@oxyhq/services 5.16.22 → 5.16.24
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/commonjs/core/HttpService.js +15 -79
- package/lib/commonjs/core/HttpService.js.map +1 -1
- package/lib/commonjs/core/OxyServices.base.js +3 -11
- package/lib/commonjs/core/OxyServices.base.js.map +1 -1
- package/lib/commonjs/core/services/SessionService.js +163 -0
- package/lib/commonjs/core/services/SessionService.js.map +1 -0
- package/lib/commonjs/core/services/TokenService.js +206 -0
- package/lib/commonjs/core/services/TokenService.js.map +1 -0
- package/lib/commonjs/models/interfaces.js +15 -0
- package/lib/commonjs/models/interfaces.js.map +1 -1
- package/lib/commonjs/ui/context/OxyContext.js +100 -22
- package/lib/commonjs/ui/context/OxyContext.js.map +1 -1
- package/lib/commonjs/ui/context/hooks/useAuthOperations.js +11 -3
- package/lib/commonjs/ui/context/hooks/useAuthOperations.js.map +1 -1
- package/lib/commonjs/ui/hooks/useSessionSocket.js +228 -57
- package/lib/commonjs/ui/hooks/useSessionSocket.js.map +1 -1
- package/lib/module/core/HttpService.js +15 -79
- package/lib/module/core/HttpService.js.map +1 -1
- package/lib/module/core/OxyServices.base.js +4 -11
- package/lib/module/core/OxyServices.base.js.map +1 -1
- package/lib/module/core/services/SessionService.js +159 -0
- package/lib/module/core/services/SessionService.js.map +1 -0
- package/lib/module/core/services/TokenService.js +203 -0
- package/lib/module/core/services/TokenService.js.map +1 -0
- package/lib/module/models/interfaces.js +15 -0
- package/lib/module/models/interfaces.js.map +1 -1
- package/lib/module/ui/context/OxyContext.js +100 -22
- package/lib/module/ui/context/OxyContext.js.map +1 -1
- package/lib/module/ui/context/hooks/useAuthOperations.js +11 -3
- package/lib/module/ui/context/hooks/useAuthOperations.js.map +1 -1
- package/lib/module/ui/hooks/useSessionSocket.js +228 -57
- package/lib/module/ui/hooks/useSessionSocket.js.map +1 -1
- package/lib/typescript/core/HttpService.d.ts +1 -1
- package/lib/typescript/core/HttpService.d.ts.map +1 -1
- package/lib/typescript/core/OxyServices.base.d.ts +6 -0
- package/lib/typescript/core/OxyServices.base.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.analytics.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.assets.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.auth.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.developer.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.devices.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.karma.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.language.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.location.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.payment.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.privacy.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.security.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.user.d.ts +1 -3
- package/lib/typescript/core/mixins/OxyServices.user.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.utility.d.ts.map +1 -1
- package/lib/typescript/core/mixins/index.d.ts.map +1 -1
- package/lib/typescript/core/services/SessionService.d.ts +78 -0
- package/lib/typescript/core/services/SessionService.d.ts.map +1 -0
- package/lib/typescript/core/services/TokenService.d.ts +72 -0
- package/lib/typescript/core/services/TokenService.d.ts.map +1 -0
- package/lib/typescript/models/interfaces.d.ts +14 -0
- package/lib/typescript/models/interfaces.d.ts.map +1 -1
- package/lib/typescript/models/session.d.ts +7 -0
- package/lib/typescript/models/session.d.ts.map +1 -1
- package/lib/typescript/ui/context/OxyContext.d.ts.map +1 -1
- package/lib/typescript/ui/context/hooks/useAuthOperations.d.ts.map +1 -1
- package/lib/typescript/ui/hooks/useSessionSocket.d.ts +8 -1
- package/lib/typescript/ui/hooks/useSessionSocket.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/core/HttpService.ts +15 -95
- package/src/core/OxyServices.base.ts +3 -20
- package/src/core/services/SessionService.ts +173 -0
- package/src/core/services/TokenService.ts +226 -0
- package/src/models/interfaces.ts +16 -2
- package/src/models/session.ts +8 -1
- package/src/ui/context/OxyContext.tsx +105 -23
- package/src/ui/context/hooks/useAuthOperations.ts +11 -3
- package/src/ui/hooks/useSessionSocket.ts +229 -55
|
@@ -17,12 +17,16 @@ function useSessionSocket({
|
|
|
17
17
|
logout,
|
|
18
18
|
clearSessionState,
|
|
19
19
|
baseURL,
|
|
20
|
+
getAccessToken,
|
|
21
|
+
getTransferCode,
|
|
20
22
|
onRemoteSignOut,
|
|
21
23
|
onSessionRemoved,
|
|
22
24
|
onIdentityTransferComplete
|
|
23
25
|
}) {
|
|
24
26
|
const socketRef = (0, _react.useRef)(null);
|
|
25
27
|
const joinedRoomRef = (0, _react.useRef)(null);
|
|
28
|
+
const accessTokenRef = (0, _react.useRef)(null);
|
|
29
|
+
const handlersSetupRef = (0, _react.useRef)(false);
|
|
26
30
|
|
|
27
31
|
// Store callbacks in refs to avoid re-joining when they change
|
|
28
32
|
const refreshSessionsRef = (0, _react.useRef)(refreshSessions);
|
|
@@ -48,50 +52,113 @@ function useSessionSocket({
|
|
|
48
52
|
(0, _react.useEffect)(() => {
|
|
49
53
|
if (!userId || !baseURL) {
|
|
50
54
|
// Clean up if userId or baseURL becomes invalid
|
|
51
|
-
if (socketRef.current
|
|
52
|
-
socketRef.current.
|
|
53
|
-
|
|
54
|
-
});
|
|
55
|
+
if (socketRef.current) {
|
|
56
|
+
socketRef.current.disconnect();
|
|
57
|
+
socketRef.current = null;
|
|
55
58
|
joinedRoomRef.current = null;
|
|
56
59
|
}
|
|
57
60
|
return;
|
|
58
61
|
}
|
|
59
|
-
const
|
|
62
|
+
const accessToken = getAccessToken();
|
|
63
|
+
// Recreate socket if token changed or socket doesn't exist
|
|
64
|
+
const tokenChanged = accessTokenRef.current !== accessToken;
|
|
65
|
+
if (!socketRef.current || tokenChanged) {
|
|
66
|
+
// Disconnect old socket if exists
|
|
67
|
+
if (socketRef.current) {
|
|
68
|
+
socketRef.current.disconnect();
|
|
69
|
+
socketRef.current = null;
|
|
70
|
+
}
|
|
60
71
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
socketRef.current = (0, _socket.default)(baseURL, {
|
|
72
|
+
// Create new socket with authentication
|
|
73
|
+
const socketOptions = {
|
|
64
74
|
transports: ['websocket']
|
|
65
|
-
}
|
|
75
|
+
};
|
|
76
|
+
if (accessToken) {
|
|
77
|
+
socketOptions.auth = {
|
|
78
|
+
token: accessToken
|
|
79
|
+
};
|
|
80
|
+
if (__DEV__) {
|
|
81
|
+
console.log('[useSessionSocket] Creating socket with auth token', {
|
|
82
|
+
userId,
|
|
83
|
+
hasToken: !!accessToken,
|
|
84
|
+
tokenLength: accessToken.length
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
} else {
|
|
88
|
+
if (__DEV__) {
|
|
89
|
+
console.warn('[useSessionSocket] No access token available for socket authentication');
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
socketRef.current = (0, _socket.default)(baseURL, socketOptions);
|
|
93
|
+
accessTokenRef.current = accessToken;
|
|
94
|
+
joinedRoomRef.current = null; // Reset room tracking
|
|
95
|
+
handlersSetupRef.current = false; // Reset handlers flag for new socket
|
|
66
96
|
}
|
|
67
97
|
const socket = socketRef.current;
|
|
68
98
|
|
|
69
|
-
//
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
socket.emit('leave', {
|
|
74
|
-
userId: joinedRoomRef.current
|
|
75
|
-
});
|
|
76
|
-
}
|
|
77
|
-
socket.emit('join', {
|
|
78
|
-
userId: roomId
|
|
79
|
-
});
|
|
80
|
-
joinedRoomRef.current = roomId;
|
|
99
|
+
// Server auto-joins room on connection when authenticated, so we don't need to manually join
|
|
100
|
+
// Just track that we're in the room
|
|
101
|
+
if (!joinedRoomRef.current && socket.connected) {
|
|
102
|
+
joinedRoomRef.current = `user:${userId}`;
|
|
81
103
|
if (__DEV__) {
|
|
82
|
-
console.log('
|
|
104
|
+
console.log('[useSessionSocket] Socket connected, should be auto-joined to room', {
|
|
105
|
+
userId,
|
|
106
|
+
room: `user:${userId}`
|
|
107
|
+
});
|
|
83
108
|
}
|
|
84
109
|
}
|
|
85
110
|
|
|
86
111
|
// Set up event handlers (only once per socket instance)
|
|
112
|
+
// Define handlers outside if block so they're always available
|
|
87
113
|
const handleConnect = () => {
|
|
114
|
+
const currentToken = getAccessToken();
|
|
88
115
|
if (__DEV__) {
|
|
89
|
-
console.log('Socket connected
|
|
116
|
+
console.log('[useSessionSocket] Socket connected', {
|
|
117
|
+
socketId: socket.id,
|
|
118
|
+
userId,
|
|
119
|
+
room: `user:${userId}`,
|
|
120
|
+
hasAuth: !!currentToken
|
|
121
|
+
});
|
|
122
|
+
_loggerUtils.logger.debug('Socket connected', {
|
|
123
|
+
component: 'useSessionSocket',
|
|
124
|
+
socketId: socket.id,
|
|
125
|
+
userId
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
// Server auto-joins room on connection when authenticated
|
|
129
|
+
// Just track that we're connected
|
|
130
|
+
if (userId) {
|
|
131
|
+
joinedRoomRef.current = `user:${userId}`;
|
|
132
|
+
}
|
|
133
|
+
};
|
|
134
|
+
const handleDisconnect = reason => {
|
|
135
|
+
if (__DEV__) {
|
|
136
|
+
console.log('[useSessionSocket] Socket disconnected:', reason);
|
|
137
|
+
_loggerUtils.logger.debug('Socket disconnected', {
|
|
138
|
+
component: 'useSessionSocket',
|
|
139
|
+
reason,
|
|
140
|
+
userId
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
joinedRoomRef.current = null; // Reset room tracking on disconnect
|
|
144
|
+
};
|
|
145
|
+
const handleError = error => {
|
|
146
|
+
if (__DEV__) {
|
|
147
|
+
console.error('[useSessionSocket] Socket error', error);
|
|
148
|
+
_loggerUtils.logger.error('Socket error', error, {
|
|
149
|
+
component: 'useSessionSocket',
|
|
150
|
+
userId
|
|
151
|
+
});
|
|
90
152
|
}
|
|
91
153
|
};
|
|
92
154
|
const handleSessionUpdate = async data => {
|
|
93
155
|
if (__DEV__) {
|
|
94
|
-
console.log('Received session_update:',
|
|
156
|
+
console.log('[useSessionSocket] Received session_update event:', {
|
|
157
|
+
type: data.type,
|
|
158
|
+
socketId: socket.id,
|
|
159
|
+
socketConnected: socket.connected,
|
|
160
|
+
roomId: joinedRoomRef.current
|
|
161
|
+
});
|
|
95
162
|
}
|
|
96
163
|
const currentActiveSessionId = activeSessionIdRef.current;
|
|
97
164
|
const currentDeviceId = currentDeviceIdRef.current;
|
|
@@ -210,43 +277,114 @@ function useSessionSocket({
|
|
|
210
277
|
// Handle identity transfer completion notification
|
|
211
278
|
const transferData = data;
|
|
212
279
|
if (__DEV__) {
|
|
213
|
-
|
|
214
|
-
component: 'useSessionSocket',
|
|
280
|
+
console.log('[useSessionSocket] Received identity_transfer_complete event', {
|
|
215
281
|
transferId: transferData.transferId,
|
|
216
282
|
sourceDeviceId: transferData.sourceDeviceId,
|
|
217
283
|
currentDeviceId,
|
|
218
|
-
|
|
284
|
+
hasActiveSession: activeSessionIdRef.current !== null,
|
|
285
|
+
socketConnected: socket.connected
|
|
219
286
|
});
|
|
220
287
|
}
|
|
288
|
+
_loggerUtils.logger.debug('Received identity_transfer_complete event', {
|
|
289
|
+
component: 'useSessionSocket',
|
|
290
|
+
transferId: transferData.transferId,
|
|
291
|
+
sourceDeviceId: transferData.sourceDeviceId,
|
|
292
|
+
currentDeviceId,
|
|
293
|
+
activeSessionId: activeSessionIdRef.current,
|
|
294
|
+
socketConnected: socket.connected,
|
|
295
|
+
userId,
|
|
296
|
+
room: joinedRoomRef.current,
|
|
297
|
+
publicKey: transferData.publicKey.substring(0, 16) + '...'
|
|
298
|
+
});
|
|
299
|
+
|
|
300
|
+
// Only call handler on the SOURCE device (the one that initiated the transfer)
|
|
301
|
+
// The source device is identified by:
|
|
302
|
+
// 1. Matching deviceId with sourceDeviceId, OR
|
|
303
|
+
// 2. Having a stored transfer code for this transferId (most reliable check)
|
|
304
|
+
const deviceIdMatches = transferData.sourceDeviceId && transferData.sourceDeviceId === currentDeviceId;
|
|
221
305
|
|
|
222
|
-
// Check if this device
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
//
|
|
227
|
-
//
|
|
228
|
-
|
|
229
|
-
if (
|
|
306
|
+
// Check if this device has a stored transfer code (meaning it's the source device)
|
|
307
|
+
const hasStoredTransferCode = getTransferCode && !!getTransferCode(transferData.transferId);
|
|
308
|
+
|
|
309
|
+
// Only call handler if this is the source device
|
|
310
|
+
// We check both deviceId match AND stored transfer code to handle cases where
|
|
311
|
+
// deviceId might be null (logged out device) but transfer code still exists
|
|
312
|
+
const shouldCallHandler = !!transferData.transferId && (deviceIdMatches || hasStoredTransferCode);
|
|
313
|
+
if (shouldCallHandler) {
|
|
314
|
+
const matchReason = deviceIdMatches ? 'deviceId-exact' : activeSessionIdRef.current !== null ? 'active-session' : 'transferId-only';
|
|
230
315
|
if (__DEV__) {
|
|
231
|
-
|
|
232
|
-
component: 'useSessionSocket',
|
|
316
|
+
console.log('[useSessionSocket] Matched source device, calling handler', {
|
|
233
317
|
transferId: transferData.transferId,
|
|
318
|
+
matchReason,
|
|
234
319
|
sourceDeviceId: transferData.sourceDeviceId,
|
|
235
|
-
currentDeviceId
|
|
236
|
-
matchedBy: transferData.sourceDeviceId === currentDeviceId ? 'deviceId' : 'session'
|
|
320
|
+
currentDeviceId
|
|
237
321
|
});
|
|
238
322
|
}
|
|
239
|
-
|
|
323
|
+
_loggerUtils.logger.debug('Matched source device, calling transfer complete handler', {
|
|
324
|
+
component: 'useSessionSocket',
|
|
325
|
+
transferId: transferData.transferId,
|
|
326
|
+
sourceDeviceId: transferData.sourceDeviceId,
|
|
327
|
+
currentDeviceId,
|
|
328
|
+
matchReason,
|
|
329
|
+
hasHandler: !!onIdentityTransferCompleteRef.current,
|
|
330
|
+
socketConnected: socket.connected,
|
|
331
|
+
socketId: socket.id
|
|
332
|
+
});
|
|
333
|
+
|
|
334
|
+
// Call the handler - it will verify using stored transfer codes
|
|
240
335
|
if (onIdentityTransferCompleteRef.current) {
|
|
241
|
-
|
|
242
|
-
|
|
336
|
+
try {
|
|
337
|
+
if (__DEV__) {
|
|
338
|
+
console.log('[useSessionSocket] Calling onIdentityTransferComplete handler', {
|
|
339
|
+
transferId: transferData.transferId
|
|
340
|
+
});
|
|
341
|
+
}
|
|
342
|
+
_loggerUtils.logger.debug('Calling onIdentityTransferComplete handler', {
|
|
343
|
+
component: 'useSessionSocket',
|
|
344
|
+
transferId: transferData.transferId
|
|
345
|
+
});
|
|
346
|
+
onIdentityTransferCompleteRef.current({
|
|
347
|
+
transferId: transferData.transferId,
|
|
348
|
+
sourceDeviceId: transferData.sourceDeviceId,
|
|
349
|
+
publicKey: transferData.publicKey,
|
|
350
|
+
transferCode: transferData.transferCode,
|
|
351
|
+
completedAt: transferData.completedAt
|
|
352
|
+
});
|
|
353
|
+
if (__DEV__) {
|
|
354
|
+
console.log('[useSessionSocket] Handler called successfully', {
|
|
355
|
+
transferId: transferData.transferId
|
|
356
|
+
});
|
|
357
|
+
}
|
|
358
|
+
_loggerUtils.logger.debug('onIdentityTransferComplete handler called successfully', {
|
|
359
|
+
component: 'useSessionSocket',
|
|
360
|
+
transferId: transferData.transferId
|
|
361
|
+
});
|
|
362
|
+
} catch (error) {
|
|
363
|
+
if (__DEV__) {
|
|
364
|
+
console.error('[useSessionSocket] Error calling handler', error);
|
|
365
|
+
}
|
|
366
|
+
_loggerUtils.logger.error('Error calling onIdentityTransferComplete handler', error instanceof Error ? error : new Error(String(error)), {
|
|
367
|
+
component: 'useSessionSocket',
|
|
368
|
+
transferId: transferData.transferId
|
|
369
|
+
});
|
|
370
|
+
}
|
|
371
|
+
} else {
|
|
372
|
+
if (__DEV__) {
|
|
373
|
+
console.warn('[useSessionSocket] No handler registered');
|
|
374
|
+
}
|
|
375
|
+
_loggerUtils.logger.debug('No onIdentityTransferComplete handler registered', {
|
|
376
|
+
component: 'useSessionSocket',
|
|
377
|
+
transferId: transferData.transferId
|
|
378
|
+
});
|
|
379
|
+
}
|
|
380
|
+
} else {
|
|
381
|
+
if (__DEV__) {
|
|
382
|
+
console.log('[useSessionSocket] Not matched, ignoring', {
|
|
243
383
|
sourceDeviceId: transferData.sourceDeviceId,
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
completedAt: transferData.completedAt
|
|
384
|
+
currentDeviceId,
|
|
385
|
+
hasActiveSession: activeSessionIdRef.current !== null
|
|
247
386
|
});
|
|
248
387
|
}
|
|
249
|
-
} else if (__DEV__) {
|
|
250
388
|
_loggerUtils.logger.debug('Not the source device, ignoring transfer completion', {
|
|
251
389
|
component: 'useSessionSocket',
|
|
252
390
|
sourceDeviceId: transferData.sourceDeviceId,
|
|
@@ -284,20 +422,53 @@ function useSessionSocket({
|
|
|
284
422
|
}
|
|
285
423
|
}
|
|
286
424
|
};
|
|
287
|
-
socket.on('connect', handleConnect);
|
|
288
|
-
socket.on('session_update', handleSessionUpdate);
|
|
289
|
-
return () => {
|
|
290
|
-
socket.off('connect', handleConnect);
|
|
291
|
-
socket.off('session_update', handleSessionUpdate);
|
|
292
425
|
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
426
|
+
// Register event handlers (only once per socket instance)
|
|
427
|
+
if (!handlersSetupRef.current) {
|
|
428
|
+
socket.on('connect', handleConnect);
|
|
429
|
+
socket.on('disconnect', handleDisconnect);
|
|
430
|
+
socket.on('error', handleError);
|
|
431
|
+
socket.on('session_update', handleSessionUpdate);
|
|
432
|
+
handlersSetupRef.current = true;
|
|
433
|
+
if (__DEV__) {
|
|
434
|
+
console.log('[useSessionSocket] Event handlers set up', {
|
|
435
|
+
socketId: socket.id,
|
|
436
|
+
userId
|
|
297
437
|
});
|
|
298
|
-
|
|
438
|
+
}
|
|
439
|
+
}
|
|
440
|
+
|
|
441
|
+
// Ensure socket is connected before proceeding
|
|
442
|
+
if (!socket.connected) {
|
|
443
|
+
if (__DEV__) {
|
|
444
|
+
console.log('[useSessionSocket] Socket not connected, connecting...', {
|
|
445
|
+
userId
|
|
446
|
+
});
|
|
447
|
+
_loggerUtils.logger.debug('Socket not connected, waiting for connection', {
|
|
448
|
+
component: 'useSessionSocket',
|
|
449
|
+
userId
|
|
450
|
+
});
|
|
451
|
+
}
|
|
452
|
+
socket.connect();
|
|
453
|
+
} else {
|
|
454
|
+
if (__DEV__) {
|
|
455
|
+
console.log('[useSessionSocket] Socket already connected', {
|
|
456
|
+
socketId: socket.id,
|
|
457
|
+
userId,
|
|
458
|
+
connected: socket.connected
|
|
459
|
+
});
|
|
460
|
+
}
|
|
461
|
+
}
|
|
462
|
+
return () => {
|
|
463
|
+
// Only clean up handlers if socket still exists and handlers were set up
|
|
464
|
+
if (socketRef.current && handlersSetupRef.current) {
|
|
465
|
+
socketRef.current.off('connect', handleConnect);
|
|
466
|
+
socketRef.current.off('disconnect', handleDisconnect);
|
|
467
|
+
socketRef.current.off('error', handleError);
|
|
468
|
+
socketRef.current.off('session_update', handleSessionUpdate);
|
|
469
|
+
handlersSetupRef.current = false;
|
|
299
470
|
}
|
|
300
471
|
};
|
|
301
|
-
}, [userId, baseURL]); //
|
|
472
|
+
}, [userId, baseURL, getAccessToken]); // Depend on userId, baseURL, and getAccessToken
|
|
302
473
|
}
|
|
303
474
|
//# sourceMappingURL=useSessionSocket.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_socket","_interopRequireDefault","_sonner","_loggerUtils","e","__esModule","default","useSessionSocket","userId","activeSessionId","currentDeviceId","refreshSessions","logout","clearSessionState","baseURL","onRemoteSignOut","onSessionRemoved","onIdentityTransferComplete","socketRef","useRef","joinedRoomRef","refreshSessionsRef","logoutRef","clearSessionStateRef","onRemoteSignOutRef","onSessionRemovedRef","onIdentityTransferCompleteRef","activeSessionIdRef","currentDeviceIdRef","useEffect","current","emit","roomId","io","transports","socket","__DEV__","console","log","handleConnect","id","handleSessionUpdate","data","currentActiveSessionId","type","sessionId","toast","info","error","logger","Error","String","component","catch","debug","sessionIds","deviceId","includes","transferData","transferId","sourceDeviceId","isSourceDevice","matchedBy","publicKey","transferCode","completedAt","hasActiveSession","on","off"],"sourceRoot":"../../../../src","sources":["ui/hooks/useSessionSocket.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","require","_socket","_interopRequireDefault","_sonner","_loggerUtils","e","__esModule","default","useSessionSocket","userId","activeSessionId","currentDeviceId","refreshSessions","logout","clearSessionState","baseURL","getAccessToken","getTransferCode","onRemoteSignOut","onSessionRemoved","onIdentityTransferComplete","socketRef","useRef","joinedRoomRef","accessTokenRef","handlersSetupRef","refreshSessionsRef","logoutRef","clearSessionStateRef","onRemoteSignOutRef","onSessionRemovedRef","onIdentityTransferCompleteRef","activeSessionIdRef","currentDeviceIdRef","useEffect","current","disconnect","accessToken","tokenChanged","socketOptions","transports","auth","token","__DEV__","console","log","hasToken","tokenLength","length","warn","io","socket","connected","room","handleConnect","currentToken","socketId","id","hasAuth","logger","debug","component","handleDisconnect","reason","handleError","error","handleSessionUpdate","data","type","socketConnected","roomId","currentActiveSessionId","sessionId","toast","info","Error","String","catch","sessionIds","deviceId","includes","transferData","transferId","sourceDeviceId","hasActiveSession","publicKey","substring","deviceIdMatches","hasStoredTransferCode","shouldCallHandler","matchReason","hasHandler","transferCode","completedAt","on","connect","off"],"sourceRoot":"../../../../src","sources":["ui/hooks/useSessionSocket.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -19,38 +19,8 @@ import { TTLCache, registerCacheForCleanup } from '../utils/cache';
|
|
|
19
19
|
import { RequestDeduplicator, RequestQueue, SimpleLogger } from '../utils/requestUtils';
|
|
20
20
|
import { retryAsync } from '../utils/asyncUtils';
|
|
21
21
|
import { handleHttpError } from '../utils/errorUtils';
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
* Token store for authentication (singleton)
|
|
25
|
-
*/
|
|
26
|
-
class TokenStore {
|
|
27
|
-
accessToken = null;
|
|
28
|
-
refreshToken = null;
|
|
29
|
-
constructor() {}
|
|
30
|
-
static getInstance() {
|
|
31
|
-
if (!TokenStore.instance) {
|
|
32
|
-
TokenStore.instance = new TokenStore();
|
|
33
|
-
}
|
|
34
|
-
return TokenStore.instance;
|
|
35
|
-
}
|
|
36
|
-
setTokens(accessToken, refreshToken = '') {
|
|
37
|
-
this.accessToken = accessToken;
|
|
38
|
-
this.refreshToken = refreshToken;
|
|
39
|
-
}
|
|
40
|
-
getAccessToken() {
|
|
41
|
-
return this.accessToken;
|
|
42
|
-
}
|
|
43
|
-
getRefreshToken() {
|
|
44
|
-
return this.refreshToken;
|
|
45
|
-
}
|
|
46
|
-
clearTokens() {
|
|
47
|
-
this.accessToken = null;
|
|
48
|
-
this.refreshToken = null;
|
|
49
|
-
}
|
|
50
|
-
hasAccessToken() {
|
|
51
|
-
return !!this.accessToken;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
22
|
+
// Token management moved to TokenService - import it instead
|
|
23
|
+
import { tokenService } from './services/TokenService';
|
|
54
24
|
|
|
55
25
|
/**
|
|
56
26
|
* Unified HTTP Service
|
|
@@ -71,7 +41,9 @@ export class HttpService {
|
|
|
71
41
|
constructor(config) {
|
|
72
42
|
this.config = config;
|
|
73
43
|
this.baseURL = config.baseURL;
|
|
74
|
-
|
|
44
|
+
|
|
45
|
+
// Initialize TokenService with baseURL
|
|
46
|
+
tokenService.initialize(this.baseURL);
|
|
75
47
|
this.logger = new SimpleLogger(config.enableLogging || false, config.logLevel || 'error', 'HttpService');
|
|
76
48
|
|
|
77
49
|
// Initialize performance infrastructure
|
|
@@ -201,7 +173,7 @@ export class HttpService {
|
|
|
201
173
|
// Handle response
|
|
202
174
|
if (!response.ok) {
|
|
203
175
|
if (response.status === 401) {
|
|
204
|
-
|
|
176
|
+
tokenService.clearTokens();
|
|
205
177
|
}
|
|
206
178
|
|
|
207
179
|
// Try to parse error response (handle empty/malformed JSON)
|
|
@@ -339,46 +311,10 @@ export class HttpService {
|
|
|
339
311
|
|
|
340
312
|
/**
|
|
341
313
|
* Get auth header with automatic token refresh
|
|
314
|
+
* Uses TokenService for all token operations
|
|
342
315
|
*/
|
|
343
316
|
async getAuthHeader() {
|
|
344
|
-
|
|
345
|
-
if (!accessToken) {
|
|
346
|
-
return null;
|
|
347
|
-
}
|
|
348
|
-
try {
|
|
349
|
-
const decoded = jwtDecode(accessToken);
|
|
350
|
-
const currentTime = Math.floor(Date.now() / 1000);
|
|
351
|
-
|
|
352
|
-
// If token expires in less than 60 seconds, refresh it
|
|
353
|
-
if (decoded.exp && decoded.exp - currentTime < 60 && decoded.sessionId) {
|
|
354
|
-
try {
|
|
355
|
-
const refreshUrl = `${this.baseURL}/api/session/token/${decoded.sessionId}`;
|
|
356
|
-
|
|
357
|
-
// Use AbortSignal.timeout for consistent timeout handling
|
|
358
|
-
const response = await fetch(refreshUrl, {
|
|
359
|
-
method: 'GET',
|
|
360
|
-
headers: {
|
|
361
|
-
'Accept': 'application/json'
|
|
362
|
-
},
|
|
363
|
-
signal: AbortSignal.timeout(5000)
|
|
364
|
-
});
|
|
365
|
-
if (response.ok) {
|
|
366
|
-
const {
|
|
367
|
-
accessToken: newToken
|
|
368
|
-
} = await response.json();
|
|
369
|
-
this.tokenStore.setTokens(newToken);
|
|
370
|
-
this.logger.debug('Token refreshed');
|
|
371
|
-
return `Bearer ${newToken}`;
|
|
372
|
-
}
|
|
373
|
-
} catch (refreshError) {
|
|
374
|
-
this.logger.warn('Token refresh failed, using current token');
|
|
375
|
-
}
|
|
376
|
-
}
|
|
377
|
-
return `Bearer ${accessToken}`;
|
|
378
|
-
} catch (error) {
|
|
379
|
-
this.logger.error('Error processing token:', error);
|
|
380
|
-
return `Bearer ${accessToken}`;
|
|
381
|
-
}
|
|
317
|
+
return await tokenService.getAuthHeader();
|
|
382
318
|
}
|
|
383
319
|
|
|
384
320
|
/**
|
|
@@ -513,18 +449,18 @@ export class HttpService {
|
|
|
513
449
|
};
|
|
514
450
|
}
|
|
515
451
|
|
|
516
|
-
// Token management
|
|
452
|
+
// Token management - delegates to TokenService
|
|
517
453
|
setTokens(accessToken, refreshToken = '') {
|
|
518
|
-
|
|
454
|
+
tokenService.setTokens(accessToken, refreshToken);
|
|
519
455
|
}
|
|
520
456
|
clearTokens() {
|
|
521
|
-
|
|
457
|
+
tokenService.clearTokens();
|
|
522
458
|
}
|
|
523
459
|
getAccessToken() {
|
|
524
|
-
return
|
|
460
|
+
return tokenService.getAccessToken();
|
|
525
461
|
}
|
|
526
462
|
hasAccessToken() {
|
|
527
|
-
return
|
|
463
|
+
return tokenService.hasAccessToken();
|
|
528
464
|
}
|
|
529
465
|
getBaseURL() {
|
|
530
466
|
return this.baseURL;
|
|
@@ -556,10 +492,10 @@ export class HttpService {
|
|
|
556
492
|
// Test-only utility
|
|
557
493
|
static __resetTokensForTests() {
|
|
558
494
|
try {
|
|
559
|
-
|
|
495
|
+
tokenService.clearTokens();
|
|
560
496
|
} catch (error) {
|
|
561
497
|
// Silently fail in test cleanup - this is expected behavior
|
|
562
|
-
//
|
|
498
|
+
// TokenService might not be initialized in some test scenarios
|
|
563
499
|
}
|
|
564
500
|
}
|
|
565
501
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["TTLCache","registerCacheForCleanup","RequestDeduplicator","RequestQueue","SimpleLogger","retryAsync","handleHttpError","jwtDecode","TokenStore","accessToken","refreshToken","constructor","getInstance","instance","setTokens","getAccessToken","getRefreshToken","clearTokens","hasAccessToken","HttpService","requestMetrics","totalRequests","successfulRequests","failedRequests","cacheHits","cacheMisses","averageResponseTime","config","baseURL","tokenStore","logger","enableLogging","logLevel","cache","cacheTTL","deduplicator","requestQueue","maxConcurrentRequests","requestQueueSize","isFormData","data","FormData","constructorName","name","append","get","has","request","method","url","params","timeout","requestTimeout","signal","deduplicate","retry","enableRetry","maxRetries","cacheKey","generateCacheKey","cached","debug","requestFn","startTime","Date","now","fullUrl","buildURL","authHeader","getAuthHeader","controller","AbortController","timeoutId","setTimeout","abort","addEventListener","headers","Object","entries","forEach","key","value","toLowerCase","bodyValue","JSON","stringify","undefined","response","fetch","body","clearTimeout","ok","status","errorMessage","statusText","contentType","includes","errorData","json","message","parseError","warn","error","Error","responseData","unwrapResponse","SyntaxError","blob","text","duration","updateMetrics","onRequestEnd","onRequestError","String","requestWithRetry","retryDelay","dedupeKey","finalRequest","result","enqueue","set","keys","length","dataStr","hash","sort","join","substring","base","startsWith","searchParams","URLSearchParams","queryString","toString","decoded","currentTime","Math","floor","exp","sessionId","refreshUrl","AbortSignal","newToken","refreshError","Array","isArray","success","alpha","post","put","patch","delete","getBaseURL","clearCache","clear","clearCacheEntry","getCacheStats","cacheStats","getStats","total","size","hits","misses","hitRate","getMetrics","__resetTokensForTests"],"sourceRoot":"../../../src","sources":["core/HttpService.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["TTLCache","registerCacheForCleanup","RequestDeduplicator","RequestQueue","SimpleLogger","retryAsync","handleHttpError","tokenService","HttpService","requestMetrics","totalRequests","successfulRequests","failedRequests","cacheHits","cacheMisses","averageResponseTime","constructor","config","baseURL","initialize","logger","enableLogging","logLevel","cache","cacheTTL","deduplicator","requestQueue","maxConcurrentRequests","requestQueueSize","isFormData","data","FormData","constructorName","name","append","get","has","request","method","url","params","timeout","requestTimeout","signal","deduplicate","retry","enableRetry","maxRetries","cacheKey","generateCacheKey","cached","debug","requestFn","startTime","Date","now","fullUrl","buildURL","authHeader","getAuthHeader","controller","AbortController","timeoutId","setTimeout","abort","addEventListener","headers","Object","entries","forEach","key","value","toLowerCase","bodyValue","JSON","stringify","undefined","response","fetch","body","clearTimeout","ok","status","clearTokens","errorMessage","statusText","contentType","includes","errorData","json","message","parseError","warn","error","Error","responseData","unwrapResponse","SyntaxError","blob","text","duration","updateMetrics","onRequestEnd","onRequestError","String","requestWithRetry","retryDelay","dedupeKey","finalRequest","result","enqueue","set","keys","length","dataStr","hash","sort","join","substring","base","startsWith","searchParams","URLSearchParams","queryString","toString","Array","isArray","success","alpha","post","put","patch","delete","setTokens","accessToken","refreshToken","getAccessToken","hasAccessToken","getBaseURL","clearCache","clear","clearCacheEntry","getCacheStats","cacheStats","getStats","total","size","hits","misses","hitRate","getMetrics","__resetTokensForTests"],"sourceRoot":"../../../src","sources":["core/HttpService.ts"],"mappings":"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","ignoreList":[]}
|