@oxyhq/core 1.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.md +50 -0
- package/dist/cjs/AuthManager.js +361 -0
- package/dist/cjs/CrossDomainAuth.js +258 -0
- package/dist/cjs/HttpService.js +618 -0
- package/dist/cjs/OxyServices.base.js +263 -0
- package/dist/cjs/OxyServices.errors.js +22 -0
- package/dist/cjs/OxyServices.js +63 -0
- package/dist/cjs/constants/version.js +16 -0
- package/dist/cjs/crypto/index.js +20 -0
- package/dist/cjs/crypto/keyManager.js +887 -0
- package/dist/cjs/crypto/polyfill.js +64 -0
- package/dist/cjs/crypto/recoveryPhrase.js +169 -0
- package/dist/cjs/crypto/signatureService.js +296 -0
- package/dist/cjs/i18n/index.js +73 -0
- package/dist/cjs/i18n/locales/ar-SA.json +120 -0
- package/dist/cjs/i18n/locales/ca-ES.json +120 -0
- package/dist/cjs/i18n/locales/de-DE.json +120 -0
- package/dist/cjs/i18n/locales/en-US.json +956 -0
- package/dist/cjs/i18n/locales/es-ES.json +944 -0
- package/dist/cjs/i18n/locales/fr-FR.json +120 -0
- package/dist/cjs/i18n/locales/it-IT.json +120 -0
- package/dist/cjs/i18n/locales/ja-JP.json +119 -0
- package/dist/cjs/i18n/locales/ko-KR.json +120 -0
- package/dist/cjs/i18n/locales/locales/ar-SA.json +120 -0
- package/dist/cjs/i18n/locales/locales/ca-ES.json +120 -0
- package/dist/cjs/i18n/locales/locales/de-DE.json +120 -0
- package/dist/cjs/i18n/locales/locales/en-US.json +956 -0
- package/dist/cjs/i18n/locales/locales/es-ES.json +944 -0
- package/dist/cjs/i18n/locales/locales/fr-FR.json +120 -0
- package/dist/cjs/i18n/locales/locales/it-IT.json +120 -0
- package/dist/cjs/i18n/locales/locales/ja-JP.json +119 -0
- package/dist/cjs/i18n/locales/locales/ko-KR.json +120 -0
- package/dist/cjs/i18n/locales/locales/pt-PT.json +120 -0
- package/dist/cjs/i18n/locales/locales/zh-CN.json +120 -0
- package/dist/cjs/i18n/locales/pt-PT.json +120 -0
- package/dist/cjs/i18n/locales/zh-CN.json +120 -0
- package/dist/cjs/index.js +153 -0
- package/dist/cjs/mixins/OxyServices.analytics.js +49 -0
- package/dist/cjs/mixins/OxyServices.assets.js +380 -0
- package/dist/cjs/mixins/OxyServices.auth.js +259 -0
- package/dist/cjs/mixins/OxyServices.developer.js +97 -0
- package/dist/cjs/mixins/OxyServices.devices.js +116 -0
- package/dist/cjs/mixins/OxyServices.features.js +309 -0
- package/dist/cjs/mixins/OxyServices.fedcm.js +435 -0
- package/dist/cjs/mixins/OxyServices.karma.js +108 -0
- package/dist/cjs/mixins/OxyServices.language.js +154 -0
- package/dist/cjs/mixins/OxyServices.location.js +43 -0
- package/dist/cjs/mixins/OxyServices.payment.js +158 -0
- package/dist/cjs/mixins/OxyServices.popup.js +371 -0
- package/dist/cjs/mixins/OxyServices.privacy.js +162 -0
- package/dist/cjs/mixins/OxyServices.redirect.js +345 -0
- package/dist/cjs/mixins/OxyServices.security.js +81 -0
- package/dist/cjs/mixins/OxyServices.user.js +355 -0
- package/dist/cjs/mixins/OxyServices.utility.js +156 -0
- package/dist/cjs/mixins/index.js +79 -0
- package/dist/cjs/mixins/mixinHelpers.js +53 -0
- package/dist/cjs/models/interfaces.js +20 -0
- package/dist/cjs/models/session.js +2 -0
- package/dist/cjs/shared/index.js +70 -0
- package/dist/cjs/shared/utils/colorUtils.js +153 -0
- package/dist/cjs/shared/utils/debugUtils.js +73 -0
- package/dist/cjs/shared/utils/errorUtils.js +183 -0
- package/dist/cjs/shared/utils/index.js +49 -0
- package/dist/cjs/shared/utils/networkUtils.js +183 -0
- package/dist/cjs/shared/utils/themeUtils.js +106 -0
- package/dist/cjs/utils/apiUtils.js +61 -0
- package/dist/cjs/utils/asyncUtils.js +194 -0
- package/dist/cjs/utils/cache.js +226 -0
- package/dist/cjs/utils/deviceManager.js +205 -0
- package/dist/cjs/utils/errorUtils.js +154 -0
- package/dist/cjs/utils/index.js +26 -0
- package/dist/cjs/utils/languageUtils.js +165 -0
- package/dist/cjs/utils/loggerUtils.js +126 -0
- package/dist/cjs/utils/platform.js +144 -0
- package/dist/cjs/utils/requestUtils.js +209 -0
- package/dist/cjs/utils/sessionUtils.js +181 -0
- package/dist/cjs/utils/validationUtils.js +173 -0
- package/dist/esm/AuthManager.js +356 -0
- package/dist/esm/CrossDomainAuth.js +253 -0
- package/dist/esm/HttpService.js +614 -0
- package/dist/esm/OxyServices.base.js +259 -0
- package/dist/esm/OxyServices.errors.js +17 -0
- package/dist/esm/OxyServices.js +59 -0
- package/dist/esm/constants/version.js +13 -0
- package/dist/esm/crypto/index.js +13 -0
- package/dist/esm/crypto/keyManager.js +850 -0
- package/dist/esm/crypto/polyfill.js +61 -0
- package/dist/esm/crypto/recoveryPhrase.js +132 -0
- package/dist/esm/crypto/signatureService.js +259 -0
- package/dist/esm/i18n/index.js +69 -0
- package/dist/esm/i18n/locales/ar-SA.json +120 -0
- package/dist/esm/i18n/locales/ca-ES.json +120 -0
- package/dist/esm/i18n/locales/de-DE.json +120 -0
- package/dist/esm/i18n/locales/en-US.json +956 -0
- package/dist/esm/i18n/locales/es-ES.json +944 -0
- package/dist/esm/i18n/locales/fr-FR.json +120 -0
- package/dist/esm/i18n/locales/it-IT.json +120 -0
- package/dist/esm/i18n/locales/ja-JP.json +119 -0
- package/dist/esm/i18n/locales/ko-KR.json +120 -0
- package/dist/esm/i18n/locales/locales/ar-SA.json +120 -0
- package/dist/esm/i18n/locales/locales/ca-ES.json +120 -0
- package/dist/esm/i18n/locales/locales/de-DE.json +120 -0
- package/dist/esm/i18n/locales/locales/en-US.json +956 -0
- package/dist/esm/i18n/locales/locales/es-ES.json +944 -0
- package/dist/esm/i18n/locales/locales/fr-FR.json +120 -0
- package/dist/esm/i18n/locales/locales/it-IT.json +120 -0
- package/dist/esm/i18n/locales/locales/ja-JP.json +119 -0
- package/dist/esm/i18n/locales/locales/ko-KR.json +120 -0
- package/dist/esm/i18n/locales/locales/pt-PT.json +120 -0
- package/dist/esm/i18n/locales/locales/zh-CN.json +120 -0
- package/dist/esm/i18n/locales/pt-PT.json +120 -0
- package/dist/esm/i18n/locales/zh-CN.json +120 -0
- package/dist/esm/index.js +55 -0
- package/dist/esm/mixins/OxyServices.analytics.js +46 -0
- package/dist/esm/mixins/OxyServices.assets.js +377 -0
- package/dist/esm/mixins/OxyServices.auth.js +256 -0
- package/dist/esm/mixins/OxyServices.developer.js +94 -0
- package/dist/esm/mixins/OxyServices.devices.js +113 -0
- package/dist/esm/mixins/OxyServices.features.js +306 -0
- package/dist/esm/mixins/OxyServices.fedcm.js +433 -0
- package/dist/esm/mixins/OxyServices.karma.js +105 -0
- package/dist/esm/mixins/OxyServices.language.js +118 -0
- package/dist/esm/mixins/OxyServices.location.js +40 -0
- package/dist/esm/mixins/OxyServices.payment.js +155 -0
- package/dist/esm/mixins/OxyServices.popup.js +369 -0
- package/dist/esm/mixins/OxyServices.privacy.js +159 -0
- package/dist/esm/mixins/OxyServices.redirect.js +343 -0
- package/dist/esm/mixins/OxyServices.security.js +78 -0
- package/dist/esm/mixins/OxyServices.user.js +352 -0
- package/dist/esm/mixins/OxyServices.utility.js +153 -0
- package/dist/esm/mixins/index.js +76 -0
- package/dist/esm/mixins/mixinHelpers.js +48 -0
- package/dist/esm/models/interfaces.js +17 -0
- package/dist/esm/models/session.js +1 -0
- package/dist/esm/shared/index.js +31 -0
- package/dist/esm/shared/utils/colorUtils.js +143 -0
- package/dist/esm/shared/utils/debugUtils.js +65 -0
- package/dist/esm/shared/utils/errorUtils.js +170 -0
- package/dist/esm/shared/utils/index.js +15 -0
- package/dist/esm/shared/utils/networkUtils.js +173 -0
- package/dist/esm/shared/utils/themeUtils.js +98 -0
- package/dist/esm/utils/apiUtils.js +55 -0
- package/dist/esm/utils/asyncUtils.js +179 -0
- package/dist/esm/utils/cache.js +218 -0
- package/dist/esm/utils/deviceManager.js +168 -0
- package/dist/esm/utils/errorUtils.js +146 -0
- package/dist/esm/utils/index.js +7 -0
- package/dist/esm/utils/languageUtils.js +158 -0
- package/dist/esm/utils/loggerUtils.js +115 -0
- package/dist/esm/utils/platform.js +102 -0
- package/dist/esm/utils/requestUtils.js +203 -0
- package/dist/esm/utils/sessionUtils.js +171 -0
- package/dist/esm/utils/validationUtils.js +153 -0
- package/dist/types/AuthManager.d.ts +143 -0
- package/dist/types/CrossDomainAuth.d.ts +160 -0
- package/dist/types/HttpService.d.ts +163 -0
- package/dist/types/OxyServices.base.d.ts +126 -0
- package/dist/types/OxyServices.d.ts +81 -0
- package/dist/types/OxyServices.errors.d.ts +11 -0
- package/dist/types/constants/version.d.ts +13 -0
- package/dist/types/crypto/index.d.ts +11 -0
- package/dist/types/crypto/keyManager.d.ts +189 -0
- package/dist/types/crypto/polyfill.d.ts +11 -0
- package/dist/types/crypto/recoveryPhrase.d.ts +58 -0
- package/dist/types/crypto/signatureService.d.ts +86 -0
- package/dist/types/i18n/index.d.ts +3 -0
- package/dist/types/index.d.ts +50 -0
- package/dist/types/mixins/OxyServices.analytics.d.ts +66 -0
- package/dist/types/mixins/OxyServices.assets.d.ts +135 -0
- package/dist/types/mixins/OxyServices.auth.d.ts +186 -0
- package/dist/types/mixins/OxyServices.developer.d.ts +99 -0
- package/dist/types/mixins/OxyServices.devices.d.ts +96 -0
- package/dist/types/mixins/OxyServices.features.d.ts +228 -0
- package/dist/types/mixins/OxyServices.fedcm.d.ts +200 -0
- package/dist/types/mixins/OxyServices.karma.d.ts +85 -0
- package/dist/types/mixins/OxyServices.language.d.ts +81 -0
- package/dist/types/mixins/OxyServices.location.d.ts +64 -0
- package/dist/types/mixins/OxyServices.payment.d.ts +111 -0
- package/dist/types/mixins/OxyServices.popup.d.ts +205 -0
- package/dist/types/mixins/OxyServices.privacy.d.ts +122 -0
- package/dist/types/mixins/OxyServices.redirect.d.ts +245 -0
- package/dist/types/mixins/OxyServices.security.d.ts +78 -0
- package/dist/types/mixins/OxyServices.user.d.ts +182 -0
- package/dist/types/mixins/OxyServices.utility.d.ts +93 -0
- package/dist/types/mixins/index.d.ts +30 -0
- package/dist/types/mixins/mixinHelpers.d.ts +31 -0
- package/dist/types/models/interfaces.d.ts +415 -0
- package/dist/types/models/session.d.ts +27 -0
- package/dist/types/shared/index.d.ts +28 -0
- package/dist/types/shared/utils/colorUtils.d.ts +104 -0
- package/dist/types/shared/utils/debugUtils.d.ts +48 -0
- package/dist/types/shared/utils/errorUtils.d.ts +97 -0
- package/dist/types/shared/utils/index.d.ts +13 -0
- package/dist/types/shared/utils/networkUtils.d.ts +139 -0
- package/dist/types/shared/utils/themeUtils.d.ts +90 -0
- package/dist/types/utils/apiUtils.d.ts +53 -0
- package/dist/types/utils/asyncUtils.d.ts +58 -0
- package/dist/types/utils/cache.d.ts +127 -0
- package/dist/types/utils/deviceManager.d.ts +65 -0
- package/dist/types/utils/errorUtils.d.ts +46 -0
- package/dist/types/utils/index.d.ts +6 -0
- package/dist/types/utils/languageUtils.d.ts +37 -0
- package/dist/types/utils/loggerUtils.d.ts +48 -0
- package/dist/types/utils/platform.d.ts +40 -0
- package/dist/types/utils/requestUtils.d.ts +123 -0
- package/dist/types/utils/sessionUtils.d.ts +54 -0
- package/dist/types/utils/validationUtils.d.ts +85 -0
- package/package.json +84 -0
- package/src/AuthManager.ts +436 -0
- package/src/CrossDomainAuth.ts +307 -0
- package/src/HttpService.ts +752 -0
- package/src/OxyServices.base.ts +334 -0
- package/src/OxyServices.errors.ts +26 -0
- package/src/OxyServices.ts +129 -0
- package/src/constants/version.ts +15 -0
- package/src/crypto/index.ts +25 -0
- package/src/crypto/keyManager.ts +962 -0
- package/src/crypto/polyfill.ts +70 -0
- package/src/crypto/recoveryPhrase.ts +166 -0
- package/src/crypto/signatureService.ts +323 -0
- package/src/i18n/index.ts +75 -0
- package/src/i18n/locales/ar-SA.json +120 -0
- package/src/i18n/locales/ca-ES.json +120 -0
- package/src/i18n/locales/de-DE.json +120 -0
- package/src/i18n/locales/en-US.json +956 -0
- package/src/i18n/locales/es-ES.json +944 -0
- package/src/i18n/locales/fr-FR.json +120 -0
- package/src/i18n/locales/it-IT.json +120 -0
- package/src/i18n/locales/ja-JP.json +119 -0
- package/src/i18n/locales/ko-KR.json +120 -0
- package/src/i18n/locales/pt-PT.json +120 -0
- package/src/i18n/locales/zh-CN.json +120 -0
- package/src/index.ts +153 -0
- package/src/mixins/OxyServices.analytics.ts +53 -0
- package/src/mixins/OxyServices.assets.ts +412 -0
- package/src/mixins/OxyServices.auth.ts +358 -0
- package/src/mixins/OxyServices.developer.ts +114 -0
- package/src/mixins/OxyServices.devices.ts +119 -0
- package/src/mixins/OxyServices.features.ts +428 -0
- package/src/mixins/OxyServices.fedcm.ts +494 -0
- package/src/mixins/OxyServices.karma.ts +111 -0
- package/src/mixins/OxyServices.language.ts +127 -0
- package/src/mixins/OxyServices.location.ts +46 -0
- package/src/mixins/OxyServices.payment.ts +163 -0
- package/src/mixins/OxyServices.popup.ts +443 -0
- package/src/mixins/OxyServices.privacy.ts +182 -0
- package/src/mixins/OxyServices.redirect.ts +397 -0
- package/src/mixins/OxyServices.security.ts +103 -0
- package/src/mixins/OxyServices.user.ts +392 -0
- package/src/mixins/OxyServices.utility.ts +191 -0
- package/src/mixins/index.ts +91 -0
- package/src/mixins/mixinHelpers.ts +69 -0
- package/src/models/interfaces.ts +511 -0
- package/src/models/session.ts +30 -0
- package/src/shared/index.ts +82 -0
- package/src/shared/utils/colorUtils.ts +155 -0
- package/src/shared/utils/debugUtils.ts +73 -0
- package/src/shared/utils/errorUtils.ts +181 -0
- package/src/shared/utils/index.ts +59 -0
- package/src/shared/utils/networkUtils.ts +248 -0
- package/src/shared/utils/themeUtils.ts +115 -0
- package/src/types/bip39.d.ts +32 -0
- package/src/types/buffer.d.ts +97 -0
- package/src/types/color.d.ts +20 -0
- package/src/types/elliptic.d.ts +62 -0
- package/src/utils/apiUtils.ts +88 -0
- package/src/utils/asyncUtils.ts +252 -0
- package/src/utils/cache.ts +264 -0
- package/src/utils/deviceManager.ts +198 -0
- package/src/utils/errorUtils.ts +216 -0
- package/src/utils/index.ts +21 -0
- package/src/utils/languageUtils.ts +174 -0
- package/src/utils/loggerUtils.ts +153 -0
- package/src/utils/platform.ts +117 -0
- package/src/utils/requestUtils.ts +237 -0
- package/src/utils/sessionUtils.ts +206 -0
- package/src/utils/validationUtils.ts +174 -0
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Session management utilities
|
|
3
|
+
*
|
|
4
|
+
* Provides consistent session normalization, deduplication, and sorting
|
|
5
|
+
* to ensure sessions are always displayed in a predictable order.
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
import type { ClientSession } from '../models/session';
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* Normalize a session to ensure all required fields are present
|
|
12
|
+
*/
|
|
13
|
+
export function normalizeSession(session: Partial<ClientSession> & { sessionId: string }): ClientSession {
|
|
14
|
+
const now = new Date().toISOString();
|
|
15
|
+
return {
|
|
16
|
+
sessionId: session.sessionId,
|
|
17
|
+
deviceId: session.deviceId || '',
|
|
18
|
+
expiresAt: session.expiresAt || now,
|
|
19
|
+
lastActive: session.lastActive || now,
|
|
20
|
+
userId: session.userId || '',
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Compare two sessions for equality
|
|
26
|
+
*/
|
|
27
|
+
export function sessionsEqual(a: ClientSession, b: ClientSession): boolean {
|
|
28
|
+
return a.sessionId === b.sessionId;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* Sort sessions by lastActive (most recent first), then by sessionId for stability
|
|
33
|
+
*/
|
|
34
|
+
export function sortSessions(sessions: ClientSession[]): ClientSession[] {
|
|
35
|
+
return [...sessions].sort((a, b) => {
|
|
36
|
+
// Sort by lastActive descending (most recent first)
|
|
37
|
+
const timeA = new Date(a.lastActive).getTime();
|
|
38
|
+
const timeB = new Date(b.lastActive).getTime();
|
|
39
|
+
if (timeA !== timeB) {
|
|
40
|
+
return timeB - timeA; // Descending order
|
|
41
|
+
}
|
|
42
|
+
// If lastActive is the same, sort by sessionId for stability
|
|
43
|
+
return a.sessionId.localeCompare(b.sessionId);
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* Deduplicate sessions by sessionId, keeping the most recent version
|
|
49
|
+
*/
|
|
50
|
+
export function deduplicateSessions(sessions: ClientSession[]): ClientSession[] {
|
|
51
|
+
const sessionMap = new Map<string, ClientSession>();
|
|
52
|
+
|
|
53
|
+
for (const session of sessions) {
|
|
54
|
+
const existing = sessionMap.get(session.sessionId);
|
|
55
|
+
if (!existing) {
|
|
56
|
+
sessionMap.set(session.sessionId, session);
|
|
57
|
+
} else {
|
|
58
|
+
// Keep the one with more recent lastActive
|
|
59
|
+
const existingTime = new Date(existing.lastActive).getTime();
|
|
60
|
+
const currentTime = new Date(session.lastActive).getTime();
|
|
61
|
+
if (currentTime > existingTime) {
|
|
62
|
+
sessionMap.set(session.sessionId, session);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
return Array.from(sessionMap.values());
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/**
|
|
71
|
+
* Deduplicate sessions by userId, keeping only one session per user
|
|
72
|
+
* Priority: 1) Active session (if provided), 2) Most recent session
|
|
73
|
+
* This prevents showing duplicate accounts for the same user
|
|
74
|
+
*/
|
|
75
|
+
export function deduplicateSessionsByUserId(
|
|
76
|
+
sessions: ClientSession[],
|
|
77
|
+
activeSessionId?: string | null
|
|
78
|
+
): ClientSession[] {
|
|
79
|
+
if (!sessions.length) return [];
|
|
80
|
+
|
|
81
|
+
const userSessionMap = new Map<string, ClientSession>();
|
|
82
|
+
|
|
83
|
+
for (const session of sessions) {
|
|
84
|
+
if (!session.userId) continue; // Skip sessions without userId
|
|
85
|
+
|
|
86
|
+
const existing = userSessionMap.get(session.userId);
|
|
87
|
+
if (!existing) {
|
|
88
|
+
userSessionMap.set(session.userId, session);
|
|
89
|
+
} else {
|
|
90
|
+
// Prioritize active session
|
|
91
|
+
const isCurrentActive = activeSessionId && session.sessionId === activeSessionId;
|
|
92
|
+
const isExistingActive = activeSessionId && existing.sessionId === activeSessionId;
|
|
93
|
+
|
|
94
|
+
if (isCurrentActive && !isExistingActive) {
|
|
95
|
+
userSessionMap.set(session.userId, session);
|
|
96
|
+
} else if (!isCurrentActive && isExistingActive) {
|
|
97
|
+
// Keep existing (active) session
|
|
98
|
+
continue;
|
|
99
|
+
} else {
|
|
100
|
+
// Neither is active, keep the one with more recent lastActive
|
|
101
|
+
const existingTime = new Date(existing.lastActive).getTime();
|
|
102
|
+
const currentTime = new Date(session.lastActive).getTime();
|
|
103
|
+
if (currentTime > existingTime) {
|
|
104
|
+
userSessionMap.set(session.userId, session);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
return Array.from(userSessionMap.values());
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
/**
|
|
114
|
+
* Normalize, deduplicate, and sort sessions
|
|
115
|
+
* This ensures consistent session ordering across the application
|
|
116
|
+
*
|
|
117
|
+
* @param sessions - Array of sessions to normalize
|
|
118
|
+
* @param activeSessionId - Optional active session ID to prioritize
|
|
119
|
+
* @param deduplicateByUserId - If true, deduplicate by userId (one account per user). Default: true
|
|
120
|
+
*/
|
|
121
|
+
export function normalizeAndSortSessions(
|
|
122
|
+
sessions: ClientSession[],
|
|
123
|
+
activeSessionId?: string | null,
|
|
124
|
+
deduplicateByUserId: boolean = true
|
|
125
|
+
): ClientSession[] {
|
|
126
|
+
if (!sessions.length) return [];
|
|
127
|
+
|
|
128
|
+
// Normalize all sessions
|
|
129
|
+
const normalized = sessions.map(normalizeSession);
|
|
130
|
+
|
|
131
|
+
// First deduplicate by sessionId (exact duplicates)
|
|
132
|
+
const deduplicatedBySessionId = deduplicateSessions(normalized);
|
|
133
|
+
|
|
134
|
+
// Then deduplicate by userId if requested (one account per user)
|
|
135
|
+
const finalSessions = deduplicateByUserId
|
|
136
|
+
? deduplicateSessionsByUserId(deduplicatedBySessionId, activeSessionId)
|
|
137
|
+
: deduplicatedBySessionId;
|
|
138
|
+
|
|
139
|
+
// Sort consistently
|
|
140
|
+
return sortSessions(finalSessions);
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
/**
|
|
144
|
+
* Merge two session arrays, prioritizing newer data
|
|
145
|
+
* Returns normalized, deduplicated, and sorted sessions
|
|
146
|
+
*
|
|
147
|
+
* @param existing - Existing sessions array
|
|
148
|
+
* @param incoming - New sessions to merge in
|
|
149
|
+
* @param activeSessionId - Optional active session ID to prioritize
|
|
150
|
+
* @param deduplicateByUserId - If true, deduplicate by userId (one account per user). Default: true
|
|
151
|
+
*/
|
|
152
|
+
export function mergeSessions(
|
|
153
|
+
existing: ClientSession[],
|
|
154
|
+
incoming: ClientSession[],
|
|
155
|
+
activeSessionId?: string | null,
|
|
156
|
+
deduplicateByUserId: boolean = true
|
|
157
|
+
): ClientSession[] {
|
|
158
|
+
if (!existing.length && !incoming.length) return [];
|
|
159
|
+
if (!existing.length) return normalizeAndSortSessions(incoming, activeSessionId, deduplicateByUserId);
|
|
160
|
+
if (!incoming.length) return normalizeAndSortSessions(existing, activeSessionId, deduplicateByUserId);
|
|
161
|
+
|
|
162
|
+
// Normalize both arrays
|
|
163
|
+
const normalizedExisting = existing.map(normalizeSession);
|
|
164
|
+
const normalizedIncoming = incoming.map(normalizeSession);
|
|
165
|
+
|
|
166
|
+
// Create a map with existing sessions (by sessionId)
|
|
167
|
+
const sessionMap = new Map<string, ClientSession>();
|
|
168
|
+
|
|
169
|
+
// Add existing sessions first
|
|
170
|
+
for (const session of normalizedExisting) {
|
|
171
|
+
sessionMap.set(session.sessionId, session);
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
// Merge incoming sessions - backend data always replaces existing
|
|
175
|
+
for (const session of normalizedIncoming) {
|
|
176
|
+
sessionMap.set(session.sessionId, session);
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
// Convert to array
|
|
180
|
+
const merged = Array.from(sessionMap.values());
|
|
181
|
+
|
|
182
|
+
// Apply userId deduplication if requested
|
|
183
|
+
const finalSessions = deduplicateByUserId
|
|
184
|
+
? deduplicateSessionsByUserId(merged, activeSessionId)
|
|
185
|
+
: merged;
|
|
186
|
+
|
|
187
|
+
// Sort consistently
|
|
188
|
+
return sortSessions(finalSessions);
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
/**
|
|
192
|
+
* Check if two session arrays are equal (same sessionIds in same order)
|
|
193
|
+
*/
|
|
194
|
+
export function sessionsArraysEqual(a: ClientSession[], b: ClientSession[]): boolean {
|
|
195
|
+
if (a.length !== b.length) {
|
|
196
|
+
return false;
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
const sortedA = sortSessions(a);
|
|
200
|
+
const sortedB = sortSessions(b);
|
|
201
|
+
|
|
202
|
+
return sortedA.every((session, index) =>
|
|
203
|
+
sessionsEqual(session, sortedB[index])
|
|
204
|
+
);
|
|
205
|
+
}
|
|
206
|
+
|
|
@@ -0,0 +1,174 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Validation utilities for common data validation patterns
|
|
3
|
+
*/
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Email validation regex
|
|
7
|
+
*/
|
|
8
|
+
export const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* Username validation regex (alphanumeric, underscores, and hyphens, 3-30 chars)
|
|
12
|
+
*/
|
|
13
|
+
export const USERNAME_REGEX = /^[a-zA-Z0-9_-]{3,30}$/;
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Password validation regex (at least 8 chars, 1 uppercase, 1 lowercase, 1 number)
|
|
17
|
+
*/
|
|
18
|
+
// At least 8 characters (tests expect len>=8 without complexity requirements)
|
|
19
|
+
export const PASSWORD_REGEX = /^.{8,}$/;
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* Validate email format
|
|
23
|
+
*/
|
|
24
|
+
export function isValidEmail(email: string): boolean {
|
|
25
|
+
return EMAIL_REGEX.test(email);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* Validate username format
|
|
30
|
+
*/
|
|
31
|
+
export function isValidUsername(username: string): boolean {
|
|
32
|
+
return USERNAME_REGEX.test(username);
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* Validate password strength
|
|
37
|
+
*/
|
|
38
|
+
export function isValidPassword(password: string): boolean {
|
|
39
|
+
return PASSWORD_REGEX.test(password);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Validate required string
|
|
44
|
+
*/
|
|
45
|
+
export function isRequiredString(value: unknown): boolean {
|
|
46
|
+
return typeof value === 'string' && value.trim().length > 0;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* Validate required number
|
|
51
|
+
*/
|
|
52
|
+
export function isRequiredNumber(value: unknown): boolean {
|
|
53
|
+
return typeof value === 'number' && !Number.isNaN(value);
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* Validate required boolean
|
|
58
|
+
*/
|
|
59
|
+
export function isRequiredBoolean(value: unknown): boolean {
|
|
60
|
+
return typeof value === 'boolean';
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/**
|
|
64
|
+
* Validate array
|
|
65
|
+
*/
|
|
66
|
+
export function isValidArray(value: unknown): boolean {
|
|
67
|
+
return Array.isArray(value);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/**
|
|
71
|
+
* Validate object
|
|
72
|
+
*/
|
|
73
|
+
export function isValidObject(value: unknown): boolean {
|
|
74
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/**
|
|
78
|
+
* Validate UUID format
|
|
79
|
+
*/
|
|
80
|
+
export function isValidUUID(uuid: string): boolean {
|
|
81
|
+
const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
|
|
82
|
+
return UUID_REGEX.test(uuid);
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* Validate URL format
|
|
87
|
+
*/
|
|
88
|
+
export function isValidURL(url: string): boolean {
|
|
89
|
+
try {
|
|
90
|
+
new URL(url);
|
|
91
|
+
return true;
|
|
92
|
+
} catch {
|
|
93
|
+
return false;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/**
|
|
98
|
+
* Validate date string
|
|
99
|
+
*/
|
|
100
|
+
export function isValidDate(dateString: string): boolean {
|
|
101
|
+
const date = new Date(dateString);
|
|
102
|
+
return !Number.isNaN(date.getTime());
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
/**
|
|
106
|
+
* Validate file size (in bytes)
|
|
107
|
+
*/
|
|
108
|
+
export function isValidFileSize(size: number, maxSize: number): boolean {
|
|
109
|
+
return size > 0 && size <= maxSize;
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
/**
|
|
113
|
+
* Validate file type
|
|
114
|
+
*/
|
|
115
|
+
export function isValidFileType(filename: string, allowedTypes: string[]): boolean {
|
|
116
|
+
const extension = filename.split('.').pop()?.toLowerCase();
|
|
117
|
+
return extension ? allowedTypes.includes(extension) : false;
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/**
|
|
121
|
+
* Sanitize string input
|
|
122
|
+
*/
|
|
123
|
+
export function sanitizeString(input: string): string {
|
|
124
|
+
// Remove HTML tags entirely and trim whitespace
|
|
125
|
+
return input.trim().replace(/<[^>]*>/g, '');
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
/**
|
|
129
|
+
* Sanitize HTML input
|
|
130
|
+
*/
|
|
131
|
+
export function sanitizeHTML(input: string): string {
|
|
132
|
+
return input
|
|
133
|
+
.replace(/&/g, '&')
|
|
134
|
+
.replace(/</g, '<')
|
|
135
|
+
.replace(/>/g, '>')
|
|
136
|
+
.replace(/"/g, '"')
|
|
137
|
+
.replace(/'/g, ''');
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
/**
|
|
141
|
+
* Validate MongoDB ObjectId format
|
|
142
|
+
* Note: This is a basic format check. For full validation, use mongoose.Types.ObjectId.isValid()
|
|
143
|
+
* This function works in environments where mongoose may not be available (e.g., client-side)
|
|
144
|
+
*/
|
|
145
|
+
export function isValidObjectId(id: string): boolean {
|
|
146
|
+
if (typeof id !== 'string') {
|
|
147
|
+
return false;
|
|
148
|
+
}
|
|
149
|
+
// MongoDB ObjectId is 24 hex characters
|
|
150
|
+
const OBJECT_ID_REGEX = /^[0-9a-fA-F]{24}$/;
|
|
151
|
+
return OBJECT_ID_REGEX.test(id);
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
/**
|
|
155
|
+
* Validate and sanitize user input
|
|
156
|
+
*/
|
|
157
|
+
export function validateAndSanitizeUserInput(input: unknown, type: 'string' | 'email' | 'username'): string | null {
|
|
158
|
+
if (typeof input !== 'string') {
|
|
159
|
+
return null;
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
const sanitized = sanitizeString(input);
|
|
163
|
+
|
|
164
|
+
switch (type) {
|
|
165
|
+
case 'email':
|
|
166
|
+
return isValidEmail(sanitized) ? sanitized : null;
|
|
167
|
+
case 'username':
|
|
168
|
+
return isValidUsername(sanitized) ? sanitized : null;
|
|
169
|
+
case 'string':
|
|
170
|
+
return isRequiredString(sanitized) ? sanitized : null;
|
|
171
|
+
default:
|
|
172
|
+
return null;
|
|
173
|
+
}
|
|
174
|
+
}
|