cynx-lib 1.3.85 → 1.3.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cynx-lib",
-  "version": "1.3.85",
+  "version": "1.3.87",
   "type": "module",
   "main": "./index.cjs",
   "module": "./index.js",
@@ -38,8 +38,8 @@
       "require": "./utils/utils/storage_manager.cjs"
     },
     "./session": {
-      "import": "./utils/utils/session_manager.js",
-      "require": "./utils/utils/session_manager.cjs"
+      "import": "./utils/utils/session.js",
+      "require": "./utils/utils/session.cjs"
     },
     "./gen": "./gen.js"
   },

package/utils/utils/session.cjs

@@ -24,8 +24,10 @@ __export(session_exports, {
   extractToken: () => import_session_manager.extractToken,
   formatToken: () => import_session_manager.formatToken,
   genSessionToken: () => genSessionToken,
+  getDeviceLabel: () => getDeviceLabel,
   getSessionId: () => import_session_manager.getSessionId,
-  parseToken: () => import_session_manager.parseToken
+  parseToken: () => import_session_manager.parseToken,
+  parseUserAgent: () => parseUserAgent
 });
 module.exports = __toCommonJS(session_exports);
 var import_uid = require("./uid.cjs");
@@ -38,6 +40,71 @@ function genSessionToken(byteLength = 32) {
   }
   return `st_${hex}`;
 }
+function getDeviceLabel(ua) {
+  if (!ua) return "PC";
+  if (/windows phone/i.test(ua)) return "Windows Phone";
+  if (/windows nt 10\.0/i.test(ua)) return "Windows 10/11 PC";
+  if (/windows nt 6\.3/i.test(ua)) return "Windows 8.1 PC";
+  if (/windows nt 6\.1/i.test(ua)) return "Windows 7 PC";
+  if (/win64|win32|windows/i.test(ua)) return "Windows PC";
+  if (/ipad/i.test(ua)) return "iPad";
+  if (/iphone/i.test(ua)) return "iPhone";
+  if (/macintosh|mac os x/i.test(ua)) return "MacBook / Mac";
+  if (/android/i.test(ua)) return /mobile/i.test(ua) ? "Android Phone" : "Android Tablet";
+  if (/cros/i.test(ua)) return "Chromebook";
+  if (/linux/i.test(ua)) return "Linux PC";
+  return "Desktop PC";
+}
+function parseUserAgent(ua) {
+  if (!ua) return { browser: "Unknown", os: "Unknown", deviceType: "desktop" };
+  let os = "Unknown";
+  let browser = "Unknown";
+  let deviceType = "desktop";
+  if (/windows phone/i.test(ua)) {
+    os = "Windows Phone";
+    deviceType = "mobile";
+  } else if (/win64|win32|windows/i.test(ua)) {
+    os = "Windows";
+    deviceType = "desktop";
+  } else if (/ipad/i.test(ua)) {
+    os = "iPadOS";
+    deviceType = "tablet";
+  } else if (/iphone|ipod/i.test(ua)) {
+    os = "iOS";
+    deviceType = "mobile";
+  } else if (/android/i.test(ua)) {
+    os = "Android";
+    deviceType = /mobile/i.test(ua) ? "mobile" : "tablet";
+  } else if (/macintosh|mac os x/i.test(ua)) {
+    os = "macOS";
+    deviceType = "desktop";
+  } else if (/cros/i.test(ua)) {
+    os = "Chrome OS";
+    deviceType = "desktop";
+  } else if (/linux/i.test(ua)) {
+    os = "Linux";
+    deviceType = "desktop";
+  }
+  if (/edg\//i.test(ua)) {
+    const m = ua.match(/edg\/(\d+)/i);
+    browser = m ? `Edge ${m[1]}` : "Edge";
+  } else if (/opr\/|opera/i.test(ua)) {
+    const m = ua.match(/(?:opr|opera)\/(\d+)/i);
+    browser = m ? `Opera ${m[1]}` : "Opera";
+  } else if (/chrome|crios/i.test(ua)) {
+    const m = ua.match(/(?:chrome|crios)\/(\d+)/i);
+    browser = m ? `Chrome ${m[1]}` : "Chrome";
+  } else if (/firefox|fxios/i.test(ua)) {
+    const m = ua.match(/(?:firefox|fxios)\/(\d+)/i);
+    browser = m ? `Firefox ${m[1]}` : "Firefox";
+  } else if (/safari/i.test(ua) && !/chrome|crios/i.test(ua)) {
+    const m = ua.match(/version\/(\d+)/i);
+    browser = m ? `Safari ${m[1]}` : "Safari";
+  } else if (/postman/i.test(ua)) {
+    browser = "Postman API";
+  }
+  return { browser, os, deviceType };
+}
 function deriveDeviceName(req, userAgent = "") {
   const headers = req?.headers || {};
   const fromHeader = headers["x-device-name"] || headers["x-pc-name"] || headers["x-computer-name"] || "";
@@ -49,16 +116,12 @@ function deriveDeviceName(req, userAgent = "") {
     return fromBody.trim().slice(0, 120);
   }
   const ua = userAgent || headers["user-agent"] || "";
-  if (/windows/i.test(ua)) return "Windows PC";
-  if (/macintosh|mac os/i.test(ua)) return "Mac";
-  if (/iphone/i.test(ua)) return "iPhone";
-  if (/ipad/i.test(ua)) return "iPad";
-  if (/android/i.test(ua)) return "Android Device";
-  if (/linux/i.test(ua)) return "Linux PC";
-  return "Desktop PC";
+  return getDeviceLabel(ua);
 }
 var session_default = {
   genSessionToken,
+  getDeviceLabel,
+  parseUserAgent,
   deriveDeviceName
 };
 // Annotate the CommonJS export names for ESM import in node:
