LumeWeb
/
hyperswarm-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*refactor 

*remove wspool
*reformat
This commit is contained in:
Derrick Hammer 2022-07-20 01:55:44 -04:00
parent 428e8b3160
commit 2c197cdeef
1 changed files with 116 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/index.ts
View File

@ -1,43 +1,45 @@
// @ts-ignore // @ts-ignore
import { DhtNode } from "@hyperswarm/dht-relay"; import DhtNode from "@hyperswarm/dht-relay";
// @ts-ignore // @ts-ignore
import Stream from "@hyperswarm/dht-relay/ws"; import Stream from "@hyperswarm/dht-relay/ws";
// @ts-ignore // @ts-ignore
import createPool from "websocket-pool";
// @ts-ignore
import createRoundRobin from "@derhuerst/round-robin-scheduler"; import createRoundRobin from "@derhuerst/round-robin-scheduler";
// @ts-ignore
import {Buffer} from "buffer"; import {Buffer} from "buffer";
// @ts-ignore
import {blake2b} from "libskynet"; import {blake2b} from "libskynet";
import { registryRead } from "libkernel"; // @ts-ignore
import {registryRead} from "libkmodule";
// @ts-ignore
import {errTuple} from "libskynet"; import {errTuple} from "libskynet";
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)$/; const REGISTRY_DHT_KEY = "lumeweb-dht-node";
export default class DHT { export default class DHT {
private _dht: DhtNode; private _wsPool: createRoundRobin.RoundRobin;
private _wsPool: DhtNode; private _options: any;
private _relays: { [pubkey: string]: string } = {};
constructor() { constructor(opts = {}) {
this._wsPool = createPool(WebSocket, createRoundRobin); // @ts-ignore
this._dht = new DhtNode(new Stream(true, this._wsPool)); opts.custodial = true;
return this.setupProxy(); this._options = opts;
this._wsPool = createRoundRobin();
} }
static get IS_WEB() { ready(): Promise<void> {
return true; return Promise.resolve();
} }
private _relays: { [pubkey: string]: () => void } = {};
get relays(): string[] { get relays(): string[] {
return Object.keys(this._relays); return Object.keys(this._relays);
} }
public async addRelay(pubkey: string): Promise<boolean> { public async addRelay(pubkey: string): Promise<boolean> {
let entry: errTuple = await registryRead( let entry: errTuple = await registryRead(
stringToUint8ArrayUtf8(pubkey), Uint8Array.from(Buffer.from(pubkey, "hex")),
hashDataKey(REGISTRY_DHT_KEY) hashDataKey(REGISTRY_DHT_KEY)
); );
@ -45,23 +47,24 @@ export default class DHT {
return false; return false;
} }
const host = Buffer.from(entry[0].entryData).toString("utf8") as string; let host;
const [ip, port] = host.split(".");
if (!IP_REGEX.test(ip)) { try {
host = unpack(entry[0].entryData);
} catch (e) {
return false; return false;
} }
const [domain, port] = host.split(":");
if (isNaN(parseInt(port))) { if (isNaN(parseInt(port))) {
return false; 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; return true;
} }
@ -71,14 +74,14 @@ export default class DHT {
return false; return false;
} }
this._relays[pubkey](); this._wsPool.remove(this._relays[pubkey]);
delete this._relays[pubkey]; delete this._relays[pubkey];
return true; return true;
} }
public clearRelays(): void { public clearRelays(): void {
this._wsPool.close(); this._wsPool = createRoundRobin();
this._relays = {}; this._relays = {};
} }
@ -95,27 +98,28 @@ export default class DHT {
}); });
} }
private setupProxy() { async connect(pubkey: string, options = {}): Promise<DhtNode> {
return new Proxy(this, { const relay = await this.getAvailableRelay();
get(target, name: string) {
if (!target.hasOwnProperty(name)) { if (!relay) {
if (!target._dht.hasOwnProperty(name)) { throw new Error("Failed to find an available relay");
throw new Error(`Cannot access the ${name} property`);
}
return target._dht[target];
} else {
// @ts-ignore
return target[name];
}
},
has(target, name: string) {
if (!target.hasOwnProperty(name)) {
return target._dht.hasOwnProperty(name);
} }
return true; const node = new DhtNode(new Stream(true, new WebSocket(relay as string)), this._options);
}, await node.ready();
});
return node.connect(pubkey, options)
}
async getAvailableRelay(): Promise<string | boolean> {
for (let i = 0; i < this._wsPool.length; i++) {
const relay = this._wsPool.get();
if (await this.isServerAvailable(relay)) {
return relay;
}
}
return false;
} }
} }