@welshman/net 0.0.35 → 0.0.37
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/Context.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ export type NetContext = {
|
|
|
7
7
|
pool: Pool;
|
|
8
8
|
authMode: AuthMode;
|
|
9
9
|
onEvent: (url: string, event: TrustedEvent) => void;
|
|
10
|
-
signEvent: (event: StampedEvent) => Promise<SignedEvent>;
|
|
10
|
+
signEvent: (event: StampedEvent) => Promise<SignedEvent | undefined>;
|
|
11
11
|
getExecutor: (relays: string[]) => Executor;
|
|
12
12
|
isDeleted: (url: string, event: TrustedEvent) => boolean;
|
|
13
13
|
isValid: (url: string, event: TrustedEvent) => boolean;
|
|
@@ -22,7 +22,7 @@ export declare const getDefaultNetContext: (overrides?: Partial<NetContext>) =>
|
|
|
22
22
|
pool: Pool;
|
|
23
23
|
authMode: AuthMode;
|
|
24
24
|
onEvent: ((url: string, event: TrustedEvent) => void) | ((...args: unknown[]) => undefined);
|
|
25
|
-
signEvent: ((event: StampedEvent) => Promise<SignedEvent>) | ((...args: unknown[]) => undefined);
|
|
25
|
+
signEvent: ((event: StampedEvent) => Promise<SignedEvent | undefined>) | ((...args: unknown[]) => undefined);
|
|
26
26
|
getExecutor: (relays: string[]) => Executor;
|
|
27
27
|
isDeleted: (url: string, event: TrustedEvent) => boolean;
|
|
28
28
|
isValid: (url: string, event: TrustedEvent) => boolean;
|
package/build/src/Socket.cjs
CHANGED
|
@@ -27,6 +27,7 @@ const { New, Open, Opening, Closing, Closed, Error, Invalid, } = SocketStatus;
|
|
|
27
27
|
class Socket {
|
|
28
28
|
constructor(cxn) {
|
|
29
29
|
this.cxn = cxn;
|
|
30
|
+
this.lastError = 0;
|
|
30
31
|
this.status = SocketStatus.New;
|
|
31
32
|
this.worker = new lib_1.Worker();
|
|
32
33
|
this.wait = async () => {
|
|
@@ -42,6 +43,12 @@ class Socket {
|
|
|
42
43
|
this.status = New;
|
|
43
44
|
this.cxn.emit(ConnectionEvent_1.ConnectionEvent.Reset);
|
|
44
45
|
}
|
|
46
|
+
// If we're closed due to an error retry after a delay
|
|
47
|
+
if (Date.now() - this.lastError > 15000) {
|
|
48
|
+
this.status = New;
|
|
49
|
+
this.lastError = 0;
|
|
50
|
+
this.cxn.emit(ConnectionEvent_1.ConnectionEvent.Reset);
|
|
51
|
+
}
|
|
45
52
|
// If the socket is new, connect
|
|
46
53
|
if (this.status === New) {
|
|
47
54
|
__classPrivateFieldGet(this, _Socket_init, "f").call(this);
|
|
@@ -74,6 +81,7 @@ class Socket {
|
|
|
74
81
|
};
|
|
75
82
|
this.ws.onerror = () => {
|
|
76
83
|
this.status = Error;
|
|
84
|
+
this.lastError = Date.now();
|
|
77
85
|
this.cxn.emit(ConnectionEvent_1.ConnectionEvent.Error);
|
|
78
86
|
};
|
|
79
87
|
this.ws.onclose = () => {
|
package/build/src/Socket.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Socket.cjs","sourceRoot":"","sources":["../../src/Socket.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kEAAqC;AACrC,uCAA2C;AAC3C,2DAAiD;AAKjD,IAAY,YAQX;AARD,WAAY,YAAY;IACtB,2BAAW,CAAA;IACX,6BAAa,CAAA;IACb,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;IACnB,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,mCAAmB,CAAA;AACrB,CAAC,EARW,YAAY,4BAAZ,YAAY,QAQvB;AAED,MAAM,EACJ,GAAG,EACH,IAAI,EACJ,OAAO,EACP,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,GACR,GAAG,YAAY,CAAA;AAEhB,MAAa,MAAM;
|
|
1
|
+
{"version":3,"file":"Socket.cjs","sourceRoot":"","sources":["../../src/Socket.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kEAAqC;AACrC,uCAA2C;AAC3C,2DAAiD;AAKjD,IAAY,YAQX;AARD,WAAY,YAAY;IACtB,2BAAW,CAAA;IACX,6BAAa,CAAA;IACb,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;IACnB,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,mCAAmB,CAAA;AACrB,CAAC,EARW,YAAY,4BAAZ,YAAY,QAQvB;AAED,MAAM,EACJ,GAAG,EACH,IAAI,EACJ,OAAO,EACP,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,GACR,GAAG,YAAY,CAAA;AAEhB,MAAa,MAAM;IAMjB,YAAqB,GAAe;QAAf,QAAG,GAAH,GAAG,CAAY;QALpC,cAAS,GAAG,CAAC,CAAA;QACb,WAAM,GAAG,YAAY,CAAC,GAAG,CAAA;QACzB,WAAM,GAAG,IAAI,YAAM,EAAW,CAAA;QAU9B,SAAI,GAAG,KAAK,IAAI,EAAE;YAChB,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAC/C,MAAM,IAAA,WAAK,EAAC,GAAG,CAAC,CAAA;aACjB;QACH,CAAC,CAAA;QAED,SAAI,GAAG,KAAK,IAAI,EAAE;YAChB,wCAAwC;YACxC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YAEjB,iCAAiC;YACjC,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE;gBAC1B,IAAI,CAAC,MAAM,GAAG,GAAG,CAAA;gBACjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAe,CAAC,KAAK,CAAC,CAAA;aACrC;YAED,sDAAsD;YACtD,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,GAAG,KAAM,EAAE;gBACxC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAA;gBACjB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;gBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAe,CAAC,KAAK,CAAC,CAAA;aACrC;YAED,gCAAgC;YAChC,IAAI,IAAI,CAAC,MAAM,KAAK,GAAG,EAAE;gBACvB,uBAAA,IAAI,oBAAM,MAAV,IAAI,CAAQ,CAAA;aACb;YAED,kDAAkD;YAClD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;QACnB,CAAC,CAAA;QAED,UAAK,GAAG,KAAK,IAAI,EAAE;;YACjB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;YACnB,MAAA,IAAI,CAAC,EAAE,0CAAE,KAAK,EAAE,CAAA;YAEhB,mDAAmD;YACnD,MAAM,IAAA,WAAK,EAAC,GAAG,CAAC,CAAA;YAEhB,qCAAqC;YACrC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YAEjB,IAAI,CAAC,EAAE,GAAG,SAAS,CAAA;QACrB,CAAC,CAAA;QAED,SAAI,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;YAChC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YAEjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;YAC5C,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;QACvC,CAAC,CAAA;QAED,uBAAQ,GAAG,EAAE;YACX,IAAI;gBACF,IAAI,CAAC,EAAE,GAAG,IAAI,uBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;gBACrC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAA;gBAErB,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,GAAG,EAAE;oBACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;oBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAe,CAAC,IAAI,CAAC,CAAA;gBACrC,CAAC,CAAA;gBAED,IAAI,CAAC,EAAE,CAAC,OAAO,GAAG,GAAG,EAAE;oBACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;oBACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;oBAC3B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAe,CAAC,KAAK,CAAC,CAAA;gBACtC,CAAC,CAAA;gBAED,IAAI,CAAC,EAAE,CAAC,OAAO,GAAG,GAAG,EAAE;oBACrB,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE;wBACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;qBACrB;oBAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAe,CAAC,KAAK,CAAC,CAAA;gBACtC,CAAC,CAAA;gBAED,IAAI,CAAC,EAAE,CAAC,SAAS,GAAG,CAAC,KAAqB,EAAE,EAAE;oBAC5C,IAAI;wBACF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAc,CAAC,CAAA;wBAEhD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;4BAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAkB,CAAC,CAAA;yBACrC;6BAAM;4BACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAe,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;yBAC1D;qBACF;oBAAC,OAAO,CAAC,EAAE;wBACV,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAe,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;qBAC1D;gBACH,CAAC,CAAA;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,GAAG,OAAO,CAAA;gBACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAe,CAAC,UAAU,CAAC,CAAA;aAC1C;QACH,CAAC,EAAA;QAnGC,yCAAyC;QACzC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAgB,EAAE,EAAE;YAChD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACjD,CAAC,CAAC,CAAA;IACJ,CAAC;CAgGF;AA3GD,wBA2GC"}
|
package/build/src/Socket.d.ts
CHANGED
package/build/src/Socket.mjs
CHANGED
|
@@ -21,6 +21,7 @@ const { New, Open, Opening, Closing, Closed, Error, Invalid, } = SocketStatus;
|
|
|
21
21
|
export class Socket {
|
|
22
22
|
constructor(cxn) {
|
|
23
23
|
this.cxn = cxn;
|
|
24
|
+
this.lastError = 0;
|
|
24
25
|
this.status = SocketStatus.New;
|
|
25
26
|
this.worker = new Worker();
|
|
26
27
|
this.wait = async () => {
|
|
@@ -36,6 +37,12 @@ export class Socket {
|
|
|
36
37
|
this.status = New;
|
|
37
38
|
this.cxn.emit(ConnectionEvent.Reset);
|
|
38
39
|
}
|
|
40
|
+
// If we're closed due to an error retry after a delay
|
|
41
|
+
if (Date.now() - this.lastError > 15000) {
|
|
42
|
+
this.status = New;
|
|
43
|
+
this.lastError = 0;
|
|
44
|
+
this.cxn.emit(ConnectionEvent.Reset);
|
|
45
|
+
}
|
|
39
46
|
// If the socket is new, connect
|
|
40
47
|
if (this.status === New) {
|
|
41
48
|
__classPrivateFieldGet(this, _Socket_init, "f").call(this);
|
|
@@ -68,6 +75,7 @@ export class Socket {
|
|
|
68
75
|
};
|
|
69
76
|
this.ws.onerror = () => {
|
|
70
77
|
this.status = Error;
|
|
78
|
+
this.lastError = Date.now();
|
|
71
79
|
this.cxn.emit(ConnectionEvent.Error);
|
|
72
80
|
};
|
|
73
81
|
this.ws.onclose = () => {
|
package/build/src/Socket.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Socket.mjs","sourceRoot":"","sources":["../../src/Socket.ts"],"names":[],"mappings":";;;;;;OAAO,SAAS,MAAM,eAAe;OAC9B,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,eAAe;OACpC,EAAC,eAAe,EAAC;AAKxB,MAAM,CAAN,IAAY,YAQX;AARD,WAAY,YAAY;IACtB,2BAAW,CAAA;IACX,6BAAa,CAAA;IACb,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;IACnB,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,mCAAmB,CAAA;AACrB,CAAC,EARW,YAAY,KAAZ,YAAY,QAQvB;AAED,MAAM,EACJ,GAAG,EACH,IAAI,EACJ,OAAO,EACP,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,GACR,GAAG,YAAY,CAAA;AAEhB,MAAM,OAAO,MAAM;
|
|
1
|
+
{"version":3,"file":"Socket.mjs","sourceRoot":"","sources":["../../src/Socket.ts"],"names":[],"mappings":";;;;;;OAAO,SAAS,MAAM,eAAe;OAC9B,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,eAAe;OACpC,EAAC,eAAe,EAAC;AAKxB,MAAM,CAAN,IAAY,YAQX;AARD,WAAY,YAAY;IACtB,2BAAW,CAAA;IACX,6BAAa,CAAA;IACb,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;IACnB,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,mCAAmB,CAAA;AACrB,CAAC,EARW,YAAY,KAAZ,YAAY,QAQvB;AAED,MAAM,EACJ,GAAG,EACH,IAAI,EACJ,OAAO,EACP,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,GACR,GAAG,YAAY,CAAA;AAEhB,MAAM,OAAO,MAAM;IAMjB,YAAqB,GAAe;QAAf,QAAG,GAAH,GAAG,CAAY;QALpC,cAAS,GAAG,CAAC,CAAA;QACb,WAAM,GAAG,YAAY,CAAC,GAAG,CAAA;QACzB,WAAM,GAAG,IAAI,MAAM,EAAW,CAAA;QAU9B,SAAI,GAAG,KAAK,IAAI,EAAE;YAChB,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAC/C,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;aACjB;QACH,CAAC,CAAA;QAED,SAAI,GAAG,KAAK,IAAI,EAAE;YAChB,wCAAwC;YACxC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YAEjB,iCAAiC;YACjC,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE;gBAC1B,IAAI,CAAC,MAAM,GAAG,GAAG,CAAA;gBACjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;aACrC;YAED,sDAAsD;YACtD,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,GAAG,KAAM,EAAE;gBACxC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAA;gBACjB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;gBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;aACrC;YAED,gCAAgC;YAChC,IAAI,IAAI,CAAC,MAAM,KAAK,GAAG,EAAE;gBACvB,uBAAA,IAAI,oBAAM,MAAV,IAAI,CAAQ,CAAA;aACb;YAED,kDAAkD;YAClD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;QACnB,CAAC,CAAA;QAED,UAAK,GAAG,KAAK,IAAI,EAAE;;YACjB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;YACnB,MAAA,IAAI,CAAC,EAAE,0CAAE,KAAK,EAAE,CAAA;YAEhB,mDAAmD;YACnD,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;YAEhB,qCAAqC;YACrC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YAEjB,IAAI,CAAC,EAAE,GAAG,SAAS,CAAA;QACrB,CAAC,CAAA;QAED,SAAI,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;YAChC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YAEjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;YAC5C,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;QACvC,CAAC,CAAA;QAED,uBAAQ,GAAG,EAAE;YACX,IAAI;gBACF,IAAI,CAAC,EAAE,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;gBACrC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAA;gBAErB,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,GAAG,EAAE;oBACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;oBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;gBACrC,CAAC,CAAA;gBAED,IAAI,CAAC,EAAE,CAAC,OAAO,GAAG,GAAG,EAAE;oBACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;oBACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;oBAC3B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;gBACtC,CAAC,CAAA;gBAED,IAAI,CAAC,EAAE,CAAC,OAAO,GAAG,GAAG,EAAE;oBACrB,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE;wBACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;qBACrB;oBAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;gBACtC,CAAC,CAAA;gBAED,IAAI,CAAC,EAAE,CAAC,SAAS,GAAG,CAAC,KAAqB,EAAE,EAAE;oBAC5C,IAAI;wBACF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAc,CAAC,CAAA;wBAEhD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;4BAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAkB,CAAC,CAAA;yBACrC;6BAAM;4BACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;yBAC1D;qBACF;oBAAC,OAAO,CAAC,EAAE;wBACV,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;qBAC1D;gBACH,CAAC,CAAA;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,GAAG,OAAO,CAAA;gBACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;aAC1C;QACH,CAAC,EAAA;QAnGC,yCAAyC;QACzC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAgB,EAAE,EAAE;YAChD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACjD,CAAC,CAAC,CAAA;IACJ,CAAC;CAgGF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@welshman/net",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.37",
|
|
4
4
|
"author": "hodlbod",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"description": "Utilities for connecting with nostr relays.",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"typescript": "~5.1.6"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@welshman/lib": "~0.0.
|
|
36
|
+
"@welshman/lib": "~0.0.25",
|
|
37
37
|
"@welshman/util": "~0.0.45",
|
|
38
38
|
"isomorphic-ws": "^5.0.0",
|
|
39
39
|
"ws": "^8.16.0"
|