@blackglory/cache-js 0.1.2 → 0.3.0

package/lib/es2015/cache.d.ts

@@ -1,5 +1,4 @@
-import { ClientProxy, BatchClient, BatchClientProxy } from 'delight-rpc';
-import { IAPI, IStats } from './contract';
+import { IStats } from './contract';
 export { IStats } from './contract';
 export interface IMetadata {
     updatedAt: number;
@@ -16,9 +15,9 @@ export declare class CacheClient {
     private batchProxy;
     private closeClients;
     private timeout?;
-    constructor(client: ClientProxy<IAPI>, batchClient: BatchClient, batchProxy: BatchClientProxy<IAPI, unknown>, closeClients: () => void, timeout?: number | undefined);
+    private constructor();
     static create(options: ICacheClientOptions): Promise<CacheClient>;
-    close(): void;
+    close(): Promise<void>;
     has(namespace: string, key: string, timeout?: number): Promise<boolean>;
     get(namespace: string, key: string, timeout?: number): Promise<string | null>;
     bulkGet(namespace: string, keys: string[], timeout?: number): Promise<Array<string | null>>;

package/lib/es2015/cache.js

@@ -28,16 +28,18 @@ class CacheClient {
         });
     }
     close() {
-        this.closeClients();
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.closeClients();
+        });
     }
     has(namespace, key, timeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.withTimeout(() => this.client.has(namespace, key), timeout);
+            return yield this.withTimeout(() => this.client.has(namespace, key), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
         });
     }
     get(namespace, key, timeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.withTimeout(() => this.client.get(namespace, key), timeout);
+            return yield this.withTimeout(() => this.client.get(namespace, key), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
         });
     }
     bulkGet(namespace, keys, timeout) {
@@ -45,7 +47,7 @@ class CacheClient {
             return yield this.withTimeout(() => __awaiter(this, void 0, void 0, function* () {
                 const results = yield this.batchClient.parallel(...keys.map(key => this.batchProxy.get(namespace, key)));
                 return results.map(result => result.unwrap());
-            }), timeout);
+            }), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
         });
     }
     getWithMetadata(namespace, key, timeout) {
@@ -63,7 +65,7 @@ class CacheClient {
                         timeBeforeDeletion: (_b = result.metadata.timeBeforeDeletion) !== null && _b !== void 0 ? _b : Infinity
                     }
                 };
-            }), timeout);
+            }), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
         });
     }
     set(namespace, key, value, timeToLive, timeBeforeDeletion, timeout) {
@@ -72,32 +74,32 @@ class CacheClient {
                 ? null
                 : timeToLive, (0, prelude_1.isPositiveInfinity)(timeBeforeDeletion)
                 ? null
-                : timeBeforeDeletion), timeout);
+                : timeBeforeDeletion), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
         });
     }
     del(namespace, key, timeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.withTimeout(() => this.client.del(namespace, key), timeout);
+            yield this.withTimeout(() => this.client.del(namespace, key), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
         });
     }
     clear(namespace, timeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.withTimeout(() => this.client.clear(namespace), timeout);
+            yield this.withTimeout(() => this.client.clear(namespace), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
         });
     }
     getAllItemKeys(namespace, timeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.withTimeout(() => this.client.getAllItemKeys(namespace), timeout);
+            return yield this.withTimeout(() => this.client.getAllItemKeys(namespace), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
         });
     }
     getAllNamespaces(timeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.withTimeout(() => this.client.getAllNamespaces(), timeout);
+            return yield this.withTimeout(() => this.client.getAllNamespaces(), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
         });
     }
     stats(namespace, timeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.withTimeout(() => this.client.stats(namespace), timeout);
+            return yield this.withTimeout(() => this.client.stats(namespace), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
         });
     }
     withTimeout(fn, timeout = this.timeout) {
@@ -105,7 +107,9 @@ class CacheClient {
             if (timeout) {
                 return yield (0, extra_abort_1.withAbortSignal)((0, extra_abort_1.timeoutSignal)(timeout), fn);
             }
-            return yield fn();
+            else {
+                return yield fn();
+            }
         });
     }
 }

package/lib/es2015/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":"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"}

package/lib/es2015/contract.d.ts

@@ -21,4 +21,4 @@ export interface IMetadata {
     timeToLive: number | null;
     timeBeforeDeletion: number | null;
 }
