@maestro-js/session 1.0.0-alpha.22 → 1.0.0-alpha.23

package/dist/index.js

@@ -1,9 +1,6 @@
 // src/index.ts
-import { randomUUID as randomUUID2 } from "crypto";
-import { ServiceRegistry } from "@maestro-js/service-registry";
-
-// src/cookie-session-driver.ts
 import { randomUUID } from "crypto";
+import { ServiceRegistry } from "@maestro-js/service-registry";
 
 // src/cookie-utils.ts
 function parseCookies(cookieHeader) {
@@ -41,14 +38,16 @@ function cookieSessionDriver({
       const raw = cookies[cookieOptions.name];
       if (!raw) return null;
       try {
-        const data = crypt.decryptString(raw);
-        return { sessionId: randomUUID(), data };
+        const decrypted = crypt.decryptString(raw);
+        const parsed = JSON.parse(decrypted);
+        if (!parsed || typeof parsed.sessionId !== "string" || typeof parsed.data !== "string") return null;
+        return { sessionId: parsed.sessionId, data: parsed.data };
       } catch {
         return null;
       }
     },
-    async write(_sessionId, data) {
-      const encrypted = crypt.encryptString(data);
+    async write(sessionId, data) {
+      const encrypted = crypt.encryptString(JSON.stringify({ sessionId, data }));
       const byteLength = new TextEncoder().encode(encrypted).byteLength;
       if (byteLength > MAX_COOKIE_BYTES) {
         throw new Error(
@@ -121,7 +120,7 @@ function create({ driver }) {
   const flashKey = `__flash`;
   const crossSiteRequestForgeryTokenKey = `__csrf_token`;
   async function getSession(cookieHeader) {
-    let sessionId = randomUUID2();
+    let sessionId = randomUUID();
     let rawData = {};
     if (cookieHeader) {
       try {
@@ -131,13 +130,13 @@ function create({ driver }) {
           rawData = JSON.parse(result.data);
         }
       } catch {
-        sessionId = randomUUID2();
+        sessionId = randomUUID();
         rawData = {};
       }
     }
     const oldFlashKeys = new Set(Array.isArray(rawData[flashKey]) ? rawData[flashKey] : []);
     const newFlashKeys = /* @__PURE__ */ new Set();
-    const csrfToken = rawData[crossSiteRequestForgeryTokenKey] || randomUUID2();
+    const csrfToken = rawData[crossSiteRequestForgeryTokenKey] || randomUUID();
     delete rawData[flashKey];
     delete rawData[crossSiteRequestForgeryTokenKey];
     const meta = { sessionId, data: rawData, oldFlashKeys, newFlashKeys, regenerate: false, csrfToken };
@@ -183,8 +182,8 @@ function create({ driver }) {
       return csrfToken;
     }
     async function commit() {
-      const nextSessionId = meta.regenerate ? randomUUID2() : meta.sessionId;
-      const nextCsrfToken = meta.regenerate ? randomUUID2() : meta.csrfToken;
+      const nextSessionId = meta.regenerate ? randomUUID() : meta.sessionId;
+      const nextCsrfToken = meta.regenerate ? randomUUID() : meta.csrfToken;
       for (const key of meta.oldFlashKeys) {
         if (!meta.newFlashKeys.has(key)) {
           delete meta.data[key];

package/package.json

@@ -7,7 +7,7 @@
       "default": "./dist/index.js"
     }
   },
-  "version": "1.0.0-alpha.22",
+  "version": "1.0.0-alpha.23",
   "publishConfig": {
     "access": "restricted"
   },
@@ -15,14 +15,14 @@
     "dist"
   ],
   "dependencies": {
-    "@maestro-js/service-registry": "1.0.0-alpha.22"
+    "@maestro-js/service-registry": "1.0.0-alpha.23"
   },
   "peerDependencies": {
-    "@maestro-js/crypt": "1.0.0-alpha.22"
+    "@maestro-js/crypt": "1.0.0-alpha.23"
   },
   "devDependencies": {
     "@types/node": "^22.19.11",
-    "@maestro-js/crypt": "1.0.0-alpha.22"
+    "@maestro-js/crypt": "1.0.0-alpha.23"
   },
   "license": "UNLICENSED",
   "engines": {