@whitewall/blip-sdk 0.0.97 → 0.0.98
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/client.js +7 -0
- package/dist/cjs/client.js.map +1 -1
- package/dist/cjs/index.js +2 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/sender/enveloperesolver.js +40 -0
- package/dist/cjs/sender/enveloperesolver.js.map +1 -0
- package/dist/cjs/sender/http/httpsender.js +8 -36
- package/dist/cjs/sender/http/httpsender.js.map +1 -1
- package/dist/cjs/sender/sessionegotiator.js +123 -0
- package/dist/cjs/sender/sessionegotiator.js.map +1 -0
- package/dist/cjs/sender/tcp/tcpsender.js +182 -0
- package/dist/cjs/sender/tcp/tcpsender.js.map +1 -0
- package/dist/cjs/sender/throttler.js +38 -0
- package/dist/cjs/sender/throttler.js.map +1 -0
- package/dist/cjs/sender/websocket/websocketsender.js +127 -0
- package/dist/cjs/sender/websocket/websocketsender.js.map +1 -0
- package/dist/cjs/types/command.js +3 -0
- package/dist/cjs/types/command.js.map +1 -1
- package/dist/cjs/types/session.js +8 -0
- package/dist/cjs/types/session.js.map +1 -0
- package/dist/esm/client.js +7 -0
- package/dist/esm/client.js.map +1 -1
- package/dist/esm/index.js +2 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/sender/enveloperesolver.js +36 -0
- package/dist/esm/sender/enveloperesolver.js.map +1 -0
- package/dist/esm/sender/http/httpsender.js +8 -36
- package/dist/esm/sender/http/httpsender.js.map +1 -1
- package/dist/esm/sender/sessionegotiator.js +119 -0
- package/dist/esm/sender/sessionegotiator.js.map +1 -0
- package/dist/esm/sender/tcp/tcpsender.js +178 -0
- package/dist/esm/sender/tcp/tcpsender.js.map +1 -0
- package/dist/esm/sender/throttler.js +34 -0
- package/dist/esm/sender/throttler.js.map +1 -0
- package/dist/esm/sender/websocket/websocketsender.js +123 -0
- package/dist/esm/sender/websocket/websocketsender.js.map +1 -0
- package/dist/esm/types/command.js +1 -1
- package/dist/esm/types/command.js.map +1 -1
- package/dist/esm/types/session.js +4 -0
- package/dist/esm/types/session.js.map +1 -0
- package/dist/types/client.d.ts +2 -0
- package/dist/types/client.d.ts.map +1 -1
- package/dist/types/index.d.ts +2 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/sender/enveloperesolver.d.ts +10 -0
- package/dist/types/sender/enveloperesolver.d.ts.map +1 -0
- package/dist/types/sender/http/httpsender.d.ts +1 -2
- package/dist/types/sender/http/httpsender.d.ts.map +1 -1
- package/dist/types/sender/sender.d.ts +5 -1
- package/dist/types/sender/sender.d.ts.map +1 -1
- package/dist/types/sender/sessionegotiator.d.ts +30 -0
- package/dist/types/sender/sessionegotiator.d.ts.map +1 -0
- package/dist/types/sender/tcp/tcpsender.d.ts +14 -0
- package/dist/types/sender/tcp/tcpsender.d.ts.map +1 -0
- package/dist/types/sender/throttler.d.ts +5 -0
- package/dist/types/sender/throttler.d.ts.map +1 -0
- package/dist/types/sender/websocket/websocketsender.d.ts +15 -0
- package/dist/types/sender/websocket/websocketsender.d.ts.map +1 -0
- package/dist/types/types/command.d.ts +3 -1
- package/dist/types/types/command.d.ts.map +1 -1
- package/dist/types/types/session.d.ts +17 -0
- package/dist/types/types/session.d.ts.map +1 -0
- package/package.json +2 -1
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.WebSocketSender = void 0;
|
|
4
|
+
const index_js_1 = require("../../types/index.js");
|
|
5
|
+
const bliperror_js_1 = require("../bliperror.js");
|
|
6
|
+
const enveloperesolver_js_1 = require("../enveloperesolver.js");
|
|
7
|
+
const sessionegotiator_js_1 = require("../sessionegotiator.js");
|
|
8
|
+
const throttler_js_1 = require("../throttler.js");
|
|
9
|
+
class WebSocketSender {
|
|
10
|
+
throttler = new throttler_js_1.EnvelopeThrottler();
|
|
11
|
+
envelopeResolver = new enveloperesolver_js_1.EnvelopeResolver(this);
|
|
12
|
+
connectionHandle;
|
|
13
|
+
sessionNegotiator = null;
|
|
14
|
+
constructor(identifier, accessKey, tenantId) {
|
|
15
|
+
const prefix = tenantId ? `${tenantId}.` : '';
|
|
16
|
+
this.connectionHandle = new WebSocketHandle(`wss://${prefix}ws.msging.net`, (webSocket) => {
|
|
17
|
+
this.sessionNegotiator = new sessionegotiator_js_1.SessionNegotiator(this, (session) => {
|
|
18
|
+
webSocket.send(JSON.stringify(session));
|
|
19
|
+
});
|
|
20
|
+
return this.sessionNegotiator.negotiate({
|
|
21
|
+
identity: new index_js_1.Node(identifier, 'msging.net'),
|
|
22
|
+
authentication: {
|
|
23
|
+
scheme: 'key',
|
|
24
|
+
data: { key: accessKey },
|
|
25
|
+
},
|
|
26
|
+
});
|
|
27
|
+
}, (envelope) => {
|
|
28
|
+
if (this.sessionNegotiator?.negotiating) {
|
|
29
|
+
return this.sessionNegotiator.handleEnvelope(envelope);
|
|
30
|
+
}
|
|
31
|
+
this.envelopeResolver.resolve(envelope);
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
async sendMessage(message) {
|
|
35
|
+
await this.throttler.throttle('message');
|
|
36
|
+
const webSocket = await this.connectionHandle.get();
|
|
37
|
+
await this.sessionNegotiator?.ensurePresence();
|
|
38
|
+
webSocket.send(JSON.stringify(message));
|
|
39
|
+
}
|
|
40
|
+
sendCommand(command) {
|
|
41
|
+
return this.withRetryPolicy(async () => {
|
|
42
|
+
await this.throttler.throttle('command');
|
|
43
|
+
const envelopeResponsePromise = this.envelopeResolver.createEnvelopeResponsePromise(command.id);
|
|
44
|
+
const webSocket = await this.connectionHandle.get();
|
|
45
|
+
await this.sessionNegotiator?.ensurePresence(command.uri);
|
|
46
|
+
webSocket.send(JSON.stringify(command));
|
|
47
|
+
const response = (await envelopeResponsePromise);
|
|
48
|
+
if (response.status === 'failure') {
|
|
49
|
+
throw new bliperror_js_1.BlipError(command.uri, response.reason.code, response.reason.description);
|
|
50
|
+
}
|
|
51
|
+
else if (response.status === 'success') {
|
|
52
|
+
return response.resource;
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
throw new Error(`Unexpected command response for command: ${command.uri}`);
|
|
56
|
+
}
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
async sendCommandResponse(response) {
|
|
60
|
+
const webSocket = await this.connectionHandle.get();
|
|
61
|
+
webSocket.send(JSON.stringify(response));
|
|
62
|
+
}
|
|
63
|
+
async close() {
|
|
64
|
+
this.sessionNegotiator?.finish();
|
|
65
|
+
await this.connectionHandle.close();
|
|
66
|
+
}
|
|
67
|
+
async withRetryPolicy(fn, retries = 5) {
|
|
68
|
+
try {
|
|
69
|
+
return await fn();
|
|
70
|
+
}
|
|
71
|
+
catch (err) {
|
|
72
|
+
if (retries > 0 && err instanceof bliperror_js_1.BlipError && err.code === 101) {
|
|
73
|
+
// wait before retrying
|
|
74
|
+
await new Promise((resolve) => setTimeout(resolve, Math.random() * 1000));
|
|
75
|
+
return this.withRetryPolicy(fn, retries - 1);
|
|
76
|
+
}
|
|
77
|
+
throw err;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
exports.WebSocketSender = WebSocketSender;
|
|
82
|
+
class WebSocketHandle {
|
|
83
|
+
currentWebSocketPromise = null;
|
|
84
|
+
closing = false;
|
|
85
|
+
connectionAttempts = 0;
|
|
86
|
+
constructor(url, onConnected, onMessage) {
|
|
87
|
+
this.currentWebSocketPromise = this.connect(url, onConnected, onMessage);
|
|
88
|
+
}
|
|
89
|
+
get() {
|
|
90
|
+
return this.currentWebSocketPromise;
|
|
91
|
+
}
|
|
92
|
+
async close() {
|
|
93
|
+
if (!this.closing && this.currentWebSocketPromise) {
|
|
94
|
+
this.closing = true;
|
|
95
|
+
const current = await this.currentWebSocketPromise;
|
|
96
|
+
current.close();
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
connect(url, onConnected, onMessage) {
|
|
100
|
+
const connection = new WebSocket(url, 'lime');
|
|
101
|
+
return new Promise((resolve, reject) => {
|
|
102
|
+
connection.onopen = async () => {
|
|
103
|
+
await onConnected(connection);
|
|
104
|
+
this.connectionAttempts = 0;
|
|
105
|
+
resolve(connection);
|
|
106
|
+
};
|
|
107
|
+
connection.onclose = () => {
|
|
108
|
+
if (!this.closing) {
|
|
109
|
+
this.connectionAttempts++;
|
|
110
|
+
if (this.connectionAttempts < 3) {
|
|
111
|
+
this.currentWebSocketPromise = this.connect(url, onConnected, onMessage);
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
reject(new Error('Failed to connect to WebSocket'));
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
};
|
|
118
|
+
connection.onmessage = (event) => {
|
|
119
|
+
onMessage(JSON.parse(event.data));
|
|
120
|
+
};
|
|
121
|
+
connection.onerror = (error) => {
|
|
122
|
+
reject(error);
|
|
123
|
+
};
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
//# sourceMappingURL=websocketsender.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"websocketsender.js","sourceRoot":"","sources":["../../../../src/sender/websocket/websocketsender.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/types/command.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/types/command.ts"],"names":[],"mappings":";;;AAuCO,MAAM,SAAS,GAAG,CAAC,QAAkB,EAAuC,EAAE,CACjF,QAAQ,IAAI,QAAQ,IAAI,KAAK,IAAI,QAAQ,CAAA;AADhC,QAAA,SAAS,aACuB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/types/session.ts"],"names":[],"mappings":";;;AAoBO,MAAM,SAAS,GAAG,CAAC,KAAe,EAAoB,EAAE;IAC3D,OAAO,OAAO,IAAI,KAAK,CAAA;AAC3B,CAAC,CAAA;AAFY,QAAA,SAAS,aAErB"}
|
package/dist/esm/client.js
CHANGED
|
@@ -10,6 +10,7 @@ import { SchedulerNamespace } from './namespaces/scheduler.js';
|
|
|
10
10
|
import { WhatsAppNamespace } from './namespaces/whatsapp.js';
|
|
11
11
|
import { HttpSender } from './sender/http/httpsender.js';
|
|
12
12
|
import { Node } from './types/node.js';
|
|
13
|
+
import { randomId } from './utils/random.js';
|
|
13
14
|
export class BlipClient {
|
|
14
15
|
sender;
|
|
15
16
|
constructor(sender, defaultOptions) {
|
|
@@ -41,6 +42,12 @@ export class BlipClient {
|
|
|
41
42
|
: new Node(botIdentityOrIdentifier, 'msging.net').toIdentity();
|
|
42
43
|
return new BlipClient(this.sender, { ownerIdentity: identity });
|
|
43
44
|
}
|
|
45
|
+
sendMessage(message) {
|
|
46
|
+
return this.sender.sendMessage({
|
|
47
|
+
id: randomId(),
|
|
48
|
+
...message,
|
|
49
|
+
});
|
|
50
|
+
}
|
|
44
51
|
static http(botIdentityOrIdentifier, accessKey, tenantId) {
|
|
45
52
|
return new BlipClient(HttpSender.login(botIdentityOrIdentifier, accessKey, tenantId));
|
|
46
53
|
}
|
package/dist/esm/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAA;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAA;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAGxD,OAAO,EAAiB,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAE5C,MAAM,OAAO,UAAU;IAEC;IADpB,YACoB,MAAc,EAC9B,cAAmC;QADnB,WAAM,GAAN,MAAM,CAAQ;QAG9B,IAAI,CAAC,OAAO,GAAG,IAAI,gBAAgB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;QACzD,IAAI,CAAC,OAAO,GAAG,IAAI,gBAAgB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;QACzD,IAAI,CAAC,IAAI,GAAG,IAAI,aAAa,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;QACnD,IAAI,CAAC,KAAK,GAAG,IAAI,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;QACrD,IAAI,CAAC,QAAQ,GAAG,IAAI,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;QAC3D,IAAI,CAAC,SAAS,GAAG,IAAI,kBAAkB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;QAC7D,IAAI,CAAC,SAAS,GAAG,IAAI,kBAAkB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;QAC7D,IAAI,CAAC,cAAc,GAAG,IAAI,uBAAuB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;QACvE,IAAI,CAAC,MAAM,GAAG,IAAI,eAAe,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;QACvD,IAAI,CAAC,OAAO,GAAG,IAAI,gBAAgB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;IAC7D,CAAC;IAEe,OAAO,CAAmB;IAC1B,OAAO,CAAmB;IAC1B,IAAI,CAAgB;IACpB,KAAK,CAAiB;IACtB,QAAQ,CAAoB;IAC5B,SAAS,CAAqB;IAC9B,SAAS,CAAqB;IAC9B,cAAc,CAA0B;IACxC,MAAM,CAAkB;IACxB,OAAO,CAAmB;IAEnC,EAAE,CAAC,uBAA0C;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC;YAClD,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,IAAI,IAAI,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC,UAAU,EAAE,CAAA;QAClE,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAA;IACnE,CAAC;IAEM,WAAW,CAA4B,OAAkC;QAC5E,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;YAC3B,EAAE,EAAE,QAAQ,EAAE;YACd,GAAG,OAAO;SACb,CAAC,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,uBAA0C,EAAE,SAAiB,EAAE,QAAgB;QAC9F,OAAO,IAAI,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,uBAAuB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAA;IACzF,CAAC;CACJ"}
|
package/dist/esm/index.js
CHANGED
|
@@ -6,6 +6,8 @@ export * from './sender/sender.js';
|
|
|
6
6
|
export * from './sender/bliperror.js';
|
|
7
7
|
export * from './sender/gateway/customgatewaysender.js';
|
|
8
8
|
export * from './sender/portal/pluginsender.js';
|
|
9
|
+
export * from './sender/websocket/websocketsender.js';
|
|
10
|
+
export * from './sender/tcp/tcpsender.js';
|
|
9
11
|
export * from './sender/http/httpsender.js';
|
|
10
12
|
export * from './namespaces/namespace.js';
|
|
11
13
|
//# sourceMappingURL=index.js.map
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,yCAAyC,CAAA;AACvD,cAAc,iCAAiC,CAAA;AAC/C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,yCAAyC,CAAA;AACvD,cAAc,iCAAiC,CAAA;AAC/C,cAAc,uCAAuC,CAAA;AACrD,cAAc,2BAA2B,CAAA;AACzC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { isCommand } from '../types/command.js';
|
|
2
|
+
export class EnvelopeResolver {
|
|
3
|
+
sender;
|
|
4
|
+
waitingEnvelopeResponseResolvers = {};
|
|
5
|
+
constructor(sender) {
|
|
6
|
+
this.sender = sender;
|
|
7
|
+
}
|
|
8
|
+
async resolve(envelope) {
|
|
9
|
+
const deferred = this.waitingEnvelopeResponseResolvers[envelope.id];
|
|
10
|
+
if (deferred) {
|
|
11
|
+
deferred(envelope);
|
|
12
|
+
}
|
|
13
|
+
else {
|
|
14
|
+
// This is a rough way to handle commands to the channel
|
|
15
|
+
// But it works for most use cases
|
|
16
|
+
if (isCommand(envelope) && envelope.method === 'get' && envelope.uri === '/ping') {
|
|
17
|
+
await this.sender.sendCommandResponse({
|
|
18
|
+
id: envelope.id,
|
|
19
|
+
method: 'get',
|
|
20
|
+
type: 'application/vnd.lime.ping+json',
|
|
21
|
+
status: 'success',
|
|
22
|
+
resource: {},
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
throw new Error(`Unexpected envelope received: ${JSON.stringify(envelope)}`);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
createEnvelopeResponsePromise(id) {
|
|
31
|
+
return new Promise((resolve) => {
|
|
32
|
+
this.waitingEnvelopeResponseResolvers[id] = resolve;
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=enveloperesolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"enveloperesolver.js","sourceRoot":"","sources":["../../../src/sender/enveloperesolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAIrE,MAAM,OAAO,gBAAgB;IAGI;IAFZ,gCAAgC,GAAiD,EAAE,CAAA;IAEpG,YAA6B,MAA4B;QAA5B,WAAM,GAAN,MAAM,CAAsB;IAAG,CAAC;IAEtD,KAAK,CAAC,OAAO,CAAC,QAAkB;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,gCAAgC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QACnE,IAAI,QAAQ,EAAE,CAAC;YACX,QAAQ,CAAC,QAAQ,CAAC,CAAA;QACtB,CAAC;aAAM,CAAC;YACJ,wDAAwD;YACxD,kCAAkC;YAClC,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,KAAK,IAAI,QAAQ,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;gBAC/E,MAAM,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC;oBAClC,EAAE,EAAE,QAAQ,CAAC,EAAE;oBACf,MAAM,EAAE,KAAK;oBACb,IAAI,EAAE,gCAAgC;oBACtC,MAAM,EAAE,SAAS;oBACjB,QAAQ,EAAE,EAAE;iBAC+B,CAAC,CAAA;YACpD,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;YAChF,CAAC;QACL,CAAC;IACL,CAAC;IAEM,6BAA6B,CAAC,EAAU;QAC3C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,gCAAgC,CAAC,EAAE,CAAC,GAAG,OAAO,CAAA;QACvD,CAAC,CAAC,CAAA;IACN,CAAC;CACJ"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { Node, } from '../../types/index.js';
|
|
2
2
|
import { BlipError } from '../bliperror.js';
|
|
3
|
+
import { EnvelopeThrottler } from '../throttler.js';
|
|
3
4
|
export class HttpSender {
|
|
4
5
|
token;
|
|
5
6
|
baseurl;
|
|
7
|
+
throttler = new EnvelopeThrottler();
|
|
6
8
|
constructor(token, tenantId) {
|
|
7
9
|
this.token = token.startsWith('Key ') ? token.slice(4) : token;
|
|
8
10
|
const prefix = tenantId ? `${tenantId}.` : '';
|
|
@@ -10,7 +12,7 @@ export class HttpSender {
|
|
|
10
12
|
}
|
|
11
13
|
sendMessage(message) {
|
|
12
14
|
return this.withFetchRetryPolicy(async () => {
|
|
13
|
-
await this.throttle('message');
|
|
15
|
+
await this.throttler.throttle('message');
|
|
14
16
|
const response = await fetch(`${this.baseurl}/messages`, {
|
|
15
17
|
method: 'POST',
|
|
16
18
|
headers: {
|
|
@@ -26,7 +28,7 @@ export class HttpSender {
|
|
|
26
28
|
}
|
|
27
29
|
sendCommand(command) {
|
|
28
30
|
return this.withFetchRetryPolicy(async () => {
|
|
29
|
-
await this.throttle('command');
|
|
31
|
+
await this.throttler.throttle('command');
|
|
30
32
|
const response = await fetch(`${this.baseurl}/commands`, {
|
|
31
33
|
method: 'POST',
|
|
32
34
|
headers: {
|
|
@@ -57,37 +59,6 @@ export class HttpSender {
|
|
|
57
59
|
const token = btoa(`${botIdentity}:${atob(accessKey)}`);
|
|
58
60
|
return new HttpSender(token, tenantId);
|
|
59
61
|
}
|
|
60
|
-
sent = {
|
|
61
|
-
message: {
|
|
62
|
-
max: 50,
|
|
63
|
-
started: 0,
|
|
64
|
-
count: 0,
|
|
65
|
-
},
|
|
66
|
-
command: {
|
|
67
|
-
max: 200,
|
|
68
|
-
started: 0,
|
|
69
|
-
count: 0,
|
|
70
|
-
},
|
|
71
|
-
};
|
|
72
|
-
async throttle(type) {
|
|
73
|
-
const throughput = this.sent[type].max * 0.8;
|
|
74
|
-
const timeToReset = 2000;
|
|
75
|
-
while (true) {
|
|
76
|
-
const elapsed = Date.now() - this.sent[type].started;
|
|
77
|
-
if (elapsed >= timeToReset) {
|
|
78
|
-
this.sent[type].started = Date.now();
|
|
79
|
-
this.sent[type].count = 0;
|
|
80
|
-
}
|
|
81
|
-
if (this.sent[type].count < throughput) {
|
|
82
|
-
this.sent[type].count++;
|
|
83
|
-
break;
|
|
84
|
-
}
|
|
85
|
-
else {
|
|
86
|
-
const wait = timeToReset - elapsed;
|
|
87
|
-
await new Promise((resolve) => setTimeout(resolve, wait));
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
62
|
async withFetchRetryPolicy(fn, retries = 5) {
|
|
92
63
|
try {
|
|
93
64
|
return await fn();
|
|
@@ -102,9 +73,10 @@ export class HttpSender {
|
|
|
102
73
|
(err instanceof BlipError && err.code === 101) ||
|
|
103
74
|
// Probably cloudflare trying to mitigate a DDoS attack
|
|
104
75
|
(err.cause instanceof Error && err.cause?.name === 'ConnectTimeoutError') ||
|
|
105
|
-
err.message === 'terminated'
|
|
106
|
-
|
|
107
|
-
|
|
76
|
+
err.message === 'terminated' ||
|
|
77
|
+
err.message === 'fetch failed')) {
|
|
78
|
+
// wait before retrying
|
|
79
|
+
await new Promise((resolve) => setTimeout(resolve, Math.random() * 1000));
|
|
108
80
|
return this.withFetchRetryPolicy(fn, retries - 1);
|
|
109
81
|
}
|
|
110
82
|
throw err;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpsender.js","sourceRoot":"","sources":["../../../../src/sender/http/httpsender.ts"],"names":[],"mappings":"AAAA,OAAO,EAOH,IAAI,GACP,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"httpsender.js","sourceRoot":"","sources":["../../../../src/sender/http/httpsender.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { Node } from '../types/node.js';
|
|
2
|
+
export class SessionNegotiator {
|
|
3
|
+
sender;
|
|
4
|
+
sendSession;
|
|
5
|
+
state = 'new';
|
|
6
|
+
session = null;
|
|
7
|
+
presencePromise = null;
|
|
8
|
+
currentMessageResolver = null;
|
|
9
|
+
constructor(sender, sendSession) {
|
|
10
|
+
this.sender = sender;
|
|
11
|
+
this.sendSession = sendSession;
|
|
12
|
+
}
|
|
13
|
+
async negotiate(options) {
|
|
14
|
+
setTimeout(() => {
|
|
15
|
+
if (this.negotiating) {
|
|
16
|
+
this.sender.close();
|
|
17
|
+
throw new Error('Negotiation timeout');
|
|
18
|
+
}
|
|
19
|
+
}, 100000);
|
|
20
|
+
this.sendSession({
|
|
21
|
+
state: 'new',
|
|
22
|
+
});
|
|
23
|
+
const negotiation = await this.waitForSessionResponse();
|
|
24
|
+
let authenticating;
|
|
25
|
+
if (negotiation.state === 'negotiating') {
|
|
26
|
+
if (!negotiation.encryptionOptions?.includes('none')) {
|
|
27
|
+
throw new Error('Unsupported encryption options');
|
|
28
|
+
}
|
|
29
|
+
this.sendSession({
|
|
30
|
+
id: negotiation.id,
|
|
31
|
+
state: 'negotiating',
|
|
32
|
+
encryption: 'none',
|
|
33
|
+
compression: negotiation.compressionOptions?.at(-1),
|
|
34
|
+
});
|
|
35
|
+
await this.waitForSessionResponse();
|
|
36
|
+
authenticating = await this.waitForSessionResponse();
|
|
37
|
+
}
|
|
38
|
+
else if (negotiation.state === 'authenticating') {
|
|
39
|
+
authenticating = negotiation;
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
throw new Error('Unexpected session state');
|
|
43
|
+
}
|
|
44
|
+
if (!authenticating.schemeOptions?.includes(options.authentication.scheme)) {
|
|
45
|
+
throw new Error('Unsupported authentication scheme');
|
|
46
|
+
}
|
|
47
|
+
this.sendSession({
|
|
48
|
+
id: authenticating.id,
|
|
49
|
+
from: options.identity,
|
|
50
|
+
state: 'authenticating',
|
|
51
|
+
scheme: options.authentication.scheme,
|
|
52
|
+
authentication: options.authentication.data,
|
|
53
|
+
});
|
|
54
|
+
const authenticated = await this.waitForSessionResponse();
|
|
55
|
+
if (authenticated.state !== 'established') {
|
|
56
|
+
throw new Error('Authentication failed');
|
|
57
|
+
}
|
|
58
|
+
this.session = {
|
|
59
|
+
id: authenticated.id,
|
|
60
|
+
localNode: Node.from(authenticated.to),
|
|
61
|
+
remoteNode: Node.from(authenticated.from),
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
handleEnvelope(message) {
|
|
65
|
+
if (this.currentMessageResolver) {
|
|
66
|
+
this.currentMessageResolver.resolve(message);
|
|
67
|
+
this.currentMessageResolver = null;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
async ensurePresence(currentCommandUri = '') {
|
|
71
|
+
if (!this.session) {
|
|
72
|
+
throw new Error('Session not established');
|
|
73
|
+
}
|
|
74
|
+
if (this.state === 'present') {
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
// its actually setting the presence
|
|
78
|
+
if (currentCommandUri === '/presence') {
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
if (this.presencePromise) {
|
|
82
|
+
return this.presencePromise;
|
|
83
|
+
}
|
|
84
|
+
this.presencePromise = this.sender.sendCommand({
|
|
85
|
+
id: Date.now().toString(),
|
|
86
|
+
method: 'set',
|
|
87
|
+
uri: '/presence',
|
|
88
|
+
type: 'application/vnd.lime.presence+json',
|
|
89
|
+
resource: {
|
|
90
|
+
status: 'available',
|
|
91
|
+
},
|
|
92
|
+
});
|
|
93
|
+
await this.presencePromise;
|
|
94
|
+
this.state = 'present';
|
|
95
|
+
}
|
|
96
|
+
finish() {
|
|
97
|
+
if (!this.session) {
|
|
98
|
+
throw new Error('Session not established');
|
|
99
|
+
}
|
|
100
|
+
this.sendSession({
|
|
101
|
+
id: this.session?.id,
|
|
102
|
+
state: 'finishing',
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
get negotiating() {
|
|
106
|
+
return this.state !== 'established' && this.state !== 'present';
|
|
107
|
+
}
|
|
108
|
+
async waitForSessionResponse() {
|
|
109
|
+
const { promise, resolve, reject } = Promise.withResolvers();
|
|
110
|
+
this.currentMessageResolver = { resolve, reject };
|
|
111
|
+
const session = await promise;
|
|
112
|
+
if (session.state === 'failed') {
|
|
113
|
+
throw new Error(`Session negotiation failed: ${session.reason?.description} (${session.reason?.code})`);
|
|
114
|
+
}
|
|
115
|
+
this.state = session.state;
|
|
116
|
+
return session;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
//# sourceMappingURL=sessionegotiator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessionegotiator.js","sourceRoot":"","sources":["../../../src/sender/sessionegotiator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
import { connect as tcpConnect } from 'node:net';
|
|
2
|
+
import { Node, } from '../../types/index.js';
|
|
3
|
+
import { BlipError } from '../bliperror.js';
|
|
4
|
+
import { EnvelopeResolver } from '../enveloperesolver.js';
|
|
5
|
+
import { SessionNegotiator } from '../sessionegotiator.js';
|
|
6
|
+
import { EnvelopeThrottler } from '../throttler.js';
|
|
7
|
+
export class TCPSender {
|
|
8
|
+
throttler = new EnvelopeThrottler();
|
|
9
|
+
envelopeResolver = new EnvelopeResolver(this);
|
|
10
|
+
connectionHandle;
|
|
11
|
+
sessionNegotiator = null;
|
|
12
|
+
constructor(identifier, accessKey, tenantId) {
|
|
13
|
+
const prefix = tenantId ? `${tenantId}.` : '';
|
|
14
|
+
this.connectionHandle = new TCPHandle(`${prefix}tcp.msging.net`, 443, async (socket) => {
|
|
15
|
+
this.sessionNegotiator = new SessionNegotiator(this, (session) => {
|
|
16
|
+
socket.write(JSON.stringify(session));
|
|
17
|
+
});
|
|
18
|
+
await this.sessionNegotiator.negotiate({
|
|
19
|
+
identity: new Node(identifier, 'msging.net'),
|
|
20
|
+
authentication: {
|
|
21
|
+
scheme: 'key',
|
|
22
|
+
data: { key: accessKey },
|
|
23
|
+
},
|
|
24
|
+
});
|
|
25
|
+
}, (envelope) => {
|
|
26
|
+
if (this.sessionNegotiator?.negotiating) {
|
|
27
|
+
return this.sessionNegotiator.handleEnvelope(envelope);
|
|
28
|
+
}
|
|
29
|
+
this.envelopeResolver.resolve(envelope);
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
async sendMessage(message) {
|
|
33
|
+
await this.throttler.throttle('message');
|
|
34
|
+
const socket = await this.connectionHandle.get();
|
|
35
|
+
await this.sessionNegotiator?.ensurePresence();
|
|
36
|
+
socket.write(JSON.stringify(message));
|
|
37
|
+
}
|
|
38
|
+
async sendCommand(command) {
|
|
39
|
+
await this.throttler.throttle('command');
|
|
40
|
+
const envelopeResponsePromise = this.envelopeResolver.createEnvelopeResponsePromise(command.id);
|
|
41
|
+
const socket = await this.connectionHandle.get();
|
|
42
|
+
await this.sessionNegotiator?.ensurePresence(command.uri);
|
|
43
|
+
socket.write(JSON.stringify(command));
|
|
44
|
+
const response = (await envelopeResponsePromise);
|
|
45
|
+
if (response.status === 'failure') {
|
|
46
|
+
throw new BlipError(command.uri, response.reason.code, response.reason.description);
|
|
47
|
+
}
|
|
48
|
+
else if (response.status === 'success') {
|
|
49
|
+
return response.resource;
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
throw new Error(`Unexpected command response for command: ${command.uri}`);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
async sendCommandResponse(response) {
|
|
56
|
+
const socket = await this.connectionHandle.get();
|
|
57
|
+
socket.write(`${JSON.stringify(response)}\n`);
|
|
58
|
+
}
|
|
59
|
+
async close() {
|
|
60
|
+
this.sessionNegotiator?.finish();
|
|
61
|
+
await this.connectionHandle.close();
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
class TCPHandle {
|
|
65
|
+
host;
|
|
66
|
+
port;
|
|
67
|
+
currentSocketPromise = null;
|
|
68
|
+
closing = false;
|
|
69
|
+
connectionAttempts = 0;
|
|
70
|
+
constructor(host, port, onConnected, onMessage) {
|
|
71
|
+
this.host = host;
|
|
72
|
+
this.port = port;
|
|
73
|
+
this.currentSocketPromise = this.connect(this.host, this.port, onConnected, onMessage);
|
|
74
|
+
}
|
|
75
|
+
get() {
|
|
76
|
+
if (!this.currentSocketPromise) {
|
|
77
|
+
throw new Error('TCP connection is not available.');
|
|
78
|
+
}
|
|
79
|
+
return this.currentSocketPromise;
|
|
80
|
+
}
|
|
81
|
+
async close() {
|
|
82
|
+
if (!this.closing && this.currentSocketPromise) {
|
|
83
|
+
this.closing = true;
|
|
84
|
+
const current = await this.currentSocketPromise;
|
|
85
|
+
current.end();
|
|
86
|
+
current.destroy();
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
connect(host, port, onConnected, onMessage) {
|
|
90
|
+
const socket = tcpConnect({ host, port });
|
|
91
|
+
let buffer = '';
|
|
92
|
+
return new Promise((resolve) => {
|
|
93
|
+
socket.on('connect', async () => {
|
|
94
|
+
await onConnected(socket);
|
|
95
|
+
this.connectionAttempts = 0;
|
|
96
|
+
resolve(socket);
|
|
97
|
+
});
|
|
98
|
+
socket.on('error', (err) => {
|
|
99
|
+
if (!this.closing) {
|
|
100
|
+
throw err;
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
socket.on('close', () => {
|
|
104
|
+
if (!this.closing) {
|
|
105
|
+
this.connectionAttempts++;
|
|
106
|
+
if (this.connectionAttempts < 3) {
|
|
107
|
+
this.currentSocketPromise = this.connect(host, port, onConnected, onMessage);
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
throw new Error('Failed to connect/reconnect to TCP socket');
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
});
|
|
114
|
+
socket.on('data', (chunk) => {
|
|
115
|
+
buffer += chunk.toString();
|
|
116
|
+
const result = this.tryParseJSON(buffer);
|
|
117
|
+
buffer = result.remainingBuffer;
|
|
118
|
+
for (const parsed of result.parsedObjects) {
|
|
119
|
+
onMessage(parsed);
|
|
120
|
+
}
|
|
121
|
+
});
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
tryParseJSON(buffer) {
|
|
125
|
+
const parsedObjects = [];
|
|
126
|
+
let currBuffer = buffer;
|
|
127
|
+
let startIndex = buffer.indexOf('{');
|
|
128
|
+
while (startIndex !== -1) {
|
|
129
|
+
let braceCount = 0;
|
|
130
|
+
let inString = false;
|
|
131
|
+
let escaped = false;
|
|
132
|
+
let foundEnd = false;
|
|
133
|
+
let endIndex = startIndex;
|
|
134
|
+
for (let i = startIndex; i < currBuffer.length; i++) {
|
|
135
|
+
const char = currBuffer[i];
|
|
136
|
+
if (inString) {
|
|
137
|
+
if (escaped) {
|
|
138
|
+
escaped = false;
|
|
139
|
+
}
|
|
140
|
+
else if (char === '\\') {
|
|
141
|
+
escaped = true;
|
|
142
|
+
}
|
|
143
|
+
else if (char === '"') {
|
|
144
|
+
inString = false;
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
if (char === '"') {
|
|
149
|
+
inString = true;
|
|
150
|
+
}
|
|
151
|
+
else if (char === '{') {
|
|
152
|
+
braceCount++;
|
|
153
|
+
}
|
|
154
|
+
else if (char === '}') {
|
|
155
|
+
braceCount--;
|
|
156
|
+
// When all opened braces are closed, we found the end.
|
|
157
|
+
if (braceCount === 0) {
|
|
158
|
+
endIndex = i;
|
|
159
|
+
foundEnd = true;
|
|
160
|
+
break;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
// If we haven't found a complete JSON object, break and wait for more data.
|
|
166
|
+
if (!foundEnd) {
|
|
167
|
+
break;
|
|
168
|
+
}
|
|
169
|
+
const rawMessage = currBuffer.slice(startIndex, endIndex + 1).trim();
|
|
170
|
+
const parsed = JSON.parse(rawMessage);
|
|
171
|
+
parsedObjects.push(parsed);
|
|
172
|
+
currBuffer = currBuffer.slice(endIndex + 1);
|
|
173
|
+
startIndex = currBuffer.indexOf('{');
|
|
174
|
+
}
|
|
175
|
+
return { parsedObjects, remainingBuffer: currBuffer };
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
//# sourceMappingURL=tcpsender.js.map
|