@welshman/net 0.0.43 → 0.0.45
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/src/Connection.d.ts +8 -8
- package/build/src/Connection.js +58 -0
- package/build/src/Connection.js.map +1 -0
- package/build/src/ConnectionAuth.d.ts +1 -1
- package/build/src/ConnectionAuth.js +99 -0
- package/build/src/ConnectionAuth.js.map +1 -0
- package/build/src/{ConnectionEvent.mjs → ConnectionEvent.js} +1 -1
- package/build/src/ConnectionEvent.js.map +1 -0
- package/build/src/ConnectionSender.d.ts +3 -3
- package/build/src/{ConnectionSender.mjs → ConnectionSender.js} +16 -14
- package/build/src/ConnectionSender.js.map +1 -0
- package/build/src/ConnectionState.d.ts +2 -2
- package/build/src/{ConnectionState.mjs → ConnectionState.js} +21 -21
- package/build/src/ConnectionState.js.map +1 -0
- package/build/src/ConnectionStats.d.ts +1 -1
- package/build/src/{ConnectionStats.mjs → ConnectionStats.js} +31 -30
- package/build/src/ConnectionStats.js.map +1 -0
- package/build/src/Context.d.ts +7 -7
- package/build/src/{Context.mjs → Context.js} +8 -9
- package/build/src/Context.js.map +1 -0
- package/build/src/Executor.d.ts +7 -6
- package/build/src/{Executor.mjs → Executor.js} +31 -30
- package/build/src/Executor.js.map +1 -0
- package/build/src/{Negentropy.mjs → Negentropy.js} +1 -1
- package/build/src/Negentropy.js.map +1 -0
- package/build/src/Pool.d.ts +2 -2
- package/build/src/{Pool.mjs → Pool.js} +5 -4
- package/build/src/Pool.js.map +1 -0
- package/build/src/Publish.d.ts +3 -3
- package/build/src/{Publish.mjs → Publish.js} +5 -6
- package/build/src/Publish.js.map +1 -0
- package/build/src/Socket.d.ts +2 -2
- package/build/src/Socket.js +110 -0
- package/build/src/Socket.js.map +1 -0
- package/build/src/Subscribe.d.ts +4 -4
- package/build/src/{Subscribe.mjs → Subscribe.js} +14 -16
- package/build/src/Subscribe.js.map +1 -0
- package/build/src/Sync.d.ts +2 -2
- package/build/src/{Sync.mjs → Sync.js} +11 -12
- package/build/src/Sync.js.map +1 -0
- package/build/src/Tracker.d.ts +2 -2
- package/build/src/Tracker.js +63 -0
- package/build/src/Tracker.js.map +1 -0
- package/build/src/index.d.ts +25 -19
- package/build/src/index.js +20 -0
- package/build/src/index.js.map +1 -0
- package/build/src/target/Echo.d.ts +2 -2
- package/build/src/target/Echo.js +13 -0
- package/build/src/target/Echo.js.map +1 -0
- package/build/src/target/Local.d.ts +4 -4
- package/build/src/target/Local.js +25 -0
- package/build/src/target/Local.js.map +1 -0
- package/build/src/target/Multi.d.ts +4 -4
- package/build/src/target/{Multi.mjs → Multi.js} +8 -7
- package/build/src/target/Multi.js.map +1 -0
- package/build/src/target/Relay.d.ts +3 -3
- package/build/src/target/Relay.js +24 -0
- package/build/src/target/Relay.js.map +1 -0
- package/build/src/target/Relays.d.ts +3 -3
- package/build/src/target/Relays.js +25 -0
- package/build/src/target/Relays.js.map +1 -0
- package/build/tsconfig.tsbuildinfo +1 -0
- package/package.json +7 -10
- package/build/src/Connection.cjs +0 -55
- package/build/src/Connection.cjs.map +0 -1
- package/build/src/Connection.mjs +0 -51
- package/build/src/Connection.mjs.map +0 -1
- package/build/src/ConnectionAuth.cjs +0 -109
- package/build/src/ConnectionAuth.cjs.map +0 -1
- package/build/src/ConnectionAuth.mjs +0 -105
- package/build/src/ConnectionAuth.mjs.map +0 -1
- package/build/src/ConnectionEvent.cjs +0 -16
- package/build/src/ConnectionEvent.cjs.map +0 -1
- package/build/src/ConnectionEvent.mjs.map +0 -1
- package/build/src/ConnectionSender.cjs +0 -50
- package/build/src/ConnectionSender.cjs.map +0 -1
- package/build/src/ConnectionSender.mjs.map +0 -1
- package/build/src/ConnectionState.cjs +0 -84
- package/build/src/ConnectionState.cjs.map +0 -1
- package/build/src/ConnectionState.mjs.map +0 -1
- package/build/src/ConnectionStats.cjs +0 -86
- package/build/src/ConnectionStats.cjs.map +0 -1
- package/build/src/ConnectionStats.mjs.map +0 -1
- package/build/src/Context.cjs +0 -47
- package/build/src/Context.cjs.map +0 -1
- package/build/src/Context.mjs.map +0 -1
- package/build/src/Executor.cjs +0 -109
- package/build/src/Executor.cjs.map +0 -1
- package/build/src/Executor.mjs.map +0 -1
- package/build/src/Negentropy.cjs +0 -516
- package/build/src/Negentropy.cjs.map +0 -1
- package/build/src/Negentropy.mjs.map +0 -1
- package/build/src/Pool.cjs +0 -38
- package/build/src/Pool.cjs.map +0 -1
- package/build/src/Pool.mjs.map +0 -1
- package/build/src/Publish.cjs +0 -74
- package/build/src/Publish.cjs.map +0 -1
- package/build/src/Publish.mjs.map +0 -1
- package/build/src/Socket.cjs +0 -120
- package/build/src/Socket.cjs.map +0 -1
- package/build/src/Socket.mjs +0 -113
- package/build/src/Socket.mjs.map +0 -1
- package/build/src/Subscribe.cjs +0 -294
- package/build/src/Subscribe.cjs.map +0 -1
- package/build/src/Subscribe.mjs.map +0 -1
- package/build/src/Sync.cjs +0 -136
- package/build/src/Sync.cjs.map +0 -1
- package/build/src/Sync.mjs.map +0 -1
- package/build/src/Tracker.cjs +0 -68
- package/build/src/Tracker.cjs.map +0 -1
- package/build/src/Tracker.mjs +0 -64
- package/build/src/Tracker.mjs.map +0 -1
- package/build/src/index.cjs +0 -36
- package/build/src/index.cjs.map +0 -1
- package/build/src/index.mjs +0 -20
- package/build/src/index.mjs.map +0 -1
- package/build/src/target/Echo.cjs +0 -20
- package/build/src/target/Echo.cjs.map +0 -1
- package/build/src/target/Echo.mjs +0 -16
- package/build/src/target/Echo.mjs.map +0 -1
- package/build/src/target/Local.cjs +0 -28
- package/build/src/target/Local.cjs.map +0 -1
- package/build/src/target/Local.mjs +0 -24
- package/build/src/target/Local.mjs.map +0 -1
- package/build/src/target/Multi.cjs +0 -25
- package/build/src/target/Multi.cjs.map +0 -1
- package/build/src/target/Multi.mjs.map +0 -1
- package/build/src/target/Relay.cjs +0 -27
- package/build/src/target/Relay.cjs.map +0 -1
- package/build/src/target/Relay.mjs +0 -23
- package/build/src/target/Relay.mjs.map +0 -1
- package/build/src/target/Relays.cjs +0 -28
- package/build/src/target/Relays.cjs.map +0 -1
- package/build/src/target/Relays.mjs +0 -24
- package/build/src/target/Relays.mjs.map +0 -1
|
@@ -1,67 +1,68 @@
|
|
|
1
|
-
import { ctx, noop } from
|
|
2
|
-
import { Negentropy, NegentropyStorageVector } from "./Negentropy.
|
|
3
|
-
const createSubId = (prefix) =>
|
|
1
|
+
import { ctx, noop } from "@welshman/lib";
|
|
2
|
+
import { Negentropy, NegentropyStorageVector } from "./Negentropy.js";
|
|
3
|
+
const createSubId = (prefix) => `${prefix}-${Math.random().toString().slice(2, 10)}`;
|
|
4
4
|
export class Executor {
|
|
5
|
+
target;
|
|
5
6
|
constructor(target) {
|
|
6
7
|
this.target = target;
|
|
7
8
|
}
|
|
8
9
|
subscribe(filters, { onEvent, onEose } = {}) {
|
|
9
10
|
let closed = false;
|
|
10
|
-
const id = createSubId(
|
|
11
|
+
const id = createSubId("REQ");
|
|
11
12
|
const eventListener = (url, subid, e) => {
|
|
12
13
|
if (subid === id) {
|
|
13
14
|
ctx.net.onEvent(url, e);
|
|
14
|
-
onEvent
|
|
15
|
+
onEvent?.(url, e);
|
|
15
16
|
}
|
|
16
17
|
};
|
|
17
18
|
const eoseListener = (url, subid) => {
|
|
18
19
|
if (subid === id) {
|
|
19
|
-
onEose
|
|
20
|
+
onEose?.(url);
|
|
20
21
|
}
|
|
21
22
|
};
|
|
22
|
-
this.target.on(
|
|
23
|
-
this.target.on(
|
|
23
|
+
this.target.on("EVENT", eventListener);
|
|
24
|
+
this.target.on("EOSE", eoseListener);
|
|
24
25
|
this.target.send("REQ", id, ...filters);
|
|
25
26
|
return {
|
|
26
27
|
unsubscribe: () => {
|
|
27
28
|
if (closed)
|
|
28
29
|
return;
|
|
29
30
|
this.target.send("CLOSE", id).catch(noop);
|
|
30
|
-
this.target.off(
|
|
31
|
-
this.target.off(
|
|
31
|
+
this.target.off("EVENT", eventListener);
|
|
32
|
+
this.target.off("EOSE", eoseListener);
|
|
32
33
|
closed = true;
|
|
33
34
|
},
|
|
34
35
|
};
|
|
35
36
|
}
|
|
36
|
-
publish(event, { verb =
|
|
37
|
+
publish(event, { verb = "EVENT", onOk, onError } = {}) {
|
|
37
38
|
const okListener = (url, id, ok, message) => {
|
|
38
39
|
if (id === event.id) {
|
|
39
40
|
if (ok) {
|
|
40
41
|
ctx.net.onEvent(url, event);
|
|
41
42
|
}
|
|
42
|
-
onOk
|
|
43
|
+
onOk?.(url, id, ok, message);
|
|
43
44
|
}
|
|
44
45
|
};
|
|
45
46
|
const errorListener = (url, id, ...payload) => {
|
|
46
47
|
if (id === event.id) {
|
|
47
|
-
onError
|
|
48
|
+
onError?.(url, id, ...payload);
|
|
48
49
|
}
|
|
49
50
|
};
|
|
50
|
-
this.target.on(
|
|
51
|
-
this.target.on(
|
|
51
|
+
this.target.on("OK", okListener);
|
|
52
|
+
this.target.on("ERROR", errorListener);
|
|
52
53
|
this.target.send(verb, event);
|
|
53
54
|
return {
|
|
54
55
|
unsubscribe: () => {
|
|
55
|
-
this.target.off(
|
|
56
|
-
this.target.off(
|
|
57
|
-
}
|
|
56
|
+
this.target.off("OK", okListener);
|
|
57
|
+
this.target.off("ERROR", errorListener);
|
|
58
|
+
},
|
|
58
59
|
};
|
|
59
60
|
}
|
|
60
61
|
diff(filter, events, { onMessage, onError, onClose } = {}) {
|
|
61
62
|
let closed = false;
|
|
62
|
-
const id = createSubId(
|
|
63
|
+
const id = createSubId("NEG");
|
|
63
64
|
const storage = new NegentropyStorageVector();
|
|
64
|
-
const neg = new Negentropy(storage,
|
|
65
|
+
const neg = new Negentropy(storage, 50_000);
|
|
65
66
|
for (const event of events) {
|
|
66
67
|
storage.insert(event.created_at, event.id);
|
|
67
68
|
}
|
|
@@ -69,9 +70,9 @@ export class Executor {
|
|
|
69
70
|
const msgListener = async (url, negid, msg) => {
|
|
70
71
|
if (negid === id) {
|
|
71
72
|
const [newMsg, have, need] = await neg.reconcile(msg);
|
|
72
|
-
onMessage
|
|
73
|
+
onMessage?.(url, { have, need });
|
|
73
74
|
if (newMsg) {
|
|
74
|
-
this.target.send(
|
|
75
|
+
this.target.send("NEG-MSG", id, newMsg);
|
|
75
76
|
}
|
|
76
77
|
else {
|
|
77
78
|
close();
|
|
@@ -80,20 +81,20 @@ export class Executor {
|
|
|
80
81
|
};
|
|
81
82
|
const errListener = (url, negid, msg) => {
|
|
82
83
|
if (negid === id) {
|
|
83
|
-
onError
|
|
84
|
+
onError?.(url, msg);
|
|
84
85
|
}
|
|
85
86
|
};
|
|
86
87
|
const close = () => {
|
|
87
88
|
if (closed)
|
|
88
89
|
return;
|
|
89
|
-
this.target.send(
|
|
90
|
-
this.target.off(
|
|
91
|
-
this.target.off(
|
|
90
|
+
this.target.send("NEG-CLOSE", id).catch(noop);
|
|
91
|
+
this.target.off("NEG-MSG", msgListener);
|
|
92
|
+
this.target.off("NEG-ERR", errListener);
|
|
92
93
|
closed = true;
|
|
93
|
-
onClose
|
|
94
|
+
onClose?.();
|
|
94
95
|
};
|
|
95
|
-
this.target.on(
|
|
96
|
-
this.target.on(
|
|
96
|
+
this.target.on("NEG-MSG", msgListener);
|
|
97
|
+
this.target.on("NEG-ERR", errListener);
|
|
97
98
|
neg.initiate().then((msg) => {
|
|
98
99
|
this.target.send("NEG-OPEN", id, filter, msg);
|
|
99
100
|
});
|
|
@@ -102,4 +103,4 @@ export class Executor {
|
|
|
102
103
|
};
|
|
103
104
|
}
|
|
104
105
|
}
|
|
105
|
-
//# sourceMappingURL=Executor.
|
|
106
|
+
//# sourceMappingURL=Executor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Executor.js","sourceRoot":"","sources":["../../src/Executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Negentropy.js","sourceRoot":"","sources":["../../src/Negentropy.ts"],"names":[],"mappings":"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"}
|
package/build/src/Pool.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Emitter } from
|
|
2
|
-
import { Connection } from "./Connection";
|
|
1
|
+
import { Emitter } from "@welshman/lib";
|
|
2
|
+
import { Connection } from "./Connection.js";
|
|
3
3
|
export declare class Pool extends Emitter {
|
|
4
4
|
data: Map<string, Connection>;
|
|
5
5
|
constructor();
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { Emitter } from
|
|
2
|
-
import { Connection } from "./Connection.
|
|
1
|
+
import { Emitter } from "@welshman/lib";
|
|
2
|
+
import { Connection } from "./Connection.js";
|
|
3
3
|
export class Pool extends Emitter {
|
|
4
|
+
data;
|
|
4
5
|
constructor() {
|
|
5
6
|
super();
|
|
6
7
|
this.data = new Map();
|
|
@@ -15,7 +16,7 @@ export class Pool extends Emitter {
|
|
|
15
16
|
}
|
|
16
17
|
const newConnection = new Connection(url);
|
|
17
18
|
this.data.set(url, newConnection);
|
|
18
|
-
this.emit(
|
|
19
|
+
this.emit("init", newConnection);
|
|
19
20
|
return newConnection;
|
|
20
21
|
}
|
|
21
22
|
remove(url) {
|
|
@@ -31,4 +32,4 @@ export class Pool extends Emitter {
|
|
|
31
32
|
}
|
|
32
33
|
}
|
|
33
34
|
}
|
|
34
|
-
//# sourceMappingURL=Pool.
|
|
35
|
+
//# sourceMappingURL=Pool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Pool.js","sourceRoot":"","sources":["../../src/Pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AACrC,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAE1C,MAAM,OAAO,IAAK,SAAQ,OAAO;IAC/B,IAAI,CAAyB;IAE7B;QACE,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAA;IACvB,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC3B,CAAC;IAED,GAAG,CAAC,GAAW;QACb,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAExC,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAA;QACtB,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA;QAEzC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,CAAC,CAAA;QACjC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;QAEhC,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAErC,IAAI,UAAU,EAAE,CAAC;YACf,UAAU,CAAC,OAAO,EAAE,CAAA;YAEpB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACvB,CAAC;IACH,CAAC;IAED,KAAK;QACH,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YACnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC;IACH,CAAC;CACF"}
|
package/build/src/Publish.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Emitter } from
|
|
2
|
-
import type { Deferred } from
|
|
3
|
-
import type { SignedEvent } from
|
|
1
|
+
import { Emitter } from "@welshman/lib";
|
|
2
|
+
import type { Deferred } from "@welshman/lib";
|
|
3
|
+
import type { SignedEvent } from "@welshman/util";
|
|
4
4
|
export declare enum PublishStatus {
|
|
5
5
|
Pending = "pending",
|
|
6
6
|
Success = "success",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ctx, Emitter, now, randomId, defer } from
|
|
2
|
-
import { asSignedEvent } from
|
|
1
|
+
import { ctx, Emitter, now, randomId, defer } from "@welshman/lib";
|
|
2
|
+
import { asSignedEvent } from "@welshman/util";
|
|
3
3
|
export var PublishStatus;
|
|
4
4
|
(function (PublishStatus) {
|
|
5
5
|
PublishStatus["Pending"] = "pending";
|
|
@@ -17,7 +17,6 @@ export const makePublish = (request) => {
|
|
|
17
17
|
return { id, created_at, request, emitter, result, status };
|
|
18
18
|
};
|
|
19
19
|
export const publish = (request) => {
|
|
20
|
-
var _a;
|
|
21
20
|
const pub = makePublish(request);
|
|
22
21
|
const event = asSignedEvent(request.event);
|
|
23
22
|
const executor = ctx.net.getExecutor(request.relays);
|
|
@@ -46,9 +45,9 @@ export const publish = (request) => {
|
|
|
46
45
|
}
|
|
47
46
|
});
|
|
48
47
|
// Give up after a specified time
|
|
49
|
-
const timeout = setTimeout(() => abort(PublishStatus.Timeout), request.timeout ||
|
|
48
|
+
const timeout = setTimeout(() => abort(PublishStatus.Timeout), request.timeout || 10_000);
|
|
50
49
|
// If we have a signal, use it
|
|
51
|
-
|
|
50
|
+
request.signal?.addEventListener("abort", () => abort(PublishStatus.Aborted));
|
|
52
51
|
// Delegate to our executor
|
|
53
52
|
const executorSub = executor.publish(event, {
|
|
54
53
|
verb: request.verb || "EVENT",
|
|
@@ -66,4 +65,4 @@ export const publish = (request) => {
|
|
|
66
65
|
});
|
|
67
66
|
return pub;
|
|
68
67
|
};
|
|
69
|
-
//# sourceMappingURL=Publish.
|
|
68
|
+
//# sourceMappingURL=Publish.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Publish.js","sourceRoot":"","sources":["../../src/Publish.ts"],"names":[],"mappings":"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"}
|
package/build/src/Socket.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import WebSocket from "isomorphic-ws";
|
|
2
|
-
import { Worker } from
|
|
3
|
-
import type { Connection } from
|
|
2
|
+
import { Worker } from "@welshman/lib";
|
|
3
|
+
import type { Connection } from "./Connection.js";
|
|
4
4
|
export type Message = [string, ...any[]];
|
|
5
5
|
export declare enum SocketStatus {
|
|
6
6
|
New = "new",
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import WebSocket from "isomorphic-ws";
|
|
2
|
+
import { Worker, sleep } from "@welshman/lib";
|
|
3
|
+
import { ConnectionEvent } from "./ConnectionEvent.js";
|
|
4
|
+
export var SocketStatus;
|
|
5
|
+
(function (SocketStatus) {
|
|
6
|
+
SocketStatus["New"] = "new";
|
|
7
|
+
SocketStatus["Open"] = "open";
|
|
8
|
+
SocketStatus["Opening"] = "opening";
|
|
9
|
+
SocketStatus["Closing"] = "closing";
|
|
10
|
+
SocketStatus["Closed"] = "closed";
|
|
11
|
+
SocketStatus["Error"] = "error";
|
|
12
|
+
SocketStatus["Invalid"] = "invalid";
|
|
13
|
+
})(SocketStatus || (SocketStatus = {}));
|
|
14
|
+
export class Socket {
|
|
15
|
+
cxn;
|
|
16
|
+
lastError = 0;
|
|
17
|
+
status = SocketStatus.New;
|
|
18
|
+
worker = new Worker();
|
|
19
|
+
ws;
|
|
20
|
+
constructor(cxn) {
|
|
21
|
+
this.cxn = cxn;
|
|
22
|
+
// Use a worker to throttle incoming data
|
|
23
|
+
this.worker.addGlobalHandler((message) => {
|
|
24
|
+
this.cxn.emit(ConnectionEvent.Receive, message);
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
wait = async () => {
|
|
28
|
+
while ([SocketStatus.Opening, SocketStatus.Closing].includes(this.status)) {
|
|
29
|
+
await sleep(100);
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
open = async () => {
|
|
33
|
+
// If we're in a provisional state, wait
|
|
34
|
+
await this.wait();
|
|
35
|
+
// If the socket is closed, reset
|
|
36
|
+
if (this.status === SocketStatus.Closed) {
|
|
37
|
+
this.status = SocketStatus.New;
|
|
38
|
+
this.cxn.emit(ConnectionEvent.Reset);
|
|
39
|
+
}
|
|
40
|
+
// If we're closed due to an error retry after a delay
|
|
41
|
+
if (this.status === SocketStatus.Error && Date.now() - this.lastError > 15_000) {
|
|
42
|
+
this.status = SocketStatus.New;
|
|
43
|
+
this.cxn.emit(ConnectionEvent.Reset);
|
|
44
|
+
}
|
|
45
|
+
// If the socket is new, connect
|
|
46
|
+
if (this.status === SocketStatus.New) {
|
|
47
|
+
this.#init();
|
|
48
|
+
}
|
|
49
|
+
// Wait until we're connected (or fail to connect)
|
|
50
|
+
await this.wait();
|
|
51
|
+
};
|
|
52
|
+
close = async () => {
|
|
53
|
+
this.worker.pause();
|
|
54
|
+
this.ws?.close();
|
|
55
|
+
this.ws = undefined;
|
|
56
|
+
// Allow the socket to start closing before waiting
|
|
57
|
+
await sleep(100);
|
|
58
|
+
// Wait for the socket to fully close
|
|
59
|
+
await this.wait();
|
|
60
|
+
};
|
|
61
|
+
send = async (message) => {
|
|
62
|
+
await this.open();
|
|
63
|
+
if (!this.ws) {
|
|
64
|
+
throw new Error(`No websocket available when sending to ${this.cxn.url}`);
|
|
65
|
+
}
|
|
66
|
+
this.cxn.emit(ConnectionEvent.Send, message);
|
|
67
|
+
this.ws.send(JSON.stringify(message));
|
|
68
|
+
};
|
|
69
|
+
#init = () => {
|
|
70
|
+
try {
|
|
71
|
+
this.ws = new WebSocket(this.cxn.url);
|
|
72
|
+
this.status = SocketStatus.Opening;
|
|
73
|
+
this.ws.onopen = () => {
|
|
74
|
+
this.status = SocketStatus.Open;
|
|
75
|
+
this.cxn.emit(ConnectionEvent.Open);
|
|
76
|
+
};
|
|
77
|
+
this.ws.onerror = () => {
|
|
78
|
+
this.status = SocketStatus.Error;
|
|
79
|
+
this.lastError = Date.now();
|
|
80
|
+
this.cxn.emit(ConnectionEvent.Error);
|
|
81
|
+
};
|
|
82
|
+
this.ws.onclose = () => {
|
|
83
|
+
if (this.status !== SocketStatus.Error) {
|
|
84
|
+
this.status = SocketStatus.Closed;
|
|
85
|
+
}
|
|
86
|
+
this.cxn.emit(ConnectionEvent.Close);
|
|
87
|
+
};
|
|
88
|
+
this.ws.onmessage = (event) => {
|
|
89
|
+
const data = event.data;
|
|
90
|
+
try {
|
|
91
|
+
const message = JSON.parse(data);
|
|
92
|
+
if (Array.isArray(message)) {
|
|
93
|
+
this.worker.push(message);
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
this.cxn.emit(ConnectionEvent.InvalidMessage, data);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
catch (e) {
|
|
100
|
+
this.cxn.emit(ConnectionEvent.InvalidMessage, data);
|
|
101
|
+
}
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
catch (e) {
|
|
105
|
+
this.status = SocketStatus.Invalid;
|
|
106
|
+
this.cxn.emit(ConnectionEvent.InvalidUrl);
|
|
107
|
+
}
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
//# sourceMappingURL=Socket.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Socket.js","sourceRoot":"","sources":["../../src/Socket.ts"],"names":[],"mappings":"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"}
|
package/build/src/Subscribe.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Emitter } from
|
|
2
|
-
import { TrustedEvent } from
|
|
3
|
-
import type { Filter } from
|
|
4
|
-
import { Tracker } from "./Tracker";
|
|
1
|
+
import { Emitter } from "@welshman/lib";
|
|
2
|
+
import { TrustedEvent } from "@welshman/util";
|
|
3
|
+
import type { Filter } from "@welshman/util";
|
|
4
|
+
import { Tracker } from "./Tracker.js";
|
|
5
5
|
export declare enum SubscriptionEvent {
|
|
6
6
|
Eose = "eose",
|
|
7
7
|
Send = "send",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { ctx, Emitter, max, chunk, randomId, once, groupBy, uniq } from
|
|
2
|
-
import { LOCAL_RELAY_URL, matchFilters, normalizeRelayUrl, unionFilters } from
|
|
3
|
-
import { Tracker } from "./Tracker.
|
|
4
|
-
import { ConnectionEvent } from "./ConnectionEvent.
|
|
1
|
+
import { ctx, Emitter, max, chunk, randomId, once, groupBy, uniq } from "@welshman/lib";
|
|
2
|
+
import { LOCAL_RELAY_URL, matchFilters, normalizeRelayUrl, unionFilters, } from "@welshman/util";
|
|
3
|
+
import { Tracker } from "./Tracker.js";
|
|
4
|
+
import { ConnectionEvent } from "./ConnectionEvent.js";
|
|
5
5
|
// `subscribe` is a super function that handles batching subscriptions by merging
|
|
6
6
|
// them based on parameters (filters and subscribe opts), then splits them by relay.
|
|
7
7
|
// This results in fewer REQs being opened per connection, fewer duplicate events
|
|
@@ -43,8 +43,8 @@ export const calculateSubscriptionGroup = (sub) => {
|
|
|
43
43
|
if (sub.request.authTimeout)
|
|
44
44
|
parts.push(`authTimeout:${sub.request.authTimeout}`);
|
|
45
45
|
if (sub.request.closeOnEose)
|
|
46
|
-
parts.push(
|
|
47
|
-
return parts.join(
|
|
46
|
+
parts.push("closeOnEose");
|
|
47
|
+
return parts.join("|");
|
|
48
48
|
};
|
|
49
49
|
export const mergeSubscriptions = (subs) => {
|
|
50
50
|
const mergedSub = makeSubscription({
|
|
@@ -54,7 +54,7 @@ export const mergeSubscriptions = (subs) => {
|
|
|
54
54
|
authTimeout: max(subs.map(sub => sub.request.authTimeout || 0)),
|
|
55
55
|
closeOnEose: subs.every(sub => sub.request.closeOnEose),
|
|
56
56
|
});
|
|
57
|
-
mergedSub.controller.signal.addEventListener(
|
|
57
|
+
mergedSub.controller.signal.addEventListener("abort", () => {
|
|
58
58
|
for (const sub of subs) {
|
|
59
59
|
sub.close();
|
|
60
60
|
}
|
|
@@ -89,9 +89,7 @@ export const mergeSubscriptions = (subs) => {
|
|
|
89
89
|
return mergedSub;
|
|
90
90
|
};
|
|
91
91
|
export const optimizeSubscriptions = (subs) => {
|
|
92
|
-
return Array.from(groupBy(calculateSubscriptionGroup, subs).values())
|
|
93
|
-
.flatMap(group => {
|
|
94
|
-
var _a;
|
|
92
|
+
return Array.from(groupBy(calculateSubscriptionGroup, subs).values()).flatMap(group => {
|
|
95
93
|
const timeout = max(group.map(sub => sub.request.timeout || 0));
|
|
96
94
|
const authTimeout = max(group.map(sub => sub.request.authTimeout || 0));
|
|
97
95
|
const closeOnEose = group.every(sub => sub.request.closeOnEose);
|
|
@@ -108,7 +106,7 @@ export const optimizeSubscriptions = (subs) => {
|
|
|
108
106
|
relays,
|
|
109
107
|
timeout,
|
|
110
108
|
authTimeout,
|
|
111
|
-
closeOnEose
|
|
109
|
+
closeOnEose,
|
|
112
110
|
});
|
|
113
111
|
for (const { id, controller, request } of group) {
|
|
114
112
|
const onAbort = () => {
|
|
@@ -117,8 +115,8 @@ export const optimizeSubscriptions = (subs) => {
|
|
|
117
115
|
mergedSub.close();
|
|
118
116
|
}
|
|
119
117
|
};
|
|
120
|
-
|
|
121
|
-
controller.signal.addEventListener(
|
|
118
|
+
request.signal?.addEventListener("abort", onAbort);
|
|
119
|
+
controller.signal.addEventListener("abort", onAbort);
|
|
122
120
|
}
|
|
123
121
|
mergedSub.emitter.on(SubscriptionEvent.Event, (url, event) => {
|
|
124
122
|
for (const sub of group) {
|
|
@@ -210,9 +208,9 @@ const _executeSubscription = (sub) => {
|
|
|
210
208
|
const onClose = (connection) => emitter.emit(SubscriptionEvent.Close, connection.url);
|
|
211
209
|
const onComplete = once(() => emitter.emit(SubscriptionEvent.Complete));
|
|
212
210
|
// Listen for abort via caller signal
|
|
213
|
-
signal
|
|
211
|
+
signal?.addEventListener("abort", onComplete);
|
|
214
212
|
// Listen for abort via our own internal signal
|
|
215
|
-
controller.signal.addEventListener(
|
|
213
|
+
controller.signal.addEventListener("abort", onComplete);
|
|
216
214
|
// If we have a timeout, complete the subscription automatically
|
|
217
215
|
if (timeout)
|
|
218
216
|
setTimeout(onComplete, timeout + authTimeout);
|
|
@@ -281,4 +279,4 @@ export const subscribe = ({ onEvent, onEose, onClose, onComplete, ...request })
|
|
|
281
279
|
sub.emitter.on(SubscriptionEvent.Complete, onComplete);
|
|
282
280
|
return sub;
|
|
283
281
|
};
|
|
284
|
-
//# sourceMappingURL=Subscribe.
|
|
282
|
+
//# sourceMappingURL=Subscribe.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Subscribe.js","sourceRoot":"","sources":["../../src/Subscribe.ts"],"names":[],"mappings":"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"}
|
package/build/src/Sync.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { SignedEvent, TrustedEvent, Filter } from
|
|
1
|
+
import type { SignedEvent, TrustedEvent, Filter } from "@welshman/util";
|
|
2
2
|
export type DiffOpts = {
|
|
3
3
|
relays: string[];
|
|
4
4
|
filters: Filter[];
|
|
@@ -33,7 +33,7 @@ export type PullWithoutNegentropyOpts = {
|
|
|
33
33
|
filters: Filter[];
|
|
34
34
|
onEvent?: (event: TrustedEvent) => void;
|
|
35
35
|
};
|
|
36
|
-
export declare const pullWithoutNegentropy: ({ relays, filters, onEvent }: PullWithoutNegentropyOpts) => Promise<TrustedEvent[]>;
|
|
36
|
+
export declare const pullWithoutNegentropy: ({ relays, filters, onEvent, }: PullWithoutNegentropyOpts) => Promise<TrustedEvent[]>;
|
|
37
37
|
export type PushWithoutNegentropyOpts = {
|
|
38
38
|
relays: string[];
|
|
39
39
|
events: SignedEvent[];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ctx, assoc, lt, groupBy, now, pushToMapKey, inc, flatten, chunk } from
|
|
2
|
-
import { subscribe } from "./Subscribe.
|
|
3
|
-
import { publish } from "./Publish.
|
|
1
|
+
import { ctx, assoc, lt, groupBy, now, pushToMapKey, inc, flatten, chunk } from "@welshman/lib";
|
|
2
|
+
import { subscribe } from "./Subscribe.js";
|
|
3
|
+
import { publish } from "./Publish.js";
|
|
4
4
|
export const diff = async ({ relays, filters, events }) => {
|
|
5
5
|
const diffs = flatten(await Promise.all(relays.flatMap(async (relay) => {
|
|
6
6
|
return await Promise.all(filters.map(async (filter) => {
|
|
@@ -10,8 +10,8 @@ export const diff = async ({ relays, filters, events }) => {
|
|
|
10
10
|
await new Promise((resolve, reject) => {
|
|
11
11
|
executor.diff(filter, events, {
|
|
12
12
|
onClose: resolve,
|
|
13
|
-
onError: (
|
|
14
|
-
onMessage: (
|
|
13
|
+
onError: (url, message) => reject(message),
|
|
14
|
+
onMessage: (url, message) => {
|
|
15
15
|
for (const id of message.have) {
|
|
16
16
|
have.add(id);
|
|
17
17
|
}
|
|
@@ -24,8 +24,7 @@ export const diff = async ({ relays, filters, events }) => {
|
|
|
24
24
|
return { relay, have, need };
|
|
25
25
|
}));
|
|
26
26
|
})));
|
|
27
|
-
return Array.from(groupBy(diff => diff.relay, diffs).entries())
|
|
28
|
-
.map(([relay, diffs]) => {
|
|
27
|
+
return Array.from(groupBy(diff => diff.relay, diffs).entries()).map(([relay, diffs]) => {
|
|
29
28
|
const have = new Set();
|
|
30
29
|
const need = new Set();
|
|
31
30
|
for (const diff of diffs) {
|
|
@@ -64,7 +63,7 @@ export const pull = async ({ relays, filters, events, onEvent }) => {
|
|
|
64
63
|
onClose: resolve,
|
|
65
64
|
onEvent: event => {
|
|
66
65
|
result.push(event);
|
|
67
|
-
onEvent
|
|
66
|
+
onEvent?.(event);
|
|
68
67
|
},
|
|
69
68
|
});
|
|
70
69
|
});
|
|
@@ -90,7 +89,7 @@ export const sync = async (opts) => {
|
|
|
90
89
|
await pull(opts);
|
|
91
90
|
await push(opts);
|
|
92
91
|
};
|
|
93
|
-
export const pullWithoutNegentropy = async ({ relays, filters, onEvent }) => {
|
|
92
|
+
export const pullWithoutNegentropy = async ({ relays, filters, onEvent, }) => {
|
|
94
93
|
let done = false;
|
|
95
94
|
let until = now() + 30;
|
|
96
95
|
const result = [];
|
|
@@ -99,7 +98,7 @@ export const pullWithoutNegentropy = async ({ relays, filters, onEvent }) => {
|
|
|
99
98
|
await new Promise(resolve => {
|
|
100
99
|
subscribe({
|
|
101
100
|
relays,
|
|
102
|
-
filters: filters.filter(f => lt(f.since, until)).map(assoc(
|
|
101
|
+
filters: filters.filter(f => lt(f.since, until)).map(assoc("until", until)),
|
|
103
102
|
closeOnEose: true,
|
|
104
103
|
onComplete: () => {
|
|
105
104
|
done = !anyResults;
|
|
@@ -109,7 +108,7 @@ export const pullWithoutNegentropy = async ({ relays, filters, onEvent }) => {
|
|
|
109
108
|
anyResults = true;
|
|
110
109
|
until = Math.min(until, event.created_at - 1);
|
|
111
110
|
result.push(event);
|
|
112
|
-
onEvent
|
|
111
|
+
onEvent?.(event);
|
|
113
112
|
},
|
|
114
113
|
});
|
|
115
114
|
});
|
|
@@ -123,4 +122,4 @@ export const syncWithoutNegentropy = async (opts) => {
|
|
|
123
122
|
await pullWithoutNegentropy(opts);
|
|
124
123
|
await pushWithoutNegentropy(opts);
|
|
125
124
|
};
|
|
126
|
-
//# sourceMappingURL=Sync.
|
|
125
|
+
//# sourceMappingURL=Sync.js.map
|