@based/client 6.4.0 → 6.5.1
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/src/incoming/protocol.js +3 -0
- package/dist/src/incoming/protocol.js.map +1 -1
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.js +4 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/index_original.d.ts +1 -0
- package/dist/src/types/generic.d.ts +3 -0
- package/dist/src/websocket/FakeWebsocket.d.ts +17 -0
- package/dist/src/websocket/FakeWebsocket.js +88 -0
- package/dist/src/websocket/FakeWebsocket.js.map +1 -0
- package/dist/src/websocket/index.js +52 -6
- package/dist/src/websocket/index.js.map +1 -1
- package/dist/src/websocket/types.d.ts +3 -0
- package/dist/src/websocket/types.js +3 -0
- package/dist/src/websocket/types.js.map +1 -1
- package/package.json +1 -1
|
@@ -33,6 +33,9 @@ export const readUint8 = (buff, start, len) => {
|
|
|
33
33
|
return n;
|
|
34
34
|
};
|
|
35
35
|
export const parseArrayBuffer = async (d) => {
|
|
36
|
+
if (d instanceof Uint8Array) {
|
|
37
|
+
return d;
|
|
38
|
+
}
|
|
36
39
|
// needed for CF workers which return array buffers
|
|
37
40
|
if (d instanceof ArrayBuffer) {
|
|
38
41
|
return new Uint8Array(d);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/incoming/protocol.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEpD,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,EAAU,EACyC,EAAE;IACrD,UAAU;IACV,gBAAgB;IAChB,qBAAqB;IACrB,yBAAyB;IACzB,6BAA6B;IAC7B,YAAY;IACZ,iBAAiB;IACjB,kBAAkB;IAClB,kCAAkC;IAClC,yBAAyB;IACzB,uBAAuB;IACvB,6BAA6B;IAC7B,oBAAoB;IACpB,gBAAgB;IAChB,MAAM,GAAG,GAAG,EAAE,IAAI,CAAC,CAAA;IACnB,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,CAAA;IACpB,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAA;IACtB,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAA;IAC1B,OAAO;QACL,IAAI;QACJ,SAAS,EAAE,SAAS,KAAK,CAAC;QAC1B,GAAG;KACJ,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,IAAgB,EAChB,KAAa,EACb,GAAW,EACH,EAAE;IACV,IAAI,CAAC,GAAG,CAAC,CAAA;IACT,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,KAAK,CAAA;IACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QAChC,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IACvB,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,CAAM,EAAuB,EAAE;IACpE,mDAAmD;IACnD,IAAI,CAAC,YAAY,WAAW,EAAE,CAAC;QAC7B,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;IAC1B,CAAC;IAED,wCAAwC;IACxC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,IAAI,CAAC,YAAY,MAAM,EAAE,CAAC;YACxB,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;YACtB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,WAAW,EAAE,CAAA;YACpC,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAE,EAAE;IACjE,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACvC,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;AAClD,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/incoming/protocol.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEpD,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,EAAU,EACyC,EAAE;IACrD,UAAU;IACV,gBAAgB;IAChB,qBAAqB;IACrB,yBAAyB;IACzB,6BAA6B;IAC7B,YAAY;IACZ,iBAAiB;IACjB,kBAAkB;IAClB,kCAAkC;IAClC,yBAAyB;IACzB,uBAAuB;IACvB,6BAA6B;IAC7B,oBAAoB;IACpB,gBAAgB;IAChB,MAAM,GAAG,GAAG,EAAE,IAAI,CAAC,CAAA;IACnB,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,CAAA;IACpB,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAA;IACtB,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAA;IAC1B,OAAO;QACL,IAAI;QACJ,SAAS,EAAE,SAAS,KAAK,CAAC;QAC1B,GAAG;KACJ,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,IAAgB,EAChB,KAAa,EACb,GAAW,EACH,EAAE;IACV,IAAI,CAAC,GAAG,CAAC,CAAA;IACT,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,KAAK,CAAA;IACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QAChC,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IACvB,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,CAAM,EAAuB,EAAE;IACpE,IAAI,CAAC,YAAY,UAAU,EAAE,CAAC;QAC5B,OAAO,CAAC,CAAA;IACV,CAAC;IAED,mDAAmD;IACnD,IAAI,CAAC,YAAY,WAAW,EAAE,CAAC;QAC7B,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;IAC1B,CAAC;IAED,wCAAwC;IACxC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,IAAI,CAAC,YAAY,MAAM,EAAE,CAAC;YACxB,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;YACtB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,WAAW,EAAE,CAAA;YACpC,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAE,EAAE;IACjE,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACvC,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;AAClD,CAAC,CAAA"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export * from './authState/parseAuthState.js';
|
|
|
8
8
|
export { AuthState, BasedQuery };
|
|
9
9
|
export declare class BasedClient extends Emitter {
|
|
10
10
|
constructor(opts?: BasedOpts, settings?: Settings);
|
|
11
|
+
restFallBack?: Settings['restFallBack'];
|
|
11
12
|
storageSize: number;
|
|
12
13
|
maxStorageSize: number;
|
|
13
14
|
storageEnvKey: number;
|
package/dist/src/index.js
CHANGED
|
@@ -25,10 +25,14 @@ export class BasedClient extends Emitter {
|
|
|
25
25
|
if (settings?.maxCacheSize) {
|
|
26
26
|
this.maxCacheSize = settings.maxCacheSize;
|
|
27
27
|
}
|
|
28
|
+
if (settings?.restFallBack) {
|
|
29
|
+
this.restFallBack = settings.restFallBack;
|
|
30
|
+
}
|
|
28
31
|
if (opts) {
|
|
29
32
|
this.connect(opts);
|
|
30
33
|
}
|
|
31
34
|
}
|
|
35
|
+
restFallBack;
|
|
32
36
|
// --------- Persistent Storage
|
|
33
37
|
storageSize = 0;
|
|
34
38
|
maxStorageSize = 5e6 - 500; // ~5mb
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAkBA,OAAO,gBAAgB,MAAM,sBAAsB,CAAA;AACnD,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,EACL,2BAA2B,EAC3B,0BAA0B,EAC1B,aAAa,EACb,kBAAkB,EAClB,UAAU,EACV,QAAQ,GACT,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,WAAW,MAAM,mBAAmB,CAAA;AAM3C,OAAO,EACL,WAAW,EACX,YAAY,EACZ,aAAa,GACd,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,SAAS,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,cAAc,+BAA+B,CAAA;AAE7C,OAAO,EAAa,UAAU,EAAE,CAAA;AAEhC,kBAAkB;AAClB,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;IACnE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAA;AACxB,CAAC;AAED,MAAM,OAAO,WAAY,SAAQ,OAAO;IACtC,YAAY,IAAgB,EAAE,QAAmB;QAC/C,KAAK,EAAE,CAAA;QAEP,IAAI,QAAQ,EAAE,iBAAiB,EAAE,CAAC;YAChC,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAA;QAC/C,CAAC;QACD,IAAI,QAAQ,EAAE,YAAY,EAAE,CAAC;YAC3B,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAA;QAC3C,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export * from './authState/parseAuthState.js';
|
|
|
8
8
|
export { AuthState, BasedQuery };
|
|
9
9
|
export declare class BasedClient extends Emitter {
|
|
10
10
|
constructor(opts?: BasedOpts, settings?: Settings);
|
|
11
|
+
restFallBack?: Settings['restFallBack'];
|
|
11
12
|
storageSize: number;
|
|
12
13
|
maxStorageSize: number;
|
|
13
14
|
storageEnvKey: number;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { BasedClient } from '../index.js';
|
|
2
|
+
export declare class FakeWebsocket {
|
|
3
|
+
url: string;
|
|
4
|
+
authState: string[];
|
|
5
|
+
constructor(url: string, restPrefix: string, client: BasedClient);
|
|
6
|
+
timer: ReturnType<typeof setTimeout>;
|
|
7
|
+
client: BasedClient;
|
|
8
|
+
_c: boolean;
|
|
9
|
+
_r: string;
|
|
10
|
+
_om: (x?: any) => void;
|
|
11
|
+
_oe: (x?: any) => void;
|
|
12
|
+
_oc: (x?: any) => void;
|
|
13
|
+
close(): void;
|
|
14
|
+
addEventListener(type: string, listener: (x?: any) => void): void;
|
|
15
|
+
removeEventListener(): void;
|
|
16
|
+
send(binary: any): void;
|
|
17
|
+
}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import fetch from '@based/fetch';
|
|
2
|
+
import { readUint8 } from '../incoming/protocol.js';
|
|
3
|
+
import { incoming } from '../incoming/index.js';
|
|
4
|
+
import { encodeAuthState } from '../index.js';
|
|
5
|
+
import { addObsToQueue } from '../outgoing/index.js';
|
|
6
|
+
const syncSubs = (ws) => {
|
|
7
|
+
if (!ws._c) {
|
|
8
|
+
setTimeout(() => {
|
|
9
|
+
if (ws._c) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
ws.client.observeState.forEach((v, k) => {
|
|
13
|
+
const c = ws.client.cache.get(k);
|
|
14
|
+
addObsToQueue(ws.client, v.name, k, v.payload, c?.c ?? 0);
|
|
15
|
+
});
|
|
16
|
+
syncSubs(ws);
|
|
17
|
+
}, ws.client.restFallBack.pollInverval ?? 1e3);
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
export class FakeWebsocket {
|
|
21
|
+
url;
|
|
22
|
+
authState;
|
|
23
|
+
constructor(url, restPrefix, client) {
|
|
24
|
+
this.url = url.replace(/^ws/, 'http');
|
|
25
|
+
this.client = client;
|
|
26
|
+
this._r = restPrefix;
|
|
27
|
+
syncSubs(this);
|
|
28
|
+
}
|
|
29
|
+
timer;
|
|
30
|
+
client;
|
|
31
|
+
_c;
|
|
32
|
+
_r;
|
|
33
|
+
_om;
|
|
34
|
+
_oe;
|
|
35
|
+
_oc;
|
|
36
|
+
close() {
|
|
37
|
+
this._c = true;
|
|
38
|
+
if (this._oc) {
|
|
39
|
+
this._oc();
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
addEventListener(type, listener) {
|
|
43
|
+
if (type === 'open') {
|
|
44
|
+
listener();
|
|
45
|
+
}
|
|
46
|
+
else if (type === 'message') {
|
|
47
|
+
this._om = listener;
|
|
48
|
+
}
|
|
49
|
+
else if (type === 'error') {
|
|
50
|
+
this._oe = listener;
|
|
51
|
+
}
|
|
52
|
+
else if (type === 'close') {
|
|
53
|
+
this._oc = listener;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
removeEventListener() { }
|
|
57
|
+
send(binary) {
|
|
58
|
+
if (binary.byteLength === 0) {
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
fetch(this.url + '/' + this._r + '/' + encodeAuthState(this.client.authState), {
|
|
62
|
+
method: 'post',
|
|
63
|
+
body: binary,
|
|
64
|
+
headers: {
|
|
65
|
+
'content-length': String(binary.byteLength),
|
|
66
|
+
},
|
|
67
|
+
})
|
|
68
|
+
.then(async (v) => {
|
|
69
|
+
const incomingArrayBuffer = new Uint8Array(await v.arrayBuffer());
|
|
70
|
+
let i = 0;
|
|
71
|
+
while (i < incomingArrayBuffer.byteLength) {
|
|
72
|
+
const s = readUint8(incomingArrayBuffer, i, 4);
|
|
73
|
+
const bufTime = incomingArrayBuffer.slice(i + 4, s + i + 4);
|
|
74
|
+
if (s) {
|
|
75
|
+
incoming(this.client, { data: bufTime });
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
console.error('error state fix later');
|
|
79
|
+
}
|
|
80
|
+
i += s + 4;
|
|
81
|
+
}
|
|
82
|
+
})
|
|
83
|
+
.catch((err) => {
|
|
84
|
+
console.error(err);
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=FakeWebsocket.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"FakeWebsocket.js","sourceRoot":"","sources":["../../../src/websocket/FakeWebsocket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import urlLoader from './urlLoader.js';
|
|
2
2
|
import { encodeAuthState } from '../authState/parseAuthState.js';
|
|
3
3
|
import { isStreaming } from '../stream/index.js';
|
|
4
|
+
import fetch from '@based/fetch';
|
|
4
5
|
import WebSocket from 'isomorphic-ws';
|
|
6
|
+
import { FakeWebsocket } from './FakeWebsocket.js';
|
|
5
7
|
const activityListeners = new Map();
|
|
6
8
|
let activeTimer;
|
|
7
|
-
// Disconnect in the browser when a window is inactive (on the background) for 30 seconds
|
|
8
9
|
if (typeof document !== 'undefined') {
|
|
9
10
|
let putToOffline = false;
|
|
10
11
|
window.addEventListener('offline', () => {
|
|
@@ -23,6 +24,7 @@ if (typeof document !== 'undefined') {
|
|
|
23
24
|
}
|
|
24
25
|
}
|
|
25
26
|
});
|
|
27
|
+
// Disconnect in the browser when a window is inactive (on the background) for 30 seconds
|
|
26
28
|
document.addEventListener('visibilitychange', function () {
|
|
27
29
|
clearTimeout(activeTimer);
|
|
28
30
|
if (document.hidden) {
|
|
@@ -39,6 +41,38 @@ if (typeof document !== 'undefined') {
|
|
|
39
41
|
}
|
|
40
42
|
});
|
|
41
43
|
}
|
|
44
|
+
// remove the logs here
|
|
45
|
+
const restPing = (ms = 500, realUrl, connection, fallback) => {
|
|
46
|
+
connection.fallBackTimer = setTimeout(() => {
|
|
47
|
+
if (!connection.disconnected) {
|
|
48
|
+
console.warn(`Cannot connect to ws in ${ms}ms`);
|
|
49
|
+
let d = Date.now();
|
|
50
|
+
connection.fallBackInProgress = true;
|
|
51
|
+
const x = realUrl.replace(/^wss?:\/\//, '').split('/');
|
|
52
|
+
const url = `http${realUrl.startsWith('wss') ? 's' : ''}://${x[0]}/based:rpstatus`;
|
|
53
|
+
fetch(url).then(async (r) => {
|
|
54
|
+
if (connection.fallBackInProgress) {
|
|
55
|
+
connection.fallBackInProgress = false;
|
|
56
|
+
const t = await r.text();
|
|
57
|
+
if (t && t[0] === '1') {
|
|
58
|
+
const timeEllapsed = Date.now() - d;
|
|
59
|
+
console.warn(`Took ${timeEllapsed}ms for rest`);
|
|
60
|
+
if (timeEllapsed < ms) {
|
|
61
|
+
console.warn(`was able to connect to rpstatus within ${ms}ms need to fallback to rest`);
|
|
62
|
+
fallback(t);
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
restPing(timeEllapsed + 100, realUrl, connection, fallback);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
console.warn('Connected while trying RP - skip');
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
}, ms);
|
|
75
|
+
};
|
|
42
76
|
const connect = (client, url, connection = {
|
|
43
77
|
destroy: () => {
|
|
44
78
|
activityListeners.delete(connection);
|
|
@@ -56,7 +90,6 @@ const connect = (client, url, connection = {
|
|
|
56
90
|
isActive = false;
|
|
57
91
|
client.onClose();
|
|
58
92
|
ws.close();
|
|
59
|
-
// add online listener as well
|
|
60
93
|
}
|
|
61
94
|
else if (!active && isActive) {
|
|
62
95
|
if (client.functionResponseListeners.size ||
|
|
@@ -82,12 +115,21 @@ const connect = (client, url, connection = {
|
|
|
82
115
|
}
|
|
83
116
|
}
|
|
84
117
|
});
|
|
85
|
-
const ws = (connection.ws =
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
let isError = false;
|
|
118
|
+
const ws = (connection.ws = connection.useFallback
|
|
119
|
+
? new FakeWebsocket(realUrl, connection.useFallback, client)
|
|
120
|
+
: new WebSocket(realUrl, [encodeAuthState(client.authState)]));
|
|
89
121
|
ws.binaryType = 'blob';
|
|
122
|
+
let isError = false;
|
|
123
|
+
if (!connection.useFallback && client.restFallBack) {
|
|
124
|
+
restPing(300, realUrl, connection, (t) => {
|
|
125
|
+
connection.useFallback = t;
|
|
126
|
+
ws.close();
|
|
127
|
+
});
|
|
128
|
+
}
|
|
90
129
|
ws.addEventListener('error', (err) => {
|
|
130
|
+
clearTimeout(connection.fallBackTimer);
|
|
131
|
+
// maybe this is a bad idea
|
|
132
|
+
connection.fallBackInProgress = false;
|
|
91
133
|
// TODO: add a websocket close number
|
|
92
134
|
// also for rateLimit
|
|
93
135
|
if (err.message && err.message.includes('401')) {
|
|
@@ -98,6 +140,8 @@ const connect = (client, url, connection = {
|
|
|
98
140
|
client.onData(d);
|
|
99
141
|
});
|
|
100
142
|
ws.addEventListener('open', () => {
|
|
143
|
+
clearTimeout(connection.fallBackTimer);
|
|
144
|
+
connection.fallBackInProgress = false;
|
|
101
145
|
if (isActive) {
|
|
102
146
|
if (connection.disconnected) {
|
|
103
147
|
return;
|
|
@@ -110,6 +154,8 @@ const connect = (client, url, connection = {
|
|
|
110
154
|
}
|
|
111
155
|
});
|
|
112
156
|
ws.addEventListener('close', () => {
|
|
157
|
+
clearTimeout(connection.fallBackTimer);
|
|
158
|
+
connection.fallBackInProgress = false;
|
|
113
159
|
if (isActive) {
|
|
114
160
|
if (connection.disconnected) {
|
|
115
161
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/websocket/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAA;AAGtC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/websocket/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/websocket/types.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,UAAU;IACd,EAAE,CAAY;IACd,YAAY,CAAU;IAC7B,OAAO,CAAY;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/websocket/types.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,UAAU;IACd,EAAE,CAAY;IACd,YAAY,CAAU;IAC7B,OAAO,CAAY;IACZ,aAAa,CAAgC;IAC7C,kBAAkB,CAAU;IAC5B,WAAW,CAAS;CAC5B"}
|