prostgles-client 4.0.169 → 4.0.170
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/index.js +1 -1
- package/dist/index.no-sync.js +1 -1
- package/dist/useProstglesClient.d.ts +2 -2
- package/dist/useProstglesClient.d.ts.map +1 -1
- package/dist/useProstglesClient.js +4 -7
- package/lib/useProstglesClient.ts +7 -11
- package/package.json +1 -1
- package/tests/package-lock.json +1 -1
|
@@ -10,7 +10,7 @@ type OnReadyParams<DBSchema> = {
|
|
|
10
10
|
isReconnect: boolean;
|
|
11
11
|
socket: Socket;
|
|
12
12
|
};
|
|
13
|
-
type
|
|
13
|
+
export type UseProstglesClientProps = Omit<InitOptions<DBSchema>, "onReady" | "socket"> & {
|
|
14
14
|
socketOptions?: Partial<ManagerOptions & SocketOptions> & {
|
|
15
15
|
uri?: string;
|
|
16
16
|
};
|
|
@@ -26,6 +26,6 @@ type ProstglesClientState<PGC> = {
|
|
|
26
26
|
isLoading: false;
|
|
27
27
|
error: Error | string;
|
|
28
28
|
};
|
|
29
|
-
export declare const useProstglesClient: <DBSchema_1>({ skip, socketOptions, ...initOpts }?:
|
|
29
|
+
export declare const useProstglesClient: <DBSchema_1>({ skip, socketOptions, ...initOpts }?: UseProstglesClientProps) => ProstglesClientState<OnReadyParams<DBSchema_1>>;
|
|
30
30
|
export {};
|
|
31
31
|
//# sourceMappingURL=useProstglesClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useProstglesClient.d.ts","sourceRoot":"","sources":["../lib/useProstglesClient.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,aAAa,EACnB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAa,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAGhF,KAAK,aAAa,CAAC,QAAQ,IAAI;IAC7B,GAAG,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC/B,OAAO,EAAE,aAAa,GAAG,SAAS,CAAC;IACnC,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAC9B,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAA;AACD,
|
|
1
|
+
{"version":3,"file":"useProstglesClient.d.ts","sourceRoot":"","sources":["../lib/useProstglesClient.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,aAAa,EACnB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAa,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAGhF,KAAK,aAAa,CAAC,QAAQ,IAAI;IAC7B,GAAG,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC/B,OAAO,EAAE,aAAa,GAAG,SAAS,CAAC;IACnC,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAC9B,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAA;AACD,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC,GAAG;IACxF,aAAa,CAAC,EAAE,OAAO,CAAC,cAAc,GAAG,aAAa,CAAC,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;KAAE,CAAC;IAC5E,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AACF,KAAK,oBAAoB,CAAC,GAAG,IAC3B;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAC;CAAE,GACvC;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAC;CAAE,GAAG,GAAG,GAC9C;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC;CAAE,CAAC;AAE/C,eAAO,MAAM,kBAAkB,sDAAoD,uBAAuB,oDAmDzG,CAAA"}
|
|
@@ -16,8 +16,10 @@ const useProstglesClient = ({ skip, socketOptions, ...initOpts } = {}) => {
|
|
|
16
16
|
});
|
|
17
17
|
const getIsMounted = (0, react_hooks_1.useIsMounted)();
|
|
18
18
|
const socketRef = useRef();
|
|
19
|
-
|
|
19
|
+
(0, react_hooks_1.useAsyncEffectQueue)(async () => {
|
|
20
20
|
var _a;
|
|
21
|
+
if (skip)
|
|
22
|
+
return undefined;
|
|
21
23
|
(_a = socketRef.current) === null || _a === void 0 ? void 0 : _a.disconnect();
|
|
22
24
|
const io = (0, react_hooks_1.getIO)();
|
|
23
25
|
const opts = {
|
|
@@ -27,11 +29,6 @@ const useProstglesClient = ({ skip, socketOptions, ...initOpts } = {}) => {
|
|
|
27
29
|
};
|
|
28
30
|
const socket = typeof (socketOptions === null || socketOptions === void 0 ? void 0 : socketOptions.uri) === "string" ? io(socketOptions.uri, opts) : io(opts);
|
|
29
31
|
socketRef.current = socket;
|
|
30
|
-
return socket;
|
|
31
|
-
}, [socketOptions]);
|
|
32
|
-
(0, react_hooks_1.useAsyncEffectQueue)(async () => {
|
|
33
|
-
if (skip)
|
|
34
|
-
return undefined;
|
|
35
32
|
await (0, prostgles_1.prostgles)({
|
|
36
33
|
socket,
|
|
37
34
|
...initOpts,
|
|
@@ -59,7 +56,7 @@ const useProstglesClient = ({ skip, socketOptions, ...initOpts } = {}) => {
|
|
|
59
56
|
return () => {
|
|
60
57
|
socket.disconnect();
|
|
61
58
|
};
|
|
62
|
-
}, [initOpts,
|
|
59
|
+
}, [initOpts, socketOptions, skip]);
|
|
63
60
|
return onReadyArgs;
|
|
64
61
|
};
|
|
65
62
|
exports.useProstglesClient = useProstglesClient;
|
|
@@ -15,7 +15,7 @@ import type { ManagerOptions, Socket, SocketOptions } from "socket.io-client";
|
|
|
15
15
|
import type { AuthHandler } from "./Auth";
|
|
16
16
|
import { SyncedTable } from "./SyncedTable/SyncedTable";
|
|
17
17
|
import { prostgles, type DBHandlerClient, type InitOptions } from "./prostgles";
|
|
18
|
-
import { getIO, getReact, useAsyncEffectQueue, useIsMounted
|
|
18
|
+
import { getIO, getReact, useAsyncEffectQueue, useIsMounted } from "./react-hooks";
|
|
19
19
|
|
|
20
20
|
type OnReadyParams<DBSchema> = {
|
|
21
21
|
dbo: DBHandlerClient<DBSchema>;
|
|
@@ -25,7 +25,7 @@ type OnReadyParams<DBSchema> = {
|
|
|
25
25
|
isReconnect: boolean;
|
|
26
26
|
socket: Socket;
|
|
27
27
|
}
|
|
28
|
-
type
|
|
28
|
+
export type UseProstglesClientProps = Omit<InitOptions<DBSchema>, "onReady" | "socket"> & {
|
|
29
29
|
socketOptions?: Partial<ManagerOptions & SocketOptions> & { uri?: string; };
|
|
30
30
|
skip?: boolean;
|
|
31
31
|
};
|
|
@@ -34,7 +34,7 @@ type ProstglesClientState<PGC> =
|
|
|
34
34
|
| { isLoading: false; error?: undefined; } & PGC
|
|
35
35
|
| { isLoading: false; error: Error | string; };
|
|
36
36
|
|
|
37
|
-
export const useProstglesClient = <DBSchema>({ skip, socketOptions, ...initOpts }:
|
|
37
|
+
export const useProstglesClient = <DBSchema>({ skip, socketOptions, ...initOpts }: UseProstglesClientProps = {}): ProstglesClientState<OnReadyParams<DBSchema>> => {
|
|
38
38
|
const { useRef, useState } = getReact(true);
|
|
39
39
|
const [onReadyArgs, setOnReadyArgs] = useState<ProstglesClientState<OnReadyParams<DBSchema>>>({
|
|
40
40
|
isLoading: true
|
|
@@ -43,7 +43,9 @@ export const useProstglesClient = <DBSchema>({ skip, socketOptions, ...initOpts
|
|
|
43
43
|
|
|
44
44
|
const socketRef = useRef<Socket>();
|
|
45
45
|
|
|
46
|
-
|
|
46
|
+
useAsyncEffectQueue(async () => {
|
|
47
|
+
if(skip) return undefined;
|
|
48
|
+
|
|
47
49
|
socketRef.current?.disconnect();
|
|
48
50
|
const io = getIO();
|
|
49
51
|
const opts = {
|
|
@@ -53,12 +55,6 @@ export const useProstglesClient = <DBSchema>({ skip, socketOptions, ...initOpts
|
|
|
53
55
|
}
|
|
54
56
|
const socket = typeof socketOptions?.uri === "string" ? io(socketOptions.uri, opts) : io(opts);
|
|
55
57
|
socketRef.current = socket;
|
|
56
|
-
return socket;
|
|
57
|
-
}, [socketOptions]);
|
|
58
|
-
|
|
59
|
-
useAsyncEffectQueue(async () => {
|
|
60
|
-
if(skip) return undefined;
|
|
61
|
-
|
|
62
58
|
await prostgles<DBSchema>({
|
|
63
59
|
socket,
|
|
64
60
|
...initOpts,
|
|
@@ -86,7 +82,7 @@ export const useProstglesClient = <DBSchema>({ skip, socketOptions, ...initOpts
|
|
|
86
82
|
socket.disconnect();
|
|
87
83
|
}
|
|
88
84
|
|
|
89
|
-
}, [initOpts,
|
|
85
|
+
}, [initOpts, socketOptions, skip]);
|
|
90
86
|
|
|
91
87
|
return onReadyArgs;
|
|
92
88
|
}
|
package/package.json
CHANGED