@@ -69,6 +132,8 @@ var session_default = {
   extractToken,
   formatToken,
   genSessionToken,
+  getDeviceLabel,
   getSessionId,
-  parseToken
+  parseToken,
+  parseUserAgent
 });

package/utils/utils/session.js

@@ -1,67 +1,131 @@
-/**
- * cynx/utils — Session and Device Resolution Utilities (session.js)
- *
- * Helpers for generating secure session tokens and extracting human-friendly device names
- * from request headers and user-agent strings.
- */
-
-import { getRandomBytes } from './uid.js';
-
-/**
- * Generate a cryptographically secure random session token.
- * Example: "st_9b1deb4d3b7d4bad9bdd2b0d7b3dcb6d..."
- *
- * @param {number} [byteLength=32]
- * @returns {string}
- */
-export function genSessionToken(byteLength = 32) {
-  const bytes = getRandomBytes(byteLength);
-  let hex = '';
-  for (let i = 0; i < bytes.length; i++) {
-    hex += bytes[i].toString(16).padStart(2, '0');
-  }
-  return `st_${hex}`;
-}
-
-/**
- * Derive human-readable device name from Express/Fastify request or User-Agent string.
- *
- * @param {object} [req] HTTP request object
- * @param {string} [userAgent=''] User-Agent string
- * @returns {string} e.g. "Windows PC", "Mac", "iPhone", "Android Device", "Desktop PC"
- */
-export function deriveDeviceName(req, userAgent = '') {
-  const headers = req?.headers || {};
-  const fromHeader = headers['x-device-name'] || headers['x-pc-name'] || headers['x-computer-name'] || '';
-  if (typeof fromHeader === 'string' && fromHeader.trim()) {
-    return fromHeader.trim().slice(0, 120);
-  }
-
-  const fromBody = req?.body?.deviceName || req?.body?.device_name || req?.body?.pcName || req?.body?.pc_name;
-  if (typeof fromBody === 'string' && fromBody.trim()) {
-    return fromBody.trim().slice(0, 120);
-  }
-
-  const ua = userAgent || headers['user-agent'] || '';
-  if (/windows/i.test(ua)) return 'Windows PC';
-  if (/macintosh|mac os/i.test(ua)) return 'Mac';
-  if (/iphone/i.test(ua)) return 'iPhone';
-  if (/ipad/i.test(ua)) return 'iPad';
-  if (/android/i.test(ua)) return 'Android Device';
-  if (/linux/i.test(ua)) return 'Linux PC';
-  return 'Desktop PC';
-}
-
-export {
-  formatToken,
-  parseToken,
-  getSessionId,
-  extractToken,
-  SessionManager,
-  createSessionManager,
-} from './session_manager.js';
-
-export default {
-  genSessionToken,
-  deriveDeviceName,
-};
+/**
+ * cynx/utils — Session and Device Resolution Utilities (session.js)
+ *
+ * Helpers for generating secure session tokens and extracting human-friendly device names
+ * from request headers and user-agent strings.
+ *
+ * STRICT NO EMOJIS!
+ */
+
+import { getRandomBytes } from './uid.js';
+
+/**
+ * Generate a cryptographically secure random session token.
+ * Example: "st_9b1deb4d3b7d4bad9bdd2b0d7b3dcb6d..."
+ *
+ * @param {number} [byteLength=32]
+ * @returns {string}
+ */
+export function genSessionToken(byteLength = 32) {
+  const bytes = getRandomBytes(byteLength);
+  let hex = '';
+  for (let i = 0; i < bytes.length; i++) {
+    hex += bytes[i].toString(16).padStart(2, '0');
+  }
+  return `st_${hex}`;
+}
+
+/**
+ * Extract human-readable device label from User-Agent string.
+ *
+ * @param {string} ua User-Agent string
+ * @returns {string} e.g. "Windows 10/11 PC", "MacBook / Mac", "iPhone", "Android Phone", "Linux PC"
+ */
+export function getDeviceLabel(ua) {
+  if (!ua) return 'PC';
+  if (/windows phone/i.test(ua)) return 'Windows Phone';
+  if (/windows nt 10\.0/i.test(ua)) return 'Windows 10/11 PC';
+  if (/windows nt 6\.3/i.test(ua)) return 'Windows 8.1 PC';
+  if (/windows nt 6\.1/i.test(ua)) return 'Windows 7 PC';
+  if (/win64|win32|windows/i.test(ua)) return 'Windows PC';
+  if (/ipad/i.test(ua)) return 'iPad';
+  if (/iphone/i.test(ua)) return 'iPhone';
+  if (/macintosh|mac os x/i.test(ua)) return 'MacBook / Mac';
+  if (/android/i.test(ua)) return /mobile/i.test(ua) ? 'Android Phone' : 'Android Tablet';
+  if (/cros/i.test(ua)) return 'Chromebook';
+  if (/linux/i.test(ua)) return 'Linux PC';
+  return 'Desktop PC';
+}
+
+/**
+ * Parse User-Agent string into browser, OS, and device type.
+ *
+ * @param {string} ua User-Agent string
+ * @returns {{ browser: string, os: string, deviceType: 'desktop' | 'mobile' | 'tablet' }}
+ */
+export function parseUserAgent(ua) {
+  if (!ua) return { browser: 'Unknown', os: 'Unknown', deviceType: 'desktop' };
+
+  let os = 'Unknown';
+  let browser = 'Unknown';
+  let deviceType = 'desktop';
+
+  if (/windows phone/i.test(ua)) { os = 'Windows Phone'; deviceType = 'mobile'; }
+  else if (/win64|win32|windows/i.test(ua)) { os = 'Windows'; deviceType = 'desktop'; }
+  else if (/ipad/i.test(ua)) { os = 'iPadOS'; deviceType = 'tablet'; }
+  else if (/iphone|ipod/i.test(ua)) { os = 'iOS'; deviceType = 'mobile'; }
+  else if (/android/i.test(ua)) { os = 'Android'; deviceType = /mobile/i.test(ua) ? 'mobile' : 'tablet'; }
+  else if (/macintosh|mac os x/i.test(ua)) { os = 'macOS'; deviceType = 'desktop'; }
+  else if (/cros/i.test(ua)) { os = 'Chrome OS'; deviceType = 'desktop'; }
+  else if (/linux/i.test(ua)) { os = 'Linux'; deviceType = 'desktop'; }
+
+  if (/edg\//i.test(ua)) {
+    const m = ua.match(/edg\/(\d+)/i);
+    browser = m ? `Edge ${m[1]}` : 'Edge';
+  } else if (/opr\/|opera/i.test(ua)) {
+    const m = ua.match(/(?:opr|opera)\/(\d+)/i);
+    browser = m ? `Opera ${m[1]}` : 'Opera';
+  } else if (/chrome|crios/i.test(ua)) {
+    const m = ua.match(/(?:chrome|crios)\/(\d+)/i);
+    browser = m ? `Chrome ${m[1]}` : 'Chrome';
+  } else if (/firefox|fxios/i.test(ua)) {
+    const m = ua.match(/(?:firefox|fxios)\/(\d+)/i);
+    browser = m ? `Firefox ${m[1]}` : 'Firefox';
+  } else if (/safari/i.test(ua) && !/chrome|crios/i.test(ua)) {
+    const m = ua.match(/version\/(\d+)/i);
+    browser = m ? `Safari ${m[1]}` : 'Safari';
+  } else if (/postman/i.test(ua)) {
+    browser = 'Postman API';
+  }
+
+  return { browser, os, deviceType };
+}
+
+/**
+ * Derive human-readable device name from Express/Fastify request or User-Agent string.
+ *
+ * @param {object} [req] HTTP request object
+ * @param {string} [userAgent=''] User-Agent string
+ * @returns {string} e.g. "Windows 10/11 PC", "MacBook / Mac", "iPhone", "Android Phone", "Desktop PC"
+ */
+export function deriveDeviceName(req, userAgent = '') {
+  const headers = req?.headers || {};
+  const fromHeader = headers['x-device-name'] || headers['x-pc-name'] || headers['x-computer-name'] || '';
+  if (typeof fromHeader === 'string' && fromHeader.trim()) {
+    return fromHeader.trim().slice(0, 120);
+  }
+
+  const fromBody = req?.body?.deviceName || req?.body?.device_name || req?.body?.pcName || req?.body?.pc_name;
+  if (typeof fromBody === 'string' && fromBody.trim()) {
+    return fromBody.trim().slice(0, 120);
+  }
+
+  const ua = userAgent || headers['user-agent'] || '';
+  return getDeviceLabel(ua);
+}
+
+export {
+  formatToken,
+  parseToken,
+  getSessionId,
+  extractToken,
+  SessionManager,
+  createSessionManager,
+} from './session_manager.js';
+
+export default {
+  genSessionToken,
+  getDeviceLabel,
+  parseUserAgent,
+  deriveDeviceName,
+};

