@whitewall/blip-sdk 0.0.134 → 0.0.136
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 +33 -10
- package/dist/cjs/client.js.map +1 -1
- package/dist/cjs/namespaces/account.js +74 -52
- package/dist/cjs/namespaces/account.js.map +1 -1
- package/dist/cjs/namespaces/desk.js +17 -1
- package/dist/cjs/namespaces/desk.js.map +1 -1
- package/dist/cjs/namespaces/namespace.js +10 -10
- package/dist/cjs/namespaces/namespace.js.map +1 -1
- package/dist/cjs/namespaces/plugins.js +15 -3
- package/dist/cjs/namespaces/plugins.js.map +1 -1
- package/dist/cjs/namespaces/portal.js +131 -6
- package/dist/cjs/namespaces/portal.js.map +1 -1
- package/dist/cjs/namespaces/whatsapp.js +2 -3
- package/dist/cjs/namespaces/whatsapp.js.map +1 -1
- package/dist/cjs/sender/bliperror.js +14 -17
- package/dist/cjs/sender/bliperror.js.map +1 -1
- package/dist/cjs/sender/enveloperesolver.js +85 -6
- package/dist/cjs/sender/enveloperesolver.js.map +1 -1
- package/dist/cjs/sender/gateway/customgatewaysender.js +16 -9
- package/dist/cjs/sender/gateway/customgatewaysender.js.map +1 -1
- package/dist/cjs/sender/http/httpsender.js +29 -31
- package/dist/cjs/sender/http/httpsender.js.map +1 -1
- package/dist/cjs/sender/plugin/communication.js +9 -2
- package/dist/cjs/sender/plugin/communication.js.map +1 -1
- package/dist/cjs/sender/plugin/pluginsender.js +11 -59
- package/dist/cjs/sender/plugin/pluginsender.js.map +1 -1
- package/dist/cjs/sender/security.js +3 -0
- package/dist/cjs/sender/security.js.map +1 -0
- package/dist/cjs/sender/sender.js +93 -0
- package/dist/cjs/sender/sender.js.map +1 -1
- package/dist/cjs/sender/{sessionegotiator.js → sessionnegotiator.js} +27 -10
- package/dist/cjs/sender/sessionnegotiator.js.map +1 -0
- package/dist/cjs/sender/tcp/tcpsender.js +36 -45
- package/dist/cjs/sender/tcp/tcpsender.js.map +1 -1
- package/dist/cjs/sender/websocket/websocketsender.js +16 -24
- package/dist/cjs/sender/websocket/websocketsender.js.map +1 -1
- package/dist/cjs/types/command.js.map +1 -1
- package/dist/cjs/types/desk.js.map +1 -1
- package/dist/cjs/types/message.js +3 -1
- package/dist/cjs/types/message.js.map +1 -1
- package/dist/cjs/types/node.js +12 -9
- package/dist/cjs/types/node.js.map +1 -1
- package/dist/cjs/types/notification.js +3 -0
- package/dist/cjs/types/notification.js.map +1 -1
- package/dist/cjs/types/reason.js +20 -0
- package/dist/cjs/types/reason.js.map +1 -0
- package/dist/cjs/types/session.js.map +1 -1
- package/dist/cjs/utils/uri.js +22 -36
- package/dist/cjs/utils/uri.js.map +1 -1
- package/dist/esm/client.js +33 -10
- package/dist/esm/client.js.map +1 -1
- package/dist/esm/namespaces/account.js +74 -52
- package/dist/esm/namespaces/account.js.map +1 -1
- package/dist/esm/namespaces/desk.js +17 -1
- package/dist/esm/namespaces/desk.js.map +1 -1
- package/dist/esm/namespaces/namespace.js +11 -11
- package/dist/esm/namespaces/namespace.js.map +1 -1
- package/dist/esm/namespaces/plugins.js +15 -3
- package/dist/esm/namespaces/plugins.js.map +1 -1
- package/dist/esm/namespaces/portal.js +131 -6
- package/dist/esm/namespaces/portal.js.map +1 -1
- package/dist/esm/namespaces/whatsapp.js +2 -3
- package/dist/esm/namespaces/whatsapp.js.map +1 -1
- package/dist/esm/sender/bliperror.js +13 -16
- package/dist/esm/sender/bliperror.js.map +1 -1
- package/dist/esm/sender/enveloperesolver.js +85 -6
- package/dist/esm/sender/enveloperesolver.js.map +1 -1
- package/dist/esm/sender/gateway/customgatewaysender.js +16 -9
- package/dist/esm/sender/gateway/customgatewaysender.js.map +1 -1
- package/dist/esm/sender/http/httpsender.js +29 -31
- package/dist/esm/sender/http/httpsender.js.map +1 -1
- package/dist/esm/sender/plugin/communication.js +9 -2
- package/dist/esm/sender/plugin/communication.js.map +1 -1
- package/dist/esm/sender/plugin/pluginsender.js +11 -59
- package/dist/esm/sender/plugin/pluginsender.js.map +1 -1
- package/dist/esm/sender/security.js +2 -0
- package/dist/esm/sender/security.js.map +1 -0
- package/dist/esm/sender/sender.js +90 -1
- package/dist/esm/sender/sender.js.map +1 -1
- package/dist/esm/sender/{sessionegotiator.js → sessionnegotiator.js} +27 -10
- package/dist/esm/sender/sessionnegotiator.js.map +1 -0
- package/dist/esm/sender/tcp/tcpsender.js +35 -44
- package/dist/esm/sender/tcp/tcpsender.js.map +1 -1
- package/dist/esm/sender/websocket/websocketsender.js +15 -23
- package/dist/esm/sender/websocket/websocketsender.js.map +1 -1
- package/dist/esm/types/command.js.map +1 -1
- package/dist/esm/types/desk.js.map +1 -1
- package/dist/esm/types/message.js +1 -0
- package/dist/esm/types/message.js.map +1 -1
- package/dist/esm/types/node.js +12 -9
- package/dist/esm/types/node.js.map +1 -1
- package/dist/esm/types/notification.js +1 -1
- package/dist/esm/types/notification.js.map +1 -1
- package/dist/esm/types/reason.js +16 -0
- package/dist/esm/types/reason.js.map +1 -0
- package/dist/esm/types/session.js.map +1 -1
- package/dist/esm/utils/uri.js +20 -34
- package/dist/esm/utils/uri.js.map +1 -1
- package/dist/types/client.d.ts +8 -6
- package/dist/types/client.d.ts.map +1 -1
- package/dist/types/namespaces/account.d.ts +8 -8
- package/dist/types/namespaces/account.d.ts.map +1 -1
- package/dist/types/namespaces/desk.d.ts +6 -0
- package/dist/types/namespaces/desk.d.ts.map +1 -1
- package/dist/types/namespaces/namespace.d.ts +6 -9
- package/dist/types/namespaces/namespace.d.ts.map +1 -1
- package/dist/types/namespaces/plugins.d.ts +6 -2
- package/dist/types/namespaces/plugins.d.ts.map +1 -1
- package/dist/types/namespaces/portal.d.ts +15 -4
- package/dist/types/namespaces/portal.d.ts.map +1 -1
- package/dist/types/namespaces/whatsapp.d.ts.map +1 -1
- package/dist/types/sender/bliperror.d.ts +6 -9
- package/dist/types/sender/bliperror.d.ts.map +1 -1
- package/dist/types/sender/enveloperesolver.d.ts +14 -1
- package/dist/types/sender/enveloperesolver.d.ts.map +1 -1
- package/dist/types/sender/gateway/customgatewaysender.d.ts +8 -4
- package/dist/types/sender/gateway/customgatewaysender.d.ts.map +1 -1
- package/dist/types/sender/http/httpsender.d.ts +10 -6
- package/dist/types/sender/http/httpsender.d.ts.map +1 -1
- package/dist/types/sender/plugin/communication.d.ts +2 -1
- package/dist/types/sender/plugin/communication.d.ts.map +1 -1
- package/dist/types/sender/plugin/pluginsender.d.ts +4 -8
- package/dist/types/sender/plugin/pluginsender.d.ts.map +1 -1
- package/dist/types/sender/security.d.ts +22 -0
- package/dist/types/sender/security.d.ts.map +1 -0
- package/dist/types/sender/sender.d.ts +32 -4
- package/dist/types/sender/sender.d.ts.map +1 -1
- package/dist/types/sender/{sessionegotiator.d.ts → sessionnegotiator.d.ts} +11 -16
- package/dist/types/sender/sessionnegotiator.d.ts.map +1 -0
- package/dist/types/sender/tcp/tcpsender.d.ts +16 -14
- package/dist/types/sender/tcp/tcpsender.d.ts.map +1 -1
- package/dist/types/sender/websocket/websocketsender.d.ts +11 -14
- package/dist/types/sender/websocket/websocketsender.d.ts.map +1 -1
- package/dist/types/types/account.d.ts +22 -0
- package/dist/types/types/account.d.ts.map +1 -1
- package/dist/types/types/billing.d.ts +1 -1
- package/dist/types/types/billing.d.ts.map +1 -1
- package/dist/types/types/command.d.ts +16 -12
- package/dist/types/types/command.d.ts.map +1 -1
- package/dist/types/types/commons.d.ts +1 -0
- package/dist/types/types/commons.d.ts.map +1 -1
- package/dist/types/types/desk.d.ts +1 -1
- package/dist/types/types/desk.d.ts.map +1 -1
- package/dist/types/types/message.d.ts +1 -0
- package/dist/types/types/message.d.ts.map +1 -1
- package/dist/types/types/node.d.ts +8 -4
- package/dist/types/types/node.d.ts.map +1 -1
- package/dist/types/types/notification.d.ts +3 -4
- package/dist/types/types/notification.d.ts.map +1 -1
- package/dist/types/types/portal.d.ts +27 -0
- package/dist/types/types/portal.d.ts.map +1 -1
- package/dist/types/types/reason.d.ts +12 -0
- package/dist/types/types/reason.d.ts.map +1 -0
- package/dist/types/types/session.d.ts +4 -5
- package/dist/types/types/session.d.ts.map +1 -1
- package/dist/types/utils/uri.d.ts +4 -3
- package/dist/types/utils/uri.d.ts.map +1 -1
- package/package.json +1 -1
- package/dist/cjs/sender/sessionegotiator.js.map +0 -1
- package/dist/esm/sender/sessionegotiator.js.map +0 -1
- package/dist/types/sender/sessionegotiator.d.ts.map +0 -1
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { Node } from "../types/node.js";
|
|
2
|
+
import { OpenConnectionSender } from "./sender.js";
|
|
2
3
|
export class SessionNegotiator {
|
|
3
4
|
sender;
|
|
4
5
|
sendSession;
|
|
5
6
|
state = 'new';
|
|
6
7
|
session = null;
|
|
7
8
|
presencePromise = null;
|
|
8
|
-
|
|
9
|
+
currentSessionResolver = null;
|
|
9
10
|
constructor(sender, sendSession) {
|
|
10
11
|
this.sender = sender;
|
|
11
12
|
this.sendSession = sendSession;
|
|
@@ -42,15 +43,23 @@ export class SessionNegotiator {
|
|
|
42
43
|
else {
|
|
43
44
|
throw new Error('Unexpected session state');
|
|
44
45
|
}
|
|
46
|
+
if (options.authentication.scheme === 'token') {
|
|
47
|
+
const { secret } = OpenConnectionSender.parseToken(options.authentication.token);
|
|
48
|
+
options.authentication = {
|
|
49
|
+
scheme: 'key',
|
|
50
|
+
key: secret,
|
|
51
|
+
};
|
|
52
|
+
}
|
|
45
53
|
if (!authenticating.schemeOptions?.includes(options.authentication.scheme)) {
|
|
46
54
|
throw new Error(`Unsupported authentication scheme: ${options.authentication.scheme} (${authenticating.schemeOptions})`);
|
|
47
55
|
}
|
|
56
|
+
const { scheme, ...authenticationOptions } = options.authentication;
|
|
48
57
|
this.sendSession({
|
|
49
58
|
id: authenticating.id,
|
|
50
59
|
from: options.node,
|
|
51
60
|
state: 'authenticating',
|
|
52
|
-
scheme
|
|
53
|
-
authentication:
|
|
61
|
+
scheme,
|
|
62
|
+
authentication: authenticationOptions,
|
|
54
63
|
});
|
|
55
64
|
const authenticated = await this.waitForSessionResponse();
|
|
56
65
|
if (authenticated.state !== 'established') {
|
|
@@ -60,16 +69,17 @@ export class SessionNegotiator {
|
|
|
60
69
|
id: authenticated.id,
|
|
61
70
|
localNode: Node.from(authenticated.to),
|
|
62
71
|
remoteNode: Node.from(authenticated.from),
|
|
72
|
+
scheme,
|
|
63
73
|
};
|
|
64
74
|
}
|
|
65
75
|
finally {
|
|
66
76
|
clearTimeout(timeout);
|
|
67
77
|
}
|
|
68
78
|
}
|
|
69
|
-
handleEnvelope(
|
|
70
|
-
if (this.
|
|
71
|
-
this.
|
|
72
|
-
this.
|
|
79
|
+
handleEnvelope(envelope) {
|
|
80
|
+
if (this.currentSessionResolver) {
|
|
81
|
+
this.currentSessionResolver.resolve(envelope);
|
|
82
|
+
this.currentSessionResolver = null;
|
|
73
83
|
}
|
|
74
84
|
}
|
|
75
85
|
async ensurePresence(currentCommandUri = '') {
|
|
@@ -79,8 +89,15 @@ export class SessionNegotiator {
|
|
|
79
89
|
if (this.state === 'present') {
|
|
80
90
|
return;
|
|
81
91
|
}
|
|
82
|
-
|
|
92
|
+
if (this.session.scheme === 'guest') {
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
83
95
|
if (currentCommandUri === '/presence') {
|
|
96
|
+
// someone is already setting the presence manually
|
|
97
|
+
if (!this.presencePromise) {
|
|
98
|
+
this.state = 'present';
|
|
99
|
+
}
|
|
100
|
+
// its actually setting the presence
|
|
84
101
|
return;
|
|
85
102
|
}
|
|
86
103
|
if (this.presencePromise) {
|
|
@@ -112,7 +129,7 @@ export class SessionNegotiator {
|
|
|
112
129
|
}
|
|
113
130
|
async waitForSessionResponse() {
|
|
114
131
|
const { promise, resolve, reject } = Promise.withResolvers();
|
|
115
|
-
this.
|
|
132
|
+
this.currentSessionResolver = { resolve, reject };
|
|
116
133
|
const session = await promise;
|
|
117
134
|
if (session.state === 'failed') {
|
|
118
135
|
throw new Error(`Session negotiation failed: ${session.reason?.description} (${session.reason?.code})`);
|
|
@@ -121,4 +138,4 @@ export class SessionNegotiator {
|
|
|
121
138
|
return session;
|
|
122
139
|
}
|
|
123
140
|
}
|
|
124
|
-
//# sourceMappingURL=
|
|
141
|
+
//# sourceMappingURL=sessionnegotiator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessionnegotiator.js","sourceRoot":"","sources":["../../../src/sender/sessionnegotiator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,20 @@
|
|
|
1
|
-
import { Node, } from "../../types/index.js";
|
|
2
1
|
import { BlipError } from "../bliperror.js";
|
|
3
|
-
import {
|
|
4
|
-
import { SessionNegotiator } from "../
|
|
2
|
+
import { ConnectionSender, OpenConnectionSender } from "../sender.js";
|
|
3
|
+
import { SessionNegotiator } from "../sessionnegotiator.js";
|
|
5
4
|
import { EnvelopeThrottler } from "../throttler.js";
|
|
6
|
-
|
|
5
|
+
/**
|
|
6
|
+
* @remarks
|
|
7
|
+
* The TCP implementation has a known limitation where large command
|
|
8
|
+
* responses can be lost and the awaiting promise will never resolve.
|
|
9
|
+
* Unless TCP is explicitly required, prefer using {@link WebSocketSender}
|
|
10
|
+
*/
|
|
11
|
+
export class TCPSender extends OpenConnectionSender {
|
|
7
12
|
throttler = new EnvelopeThrottler();
|
|
8
|
-
envelopeResolver = new EnvelopeResolver(this);
|
|
9
13
|
connectionHandle;
|
|
10
|
-
sessionNegotiator = null;
|
|
11
14
|
constructor(options) {
|
|
15
|
+
super(options);
|
|
12
16
|
const prefix = options.tenantId ? `${options.tenantId}.` : '';
|
|
13
|
-
|
|
14
|
-
this.connectionHandle = new TCPHandle(`${prefix}tcp.${domain}`, 443, async (socket) => {
|
|
17
|
+
this.connectionHandle = new TCPHandle(`${prefix}tcp.${this.domain}`, 443, async (socket) => {
|
|
15
18
|
this.sessionNegotiator = new SessionNegotiator(this, (session) => {
|
|
16
19
|
socket.write(JSON.stringify(session));
|
|
17
20
|
});
|
|
@@ -26,6 +29,10 @@ export class TCPSender {
|
|
|
26
29
|
this.envelopeResolver.resolve(envelope);
|
|
27
30
|
});
|
|
28
31
|
}
|
|
32
|
+
async sendNotification(notification) {
|
|
33
|
+
const socket = await this.connectionHandle.get();
|
|
34
|
+
socket.write(JSON.stringify(notification));
|
|
35
|
+
}
|
|
29
36
|
async sendMessage(message) {
|
|
30
37
|
await this.throttler.throttle('message');
|
|
31
38
|
const socket = await this.connectionHandle.get();
|
|
@@ -47,7 +54,7 @@ export class TCPSender {
|
|
|
47
54
|
return response.resource;
|
|
48
55
|
}
|
|
49
56
|
else {
|
|
50
|
-
throw new Error(`Unexpected
|
|
57
|
+
throw new Error(`Unexpected response for command '${command.uri}': ${JSON.stringify(response)}`);
|
|
51
58
|
}
|
|
52
59
|
});
|
|
53
60
|
}
|
|
@@ -59,20 +66,7 @@ export class TCPSender {
|
|
|
59
66
|
this.sessionNegotiator?.finish();
|
|
60
67
|
await this.connectionHandle.close();
|
|
61
68
|
}
|
|
62
|
-
static login
|
|
63
|
-
const node = Node.isValid(botIdentityOrIdentifier)
|
|
64
|
-
? Node.from(botIdentityOrIdentifier)
|
|
65
|
-
: new Node(botIdentityOrIdentifier, 'msging.net');
|
|
66
|
-
return new TCPSender({
|
|
67
|
-
node,
|
|
68
|
-
authentication: {
|
|
69
|
-
scheme: 'key',
|
|
70
|
-
key: accessKey,
|
|
71
|
-
},
|
|
72
|
-
domain: 'msging.net',
|
|
73
|
-
tenantId,
|
|
74
|
-
});
|
|
75
|
-
}
|
|
69
|
+
static login = (ConnectionSender.login);
|
|
76
70
|
async withRetryPolicy(fn, retries = 10) {
|
|
77
71
|
try {
|
|
78
72
|
return await fn();
|
|
@@ -110,18 +104,18 @@ class TCPHandle {
|
|
|
110
104
|
}
|
|
111
105
|
async connect(host, port, onConnected, onMessage) {
|
|
112
106
|
const { connect } = await import('node:net');
|
|
113
|
-
const socket = connect({ host, port });
|
|
107
|
+
const socket = connect({ host, port }).setEncoding('utf8');
|
|
114
108
|
let buffer = '';
|
|
115
109
|
await new Promise((resolve) => {
|
|
116
|
-
socket.
|
|
110
|
+
socket.once('connect', () => {
|
|
117
111
|
resolve();
|
|
118
112
|
});
|
|
119
|
-
socket.
|
|
113
|
+
socket.once('error', (err) => {
|
|
120
114
|
if (!this.closing) {
|
|
121
115
|
throw err;
|
|
122
116
|
}
|
|
123
117
|
});
|
|
124
|
-
socket.
|
|
118
|
+
socket.once('close', () => {
|
|
125
119
|
if (!this.closing) {
|
|
126
120
|
this.connectionAttempts++;
|
|
127
121
|
if (this.connectionAttempts < 3) {
|
|
@@ -133,8 +127,7 @@ class TCPHandle {
|
|
|
133
127
|
}
|
|
134
128
|
});
|
|
135
129
|
socket.on('data', (chunk) => {
|
|
136
|
-
buffer
|
|
137
|
-
const result = this.tryParseJSON(buffer);
|
|
130
|
+
const result = this.tryParseJSON(buffer + chunk);
|
|
138
131
|
buffer = result.remainingBuffer;
|
|
139
132
|
for (const parsed of result.parsedObjects) {
|
|
140
133
|
onMessage(parsed);
|
|
@@ -168,21 +161,19 @@ class TCPHandle {
|
|
|
168
161
|
inString = false;
|
|
169
162
|
}
|
|
170
163
|
}
|
|
171
|
-
else {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
break;
|
|
185
|
-
}
|
|
164
|
+
else if (char === '"') {
|
|
165
|
+
inString = true;
|
|
166
|
+
}
|
|
167
|
+
else if (char === '{') {
|
|
168
|
+
braceCount++;
|
|
169
|
+
}
|
|
170
|
+
else if (char === '}') {
|
|
171
|
+
braceCount--;
|
|
172
|
+
// When all opened braces are closed, we found the end.
|
|
173
|
+
if (braceCount === 0) {
|
|
174
|
+
endIndex = i;
|
|
175
|
+
foundEnd = true;
|
|
176
|
+
break;
|
|
186
177
|
}
|
|
187
178
|
}
|
|
188
179
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tcpsender.js","sourceRoot":"","sources":["../../../../src/sender/tcp/tcpsender.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tcpsender.js","sourceRoot":"","sources":["../../../../src/sender/tcp/tcpsender.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,14 @@
|
|
|
1
|
-
import { Node, } from "../../types/index.js";
|
|
2
1
|
import { BlipError } from "../bliperror.js";
|
|
3
|
-
import {
|
|
4
|
-
import { SessionNegotiator } from "../
|
|
2
|
+
import { ConnectionSender, OpenConnectionSender } from "../sender.js";
|
|
3
|
+
import { SessionNegotiator } from "../sessionnegotiator.js";
|
|
5
4
|
import { EnvelopeThrottler } from "../throttler.js";
|
|
6
|
-
export class WebSocketSender {
|
|
5
|
+
export class WebSocketSender extends OpenConnectionSender {
|
|
7
6
|
throttler = new EnvelopeThrottler();
|
|
8
|
-
envelopeResolver = new EnvelopeResolver(this);
|
|
9
7
|
connectionHandle;
|
|
10
|
-
sessionNegotiator = null;
|
|
11
8
|
constructor(options) {
|
|
9
|
+
super(options);
|
|
12
10
|
const prefix = options.tenantId ? `${options.tenantId}.` : '';
|
|
13
|
-
|
|
14
|
-
this.connectionHandle = new WebSocketHandle(`wss://${prefix}ws.${domain}`, (webSocket) => {
|
|
11
|
+
this.connectionHandle = new WebSocketHandle(`wss://${prefix}ws.${this.domain}`, (webSocket) => {
|
|
15
12
|
this.sessionNegotiator = new SessionNegotiator(this, (session) => {
|
|
16
13
|
webSocket.send(JSON.stringify(session));
|
|
17
14
|
});
|
|
@@ -47,32 +44,27 @@ export class WebSocketSender {
|
|
|
47
44
|
return response.resource;
|
|
48
45
|
}
|
|
49
46
|
else {
|
|
50
|
-
throw new Error(`Unexpected
|
|
47
|
+
throw new Error(`Unexpected response for command '${command.uri}': ${JSON.stringify(response)}`);
|
|
51
48
|
}
|
|
52
49
|
});
|
|
53
50
|
}
|
|
51
|
+
async sendNotification(notification) {
|
|
52
|
+
const webSocket = await this.connectionHandle.get();
|
|
53
|
+
webSocket.send(JSON.stringify(notification));
|
|
54
|
+
}
|
|
54
55
|
async sendCommandResponse(response) {
|
|
55
56
|
const webSocket = await this.connectionHandle.get();
|
|
56
57
|
webSocket.send(JSON.stringify(response));
|
|
57
58
|
}
|
|
59
|
+
async isConnected() {
|
|
60
|
+
const webSocket = await this.connectionHandle.get();
|
|
61
|
+
return webSocket.readyState === WebSocket.OPEN;
|
|
62
|
+
}
|
|
58
63
|
async close() {
|
|
59
64
|
this.sessionNegotiator?.finish();
|
|
60
65
|
await this.connectionHandle.close();
|
|
61
66
|
}
|
|
62
|
-
static login
|
|
63
|
-
const node = Node.isValid(botIdentityOrIdentifier)
|
|
64
|
-
? Node.from(botIdentityOrIdentifier)
|
|
65
|
-
: new Node(botIdentityOrIdentifier, 'msging.net');
|
|
66
|
-
return new WebSocketSender({
|
|
67
|
-
node,
|
|
68
|
-
authentication: {
|
|
69
|
-
scheme: 'key',
|
|
70
|
-
key: accessKey,
|
|
71
|
-
},
|
|
72
|
-
domain: 'msging.net',
|
|
73
|
-
tenantId,
|
|
74
|
-
});
|
|
75
|
-
}
|
|
67
|
+
static login = (ConnectionSender.login);
|
|
76
68
|
async withRetryPolicy(fn, retries = 5) {
|
|
77
69
|
try {
|
|
78
70
|
return await fn();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocketsender.js","sourceRoot":"","sources":["../../../../src/sender/websocket/websocketsender.ts"],"names":[],"mappings":"
|
|
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":"AA8CA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAAkB,EAA8B,EAAE,CAAC,QAAQ,IAAI,QAAQ,IAAI,KAAK,IAAI,QAAQ,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"desk.js","sourceRoot":"","sources":["../../../src/types/desk.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"desk.js","sourceRoot":"","sources":["../../../src/types/desk.ts"],"names":[],"mappings":"AAgBA,MAAM,CAAN,IAAY,SAQX;AARD,WAAY,SAAS;IACjB,8BAAiB,CAAA;IACjB,8BAAiB,CAAA;IACjB,gCAAmB,CAAA;IACnB,oCAAuB,CAAA;IACvB,kCAAqB,CAAA;IACrB,8BAAiB,CAAA;IACjB,kCAAqB,CAAA;AACzB,CAAC,EARW,SAAS,KAAT,SAAS,QAQpB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
export const isMessage = (envelope) => 'type' in envelope && 'content' in envelope && typeof envelope.type === 'string';
|
|
1
2
|
export const isMessageOfType = (message, type) => message.type === type;
|
|
2
3
|
export const isDocumentOfType = (document, type) => document.type === type;
|
|
3
4
|
export const messageToDocument = (message) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/types/message.ts"],"names":[],"mappings":"AAiGA,MAAM,CAAC,MAAM,eAAe,GAAG,CAC3B,OAAuB,EACvB,IAAU,EACc,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAA;AAEpD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,QAAyB,EACzB,IAAU,EACgB,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAA;AAEvD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC7B,OAAgD,EAClC,EAAE,CAAC,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC,IAAI;IAClB,KAAK,EAAE,OAAO,CAAC,OAAO;CACzB,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/types/message.ts"],"names":[],"mappings":"AAiGA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAAkB,EAA8B,EAAE,CACxE,MAAM,IAAI,QAAQ,IAAI,SAAS,IAAI,QAAQ,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAA;AAEpF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC3B,OAAuB,EACvB,IAAU,EACc,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAA;AAEpD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,QAAyB,EACzB,IAAU,EACgB,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAA;AAEvD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC7B,OAAgD,EAClC,EAAE,CAAC,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC,IAAI;IAClB,KAAK,EAAE,OAAO,CAAC,OAAO;CACzB,CAAC,CAAA"}
|
package/dist/esm/types/node.js
CHANGED
|
@@ -14,9 +14,6 @@ export class Node extends String {
|
|
|
14
14
|
withInstance(instance) {
|
|
15
15
|
return new Node(this.name, this.domain, instance);
|
|
16
16
|
}
|
|
17
|
-
static isValid(node) {
|
|
18
|
-
return node ? /^.+@.+\..+/.test(node) : false;
|
|
19
|
-
}
|
|
20
17
|
getSource() {
|
|
21
18
|
switch (this.domain) {
|
|
22
19
|
case '0mn.io':
|
|
@@ -56,16 +53,22 @@ export class Node extends String {
|
|
|
56
53
|
return 'Unknown';
|
|
57
54
|
}
|
|
58
55
|
}
|
|
59
|
-
static from(
|
|
60
|
-
if (
|
|
61
|
-
return
|
|
56
|
+
static from(nameOrPossibleNode, domain) {
|
|
57
|
+
if (nameOrPossibleNode instanceof Node) {
|
|
58
|
+
return nameOrPossibleNode;
|
|
62
59
|
}
|
|
63
|
-
if (Node.isValid(
|
|
64
|
-
const [name, otherPart] =
|
|
60
|
+
if (Node.isValid(nameOrPossibleNode)) {
|
|
61
|
+
const [name, otherPart] = nameOrPossibleNode.split('@');
|
|
65
62
|
const [domain, instance] = otherPart.split('/');
|
|
66
63
|
return new Node(decodeURIComponent(name), domain, instance);
|
|
67
64
|
}
|
|
68
|
-
|
|
65
|
+
if (domain) {
|
|
66
|
+
return new Node(decodeURIComponent(nameOrPossibleNode), domain);
|
|
67
|
+
}
|
|
68
|
+
throw new Error(`Invalid node shape: ${nameOrPossibleNode}`);
|
|
69
|
+
}
|
|
70
|
+
static isValid(node) {
|
|
71
|
+
return node ? /^.+@.+\..+/.test(node) : false;
|
|
69
72
|
}
|
|
70
73
|
}
|
|
71
74
|
//# sourceMappingURL=node.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../src/types/node.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../src/types/node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export const isNotification = (envelope) => 'event' in envelope && typeof envelope.event === 'string';
|
|
2
2
|
//# sourceMappingURL=notification.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../../src/types/notification.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../../src/types/notification.ts"],"names":[],"mappings":"AAgBA,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAkB,EAA4B,EAAE,CAC3E,OAAO,IAAI,QAAQ,IAAI,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ,CAAA"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
export var ReasonCodes;
|
|
2
|
+
(function (ReasonCodes) {
|
|
3
|
+
ReasonCodes[ReasonCodes["PipelineTimeout"] = 2] = "PipelineTimeout";
|
|
4
|
+
ReasonCodes[ReasonCodes["MaxThroughputExceeded"] = 38] = "MaxThroughputExceeded";
|
|
5
|
+
ReasonCodes[ReasonCodes["GeneralError"] = 101] = "GeneralError";
|
|
6
|
+
ReasonCodes[ReasonCodes["FailedToSendEnvelopeViaHTTP"] = 2105] = "FailedToSendEnvelopeViaHTTP";
|
|
7
|
+
})(ReasonCodes || (ReasonCodes = {}));
|
|
8
|
+
export const isReason = (value) => {
|
|
9
|
+
return (typeof value === 'object' &&
|
|
10
|
+
value !== null &&
|
|
11
|
+
'code' in value &&
|
|
12
|
+
typeof value.code === 'number' &&
|
|
13
|
+
'description' in value &&
|
|
14
|
+
typeof value.description === 'string');
|
|
15
|
+
};
|
|
16
|
+
//# sourceMappingURL=reason.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reason.js","sourceRoot":"","sources":["../../../src/types/reason.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACnB,mEAAmB,CAAA;IACnB,gFAA0B,CAAA;IAC1B,+DAAkB,CAAA;IAClB,8FAAkC,CAAA;AACtC,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB;AAOD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAmB,EAAE;IACxD,OAAO,CACH,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,MAAM,IAAI,KAAK;QACf,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;QAC9B,aAAa,IAAI,KAAK;QACtB,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ,CACxC,CAAA;AACL,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/types/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/types/session.ts"],"names":[],"mappings":"AAmBA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAe,EAAoB,EAAE;IAC3D,OAAO,OAAO,IAAI,KAAK,CAAA;AAC3B,CAAC,CAAA"}
|
package/dist/esm/utils/uri.js
CHANGED
|
@@ -1,44 +1,30 @@
|
|
|
1
1
|
export const uri = (parts, ...vars) => {
|
|
2
|
-
let
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
if (uriString.includes('?') || variable.startsWith('?')) {
|
|
8
|
-
uriString += variable;
|
|
9
|
-
}
|
|
10
|
-
else {
|
|
11
|
-
uriString += encodeURIComponent(variable);
|
|
12
|
-
}
|
|
13
|
-
}
|
|
2
|
+
let queryObject;
|
|
3
|
+
const last = vars[vars.length - 1];
|
|
4
|
+
if (last && last.constructor === Object) {
|
|
5
|
+
queryObject = last;
|
|
6
|
+
vars.splice(vars.length - 1, 1);
|
|
14
7
|
}
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
const params = lastParam;
|
|
24
|
-
for (const key in params) {
|
|
25
|
-
if (params[key] !== undefined) {
|
|
26
|
-
let value = params[key];
|
|
27
|
-
if (value instanceof Date) {
|
|
28
|
-
value = value.toISOString();
|
|
29
|
-
}
|
|
30
|
-
query.set(key, value);
|
|
8
|
+
const stringify = (v) => v === undefined || v === null ? '' : v instanceof Date ? v.toISOString() : String(v);
|
|
9
|
+
const raw = parts.map((part, i) => part + encodeURIComponent(stringify(vars[i]))).join('');
|
|
10
|
+
const [path, rawQuery = ''] = raw.split('?', 2);
|
|
11
|
+
const query = new Map(new URLSearchParams(rawQuery));
|
|
12
|
+
if (queryObject) {
|
|
13
|
+
for (const [key, value] of Object.entries(queryObject)) {
|
|
14
|
+
if (value !== undefined && value !== null) {
|
|
15
|
+
query.set(key, stringify(value));
|
|
31
16
|
}
|
|
32
17
|
}
|
|
33
18
|
}
|
|
34
|
-
return {
|
|
35
|
-
path,
|
|
36
|
-
query,
|
|
37
|
-
};
|
|
19
|
+
return { path, query };
|
|
38
20
|
};
|
|
39
|
-
export const
|
|
40
|
-
|
|
21
|
+
export const uriToString = (uri) => {
|
|
22
|
+
if (uri.query.size === 0) {
|
|
23
|
+
return uri.path;
|
|
24
|
+
}
|
|
25
|
+
const query = Array.from(uri.query)
|
|
41
26
|
.map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
|
|
42
27
|
.join('&');
|
|
28
|
+
return `${uri.path}?${query}`;
|
|
43
29
|
};
|
|
44
30
|
//# sourceMappingURL=uri.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uri.js","sourceRoot":"","sources":["../../../src/utils/uri.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"uri.js","sourceRoot":"","sources":["../../../src/utils/uri.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,KAA2B,EAAE,GAAG,IAAoB,EAAO,EAAE;IAC7E,IAAI,WAAgD,CAAA;IACpD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAClC,IAAI,IAAI,IAAI,IAAI,CAAC,WAAW,KAAK,MAAM,EAAE,CAAC;QACtC,WAAW,GAAG,IAA+B,CAAA;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;IACnC,CAAC;IAED,MAAM,SAAS,GAAG,CAAC,CAAU,EAAU,EAAE,CACrC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAExF,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAE1F,MAAM,CAAC,IAAI,EAAE,QAAQ,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAC/C,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEpD,IAAI,WAAW,EAAE,CAAC;QACd,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YACrD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACxC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;YACpC,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;AAC1B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAQ,EAAU,EAAE;IAC5C,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,IAAI,CAAA;IACnB,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;SAC9B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;SAC5D,IAAI,CAAC,GAAG,CAAC,CAAA;IACd,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,KAAK,EAAE,CAAA;AACjC,CAAC,CAAA"}
|
package/dist/types/client.d.ts
CHANGED
|
@@ -11,12 +11,12 @@ import { PluginsNamespace } from './namespaces/plugins.ts';
|
|
|
11
11
|
import { PortalNamespace } from './namespaces/portal.ts';
|
|
12
12
|
import { SchedulerNamespace } from './namespaces/scheduler.ts';
|
|
13
13
|
import { WhatsAppNamespace } from './namespaces/whatsapp.ts';
|
|
14
|
-
import type
|
|
14
|
+
import { type ConnectionSenderConstructor, type Sender } from './sender/sender.ts';
|
|
15
15
|
import type { Message, MessageTypes } from './types/message.ts';
|
|
16
16
|
import { type Identity } from './types/node.ts';
|
|
17
|
-
export declare class BlipClient {
|
|
18
|
-
readonly sender:
|
|
19
|
-
constructor(sender:
|
|
17
|
+
export declare class BlipClient<TSender extends Sender = Sender> {
|
|
18
|
+
readonly sender: TSender;
|
|
19
|
+
constructor(sender: TSender, defaultOptions?: SendCommandOptions);
|
|
20
20
|
readonly account: AccountNamespace;
|
|
21
21
|
readonly builder: BuilderNamespace;
|
|
22
22
|
readonly desk: DeskNamespace;
|
|
@@ -29,9 +29,11 @@ export declare class BlipClient {
|
|
|
29
29
|
readonly plugins: PluginsNamespace;
|
|
30
30
|
readonly context: ContextNamespace;
|
|
31
31
|
readonly billing: BillingNamespace;
|
|
32
|
-
as(
|
|
32
|
+
as(identityOrBotIdentifier: string | Identity): BlipClient<TSender>;
|
|
33
33
|
sendMessage<Type extends MessageTypes>(message: Omit<Message<Type>, 'id'>): Promise<void>;
|
|
34
34
|
close(): Promise<void>;
|
|
35
|
-
static http(
|
|
35
|
+
static http(bot: string | Identity, accessKey: string, tenantId?: string): BlipClient;
|
|
36
|
+
static http(token: string, tenantId?: string): BlipClient;
|
|
37
|
+
static createAccountAndConnect<TSender extends Sender>(sender: ConnectionSenderConstructor<TSender>, identity: Identity, password: string, tenantId?: string): Promise<BlipClient<TSender>>;
|
|
36
38
|
}
|
|
37
39
|
//# sourceMappingURL=client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","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,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AACnE,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;AAE5D,OAAO,KAAK,EAAwB,MAAM,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"client.d.ts","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,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AACnE,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;AAE5D,OAAO,EAAE,KAAK,2BAA2B,EAAwB,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAA;AACxG,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAC/D,OAAO,EAAmB,KAAK,QAAQ,EAAQ,MAAM,iBAAiB,CAAA;AAGtE,qBAAa,UAAU,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;aAE/B,MAAM,EAAE,OAAO;gBAAf,MAAM,EAAE,OAAO,EAC/B,cAAc,CAAC,EAAE,kBAAkB;IAgBvC,SAAgB,OAAO,EAAG,gBAAgB,CAAA;IAC1C,SAAgB,OAAO,EAAG,gBAAgB,CAAA;IAC1C,SAAgB,IAAI,EAAG,aAAa,CAAA;IACpC,SAAgB,KAAK,EAAG,cAAc,CAAA;IACtC,SAAgB,QAAQ,EAAG,iBAAiB,CAAA;IAC5C,SAAgB,SAAS,EAAG,kBAAkB,CAAA;IAC9C,SAAgB,SAAS,EAAG,kBAAkB,CAAA;IAC9C,SAAgB,cAAc,EAAG,uBAAuB,CAAA;IACxD,SAAgB,MAAM,EAAG,eAAe,CAAA;IACxC,SAAgB,OAAO,EAAG,gBAAgB,CAAA;IAC1C,SAAgB,OAAO,EAAG,gBAAgB,CAAA;IAC1C,SAAgB,OAAO,EAAG,gBAAgB,CAAA;IAEnC,EAAE,CAAC,uBAAuB,EAAE,MAAM,GAAG,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC;IAMnE,WAAW,CAAC,IAAI,SAAS,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQzF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;WAOf,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,UAAU;WAC9E,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,UAAU;WAK5C,uBAAuB,CAAC,OAAO,SAAS,MAAM,EAC9D,MAAM,EAAE,2BAA2B,CAAC,OAAO,CAAC,EAC5C,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM;CAkCxB"}
|