@whitewall/blip-sdk 0.0.180 → 0.0.181
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/dist/cjs/sender/enveloperesolver.js +2 -2
- package/dist/cjs/sender/enveloperesolver.js.map +1 -1
- package/dist/cjs/sender/sender.js +6 -0
- package/dist/cjs/sender/sender.js.map +1 -1
- package/dist/cjs/sender/sessionnegotiator.js +15 -7
- package/dist/cjs/sender/sessionnegotiator.js.map +1 -1
- package/dist/cjs/sender/tcp/tcpsender.js +47 -31
- package/dist/cjs/sender/tcp/tcpsender.js.map +1 -1
- package/dist/cjs/sender/websocket/websocketsender.js +40 -12
- package/dist/cjs/sender/websocket/websocketsender.js.map +1 -1
- package/dist/esm/sender/enveloperesolver.js +2 -2
- package/dist/esm/sender/enveloperesolver.js.map +1 -1
- package/dist/esm/sender/sender.js +6 -0
- package/dist/esm/sender/sender.js.map +1 -1
- package/dist/esm/sender/sessionnegotiator.js +15 -7
- package/dist/esm/sender/sessionnegotiator.js.map +1 -1
- package/dist/esm/sender/tcp/tcpsender.js +47 -31
- package/dist/esm/sender/tcp/tcpsender.js.map +1 -1
- package/dist/esm/sender/websocket/websocketsender.js +40 -12
- package/dist/esm/sender/websocket/websocketsender.js.map +1 -1
- package/dist/types/sender/enveloperesolver.d.ts +1 -1
- package/dist/types/sender/enveloperesolver.d.ts.map +1 -1
- package/dist/types/sender/sender.d.ts +1 -0
- package/dist/types/sender/sender.d.ts.map +1 -1
- package/dist/types/sender/sessionnegotiator.d.ts +2 -0
- package/dist/types/sender/sessionnegotiator.d.ts.map +1 -1
- package/dist/types/sender/tcp/tcpsender.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/sender/enveloperesolver.ts +2 -2
- package/src/sender/sender.ts +7 -0
- package/src/sender/sessionnegotiator.ts +16 -7
- package/src/sender/tcp/tcpsender.ts +51 -33
- package/src/sender/websocket/websocketsender.ts +40 -14
|
@@ -119,9 +119,9 @@ class EnvelopeResolver {
|
|
|
119
119
|
this.resolveEnvelopeResponse(id, new Error(`Connection for envelope '${id}' was closed`));
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
|
-
rejectPendingEnvelopes(
|
|
122
|
+
rejectPendingEnvelopes(error) {
|
|
123
123
|
for (const id in this.waitingEnvelopeResponseResolvers) {
|
|
124
|
-
this.resolveEnvelopeResponse(id,
|
|
124
|
+
this.resolveEnvelopeResponse(id, error);
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
127
|
resolveEnvelopeResponse(id, envelopeOrError) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enveloperesolver.js","sourceRoot":"","sources":["../../../src/sender/enveloperesolver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"enveloperesolver.js","sourceRoot":"","sources":["../../../src/sender/enveloperesolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.OpenConnectionSender = exports.ConnectionSender = void 0;
|
|
4
4
|
const index_ts_1 = require("../types/index.js");
|
|
5
5
|
const enveloperesolver_ts_1 = require("./enveloperesolver.js");
|
|
6
|
+
const retryableerror_ts_1 = require("./retryableerror.js");
|
|
6
7
|
const ROOT_AUTHORITIES = ['msging.net', 'blip.ai', '0mn.io'];
|
|
7
8
|
class ConnectionSender {
|
|
8
9
|
_domain;
|
|
@@ -97,6 +98,11 @@ class OpenConnectionSender extends ConnectionSender {
|
|
|
97
98
|
this.envelopeResolver.close();
|
|
98
99
|
return Promise.resolve();
|
|
99
100
|
}
|
|
101
|
+
rejectPending(reason) {
|
|
102
|
+
const error = new retryableerror_ts_1.RetryableError(reason);
|
|
103
|
+
this.sessionNegotiator?.fail(error);
|
|
104
|
+
this.envelopeResolver.rejectPendingEnvelopes(error);
|
|
105
|
+
}
|
|
100
106
|
}
|
|
101
107
|
exports.OpenConnectionSender = OpenConnectionSender;
|
|
102
108
|
//# sourceMappingURL=sender.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender.js","sourceRoot":"","sources":["../../../src/sender/sender.ts"],"names":[],"mappings":";;;AAAA,gDAW0B;AAE1B,+DAAsF;
|
|
1
|
+
{"version":3,"file":"sender.js","sourceRoot":"","sources":["../../../src/sender/sender.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,16 +10,14 @@ class SessionNegotiator {
|
|
|
10
10
|
session = null;
|
|
11
11
|
presencePromise = null;
|
|
12
12
|
currentSessionResolver = null;
|
|
13
|
+
failure = null;
|
|
13
14
|
constructor(sender, sendSession) {
|
|
14
15
|
this.sender = sender;
|
|
15
16
|
this.sendSession = sendSession;
|
|
16
17
|
}
|
|
17
18
|
async negotiate(options) {
|
|
18
|
-
const timeout = setTimeout(
|
|
19
|
-
|
|
20
|
-
await this.sender.close();
|
|
21
|
-
throw new Error('Negotiation timeout');
|
|
22
|
-
}
|
|
19
|
+
const timeout = setTimeout(() => {
|
|
20
|
+
this.fail(new Error('Negotiation timeout'));
|
|
23
21
|
}, 60000); // 60 seconds
|
|
24
22
|
try {
|
|
25
23
|
this.sendSession({
|
|
@@ -92,6 +90,13 @@ class SessionNegotiator {
|
|
|
92
90
|
this.currentSessionResolver = null;
|
|
93
91
|
}
|
|
94
92
|
}
|
|
93
|
+
fail(error) {
|
|
94
|
+
this.failure = error;
|
|
95
|
+
if (this.currentSessionResolver) {
|
|
96
|
+
this.currentSessionResolver.reject(error);
|
|
97
|
+
this.currentSessionResolver = null;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
95
100
|
async ensurePresence(currentCommandUri = '') {
|
|
96
101
|
if (!this.session) {
|
|
97
102
|
throw new Error('Session not established');
|
|
@@ -127,10 +132,10 @@ class SessionNegotiator {
|
|
|
127
132
|
}
|
|
128
133
|
finish() {
|
|
129
134
|
if (!this.session) {
|
|
130
|
-
|
|
135
|
+
return;
|
|
131
136
|
}
|
|
132
137
|
this.sendSession({
|
|
133
|
-
id: this.session
|
|
138
|
+
id: this.session.id,
|
|
134
139
|
state: 'finishing',
|
|
135
140
|
});
|
|
136
141
|
}
|
|
@@ -138,6 +143,9 @@ class SessionNegotiator {
|
|
|
138
143
|
return this.state !== 'established' && this.state !== 'present';
|
|
139
144
|
}
|
|
140
145
|
async waitForSessionResponse() {
|
|
146
|
+
if (this.failure) {
|
|
147
|
+
throw this.failure;
|
|
148
|
+
}
|
|
141
149
|
const { promise, resolve, reject } = Promise.withResolvers();
|
|
142
150
|
this.currentSessionResolver = { resolve, reject };
|
|
143
151
|
const session = await promise;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionnegotiator.js","sourceRoot":"","sources":["../../../src/sender/sessionnegotiator.ts"],"names":[],"mappings":";;;AACA,8CAAsD;AAGtD,2CAAkD;AASlD,MAAa,iBAAiB;
|
|
1
|
+
{"version":3,"file":"sessionnegotiator.js","sourceRoot":"","sources":["../../../src/sender/sessionnegotiator.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,6 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.TCPSender = void 0;
|
|
37
|
-
const logger_ts_1 = require("../../utils/logger.js");
|
|
38
37
|
const bliperror_ts_1 = require("../bliperror.js");
|
|
39
38
|
const retryableerror_ts_1 = require("../retryableerror.js");
|
|
40
39
|
const sender_ts_1 = require("../sender.js");
|
|
@@ -57,20 +56,19 @@ class TCPSender extends sender_ts_1.OpenConnectionSender {
|
|
|
57
56
|
const host = `${prefix}tcp.${this.domain}`;
|
|
58
57
|
const auth = options.authentication;
|
|
59
58
|
const tlsOptions = auth.scheme === 'transport' ? { ...(0, transporttls_ts_1.buildTlsConnectOptions)(auth), servername: host } : null;
|
|
60
|
-
this.connectionHandle = new TCPHandle(host, 443, () => {
|
|
59
|
+
this.connectionHandle = new TCPHandle(host, 443, (socketRef) => {
|
|
61
60
|
this.sessionNegotiator = new sessionnegotiator_ts_1.SessionNegotiator(this, (session) => {
|
|
62
|
-
|
|
63
|
-
.get()
|
|
64
|
-
.then((s) => s.write(JSON.stringify(session)))
|
|
65
|
-
.catch((err) => logger_ts_1.logger.warn('TCPSender', 'Failed to write session frame', err));
|
|
61
|
+
socketRef.current.write(JSON.stringify(session));
|
|
66
62
|
});
|
|
67
|
-
const upgradeToTls = tlsOptions
|
|
63
|
+
const upgradeToTls = tlsOptions
|
|
64
|
+
? () => this.connectionHandle.upgradeToTls(tlsOptions, socketRef)
|
|
65
|
+
: undefined;
|
|
68
66
|
return this.sessionNegotiator.negotiate({
|
|
69
67
|
node: options.node,
|
|
70
68
|
authentication: auth,
|
|
71
69
|
upgradeToTls,
|
|
72
70
|
});
|
|
73
|
-
}, () => this.
|
|
71
|
+
}, () => this.rejectPending('Connection was closed'), (envelope) => {
|
|
74
72
|
if (this.sessionNegotiator?.negotiating) {
|
|
75
73
|
return this.sessionNegotiator.handleEnvelope(envelope);
|
|
76
74
|
}
|
|
@@ -154,15 +152,16 @@ class TCPHandle {
|
|
|
154
152
|
current.end().removeAllListeners().destroySoon();
|
|
155
153
|
}
|
|
156
154
|
}
|
|
157
|
-
async upgradeToTls(options) {
|
|
158
|
-
|
|
159
|
-
throw new Error('Cannot upgrade: no active socket.');
|
|
160
|
-
}
|
|
161
|
-
const plain = await this.currentSocketPromise;
|
|
155
|
+
async upgradeToTls(options, socketRef) {
|
|
156
|
+
const plain = socketRef.current;
|
|
162
157
|
plain.removeAllListeners('data');
|
|
163
158
|
this.buffer = Buffer.alloc(0);
|
|
164
159
|
const { connect: tlsConnect } = await Promise.resolve().then(() => __importStar(require('node:tls')));
|
|
165
160
|
const secured = tlsConnect({ ...options, socket: plain });
|
|
161
|
+
// Permanent no-op handler attached up front, so errors that arrive in
|
|
162
|
+
// the microtask gap after secureConnect resolves don't become
|
|
163
|
+
// uncaughtException. The underlying TCP socket's 'close' drives reconnect.
|
|
164
|
+
secured.on('error', () => undefined);
|
|
166
165
|
await new Promise((resolve, reject) => {
|
|
167
166
|
const onError = (err) => {
|
|
168
167
|
secured.off('secureConnect', onConnect);
|
|
@@ -176,7 +175,7 @@ class TCPHandle {
|
|
|
176
175
|
secured.once('error', onError);
|
|
177
176
|
});
|
|
178
177
|
this.attachDataListener(secured);
|
|
179
|
-
|
|
178
|
+
socketRef.current = secured;
|
|
180
179
|
}
|
|
181
180
|
attachDataListener(socket) {
|
|
182
181
|
socket.on('data', (chunk) => {
|
|
@@ -191,37 +190,54 @@ class TCPHandle {
|
|
|
191
190
|
const { connect } = await Promise.resolve().then(() => __importStar(require('node:net')));
|
|
192
191
|
const socket = connect({ host, port }).setKeepAlive(true);
|
|
193
192
|
this.buffer = Buffer.alloc(0);
|
|
194
|
-
|
|
193
|
+
// Mutable holder so upgradeToTls can swap the socket mid-handshake;
|
|
194
|
+
// the negotiator's sendSession reads .current at write time, so frames
|
|
195
|
+
// always go to the active socket even after the TLS upgrade.
|
|
196
|
+
const socketRef = { current: socket };
|
|
197
|
+
await new Promise((resolve, reject) => {
|
|
198
|
+
let connected = false;
|
|
195
199
|
socket.once('connect', () => {
|
|
200
|
+
connected = true;
|
|
196
201
|
resolve();
|
|
197
202
|
});
|
|
198
203
|
socket.once('error', (err) => {
|
|
199
|
-
if (!
|
|
200
|
-
|
|
204
|
+
if (!connected) {
|
|
205
|
+
reject(err);
|
|
201
206
|
}
|
|
207
|
+
// Post-connect errors are followed by 'close', which drives reconnect;
|
|
208
|
+
// this listener exists only to prevent uncaughtException.
|
|
202
209
|
});
|
|
203
210
|
socket.once('close', () => {
|
|
204
|
-
socket
|
|
211
|
+
// socketRef.current is the TLS-upgraded socket if upgrade ran; the
|
|
212
|
+
// plain one otherwise. Both cases hold the only live data listener.
|
|
213
|
+
socketRef.current.removeAllListeners('data');
|
|
205
214
|
if (!this.closing) {
|
|
206
|
-
|
|
215
|
+
if (connected)
|
|
216
|
+
onClose();
|
|
207
217
|
this.connectionAttempts++;
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
218
|
+
// Swallow the rejection of the now-orphaned previous promise; any
|
|
219
|
+
// in-flight get() awaiter still sees it via their captured reference.
|
|
220
|
+
const previous = this.currentSocketPromise;
|
|
221
|
+
this.currentSocketPromise =
|
|
222
|
+
this.connectionAttempts < 3 ? this.connect(host, port, onConnected, onClose) : null;
|
|
223
|
+
previous?.catch(() => undefined);
|
|
214
224
|
}
|
|
225
|
+
if (!connected)
|
|
226
|
+
reject(new Error('Socket closed before connect'));
|
|
215
227
|
});
|
|
216
228
|
this.attachDataListener(socket);
|
|
217
229
|
});
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
230
|
+
try {
|
|
231
|
+
await onConnected(socketRef);
|
|
232
|
+
}
|
|
233
|
+
catch (err) {
|
|
234
|
+
// Handshake failures (timeout, bad response) leave the socket open
|
|
235
|
+
// otherwise; destroy it so the 'close' handler drives reconnect.
|
|
236
|
+
socketRef.current.destroy();
|
|
237
|
+
throw err;
|
|
238
|
+
}
|
|
223
239
|
this.connectionAttempts = 0;
|
|
224
|
-
return
|
|
240
|
+
return socketRef.current;
|
|
225
241
|
}
|
|
226
242
|
}
|
|
227
243
|
//# sourceMappingURL=tcpsender.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tcpsender.js","sourceRoot":"","sources":["../../../../src/sender/tcp/tcpsender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,
|
|
1
|
+
{"version":3,"file":"tcpsender.js","sourceRoot":"","sources":["../../../../src/sender/tcp/tcpsender.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ class WebSocketSender extends sender_ts_1.OpenConnectionSender {
|
|
|
23
23
|
node: options.node,
|
|
24
24
|
authentication: options.authentication,
|
|
25
25
|
});
|
|
26
|
-
}, () => this.
|
|
26
|
+
}, () => this.rejectPending('Connection was closed'), (envelope) => {
|
|
27
27
|
if (this.sessionNegotiator?.negotiating) {
|
|
28
28
|
return this.sessionNegotiator.handleEnvelope(envelope);
|
|
29
29
|
}
|
|
@@ -97,6 +97,9 @@ class WebSocketHandle {
|
|
|
97
97
|
this.currentWebSocketPromise = this.connect(url, onConnected, onClose, onMessage);
|
|
98
98
|
}
|
|
99
99
|
get() {
|
|
100
|
+
if (!this.currentWebSocketPromise) {
|
|
101
|
+
throw new Error('WebSocket connection is not available.');
|
|
102
|
+
}
|
|
100
103
|
return this.currentWebSocketPromise;
|
|
101
104
|
}
|
|
102
105
|
async close() {
|
|
@@ -109,29 +112,54 @@ class WebSocketHandle {
|
|
|
109
112
|
async connect(url, onConnected, onClose, onMessage) {
|
|
110
113
|
const connection = new WebSocket(url, 'lime');
|
|
111
114
|
await new Promise((resolve, reject) => {
|
|
115
|
+
let connected = false;
|
|
112
116
|
connection.onopen = () => {
|
|
117
|
+
connected = true;
|
|
113
118
|
resolve();
|
|
114
119
|
};
|
|
120
|
+
connection.onerror = (err) => {
|
|
121
|
+
if (!connected) {
|
|
122
|
+
reject('message' in err ? new Error(`WebSocket error: ${err.message}`, { cause: err }) : err);
|
|
123
|
+
}
|
|
124
|
+
// Post-open errors are followed by 'close', which drives reconnect.
|
|
125
|
+
};
|
|
115
126
|
connection.onclose = () => {
|
|
116
127
|
if (!this.closing) {
|
|
128
|
+
if (connected)
|
|
129
|
+
onClose();
|
|
117
130
|
this.connectionAttempts++;
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
onClose();
|
|
131
|
+
// Swallow the rejection of the now-orphaned previous promise; any
|
|
132
|
+
// in-flight get() awaiter still sees it via their captured reference.
|
|
133
|
+
const previous = this.currentWebSocketPromise;
|
|
134
|
+
this.currentWebSocketPromise =
|
|
135
|
+
this.connectionAttempts < 3 ? this.connect(url, onConnected, onClose, onMessage) : null;
|
|
136
|
+
previous?.catch(() => undefined);
|
|
125
137
|
}
|
|
138
|
+
if (!connected)
|
|
139
|
+
reject(new Error('WebSocket closed before open'));
|
|
126
140
|
};
|
|
127
141
|
connection.onmessage = (event) => {
|
|
128
142
|
onMessage(JSON.parse(event.data));
|
|
129
143
|
};
|
|
130
|
-
connection.onerror = (err) => {
|
|
131
|
-
reject('message' in err ? new Error(`WebSocket error: ${err.message}`, { cause: err }) : err);
|
|
132
|
-
};
|
|
133
144
|
});
|
|
134
|
-
|
|
145
|
+
try {
|
|
146
|
+
await onConnected(connection);
|
|
147
|
+
}
|
|
148
|
+
catch (err) {
|
|
149
|
+
// Handshake failures leave the socket open otherwise; tear it down so
|
|
150
|
+
// the 'onclose' handler drives reconnect. Prefer ws.terminate() (hard
|
|
151
|
+
// kill, Node only) to avoid waiting on the graceful close handshake
|
|
152
|
+
// with a peer that just failed to negotiate; fall back to close() in
|
|
153
|
+
// browsers where terminate() doesn't exist.
|
|
154
|
+
const terminable = connection;
|
|
155
|
+
if (terminable.terminate) {
|
|
156
|
+
terminable.terminate();
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
connection.close();
|
|
160
|
+
}
|
|
161
|
+
throw err;
|
|
162
|
+
}
|
|
135
163
|
this.connectionAttempts = 0;
|
|
136
164
|
return connection;
|
|
137
165
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocketsender.js","sourceRoot":"","sources":["../../../../src/sender/websocket/websocketsender.ts"],"names":[],"mappings":";;;AAUA,qDAA8C;AAC9C,kDAA2C;AAC3C,4DAAqD;AACrD,gDAAwF;AACxF,4CAAuG;AACvG,kEAA2D;AAC3D,kDAAmD;AAEnD,MAAa,eAAgB,SAAQ,gCAAoB;IACpC,SAAS,GAAG,IAAI,gCAAiB,EAAE,CAAA;IACnC,gBAAgB,CAA2B;IAE5D,YACI,OAA2G;QAE3G,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAA,oCAAsB,EAAC,OAAO,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAA;QAEjE,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;QAE7D,IAAI,CAAC,gBAAgB,GAAG,IAAI,eAAe,CACvC,SAAS,MAAM,MAAM,IAAI,CAAC,MAAM,EAAE,EAClC,CAAC,SAAS,EAAE,EAAE;YACV,IAAI,CAAC,iBAAiB,GAAG,IAAI,wCAAiB,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE;gBAC7D,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;YAC3C,CAAC,CAAC,CAAA;YACF,OAAO,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC;gBACpC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,cAAc,EAAE,OAAO,CAAC,cAAc;aACzC,CAAC,CAAA;QACN,CAAC,EACD,GAAG,EAAE,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"websocketsender.js","sourceRoot":"","sources":["../../../../src/sender/websocket/websocketsender.ts"],"names":[],"mappings":"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"}
|
|
@@ -116,9 +116,9 @@ export class EnvelopeResolver {
|
|
|
116
116
|
this.resolveEnvelopeResponse(id, new Error(`Connection for envelope '${id}' was closed`));
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
|
-
rejectPendingEnvelopes(
|
|
119
|
+
rejectPendingEnvelopes(error) {
|
|
120
120
|
for (const id in this.waitingEnvelopeResponseResolvers) {
|
|
121
|
-
this.resolveEnvelopeResponse(id,
|
|
121
|
+
this.resolveEnvelopeResponse(id, error);
|
|
122
122
|
}
|
|
123
123
|
}
|
|
124
124
|
resolveEnvelopeResponse(id, envelopeOrError) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enveloperesolver.js","sourceRoot":"","sources":["../../../src/sender/enveloperesolver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"enveloperesolver.js","sourceRoot":"","sources":["../../../src/sender/enveloperesolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Node, } from "../types/index.js";
|
|
2
2
|
import { EnvelopeResolver } from "./enveloperesolver.js";
|
|
3
|
+
import { RetryableError } from "./retryableerror.js";
|
|
3
4
|
const ROOT_AUTHORITIES = ['msging.net', 'blip.ai', '0mn.io'];
|
|
4
5
|
export class ConnectionSender {
|
|
5
6
|
_domain;
|
|
@@ -93,5 +94,10 @@ export class OpenConnectionSender extends ConnectionSender {
|
|
|
93
94
|
this.envelopeResolver.close();
|
|
94
95
|
return Promise.resolve();
|
|
95
96
|
}
|
|
97
|
+
rejectPending(reason) {
|
|
98
|
+
const error = new RetryableError(reason);
|
|
99
|
+
this.sessionNegotiator?.fail(error);
|
|
100
|
+
this.envelopeResolver.rejectPendingEnvelopes(error);
|
|
101
|
+
}
|
|
96
102
|
}
|
|
97
103
|
//# sourceMappingURL=sender.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender.js","sourceRoot":"","sources":["../../../src/sender/sender.ts"],"names":[],"mappings":"AAAA,OAAO,EAOH,IAAI,GAIP,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,gBAAgB,EAAgC,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"sender.js","sourceRoot":"","sources":["../../../src/sender/sender.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,16 +7,14 @@ export class SessionNegotiator {
|
|
|
7
7
|
session = null;
|
|
8
8
|
presencePromise = null;
|
|
9
9
|
currentSessionResolver = null;
|
|
10
|
+
failure = null;
|
|
10
11
|
constructor(sender, sendSession) {
|
|
11
12
|
this.sender = sender;
|
|
12
13
|
this.sendSession = sendSession;
|
|
13
14
|
}
|
|
14
15
|
async negotiate(options) {
|
|
15
|
-
const timeout = setTimeout(
|
|
16
|
-
|
|
17
|
-
await this.sender.close();
|
|
18
|
-
throw new Error('Negotiation timeout');
|
|
19
|
-
}
|
|
16
|
+
const timeout = setTimeout(() => {
|
|
17
|
+
this.fail(new Error('Negotiation timeout'));
|
|
20
18
|
}, 60000); // 60 seconds
|
|
21
19
|
try {
|
|
22
20
|
this.sendSession({
|
|
@@ -89,6 +87,13 @@ export class SessionNegotiator {
|
|
|
89
87
|
this.currentSessionResolver = null;
|
|
90
88
|
}
|
|
91
89
|
}
|
|
90
|
+
fail(error) {
|
|
91
|
+
this.failure = error;
|
|
92
|
+
if (this.currentSessionResolver) {
|
|
93
|
+
this.currentSessionResolver.reject(error);
|
|
94
|
+
this.currentSessionResolver = null;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
92
97
|
async ensurePresence(currentCommandUri = '') {
|
|
93
98
|
if (!this.session) {
|
|
94
99
|
throw new Error('Session not established');
|
|
@@ -124,10 +129,10 @@ export class SessionNegotiator {
|
|
|
124
129
|
}
|
|
125
130
|
finish() {
|
|
126
131
|
if (!this.session) {
|
|
127
|
-
|
|
132
|
+
return;
|
|
128
133
|
}
|
|
129
134
|
this.sendSession({
|
|
130
|
-
id: this.session
|
|
135
|
+
id: this.session.id,
|
|
131
136
|
state: 'finishing',
|
|
132
137
|
});
|
|
133
138
|
}
|
|
@@ -135,6 +140,9 @@ export class SessionNegotiator {
|
|
|
135
140
|
return this.state !== 'established' && this.state !== 'present';
|
|
136
141
|
}
|
|
137
142
|
async waitForSessionResponse() {
|
|
143
|
+
if (this.failure) {
|
|
144
|
+
throw this.failure;
|
|
145
|
+
}
|
|
138
146
|
const { promise, resolve, reject } = Promise.withResolvers();
|
|
139
147
|
this.currentSessionResolver = { resolve, reject };
|
|
140
148
|
const session = await promise;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionnegotiator.js","sourceRoot":"","sources":["../../../src/sender/sessionnegotiator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAiB,MAAM,kBAAkB,CAAA;AAGtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AASlD,MAAM,OAAO,iBAAiB;
|
|
1
|
+
{"version":3,"file":"sessionnegotiator.js","sourceRoot":"","sources":["../../../src/sender/sessionnegotiator.ts"],"names":[],"mappings":"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"}
|