Compare commits
3 Commits
14a71cffd9
...
bdf0cb705c
Author | SHA1 | Date |
---|---|---|
Derrick Hammer | bdf0cb705c | |
Derrick Hammer | 1a4f33c697 | |
Derrick Hammer | 290ca18c4b |
|
@ -9,6 +9,7 @@ export declare class SwarmClient extends Client {
|
||||||
private _autoReconnect;
|
private _autoReconnect;
|
||||||
private _connectBackoff;
|
private _connectBackoff;
|
||||||
private _ready?;
|
private _ready?;
|
||||||
|
private _connectionListener?;
|
||||||
private _topics;
|
private _topics;
|
||||||
private _sockets;
|
private _sockets;
|
||||||
get dht(): {
|
get dht(): {
|
||||||
|
|
|
@ -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,EAAU,QAAQ,EAAY,MAAM,gBAAgB,CAAC;AAG5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAKlD,qBAAa,WAAY,SAAQ,MAAM;IACrC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,EAAE,CAAa;IACvB,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,eAAe,CAAM;IAE7B,OAAO,CAAC,MAAM,CAAC,CAAgB;IAE/B,OAAO,CAAC,OAAO,CAA0C;IACzD,OAAO,CAAC,QAAQ,CAAkD;IAElE,IAAI,GAAG;;MAON;gBAEW,aAAa,UAAO,EAAE,aAAa,UAAQ;IAUvD,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAEY,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;IAkBtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAUd,OAAO;IAwBR,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,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAQtE;AAQD,qBAAa,MAAO,SAAQ,MAAM;IAChC,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,YAAY,CAAqC;gBAE7C,EAAE,EAAE,MAAM;IAKtB,OAAO,CAAC,gBAAgB,CAAC,CAAa;IAEtC,IAAI,eAAe,IAAI,UAAU,CAEhC;IAED,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC,IAAI,SAAS,IAAI,UAAU,CAE1B;IAEK,KAAK;IAOX,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"}
|
{"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,EAAU,QAAQ,EAAY,MAAM,gBAAgB,CAAC;AAG5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAKlD,qBAAa,WAAY,SAAQ,MAAM;IACrC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,EAAE,CAAa;IACvB,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,eAAe,CAAM;IAE7B,OAAO,CAAC,MAAM,CAAC,CAAgB;IAC/B,OAAO,CAAC,mBAAmB,CAAC,CAG1B;IAEF,OAAO,CAAC,OAAO,CAA0C;IACzD,OAAO,CAAC,QAAQ,CAAkD;IAElE,IAAI,GAAG;;MAON;gBAEW,aAAa,UAAO,EAAE,aAAa,UAAQ;IAcvD,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAEY,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;IAkBtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAMd,OAAO;IA2BR,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,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAQtE;AAQD,qBAAa,MAAO,SAAQ,MAAM;IAChC,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,YAAY,CAAqC;gBAE7C,EAAE,EAAE,MAAM;IAKtB,OAAO,CAAC,gBAAgB,CAAC,CAAa;IAEtC,IAAI,eAAe,IAAI,UAAU,CAEhC;IAED,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC,IAAI,SAAS,IAAI,UAAU,CAE1B;IAEK,KAAK;IAOX,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"}
|
|
@ -9,6 +9,7 @@ export class SwarmClient extends Client {
|
||||||
_autoReconnect;
|
_autoReconnect;
|
||||||
_connectBackoff;
|
_connectBackoff;
|
||||||
_ready;
|
_ready;
|
||||||
|
_connectionListener;
|
||||||
_topics = new Set();
|
_topics = new Set();
|
||||||
_sockets = new Map();
|
_sockets = new Map();
|
||||||
get dht() {
|
get dht() {
|
||||||
|
@ -27,6 +28,9 @@ export class SwarmClient extends Client {
|
||||||
strategy: "fibo",
|
strategy: "fibo",
|
||||||
maxAttempts: Number.MAX_SAFE_INTEGER,
|
maxAttempts: Number.MAX_SAFE_INTEGER,
|
||||||
});
|
});
|
||||||
|
this._connectBackoff.on("retry", (error) => {
|
||||||
|
this.logErr(error);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
get swarm() {
|
get swarm() {
|
||||||
return this.useDefaultSwarm ? undefined : this.id;
|
return this.useDefaultSwarm ? undefined : this.id;
|
||||||
|
@ -59,13 +63,11 @@ export class SwarmClient extends Client {
|
||||||
}
|
}
|
||||||
async start() {
|
async start() {
|
||||||
await this._connectBackoff.run(() => this.init());
|
await this._connectBackoff.run(() => this.init());
|
||||||
this._connectBackoff.on("retry", (error) => {
|
|
||||||
this.logErr(error);
|
|
||||||
});
|
|
||||||
await this.ready();
|
await this.ready();
|
||||||
}
|
}
|
||||||
async _listen() {
|
async _listen() {
|
||||||
const connect = this.connectModule("listenConnections", { swarm: this.swarm }, async (socketId) => {
|
if (!this._connectionListener) {
|
||||||
|
this._connectionListener = this.connectModule("listenConnections", { swarm: this.swarm }, async (socketId) => {
|
||||||
const socket = this._sockets.get(socketId) ?? (await createSocket(socketId));
|
const socket = this._sockets.get(socketId) ?? (await createSocket(socketId));
|
||||||
socket.on("close", () => {
|
socket.on("close", () => {
|
||||||
this._sockets.delete(socketId);
|
this._sockets.delete(socketId);
|
||||||
|
@ -75,7 +77,9 @@ export class SwarmClient extends Client {
|
||||||
}
|
}
|
||||||
this.emit("connection", socket);
|
this.emit("connection", socket);
|
||||||
});
|
});
|
||||||
await connect[1];
|
}
|
||||||
|
await this._connectionListener[1];
|
||||||
|
this._connectionListener = undefined;
|
||||||
this.start();
|
this.start();
|
||||||
}
|
}
|
||||||
async addRelay(pubkey) {
|
async addRelay(pubkey) {
|
||||||
|
|
19
src/index.ts
19
src/index.ts
|
@ -15,6 +15,10 @@ export class SwarmClient extends Client {
|
||||||
private _connectBackoff: any;
|
private _connectBackoff: any;
|
||||||
|
|
||||||
private _ready?: Promise<void>;
|
private _ready?: Promise<void>;
|
||||||
|
private _connectionListener?: [
|
||||||
|
sendUpdate: DataFn,
|
||||||
|
response: Promise<ErrTuple>
|
||||||
|
];
|
||||||
|
|
||||||
private _topics: Set<Uint8Array> = new Set<Uint8Array>();
|
private _topics: Set<Uint8Array> = new Set<Uint8Array>();
|
||||||
private _sockets: Map<number, Socket> = new Map<number, Socket>();
|
private _sockets: Map<number, Socket> = new Map<number, Socket>();
|
||||||
|
@ -36,6 +40,10 @@ export class SwarmClient extends Client {
|
||||||
strategy: "fibo",
|
strategy: "fibo",
|
||||||
maxAttempts: Number.MAX_SAFE_INTEGER,
|
maxAttempts: Number.MAX_SAFE_INTEGER,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this._connectBackoff.on("retry", (error: any) => {
|
||||||
|
this.logErr(error);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
get swarm(): number | undefined {
|
get swarm(): number | undefined {
|
||||||
|
@ -79,15 +87,12 @@ export class SwarmClient extends Client {
|
||||||
async start(): Promise<void> {
|
async start(): Promise<void> {
|
||||||
await this._connectBackoff.run(() => this.init());
|
await this._connectBackoff.run(() => this.init());
|
||||||
|
|
||||||
this._connectBackoff.on("retry", (error: any) => {
|
|
||||||
this.logErr(error);
|
|
||||||
});
|
|
||||||
|
|
||||||
await this.ready();
|
await this.ready();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async _listen() {
|
private async _listen() {
|
||||||
const connect = this.connectModule(
|
if (!this._connectionListener) {
|
||||||
|
this._connectionListener = this.connectModule(
|
||||||
"listenConnections",
|
"listenConnections",
|
||||||
{ swarm: this.swarm },
|
{ swarm: this.swarm },
|
||||||
async (socketId: any) => {
|
async (socketId: any) => {
|
||||||
|
@ -105,8 +110,10 @@ export class SwarmClient extends Client {
|
||||||
this.emit("connection", socket);
|
this.emit("connection", socket);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
await connect[1];
|
await this._connectionListener[1];
|
||||||
|
this._connectionListener = undefined;
|
||||||
this.start();
|
this.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue