@based/client 4.0.1 → 4.0.2
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/README.md +3 -3
- package/dist/getUrlFromOpts.js +10 -7
- package/dist/getUrlFromOpts.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/stream/fetch.js +3 -7
- package/dist/stream/fetch.js.map +1 -1
- package/dist/stream/nodeStream.d.ts +0 -1
- package/dist/stream/nodeStream.js +2 -5
- package/dist/stream/nodeStream.js.map +1 -1
- package/dist/stream/uploadFileBrowser.js +2 -9
- package/dist/stream/uploadFileBrowser.js.map +1 -1
- package/dist/types/error.d.ts +2 -1
- package/dist/types/error.js +1 -0
- package/dist/types/error.js.map +1 -1
- package/dist/types/generic.d.ts +3 -1
- package/dist/websocket/index.js +8 -3
- package/dist/websocket/index.js.map +1 -1
- package/package.json +2 -1
package/README.md
CHANGED
|
@@ -41,14 +41,14 @@ const data = await client
|
|
|
41
41
|
|
|
42
42
|
// Get updates, persitent stores results in localStorage
|
|
43
43
|
const unsubscribe = client
|
|
44
|
-
.query('db', { $id: 'fwe2233', title: true }, { persistent: true})
|
|
44
|
+
.query('db', { $id: 'fwe2233', title: true }, { persistent: true })
|
|
45
45
|
.subscribe((data) => console.log(data))
|
|
46
46
|
|
|
47
47
|
// Channels are stateless streams
|
|
48
|
-
const unsubscribeChannel = client.channel('events', { type: 'page-view })
|
|
48
|
+
const unsubscribeChannel = client.channel('events', { type: 'page-view' })
|
|
49
49
|
.subscribe(event => console.log(event))
|
|
50
50
|
|
|
51
51
|
client
|
|
52
|
-
.channel('events', { type: 'page-view })
|
|
52
|
+
.channel('events', { type: 'page-view' })
|
|
53
53
|
.publish({ id: 'mypage' })
|
|
54
54
|
```
|
package/dist/getUrlFromOpts.js
CHANGED
|
@@ -11,14 +11,17 @@ exports.default = async (opts) => {
|
|
|
11
11
|
const discoveryUrls = opts.discoveryUrls || [
|
|
12
12
|
`https://${opts.org}-${opts.project}-${opts.env}.based.io`,
|
|
13
13
|
];
|
|
14
|
-
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
14
|
+
while (true) {
|
|
15
|
+
for (const hubDiscoveryUrl of discoveryUrls) {
|
|
16
|
+
const dUrl = `${hubDiscoveryUrl}/status?hub=${opts.name || '@based/env-hub'}&key=${opts.key}`;
|
|
17
|
+
const res = await (0, cross_fetch_1.default)(dUrl).catch(() => ({ ok: false }));
|
|
18
|
+
if (res.ok) {
|
|
19
|
+
const hubs = (await res.json());
|
|
20
|
+
const [hubUrl] = hubs[~~(Math.random() * hubs.length)];
|
|
21
|
+
return hubUrl;
|
|
22
|
+
}
|
|
21
23
|
}
|
|
24
|
+
await new Promise((resolve) => setTimeout(resolve, 5e3 + ~~(Math.random() * 1e3)));
|
|
22
25
|
}
|
|
23
26
|
};
|
|
24
27
|
//# sourceMappingURL=getUrlFromOpts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUrlFromOpts.js","sourceRoot":"","sources":["../src/getUrlFromOpts.ts"],"names":[],"mappings":";;;;;AACA,8DAA+B;AAE/B,kBAAe,KAAK,EAClB,IAAe,EAC4B,EAAE;IAC7C,IAAI,IAAI,CAAC,GAAG,EAAE;QACZ,OAAO,IAAI,CAAC,GAAG,CAAA;KAChB;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI;QAC1C,WAAW,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,WAAW;KAC3D,CAAA;IAED,KAAK,MAAM,eAAe,IAAI,aAAa,EAAE;
|
|
1
|
+
{"version":3,"file":"getUrlFromOpts.js","sourceRoot":"","sources":["../src/getUrlFromOpts.ts"],"names":[],"mappings":";;;;;AACA,8DAA+B;AAE/B,kBAAe,KAAK,EAClB,IAAe,EAC4B,EAAE;IAC7C,IAAI,IAAI,CAAC,GAAG,EAAE;QACZ,OAAO,IAAI,CAAC,GAAG,CAAA;KAChB;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI;QAC1C,WAAW,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,WAAW;KAC3D,CAAA;IAED,OAAO,IAAI,EAAE;QACX,KAAK,MAAM,eAAe,IAAI,aAAa,EAAE;YAC3C,MAAM,IAAI,GAAG,GAAG,eAAe,eAC7B,IAAI,CAAC,IAAI,IAAI,gBACf,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAA;YAClB,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAK,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAc,EAAE,CAAC,CAAC,CAAA;YAEnE,IAAI,GAAG,CAAC,EAAE,EAAE;gBACV,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAuB,CAAA;gBACrD,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;gBACtD,OAAO,MAAM,CAAA;aACd;SACF;QAED,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5B,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CACnD,CAAA;KACF;AACH,CAAC,CAAA"}
|
package/dist/index.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ import { StreamFunctionOpts } from './stream/types';
|
|
|
7
7
|
import { BasedChannel } from './channel';
|
|
8
8
|
import { ChannelQueue, ChannelPublishQueue, ChannelState } from './types/channel';
|
|
9
9
|
export * from './authState/parseAuthState';
|
|
10
|
+
export * from './types/error';
|
|
10
11
|
export { AuthState, BasedQuery };
|
|
11
12
|
export declare class BasedClient extends Emitter {
|
|
12
13
|
constructor(opts?: BasedOpts, settings?: Settings);
|
|
@@ -18,7 +19,7 @@ export declare class BasedClient extends Emitter {
|
|
|
18
19
|
opts: BasedOpts;
|
|
19
20
|
connected: boolean;
|
|
20
21
|
connection: Connection;
|
|
21
|
-
url:
|
|
22
|
+
url: () => Promise<string>;
|
|
22
23
|
outgoingStreams: Map<string, {
|
|
23
24
|
stream: any;
|
|
24
25
|
resolve: (result: any) => void;
|
package/dist/index.js
CHANGED
|
@@ -20,7 +20,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
20
20
|
exports.BasedClient = exports.BasedQuery = void 0;
|
|
21
21
|
const websocket_1 = __importDefault(require("./websocket"));
|
|
22
22
|
const Emitter_1 = __importDefault(require("./Emitter"));
|
|
23
|
-
const getUrlFromOpts_1 = __importDefault(require("./getUrlFromOpts"));
|
|
24
23
|
const outgoing_1 = require("./outgoing");
|
|
25
24
|
const incoming_1 = require("./incoming");
|
|
26
25
|
const query_1 = require("./query");
|
|
@@ -29,7 +28,9 @@ const stream_1 = __importDefault(require("./stream"));
|
|
|
29
28
|
const persistentStorage_1 = require("./persistentStorage");
|
|
30
29
|
const channel_1 = require("./channel");
|
|
31
30
|
const hash_1 = require("@saulx/hash");
|
|
31
|
+
const opts_1 = __importDefault(require("@based/opts"));
|
|
32
32
|
__exportStar(require("./authState/parseAuthState"), exports);
|
|
33
|
+
__exportStar(require("./types/error"), exports);
|
|
33
34
|
class BasedClient extends Emitter_1.default {
|
|
34
35
|
constructor(opts, settings) {
|
|
35
36
|
super();
|
|
@@ -140,7 +141,7 @@ class BasedClient extends Emitter_1.default {
|
|
|
140
141
|
this.disconnect();
|
|
141
142
|
}
|
|
142
143
|
this.opts = opts;
|
|
143
|
-
this.url =
|
|
144
|
+
this.url = () => (0, opts_1.default)(opts);
|
|
144
145
|
}
|
|
145
146
|
if (!this.opts) {
|
|
146
147
|
console.error('Configure opts to connect');
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAaA,4DAA0C;AAC1C,wDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAaA,4DAA0C;AAC1C,wDAA+B;AAC/B,yCAOmB;AACnB,yCAAqC;AACrC,mCAAoC;AAiBhB,2FAjBX,kBAAU,OAiBW;AAhB9B,sDAAkC;AAElC,2DAA8E;AAC9E,uCAAwC;AAMxC,sCAAsD;AACtD,uDAAmC;AAEnC,6DAA0C;AAE1C,gDAA6B;AAI7B,MAAa,WAAY,SAAQ,iBAAO;IACtC,YAAY,IAAgB,EAAE,QAAmB;QAC/C,KAAK,EAAE,CAAA;QAeT,+BAA+B;QAC/B,gBAAW,GAAW,CAAC,CAAA;QACvB,mBAAc,GAAW,GAAG,GAAG,GAAG,CAAA,CAAC,OAAO;QAC1C,kBAAa,GAAW,CAAC,CAAA;QAKzB,cAAS,GAAY,KAAK,CAAA;QAG1B,mBAAmB;QACnB,oBAAe,GAOX,IAAI,GAAG,EAAE,CAAA;QAEb,sBAAiB,GAAY,KAAK,CAAA;QAClC,kBAAkB;QAClB,iBAAY,GAAwB,EAAE,CAAA;QACtC,kBAAa,GAAkB,EAAE,CAAA;QACjC,iBAAY,GAAiB,IAAI,GAAG,EAAE,CAAA;QACtC,iBAAY,GAAiB,IAAI,GAAG,EAAE,CAAA;QACtC,oBAAe,GAAoB,IAAI,GAAG,EAAE,CAAA;QAC5C,oBAAe,GAAY,KAAK,CAAA;QAGhC,wBAAwB;QACxB,iBAAY,GAAY,KAAK,CAAA;QAC7B,iBAAY,GAAW,GAAG,CAAA,CAAC,WAAW;QACtC,UAAK,GAAU,IAAI,GAAG,EAAE,CAAA;QACxB,2BAA2B;QAC3B,8BAAyB,GAA8B,IAAI,GAAG,EAAE,CAAA;QAChE,cAAS,GAAW,CAAC,CAAA,CAAC,8BAA8B;QACpD,0BAA0B;QAC1B,iBAAY,GAAiB,IAAI,GAAG,EAAE,CAAA;QAEtC,wBAAmB,GAAW,IAAI,CAAA;QAClC,0BAA0B;QAC1B,iBAAY,GAAiB,IAAI,GAAG,EAAE,CAAA;QACtC,sBAAsB;QACtB,aAAQ,GAAa,IAAI,GAAG,EAAE,CAAA;QAC9B,sBAAsB;QACtB,cAAS,GAAc,EAAE,CAAA;QACzB,gBAAW,GAMP;YACF,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,KAAK;SAClB,CAAA;QA1EC,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACxC,IAAI,CAAC,aAAa,GAAG,IAAA,+BAAwB,EAAC,IAAI,CAAC,CAAA;YACnD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;SACnB;QACD,IAAI,QAAQ,EAAE,iBAAiB,EAAE;YAC/B,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAA;SAC9C;QACD,IAAI,QAAQ,EAAE,YAAY,EAAE;YAC1B,OAAO,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAA;YAC3D,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAA;SAC1C;QACD,IAAA,+BAAW,EAAC,IAAI,CAAC,CAAA;IACnB,CAAC;IAgED,4BAA4B;IAC5B,OAAO;QACL,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;QACtB,2FAA2F;QAC3F,IAAI,IAAI,CAAC,yBAAyB,CAAC,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;YACnE,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC9C,IACE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;oBAChC,IAAI,EAAE,KAAK,CAAC,EAAE;wBACZ,OAAO,IAAI,CAAA;qBACZ;oBACD,OAAO,KAAK,CAAA;gBACd,CAAC,CAAC,EACF;oBACA,CAAC,CAAC,CAAC,CAAC,CACF,IAAI,KAAK,CACP,0DAA0D,CAC3D,CACF,CAAA;oBACD,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;iBACzC;YACH,CAAC,CAAC,CAAA;SACH;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;IAC/B,CAAC;IAED,WAAW;QACT,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACrB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACrB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QAE1B,2BAA2B;QAC3B,KAAK,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE;YACzC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBACrC,IAAA,wBAAa,EACX,IAAI,EACJ,GAAG,CAAC,IAAI,EACR,EAAE,EACF,GAAG,CAAC,OAAO,EACX,UAAU,EAAE,QAAQ,IAAI,CAAC,CAC1B,CAAA;aACF;SACF;QAED,sBAAsB;QACtB,KAAK,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE;YAC7C,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAC9B,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE;oBAC5B,IAAA,qCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;iBACpE;qBAAM;oBACL,IAAA,sCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;iBACrE;aACF;SACF;QAED,IAAA,qBAAU,EAAC,IAAI,CAAC,CAAA;IAClB,CAAC;IAED,MAAM,CAAC,IAAS;QACd,IAAA,mBAAQ,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACtB,CAAC;IAED,oBAAoB;IACb,KAAK,CAAC,OAAO,CAAC,IAAgB;QACnC,IAAI,IAAI,EAAE;YACR,IAAI,IAAI,CAAC,IAAI,EAAE;gBACb,IAAI,CAAC,UAAU,EAAE,CAAA;aAClB;YACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;YAChB,IAAI,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,IAAA,cAAS,EAAC,IAAI,CAAC,CAAA;SACjC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAA;YAC1C,OAAM;SACP;QACD,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAChC,IAAI,CAAC,UAAU,GAAG,IAAA,mBAAgB,EAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;SACnD;IACH,CAAC;IAEM,UAAU;QACf,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,UAAU,CAAC,YAAY,GAAG,IAAI,CAAA;YACnC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAA;YACzB,IAAI,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE;gBACtB,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;aAC3B;YACD,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,IAAI,CAAC,OAAO,EAAE,CAAA;aACf;YACD,OAAO,IAAI,CAAC,UAAU,CAAA;SACvB;QACD,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC/B,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC3B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;IACxB,CAAC;IAIM,KAAK,CAAC,OAAO,CAAC,SAAmB;QACtC,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAA,iCAAa,EAAC,IAAI,CAAC,CAAA;SAC1B;QACD,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;QACtC,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;QACtC,IAAI,CAAC,UAAU,EAAE,CAAA;QACjB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QACvB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;YACpB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;SACf;IACH,CAAC;IAED,qBAAqB;IACrB,OAAO,CAAC,IAAY,EAAE,OAAa;QACjC,OAAO,IAAI,sBAAY,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC;IAED,mBAAmB;IACnB,KAAK,CACH,IAAY,EACZ,OAAa,EACb,IAA8B;QAE9B,OAAO,IAAI,kBAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IAClD,CAAC;IAED,oBAAoB;IACpB,IAAI,CAAC,IAAY,EAAE,OAAa;QAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAA,6BAAkB,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;QAC1D,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,kBAAkB;IAClB,MAAM,CACJ,IAAY,EACZ,MAA0B,EAC1B,gBAA6C;QAE7C,OAAO,IAAA,gBAAW,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAC1D,CAAC;IAED,gBAAgB;IAChB,YAAY,CAAC,SAAoB;QAC/B,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACjC,OAAO,IAAA,mBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAA;SACjC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;SAC5C;IACH,CAAC;IAED,cAAc;QACZ,OAAO,IAAA,mBAAQ,EAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IAC3B,CAAC;IAED,yBAAyB;IACzB,YAAY;QACV,OAAO,IAAA,gCAAY,EAAC,IAAI,CAAC,CAAA;IAC3B,CAAC;IAED,WAAW;QACT,OAAO,IAAA,iCAAa,EAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;CACF;AAvPD,kCAuPC;AAID,SAAwB,KAAK,CAC3B,IAAe,EACf,QAAmB;IAEnB,OAAO,IAAI,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;AACxC,CAAC;AALD,wBAKC"}
|
package/dist/stream/fetch.js
CHANGED
|
@@ -5,17 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const __1 = require("..");
|
|
7
7
|
const cross_fetch_1 = __importDefault(require("cross-fetch"));
|
|
8
|
-
const getUrlFromOpts_1 = __importDefault(require("../getUrlFromOpts"));
|
|
9
8
|
const utils_1 = require("@saulx/utils");
|
|
9
|
+
const opts_1 = __importDefault(require("@based/opts"));
|
|
10
10
|
exports.default = async (client, name, options) => {
|
|
11
11
|
if (!client.connected) {
|
|
12
12
|
await client.once('connect');
|
|
13
13
|
}
|
|
14
|
-
|
|
15
|
-
let url = await (0, getUrlFromOpts_1.default)(client.opts);
|
|
16
|
-
if (typeof url === 'function') {
|
|
17
|
-
url = await url();
|
|
18
|
-
}
|
|
14
|
+
const url = await (0, opts_1.default)(client.opts, true);
|
|
19
15
|
const headers = {
|
|
20
16
|
'Content-Type': options.mimeType || 'text/plain',
|
|
21
17
|
Authorization: (0, __1.encodeAuthState)(client.authState),
|
|
@@ -27,7 +23,7 @@ exports.default = async (client, name, options) => {
|
|
|
27
23
|
if (options.payload) {
|
|
28
24
|
q = '?' + (0, utils_1.serializeQuery)(options.payload);
|
|
29
25
|
}
|
|
30
|
-
const result = await (0, cross_fetch_1.default)(url
|
|
26
|
+
const result = await (0, cross_fetch_1.default)(url + '/' + name + q, {
|
|
31
27
|
method: 'POST',
|
|
32
28
|
cache: 'no-cache',
|
|
33
29
|
headers,
|
package/dist/stream/fetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/stream/fetch.ts"],"names":[],"mappings":";;;;;AAAA,0BAAiD;AAEjD,8DAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/stream/fetch.ts"],"names":[],"mappings":";;;;;AAAA,0BAAiD;AAEjD,8DAA+B;AAC/B,wCAA6C;AAC7C,uDAAmC;AAEnC,kBAAe,KAAK,EAClB,MAAmB,EACnB,IAAY,EACZ,OAA+B,EACjB,EAAE;IAChB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;QACrB,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;KAC7B;IAED,MAAM,GAAG,GAAG,MAAM,IAAA,cAAS,EAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE9C,MAAM,OAAO,GAAkB;QAC7B,cAAc,EAAE,OAAO,CAAC,QAAQ,IAAI,YAAY;QAChD,aAAa,EAAE,IAAA,mBAAe,EAAC,MAAM,CAAC,SAAS,CAAC;KACjD,CAAA;IAED,IAAI,OAAO,CAAC,QAAQ,EAAE;QACpB,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAA;KAC3C;IAED,IAAI,CAAC,GAAG,EAAE,CAAA;IACV,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,CAAC,GAAG,GAAG,GAAG,IAAA,sBAAc,EAAC,OAAO,CAAC,OAAO,CAAC,CAAA;KAC1C;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAK,EAAC,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,CAAC,EAAE;QAC/C,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,UAAU;QACjB,OAAO;QACP,IAAI,EAAE,OAAO,CAAC,QAAQ;KACvB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IAExB,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;KAC1B;IAAC,OAAO,CAAC,EAAE,GAAE;IAEd,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}
|
|
@@ -10,7 +10,7 @@ const https_1 = require("https");
|
|
|
10
10
|
const fs_1 = __importDefault(require("fs"));
|
|
11
11
|
const util_1 = require("util");
|
|
12
12
|
const __1 = require("..");
|
|
13
|
-
const
|
|
13
|
+
const opts_1 = __importDefault(require("@based/opts"));
|
|
14
14
|
const error_1 = require("../types/error");
|
|
15
15
|
const utils_1 = require("@saulx/utils");
|
|
16
16
|
const stat = (0, util_1.promisify)(fs_1.default.stat);
|
|
@@ -92,10 +92,7 @@ const uploadFileStream = async (client, name, options) => {
|
|
|
92
92
|
await client.once('connect');
|
|
93
93
|
}
|
|
94
94
|
// key is something special
|
|
95
|
-
|
|
96
|
-
if (typeof url === 'function') {
|
|
97
|
-
url = await url();
|
|
98
|
-
}
|
|
95
|
+
const url = await (0, opts_1.default)(client.opts, true);
|
|
99
96
|
const headers = {
|
|
100
97
|
'Content-Length': String(options.size),
|
|
101
98
|
'Content-Type': options.mimeType || 'text/plain',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeStream.js","sourceRoot":"","sources":["../../src/stream/nodeStream.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAiC;AACjC,+BAA+C;AAC/C,iCAA6C;AAC7C,4CAAmB;AACnB,+BAAgC;AAMhC,0BAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"nodeStream.js","sourceRoot":"","sources":["../../src/stream/nodeStream.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,17 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const __1 = require("..");
|
|
7
|
-
const
|
|
7
|
+
const opts_1 = __importDefault(require("@based/opts"));
|
|
8
8
|
const error_1 = require("../types/error");
|
|
9
9
|
const inProgress = {};
|
|
10
10
|
const queue = {};
|
|
11
|
-
const getUrl = async (client) => {
|
|
12
|
-
let url = await (0, getUrlFromOpts_1.default)(client.opts);
|
|
13
|
-
if (typeof url === 'function') {
|
|
14
|
-
url = await url();
|
|
15
|
-
}
|
|
16
|
-
return url.replace(/^ws/, 'http');
|
|
17
|
-
};
|
|
18
11
|
const reject = (err, q) => {
|
|
19
12
|
q.forEach((item) => {
|
|
20
13
|
item.reject(err);
|
|
@@ -25,7 +18,7 @@ const drainQueue = (client, functionName, authorization) => {
|
|
|
25
18
|
inProgress[functionName] = true;
|
|
26
19
|
setTimeout(async () => {
|
|
27
20
|
inProgress[functionName] = false;
|
|
28
|
-
const url = await
|
|
21
|
+
const url = await (0, opts_1.default)(client.opts, true);
|
|
29
22
|
const q = queue[functionName];
|
|
30
23
|
queue[functionName] = [];
|
|
31
24
|
const body = new global.FormData();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadFileBrowser.js","sourceRoot":"","sources":["../../src/stream/uploadFileBrowser.ts"],"names":[],"mappings":";;;;;AAAA,0BAAiD;AAEjD,
|
|
1
|
+
{"version":3,"file":"uploadFileBrowser.js","sourceRoot":"","sources":["../../src/stream/uploadFileBrowser.ts"],"names":[],"mappings":"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"}
|
package/dist/types/error.d.ts
CHANGED
|
@@ -18,7 +18,8 @@ export declare enum BasedErrorCode {
|
|
|
18
18
|
LengthRequired = 41101,
|
|
19
19
|
MethodNotAllowed = 40501,
|
|
20
20
|
RateLimit = 40029,
|
|
21
|
-
MissingAuthStateProtocolHeader = 40030
|
|
21
|
+
MissingAuthStateProtocolHeader = 40030,
|
|
22
|
+
IncorrectAccessKey = 40031
|
|
22
23
|
}
|
|
23
24
|
export type BasedErrorData = {
|
|
24
25
|
message: string;
|
package/dist/types/error.js
CHANGED
|
@@ -23,6 +23,7 @@ var BasedErrorCode;
|
|
|
23
23
|
BasedErrorCode[BasedErrorCode["MethodNotAllowed"] = 40501] = "MethodNotAllowed";
|
|
24
24
|
BasedErrorCode[BasedErrorCode["RateLimit"] = 40029] = "RateLimit";
|
|
25
25
|
BasedErrorCode[BasedErrorCode["MissingAuthStateProtocolHeader"] = 40030] = "MissingAuthStateProtocolHeader";
|
|
26
|
+
BasedErrorCode[BasedErrorCode["IncorrectAccessKey"] = 40031] = "IncorrectAccessKey";
|
|
26
27
|
})(BasedErrorCode = exports.BasedErrorCode || (exports.BasedErrorCode = {}));
|
|
27
28
|
class BasedError extends Error {
|
|
28
29
|
}
|
package/dist/types/error.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/types/error.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/types/error.ts"],"names":[],"mappings":";;;AAAA,IAAY,cAsBX;AAtBD,WAAY,cAAc;IACxB,yEAAqB,CAAA;IACrB,2FAA8B,CAAA;IAC9B,iGAAiC,CAAA;IACjC,6FAA+B,CAAA;IAC/B,uFAA4B,CAAA;IAC5B,+EAAwB,CAAA;IACxB,6FAA+B,CAAA;IAC/B,uFAA4B,CAAA;IAC5B,+EAAwB,CAAA;IACxB,+GAAwC,CAAA;IACxC,2FAA8B,CAAA;IAC9B,2EAAsB,CAAA;IACtB,6EAAuB,CAAA;IACvB,yEAAqB,CAAA;IACrB,mGAAkC,CAAA;IAClC,+EAAwB,CAAA;IACxB,2EAAsB,CAAA;IACtB,+EAAwB,CAAA;IACxB,iEAAiB,CAAA;IACjB,2GAAsC,CAAA;IACtC,mFAA0B,CAAA;AAC5B,CAAC,EAtBW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAsBzB;AAYD,MAAa,UAAW,SAAQ,KAAK;CAGpC;AAHD,gCAGC;AAEM,MAAM,uBAAuB,GAAG,CACrC,OAAuB,EACvB,KAAc,EACF,EAAE;IACd,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;IACjC,MAAM,GAAG,GACP,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAA;IACvE,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA;IACjC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAA;IAC7C,KAAK,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,CAAA;IACjC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAA;IACjB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAZY,QAAA,uBAAuB,2BAYnC"}
|
package/dist/types/generic.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export type GenericObject = {
|
|
2
2
|
[key: string]: any;
|
|
3
3
|
};
|
|
4
|
+
export type BasedUrlFn = () => Promise<string>;
|
|
4
5
|
export type BasedOpts = {
|
|
5
6
|
env?: string;
|
|
6
7
|
project?: string;
|
|
@@ -8,7 +9,8 @@ export type BasedOpts = {
|
|
|
8
9
|
cluster?: string;
|
|
9
10
|
name?: string;
|
|
10
11
|
key?: string;
|
|
11
|
-
|
|
12
|
+
optionalKey?: boolean;
|
|
13
|
+
url?: string | BasedUrlFn;
|
|
12
14
|
discoveryUrls?: string[];
|
|
13
15
|
params?: {
|
|
14
16
|
[key: string]: string | number;
|
package/dist/websocket/index.js
CHANGED
|
@@ -54,8 +54,11 @@ const connect = (client, url, connection = {
|
|
|
54
54
|
const ws = (connection.ws = new isomorphic_ws_1.default(realUrl, [
|
|
55
55
|
(0, parseAuthState_1.encodeAuthState)(client.authState),
|
|
56
56
|
]));
|
|
57
|
-
|
|
58
|
-
|
|
57
|
+
let isError = false;
|
|
58
|
+
ws.onerror = (err) => {
|
|
59
|
+
if (err.message && err.message.includes('401')) {
|
|
60
|
+
isError = true;
|
|
61
|
+
}
|
|
59
62
|
};
|
|
60
63
|
ws.onmessage = (d) => {
|
|
61
64
|
client.onData(d);
|
|
@@ -80,7 +83,9 @@ const connect = (client, url, connection = {
|
|
|
80
83
|
client.onClose();
|
|
81
84
|
connect(client, url, connection,
|
|
82
85
|
// relatively low backoff but will make it faster if multiple servers are down
|
|
83
|
-
|
|
86
|
+
isError
|
|
87
|
+
? 10e3
|
|
88
|
+
: Math.min(2000, Math.min(time + ~~(Math.random() * 500) + 100)), true);
|
|
84
89
|
}
|
|
85
90
|
};
|
|
86
91
|
}, time);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/websocket/index.ts"],"names":[],"mappings":";;;;;AAAA,4DAAmC;AAGnC,kEAAqC;AACrC,gEAA6D;AAI7D,MAAM,iBAAiB,GAA8B,IAAI,GAAG,EAAE,CAAA;AAE9D,IAAI,WAA2B,CAAA;AAE/B,yFAAyF;AACzF,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IACjC,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE;QAC5C,YAAY,CAAC,WAAW,CAAC,CAAA;QACzB,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,iBAAiB,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;oBAC/B,EAAE,CAAC,KAAK,CAAC,CAAA;gBACX,CAAC,CAAC,CAAA;YACJ,CAAC,EAAE,IAAI,CAAC,CAAA;SACT;aAAM;YACL,iBAAiB,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;gBAC/B,EAAE,CAAC,IAAI,CAAC,CAAA;YACV,CAAC,CAAC,CAAA;SACH;IACH,CAAC,CAAC,CAAA;CACH;AAED,MAAM,OAAO,GAAG,CACd,MAAmB,EACnB,GAAqC,EACrC,aAAyB;IACvB,OAAO,EAAE,GAAG,EAAE;QACZ,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IACtC,CAAC;CACF,EACD,IAAI,GAAG,CAAC,EACR,SAAS,GAAG,KAAK,EACL,EAAE;IACd,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE;QACzB,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,UAAU,CAAC,YAAY,EAAE;gBAC3B,OAAM;aACP;YAED,IAAI,QAAQ,GAAG,IAAI,CAAA;YAEnB,iBAAiB,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;gBAC3C,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE;oBAC5B,IAAI,CAAC,MAAM,IAAI,QAAQ,EAAE;wBACvB,OAAO,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAA;wBACrD,QAAQ,GAAG,KAAK,CAAA;wBAChB,MAAM,CAAC,OAAO,EAAE,CAAA;wBAChB,EAAE,CAAC,KAAK,EAAE,CAAA;qBACX;yBAAM,IAAI,CAAC,QAAQ,IAAI,MAAM,EAAE;wBAC9B,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;wBACpC,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;qBAC1C;iBACF;YACH,CAAC,CAAC,CAAA;YAEF,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,IAAI,uBAAS,CAAC,OAAO,EAAE;gBACjD,IAAA,gCAAe,EAAC,MAAM,CAAC,SAAS,CAAC;aAClC,CAAC,CAAC,CAAA;YAEH,EAAE,CAAC,OAAO,GAAG,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/websocket/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@based/client",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.2",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -24,6 +24,7 @@
|
|
|
24
24
|
]
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
+
"@based/opts": "0.0.5",
|
|
27
28
|
"@saulx/diff": "^1.1.4",
|
|
28
29
|
"@saulx/hash": "^2.0.0",
|
|
29
30
|
"fflate": "^0.7.3",
|