-export declare const expectedVersion = "0.1.1";
+export declare const expectedVersion = "0.2.0";

package/lib/es2015/contract.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expectedVersion = void 0;
-exports.expectedVersion = '0.1.1';
+exports.expectedVersion = '0.2.0';
 //# sourceMappingURL=contract.js.map

package/lib/es2015/utils/rpc-client.browser.d.ts

@@ -4,5 +4,5 @@ export declare function createRPCClient(url: string): Promise<{
     client: ClientProxy<IAPI>;
     batchClient: BatchClient<IAPI>;
     proxy: BatchClientProxy<IAPI, unknown>;
-    close: () => void;
+    close: () => Promise<void>;
 }>;

package/lib/es2015/utils/rpc-client.browser.js

@@ -12,23 +12,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRPCClient = void 0;
 const contract_1 = require("../contract");
 const delight_rpc_1 = require("delight-rpc");
-const websocket_browser_1 = require("@delight-rpc/websocket-browser");
-const wait_for_1 = require("@blackglory/wait-for");
+const extra_native_websocket_1 = require("@delight-rpc/extra-native-websocket");
+const extra_native_websocket_2 = require("extra-native-websocket");
 function createRPCClient(url) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ws = new WebSocket(url);
-        yield (0, wait_for_1.waitForEventTarget)(ws, 'open');
-        const [client, closeClient] = (0, websocket_browser_1.createClient)(ws, undefined, contract_1.expectedVersion);
-        const [batchClient, closeBatchClient] = (0, websocket_browser_1.createBatchClient)(new WebSocket(url), contract_1.expectedVersion);
+        const ws = new extra_native_websocket_2.ExtraNativeWebSocket(() => new WebSocket(url));
+        const cancelAutoReconnect = (0, extra_native_websocket_2.autoReconnect)(ws);
+        yield ws.connect();
+        const [client, closeClient] = (0, extra_native_websocket_1.createClient)(ws, { expectedVersion: contract_1.expectedVersion });
+        const [batchClient, closeBatchClient] = (0, extra_native_websocket_1.createBatchClient)(ws, { expectedVersion: contract_1.expectedVersion });
         const proxy = (0, delight_rpc_1.createBatchProxy)();
         return {
             client,
             batchClient,
             proxy,
-            close: () => {
+            close: () => __awaiter(this, void 0, void 0, function* () {
                 closeClient();
                 closeBatchClient();
-            }
+                cancelAutoReconnect();
+                yield ws.close();
+            })
         };
     });
 }

