diff --git a/dist/index.d.ts b/dist/index.d.ts index ccb1d5f..e96d3a8 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -1,15 +1,18 @@ +import DhtNode from "@hyperswarm/dht-relay"; export default class DHT { - private _dht; private _wsPool; - constructor(); - static get IS_WEB(): boolean; + private _options; private _relays; + constructor(opts?: {}); + ready(): Promise; + static get IS_WEB(): boolean; get relays(): string[]; addRelay(pubkey: string): Promise; removeRelay(pubkey: string): boolean; clearRelays(): void; private isServerAvailable; - private setupProxy; + connect(pubkey: string, options?: {}): Promise; + getAvailableRelay(): Promise; } export declare function hashDataKey(dataKey: string): Uint8Array; //# sourceMappingURL=index.d.ts.map \ No newline at end of file diff --git a/dist/index.d.ts.map b/dist/index.d.ts.map deleted file mode 100644 index 0515006..0000000 --- a/dist/index.d.ts.map +++ /dev/null @@ -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"} \ No newline at end of file diff --git a/dist/index.js b/dist/index.js index a1849fd..c7a3acd 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,114 +1,114 @@ -// @ts-ignore -import { DhtNode } from "@hyperswarm/dht-relay"; -// @ts-ignore +// src/index.ts +import DhtNode from "@hyperswarm/dht-relay"; 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"; -const REGISTRY_DHT_KEY = "lumeweb-dht-relay"; -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)$/; -export default class DHT { - constructor() { - this._relays = {}; - this._wsPool = createPool(WebSocket, createRoundRobin); - this._dht = new DhtNode(new Stream(true, this._wsPool)); - return this.setupProxy(); +import { registryRead } from "libkmodule"; +import { unpack } from "msgpackr"; +var REGISTRY_DHT_KEY = "lumeweb-dht-node"; +var DHT = class { + _wsPool; + _options; + _relays = {}; + constructor(opts = {}) { + opts.custodial = true; + this._options = opts; + this._wsPool = createRoundRobin(); + } + ready() { + return Promise.resolve(); + } + get relays() { + return Object.keys(this._relays); + } + async addRelay(pubkey) { + var _a; + 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; } - static get IS_WEB() { - return true; + let host; + try { + host = unpack(entry[0].entryData); + } catch (e) { + return false; } - get relays() { - return Object.keys(this._relays); + const [domain, port] = host.split(":"); + if (isNaN(parseInt(port))) { + return false; } - async addRelay(pubkey) { - let entry = await registryRead(stringToUint8ArrayUtf8(pubkey), hashDataKey(REGISTRY_DHT_KEY)); - if (entry[1] || !entry[0]?.exists) { - return false; - } - const host = Buffer.from(entry[0].entryData).toString("utf8"); - const [ip, port] = host.split("."); - if (!IP_REGEX.test(ip)) { - return false; - } - if (isNaN(parseInt(port))) { - return false; - } - const connection = `ws://${ip}:${port}/`; - if (!(await this.isServerAvailable(connection))) { - return false; - } - this._relays[pubkey] = this._wsPool.add(connection); - return true; + const connection = `wss://${domain}:${port}/`; + this._wsPool.add(connection); + this._relays[pubkey] = connection; + return true; + } + removeRelay(pubkey) { + if (!(pubkey in this._relays)) { + return false; } - removeRelay(pubkey) { - if (!(pubkey in this._relays)) { - return false; - } - this._relays[pubkey](); - delete this._relays[pubkey]; - return true; + this._wsPool.remove(this._relays[pubkey]); + delete this._relays[pubkey]; + return true; + } + clearRelays() { + this._wsPool = createRoundRobin(); + this._relays = {}; + } + async isServerAvailable(connection) { + return new Promise((resolve) => { + const ws = new WebSocket(connection); + ws.addEventListener("open", () => { + ws.close(); + resolve(true); + }); + ws.addEventListener("error", () => { + resolve(false); + }); + }); + } + async connect(pubkey, options = {}) { + const relay = await this.getAvailableRelay(); + if (!relay) { + throw new Error("Failed to find an available relay"); } - clearRelays() { - this._wsPool.close(); - this._relays = {}; + const node = new DhtNode(new Stream(true, new WebSocket(relay)), this._options); + await node.ready(); + return node.connect(pubkey, options); + } + async getAvailableRelay() { + for (let i = 0; i < this._wsPool.length; i++) { + const relay = this._wsPool.get(); + if (await this.isServerAvailable(relay)) { + return relay; + } } - async isServerAvailable(connection) { - return new Promise((resolve) => { - const ws = new WebSocket(connection); - ws.addEventListener("open", () => { - ws.close(); - resolve(true); - }); - ws.addEventListener("error", () => { - resolve(false); - }); - }); - } - setupProxy() { - return new Proxy(this, { - get(target, name) { - if (!target.hasOwnProperty(name)) { - if (!target._dht.hasOwnProperty(name)) { - throw new Error(`Cannot access the ${name} property`); - } - return target._dht[target]; - } - else { - // @ts-ignore - return target[name]; - } - }, - has(target, name) { - if (!target.hasOwnProperty(name)) { - return target._dht.hasOwnProperty(name); - } - return true; - }, - }); - } -} -export function hashDataKey(dataKey) { - return blake2b(encodeUtf8String(dataKey)); + return false; + } +}; +function hashDataKey(dataKey) { + return blake2b(encodeUtf8String(dataKey)); } function encodeUtf8String(str) { - const byteArray = stringToUint8ArrayUtf8(str); - const encoded = new Uint8Array(8 + byteArray.length); - encoded.set(encodeNumber(byteArray.length)); - encoded.set(byteArray, 8); - return encoded; + const byteArray = stringToUint8ArrayUtf8(str); + const encoded = new Uint8Array(8 + byteArray.length); + encoded.set(encodeNumber(byteArray.length)); + encoded.set(byteArray, 8); + return encoded; } function stringToUint8ArrayUtf8(str) { - return Uint8Array.from(Buffer.from(str, "utf-8")); + return Uint8Array.from(Buffer.from(str, "utf-8")); } function encodeNumber(num) { - const encoded = new Uint8Array(8); - for (let index = 0; index < encoded.length; index++) { - encoded[index] = num & 0xff; - num = num >> 8; - } - return encoded; + const encoded = new Uint8Array(8); + for (let index = 0; index < encoded.length; index++) { + encoded[index] = num & 255; + num = num >> 8; + } + return encoded; } +export { + DHT as default, + hashDataKey +}; +//# sourceMappingURL=index.js.map \ No newline at end of file