@welshman/net 0.0.10 → 0.0.11
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/Connection.cjs +8 -6
- package/build/Connection.cjs.map +1 -1
- package/build/Connection.d.ts +1 -1
- package/build/Connection.mjs +8 -6
- package/build/Connection.mjs.map +1 -1
- package/build/ConnectionMeta.cjs +4 -1
- package/build/ConnectionMeta.cjs.map +1 -1
- package/build/ConnectionMeta.mjs +4 -1
- package/build/ConnectionMeta.mjs.map +1 -1
- package/build/Socket.cjs +27 -54
- package/build/Socket.cjs.map +1 -1
- package/build/Socket.d.ts +11 -16
- package/build/Socket.mjs +28 -55
- package/build/Socket.mjs.map +1 -1
- package/package.json +3 -3
package/build/Connection.cjs
CHANGED
|
@@ -10,7 +10,7 @@ class Connection extends lib_1.Emitter {
|
|
|
10
10
|
this.createSender = () => {
|
|
11
11
|
const worker = new lib_1.Worker({
|
|
12
12
|
shouldDefer: (message) => {
|
|
13
|
-
if (!this.socket.
|
|
13
|
+
if (!this.socket.isOpen()) {
|
|
14
14
|
return true;
|
|
15
15
|
}
|
|
16
16
|
const [verb, ...extra] = (0, Socket_1.asMessage)(message);
|
|
@@ -57,12 +57,14 @@ class Connection extends lib_1.Emitter {
|
|
|
57
57
|
this.onReceive = (message) => {
|
|
58
58
|
this.emit('receive', this, message);
|
|
59
59
|
};
|
|
60
|
-
this.ensureConnected = ({ shouldReconnect = true }) => {
|
|
61
|
-
|
|
62
|
-
|
|
60
|
+
this.ensureConnected = async ({ shouldReconnect = true }) => {
|
|
61
|
+
const isUnhealthy = this.socket.isClosing() || this.socket.isClosed();
|
|
62
|
+
const noRecentFault = this.meta.lastFault < Date.now() - 60000;
|
|
63
|
+
if (shouldReconnect && isUnhealthy && noRecentFault) {
|
|
64
|
+
await this.disconnect();
|
|
63
65
|
}
|
|
64
|
-
if (this.socket.
|
|
65
|
-
this.socket.connect();
|
|
66
|
+
if (this.socket.isNew()) {
|
|
67
|
+
await this.socket.connect();
|
|
66
68
|
}
|
|
67
69
|
};
|
|
68
70
|
this.url = url;
|
package/build/Connection.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Connection.cjs","sourceRoot":"","sources":["../Connection.ts"],"names":[],"mappings":";;;AAAA,uCAA6C;AAC7C,yDAA2D;AAC3D,yCAAqD;AAGrD,MAAa,UAAW,SAAQ,aAAO;IAOrC,YAAY,GAAW;QACrB,KAAK,EAAE,CAAA;QAUT,iBAAY,GAAG,GAAG,EAAE;YAClB,MAAM,MAAM,GAAG,IAAI,YAAM,CAAgB;gBACvC,WAAW,EAAE,CAAC,OAAsB,EAAE,EAAE;oBACtC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"Connection.cjs","sourceRoot":"","sources":["../Connection.ts"],"names":[],"mappings":"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"}
|
package/build/Connection.d.ts
CHANGED
|
@@ -20,7 +20,7 @@ export declare class Connection extends Emitter {
|
|
|
20
20
|
onReceive: (message: SocketMessage) => void;
|
|
21
21
|
ensureConnected: ({ shouldReconnect }: {
|
|
22
22
|
shouldReconnect?: boolean | undefined;
|
|
23
|
-
}) => void
|
|
23
|
+
}) => Promise<void>;
|
|
24
24
|
disconnect(): void;
|
|
25
25
|
destroy(): void;
|
|
26
26
|
}
|
package/build/Connection.mjs
CHANGED
|
@@ -7,7 +7,7 @@ export class Connection extends Emitter {
|
|
|
7
7
|
this.createSender = () => {
|
|
8
8
|
const worker = new Worker({
|
|
9
9
|
shouldDefer: (message) => {
|
|
10
|
-
if (!this.socket.
|
|
10
|
+
if (!this.socket.isOpen()) {
|
|
11
11
|
return true;
|
|
12
12
|
}
|
|
13
13
|
const [verb, ...extra] = asMessage(message);
|
|
@@ -54,12 +54,14 @@ export class Connection extends Emitter {
|
|
|
54
54
|
this.onReceive = (message) => {
|
|
55
55
|
this.emit('receive', this, message);
|
|
56
56
|
};
|
|
57
|
-
this.ensureConnected = ({ shouldReconnect = true }) => {
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
this.ensureConnected = async ({ shouldReconnect = true }) => {
|
|
58
|
+
const isUnhealthy = this.socket.isClosing() || this.socket.isClosed();
|
|
59
|
+
const noRecentFault = this.meta.lastFault < Date.now() - 60000;
|
|
60
|
+
if (shouldReconnect && isUnhealthy && noRecentFault) {
|
|
61
|
+
await this.disconnect();
|
|
60
62
|
}
|
|
61
|
-
if (this.socket.
|
|
62
|
-
this.socket.connect();
|
|
63
|
+
if (this.socket.isNew()) {
|
|
64
|
+
await this.socket.connect();
|
|
63
65
|
}
|
|
64
66
|
};
|
|
65
67
|
this.url = url;
|
package/build/Connection.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Connection.mjs","sourceRoot":"","sources":["../Connection.ts"],"names":[],"mappings":"OAAO,EAAC,OAAO,EAAE,MAAM,EAAC,MAAM,eAAe;OACtC,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,
|
|
1
|
+
{"version":3,"file":"Connection.mjs","sourceRoot":"","sources":["../Connection.ts"],"names":[],"mappings":"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"}
|
package/build/ConnectionMeta.cjs
CHANGED
|
@@ -40,13 +40,16 @@ class ConnectionMeta {
|
|
|
40
40
|
};
|
|
41
41
|
this.getSpeed = () => this.responseCount ? this.responseTimer / this.responseCount : 0;
|
|
42
42
|
this.getStatus = () => {
|
|
43
|
+
const socket = this.cxn.socket;
|
|
43
44
|
if (this.authStatus === AuthStatus.Unauthorized)
|
|
44
45
|
return ConnectionStatus.Unauthorized;
|
|
45
46
|
if (this.authStatus === AuthStatus.Forbidden)
|
|
46
47
|
return ConnectionStatus.Forbidden;
|
|
48
|
+
if (socket.isNew())
|
|
49
|
+
return ConnectionStatus.Closed;
|
|
47
50
|
if (this.lastFault && this.lastFault > this.lastOpen)
|
|
48
51
|
return ConnectionStatus.Error;
|
|
49
|
-
if (
|
|
52
|
+
if (socket.isClosed() || socket.isClosing())
|
|
50
53
|
return ConnectionStatus.Closed;
|
|
51
54
|
if (this.getSpeed() > 1000)
|
|
52
55
|
return ConnectionStatus.Slow;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectionMeta.cjs","sourceRoot":"","sources":["../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,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,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ;gBAAE,OAAO,gBAAgB,CAAC,KAAK,CAAA;YACnF,IAAI,
|
|
1
|
+
{"version":3,"file":"ConnectionMeta.cjs","sourceRoot":"","sources":["../ConnectionMeta.ts"],"names":[],"mappings":"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"}
|
package/build/ConnectionMeta.mjs
CHANGED
|
@@ -37,13 +37,16 @@ export class ConnectionMeta {
|
|
|
37
37
|
};
|
|
38
38
|
this.getSpeed = () => this.responseCount ? this.responseTimer / this.responseCount : 0;
|
|
39
39
|
this.getStatus = () => {
|
|
40
|
+
const socket = this.cxn.socket;
|
|
40
41
|
if (this.authStatus === AuthStatus.Unauthorized)
|
|
41
42
|
return ConnectionStatus.Unauthorized;
|
|
42
43
|
if (this.authStatus === AuthStatus.Forbidden)
|
|
43
44
|
return ConnectionStatus.Forbidden;
|
|
45
|
+
if (socket.isNew())
|
|
46
|
+
return ConnectionStatus.Closed;
|
|
44
47
|
if (this.lastFault && this.lastFault > this.lastOpen)
|
|
45
48
|
return ConnectionStatus.Error;
|
|
46
|
-
if (
|
|
49
|
+
if (socket.isClosed() || socket.isClosing())
|
|
47
50
|
return ConnectionStatus.Closed;
|
|
48
51
|
if (this.getSpeed() > 1000)
|
|
49
52
|
return ConnectionStatus.Slow;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectionMeta.mjs","sourceRoot":"","sources":["../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,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,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ;gBAAE,OAAO,gBAAgB,CAAC,KAAK,CAAA;YACnF,IAAI,
|
|
1
|
+
{"version":3,"file":"ConnectionMeta.mjs","sourceRoot":"","sources":["../ConnectionMeta.ts"],"names":[],"mappings":"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"}
|
package/build/Socket.cjs
CHANGED
|
@@ -12,17 +12,14 @@ const asMessage = (m) => (0, exports.isMessage)(m) ? m : m[1];
|
|
|
12
12
|
exports.asMessage = asMessage;
|
|
13
13
|
class Socket {
|
|
14
14
|
constructor(url, opts) {
|
|
15
|
+
this.url = url;
|
|
15
16
|
this.opts = opts;
|
|
16
|
-
this.
|
|
17
|
-
this.
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
};
|
|
21
|
-
this.
|
|
22
|
-
this.failedToConnect = true;
|
|
23
|
-
this.opts.onError();
|
|
24
|
-
this.disconnect();
|
|
25
|
-
};
|
|
17
|
+
this.isNew = () => this.ws === undefined;
|
|
18
|
+
this.isInvalid = () => this.ws === 'invalid';
|
|
19
|
+
this.isConnecting = () => { var _a; return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === isomorphic_ws_1.default.CONNECTING; };
|
|
20
|
+
this.isOpen = () => { var _a; return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === isomorphic_ws_1.default.OPEN; };
|
|
21
|
+
this.isClosing = () => { var _a; return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === isomorphic_ws_1.default.CLOSING; };
|
|
22
|
+
this.isClosed = () => { var _a; return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === isomorphic_ws_1.default.CLOSED; };
|
|
26
23
|
this.onMessage = (event) => {
|
|
27
24
|
try {
|
|
28
25
|
const message = JSON.parse(event.data);
|
|
@@ -37,62 +34,38 @@ class Socket {
|
|
|
37
34
|
// pass
|
|
38
35
|
}
|
|
39
36
|
};
|
|
40
|
-
this.send = (message) =>
|
|
41
|
-
|
|
42
|
-
throw new Error('Send attempted before socket was opened');
|
|
43
|
-
}
|
|
44
|
-
this.ws.send(JSON.stringify(message));
|
|
45
|
-
};
|
|
46
|
-
this.connect = () => {
|
|
37
|
+
this.send = (message) => this.ws.send(JSON.stringify(message));
|
|
38
|
+
this.connect = async () => {
|
|
47
39
|
if (this.ws) {
|
|
48
40
|
throw new Error(`Already attempted connection for ${this.url}`);
|
|
49
41
|
}
|
|
50
42
|
try {
|
|
51
43
|
this.ws = new isomorphic_ws_1.default(this.url);
|
|
52
|
-
this.ws.onopen = this.onOpen;
|
|
53
|
-
this.ws.onerror = this.onError;
|
|
44
|
+
this.ws.onopen = this.opts.onOpen;
|
|
45
|
+
this.ws.onerror = this.opts.onError;
|
|
46
|
+
this.ws.onclose = this.opts.onClose;
|
|
54
47
|
this.ws.onmessage = this.onMessage;
|
|
55
|
-
this.ws.onclose = this.disconnect;
|
|
56
48
|
}
|
|
57
49
|
catch (e) {
|
|
58
|
-
this.
|
|
50
|
+
this.ws = 'invalid';
|
|
51
|
+
this.opts.onError();
|
|
52
|
+
}
|
|
53
|
+
while (this.isConnecting()) {
|
|
54
|
+
await (0, lib_1.sleep)(100);
|
|
59
55
|
}
|
|
60
56
|
};
|
|
61
|
-
this.disconnect = () => {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
this.
|
|
67
|
-
this.ws = undefined;
|
|
68
|
-
// Resolve a different instance of the promise
|
|
69
|
-
this.ready.resolve(false);
|
|
57
|
+
this.disconnect = async () => {
|
|
58
|
+
while (this.isConnecting()) {
|
|
59
|
+
await (0, lib_1.sleep)(100);
|
|
60
|
+
}
|
|
61
|
+
if (this.isOpen()) {
|
|
62
|
+
this.ws.close();
|
|
70
63
|
}
|
|
64
|
+
while (this.isClosing()) {
|
|
65
|
+
await (0, lib_1.sleep)(100);
|
|
66
|
+
}
|
|
67
|
+
this.ws = undefined;
|
|
71
68
|
};
|
|
72
|
-
this.url = url;
|
|
73
|
-
this.ready = (0, lib_1.defer)();
|
|
74
|
-
}
|
|
75
|
-
isPending() {
|
|
76
|
-
return !this.ws && !this.failedToConnect;
|
|
77
|
-
}
|
|
78
|
-
isConnecting() {
|
|
79
|
-
var _a;
|
|
80
|
-
return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === isomorphic_ws_1.default.CONNECTING;
|
|
81
|
-
}
|
|
82
|
-
isReady() {
|
|
83
|
-
var _a;
|
|
84
|
-
return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === isomorphic_ws_1.default.OPEN;
|
|
85
|
-
}
|
|
86
|
-
isClosing() {
|
|
87
|
-
var _a;
|
|
88
|
-
return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === isomorphic_ws_1.default.CLOSING;
|
|
89
|
-
}
|
|
90
|
-
isClosed() {
|
|
91
|
-
var _a;
|
|
92
|
-
return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === isomorphic_ws_1.default.CLOSED;
|
|
93
|
-
}
|
|
94
|
-
isHealthy() {
|
|
95
|
-
return this.isPending() || this.isConnecting() || this.isReady();
|
|
96
69
|
}
|
|
97
70
|
}
|
|
98
71
|
exports.Socket = Socket;
|
package/build/Socket.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Socket.cjs","sourceRoot":"","sources":["../Socket.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"Socket.cjs","sourceRoot":"","sources":["../Socket.ts"],"names":[],"mappings":"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"}
|
package/build/Socket.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import WebSocket from "isomorphic-ws";
|
|
2
|
-
import { Deferred } from '@welshman/lib';
|
|
3
2
|
export type Message = [string, ...any[]];
|
|
4
3
|
export type PlexMessage = [{
|
|
5
4
|
relays: string[];
|
|
@@ -14,24 +13,20 @@ export type SocketOpts = {
|
|
|
14
13
|
onMessage: (message: SocketMessage) => void;
|
|
15
14
|
};
|
|
16
15
|
export declare class Socket {
|
|
16
|
+
readonly url: string;
|
|
17
17
|
readonly opts: SocketOpts;
|
|
18
|
-
|
|
19
|
-
ws?: WebSocket;
|
|
20
|
-
ready: Deferred<boolean>;
|
|
21
|
-
failedToConnect: boolean;
|
|
18
|
+
ws?: WebSocket | 'invalid';
|
|
22
19
|
constructor(url: string, opts: SocketOpts);
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
onOpen: () => void;
|
|
30
|
-
onError: () => void;
|
|
20
|
+
isNew: () => boolean;
|
|
21
|
+
isInvalid: () => boolean;
|
|
22
|
+
isConnecting: () => boolean;
|
|
23
|
+
isOpen: () => boolean;
|
|
24
|
+
isClosing: () => boolean;
|
|
25
|
+
isClosed: () => boolean;
|
|
31
26
|
onMessage: (event: {
|
|
32
27
|
data: string;
|
|
33
28
|
}) => void;
|
|
34
|
-
send: (message: any) =>
|
|
35
|
-
connect: () => void
|
|
36
|
-
disconnect: () => void
|
|
29
|
+
send: (message: any) => any;
|
|
30
|
+
connect: () => Promise<void>;
|
|
31
|
+
disconnect: () => Promise<void>;
|
|
37
32
|
}
|
package/build/Socket.mjs
CHANGED
|
@@ -1,20 +1,17 @@
|
|
|
1
1
|
import WebSocket from "isomorphic-ws";
|
|
2
|
-
import {
|
|
2
|
+
import { sleep } from '@welshman/lib';
|
|
3
3
|
export const isMessage = (m) => typeof m[0] === 'string';
|
|
4
4
|
export const asMessage = (m) => isMessage(m) ? m : m[1];
|
|
5
5
|
export class Socket {
|
|
6
6
|
constructor(url, opts) {
|
|
7
|
+
this.url = url;
|
|
7
8
|
this.opts = opts;
|
|
8
|
-
this.
|
|
9
|
-
this.
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
};
|
|
13
|
-
this.
|
|
14
|
-
this.failedToConnect = true;
|
|
15
|
-
this.opts.onError();
|
|
16
|
-
this.disconnect();
|
|
17
|
-
};
|
|
9
|
+
this.isNew = () => this.ws === undefined;
|
|
10
|
+
this.isInvalid = () => this.ws === 'invalid';
|
|
11
|
+
this.isConnecting = () => { var _a; return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.CONNECTING; };
|
|
12
|
+
this.isOpen = () => { var _a; return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.OPEN; };
|
|
13
|
+
this.isClosing = () => { var _a; return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.CLOSING; };
|
|
14
|
+
this.isClosed = () => { var _a; return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.CLOSED; };
|
|
18
15
|
this.onMessage = (event) => {
|
|
19
16
|
try {
|
|
20
17
|
const message = JSON.parse(event.data);
|
|
@@ -29,62 +26,38 @@ export class Socket {
|
|
|
29
26
|
// pass
|
|
30
27
|
}
|
|
31
28
|
};
|
|
32
|
-
this.send = (message) =>
|
|
33
|
-
|
|
34
|
-
throw new Error('Send attempted before socket was opened');
|
|
35
|
-
}
|
|
36
|
-
this.ws.send(JSON.stringify(message));
|
|
37
|
-
};
|
|
38
|
-
this.connect = () => {
|
|
29
|
+
this.send = (message) => this.ws.send(JSON.stringify(message));
|
|
30
|
+
this.connect = async () => {
|
|
39
31
|
if (this.ws) {
|
|
40
32
|
throw new Error(`Already attempted connection for ${this.url}`);
|
|
41
33
|
}
|
|
42
34
|
try {
|
|
43
35
|
this.ws = new WebSocket(this.url);
|
|
44
|
-
this.ws.onopen = this.onOpen;
|
|
45
|
-
this.ws.onerror = this.onError;
|
|
36
|
+
this.ws.onopen = this.opts.onOpen;
|
|
37
|
+
this.ws.onerror = this.opts.onError;
|
|
38
|
+
this.ws.onclose = this.opts.onClose;
|
|
46
39
|
this.ws.onmessage = this.onMessage;
|
|
47
|
-
this.ws.onclose = this.disconnect;
|
|
48
40
|
}
|
|
49
41
|
catch (e) {
|
|
50
|
-
this.
|
|
42
|
+
this.ws = 'invalid';
|
|
43
|
+
this.opts.onError();
|
|
44
|
+
}
|
|
45
|
+
while (this.isConnecting()) {
|
|
46
|
+
await sleep(100);
|
|
51
47
|
}
|
|
52
48
|
};
|
|
53
|
-
this.disconnect = () => {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
this.
|
|
59
|
-
this.ws = undefined;
|
|
60
|
-
// Resolve a different instance of the promise
|
|
61
|
-
this.ready.resolve(false);
|
|
49
|
+
this.disconnect = async () => {
|
|
50
|
+
while (this.isConnecting()) {
|
|
51
|
+
await sleep(100);
|
|
52
|
+
}
|
|
53
|
+
if (this.isOpen()) {
|
|
54
|
+
this.ws.close();
|
|
62
55
|
}
|
|
56
|
+
while (this.isClosing()) {
|
|
57
|
+
await sleep(100);
|
|
58
|
+
}
|
|
59
|
+
this.ws = undefined;
|
|
63
60
|
};
|
|
64
|
-
this.url = url;
|
|
65
|
-
this.ready = defer();
|
|
66
|
-
}
|
|
67
|
-
isPending() {
|
|
68
|
-
return !this.ws && !this.failedToConnect;
|
|
69
|
-
}
|
|
70
|
-
isConnecting() {
|
|
71
|
-
var _a;
|
|
72
|
-
return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.CONNECTING;
|
|
73
|
-
}
|
|
74
|
-
isReady() {
|
|
75
|
-
var _a;
|
|
76
|
-
return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.OPEN;
|
|
77
|
-
}
|
|
78
|
-
isClosing() {
|
|
79
|
-
var _a;
|
|
80
|
-
return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.CLOSING;
|
|
81
|
-
}
|
|
82
|
-
isClosed() {
|
|
83
|
-
var _a;
|
|
84
|
-
return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.CLOSED;
|
|
85
|
-
}
|
|
86
|
-
isHealthy() {
|
|
87
|
-
return this.isPending() || this.isConnecting() || this.isReady();
|
|
88
61
|
}
|
|
89
62
|
}
|
|
90
63
|
//# sourceMappingURL=Socket.mjs.map
|
package/build/Socket.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Socket.mjs","sourceRoot":"","sources":["../Socket.ts"],"names":[],"mappings":"OAAO,SAAS,MAAM,eAAe;OAC9B,
|
|
1
|
+
{"version":3,"file":"Socket.mjs","sourceRoot":"","sources":["../Socket.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@welshman/net",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.11",
|
|
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.8",
|
|
35
|
+
"@welshman/util": "0.0.11",
|
|
36
36
|
"isomorphic-ws": "^5.0.0",
|
|
37
37
|
"ws": "^8.16.0"
|
|
38
38
|
}
|