From d4df7d45c384ec7de39102261235af6317b8998e Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Mon, 6 Feb 2023 03:26:19 -0500 Subject: [PATCH] *Update dist --- dist/index.d.ts | 7 ++++--- dist/index.d.ts.map | 2 +- dist/index.js | 27 +++++++++++++++------------ 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dist/index.d.ts b/dist/index.d.ts index 63dc4f3..ed97731 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -2,6 +2,7 @@ import { Buffer } from "buffer"; import { Client } from "@lumeweb/libkernel-universal"; import { ErrTuple } from "@siaweb/libweb"; +import type { EventEmitter } from "eventemitter3"; export declare class SwarmClient extends Client { private useDefaultSwarm; private id; @@ -9,7 +10,7 @@ export declare class SwarmClient extends Client { constructor(useDefaultDht?: boolean); connect(pubkey: string | Uint8Array): Promise; init(): Promise; - ready(): Promise; + ready(): Promise; addRelay(pubkey: string): Promise; removeRelay(pubkey: string): Promise; clearRelays(): Promise; @@ -20,8 +21,8 @@ export declare class Socket extends Client { private id; private eventUpdates; constructor(id: number); - on(eventName: string, listener: (...args: any[]) => void): this; - off(type: string, listener: any): this; + on>(event: T, fn: EventEmitter.EventListener, context?: any): this; + off>(event: T, fn?: EventEmitter.EventListener, context?: any, once?: boolean): this; write(message: string | Buffer): void; end(): void; private ensureEvent; diff --git a/dist/index.d.ts.map b/dist/index.d.ts.map index dda0087..ddec4f6 100644 --- a/dist/index.d.ts.map +++ b/dist/index.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,MAAM,EAAW,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAoB,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE5D,qBAAa,WAAY,SAAQ,MAAM;IACrC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,EAAE,CAAa;IAEvB,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;gBAEW,aAAa,UAAO;IAKnB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAa5D,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC;IAGzB,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC;IAInB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAG5B,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI9B,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGhD;AAED,qBAAa,MAAO,SAAQ,MAAM;IAChC,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,YAAY,CAAqC;gBAE7C,EAAE,EAAE,MAAM;IAKtB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,IAAI;IAiB/D,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAStC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIrC,GAAG,IAAI,IAAI;IAUX,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,UAAU;CAInB;AAID,eAAO,MAAM,YAAY,+BAA4C,CAAC"} \ No newline at end of file +{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,MAAM,EAAW,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAoB,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,qBAAa,WAAY,SAAQ,MAAM;IACrC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,EAAE,CAAa;IAEvB,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;gBAEW,aAAa,UAAO;IAKnB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAa5D,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC;IAGzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAYf,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAG5B,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI9B,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGhD;AAED,qBAAa,MAAO,SAAQ,MAAM;IAChC,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,YAAY,CAAqC;gBAE7C,EAAE,EAAE,MAAM;IAItB,EAAE,CAAC,CAAC,SAAS,YAAY,CAAC,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,EACnD,KAAK,EAAE,CAAC,EACR,EAAE,EAAE,YAAY,CAAC,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,EAClD,OAAO,CAAC,EAAE,GAAG,GACZ,IAAI;IAiBP,GAAG,CAAC,CAAC,SAAS,YAAY,CAAC,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,EACpD,KAAK,EAAE,CAAC,EACR,EAAE,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,EACnD,OAAO,CAAC,EAAE,GAAG,EACb,IAAI,CAAC,EAAE,OAAO,GACb,IAAI;IASP,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIrC,GAAG,IAAI,IAAI;IAUX,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,UAAU;CAInB;AAID,eAAO,MAAM,YAAY,+BAA4C,CAAC"} \ No newline at end of file diff --git a/dist/index.js b/dist/index.js index 226bb1f..b6028a6 100644 --- a/dist/index.js +++ b/dist/index.js @@ -25,7 +25,10 @@ export class SwarmClient extends Client { return this.callModuleReturn("init", { swarm: this.swarm }); } async ready() { - return this.callModuleReturn("ready", { swarm: this.swarm }); + await this.callModuleReturn("ready", { swarm: this.swarm }); + this.connectModule("listenConnections", { swarm: this.swarm }, (socketId) => { + this.emit("connection", createSocket(socketId)); + }); } async addRelay(pubkey) { return this.callModuleReturn("addRelay", { pubkey, swarm: this.swarm }); @@ -50,23 +53,23 @@ export class Socket extends Client { super(); this.id = id; } - on(eventName, listener) { - const [update, promise] = this.connectModule("listenSocketEvent", { id: this.id, event: eventName }, (data) => { - this.emit(eventName, data); + on(event, fn, context) { + const [update, promise] = this.connectModule("listenSocketEvent", { id: this.id, event: event }, (data) => { + this.emit(event, data); }); - this.trackEvent(eventName, update); + this.trackEvent(event, update); promise.then(() => { - this.off(eventName, listener); + this.off(event, fn); }); - return super.on(eventName, listener); + return super.on(event, fn, context); } - off(type, listener) { - const updates = [...this.eventUpdates[type]]; - this.eventUpdates[type] = []; + off(event, fn, context, once) { + const updates = [...this.eventUpdates[event]]; + this.eventUpdates[event] = []; for (const func of updates) { - func({ action: "off" }); + func(); } - return super.off(type, listener); + return super.off(event, fn, context, once); } write(message) { this.callModule("write", { id: this.id, message });