package/lib/es2015/utils/rpc-client.browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.browser.js","sourceRoot":"","sources":["../../../src/utils/rpc-client.browser.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAqD;AACrD,6CAA0F;AAC1F,sEAAgF;AAChF,mDAAyD;AAEzD,SAAsB,eAAe,CAAC,GAAW;;QAM/C,MAAM,EAAE,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAA;QAC7B,MAAM,IAAA,6BAAkB,EAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QACpC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,gCAAY,EAAO,EAAE,EAAE,SAAS,EAAE,0BAAe,CAAC,CAAA;QAChF,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAA,qCAAiB,EAAC,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,0BAAe,CAAC,CAAA;QAC9F,MAAM,KAAK,GAAG,IAAA,8BAAgB,GAAQ,CAAA;QACtC,OAAO;YACL,MAAM;YACN,WAAW;YACX,KAAK;YACL,KAAK,EAAE,GAAG,EAAE;gBACV,WAAW,EAAE,CAAA;gBACb,gBAAgB,EAAE,CAAA;YACpB,CAAC;SACF,CAAA;IACH,CAAC;CAAA;AApBD,0CAoBC"}
+{"version":3,"file":"rpc-client.browser.js","sourceRoot":"","sources":["../../../src/utils/rpc-client.browser.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAqD;AACrD,6CAA0F;AAC1F,gFAAqF;AACrF,mEAA4E;AAE5E,SAAsB,eAAe,CAAC,GAAW;;QAM/C,MAAM,EAAE,GAAG,IAAI,6CAAoB,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;QAC7D,MAAM,mBAAmB,GAAG,IAAA,sCAAa,EAAC,EAAE,CAAC,CAAA;QAC7C,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;QAElB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,qCAAY,EAAO,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;QACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAA,0CAAiB,EAAC,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;QAClF,MAAM,KAAK,GAAG,IAAA,8BAAgB,GAAQ,CAAA;QAEtC,OAAO;YACL,MAAM;YACN,WAAW;YACX,KAAK;YACL,KAAK,EAAE,GAAS,EAAE;gBAChB,WAAW,EAAE,CAAA;gBACb,gBAAgB,EAAE,CAAA;gBAClB,mBAAmB,EAAE,CAAA;gBACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;YAClB,CAAC,CAAA;SACF,CAAA;IACH,CAAC;CAAA;AAzBD,0CAyBC"}

package/lib/es2015/utils/rpc-client.d.ts

@@ -4,5 +4,5 @@ export declare function createRPCClient(url: string): Promise<{
     client: ClientProxy<IAPI>;
     batchClient: BatchClient<IAPI>;
     proxy: BatchClientProxy<IAPI, unknown>;
-    close: () => void;
+    close: () => Promise<void>;
 }>;

package/lib/es2015/utils/rpc-client.js

@@ -12,24 +12,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRPCClient = void 0;
 const contract_1 = require("../contract");
 const delight_rpc_1 = require("delight-rpc");
-const websocket_1 = require("@delight-rpc/websocket");
+const extra_websocket_1 = require("@delight-rpc/extra-websocket");
 const ws_1 = require("ws");
-const wait_for_1 = require("@blackglory/wait-for");
+const extra_websocket_2 = require("extra-websocket");
 function createRPCClient(url) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ws = new ws_1.WebSocket(url);
-        yield (0, wait_for_1.waitForEventEmitter)(ws, 'open');
-        const [client, closeClient] = (0, websocket_1.createClient)(ws, undefined, contract_1.expectedVersion);
-        const [batchClient, closeBatchClient] = (0, websocket_1.createBatchClient)(new ws_1.WebSocket(url), contract_1.expectedVersion);
+        const ws = new extra_websocket_2.ExtraWebSocket(() => new ws_1.WebSocket(url));
+        const cancelAutoReconnect = (0, extra_websocket_2.autoReconnect)(ws);
+        yield ws.connect();
+        const [client, closeClient] = (0, extra_websocket_1.createClient)(ws, { expectedVersion: contract_1.expectedVersion });
+        const [batchClient, closeBatchClient] = (0, extra_websocket_1.createBatchClient)(ws, { expectedVersion: contract_1.expectedVersion });
         const proxy = (0, delight_rpc_1.createBatchProxy)();
         return {
             client,
             batchClient,
             proxy,
-            close: () => {
+            close: () => __awaiter(this, void 0, void 0, function* () {
                 closeClient();
                 closeBatchClient();
-            }
+                cancelAutoReconnect();
+                yield ws.close();
+            })
         };
     });
 }

