refactor: switch to new sdks

.presetterrc.json

@@ -0,0 +1,5 @@
+{
+  "preset": [
+    "@lumeweb/node-library-preset"
+  ]
+}

dist/client.d.ts

@@ -1 +0,0 @@
-export declare const dnsClient: import("@lumeweb/kernel-dns-client").DnsClient;

dist/client.js

@@ -1,2 +0,0 @@
-import { createClient } from "@lumeweb/kernel-dns-client";
-export const dnsClient = createClient();

dist/index.d.ts

@@ -1,22 +0,0 @@
-import type {
-  DNSResult,
-  ResolverModule as ResolverModuleBase,
-} from "@lumeweb/libresolver";
-import { DnsClient } from "@lumeweb/kernel-dns-client";
-import { ResolverOptions } from "@lumeweb/libresolver/src/types.js";
-export interface ResolverModule {
-  get resolver(): DnsClient;
-  set resolver(value: DnsClient);
-  resolve(
-    domain: string,
-    options: ResolverOptions,
-    bypassCache: boolean
-  ): Promise<DNSResult>;
-  getSupportedTlds(): string[];
-  getSupportedTlds(): Promise<string[]>;
-  getSupportedTlds(): any;
-}
-export declare function setup(rm: ResolverModule | ResolverModuleBase): void;
-export * from "@lumeweb/libresolver/dist/util.js";
-export * from "@lumeweb/libresolver/dist/types.js";
-export { AbstractResolverModule } from "@lumeweb/libresolver/dist/resolverModule.js";

dist/index.js

@@ -1,42 +0,0 @@
-import { addHandler, handleMessage } from "libkmodule";
-import { DNS_RECORD_TYPE } from "@lumeweb/libresolver";
-import { dnsClient } from "./client.js";
-let resolver;
-export function setup(rm) {
-    addHandler("resolve", handleResolve);
-    addHandler("register", handleRegister);
-    addHandler("getSupportedTlds", handleGetSupportedTlds);
-    onmessage = handleMessage;
-    resolver = rm;
-    // @ts-ignore
-    resolver.resolver = dnsClient;
-}
-async function handleRegister(aq) {
-    await dnsClient.register();
-    aq.respond();
-}
-async function handleResolve(aq) {
-    if (!("domain" in aq.callerInput)) {
-        aq.reject("domain required");
-        return;
-    }
-    let ret;
-    try {
-        ret = await resolver.resolve(aq.callerInput.domain, aq.callerInput?.options ?? { type: DNS_RECORD_TYPE.CONTENT }, aq.callerInput?.bypassCache || false);
-    }
-    catch (e) {
-        aq.reject(e);
-        return;
-    }
-    if (ret.error) {
-        aq.reject(ret.error);
-        return;
-    }
-    aq.respond(ret);
-}
-function handleGetSupportedTlds(aq) {
-    aq.respond(resolver.getSupportedTlds());
-}
-export * from "@lumeweb/libresolver/dist/util.js";
-export * from "@lumeweb/libresolver/dist/types.js";
-export { AbstractResolverModule } from "@lumeweb/libresolver/dist/resolverModule.js";

package.json

