@blackglory/estore-js 0.6.0 → 0.6.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/lib/estore-client.js +1 -1
- package/lib/estore-client.js.map +1 -1
- package/lib/utils/rpc-client.browser.d.ts +1 -1
- package/lib/utils/rpc-client.browser.js +6 -3
- package/lib/utils/rpc-client.browser.js.map +1 -1
- package/lib/utils/rpc-client.d.ts +1 -1
- package/lib/utils/rpc-client.js +6 -3
- package/lib/utils/rpc-client.js.map +1 -1
- package/package.json +11 -11
- package/src/estore-client.ts +1 -0
- package/src/utils/rpc-client.browser.ts +12 -2
- package/src/utils/rpc-client.ts +12 -2
package/lib/estore-client.js
CHANGED
|
@@ -4,7 +4,7 @@ import { isntUndefined, isUndefined } from '@blackglory/prelude';
|
|
|
4
4
|
export { EventIndexConflict } from './contract.js';
|
|
5
5
|
export class EStoreClient {
|
|
6
6
|
static async create(options) {
|
|
7
|
-
const { client, close } = await createRPCClient(options.server, options.retryIntervalForReconnection);
|
|
7
|
+
const { client, close } = await createRPCClient(options.server, options.retryIntervalForReconnection, options.timeout);
|
|
8
8
|
return new EStoreClient(client, close, options.timeout);
|
|
9
9
|
}
|
|
10
10
|
constructor(client, closeClients, timeout) {
|
package/lib/estore-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estore-client.js","sourceRoot":"","sources":["../src/estore-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,8BAA4B;AAGtD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAa,MAAM,qBAAqB,CAAA;AAE3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAQlD,MAAM,OAAO,YAAY;IACvB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAA6B;QAC/C,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,eAAe,CAC7C,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,4BAA4B,
|
|
1
|
+
{"version":3,"file":"estore-client.js","sourceRoot":"","sources":["../src/estore-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IAPI } from "../contract.js";
|
|
2
2
|
import { ClientProxy } from 'delight-rpc';
|
|
3
|
-
export declare function createRPCClient(url: string, retryIntervalForReconnection?: number): Promise<{
|
|
3
|
+
export declare function createRPCClient(url: string, retryIntervalForReconnection?: number, timeoutForConnection?: number): Promise<{
|
|
4
4
|
client: ClientProxy<IAPI>;
|
|
5
5
|
close: () => Promise<void>;
|
|
6
6
|
}>;
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import { expectedVersion } from "../contract.js";
|
|
2
2
|
import { createClient } from '@delight-rpc/extra-native-websocket';
|
|
3
3
|
import { ExtraNativeWebSocket, autoReconnect } from 'extra-native-websocket';
|
|
4
|
-
|
|
4
|
+
import { timeoutSignal } from 'extra-abort';
|
|
5
|
+
export async function createRPCClient(url, retryIntervalForReconnection, timeoutForConnection) {
|
|
5
6
|
const ws = new ExtraNativeWebSocket(() => new WebSocket(url));
|
|
6
|
-
const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection);
|
|
7
|
-
await ws.connect(
|
|
7
|
+
const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection, timeoutForConnection);
|
|
8
|
+
await ws.connect(timeoutForConnection
|
|
9
|
+
? timeoutSignal(timeoutForConnection)
|
|
10
|
+
: undefined);
|
|
8
11
|
const [client, closeClient] = createClient(ws, { expectedVersion });
|
|
9
12
|
return {
|
|
10
13
|
client,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client.browser.js","sourceRoot":"","sources":["../../src/utils/rpc-client.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,eAAe,EAAE,uBAAwB;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAClE,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"rpc-client.browser.js","sourceRoot":"","sources":["../../src/utils/rpc-client.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,eAAe,EAAE,uBAAwB;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAClE,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC,EACrC,oBAA6B;IAK7B,MAAM,EAAE,GAAG,IAAI,oBAAoB,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAC7D,MAAM,mBAAmB,GAAG,aAAa,CACvC,EAAE,EACF,4BAA4B,EAC5B,oBAAoB,CACrB,CAAA;IACD,MAAM,EAAE,CAAC,OAAO,CACd,oBAAoB;QACtB,CAAC,CAAC,aAAa,CAAC,oBAAoB,CAAC;QACrC,CAAC,CAAC,SAAS,CACV,CAAA;IAED,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,YAAY,CAAO,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IAEzE,OAAO;QACL,MAAM;QACN,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IAPI } from "../contract.js";
|
|
2
2
|
import { ClientProxy } from 'delight-rpc';
|
|
3
|
-
export declare function createRPCClient(url: string, retryIntervalForReconnection?: number): Promise<{
|
|
3
|
+
export declare function createRPCClient(url: string, retryIntervalForReconnection?: number, timeoutForConnection?: number): Promise<{
|
|
4
4
|
client: ClientProxy<IAPI>;
|
|
5
5
|
close: () => Promise<void>;
|
|
6
6
|
}>;
|
package/lib/utils/rpc-client.js
CHANGED
|
@@ -2,10 +2,13 @@ import { expectedVersion } from "../contract.js";
|
|
|
2
2
|
import { createClient } from '@delight-rpc/extra-websocket';
|
|
3
3
|
import { WebSocket } from 'ws';
|
|
4
4
|
import { ExtraWebSocket, autoReconnect } from 'extra-websocket';
|
|
5
|
-
|
|
5
|
+
import { timeoutSignal } from 'extra-abort';
|
|
6
|
+
export async function createRPCClient(url, retryIntervalForReconnection, timeoutForConnection) {
|
|
6
7
|
const ws = new ExtraWebSocket(() => new WebSocket(url));
|
|
7
|
-
const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection);
|
|
8
|
-
await ws.connect(
|
|
8
|
+
const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection, timeoutForConnection);
|
|
9
|
+
await ws.connect(timeoutForConnection
|
|
10
|
+
? timeoutSignal(timeoutForConnection)
|
|
11
|
+
: undefined);
|
|
9
12
|
const [client, closeClient] = createClient(ws, { expectedVersion });
|
|
10
13
|
return {
|
|
11
14
|
client,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../src/utils/rpc-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,eAAe,EAAE,uBAAwB;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../src/utils/rpc-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,eAAe,EAAE,uBAAwB;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC,EACrC,oBAA6B;IAK7B,MAAM,EAAE,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IACvD,MAAM,mBAAmB,GAAG,aAAa,CACvC,EAAE,EACF,4BAA4B,EAC5B,oBAAoB,CACrB,CAAA;IACD,MAAM,EAAE,CAAC,OAAO,CACd,oBAAoB;QACtB,CAAC,CAAC,aAAa,CAAC,oBAAoB,CAAC;QACrC,CAAC,CAAC,SAAS,CACV,CAAA;IAED,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,YAAY,CAAO,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IAEzE,OAAO;QACL,MAAM;QACN,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blackglory/estore-js",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"files": [
|
|
@@ -43,10 +43,10 @@
|
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@commitlint/cli": "^19.8.1",
|
|
45
45
|
"@commitlint/config-conventional": "^19.8.1",
|
|
46
|
-
"@eslint/js": "^9.
|
|
46
|
+
"@eslint/js": "^9.31.0",
|
|
47
47
|
"@types/ws": "^8.18.1",
|
|
48
48
|
"cross-env": "^7.0.3",
|
|
49
|
-
"eslint": "^9.
|
|
49
|
+
"eslint": "^9.31.0",
|
|
50
50
|
"extra-utils": "^5.19.0",
|
|
51
51
|
"husky": "4",
|
|
52
52
|
"npm-run-all": "^4.1.5",
|
|
@@ -55,22 +55,22 @@
|
|
|
55
55
|
"ts-patch": "^3.3.0",
|
|
56
56
|
"tslib": "^2.8.1",
|
|
57
57
|
"typescript": "5.8.3",
|
|
58
|
-
"typescript-eslint": "^8.
|
|
58
|
+
"typescript-eslint": "^8.38.0",
|
|
59
59
|
"typescript-transform-paths": "^3.5.5",
|
|
60
|
-
"vite": "^
|
|
60
|
+
"vite": "^7.0.5",
|
|
61
61
|
"vite-tsconfig-paths": "^5.1.4",
|
|
62
|
-
"vitest": "^3.
|
|
62
|
+
"vitest": "^3.2.4"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
65
|
"@blackglory/errors": "^3.0.3",
|
|
66
66
|
"@blackglory/prelude": "^0.4.0",
|
|
67
|
-
"@delight-rpc/extra-native-websocket": "^0.6.
|
|
68
|
-
"@delight-rpc/extra-websocket": "^0.7.
|
|
67
|
+
"@delight-rpc/extra-native-websocket": "^0.6.1",
|
|
68
|
+
"@delight-rpc/extra-websocket": "^0.7.1",
|
|
69
69
|
"delight-rpc": "^6.1.2",
|
|
70
70
|
"extra-abort": "^0.4.0",
|
|
71
|
-
"extra-native-websocket": "^0.
|
|
72
|
-
"extra-websocket": "^0.
|
|
71
|
+
"extra-native-websocket": "^0.5.0",
|
|
72
|
+
"extra-websocket": "^0.5.0",
|
|
73
73
|
"justypes": "^4.4.1",
|
|
74
|
-
"ws": "^8.18.
|
|
74
|
+
"ws": "^8.18.3"
|
|
75
75
|
}
|
|
76
76
|
}
|
package/src/estore-client.ts
CHANGED
|
@@ -2,17 +2,27 @@ import { IAPI, expectedVersion } from '@src/contract.js'
|
|
|
2
2
|
import { ClientProxy } from 'delight-rpc'
|
|
3
3
|
import { createClient } from '@delight-rpc/extra-native-websocket'
|
|
4
4
|
import { ExtraNativeWebSocket, autoReconnect } from 'extra-native-websocket'
|
|
5
|
+
import { timeoutSignal } from 'extra-abort'
|
|
5
6
|
|
|
6
7
|
export async function createRPCClient(
|
|
7
8
|
url: string
|
|
8
9
|
, retryIntervalForReconnection?: number
|
|
10
|
+
, timeoutForConnection?: number
|
|
9
11
|
): Promise<{
|
|
10
12
|
client: ClientProxy<IAPI>
|
|
11
13
|
close: () => Promise<void>
|
|
12
14
|
}> {
|
|
13
15
|
const ws = new ExtraNativeWebSocket(() => new WebSocket(url))
|
|
14
|
-
const cancelAutoReconnect = autoReconnect(
|
|
15
|
-
|
|
16
|
+
const cancelAutoReconnect = autoReconnect(
|
|
17
|
+
ws
|
|
18
|
+
, retryIntervalForReconnection
|
|
19
|
+
, timeoutForConnection
|
|
20
|
+
)
|
|
21
|
+
await ws.connect(
|
|
22
|
+
timeoutForConnection
|
|
23
|
+
? timeoutSignal(timeoutForConnection)
|
|
24
|
+
: undefined
|
|
25
|
+
)
|
|
16
26
|
|
|
17
27
|
const [client, closeClient] = createClient<IAPI>(ws, { expectedVersion })
|
|
18
28
|
|
package/src/utils/rpc-client.ts
CHANGED
|
@@ -3,17 +3,27 @@ import { ClientProxy } from 'delight-rpc'
|
|
|
3
3
|
import { createClient } from '@delight-rpc/extra-websocket'
|
|
4
4
|
import { WebSocket } from 'ws'
|
|
5
5
|
import { ExtraWebSocket, autoReconnect } from 'extra-websocket'
|
|
6
|
+
import { timeoutSignal } from 'extra-abort'
|
|
6
7
|
|
|
7
8
|
export async function createRPCClient(
|
|
8
9
|
url: string
|
|
9
10
|
, retryIntervalForReconnection?: number
|
|
11
|
+
, timeoutForConnection?: number
|
|
10
12
|
): Promise<{
|
|
11
13
|
client: ClientProxy<IAPI>
|
|
12
14
|
close: () => Promise<void>
|
|
13
15
|
}> {
|
|
14
16
|
const ws = new ExtraWebSocket(() => new WebSocket(url))
|
|
15
|
-
const cancelAutoReconnect = autoReconnect(
|
|
16
|
-
|
|
17
|
+
const cancelAutoReconnect = autoReconnect(
|
|
18
|
+
ws
|
|
19
|
+
, retryIntervalForReconnection
|
|
20
|
+
, timeoutForConnection
|
|
21
|
+
)
|
|
22
|
+
await ws.connect(
|
|
23
|
+
timeoutForConnection
|
|
24
|
+
? timeoutSignal(timeoutForConnection)
|
|
25
|
+
: undefined
|
|
26
|
+
)
|
|
17
27
|
|
|
18
28
|
const [client, closeClient] = createClient<IAPI>(ws, { expectedVersion })
|
|
19
29
|
|