@royaltics/ui 1.9.8 → 2.0.0
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.socket.md +60 -78
- package/dist/core/http/http.client.d.ts.map +1 -1
- package/dist/core/http/http.client.js +15 -2
- package/dist/core/http/http.client.js.map +1 -1
- package/dist/core/http/http.refresh.d.ts.map +1 -1
- package/dist/core/http/http.refresh.js +4 -0
- package/dist/core/http/http.refresh.js.map +1 -1
- package/dist/core/http/query-manager.d.ts.map +1 -1
- package/dist/core/http/query-manager.js +10 -4
- package/dist/core/http/query-manager.js.map +1 -1
- package/dist/core/socket/socket-store.d.ts +18 -7
- package/dist/core/socket/socket-store.d.ts.map +1 -1
- package/dist/core/socket/socket-store.js +34 -10
- package/dist/core/socket/socket-store.js.map +1 -1
- package/dist/core/socket/useSocketState.d.ts +13 -1
- package/dist/core/socket/useSocketState.d.ts.map +1 -1
- package/dist/core/socket/useSocketState.js +31 -2
- package/dist/core/socket/useSocketState.js.map +1 -1
- package/package.json +1 -1
package/README.socket.md
CHANGED
|
@@ -1,126 +1,108 @@
|
|
|
1
1
|
# @royaltics/ui - WebSocket Store & Hooks
|
|
2
2
|
|
|
3
|
-
The WebSocket system
|
|
3
|
+
The WebSocket system provides a global `Zustand` store for managing connections and subscriptions, removing the need for local state management or complex context providers. It's designed for high-performance SaaS applications with automatic resubscription and flexible configuration.
|
|
4
4
|
|
|
5
5
|
## 1. Global Socket Initialization
|
|
6
|
-
|
|
6
|
+
|
|
7
|
+
### Via `SocketProvider` (Recommended)
|
|
8
|
+
The `SocketProvider` is the most scalable way to initialize the socket in React. It automatically handles connection lifecycle based on props.
|
|
9
|
+
|
|
10
|
+
```tsx
|
|
11
|
+
import { SocketProvider } from '@royaltics/ui/socket';
|
|
12
|
+
|
|
13
|
+
export const App = ({ userToken }) => {
|
|
14
|
+
return (
|
|
15
|
+
<SocketProvider
|
|
16
|
+
socketUrl="https://api.example.com"
|
|
17
|
+
token={userToken}
|
|
18
|
+
path="/ws" // Optional, default: /ws
|
|
19
|
+
transports={['websocket']} // Optional, default: ['websocket']
|
|
20
|
+
>
|
|
21
|
+
<MainLayout />
|
|
22
|
+
</SocketProvider>
|
|
23
|
+
);
|
|
24
|
+
};
|
|
25
|
+
```
|
|
26
|
+
|
|
27
|
+
### Via `initSocketOptions` (Imperative)
|
|
28
|
+
If you need to initialize the socket outside of a React component (e.g., in a service or interceptor):
|
|
7
29
|
|
|
8
30
|
```tsx
|
|
9
|
-
import { initSocketOptions } from '@royaltics/ui/
|
|
31
|
+
import { initSocketOptions } from '@royaltics/ui/socket';
|
|
10
32
|
|
|
11
|
-
// Call this when the user logs in or app initializes
|
|
12
33
|
initSocketOptions({
|
|
13
34
|
socketUrl: 'https://socket.example.com',
|
|
14
35
|
token: 'YOUR_AUTH_TOKEN_HERE',
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
reconnection: true,
|
|
18
|
-
reconnectionAttempts: 5,
|
|
19
|
-
},
|
|
20
|
-
onAuthError: (err) => {
|
|
21
|
-
// Triggered when socket.io 'connect_error' is fired.
|
|
22
|
-
// You can implement token refreshing mechanisms and then re-call `initSocketOptions({ ...newConfig })`
|
|
23
|
-
console.error("Socket authentication failed", err);
|
|
24
|
-
}
|
|
36
|
+
path: '/ws',
|
|
37
|
+
onAuthError: (err) => console.error("Socket Auth failed", err)
|
|
25
38
|
});
|
|
26
39
|
```
|
|
27
|
-
*Note: If you call `initSocketOptions` with an empty `socketUrl` or `token`, it will automatically disconnect the socket.*
|
|
28
40
|
|
|
29
|
-
## 2.
|
|
30
|
-
|
|
41
|
+
## 2. Managing Subscriptions
|
|
42
|
+
|
|
43
|
+
The system features an **Auto-Resubscription** engine. When you subscribe to a topic, the store keeps track of it. If the connection drops and reconnects, the store will automatically re-emit the subscription events.
|
|
44
|
+
|
|
45
|
+
### `useSocketSubscription`
|
|
46
|
+
Designed for NestJS-compatible @SubscribeMessage handlers. It manages the full lifecycle (subscribe on mount, unsubscribe on unmount).
|
|
31
47
|
|
|
32
48
|
```tsx
|
|
33
|
-
import {
|
|
49
|
+
import { useSocketSubscription } from '@royaltics/ui/socket';
|
|
34
50
|
|
|
35
|
-
export const
|
|
36
|
-
//
|
|
37
|
-
|
|
51
|
+
export const ChatRoom = ({ roomId }) => {
|
|
52
|
+
// Sends { rooms: [roomId] } to 'subscribe' event
|
|
53
|
+
useSocketSubscription(`room-${roomId}`, [roomId]);
|
|
38
54
|
|
|
39
|
-
return <div>
|
|
55
|
+
return <div>Room: {roomId}</div>;
|
|
40
56
|
}
|
|
41
57
|
```
|
|
42
58
|
|
|
43
|
-
## 3. Emitting
|
|
44
|
-
|
|
59
|
+
## 3. Emitting & Listening
|
|
60
|
+
|
|
61
|
+
### `useSocketState`
|
|
62
|
+
Read connection status and access the raw `emit` function.
|
|
45
63
|
|
|
46
64
|
```tsx
|
|
47
65
|
import { useSocketState } from '@royaltics/ui/socket';
|
|
48
66
|
|
|
49
67
|
export const ChatInput = () => {
|
|
50
|
-
|
|
51
|
-
const { emit, isConnected } = useSocketState();
|
|
68
|
+
const { emit, isConnected, status } = useSocketState();
|
|
52
69
|
|
|
53
70
|
const sendMessage = () => {
|
|
54
71
|
if (!isConnected) return;
|
|
55
|
-
emit('chat:message', { text: 'Hello
|
|
72
|
+
emit('chat:message', { text: 'Hello!' });
|
|
56
73
|
};
|
|
57
74
|
|
|
58
|
-
return <button onClick={sendMessage}>Send</button>;
|
|
75
|
+
return <button disabled={status !== 'connected'} onClick={sendMessage}>Send</button>;
|
|
59
76
|
};
|
|
60
77
|
```
|
|
61
78
|
|
|
62
|
-
### `
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
```tsx
|
|
66
|
-
import { useSocketState } from '@royaltics/ui/socket';
|
|
67
|
-
|
|
68
|
-
export const ProfileSettings = () => {
|
|
69
|
-
const { setToken } = useSocketState();
|
|
70
|
-
|
|
71
|
-
const handleSessionRefresh = (newToken: string) => {
|
|
72
|
-
setToken(newToken);
|
|
73
|
-
};
|
|
74
|
-
|
|
75
|
-
return <button onClick={() => handleSessionRefresh('NEW_TOKEN')}>Refresh Socket Token</button>;
|
|
76
|
-
};
|
|
77
|
-
```
|
|
78
|
-
|
|
79
|
-
## 4. Tree-Shaking & Bundle Optimization
|
|
80
|
-
To ensure that `socket.io-client` is only bundled when you actually use WebSockets, the socket logic is isolated in `@royaltics/ui/socket`.
|
|
81
|
-
|
|
82
|
-
> [!IMPORTANT]
|
|
83
|
-
> Do **NOT** import socket hooks from `@royaltics/ui/hooks`. Always use the dedicated entry point:
|
|
84
|
-
> `import { useSocketState } from '@royaltics/ui/socket';`
|
|
85
|
-
|
|
86
|
-
## 5. Listening to Events
|
|
87
|
-
We provide two tailored hooks for listening to specific Socket.io events and managing standard React lifecycles.
|
|
88
|
-
|
|
89
|
-
### `useSocketEvent`
|
|
90
|
-
Used for managing a single distinct event listener.
|
|
79
|
+
### `useSocketEvent`
|
|
80
|
+
Handle specific incoming events.
|
|
91
81
|
|
|
92
82
|
```tsx
|
|
93
83
|
import { useSocketEvent } from '@royaltics/ui/socket';
|
|
94
84
|
|
|
95
85
|
export const NotificationToast = () => {
|
|
96
|
-
// Automatically binds/unbinds on mount/unmount
|
|
97
86
|
useSocketEvent('notification:new', (data) => {
|
|
98
|
-
console.log('
|
|
87
|
+
console.log('New notification:', data);
|
|
99
88
|
});
|
|
100
89
|
|
|
101
90
|
return null;
|
|
102
91
|
}
|
|
103
92
|
```
|
|
104
93
|
|
|
105
|
-
|
|
106
|
-
|
|
94
|
+
## 4. Advanced Configuration
|
|
95
|
+
|
|
96
|
+
### `setToken(token)`
|
|
97
|
+
Update the authentication token without resetting the entire configuration.
|
|
107
98
|
|
|
108
99
|
```tsx
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
export const ChatRoom = () => {
|
|
112
|
-
useSocketEvents([
|
|
113
|
-
{
|
|
114
|
-
event: 'chat:message',
|
|
115
|
-
onData: (message) => console.log('New Message:', message)
|
|
116
|
-
},
|
|
117
|
-
{
|
|
118
|
-
event: 'chat:typing',
|
|
119
|
-
enabled: false, // You can toggle this dynamically!
|
|
120
|
-
onData: (user) => console.log(`${user} is typing...`)
|
|
121
|
-
}
|
|
122
|
-
]);
|
|
123
|
-
|
|
124
|
-
return <div>Chat UI</div>
|
|
125
|
-
}
|
|
100
|
+
const { setToken } = useSocketState();
|
|
101
|
+
setToken('NEW_JWT_TOKEN');
|
|
126
102
|
```
|
|
103
|
+
|
|
104
|
+
### SaaS Scalability
|
|
105
|
+
The store allows overriding the subscription event name (default: `'subscribe'`) and handles multi-transport fallbacks if needed.
|
|
106
|
+
|
|
107
|
+
> [!TIP]
|
|
108
|
+
> Always prefer `SocketProvider` for React applications to ensure the socket state is strictly synced with your authentication state.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.client.d.ts","sourceRoot":"","sources":["../../../src/core/http/http.client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAItE,eAAO,MAAM,SAAS,GAAU,CAAC,EAAG,SAAS,gBAAgB,EAAE,kBAAgB,KAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"http.client.d.ts","sourceRoot":"","sources":["../../../src/core/http/http.client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAItE,eAAO,MAAM,SAAS,GAAU,CAAC,EAAG,SAAS,gBAAgB,EAAE,kBAAgB,KAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAqE7G,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAU,CAAC,EACvC,KAAK,MAAM,GAAG,MAAM,EAAE,EACtB,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,UAAU,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,kBAAe,EACf,kBAA2B,EAC3B,SAAQ,MAAM,GAAG,OAAO,GAAG,KAAc,EACzC,YAAY,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,EAC7B,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,EACxC,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,kBA6E3C,CAAC"}
|
|
@@ -4,6 +4,11 @@ import { handleTokenRefresh } from './http.refresh.js';
|
|
|
4
4
|
export const HttpFetch = async (options, _isRetry = false) => {
|
|
5
5
|
const state = httpStore.getState();
|
|
6
6
|
const { api, data = {}, query = {}, method = 'POST', content_type = 'json', headers, withAuth = true } = options;
|
|
7
|
+
if (!state.online && method === 'GET') {
|
|
8
|
+
const error = new Error("Offline / OMIT_OFFLINE");
|
|
9
|
+
error.code = "REJECT_NETWORK"; // Tag it so query manager knows it's network/offline
|
|
10
|
+
throw error;
|
|
11
|
+
}
|
|
7
12
|
const url = buildUrl(api, state.baseUrl);
|
|
8
13
|
const body = ['POST', 'PUT', 'PATCH', 'DELETE'].includes(method) ? buildBody(data, content_type) : undefined;
|
|
9
14
|
const queryArray = Object.keys(query).map((key) => `${key}=${query[key] !== false && query[key] !== null && query[key] !== undefined ? query[key] : ''}`);
|
|
@@ -16,16 +21,20 @@ export const HttpFetch = async (options, _isRetry = false) => {
|
|
|
16
21
|
body,
|
|
17
22
|
credentials: withAuth ? "include" : "same-origin"
|
|
18
23
|
}).catch((err) => {
|
|
24
|
+
const originalMessage = err.message || "";
|
|
19
25
|
err.code = "REJECT_NETWORK";
|
|
20
26
|
err.name = "HttpConnectError";
|
|
21
27
|
err.message = "Sin Conexión al Servidor / Error connection to server";
|
|
22
|
-
const isOffline = (typeof navigator !== 'undefined' && !navigator.onLine) ||
|
|
28
|
+
const isOffline = (typeof navigator !== 'undefined' && !navigator.onLine) || originalMessage.toLowerCase().includes('fetch') || originalMessage.toLowerCase().includes('network');
|
|
23
29
|
if (isOffline) {
|
|
24
30
|
state.setOnline(false);
|
|
25
31
|
}
|
|
26
32
|
state.onHttpError?.(err);
|
|
27
33
|
throw err;
|
|
28
34
|
});
|
|
35
|
+
if (res.ok) {
|
|
36
|
+
state.setOnline(true);
|
|
37
|
+
}
|
|
29
38
|
const json = await res.json().catch(() => ({}));
|
|
30
39
|
if (state.debug)
|
|
31
40
|
console.log('Host:', fullUrl, method, data, 'Content Type:', content_type, 'Response:', json);
|
|
@@ -82,12 +91,16 @@ export const uploadFileChunks = async (api, data, headers, withAuth = true, chun
|
|
|
82
91
|
body: formData,
|
|
83
92
|
credentials: withAuth ? "include" : "same-origin"
|
|
84
93
|
}).catch((err) => {
|
|
85
|
-
const
|
|
94
|
+
const originalMessage = err.message || "";
|
|
95
|
+
const isOffline = (typeof navigator !== 'undefined' && !navigator.onLine) || originalMessage.toLowerCase().includes('fetch') || originalMessage.toLowerCase().includes('network');
|
|
86
96
|
if (isOffline)
|
|
87
97
|
state.setOnline(false);
|
|
88
98
|
state.onHttpError?.(err);
|
|
89
99
|
throw err;
|
|
90
100
|
});
|
|
101
|
+
if (res.ok) {
|
|
102
|
+
state.setOnline(true);
|
|
103
|
+
}
|
|
91
104
|
const json = await res.json().catch(() => ({}));
|
|
92
105
|
const isNetwork401 = res.status === 401;
|
|
93
106
|
const isPayload401 = json?.code === 401;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.client.js","sourceRoot":"","sources":["../../../src/core/http/http.client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAM,OAAyB,EAAE,QAAQ,GAAG,KAAK,EAAiC,EAAE;IACjH,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;IACnC,MAAM,EAAE,GAAG,EAAE,IAAI,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,YAAY,GAAG,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAEjH,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7G,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1J,MAAM,MAAM,GAAG,MAAM,KAAK,KAAK,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3H,MAAM,OAAO,GAAG,GAAG,GAAG,GAAG,MAAM,EAAE,CAAC;IAElC,IAAI,CAAC;QACJ,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE;YAChC,MAAM;YACN,OAAO,EAAE,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC;YACxD,IAAI;YACJ,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa;SACjD,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAChB,GAAG,CAAC,IAAI,GAAG,gBAAgB,CAAC;YAC5B,GAAG,CAAC,IAAI,GAAG,kBAAkB,CAAC;YAC9B,GAAG,CAAC,OAAO,GAAG,uDAAuD,CAAC;YAEtE,MAAM,SAAS,GAAG,CAAC,OAAO,SAAS,KAAK,WAAW,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"http.client.js","sourceRoot":"","sources":["../../../src/core/http/http.client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.refresh.d.ts","sourceRoot":"","sources":["../../../src/core/http/http.refresh.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,kBAAkB,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"http.refresh.d.ts","sourceRoot":"","sources":["../../../src/core/http/http.refresh.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,kBAAkB,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,OAAO,CAqErE,CAAC"}
|
|
@@ -54,6 +54,10 @@ export const handleTokenRefresh = async (url) => {
|
|
|
54
54
|
}
|
|
55
55
|
catch (err) {
|
|
56
56
|
lastFailTime = Date.now();
|
|
57
|
+
const isNetworkError = err?.code === 'REJECT_NETWORK' || !navigator.onLine || err.message?.includes('fetch');
|
|
58
|
+
if (isNetworkError && refreshConfig?.maxAttempts) {
|
|
59
|
+
refreshAttempts = refreshConfig.maxAttempts; // prevent immediate retries loop
|
|
60
|
+
}
|
|
57
61
|
if (refreshConfig?.onFailed) {
|
|
58
62
|
refreshConfig.onFailed(err);
|
|
59
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.refresh.js","sourceRoot":"","sources":["../../../src/core/http/http.refresh.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,IAAI,cAAc,GAA4B,IAAI,CAAC;AACnD,IAAI,eAAe,GAAG,CAAC,CAAC;AACxB,IAAI,YAAY,GAAG,CAAC,CAAC;AAErB,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,GAAW,EAAoB,EAAE;IACzE,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;IACnC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QAC1B,IAAI,KAAK,CAAC,SAAS,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACpG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACzC,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,IAAI,CAAC,CAAC;IAEnD,IAAI,cAAc;QAAE,OAAO,cAAc,CAAC;IAE1C,IAAI,eAAe,IAAI,WAAW,EAAE,CAAC;QACpC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,GAAG,KAAK,CAAC,CAAC,eAAe;QACrE,IAAI,UAAU,EAAE,CAAC;YAChB,IAAI,aAAa,EAAE,QAAQ,EAAE,CAAC;gBAC7B,aAAa,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC,CAAC;YACnF,CAAC;iBAAM,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;gBAC1C,MAAM,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,IAAI,KAAK,CAAC,8CAA8C,CAAC,EAAE,CAAC,CAAC,CAAC;YAChI,CAAC;YACD,OAAO,KAAK,CAAC;QACd,CAAC;aAAM,CAAC;YACP,eAAe,GAAG,CAAC,CAAC;QACrB,CAAC;IACF,CAAC;IAED,eAAe,EAAE,CAAC;IAElB,cAAc,GAAG,CAAC,KAAK,IAAI,EAAE;QAC5B,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YACxD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE;gBACnC,MAAM,EAAE,aAAa,CAAC,MAAM,IAAI,MAAM;gBACtC,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;gBACzE,WAAW,EAAE,SAAS;aACtB,CAAC,CAAC;YAEH,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAE7D,IAAI,GAAG,CAAC,EAAE,IAAI,OAAO,EAAE,CAAC;gBACvB,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;oBAC7B,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC/B,CAAC;gBACD,eAAe,GAAG,CAAC,CAAC;gBACpB,OAAO,IAAI,CAAC;YACb,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACnC,CAAC;QACF,CAAC;QAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"http.refresh.js","sourceRoot":"","sources":["../../../src/core/http/http.refresh.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-manager.d.ts","sourceRoot":"","sources":["../../../src/core/http/query-manager.ts"],"names":[],"mappings":"AAAA,KAAK,QAAQ,GAAG,SAAS,OAAO,EAAE,CAAC;AAEnC,KAAK,WAAW,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;AAE5D,UAAU,cAAc;IACpB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,UAAU,CAAC,CAAC,GAAG,OAAO,CAAE,SAAQ,cAAc;IACpD,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;IACf,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;IACjD,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,UAAU,YAAY;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,kBAAkB,CAAC,CAAC,GAAG,OAAO,CAAE,SAAQ,cAAc;IAC5D,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;IACzD,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAC/C,OAAO,EAAE,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC;QAAE,IAAI,EAAE,CAAC,CAAC;QAAC,QAAQ,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC,GAAG,IAAI,CAAC;IACnG,aAAa,EAAE;QAAE,IAAI,EAAE,CAAC,CAAC;QAAC,QAAQ,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,EAAE,CAAC;IAC3D,UAAU,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;IAC9B,WAAW,EAAE,OAAO,CAAC;CACxB;AAED,cAAM,YAAY;IACd,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0C;IAClE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkD;IAClF,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqC;IAChE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqC;IACtE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAe;gBAEhC,WAAW,CAAC,EAAE,YAAY;IAOtC,OAAO,CAAC,iBAAiB,CAMvB;IAEF,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,aAAa;IAId,OAAO,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM;IAa1C,OAAO,CAAC,UAAU;IAYlB,OAAO,CAAC,OAAO;IAQf,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,oBAAoB;IAQtB,UAAU,CAAC,CAAC,EACd,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACzB,OAAO,GAAE,YAAiB,GAC3B,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"query-manager.d.ts","sourceRoot":"","sources":["../../../src/core/http/query-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,8 +112,11 @@ class QueryManager {
|
|
|
112
112
|
}
|
|
113
113
|
catch (error) {
|
|
114
114
|
if (attemptsLeft > 0) {
|
|
115
|
-
|
|
116
|
-
|
|
115
|
+
const isNetworkRefused = error?.code === 'REJECT_NETWORK';
|
|
116
|
+
if (!isNetworkRefused) {
|
|
117
|
+
await new Promise(resolve => setTimeout(resolve, Math.min(1000 * (retry - attemptsLeft + 1), 5000)));
|
|
118
|
+
return executeQuery(attemptsLeft - 1);
|
|
119
|
+
}
|
|
117
120
|
}
|
|
118
121
|
if (!entry)
|
|
119
122
|
throw error;
|
|
@@ -182,8 +185,11 @@ class QueryManager {
|
|
|
182
185
|
}
|
|
183
186
|
catch (error) {
|
|
184
187
|
if (attemptsLeft > 0) {
|
|
185
|
-
|
|
186
|
-
|
|
188
|
+
const isNetworkRefused = error?.code === 'REJECT_NETWORK';
|
|
189
|
+
if (!isNetworkRefused) {
|
|
190
|
+
await new Promise(resolve => setTimeout(resolve, Math.min(1000 * (retry - attemptsLeft + 1), 5000)));
|
|
191
|
+
return executeQuery(attemptsLeft - 1);
|
|
192
|
+
}
|
|
187
193
|
}
|
|
188
194
|
if (!entry)
|
|
189
195
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-manager.js","sourceRoot":"","sources":["../../../src/core/http/query-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"query-manager.js","sourceRoot":"","sources":["../../../src/core/http/query-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,31 @@
|
|
|
1
1
|
import { Socket, ManagerOptions, SocketOptions } from 'socket.io-client';
|
|
2
2
|
export type SocketStatus = 'disconnected' | 'connecting' | 'connected' | 'error';
|
|
3
|
+
export interface SubscriptionData {
|
|
4
|
+
rooms: string[];
|
|
5
|
+
[key: string]: any;
|
|
6
|
+
}
|
|
7
|
+
export interface SocketStoreConfig {
|
|
8
|
+
url: string;
|
|
9
|
+
token: string;
|
|
10
|
+
path?: string;
|
|
11
|
+
transports?: ('websocket' | 'polling')[];
|
|
12
|
+
options?: Partial<ManagerOptions & SocketOptions>;
|
|
13
|
+
onAuthError?: (err: Error) => void;
|
|
14
|
+
subscriptionEvent?: string;
|
|
15
|
+
}
|
|
3
16
|
export interface SocketStoreState {
|
|
4
17
|
socket: Socket | null;
|
|
5
18
|
status: SocketStatus;
|
|
6
19
|
isConnected: boolean;
|
|
7
|
-
config:
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
options?: Partial<ManagerOptions & SocketOptions>;
|
|
11
|
-
onAuthError?: (err: Error) => void;
|
|
12
|
-
} | null;
|
|
13
|
-
connect: (url: string, token: string, extraOptions?: Partial<ManagerOptions & SocketOptions>, onAuthError?: (err: Error) => void) => void;
|
|
20
|
+
config: SocketStoreConfig | null;
|
|
21
|
+
subscriptions: Map<string, SubscriptionData>;
|
|
22
|
+
connect: (config: SocketStoreConfig) => void;
|
|
14
23
|
disconnect: () => void;
|
|
15
24
|
setToken: (token: string) => void;
|
|
16
25
|
emit: (event: string, ...args: any[]) => void;
|
|
17
26
|
off: (event: string, callback?: (...args: any[]) => void) => void;
|
|
27
|
+
subscribe: (id: string, data: SubscriptionData, event?: string) => void;
|
|
28
|
+
unsubscribe: (id: string, event?: string) => void;
|
|
18
29
|
}
|
|
19
30
|
export interface SocketHookEvent<T = any> {
|
|
20
31
|
event: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-store.d.ts","sourceRoot":"","sources":["../../../src/core/socket/socket-store.ts"],"names":[],"mappings":"AACA,OAAO,EAAM,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE7E,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG,YAAY,GAAG,WAAW,GAAG,OAAO,CAAC;AAEjF,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"socket-store.d.ts","sourceRoot":"","sources":["../../../src/core/socket/socket-store.ts"],"names":[],"mappings":"AACA,OAAO,EAAM,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE7E,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG,YAAY,GAAG,WAAW,GAAG,OAAO,CAAC;AAEjF,MAAM,WAAW,gBAAgB;IAC7B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC;IACzC,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,GAAG,aAAa,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;IACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,YAAY,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACjC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC7C,OAAO,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC9C,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,KAAK,IAAI,CAAC;IAClE,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACxE,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD;AAED,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,GAAG;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,eAAO,MAAM,WAAW,8CA6HrB,CAAC"}
|
|
@@ -5,31 +5,38 @@ export const socketStore = createStore((set, get) => ({
|
|
|
5
5
|
status: 'disconnected',
|
|
6
6
|
isConnected: false,
|
|
7
7
|
config: null,
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
subscriptions: new Map(),
|
|
9
|
+
connect: (config) => {
|
|
10
|
+
const { url, token, path = '/ws', transports = ['websocket'], options, onAuthError, subscriptionEvent = 'subscribe' } = config;
|
|
11
|
+
let { socket, subscriptions } = get();
|
|
12
|
+
// Prevent reconnecting if already connected to the same instance/token/path
|
|
11
13
|
// @ts-ignore: uri is private but needed for caching check
|
|
12
|
-
if (socket?.connected && socket.auth && socket.auth.token === token && socket.io.uri === url)
|
|
14
|
+
if (socket?.connected && socket.auth && socket.auth.token === token && socket.io.uri === url && socket.io.opts.path === path)
|
|
13
15
|
return;
|
|
14
16
|
// Clean up previous instance
|
|
15
17
|
if (socket) {
|
|
16
18
|
socket.removeAllListeners();
|
|
17
19
|
socket.disconnect();
|
|
18
20
|
}
|
|
19
|
-
set({ status: 'connecting' });
|
|
21
|
+
set({ status: 'connecting', config });
|
|
20
22
|
const newSocket = io(url, {
|
|
21
23
|
auth: { token },
|
|
22
|
-
path
|
|
23
|
-
transports
|
|
24
|
+
path,
|
|
25
|
+
transports,
|
|
24
26
|
reconnection: true,
|
|
25
27
|
reconnectionDelay: 3000,
|
|
26
28
|
reconnectionAttempts: 5,
|
|
27
29
|
timeout: 10000,
|
|
28
30
|
autoConnect: true,
|
|
29
|
-
...
|
|
31
|
+
...options
|
|
30
32
|
});
|
|
31
33
|
newSocket.on('connect', () => {
|
|
34
|
+
console.log('[Socket.IO] Connected to:', url);
|
|
32
35
|
set({ status: 'connected', isConnected: true });
|
|
36
|
+
// Auto-resubscribe to all active topics
|
|
37
|
+
subscriptions.forEach((data) => {
|
|
38
|
+
newSocket.emit(subscriptionEvent, data);
|
|
39
|
+
});
|
|
33
40
|
});
|
|
34
41
|
newSocket.on('disconnect', (reason) => {
|
|
35
42
|
console.log('[Socket.IO] Disconnected:', reason);
|
|
@@ -49,12 +56,12 @@ export const socketStore = createStore((set, get) => ({
|
|
|
49
56
|
console.error('[Socket.IO] Socket error:', error);
|
|
50
57
|
set({ status: 'error', isConnected: false });
|
|
51
58
|
});
|
|
52
|
-
set({ socket: newSocket
|
|
59
|
+
set({ socket: newSocket });
|
|
53
60
|
},
|
|
54
61
|
setToken: (token) => {
|
|
55
62
|
const { config, connect } = get();
|
|
56
63
|
if (config && config.token !== token) {
|
|
57
|
-
connect(config
|
|
64
|
+
connect({ ...config, token });
|
|
58
65
|
}
|
|
59
66
|
},
|
|
60
67
|
disconnect: () => {
|
|
@@ -84,6 +91,23 @@ export const socketStore = createStore((set, get) => ({
|
|
|
84
91
|
socket.off(event);
|
|
85
92
|
}
|
|
86
93
|
}
|
|
94
|
+
},
|
|
95
|
+
subscribe: (id, data, event) => {
|
|
96
|
+
const { socket, subscriptions, config } = get();
|
|
97
|
+
const eventName = event || config?.subscriptionEvent || 'subscribe';
|
|
98
|
+
subscriptions.set(id, data);
|
|
99
|
+
if (socket?.connected) {
|
|
100
|
+
socket.emit(eventName, data);
|
|
101
|
+
}
|
|
102
|
+
},
|
|
103
|
+
unsubscribe: (id, event) => {
|
|
104
|
+
const { socket, subscriptions, config } = get();
|
|
105
|
+
const eventName = event || config?.subscriptionEvent || 'unsubscribe';
|
|
106
|
+
const data = subscriptions.get(id);
|
|
107
|
+
if (data && socket?.connected) {
|
|
108
|
+
socket.emit(eventName, data);
|
|
109
|
+
}
|
|
110
|
+
subscriptions.delete(id);
|
|
87
111
|
}
|
|
88
112
|
}));
|
|
89
113
|
//# sourceMappingURL=socket-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-store.js","sourceRoot":"","sources":["../../../src/core/socket/socket-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,EAAE,EAAyC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"socket-store.js","sourceRoot":"","sources":["../../../src/core/socket/socket-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,23 @@ import { SocketHookEvent } from './socket-store.js';
|
|
|
3
3
|
export interface SocketOptionsProps {
|
|
4
4
|
socketUrl?: string;
|
|
5
5
|
token?: string;
|
|
6
|
+
path?: string;
|
|
7
|
+
transports?: ('websocket' | 'polling')[];
|
|
6
8
|
options?: Partial<ManagerOptions & SocketOptions>;
|
|
9
|
+
subscriptionEvent?: string;
|
|
7
10
|
onAuthError?: (error: Error) => void;
|
|
8
11
|
}
|
|
9
|
-
export declare const initSocketOptions: ({ socketUrl, token, options, onAuthError }: SocketOptionsProps) => void;
|
|
12
|
+
export declare const initSocketOptions: ({ socketUrl, token, path, transports, options, onAuthError, subscriptionEvent }: SocketOptionsProps) => void;
|
|
10
13
|
export declare const useSocketState: () => import("./socket-store.js").SocketStoreState;
|
|
14
|
+
export declare const SocketProvider: ({ children, ...props }: SocketOptionsProps & {
|
|
15
|
+
children: React.ReactNode;
|
|
16
|
+
}) => import("react").ReactNode;
|
|
11
17
|
export declare const useSocketEvent: <T = any>(event: string, callback: (...args: T[]) => void) => void;
|
|
12
18
|
export declare const useSocketEvents: (events: SocketHookEvent[]) => void;
|
|
19
|
+
/**
|
|
20
|
+
* Hook to manage a socket subscription lifecycle.
|
|
21
|
+
* Automatically sends 'subscribe' on mount and 'unsubscribe' on unmount.
|
|
22
|
+
* Compatible with NestJS @SubscribeMessage('subscribe')
|
|
23
|
+
*/
|
|
24
|
+
export declare const useSocketSubscription: (id: string, rooms: string[], extraData?: Record<string, any>, subscriptionEvent?: string) => void;
|
|
13
25
|
//# sourceMappingURL=useSocketState.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSocketState.d.ts","sourceRoot":"","sources":["../../../src/core/socket/useSocketState.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAe,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEjE,MAAM,WAAW,kBAAkB;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,GAAG,aAAa,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACxC;AAED,eAAO,MAAM,iBAAiB,GAAI,
|
|
1
|
+
{"version":3,"file":"useSocketState.d.ts","sourceRoot":"","sources":["../../../src/core/socket/useSocketState.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAe,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEjE,MAAM,WAAW,kBAAkB;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC;IACzC,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,GAAG,aAAa,CAAC,CAAC;IAClD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACxC;AAED,eAAO,MAAM,iBAAiB,GAAI,iFAAiF,kBAAkB,SAcpI,CAAC;AAEF,eAAO,MAAM,cAAc,oDAE1B,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,wBAAwB,kBAAkB,GAAG;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,8BAMxG,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,CAAC,GAAG,GAAG,EAAE,OAAO,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,KAAK,IAAI,SAUtF,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,QAAQ,eAAe,EAAE,SAkBxD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAAI,IAAI,MAAM,EAAE,OAAO,MAAM,EAAE,EAAE,YAAY,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,oBAAoB,MAAM,SAW7H,CAAC"}
|
|
@@ -1,9 +1,17 @@
|
|
|
1
1
|
import { useEffect } from 'react';
|
|
2
2
|
import { useStore } from 'zustand';
|
|
3
3
|
import { socketStore } from './socket-store.js';
|
|
4
|
-
export const initSocketOptions = ({ socketUrl, token, options, onAuthError }) => {
|
|
4
|
+
export const initSocketOptions = ({ socketUrl, token, path, transports, options, onAuthError, subscriptionEvent }) => {
|
|
5
5
|
if (socketUrl && token) {
|
|
6
|
-
socketStore.getState().connect(
|
|
6
|
+
socketStore.getState().connect({
|
|
7
|
+
url: socketUrl,
|
|
8
|
+
token,
|
|
9
|
+
path,
|
|
10
|
+
transports,
|
|
11
|
+
options,
|
|
12
|
+
onAuthError,
|
|
13
|
+
subscriptionEvent
|
|
14
|
+
});
|
|
7
15
|
}
|
|
8
16
|
else {
|
|
9
17
|
socketStore.getState().disconnect();
|
|
@@ -12,6 +20,12 @@ export const initSocketOptions = ({ socketUrl, token, options, onAuthError }) =>
|
|
|
12
20
|
export const useSocketState = () => {
|
|
13
21
|
return useStore(socketStore);
|
|
14
22
|
};
|
|
23
|
+
export const SocketProvider = ({ children, ...props }) => {
|
|
24
|
+
useEffect(() => {
|
|
25
|
+
initSocketOptions(props);
|
|
26
|
+
}, [props.socketUrl, props.token, props.path, JSON.stringify(props.transports), JSON.stringify(props.options)]);
|
|
27
|
+
return children;
|
|
28
|
+
};
|
|
15
29
|
export const useSocketEvent = (event, callback) => {
|
|
16
30
|
const socket = useSocketState().socket;
|
|
17
31
|
useEffect(() => {
|
|
@@ -39,4 +53,19 @@ export const useSocketEvents = (events) => {
|
|
|
39
53
|
};
|
|
40
54
|
}, [socket, events]);
|
|
41
55
|
};
|
|
56
|
+
/**
|
|
57
|
+
* Hook to manage a socket subscription lifecycle.
|
|
58
|
+
* Automatically sends 'subscribe' on mount and 'unsubscribe' on unmount.
|
|
59
|
+
* Compatible with NestJS @SubscribeMessage('subscribe')
|
|
60
|
+
*/
|
|
61
|
+
export const useSocketSubscription = (id, rooms, extraData, subscriptionEvent) => {
|
|
62
|
+
const { subscribe, unsubscribe, isConnected } = useSocketState();
|
|
63
|
+
useEffect(() => {
|
|
64
|
+
const data = { rooms, ...extraData };
|
|
65
|
+
subscribe(id, data, subscriptionEvent);
|
|
66
|
+
return () => {
|
|
67
|
+
unsubscribe(id, subscriptionEvent);
|
|
68
|
+
};
|
|
69
|
+
}, [id, JSON.stringify(rooms), JSON.stringify(extraData), isConnected, subscriptionEvent]);
|
|
70
|
+
};
|
|
42
71
|
//# sourceMappingURL=useSocketState.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSocketState.js","sourceRoot":"","sources":["../../../src/core/socket/useSocketState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,WAAW,EAAmB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"useSocketState.js","sourceRoot":"","sources":["../../../src/core/socket/useSocketState.ts"],"names":[],"mappings":"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"}
|