@mstuercke/api-utils 0.0.47 → 0.0.48
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.
|
@@ -1,13 +1,19 @@
|
|
|
1
|
-
import { WsApiResponse, WsApiRoute } from '../types';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
import { WsApiRequest, WsApiResponse, WsApiRoute } from '../types';
|
|
2
|
+
type WsApiConnection<Request extends WsApiRequest> = {
|
|
3
|
+
disconnect: () => void;
|
|
4
|
+
sendRequest: (request: Request) => void;
|
|
5
|
+
};
|
|
6
|
+
export type WsApiOptions<Request extends WsApiRequest, Response extends WsApiResponse> = {
|
|
7
|
+
onConnected?: (connection: WsApiConnection<Request>) => void;
|
|
8
|
+
onResponse?: (response: Response, connection: WsApiConnection<Request>) => void;
|
|
9
|
+
onError?: (error: unknown, connection: WsApiConnection<Request>) => void;
|
|
6
10
|
onDisconnected?: () => void;
|
|
7
11
|
};
|
|
8
|
-
export declare const useWsApi: (wsApiUrl: string) => {
|
|
9
|
-
|
|
12
|
+
export declare const useWsApi: <Action extends string, Request_1 extends object, Response_1 extends object>(wsApiUrl: string, route: WsApiRoute<Action, Request_1, Response_1> | undefined) => {
|
|
13
|
+
connect: (options: WsApiOptions<Request_1, Response_1>) => Promise<void>;
|
|
10
14
|
connected: boolean;
|
|
15
|
+
connection: WsApiConnection<Request_1>;
|
|
11
16
|
error: boolean;
|
|
12
|
-
disconnect: () => void;
|
|
17
|
+
disconnect: () => void | undefined;
|
|
13
18
|
};
|
|
19
|
+
export {};
|
|
@@ -1,67 +1,57 @@
|
|
|
1
|
-
import { useCallback,
|
|
2
|
-
export const useWsApi = (wsApiUrl) => {
|
|
1
|
+
import { useCallback, useMemo, useRef, useState } from 'react';
|
|
2
|
+
export const useWsApi = (wsApiUrl, route) => {
|
|
3
3
|
const [error, setError] = useState(false);
|
|
4
4
|
const [connected, setConnected] = useState(false);
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const [options, setOptions] = useState();
|
|
8
|
-
const handleConnected = useCallback(() => {
|
|
9
|
-
setConnected(true);
|
|
10
|
-
setError(false);
|
|
11
|
-
options?.onConnected?.();
|
|
12
|
-
}, [options]);
|
|
13
|
-
const handleError = useCallback((error) => {
|
|
14
|
-
setError(false);
|
|
15
|
-
options?.onError?.(error);
|
|
16
|
-
}, [options]);
|
|
17
|
-
const handleResponse = useCallback((response) => {
|
|
18
|
-
setError(false);
|
|
19
|
-
options?.onResponse?.(response);
|
|
20
|
-
}, [options]);
|
|
21
|
-
const handleDisconnected = useCallback(() => {
|
|
22
|
-
setConnected(false);
|
|
23
|
-
options?.onDisconnected?.();
|
|
24
|
-
}, [options]);
|
|
25
|
-
const websocket = useMemo(() => {
|
|
5
|
+
const webSocket = useRef();
|
|
6
|
+
const sendRequest = useCallback((request) => {
|
|
26
7
|
if (!route)
|
|
27
|
-
|
|
28
|
-
if (!
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
8
|
+
throw 'Not route';
|
|
9
|
+
if (!webSocket.current)
|
|
10
|
+
throw 'Not connected';
|
|
11
|
+
webSocket.current.send(JSON.stringify({
|
|
12
|
+
action: route.action,
|
|
13
|
+
...request,
|
|
14
|
+
}));
|
|
15
|
+
}, [route]);
|
|
16
|
+
const disconnect = useCallback(() => webSocket.current?.close(), [webSocket]);
|
|
17
|
+
const connection = useMemo(() => {
|
|
18
|
+
return {
|
|
19
|
+
disconnect,
|
|
20
|
+
sendRequest,
|
|
37
21
|
};
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
22
|
+
}, [disconnect, sendRequest]);
|
|
23
|
+
const connect = useCallback(async (options) => {
|
|
24
|
+
return new Promise((resolve) => {
|
|
25
|
+
if (webSocket.current && (webSocket.current.readyState === WebSocket.CONNECTING || webSocket.current.readyState === WebSocket.OPEN))
|
|
26
|
+
throw 'Already connected';
|
|
27
|
+
webSocket.current = new WebSocket(wsApiUrl);
|
|
28
|
+
webSocket.current.onopen = () => {
|
|
29
|
+
setConnected(true);
|
|
30
|
+
setError(false);
|
|
31
|
+
options?.onConnected?.(connection);
|
|
32
|
+
resolve();
|
|
33
|
+
};
|
|
34
|
+
webSocket.current.onmessage = (ev) => {
|
|
35
|
+
if (!ev.data || ev.data === '{}')
|
|
36
|
+
return;
|
|
37
|
+
setError(false);
|
|
38
|
+
options?.onResponse?.(JSON.parse(ev.data), connection);
|
|
39
|
+
};
|
|
40
|
+
webSocket.current.onerror = (error) => {
|
|
41
|
+
setError(false);
|
|
42
|
+
options?.onError?.(error, connection);
|
|
43
|
+
};
|
|
44
|
+
webSocket.current.onclose = () => {
|
|
45
|
+
setConnected(false);
|
|
46
|
+
options?.onDisconnected?.();
|
|
47
|
+
webSocket.current = undefined;
|
|
48
|
+
};
|
|
49
|
+
});
|
|
50
|
+
}, [wsApiUrl, connection]);
|
|
62
51
|
return {
|
|
63
|
-
|
|
52
|
+
connect,
|
|
64
53
|
connected,
|
|
54
|
+
connection,
|
|
65
55
|
error,
|
|
66
56
|
disconnect,
|
|
67
57
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWsApi.js","sourceRoot":"","sources":["../../../src/ws/client/useWsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"useWsApi.js","sourceRoot":"","sources":["../../../src/ws/client/useWsApi.ts"],"names":[],"mappings":"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"}
|