@scayle/h3-session 0.5.0 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @scayle/h3-session
 
+## 0.6.0
+
+### Minor Changes
+
+- [Performance] Reduce the calls to `importKey` to improve performance.
+
+## 0.5.1
+
+### Patch Changes
+
+- When a sessionID exists, but there is no session data, re-use the sessionID instead of generating both new data and a new ID. This enables proper functioning of the `saveUnitialized` configuration.
+- Fix the `clear()` method on `UnstorageSessionStore` not clearing sessions
+
 ## 0.5.0
 
 ### Minor Changes

package/dist/index.mjs

@@ -3,6 +3,41 @@ import { getCookie, setCookie } from 'h3';
 import { defu } from 'defu';
 import { subtle, randomUUID } from 'uncrypto';
 
+const _signKeys = {};
+async function getCryptoSignKey(secret) {
+  if (_signKeys[secret]) {
+    return _signKeys[secret];
+  }
+  const encoder = new TextEncoder();
+  const keyUint8Array = encoder.encode(secret);
+  const cryptoKey = await subtle.importKey(
+    "raw",
+    keyUint8Array,
+    { name: "HMAC", hash: "SHA-256" },
+    false,
+    ["sign"]
+  );
+  _signKeys[secret] = cryptoKey;
+  return cryptoKey;
+}
+const _verifyKeys = {};
+async function getCryptoVerifyKey(secret) {
+  if (_verifyKeys[secret]) {
+    return _verifyKeys[secret];
+  }
+  const encoder = new TextEncoder();
+  const keyUint8Array = encoder.encode(secret);
+  const cryptoKey = await subtle.importKey(
+    "raw",
+    keyUint8Array,
+    { name: "HMAC", hash: "SHA-256" },
+    false,
+    ["verify"]
+  );
+  _verifyKeys[secret] = cryptoKey;
+  return cryptoKey;
+}
+
 class Session {
   #id;
   #store;
@@ -60,7 +95,7 @@ class UnstorageSessionStore {
    */
   async get(sid) {
     const item = await this.storage.getItem(this.getKey(sid));
-    return item ?? void 0;
+    return item ?? undefined;
   }
   /**
    * Save the session with the specified session ID
@@ -88,7 +123,8 @@ class UnstorageSessionStore {
    * Remove all saved sessions
    */
   async clear() {
-    return await this.storage.clear(this.prefix);
+    const keys = await this.getAllKeys();
+    await Promise.all(keys.map((k) => this.storage.removeItem(k)));
   }
   /**
    * Fetch all saved sessions.
@@ -130,11 +166,11 @@ class UnstorageSessionStore {
 const signatureLength = 43;
 function parseCookieValue(value) {
   if (value.length < signatureLength + 3) {
-    return void 0;
+    return undefined;
   }
   const separatorIndex = value.length - signatureLength - 1;
   if (value.charAt(0) !== "s" || value.charAt(1) !== ":" || value.charAt(separatorIndex) !== ".") {
-    return void 0;
+    return undefined;
   }
   return [
     value.substring(2, separatorIndex),
@@ -151,14 +187,7 @@ async function unsignCookie(value, secrets) {
   const messageUint8Array = encoder.encode(message);
   const signatureUint8Array = Uint8Array.from(Buffer.from(signature, "base64"));
   for (let i = 0; i < secrets.length; i++) {
-    const keyUint8Array = encoder.encode(secrets[i]);
-    const cryptoKey = await subtle.importKey(
-      "raw",
-      keyUint8Array,
-      { name: "HMAC", hash: "SHA-256" },
-      false,
-      ["verify"]
-    );
+    const cryptoKey = await getCryptoVerifyKey(secrets[i]);
     const result = await subtle.verify(
       "HMAC",
       cryptoKey,
@@ -180,14 +209,7 @@ async function signCookie(value, secret) {
   }
   const encoder = new TextEncoder();
   const messageUint8Array = encoder.encode(value);
-  const keyUint8Array = encoder.encode(secret);
-  const cryptoKey = await subtle.importKey(
-    "raw",
-    keyUint8Array,
-    { name: "HMAC", hash: "SHA-256" },
-    false,
-    ["sign"]
-  );
+  const cryptoKey = await getCryptoSignKey(secret);
   const signature = await subtle.sign("HMAC", cryptoKey, messageUint8Array);
   const b64Signature = Buffer.from(signature).toString("base64").replace(/=+$/, "");
   return `s:${value}.${b64Signature}`;
@@ -262,14 +284,22 @@ async function useSession(event, config) {
   }
   async function createExistingSession(id, data) {
     const cookie = await createSessionCookie(id);
-    if (store.touch) {
+    if (store.touch && data) {
       await store.touch(id, data);
     }
-    event.context.session = new Session(id, data, store, generate, cookie);
+    event.context.session = new Session(
+      id,
+      data ?? sessionConfig.generate(),
+      store,
+      generate,
+      cookie
+    );
     event.context.sessionId = id;
   }
-  if (!sessionId || !sessionData) {
+  if (!sessionId) {
     await createNewSession();
+  } else if (!sessionData) {
+    await createExistingSession(sessionId);
   } else {
     await createExistingSession(sessionId, sessionData);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/h3-session",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Persistent sessions for h3",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -24,7 +24,7 @@
     "lint": "eslint . --format gitlab",
     "lint:fix": "eslint . --fix",
     "test": "vitest run",
-    "test:ci": "vitest --run --coverage --reporter=default --reporter=junit --outputFile=./junit.xml",
+    "test:ci": "vitest --run --coverage --reporter=default --reporter=junit --outputFile=./coverage/junit.xml",
     "test:watch": "vitest watch",
     "typecheck": "tsc --noEmit -p tsconfig.json"
   },
@@ -37,17 +37,18 @@
     "unstorage": "^1.10.2"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "0.17.1",
-    "@scayle/eslint-config-storefront": "4.4.0",
-    "dprint": "0.47.6",
-    "eslint": "9.17.0",
+    "@arethetypeswrong/cli": "0.17.3",
+    "@scayle/eslint-config-storefront": "4.4.1",
+    "cookie-es": "1.2.2",
+    "dprint": "0.48.0",
+    "eslint": "9.18.0",
     "eslint-formatter-gitlab": "5.1.0",
-    "h3": "1.13.0",
-    "typescript": "5.6.3",
-    "unbuild": "3.0.1",
+    "h3": "1.13.1",
+    "typescript": "5.7.3",
+    "unbuild": "3.3.1",
     "vitest": "2.1.8"
   },
   "volta": {
-    "node": "22.12.0"
+    "node": "22.13.0"
   }
 }