package/lib/es2015/utils/rpc-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../../src/utils/rpc-client.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAqD;AACrD,6CAA0F;AAC1F,sDAAwE;AACxE,2BAA8B;AAC9B,mDAA0D;AAE1D,SAAsB,eAAe,CAAC,GAAW;;QAM/C,MAAM,EAAE,GAAG,IAAI,cAAS,CAAC,GAAG,CAAC,CAAA;QAC7B,MAAM,IAAA,8BAAmB,EAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QACrC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,wBAAY,EAAO,EAAE,EAAE,SAAS,EAAE,0BAAe,CAAC,CAAA;QAChF,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAA,6BAAiB,EAAC,IAAI,cAAS,CAAC,GAAG,CAAC,EAAE,0BAAe,CAAC,CAAA;QAC9F,MAAM,KAAK,GAAG,IAAA,8BAAgB,GAAQ,CAAA;QACtC,OAAO;YACL,MAAM;YACN,WAAW;YACX,KAAK;YACL,KAAK,EAAE,GAAG,EAAE;gBACV,WAAW,EAAE,CAAA;gBACb,gBAAgB,EAAE,CAAA;YACpB,CAAC;SACF,CAAA;IACH,CAAC;CAAA;AApBD,0CAoBC"}
+{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../../src/utils/rpc-client.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAqD;AACrD,6CAA0F;AAC1F,kEAA8E;AAC9E,2BAA8B;AAC9B,qDAA+D;AAE/D,SAAsB,eAAe,CAAC,GAAW;;QAM/C,MAAM,EAAE,GAAG,IAAI,gCAAc,CAAC,GAAG,EAAE,CAAC,IAAI,cAAS,CAAC,GAAG,CAAC,CAAC,CAAA;QACvD,MAAM,mBAAmB,GAAG,IAAA,+BAAa,EAAC,EAAE,CAAC,CAAA;QAC7C,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;QAElB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,8BAAY,EAAO,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;QACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAA,mCAAiB,EAAC,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;QAClF,MAAM,KAAK,GAAG,IAAA,8BAAgB,GAAQ,CAAA;QAEtC,OAAO;YACL,MAAM;YACN,WAAW;YACX,KAAK;YACL,KAAK,EAAE,GAAS,EAAE;gBAChB,WAAW,EAAE,CAAA;gBACb,gBAAgB,EAAE,CAAA;gBAClB,mBAAmB,EAAE,CAAA;gBACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;YAClB,CAAC,CAAA;SACF,CAAA;IACH,CAAC;CAAA;AAzBD,0CAyBC"}

package/lib/es2018/cache.d.ts

@@ -1,5 +1,4 @@
-import { ClientProxy, BatchClient, BatchClientProxy } from 'delight-rpc';
-import { IAPI, IStats } from './contract';
+import { IStats } from './contract';
 export { IStats } from './contract';
 export interface IMetadata {
     updatedAt: number;
@@ -16,9 +15,9 @@ export declare class CacheClient {
     private batchProxy;
     private closeClients;
     private timeout?;
-    constructor(client: ClientProxy<IAPI>, batchClient: BatchClient, batchProxy: BatchClientProxy<IAPI, unknown>, closeClients: () => void, timeout?: number | undefined);
+    private constructor();
     static create(options: ICacheClientOptions): Promise<CacheClient>;
-    close(): void;
+    close(): Promise<void>;
     has(namespace: string, key: string, timeout?: number): Promise<boolean>;
     get(namespace: string, key: string, timeout?: number): Promise<string | null>;
     bulkGet(namespace: string, keys: string[], timeout?: number): Promise<Array<string | null>>;

package/lib/es2018/cache.js

@@ -16,20 +16,20 @@ class CacheClient {
         const { client, batchClient, proxy, close } = await (0, rpc_client_1.createRPCClient)(options.server);
         return new CacheClient(client, batchClient, proxy, close, options.timeout);
     }
-    close() {
-        this.closeClients();
+    async close() {
+        await this.closeClients();
     }
     async has(namespace, key, timeout) {
-        return await this.withTimeout(() => this.client.has(namespace, key), timeout);
+        return await this.withTimeout(() => this.client.has(namespace, key), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }
     async get(namespace, key, timeout) {
-        return await this.withTimeout(() => this.client.get(namespace, key), timeout);
+        return await this.withTimeout(() => this.client.get(namespace, key), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }
     async bulkGet(namespace, keys, timeout) {
         return await this.withTimeout(async () => {
             const results = await this.batchClient.parallel(...keys.map(key => this.batchProxy.get(namespace, key)));
             return results.map(result => result.unwrap());
-        }, timeout);
+        }, timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }
     async getWithMetadata(namespace, key, timeout) {
         return await this.withTimeout(async () => {
@@ -45,35 +45,37 @@ class CacheClient {
                     timeBeforeDeletion: (_b = result.metadata.timeBeforeDeletion) !== null && _b !== void 0 ? _b : Infinity
                 }
             };
-        }, timeout);
+        }, timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }
     async set(namespace, key, value, timeToLive, timeBeforeDeletion, timeout) {
         await this.withTimeout(() => this.client.set(namespace, key, value, (0, prelude_1.isPositiveInfinity)(timeToLive)
             ? null
             : timeToLive, (0, prelude_1.isPositiveInfinity)(timeBeforeDeletion)
             ? null
-            : timeBeforeDeletion), timeout);
+            : timeBeforeDeletion), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }
     async del(namespace, key, timeout) {
-        await this.withTimeout(() => this.client.del(namespace, key), timeout);
+        await this.withTimeout(() => this.client.del(namespace, key), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }
     async clear(namespace, timeout) {
-        await this.withTimeout(() => this.client.clear(namespace), timeout);
+        await this.withTimeout(() => this.client.clear(namespace), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }
     async getAllItemKeys(namespace, timeout) {
-        return await this.withTimeout(() => this.client.getAllItemKeys(namespace), timeout);
+        return await this.withTimeout(() => this.client.getAllItemKeys(namespace), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }
     async getAllNamespaces(timeout) {
-        return await this.withTimeout(() => this.client.getAllNamespaces(), timeout);
+        return await this.withTimeout(() => this.client.getAllNamespaces(), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }
     async stats(namespace, timeout) {
-        return await this.withTimeout(() => this.client.stats(namespace), timeout);
+        return await this.withTimeout(() => this.client.stats(namespace), timeout !== null && timeout !== void 0 ? timeout : this.timeout);
     }
     async withTimeout(fn, timeout = this.timeout) {
         if (timeout) {
             return await (0, extra_abort_1.withAbortSignal)((0, extra_abort_1.timeoutSignal)(timeout), fn);
         }
-        return await fn();
+        else {
+            return await fn();
+        }
     }
 }
 exports.CacheClient = CacheClient;

package/lib/es2018/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":"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"}

package/lib/es2018/contract.d.ts

@@ -21,4 +21,4 @@ export interface IMetadata {
     timeToLive: number | null;
     timeBeforeDeletion: number | null;
 }
-export declare const expectedVersion = "0.1.1";
+export declare const expectedVersion = "0.2.0";

package/lib/es2018/contract.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expectedVersion = void 0;
-exports.expectedVersion = '0.1.1';
+exports.expectedVersion = '0.2.0';
 //# sourceMappingURL=contract.js.map

package/lib/es2018/utils/rpc-client.browser.d.ts

@@ -4,5 +4,5 @@ export declare function createRPCClient(url: string): Promise<{
     client: ClientProxy<IAPI>;
     batchClient: BatchClient<IAPI>;
     proxy: BatchClientProxy<IAPI, unknown>;
-    close: () => void;
+    close: () => Promise<void>;
 }>;

package/lib/es2018/utils/rpc-client.browser.js

@@ -3,21 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRPCClient = void 0;
 const contract_1 = require("../contract");
 const delight_rpc_1 = require("delight-rpc");
-const websocket_browser_1 = require("@delight-rpc/websocket-browser");
-const wait_for_1 = require("@blackglory/wait-for");
+const extra_native_websocket_1 = require("@delight-rpc/extra-native-websocket");
+const extra_native_websocket_2 = require("extra-native-websocket");
 async function createRPCClient(url) {
-    const ws = new WebSocket(url);
-    await (0, wait_for_1.waitForEventTarget)(ws, 'open');
-    const [client, closeClient] = (0, websocket_browser_1.createClient)(ws, undefined, contract_1.expectedVersion);
-    const [batchClient, closeBatchClient] = (0, websocket_browser_1.createBatchClient)(new WebSocket(url), contract_1.expectedVersion);
+    const ws = new extra_native_websocket_2.ExtraNativeWebSocket(() => new WebSocket(url));
+    const cancelAutoReconnect = (0, extra_native_websocket_2.autoReconnect)(ws);
+    await ws.connect();
+    const [client, closeClient] = (0, extra_native_websocket_1.createClient)(ws, { expectedVersion: contract_1.expectedVersion });
+    const [batchClient, closeBatchClient] = (0, extra_native_websocket_1.createBatchClient)(ws, { expectedVersion: contract_1.expectedVersion });
     const proxy = (0, delight_rpc_1.createBatchProxy)();
     return {
         client,
         batchClient,
         proxy,
-        close: () => {
+        close: async () => {
             closeClient();
             closeBatchClient();
+            cancelAutoReconnect();
+            await ws.close();
         }
     };
 }

package/lib/es2018/utils/rpc-client.browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.browser.js","sourceRoot":"","sources":["../../../src/utils/rpc-client.browser.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AACrD,6CAA0F;AAC1F,sEAAgF;AAChF,mDAAyD;AAElD,KAAK,UAAU,eAAe,CAAC,GAAW;IAM/C,MAAM,EAAE,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAA;IAC7B,MAAM,IAAA,6BAAkB,EAAC,EAAE,EAAE,MAAM,CAAC,CAAA;IACpC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,gCAAY,EAAO,EAAE,EAAE,SAAS,EAAE,0BAAe,CAAC,CAAA;IAChF,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAA,qCAAiB,EAAC,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,0BAAe,CAAC,CAAA;IAC9F,MAAM,KAAK,GAAG,IAAA,8BAAgB,GAAQ,CAAA;IACtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,GAAG,EAAE;YACV,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;QACpB,CAAC;KACF,CAAA;AACH,CAAC;AApBD,0CAoBC"}
+{"version":3,"file":"rpc-client.browser.js","sourceRoot":"","sources":["../../../src/utils/rpc-client.browser.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AACrD,6CAA0F;AAC1F,gFAAqF;AACrF,mEAA4E;AAErE,KAAK,UAAU,eAAe,CAAC,GAAW;IAM/C,MAAM,EAAE,GAAG,IAAI,6CAAoB,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAC7D,MAAM,mBAAmB,GAAG,IAAA,sCAAa,EAAC,EAAE,CAAC,CAAA;IAC7C,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;IAElB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,qCAAY,EAAO,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;IACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAA,0CAAiB,EAAC,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;IAClF,MAAM,KAAK,GAAG,IAAA,8BAAgB,GAAQ,CAAA;IAEtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;YAClB,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC;AAzBD,0CAyBC"}

package/lib/es2018/utils/rpc-client.d.ts

@@ -4,5 +4,5 @@ export declare function createRPCClient(url: string): Promise<{
     client: ClientProxy<IAPI>;
     batchClient: BatchClient<IAPI>;
     proxy: BatchClientProxy<IAPI, unknown>;
-    close: () => void;
+    close: () => Promise<void>;
 }>;

package/lib/es2018/utils/rpc-client.js

@@ -3,22 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRPCClient = void 0;
 const contract_1 = require("../contract");
 const delight_rpc_1 = require("delight-rpc");
-const websocket_1 = require("@delight-rpc/websocket");
+const extra_websocket_1 = require("@delight-rpc/extra-websocket");
 const ws_1 = require("ws");
-const wait_for_1 = require("@blackglory/wait-for");
+const extra_websocket_2 = require("extra-websocket");
 async function createRPCClient(url) {
-    const ws = new ws_1.WebSocket(url);
-    await (0, wait_for_1.waitForEventEmitter)(ws, 'open');
-    const [client, closeClient] = (0, websocket_1.createClient)(ws, undefined, contract_1.expectedVersion);
-    const [batchClient, closeBatchClient] = (0, websocket_1.createBatchClient)(new ws_1.WebSocket(url), contract_1.expectedVersion);
+    const ws = new extra_websocket_2.ExtraWebSocket(() => new ws_1.WebSocket(url));
+    const cancelAutoReconnect = (0, extra_websocket_2.autoReconnect)(ws);
+    await ws.connect();
+    const [client, closeClient] = (0, extra_websocket_1.createClient)(ws, { expectedVersion: contract_1.expectedVersion });
+    const [batchClient, closeBatchClient] = (0, extra_websocket_1.createBatchClient)(ws, { expectedVersion: contract_1.expectedVersion });
     const proxy = (0, delight_rpc_1.createBatchProxy)();
     return {
         client,
         batchClient,
         proxy,
-        close: () => {
+        close: async () => {
             closeClient();
             closeBatchClient();
+            cancelAutoReconnect();
+            await ws.close();
         }
     };
 }

package/lib/es2018/utils/rpc-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../../src/utils/rpc-client.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AACrD,6CAA0F;AAC1F,sDAAwE;AACxE,2BAA8B;AAC9B,mDAA0D;AAEnD,KAAK,UAAU,eAAe,CAAC,GAAW;IAM/C,MAAM,EAAE,GAAG,IAAI,cAAS,CAAC,GAAG,CAAC,CAAA;IAC7B,MAAM,IAAA,8BAAmB,EAAC,EAAE,EAAE,MAAM,CAAC,CAAA;IACrC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,wBAAY,EAAO,EAAE,EAAE,SAAS,EAAE,0BAAe,CAAC,CAAA;IAChF,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAA,6BAAiB,EAAC,IAAI,cAAS,CAAC,GAAG,CAAC,EAAE,0BAAe,CAAC,CAAA;IAC9F,MAAM,KAAK,GAAG,IAAA,8BAAgB,GAAQ,CAAA;IACtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,GAAG,EAAE;YACV,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;QACpB,CAAC;KACF,CAAA;AACH,CAAC;AApBD,0CAoBC"}
+{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../../src/utils/rpc-client.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AACrD,6CAA0F;AAC1F,kEAA8E;AAC9E,2BAA8B;AAC9B,qDAA+D;AAExD,KAAK,UAAU,eAAe,CAAC,GAAW;IAM/C,MAAM,EAAE,GAAG,IAAI,gCAAc,CAAC,GAAG,EAAE,CAAC,IAAI,cAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IACvD,MAAM,mBAAmB,GAAG,IAAA,+BAAa,EAAC,EAAE,CAAC,CAAA;IAC7C,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;IAElB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,8BAAY,EAAO,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;IACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAA,mCAAiB,EAAC,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;IAClF,MAAM,KAAK,GAAG,IAAA,8BAAgB,GAAQ,CAAA;IAEtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;YAClB,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC;AAzBD,0CAyBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blackglory/cache-js",
-  "version": "0.1.2",
+  "version": "0.3.0",
   "description": "",
   "keywords": [],
   "files": [
@@ -18,7 +18,7 @@
   "license": "MIT",
   "scripts": {
     "prepare": "ts-patch install -s",
-    "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src",
+    "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src __tests__",
     "test": "jest --runInBand --no-cache --config jest.config.js",
     "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
     "test:coverage": "jest --coverage --config jest.config.js",
@@ -30,6 +30,11 @@
     "build:es2015": "tsc --project tsconfig.build.json --module commonjs --target es2015 --outDir lib/es2015",
     "build:es2018": "tsc --project tsconfig.build.json --module commonjs --target es2018 --outDir lib/es2018",
     "bundle": "rollup --config rollup.config.js",
+    "docker:test": "run-s docker:test:clean docker:test:build docker:test:run docker:test:clean",
+    "docker:coverage": "run-s docker:test:clean docker:test:build docker:test:coverage docker:test:clean",
+    "docker:test:build": "docker-compose --project-name cache-js --file docker-compose.test.yml build",
+    "docker:test:run": "docker-compose --project-name cache-js --file docker-compose.test.yml run --rm test",
+    "docker:test:clean": "docker-compose --project-name cache-js --file docker-compose.test.yml down",
     "release": "standard-version"
   },
   "husky": {
@@ -39,41 +44,42 @@
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "^16.2.3",
-    "@commitlint/config-conventional": "^16.2.1",
+    "@commitlint/cli": "^17.0.1",
+    "@commitlint/config-conventional": "^17.0.0",
     "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-commonjs": "^21.0.3",
+    "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.2.0",
+    "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
     "@rollup/plugin-typescript": "^8.3.2",
-    "@types/jest": "^27.4.1",
+    "@types/jest": "^27.5.1",
     "@types/ws": "^8.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.19.0",
-    "@typescript-eslint/parser": "^5.19.0",
-    "eslint": "^8.13.0",
+    "@typescript-eslint/eslint-plugin": "^5.27.0",
+    "@typescript-eslint/parser": "^5.27.0",
+    "eslint": "^8.16.0",
     "husky": "4",
-    "jest": "^27.5.1",
-    "msw": "^0.39.2",
+    "jest": "^28.1.0",
+    "msw": "^0.42.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
-    "rollup": "^2.70.1",
+    "rollup": "^2.75.4",
     "rollup-plugin-analyzer": "^4.0.0",
     "rollup-plugin-terser": "^7.0.2",
-    "standard-version": "^9.3.2",
-    "ts-jest": "^27.1.4",
+    "standard-version": "^9.5.0",
+    "ts-jest": "^28.0.3",
     "ts-patch": "^2.0.1",
-    "tslib": "^2.3.1",
-    "typescript": "^4.6.3",
+    "tslib": "^2.4.0",
+    "typescript": "^4.7.2",
     "typescript-transform-paths": "^3.3.1"
   },
   "dependencies": {
     "@blackglory/prelude": "^0.1.1",
-    "@blackglory/wait-for": "^0.4.4",
-    "@delight-rpc/websocket": "^0.3.3",
-    "@delight-rpc/websocket-browser": "^0.3.2",
-    "delight-rpc": "^2.1.2",
+    "@delight-rpc/extra-native-websocket": "^0.2.2",
+    "@delight-rpc/extra-websocket": "^0.2.1",
+    "delight-rpc": "^4.1.0",
     "extra-abort": "^0.1.2",
-    "ws": "^8.5.0"
+    "extra-native-websocket": "^0.2.0",
+    "extra-websocket": "^0.2.1",
+    "ws": "^8.7.0"
   }
 }