package/utils/utils/session_manager.cjs

@@ -20,15 +20,20 @@ __export(session_manager_exports, {
   SessionManager: () => SessionManager,
   createSessionManager: () => createSessionManager,
   default: () => session_manager_default,
+  deriveDeviceName: () => import_session2.deriveDeviceName,
   extractToken: () => extractToken,
   formatToken: () => formatToken,
+  genSessionToken: () => import_session2.genSessionToken,
+  getDeviceLabel: () => import_session2.getDeviceLabel,
   getSessionId: () => getSessionId,
-  parseToken: () => parseToken
+  parseToken: () => parseToken,
+  parseUserAgent: () => import_session2.parseUserAgent
 });
 module.exports = __toCommonJS(session_manager_exports);
 var import_uid = require("./uid.cjs");
 var import_duration = require("./duration.cjs");
 var import_session = require("./session.cjs");
+var import_session2 = require("./session.cjs");
 function formatToken(sessionId, secret, prefix = "st_") {
   return `${prefix}${sessionId}$${secret}`;
 }
@@ -483,8 +488,12 @@ var session_manager_default = {
 0 && (module.exports = {
   SessionManager,
   createSessionManager,
+  deriveDeviceName,
   extractToken,
   formatToken,
+  genSessionToken,
+  getDeviceLabel,
   getSessionId,
-  parseToken
+  parseToken,
+  parseUserAgent
 });

package/utils/utils/session_manager.js

@@ -539,6 +539,13 @@ export function createSessionManager(options) {
   return new SessionManager(options);
 }
 
+export {
+  genSessionToken,
+  getDeviceLabel,
+  parseUserAgent,
+  deriveDeviceName,
+} from './session.js';
+
 export default {
   SessionManager,
   createSessionManager,