Compare commits
No commits in common. "79bbf5c144fb8b14ee43cc3d3cd96bd46f8aefa1" and "bb657e5af0fe2156ff783b2b48a8ad7fa40f899c" have entirely different histories.
79bbf5c144
...
bb657e5af0
|
|
@ -6,183 +6,174 @@ import b4a from "b4a";
|
|||
import Backoff from "backoff.js";
|
||||
import { Mutex } from "async-mutex";
|
||||
export class SwarmClient extends Client {
|
||||
useDefaultSwarm;
|
||||
id = 0;
|
||||
_autoReconnect;
|
||||
_connectBackoff;
|
||||
_ready;
|
||||
_connectionListener;
|
||||
_topics = new Set();
|
||||
_sockets = new Map();
|
||||
get dht() {
|
||||
const self = this;
|
||||
return {
|
||||
async ready() {
|
||||
return self.ready();
|
||||
},
|
||||
};
|
||||
}
|
||||
constructor(useDefaultDht = true, autoReconnect = false) {
|
||||
super();
|
||||
this.useDefaultSwarm = useDefaultDht;
|
||||
this._autoReconnect = autoReconnect;
|
||||
this._connectBackoff = new Backoff({
|
||||
strategy: "fibo",
|
||||
maxAttempts: Number.MAX_SAFE_INTEGER,
|
||||
});
|
||||
this._connectBackoff.on("retry", (error) => {
|
||||
this.logErr(error);
|
||||
});
|
||||
}
|
||||
get swarm() {
|
||||
return this.useDefaultSwarm ? undefined : this.id;
|
||||
}
|
||||
async connect(pubkey) {
|
||||
if (typeof pubkey === "string") {
|
||||
const buf = hexToBuf(pubkey);
|
||||
pubkey = this.handleErrorOrReturn(buf);
|
||||
useDefaultSwarm;
|
||||
id = 0;
|
||||
_autoReconnect;
|
||||
_connectBackoff;
|
||||
_ready;
|
||||
_connectionListener;
|
||||
_topics = new Set();
|
||||
_sockets = new Map();
|
||||
get dht() {
|
||||
const self = this;
|
||||
return {
|
||||
async ready() {
|
||||
return self.ready();
|
||||
},
|
||||
};
|
||||
}
|
||||
let existing = Array.from(this._sockets.values()).filter((socket) => {
|
||||
return b4a.equals(socket.remotePublicKey, pubkey);
|
||||
});
|
||||
if (existing.length) {
|
||||
return existing[0];
|
||||
constructor(useDefaultDht = true, autoReconnect = false) {
|
||||
super();
|
||||
this.useDefaultSwarm = useDefaultDht;
|
||||
this._autoReconnect = autoReconnect;
|
||||
this._connectBackoff = new Backoff({
|
||||
strategy: "fibo",
|
||||
maxAttempts: Number.MAX_SAFE_INTEGER,
|
||||
});
|
||||
this._connectBackoff.on("retry", (error) => {
|
||||
this.logErr(error);
|
||||
});
|
||||
}
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
async init() {
|
||||
return await this.callModuleReturn("init", { swarm: this.swarm });
|
||||
}
|
||||
async ready() {
|
||||
if (this._ready) {
|
||||
return this._ready;
|
||||
get swarm() {
|
||||
return this.useDefaultSwarm ? undefined : this.id;
|
||||
}
|
||||
this._listen();
|
||||
this._ready = this.callModuleReturn("ready", { swarm: this.swarm });
|
||||
await this._ready;
|
||||
this._ready = undefined;
|
||||
for (const topic of this._topics) {
|
||||
await this.join(topic);
|
||||
}
|
||||
}
|
||||
async start() {
|
||||
await this._connectBackoff.run(() => this.init());
|
||||
await this.ready();
|
||||
}
|
||||
async _listen() {
|
||||
if (!this._connectionListener) {
|
||||
this._connectionListener = this.connectModule(
|
||||
"listenConnections",
|
||||
{ swarm: this.swarm },
|
||||
async (socketId) => {
|
||||
const socket =
|
||||
this._sockets.get(socketId) ?? (await createSocket(socketId, this));
|
||||
socket.on("close", () => {
|
||||
this._sockets.delete(socketId);
|
||||
});
|
||||
if (!this._sockets.has(socketId)) {
|
||||
this._sockets.set(socketId, socket);
|
||||
}
|
||||
this.emit("connection", socket);
|
||||
async connect(pubkey) {
|
||||
if (typeof pubkey === "string") {
|
||||
const buf = hexToBuf(pubkey);
|
||||
pubkey = this.handleErrorOrReturn(buf);
|
||||
}
|
||||
);
|
||||
let existing = Array.from(this._sockets.values()).filter((socket) => {
|
||||
return b4a.equals(socket.remotePublicKey, pubkey);
|
||||
});
|
||||
if (existing.length) {
|
||||
return existing[0];
|
||||
}
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
await this._connectionListener[1];
|
||||
this._connectionListener = undefined;
|
||||
this.start();
|
||||
}
|
||||
async addRelay(pubkey) {
|
||||
return this.callModuleReturn("addRelay", { pubkey, swarm: this.swarm });
|
||||
}
|
||||
async removeRelay(pubkey) {
|
||||
return this.callModuleReturn("removeRelay", { pubkey, swarm: this.swarm });
|
||||
}
|
||||
async clearRelays() {
|
||||
return this.callModuleReturn("clearRelays", { swarm: this.swarm });
|
||||
}
|
||||
async getRelays() {
|
||||
return this.callModuleReturn("getRelays", { swarm: this.swarm });
|
||||
}
|
||||
async join(topic) {
|
||||
if (typeof topic === "string") {
|
||||
topic = blake2b(topic, { dkLen: 32 });
|
||||
async init() {
|
||||
return await this.callModuleReturn("init", { swarm: this.swarm });
|
||||
}
|
||||
async ready() {
|
||||
if (this._ready) {
|
||||
return this._ready;
|
||||
}
|
||||
this._listen();
|
||||
this._ready = this.callModuleReturn("ready", { swarm: this.swarm });
|
||||
await this._ready;
|
||||
this._ready = undefined;
|
||||
for (const topic of this._topics) {
|
||||
await this.join(topic);
|
||||
}
|
||||
}
|
||||
async start() {
|
||||
await this._connectBackoff.run(() => this.init());
|
||||
await this.ready();
|
||||
}
|
||||
async _listen() {
|
||||
if (!this._connectionListener) {
|
||||
this._connectionListener = this.connectModule("listenConnections", { swarm: this.swarm }, async (socketId) => {
|
||||
const socket = this._sockets.get(socketId) ?? (await createSocket(socketId, this));
|
||||
socket.on("close", () => {
|
||||
this._sockets.delete(socketId);
|
||||
});
|
||||
if (!this._sockets.has(socketId)) {
|
||||
this._sockets.set(socketId, socket);
|
||||
}
|
||||
this.emit("connection", socket);
|
||||
});
|
||||
}
|
||||
await this._connectionListener[1];
|
||||
this._connectionListener = undefined;
|
||||
this.start();
|
||||
}
|
||||
async addRelay(pubkey) {
|
||||
return this.callModuleReturn("addRelay", { pubkey, swarm: this.swarm });
|
||||
}
|
||||
async removeRelay(pubkey) {
|
||||
return this.callModuleReturn("removeRelay", { pubkey, swarm: this.swarm });
|
||||
}
|
||||
async clearRelays() {
|
||||
return this.callModuleReturn("clearRelays", { swarm: this.swarm });
|
||||
}
|
||||
async getRelays() {
|
||||
return this.callModuleReturn("getRelays", { swarm: this.swarm });
|
||||
}
|
||||
async join(topic) {
|
||||
if (typeof topic === "string") {
|
||||
topic = blake2b(topic, { dkLen: 32 });
|
||||
}
|
||||
this._topics.add(topic);
|
||||
this.callModule("join", { id: this.id, topic });
|
||||
}
|
||||
this._topics.add(topic);
|
||||
this.callModule("join", { id: this.id, topic });
|
||||
}
|
||||
}
|
||||
export class Socket extends Client {
|
||||
id;
|
||||
eventUpdates = {};
|
||||
syncMutex = new Mutex();
|
||||
swarm;
|
||||
userData = null;
|
||||
constructor(id, swarm) {
|
||||
super();
|
||||
this.id = id;
|
||||
this.swarm = swarm;
|
||||
}
|
||||
_remotePublicKey;
|
||||
get remotePublicKey() {
|
||||
return this._remotePublicKey;
|
||||
}
|
||||
_rawStream;
|
||||
get rawStream() {
|
||||
return this._rawStream;
|
||||
}
|
||||
async setup() {
|
||||
let info = await this.callModuleReturn("socketGetInfo", { id: this.id });
|
||||
this._remotePublicKey = info.remotePublicKey;
|
||||
this._rawStream = info.rawStream;
|
||||
await this.swarm.emitAsync("setup", this);
|
||||
}
|
||||
on(event, listener, options) {
|
||||
const [update, promise] = this.connectModule(
|
||||
"socketListenEvent",
|
||||
{ id: this.id, event: event },
|
||||
(data) => {
|
||||
this.emit(event, data);
|
||||
}
|
||||
);
|
||||
this.trackEvent(event, update);
|
||||
promise.then(() => {
|
||||
this.off(event, listener);
|
||||
});
|
||||
return super.on(event, listener, options);
|
||||
}
|
||||
off(event, listener) {
|
||||
const updates = [...this.eventUpdates[event]];
|
||||
this.eventUpdates[event] = [];
|
||||
for (const func of updates) {
|
||||
func();
|
||||
id;
|
||||
eventUpdates = {};
|
||||
syncMutex = new Mutex();
|
||||
swarm;
|
||||
userData = null;
|
||||
constructor(id, swarm) {
|
||||
super();
|
||||
this.id = id;
|
||||
this.swarm = swarm;
|
||||
}
|
||||
return super.off(event, listener);
|
||||
}
|
||||
write(message) {
|
||||
this.callModule("socketWrite", { id: this.id, message });
|
||||
}
|
||||
end() {
|
||||
this.callModule("socketExists", { id: this.id }).then(([exists]) => {
|
||||
if (exists) {
|
||||
this.callModule("socketClose", { id: this.id });
|
||||
}
|
||||
});
|
||||
}
|
||||
ensureEvent(event) {
|
||||
if (!(event in this.eventUpdates)) {
|
||||
this.eventUpdates[event] = [];
|
||||
_remotePublicKey;
|
||||
get remotePublicKey() {
|
||||
return this._remotePublicKey;
|
||||
}
|
||||
_rawStream;
|
||||
get rawStream() {
|
||||
return this._rawStream;
|
||||
}
|
||||
async setup() {
|
||||
let info = await this.callModuleReturn("socketGetInfo", { id: this.id });
|
||||
this._remotePublicKey = info.remotePublicKey;
|
||||
this._rawStream = info.rawStream;
|
||||
await this.swarm.emitAsync("setup", this);
|
||||
}
|
||||
on(event, listener, options) {
|
||||
const [update, promise] = this.connectModule("socketListenEvent", { id: this.id, event: event }, (data) => {
|
||||
this.emit(event, data);
|
||||
});
|
||||
this.trackEvent(event, update);
|
||||
promise.then(() => {
|
||||
this.off(event, listener);
|
||||
});
|
||||
return super.on(event, listener, options);
|
||||
}
|
||||
off(event, listener) {
|
||||
const updates = [...this.eventUpdates[event]];
|
||||
this.eventUpdates[event] = [];
|
||||
for (const func of updates) {
|
||||
func();
|
||||
}
|
||||
return super.off(event, listener);
|
||||
}
|
||||
write(message) {
|
||||
this.callModule("socketWrite", { id: this.id, message });
|
||||
}
|
||||
end() {
|
||||
this.callModule("socketExists", { id: this.id }).then(([exists]) => {
|
||||
if (exists) {
|
||||
this.callModule("socketClose", { id: this.id });
|
||||
}
|
||||
});
|
||||
}
|
||||
ensureEvent(event) {
|
||||
if (!(event in this.eventUpdates)) {
|
||||
this.eventUpdates[event] = [];
|
||||
}
|
||||
}
|
||||
trackEvent(event, update) {
|
||||
this.ensureEvent(event);
|
||||
this.eventUpdates[event].push(update);
|
||||
}
|
||||
}
|
||||
trackEvent(event, update) {
|
||||
this.ensureEvent(event);
|
||||
this.eventUpdates[event].push(update);
|
||||
}
|
||||
}
|
||||
export const MODULE = "_AVbH2uOdd4s4hypKB3QqaP1kxJO_Q5m6y4hsEro6dpVJQ";
|
||||
export const MODULE = "_AVKgzVYC8Sb_qiTA6kw5BDzQ4Ch-8D4sldQJl8dXF9oTw";
|
||||
export const createClient = factory(SwarmClient, MODULE);
|
||||
const socketFactory = factory(Socket, MODULE);
|
||||
const createSocket = async (...args) => {
|
||||
const socket = socketFactory(...args);
|
||||
await socket.setup();
|
||||
return socket;
|
||||
const socket = socketFactory(...args);
|
||||
await socket.setup();
|
||||
return socket;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ export class Socket extends Client {
|
|||
}
|
||||
}
|
||||
|
||||
export const MODULE = "_AVbH2uOdd4s4hypKB3QqaP1kxJO_Q5m6y4hsEro6dpVJQ";
|
||||
export const MODULE = "_AVKgzVYC8Sb_qiTA6kw5BDzQ4Ch-8D4sldQJl8dXF9oTw";
|
||||
|
||||
export const createClient = factory<SwarmClient>(SwarmClient, MODULE);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue