@welshman/net 0.0.18 → 0.0.19
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.cjs +15 -0
- package/build/src/Connection.cjs.map +1 -1
- package/build/src/Connection.d.ts +3 -0
- package/build/src/Connection.mjs +16 -1
- package/build/src/Connection.mjs.map +1 -1
- package/build/src/ConnectionMeta.cjs +1 -1
- package/build/src/ConnectionMeta.cjs.map +1 -1
- package/build/src/ConnectionMeta.d.ts +2 -2
- package/build/src/ConnectionMeta.mjs +1 -1
- package/build/src/ConnectionMeta.mjs.map +1 -1
- package/build/src/Context.cjs.map +1 -1
- package/build/src/Context.d.ts +5 -6
- package/build/src/Context.mjs.map +1 -1
- package/build/src/Executor.cjs.map +1 -1
- package/build/src/Executor.d.ts +3 -3
- package/build/src/Executor.mjs.map +1 -1
- package/build/src/Publish.cjs.map +1 -1
- package/build/src/Publish.d.ts +2 -2
- package/build/src/Publish.mjs.map +1 -1
- package/build/src/Subscribe.cjs +30 -10
- package/build/src/Subscribe.cjs.map +1 -1
- package/build/src/Subscribe.d.ts +3 -2
- package/build/src/Subscribe.mjs +31 -11
- package/build/src/Subscribe.mjs.map +1 -1
- package/build/src/target/Local.cjs.map +1 -1
- package/build/src/target/Local.d.ts +3 -4
- package/build/src/target/Local.mjs.map +1 -1
- package/package.json +3 -3
package/build/src/Connection.cjs
CHANGED
|
@@ -71,6 +71,21 @@ class Connection extends lib_1.Emitter {
|
|
|
71
71
|
await this.socket.connect();
|
|
72
72
|
}
|
|
73
73
|
};
|
|
74
|
+
this.ensureAuth = async ({ timeout = 3000 }) => {
|
|
75
|
+
await this.ensureConnected({ shouldReconnect: true });
|
|
76
|
+
if (this.meta.authStatus === ConnectionMeta_1.AuthStatus.Pending) {
|
|
77
|
+
await Promise.race([
|
|
78
|
+
(0, lib_1.sleep)(timeout),
|
|
79
|
+
new Promise(resolve => {
|
|
80
|
+
this.on('receive', (cxn, message) => {
|
|
81
|
+
if (message[0] === 'OK' && message[2]) {
|
|
82
|
+
resolve();
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
})
|
|
86
|
+
]);
|
|
87
|
+
}
|
|
88
|
+
};
|
|
74
89
|
this.url = url;
|
|
75
90
|
this.socket = new Socket_1.Socket(url, this);
|
|
76
91
|
this.sender = this.createSender();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Connection.cjs","sourceRoot":"","sources":["../../src/Connection.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"Connection.cjs","sourceRoot":"","sources":["../../src/Connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,9 @@ export declare class Connection extends Emitter {
|
|
|
21
21
|
ensureConnected: ({ shouldReconnect }: {
|
|
22
22
|
shouldReconnect?: boolean | undefined;
|
|
23
23
|
}) => Promise<void>;
|
|
24
|
+
ensureAuth: ({ timeout }: {
|
|
25
|
+
timeout?: number | undefined;
|
|
26
|
+
}) => Promise<void>;
|
|
24
27
|
disconnect(): void;
|
|
25
28
|
destroy(): void;
|
|
26
29
|
}
|
package/build/src/Connection.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Emitter, Worker } from '@welshman/lib';
|
|
1
|
+
import { Emitter, Worker, sleep } from '@welshman/lib';
|
|
2
2
|
import { AuthStatus, ConnectionMeta } from "./ConnectionMeta.mjs";
|
|
3
3
|
import { Socket, isMessage, asMessage } from "./Socket.mjs";
|
|
4
4
|
export class Connection extends Emitter {
|
|
@@ -68,6 +68,21 @@ export class Connection extends Emitter {
|
|
|
68
68
|
await this.socket.connect();
|
|
69
69
|
}
|
|
70
70
|
};
|
|
71
|
+
this.ensureAuth = async ({ timeout = 3000 }) => {
|
|
72
|
+
await this.ensureConnected({ shouldReconnect: true });
|
|
73
|
+
if (this.meta.authStatus === AuthStatus.Pending) {
|
|
74
|
+
await Promise.race([
|
|
75
|
+
sleep(timeout),
|
|
76
|
+
new Promise(resolve => {
|
|
77
|
+
this.on('receive', (cxn, message) => {
|
|
78
|
+
if (message[0] === 'OK' && message[2]) {
|
|
79
|
+
resolve();
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
})
|
|
83
|
+
]);
|
|
84
|
+
}
|
|
85
|
+
};
|
|
71
86
|
this.url = url;
|
|
72
87
|
this.socket = new Socket(url, this);
|
|
73
88
|
this.sender = this.createSender();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Connection.mjs","sourceRoot":"","sources":["../../src/Connection.ts"],"names":[],"mappings":"OAAO,EAAC,OAAO,EAAE,MAAM,EAAC,MAAM,eAAe;
|
|
1
|
+
{"version":3,"file":"Connection.mjs","sourceRoot":"","sources":["../../src/Connection.ts"],"names":[],"mappings":"OAAO,EAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAC,MAAM,eAAe;OAC7C,EAAC,UAAU,EAAE,cAAc,EAAC;OAC5B,EAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAC;AAGrC,MAAM,OAAO,UAAW,SAAQ,OAAO;IAOrC,YAAY,GAAW;QACrB,KAAK,EAAE,CAAA;QAUT,iBAAY,GAAG,GAAG,EAAE;YAClB,MAAM,MAAM,GAAG,IAAI,MAAM,CAAgB;gBACvC,WAAW,EAAE,CAAC,OAAsB,EAAE,EAAE;oBACtC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE;wBACzB,OAAO,IAAI,CAAA;qBACZ;oBAED,MAAM,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;oBAE3C,IAAI,IAAI,KAAK,MAAM,EAAE;wBACnB,OAAO,KAAK,CAAA;qBACb;oBAED,sCAAsC;oBACtC,IAAI,IAAI,KAAK,OAAO,EAAE;wBACpB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;qBAChD;oBAED,+BAA+B;oBAC/B,IAAI,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,EAAE;wBAC/C,OAAO,KAAK,CAAA;qBACb;oBAED,gDAAgD;oBAChD,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;wBAC7F,OAAO,IAAI,CAAA;qBACZ;oBAED,IAAI,IAAI,KAAK,KAAK,EAAE;wBAClB,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,CAAA;qBAC3C;oBAED,OAAO,KAAK,CAAA;gBACd,CAAC;aACF,CAAC,CAAA;YAEF,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAsB,EAAE,EAAE;gBACjD,gFAAgF;gBAChF,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE;oBAC1B,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBACpF;gBAED,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACtB,CAAC,CAAC,CAAA;YAEF,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;QAED,mBAAc,GAAG,GAAG,EAAE;YACpB,MAAM,MAAM,GAAG,IAAI,MAAM,EAAiB,CAAA;YAE1C,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAEvC,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;QAED,SAAI,GAAG,CAAC,CAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAEhD,WAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAEtC,YAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QAExC,YAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QAExC,cAAS,GAAG,CAAC,CAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAEvD,WAAM,GAAG,CAAC,OAAsB,EAAE,EAAE;YAClC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;YAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC3B,CAAC,CAAA;QAED,cAAS,GAAG,CAAC,OAAsB,EAAE,EAAE;YACrC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;QACrC,CAAC,CAAA;QAED,oBAAe,GAAG,KAAK,EAAE,EAAC,eAAe,GAAG,IAAI,EAAC,EAAE,EAAE;YACnD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAA;YACrE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAM,CAAA;YAE/D,IAAI,eAAe,IAAI,WAAW,IAAI,aAAa,EAAE;gBACnD,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;aACxB;YAED,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE;gBACvB,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;aAC5B;QACH,CAAC,CAAA;QAED,eAAU,GAAG,KAAK,EAAE,EAAC,OAAO,GAAG,IAAI,EAAC,EAAE,EAAE;YACtC,MAAM,IAAI,CAAC,eAAe,CAAC,EAAC,eAAe,EAAE,IAAI,EAAC,CAAC,CAAA;YAEnD,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,OAAO,EAAE;gBAC/C,MAAM,OAAO,CAAC,IAAI,CAAC;oBACjB,KAAK,CAAC,OAAO,CAAC;oBACd,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;wBAC1B,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAe,EAAE,OAAgB,EAAE,EAAE;4BACvD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;gCACtC,OAAO,EAAE,CAAA;6BACT;wBACH,CAAC,CAAC,CAAA;oBACJ,CAAC,CAAC;iBACH,CAAC,CAAA;aACH;QACH,CAAC,CAAA;QA/GC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACnC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAA;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QACrC,IAAI,CAAC,IAAI,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,CAAA;QACpC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAA;IAC3B,CAAC;IA2GD,UAAU;QACR,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAA;QACxB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;QACnB,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;QACrB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAA;IAC1B,CAAC;IAED,OAAO;QACL,IAAI,CAAC,UAAU,EAAE,CAAA;QACjB,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IACtB,CAAC;CACF"}
|
|
@@ -120,7 +120,7 @@ class ConnectionMeta {
|
|
|
120
120
|
this.authStatus = AuthStatus.Ok;
|
|
121
121
|
}
|
|
122
122
|
else if (notice === null || notice === void 0 ? void 0 : notice.startsWith('auth-required:')) {
|
|
123
|
-
// Re-enqueue pending
|
|
123
|
+
// Re-enqueue pending events when auth challenge is received
|
|
124
124
|
const pub = this.pendingPublishes.get(eventId);
|
|
125
125
|
if (pub) {
|
|
126
126
|
this.cxn.send(['EVENT', pub.event]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectionMeta.cjs","sourceRoot":"","sources":["../../src/ConnectionMeta.ts"],"names":[],"mappings":";;;AAeA,IAAY,UAKX;AALD,WAAY,UAAU;IACpB,uBAAS,CAAA;IACT,iCAAmB,CAAA;IACnB,2CAA6B,CAAA;IAC7B,qCAAuB,CAAA;AACzB,CAAC,EALW,UAAU,0BAAV,UAAU,QAKrB;AAED,IAAY,gBAOX;AAPD,WAAY,gBAAgB;IAC1B,iDAA6B,CAAA;IAC7B,2CAAuB,CAAA;IACvB,mCAAe,CAAA;IACf,qCAAiB,CAAA;IACjB,iCAAa,CAAA;IACb,6BAAS,CAAA;AACX,CAAC,EAPW,gBAAgB,gCAAhB,gBAAgB,QAO3B;AAED,MAAa,cAAc;IAgBzB,YAAqB,GAAe;QAAf,QAAG,GAAH,GAAG,CAAY;QAfpC,eAAU,GAAG,UAAU,CAAC,OAAO,CAAA;QAC/B,qBAAgB,GAAG,IAAI,GAAG,EAAuB,CAAA;QACjD,oBAAe,GAAG,IAAI,GAAG,EAAuB,CAAA;QAChD,iBAAY,GAAG,CAAC,CAAA;QAChB,iBAAY,GAAG,CAAC,CAAA;QAChB,eAAU,GAAG,CAAC,CAAA;QACd,aAAQ,GAAG,CAAC,CAAA;QACZ,cAAS,GAAG,CAAC,CAAA;QACb,cAAS,GAAG,CAAC,CAAA;QACb,gBAAW,GAAG,CAAC,CAAA;QACf,gBAAW,GAAG,CAAC,CAAA;QACf,cAAS,GAAG,CAAC,CAAA;QACb,kBAAa,GAAG,CAAC,CAAA;QACjB,kBAAa,GAAG,CAAC,CAAA;QA4GjB,iBAAY,GAAG,GAAG,EAAE;YAClB,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAA;YAC7B,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;QAC9B,CAAC,CAAA;QAED,aAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;QAEjF,cAAS,GAAG,GAAG,EAAE;YACf,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAA;YAE9B,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,YAAY;gBAAO,OAAO,gBAAgB,CAAC,YAAY,CAAA;YAC1F,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,SAAS;gBAAU,OAAO,gBAAgB,CAAC,SAAS,CAAA;YACvF,IAAI,MAAM,CAAC,KAAK,EAAE;gBAAoC,OAAO,gBAAgB,CAAC,MAAM,CAAA;YACpF,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ;gBAAE,OAAO,gBAAgB,CAAC,KAAK,CAAA;YACnF,IAAI,MAAM,CAAC,QAAQ,EAAE,IAAI,MAAM,CAAC,SAAS,EAAE;gBAAW,OAAO,gBAAgB,CAAC,MAAM,CAAA;YACpF,IAAI,IAAI,CAAC,QAAQ,EAAE,GAAG,IAAI;gBAA4B,OAAO,gBAAgB,CAAC,IAAI,CAAA;YAElF,OAAO,gBAAgB,CAAC,EAAE,CAAA;QAC5B,CAAC,CAAA;QAED,mBAAc,GAAG,GAAG,EAAE;YACpB,QAAQ,IAAI,CAAC,SAAS,EAAE,EAAE;gBACxB,KAAK,gBAAgB,CAAC,YAAY,CAAC,CAAC,OAAO,YAAY,CAAA;gBACvD,KAAK,gBAAgB,CAAC,SAAS,CAAC,CAAI,OAAO,kBAAkB,CAAA;gBAC7D,KAAK,gBAAgB,CAAC,KAAK,CAAC,CAAQ,OAAO,mBAAmB,CAAA;gBAC9D,KAAK,gBAAgB,CAAC,MAAM,CAAC,CAAO,OAAO,sBAAsB,CAAA;gBACjE,KAAK,gBAAgB,CAAC,IAAI,CAAC,CAAS,OAAO,iBAAiB,CAAA;gBAC5D,KAAK,gBAAgB,CAAC,EAAE,CAAC,CAAW,OAAO,WAAW,CAAA;aACvD;QACH,CAAC,CAAA;QAtIC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC5B,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,GAAe,EAAE,OAAgB,EAAE,EAAE;YACnD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,KAAK;gBAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YACrD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO;gBAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;YACrD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO;gBAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QACvD,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAe,EAAE,OAAgB,EAAE,EAAE;YACtD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI;gBAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;YAClD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM;gBAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YACtD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO;gBAAE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;YACxD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM;gBAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YACtD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ;gBAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;YAC1D,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ;gBAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QAC5D,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,aAAa,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAU;QAC9C,IAAI,CAAC,YAAY,EAAE,CAAA;QACnB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE;YAC9B,OAAO;YACP,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC,CAAA;IACJ,CAAC;IAED,WAAW,CAAC,CAAC,IAAI,EAAE,KAAK,CAAU;QAChC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,WAAW,CAAC,CAAC,IAAI,EAAE,KAAK,CAAU;QAChC,IAAI,CAAC,YAAY,EAAE,CAAA;QACnB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,EAAC,CAAC,CAAA;IAChE,CAAC;IAED,WAAW,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,CAAU;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAElD,IAAI,EAAE,EAAE;YACN,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,EAAE,CAAA;SAChC;aAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,CAAC,gBAAgB,CAAC,EAAE;YAC/C,
|
|
1
|
+
{"version":3,"file":"ConnectionMeta.cjs","sourceRoot":"","sources":["../../src/ConnectionMeta.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { SignedEvent, Filter } from '@welshman/util';
|
|
2
2
|
import type { Message } from './Socket';
|
|
3
3
|
import type { Connection } from './Connection';
|
|
4
4
|
export type PublishMeta = {
|
|
5
5
|
sent: number;
|
|
6
|
-
event:
|
|
6
|
+
event: SignedEvent;
|
|
7
7
|
};
|
|
8
8
|
export type RequestMeta = {
|
|
9
9
|
sent: number;
|
|
@@ -117,7 +117,7 @@ export class ConnectionMeta {
|
|
|
117
117
|
this.authStatus = AuthStatus.Ok;
|
|
118
118
|
}
|
|
119
119
|
else if (notice === null || notice === void 0 ? void 0 : notice.startsWith('auth-required:')) {
|
|
120
|
-
// Re-enqueue pending
|
|
120
|
+
// Re-enqueue pending events when auth challenge is received
|
|
121
121
|
const pub = this.pendingPublishes.get(eventId);
|
|
122
122
|
if (pub) {
|
|
123
123
|
this.cxn.send(['EVENT', pub.event]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectionMeta.mjs","sourceRoot":"","sources":["../../src/ConnectionMeta.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ConnectionMeta.mjs","sourceRoot":"","sources":["../../src/ConnectionMeta.ts"],"names":[],"mappings":"AAeA,MAAM,CAAN,IAAY,UAKX;AALD,WAAY,UAAU;IACpB,uBAAS,CAAA;IACT,iCAAmB,CAAA;IACnB,2CAA6B,CAAA;IAC7B,qCAAuB,CAAA;AACzB,CAAC,EALW,UAAU,KAAV,UAAU,QAKrB;AAED,MAAM,CAAN,IAAY,gBAOX;AAPD,WAAY,gBAAgB;IAC1B,iDAA6B,CAAA;IAC7B,2CAAuB,CAAA;IACvB,mCAAe,CAAA;IACf,qCAAiB,CAAA;IACjB,iCAAa,CAAA;IACb,6BAAS,CAAA;AACX,CAAC,EAPW,gBAAgB,KAAhB,gBAAgB,QAO3B;AAED,MAAM,OAAO,cAAc;IAgBzB,YAAqB,GAAe;QAAf,QAAG,GAAH,GAAG,CAAY;QAfpC,eAAU,GAAG,UAAU,CAAC,OAAO,CAAA;QAC/B,qBAAgB,GAAG,IAAI,GAAG,EAAuB,CAAA;QACjD,oBAAe,GAAG,IAAI,GAAG,EAAuB,CAAA;QAChD,iBAAY,GAAG,CAAC,CAAA;QAChB,iBAAY,GAAG,CAAC,CAAA;QAChB,eAAU,GAAG,CAAC,CAAA;QACd,aAAQ,GAAG,CAAC,CAAA;QACZ,cAAS,GAAG,CAAC,CAAA;QACb,cAAS,GAAG,CAAC,CAAA;QACb,gBAAW,GAAG,CAAC,CAAA;QACf,gBAAW,GAAG,CAAC,CAAA;QACf,cAAS,GAAG,CAAC,CAAA;QACb,kBAAa,GAAG,CAAC,CAAA;QACjB,kBAAa,GAAG,CAAC,CAAA;QA4GjB,iBAAY,GAAG,GAAG,EAAE;YAClB,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAA;YAC7B,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;QAC9B,CAAC,CAAA;QAED,aAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;QAEjF,cAAS,GAAG,GAAG,EAAE;YACf,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAA;YAE9B,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,YAAY;gBAAO,OAAO,gBAAgB,CAAC,YAAY,CAAA;YAC1F,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,SAAS;gBAAU,OAAO,gBAAgB,CAAC,SAAS,CAAA;YACvF,IAAI,MAAM,CAAC,KAAK,EAAE;gBAAoC,OAAO,gBAAgB,CAAC,MAAM,CAAA;YACpF,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ;gBAAE,OAAO,gBAAgB,CAAC,KAAK,CAAA;YACnF,IAAI,MAAM,CAAC,QAAQ,EAAE,IAAI,MAAM,CAAC,SAAS,EAAE;gBAAW,OAAO,gBAAgB,CAAC,MAAM,CAAA;YACpF,IAAI,IAAI,CAAC,QAAQ,EAAE,GAAG,IAAI;gBAA4B,OAAO,gBAAgB,CAAC,IAAI,CAAA;YAElF,OAAO,gBAAgB,CAAC,EAAE,CAAA;QAC5B,CAAC,CAAA;QAED,mBAAc,GAAG,GAAG,EAAE;YACpB,QAAQ,IAAI,CAAC,SAAS,EAAE,EAAE;gBACxB,KAAK,gBAAgB,CAAC,YAAY,CAAC,CAAC,OAAO,YAAY,CAAA;gBACvD,KAAK,gBAAgB,CAAC,SAAS,CAAC,CAAI,OAAO,kBAAkB,CAAA;gBAC7D,KAAK,gBAAgB,CAAC,KAAK,CAAC,CAAQ,OAAO,mBAAmB,CAAA;gBAC9D,KAAK,gBAAgB,CAAC,MAAM,CAAC,CAAO,OAAO,sBAAsB,CAAA;gBACjE,KAAK,gBAAgB,CAAC,IAAI,CAAC,CAAS,OAAO,iBAAiB,CAAA;gBAC5D,KAAK,gBAAgB,CAAC,EAAE,CAAC,CAAW,OAAO,WAAW,CAAA;aACvD;QACH,CAAC,CAAA;QAtIC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC5B,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,GAAe,EAAE,OAAgB,EAAE,EAAE;YACnD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,KAAK;gBAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YACrD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO;gBAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;YACrD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO;gBAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QACvD,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAe,EAAE,OAAgB,EAAE,EAAE;YACtD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI;gBAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;YAClD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM;gBAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YACtD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO;gBAAE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;YACxD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM;gBAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YACtD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ;gBAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;YAC1D,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ;gBAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QAC5D,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,aAAa,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAU;QAC9C,IAAI,CAAC,YAAY,EAAE,CAAA;QACnB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE;YAC9B,OAAO;YACP,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC,CAAA;IACJ,CAAC;IAED,WAAW,CAAC,CAAC,IAAI,EAAE,KAAK,CAAU;QAChC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,WAAW,CAAC,CAAC,IAAI,EAAE,KAAK,CAAU;QAChC,IAAI,CAAC,YAAY,EAAE,CAAA;QACnB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,EAAC,CAAC,CAAA;IAChE,CAAC;IAED,WAAW,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,CAAU;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAElD,IAAI,EAAE,EAAE;YACN,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,EAAE,CAAA;SAChC;aAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,CAAC,gBAAgB,CAAC,EAAE;YAC/C,4DAA4D;YAC5D,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAE9C,IAAI,GAAG,EAAE;gBACP,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;aACpC;SACF;QAED,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,aAAa,EAAE,CAAA;YACpB,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;YAC/C,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;SACtC;IACH,CAAC;IAED,aAAa,CAAC,CAAC,IAAI,EAAE,OAAO,CAAU;QACpC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAA;IAC3C,CAAC;IAED,cAAc,CAAC,CAAC,IAAI,EAAE,KAAK,CAAU;QACnC,IAAI,CAAC,UAAU,EAAE,CAAA;QACjB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAC7B,CAAC;IAED,aAAa,CAAC,CAAC,IAAI,EAAE,KAAK,CAAU;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAE/C,4BAA4B;QAC5B,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YACpC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAA;YAE3B,IAAI,CAAC,aAAa,EAAE,CAAA;YACpB,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;SAChD;IACH,CAAC;IAED,eAAe,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,CAAU;QACzC,IAAI,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;YACvC,0DAA0D;YAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YAExC,IAAI,GAAG,EAAE;gBACP,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;aAC3C;SACF;IACH,CAAC;IAED,eAAe,CAAC,CAAC,IAAI,EAAE,MAAM,CAAU;QACrC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAC9C,CAAC;CAgCF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Context.cjs","sourceRoot":"","sources":["../../src/Context.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"Context.cjs","sourceRoot":"","sources":["../../src/Context.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAE9D,qCAA2B;AAC3B,6CAAmC;AACnC,gDAAsC;AAEzB,QAAA,WAAW,GAAG,IAAI,WAAI,EAAE,CAAA;AAE9B,MAAM,kBAAkB,GAAG,CAAC,MAAgB,EAAE,EAAE,CACrD,IAAI,mBAAQ,CAAC,IAAI,eAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,sBAAc,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AAD5E,QAAA,kBAAkB,sBAC0D;AAEzF,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,KAAkB,EAAE,EAAE,CAAC,IAAI,CAAA;AAEhE,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,SAAiB,EAAE,EAAE,CAAC,IAAI,CAAA;AAE9D,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAU,EAAE,EAAW,EAAE,OAAe,EAAE,EAAE,CAAC,IAAI,CAAA;AAEnF,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,KAAkB,EAAE,EAAE,CAAC,KAAK,CAAA;AAEnE,MAAM,wBAAwB,GAAG,CAAC,GAAW,EAAE,KAAkB,EAAE,EAAE,CAAC,IAAA,wBAAiB,EAAC,KAAK,CAAC,CAAA;AAE9F,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAE,OAAiB,EAAE,KAAkB,EAAE,EAAE,CAAC,IAAA,mBAAY,EAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AAEnG,QAAA,cAAc,GAAG;IAC5B,IAAI,EAAE,mBAAW;IACjB,WAAW,EAAE,0BAAkB;IAC/B,OAAO,EAAE,cAAc;IACvB,MAAM,EAAE,aAAa;IACrB,IAAI,EAAE,WAAW;IACjB,SAAS,EAAE,gBAAgB;IAC3B,iBAAiB,EAAE,wBAAwB;IAC3C,YAAY,EAAE,mBAAmB;CAClC,CAAA"}
|
package/build/src/Context.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type { Filter } from '@welshman/util';
|
|
1
|
+
import type { Filter, SignedEvent } from '@welshman/util';
|
|
3
2
|
import { Pool } from "./Pool";
|
|
4
3
|
import { Executor } from "./Executor";
|
|
5
4
|
export declare const defaultPool: Pool;
|
|
@@ -7,10 +6,10 @@ export declare const defaultGetExecutor: (relays: string[]) => Executor;
|
|
|
7
6
|
export declare const NetworkContext: {
|
|
8
7
|
pool: Pool;
|
|
9
8
|
getExecutor: (relays: string[]) => Executor;
|
|
10
|
-
onEvent: (url: string, event:
|
|
9
|
+
onEvent: (url: string, event: SignedEvent) => null;
|
|
11
10
|
onAuth: (url: string, challenge: string) => null;
|
|
12
11
|
onOk: (url: string, id: string, ok: boolean, message: string) => null;
|
|
13
|
-
isDeleted: (url: string, event:
|
|
14
|
-
hasValidSignature: (url: string, event:
|
|
15
|
-
matchFilters: (url: string, filters: Filter[], event:
|
|
12
|
+
isDeleted: (url: string, event: SignedEvent) => boolean;
|
|
13
|
+
hasValidSignature: (url: string, event: SignedEvent) => boolean;
|
|
14
|
+
matchFilters: (url: string, filters: Filter[], event: SignedEvent) => boolean;
|
|
16
15
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Context.mjs","sourceRoot":"","sources":["../../src/Context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Context.mjs","sourceRoot":"","sources":["../../src/Context.ts"],"names":[],"mappings":"OAAO,EAAC,YAAY,EAAE,iBAAiB,EAAC,MAAM,gBAAgB;OAEvD,EAAC,IAAI,EAAC;OACN,EAAC,QAAQ,EAAC;OACV,EAAC,MAAM,EAAC;AAEf,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAA;AAErC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,MAAgB,EAAE,EAAE,CACrD,IAAI,QAAQ,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AAEzF,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,KAAkB,EAAE,EAAE,CAAC,IAAI,CAAA;AAEhE,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,SAAiB,EAAE,EAAE,CAAC,IAAI,CAAA;AAE9D,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAU,EAAE,EAAW,EAAE,OAAe,EAAE,EAAE,CAAC,IAAI,CAAA;AAEnF,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,KAAkB,EAAE,EAAE,CAAC,KAAK,CAAA;AAEnE,MAAM,wBAAwB,GAAG,CAAC,GAAW,EAAE,KAAkB,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;AAE9F,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAE,OAAiB,EAAE,KAAkB,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AAEhH,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,kBAAkB;IAC/B,OAAO,EAAE,cAAc;IACvB,MAAM,EAAE,aAAa;IACrB,IAAI,EAAE,WAAW;IACjB,SAAS,EAAE,gBAAgB;IAC3B,iBAAiB,EAAE,wBAAwB;IAC3C,YAAY,EAAE,mBAAmB;CAClC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Executor.cjs","sourceRoot":"","sources":["../../src/Executor.ts"],"names":[],"mappings":";;;AAIA,2CAAwC;AAexC,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEjG,MAAa,QAAQ;IAEnB,YAAqB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QACjC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,wBAAc,CAAC,MAAM,CAAC,CAAA;QACxC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,wBAAc,CAAC,IAAI,CAAC,CAAA;IACtC,CAAC;IAED,SAAS,CAAC,OAAiB,EAAE,EAAC,OAAO,EAAE,MAAM,KAAmB,EAAE;QAChE,IAAI,MAAM,GAAG,KAAK,CAAA;QAElB,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;QAE7B,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,KAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"Executor.cjs","sourceRoot":"","sources":["../../src/Executor.ts"],"names":[],"mappings":"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"}
|
package/build/src/Executor.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { Event, Filter } from 'nostr-tools';
|
|
2
1
|
import type { Emitter } from '@welshman/lib';
|
|
2
|
+
import type { SignedEvent, Filter } from '@welshman/util';
|
|
3
3
|
import type { Message } from './Socket';
|
|
4
4
|
import type { Connection } from './Connection';
|
|
5
5
|
export type Target = Emitter & {
|
|
@@ -7,7 +7,7 @@ export type Target = Emitter & {
|
|
|
7
7
|
send: (...args: Message) => void;
|
|
8
8
|
cleanup: () => void;
|
|
9
9
|
};
|
|
10
|
-
type EventCallback = (url: string, event:
|
|
10
|
+
type EventCallback = (url: string, event: SignedEvent) => void;
|
|
11
11
|
type EoseCallback = (url: string) => void;
|
|
12
12
|
type OkCallback = (url: string, id: string, ...extra: any[]) => void;
|
|
13
13
|
type ErrorCallback = (url: string, id: string, ...extra: any[]) => void;
|
|
@@ -26,7 +26,7 @@ export declare class Executor {
|
|
|
26
26
|
subscribe(filters: Filter[], { onEvent, onEose }?: SubscribeOpts): {
|
|
27
27
|
unsubscribe: () => void;
|
|
28
28
|
};
|
|
29
|
-
publish(event:
|
|
29
|
+
publish(event: SignedEvent, { verb, onOk, onError }?: PublishOpts): {
|
|
30
30
|
unsubscribe: () => void;
|
|
31
31
|
};
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Executor.mjs","sourceRoot":"","sources":["../../src/Executor.ts"],"names":[],"mappings":"OAIO,EAAC,cAAc,EAAC;AAevB,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEjG,MAAM,OAAO,QAAQ;IAEnB,YAAqB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QACjC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;QACxC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,CAAA;IACtC,CAAC;IAED,SAAS,CAAC,OAAiB,EAAE,EAAC,OAAO,EAAE,MAAM,KAAmB,EAAE;QAChE,IAAI,MAAM,GAAG,KAAK,CAAA;QAElB,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;QAE7B,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,KAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"Executor.mjs","sourceRoot":"","sources":["../../src/Executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Publish.cjs","sourceRoot":"","sources":["../../src/Publish.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"Publish.cjs","sourceRoot":"","sources":["../../src/Publish.ts"],"names":[],"mappings":"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"}
|
package/build/src/Publish.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { Event } from 'nostr-tools';
|
|
2
1
|
import { Emitter } from '@welshman/lib';
|
|
3
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",
|
|
@@ -10,7 +10,7 @@ export declare enum PublishStatus {
|
|
|
10
10
|
}
|
|
11
11
|
export type PublishStatusMap = Map<string, PublishStatus>;
|
|
12
12
|
export type PublishRequest = {
|
|
13
|
-
event:
|
|
13
|
+
event: SignedEvent;
|
|
14
14
|
relays: string[];
|
|
15
15
|
signal?: AbortSignal;
|
|
16
16
|
timeout?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Publish.mjs","sourceRoot":"","sources":["../../src/Publish.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Publish.mjs","sourceRoot":"","sources":["../../src/Publish.ts"],"names":[],"mappings":"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"}
|
package/build/src/Subscribe.cjs
CHANGED
|
@@ -61,6 +61,7 @@ const mergeSubscriptions = (subs) => {
|
|
|
61
61
|
relays: [relay],
|
|
62
62
|
timeout: callerSubs[0].request.timeout,
|
|
63
63
|
closeOnEose: callerSubs[0].request.closeOnEose,
|
|
64
|
+
authTimeout: (0, lib_1.max)(callerSubs.map(r => r.request.authTimeout).filter(lib_1.identity)),
|
|
64
65
|
filters: (0, util_1.unionFilters)(callerSubs.flatMap((sub) => sub.request.filters)),
|
|
65
66
|
});
|
|
66
67
|
for (const { id, controller, request } of callerSubs) {
|
|
@@ -128,7 +129,7 @@ const mergeSubscriptions = (subs) => {
|
|
|
128
129
|
exports.mergeSubscriptions = mergeSubscriptions;
|
|
129
130
|
const executeSubscription = (sub) => {
|
|
130
131
|
const { request, emitter, tracker, controller } = sub;
|
|
131
|
-
const { timeout, filters, closeOnEose, relays, signal } = request;
|
|
132
|
+
const { timeout, filters, closeOnEose, relays, signal, authTimeout = 0 } = request;
|
|
132
133
|
const executor = Context_1.NetworkContext.getExecutor(relays);
|
|
133
134
|
const subs = [];
|
|
134
135
|
const completedRelays = new Set();
|
|
@@ -182,17 +183,23 @@ const executeSubscription = (sub) => {
|
|
|
182
183
|
controller.signal.addEventListener('abort', onComplete);
|
|
183
184
|
// If we have a timeout, complete the subscription automatically
|
|
184
185
|
if (timeout)
|
|
185
|
-
setTimeout(onComplete, timeout);
|
|
186
|
+
setTimeout(onComplete, timeout + authTimeout);
|
|
186
187
|
// If one of our connections gets closed make sure to kill our sub
|
|
187
188
|
executor.target.connections.forEach((c) => c.on('close', onClose));
|
|
188
189
|
// Finally, start our subscription. If we didn't get any filters, don't even send the
|
|
189
190
|
// request, just close it. This can be valid when a caller fulfills a request themselves.
|
|
190
191
|
if (filters.length > 0) {
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
}
|
|
192
|
+
Promise.all(executor.target.connections.map(async (connection) => {
|
|
193
|
+
if (authTimeout) {
|
|
194
|
+
await connection.ensureAuth({ timeout: authTimeout });
|
|
195
|
+
}
|
|
196
|
+
})).then(() => {
|
|
197
|
+
// If we send too many filters in a request relays will refuse to respond. REQs are rate
|
|
198
|
+
// limited client-side by Connection, so this will throttle concurrent requests.
|
|
199
|
+
for (const filtersChunk of (0, lib_1.chunk)(8, filters)) {
|
|
200
|
+
subs.push(executor.subscribe(filtersChunk, { onEvent, onEose }));
|
|
201
|
+
}
|
|
202
|
+
});
|
|
196
203
|
}
|
|
197
204
|
else {
|
|
198
205
|
onComplete();
|
|
@@ -201,10 +208,23 @@ const executeSubscription = (sub) => {
|
|
|
201
208
|
exports.executeSubscription = executeSubscription;
|
|
202
209
|
const executeSubscriptions = (subs) => (0, exports.mergeSubscriptions)(subs).forEach(exports.executeSubscription);
|
|
203
210
|
exports.executeSubscriptions = executeSubscriptions;
|
|
204
|
-
exports.executeSubscriptionBatched = (
|
|
211
|
+
exports.executeSubscriptionBatched = (() => {
|
|
212
|
+
const subs = [];
|
|
213
|
+
const timeouts = [];
|
|
214
|
+
const executeAll = () => {
|
|
215
|
+
(0, exports.executeSubscriptions)(subs.splice(0));
|
|
216
|
+
for (const timeout of timeouts.splice(0)) {
|
|
217
|
+
clearTimeout(timeout);
|
|
218
|
+
}
|
|
219
|
+
};
|
|
220
|
+
return (sub) => {
|
|
221
|
+
subs.push(sub);
|
|
222
|
+
timeouts.push(setTimeout(executeAll, Math.max(16, sub.request.delay)));
|
|
223
|
+
};
|
|
224
|
+
})();
|
|
205
225
|
const subscribe = (request) => {
|
|
206
|
-
const subscription = (0, exports.makeSubscription)(request);
|
|
207
|
-
if (request.
|
|
226
|
+
const subscription = (0, exports.makeSubscription)({ delay: 800, ...request });
|
|
227
|
+
if (request.delay === 0) {
|
|
208
228
|
(0, exports.executeSubscription)(subscription);
|
|
209
229
|
}
|
|
210
230
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Subscribe.cjs","sourceRoot":"","sources":["../../src/Subscribe.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"Subscribe.cjs","sourceRoot":"","sources":["../../src/Subscribe.ts"],"names":[],"mappings":"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"}
|
package/build/src/Subscribe.d.ts
CHANGED
|
@@ -14,11 +14,12 @@ export declare enum SubscriptionEvent {
|
|
|
14
14
|
export type SubscribeRequest = {
|
|
15
15
|
relays: string[];
|
|
16
16
|
filters: Filter[];
|
|
17
|
+
delay?: number;
|
|
17
18
|
signal?: AbortSignal;
|
|
18
19
|
timeout?: number;
|
|
19
20
|
tracker?: Tracker;
|
|
20
|
-
immediate?: boolean;
|
|
21
21
|
closeOnEose?: boolean;
|
|
22
|
+
authTimeout?: number;
|
|
22
23
|
};
|
|
23
24
|
export type Subscription = {
|
|
24
25
|
id: string;
|
|
@@ -47,5 +48,5 @@ export declare const mergeSubscriptions: (subs: Subscription[]) => {
|
|
|
47
48
|
}[];
|
|
48
49
|
export declare const executeSubscription: (sub: Subscription) => void;
|
|
49
50
|
export declare const executeSubscriptions: (subs: Subscription[]) => void;
|
|
50
|
-
export declare const executeSubscriptionBatched: (
|
|
51
|
+
export declare const executeSubscriptionBatched: (sub: Subscription) => void;
|
|
51
52
|
export declare const subscribe: (request: SubscribeRequest) => Subscription;
|
package/build/src/Subscribe.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Emitter, chunk, randomId, once, groupBy,
|
|
1
|
+
import { Emitter, identity, max, chunk, randomId, once, groupBy, uniq } from '@welshman/lib';
|
|
2
2
|
import { matchFilters, unionFilters } from '@welshman/util';
|
|
3
3
|
import { Tracker } from "./Tracker.mjs";
|
|
4
4
|
import { NetworkContext } from "./Context.mjs";
|
|
@@ -56,6 +56,7 @@ export const mergeSubscriptions = (subs) => {
|
|
|
56
56
|
relays: [relay],
|
|
57
57
|
timeout: callerSubs[0].request.timeout,
|
|
58
58
|
closeOnEose: callerSubs[0].request.closeOnEose,
|
|
59
|
+
authTimeout: max(callerSubs.map(r => r.request.authTimeout).filter(identity)),
|
|
59
60
|
filters: unionFilters(callerSubs.flatMap((sub) => sub.request.filters)),
|
|
60
61
|
});
|
|
61
62
|
for (const { id, controller, request } of callerSubs) {
|
|
@@ -122,7 +123,7 @@ export const mergeSubscriptions = (subs) => {
|
|
|
122
123
|
};
|
|
123
124
|
export const executeSubscription = (sub) => {
|
|
124
125
|
const { request, emitter, tracker, controller } = sub;
|
|
125
|
-
const { timeout, filters, closeOnEose, relays, signal } = request;
|
|
126
|
+
const { timeout, filters, closeOnEose, relays, signal, authTimeout = 0 } = request;
|
|
126
127
|
const executor = NetworkContext.getExecutor(relays);
|
|
127
128
|
const subs = [];
|
|
128
129
|
const completedRelays = new Set();
|
|
@@ -176,27 +177,46 @@ export const executeSubscription = (sub) => {
|
|
|
176
177
|
controller.signal.addEventListener('abort', onComplete);
|
|
177
178
|
// If we have a timeout, complete the subscription automatically
|
|
178
179
|
if (timeout)
|
|
179
|
-
setTimeout(onComplete, timeout);
|
|
180
|
+
setTimeout(onComplete, timeout + authTimeout);
|
|
180
181
|
// If one of our connections gets closed make sure to kill our sub
|
|
181
182
|
executor.target.connections.forEach((c) => c.on('close', onClose));
|
|
182
183
|
// Finally, start our subscription. If we didn't get any filters, don't even send the
|
|
183
184
|
// request, just close it. This can be valid when a caller fulfills a request themselves.
|
|
184
185
|
if (filters.length > 0) {
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
}
|
|
186
|
+
Promise.all(executor.target.connections.map(async (connection) => {
|
|
187
|
+
if (authTimeout) {
|
|
188
|
+
await connection.ensureAuth({ timeout: authTimeout });
|
|
189
|
+
}
|
|
190
|
+
})).then(() => {
|
|
191
|
+
// If we send too many filters in a request relays will refuse to respond. REQs are rate
|
|
192
|
+
// limited client-side by Connection, so this will throttle concurrent requests.
|
|
193
|
+
for (const filtersChunk of chunk(8, filters)) {
|
|
194
|
+
subs.push(executor.subscribe(filtersChunk, { onEvent, onEose }));
|
|
195
|
+
}
|
|
196
|
+
});
|
|
190
197
|
}
|
|
191
198
|
else {
|
|
192
199
|
onComplete();
|
|
193
200
|
}
|
|
194
201
|
};
|
|
195
202
|
export const executeSubscriptions = (subs) => mergeSubscriptions(subs).forEach(executeSubscription);
|
|
196
|
-
export const executeSubscriptionBatched =
|
|
203
|
+
export const executeSubscriptionBatched = (() => {
|
|
204
|
+
const subs = [];
|
|
205
|
+
const timeouts = [];
|
|
206
|
+
const executeAll = () => {
|
|
207
|
+
executeSubscriptions(subs.splice(0));
|
|
208
|
+
for (const timeout of timeouts.splice(0)) {
|
|
209
|
+
clearTimeout(timeout);
|
|
210
|
+
}
|
|
211
|
+
};
|
|
212
|
+
return (sub) => {
|
|
213
|
+
subs.push(sub);
|
|
214
|
+
timeouts.push(setTimeout(executeAll, Math.max(16, sub.request.delay)));
|
|
215
|
+
};
|
|
216
|
+
})();
|
|
197
217
|
export const subscribe = (request) => {
|
|
198
|
-
const subscription = makeSubscription(request);
|
|
199
|
-
if (request.
|
|
218
|
+
const subscription = makeSubscription({ delay: 800, ...request });
|
|
219
|
+
if (request.delay === 0) {
|
|
200
220
|
executeSubscription(subscription);
|
|
201
221
|
}
|
|
202
222
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Subscribe.mjs","sourceRoot":"","sources":["../../src/Subscribe.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Subscribe.mjs","sourceRoot":"","sources":["../../src/Subscribe.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Local.cjs","sourceRoot":"","sources":["../../../src/target/Local.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;
|
|
1
|
+
{"version":3,"file":"Local.cjs","sourceRoot":"","sources":["../../../src/target/Local.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AACrC,yCAAqD;AAGrD,MAAa,KAAM,SAAQ,aAAO;IAChC,YAAqB,KAAY;QAC/B,KAAK,EAAE,CAAA;QADY,UAAK,GAAL,KAAK,CAAO;QAcjC,cAAS,GAAG,CAAC,GAAG,OAAgB,EAAE,EAAE;YAClC,MAAM,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,OAAO,CAAA;YAElC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,sBAAe,EAAE,GAAG,OAAO,CAAC,CAAA;QAC9C,CAAC,CAAA;QAED,YAAO,GAAG,GAAG,EAAE;YACb,IAAI,CAAC,kBAAkB,EAAE,CAAA;YACzB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACrC,CAAC,CAAA;QApBC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IAC/B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,EAAE,CAAA;IACX,CAAC;IAED,IAAI,CAAC,GAAG,OAAgB;QACtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAA;IAC7B,CAAC;CAYF;AAzBD,sBAyBC"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { Emitter } from '@welshman/lib';
|
|
2
|
-
import type { TrustedEvent } from '@welshman/util';
|
|
3
2
|
import { Relay } from '@welshman/util';
|
|
4
3
|
import type { Message } from '../Socket';
|
|
5
|
-
export declare class Local
|
|
6
|
-
readonly relay: Relay
|
|
7
|
-
constructor(relay: Relay
|
|
4
|
+
export declare class Local extends Emitter {
|
|
5
|
+
readonly relay: Relay;
|
|
6
|
+
constructor(relay: Relay);
|
|
8
7
|
get connections(): never[];
|
|
9
8
|
send(...payload: Message): void;
|
|
10
9
|
onMessage: (message_0: string, ...message_1: any[]) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Local.mjs","sourceRoot":"","sources":["../../../src/target/Local.ts"],"names":[],"mappings":"OAAO,EAAC,OAAO,EAAC,MAAM,eAAe;
|
|
1
|
+
{"version":3,"file":"Local.mjs","sourceRoot":"","sources":["../../../src/target/Local.ts"],"names":[],"mappings":"OAAO,EAAC,OAAO,EAAC,MAAM,eAAe;OAC9B,EAAQ,eAAe,EAAC,MAAM,gBAAgB;AAGrD,MAAM,OAAO,KAAM,SAAQ,OAAO;IAChC,YAAqB,KAAY;QAC/B,KAAK,EAAE,CAAA;QADY,UAAK,GAAL,KAAK,CAAO;QAcjC,cAAS,GAAG,CAAC,GAAG,OAAgB,EAAE,EAAE;YAClC,MAAM,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,OAAO,CAAA;YAElC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,CAAA;QAC9C,CAAC,CAAA;QAED,YAAO,GAAG,GAAG,EAAE;YACb,IAAI,CAAC,kBAAkB,EAAE,CAAA;YACzB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACrC,CAAC,CAAA;QApBC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IAC/B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,EAAE,CAAA;IACX,CAAC;IAED,IAAI,CAAC,GAAG,OAAgB;QACtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAA;IAC7B,CAAC;CAYF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@welshman/net",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.19",
|
|
4
4
|
"author": "hodlbod",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"description": "Utilities for connecting with nostr relays.",
|
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
"typescript": "~5.1.6"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@welshman/lib": "0.0.
|
|
35
|
-
"@welshman/util": "0.0.
|
|
34
|
+
"@welshman/lib": "0.0.15",
|
|
35
|
+
"@welshman/util": "0.0.27",
|
|
36
36
|
"isomorphic-ws": "^5.0.0",
|
|
37
37
|
"ws": "^8.16.0"
|
|
38
38
|
}
|