*Update dist

dist/index.d.ts

@@ -1,15 +1,18 @@
+import DhtNode from "@hyperswarm/dht-relay";
 export default class DHT {
-    private _dht;
     private _wsPool;
-    constructor();
+    private _options;
-    static get IS_WEB(): boolean;
     private _relays;
+    constructor(opts?: {});
+    ready(): Promise<void>;
+    static get IS_WEB(): boolean;
     get relays(): string[];
     addRelay(pubkey: string): Promise<boolean>;
     removeRelay(pubkey: string): boolean;
     clearRelays(): void;
     private isServerAvailable;
-    private setupProxy;
+    connect(pubkey: string, options?: {}): Promise<DhtNode>;
+    getAvailableRelay(): Promise<string | boolean>;
 }
 export declare function hashDataKey(dataKey: string): Uint8Array;
 //# sourceMappingURL=index.d.ts.map

dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,OAAO,OAAO,GAAG;IACtB,OAAO,CAAC,IAAI,CAAU;IACtB,OAAO,CAAC,OAAO,CAAU;;IAQzB,MAAM,KAAK,MAAM,YAEhB;IAED,OAAO,CAAC,OAAO,CAAwC;IAEvD,IAAI,MAAM,IAAI,MAAM,EAAE,CAErB;IAEY,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BhD,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAWpC,WAAW,IAAI,IAAI;YAKZ,iBAAiB;IAa/B,OAAO,CAAC,UAAU;CAsBnB;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAEvD"}

dist/index.js

@@ -1,59 +1,58 @@
-// @ts-ignore
+// src/index.ts
-import { DhtNode } from "@hyperswarm/dht-relay";
+import DhtNode from "@hyperswarm/dht-relay";
-// @ts-ignore
 import Stream from "@hyperswarm/dht-relay/ws";
-// @ts-ignore
-import createPool from "websocket-pool";
-// @ts-ignore
 import createRoundRobin from "@derhuerst/round-robin-scheduler";
 import { Buffer } from "buffer";
 import { blake2b } from "libskynet";
-import { registryRead } from "libkernel";
+import { registryRead } from "libkmodule";
-const REGISTRY_DHT_KEY = "lumeweb-dht-relay";
+import { unpack } from "msgpackr";
-const IP_REGEX = /^(?:(?:2[0-4]\d|25[0-5]|1\d{2}|[1-9]?\d)\.){3}(?:2[0-4]\d|25[0-5]|1\d{2}|[1-9]?\d)$/;
+var REGISTRY_DHT_KEY = "lumeweb-dht-node";
-export default class DHT {
+var DHT = class {
-    constructor() {
+  _wsPool;
-        this._relays = {};
+  _options;
-        this._wsPool = createPool(WebSocket, createRoundRobin);
+  _relays = {};
-        this._dht = new DhtNode(new Stream(true, this._wsPool));
+  constructor(opts = {}) {
-        return this.setupProxy();
+    opts.custodial = true;
+    this._options = opts;
+    this._wsPool = createRoundRobin();
   }
-    static get IS_WEB() {
+  ready() {
-        return true;
+    return Promise.resolve();
   }
   get relays() {
     return Object.keys(this._relays);
   }
   async addRelay(pubkey) {
-        let entry = await registryRead(stringToUint8ArrayUtf8(pubkey), hashDataKey(REGISTRY_DHT_KEY));
+    var _a;
-        if (entry[1] || !entry[0]?.exists) {
+    let entry = await registryRead(Uint8Array.from(Buffer.from(pubkey, "hex")), hashDataKey(REGISTRY_DHT_KEY));
+    if (entry[1] || !((_a = entry[0]) == null ? void 0 : _a.exists)) {
       return false;
     }
-        const host = Buffer.from(entry[0].entryData).toString("utf8");
+    let host;
-        const [ip, port] = host.split(".");
+    try {
-        if (!IP_REGEX.test(ip)) {
+      host = unpack(entry[0].entryData);
+    } catch (e) {
       return false;
     }
+    const [domain, port] = host.split(":");
     if (isNaN(parseInt(port))) {
       return false;
     }
-        const connection = `ws://${ip}:${port}/`;
+    const connection = `wss://${domain}:${port}/`;
-        if (!(await this.isServerAvailable(connection))) {
+    this._wsPool.add(connection);
-            return false;
+    this._relays[pubkey] = connection;
-        }
-        this._relays[pubkey] = this._wsPool.add(connection);
     return true;
   }
   removeRelay(pubkey) {
     if (!(pubkey in this._relays)) {
       return false;
     }
-        this._relays[pubkey]();
+    this._wsPool.remove(this._relays[pubkey]);
     delete this._relays[pubkey];
     return true;
   }
   clearRelays() {
-        this._wsPool.close();
+    this._wsPool = createRoundRobin();
     this._relays = {};
   }
   async isServerAvailable(connection) {
@@ -68,30 +67,26 @@ export default class DHT {
       });
     });
   }
-    setupProxy() {
+  async connect(pubkey, options = {}) {
-        return new Proxy(this, {
+    const relay = await this.getAvailableRelay();
-            get(target, name) {
+    if (!relay) {
-                if (!target.hasOwnProperty(name)) {
+      throw new Error("Failed to find an available relay");
-                    if (!target._dht.hasOwnProperty(name)) {
-                        throw new Error(`Cannot access the ${name} property`);
     }
-                    return target._dht[target];
+    const node = new DhtNode(new Stream(true, new WebSocket(relay)), this._options);
+    await node.ready();
+    return node.connect(pubkey, options);
   }
-                else {
+  async getAvailableRelay() {
-                    // @ts-ignore
+    for (let i = 0; i < this._wsPool.length; i++) {
-                    return target[name];
+      const relay = this._wsPool.get();
+      if (await this.isServerAvailable(relay)) {
+        return relay;
       }
-            },
-            has(target, name) {
-                if (!target.hasOwnProperty(name)) {
-                    return target._dht.hasOwnProperty(name);
     }
-                return true;
+    return false;
-            },
-        });
   }
-}
+};
-export function hashDataKey(dataKey) {
+function hashDataKey(dataKey) {
   return blake2b(encodeUtf8String(dataKey));
 }
 function encodeUtf8String(str) {
@@ -107,8 +102,13 @@ function stringToUint8ArrayUtf8(str) {
 function encodeNumber(num) {
   const encoded = new Uint8Array(8);
   for (let index = 0; index < encoded.length; index++) {
-        encoded[index] = num & 0xff;
+    encoded[index] = num & 255;
     num = num >> 8;
   }
   return encoded;
 }
+export {
+  DHT as default,
+  hashDataKey
+};
+//# sourceMappingURL=index.js.map