@@ -1,19 +1,32 @@
 {
     "name": "@lumeweb/kernel-libresolver",
     "version": "0.1.0",
-    "main": "dist/index.js",
+    "main": "lin/index.js",
-    "dependencies": {
+    "type": "module",
-        "@lumeweb/kernel-dns-client": "git+https://git.lumeweb.com/LumeWeb/kernel-dns-client.git",
+    "repository": {
-        "@lumeweb/kernel-libresolver": "git+https://git.lumeweb.com/LumeWeb/kernel-libresolver.git",
+        "type": "git",
-        "@lumeweb/kernel-rpc-client": "git+https://git.lumeweb.com/LumeWeb/kernel-rpc-client.git",
+        "url": "gitea@git.lumeweb.com:LumeWeb/kernel-libresolver.git"
-        "@lumeweb/libkernel-universal": "git+https://git.lumeweb.com/LumeWeb/libkernel-universal.git",
-        "@lumeweb/libresolver": "git+https://git.lumeweb.com/LumeWeb/libresolver.git",
-        "libkmodule": "^0.2.53"
     },
     "devDependencies": {
-        "@lumeweb/relay-types": "git+https://git.lumeweb.com/LumeWeb/relay-types.git",
+        "@lumeweb/node-library-preset": "^0.2.7",
-        "@types/node": "^18.14.0",
+        "presetter": "*"
-        "prettier": "^2.8.4",
+    },
-        "typescript": "^4.9.5"
+    "readme": "ERROR: No README data found!",
+    "_id": "@lumeweb/kernel-libresolver@0.1.0",
+    "scripts": {
+        "prepare": "presetter bootstrap",
+        "build": "run build",
+        "semantic-release": "semantic-release"
+    },
+    "dependencies": {
+        "@lumeweb/kernel-dns-client": "^0.0.2-develop.1",
+        "@lumeweb/libkernel": "^0.1.0-develop.14",
+        "@lumeweb/libresolver": "^0.0.2-develop.1"
+    },
+    "files": [
+        "lib"
+    ],
+    "publishConfig": {
+        "access": "public"
     }
 }

src/index.ts

@@ -1,4 +1,8 @@
-import { addHandler, ActiveQuery, handleMessage } from "libkmodule";
+import {
+  addHandler,
+  ActiveQuery,
+  handleMessage,
+} from "@lumeweb/libkernel/module";
 
 import type {
   DNSResult,
@@ -7,21 +11,25 @@ import type {
 import { DNS_RECORD_TYPE } from "@lumeweb/libresolver";
 import { dnsClient } from "./client.js";
 import { DnsClient } from "@lumeweb/kernel-dns-client";
-import { ResolverOptions } from "@lumeweb/libresolver/src/types.js";
+import type { ResolverOptions } from "@lumeweb/libresolver";
 
 let resolver: ResolverModule | ResolverModuleBase;
 
 export interface ResolverModule {
   get resolver(): DnsClient;
+
   set resolver(value: DnsClient);
+
   resolve(
     domain: string,
     options: ResolverOptions,
-    bypassCache: boolean
+    bypassCache: boolean,
   ): Promise<DNSResult>;
 
   getSupportedTlds(): string[];
+
   getSupportedTlds(): Promise<string[]>;
+
   getSupportedTlds(): any;
 }
 
@@ -51,7 +59,7 @@ async function handleResolve(aq: ActiveQuery) {
     ret = await resolver.resolve(
       aq.callerInput.domain,
       aq.callerInput?.options ?? { type: DNS_RECORD_TYPE.CONTENT },
-      aq.callerInput?.bypassCache || false
+      aq.callerInput?.bypassCache || false,
     );
   } catch (e: any) {
     aq.reject(e);
@@ -70,6 +78,6 @@ function handleGetSupportedTlds(aq: ActiveQuery) {
   aq.respond(resolver.getSupportedTlds());
 }
 
-export * from "@lumeweb/libresolver/dist/util.js";
+export * from "@lumeweb/libresolver/lib/util.js";
-export * from "@lumeweb/libresolver/dist/types.js";
+export * from "@lumeweb/libresolver/lib/types.js";
-export { AbstractResolverModule } from "@lumeweb/libresolver/dist/resolverModule.js";
+export { AbstractResolverModule } from "@lumeweb/libresolver/lib/resolverModule.js";

tsconfig.json

@@ -1,12 +0,0 @@
-{
-	"compilerOptions": {
-		"target": "esnext",
-		"declaration": true,
-		"moduleResolution": "node",
-		"outDir": "./dist",
-		"strict": true,
-        "allowSyntheticDefaultImports": true
-	},
-	"include": ["src"],
-	"exclude": ["node_modules", "**/__tests__/*"]
-}