@kya-os/mcp-i-core 1.3.24 → 1.3.26

package/dist/utils/base64.js

@@ -18,29 +18,41 @@ exports.base64ToBytes = base64ToBytes;
 function base64urlDecodeToString(input) {
     const padded = addPadding(input);
     const base64 = padded.replace(/-/g, "+").replace(/_/g, "/");
+    // Prefer Buffer when available (Node.js) as it handles UTF-8 correctly
+    if (typeof Buffer !== "undefined") {
+        // Buffer.from doesn't throw for invalid base64, so we validate first
+        const base64Regex = /^[A-Za-z0-9+/]*={0,2}$/;
+        if (!base64Regex.test(base64)) {
+            throw new Error("Invalid base64url string: contains invalid characters");
+        }
+        try {
+            const decoded = Buffer.from(base64, "base64").toString("utf-8");
+            return decoded;
+        }
+        catch (error) {
+            throw new Error(`Invalid base64url string: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
     // For platforms that don't have Buffer (e.g., Cloudflare Workers)
     if (typeof atob !== "undefined") {
         try {
-            return atob(base64);
+            const binaryString = atob(base64);
+            // Decode UTF-8 bytes to string
+            if (typeof TextDecoder !== "undefined") {
+                const bytes = new Uint8Array(binaryString.length);
+                for (let i = 0; i < binaryString.length; i++) {
+                    bytes[i] = binaryString.charCodeAt(i);
+                }
+                return new TextDecoder().decode(bytes);
+            }
+            // Fallback: return binary string as-is (may not handle UTF-8 correctly)
+            return binaryString;
         }
         catch (error) {
             throw new Error(`Invalid base64url string: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    // For Node.js environments - Buffer.from doesn't throw for invalid base64
-    // We need to validate by checking if the input contains only valid base64 characters
-    // Base64 characters: A-Z, a-z, 0-9, +, /, = (padding)
-    const base64Regex = /^[A-Za-z0-9+/]*={0,2}$/;
-    if (!base64Regex.test(base64)) {
-        throw new Error("Invalid base64url string: contains invalid characters");
-    }
-    try {
-        const decoded = Buffer.from(base64, "base64").toString("utf-8");
-        return decoded;
-    }
-    catch (error) {
-        throw new Error(`Invalid base64url string: ${error instanceof Error ? error.message : String(error)}`);
-    }
+    throw new Error("Neither Buffer nor atob is available");
 }
 /**
  * Decode base64url string to Uint8Array
@@ -70,14 +82,29 @@ function base64urlDecodeToBytes(input) {
  * Encode string to base64url
  */
 function base64urlEncodeFromString(input) {
-    // For platforms that don't have Buffer
-    if (typeof btoa !== "undefined") {
-        const base64 = btoa(input);
+    // Prefer Buffer when available (Node.js) as it handles Unicode correctly
+    if (typeof Buffer !== "undefined") {
+        const base64 = Buffer.from(input, "utf-8").toString("base64");
         return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
     }
-    // For Node.js environments
-    const base64 = Buffer.from(input, "utf-8").toString("base64");
-    return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+    // For platforms that don't have Buffer (e.g., Cloudflare Workers)
+    if (typeof btoa !== "undefined") {
+        // btoa doesn't handle Unicode, so we need to encode to UTF-8 bytes first
+        try {
+            const utf8Bytes = new TextEncoder().encode(input);
+            const binaryString = Array.from(utf8Bytes)
+                .map((byte) => String.fromCharCode(byte))
+                .join("");
+            const base64 = btoa(binaryString);
+            return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+        }
+        catch {
+            // Fallback: if TextEncoder not available, try direct btoa (may fail for Unicode)
+            const base64 = btoa(input);
+            return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+        }
+    }
+    throw new Error("Neither Buffer nor btoa is available");
 }
 /**
  * Encode Uint8Array to base64url
@@ -110,12 +137,19 @@ function bytesToBase64(bytes) {
     return Buffer.from(bytes).toString("base64");
 }
 /**
- * Convert standard base64 to bytes
+ * Convert standard base64 or base64url to bytes
+ * Handles both standard base64 (+/) and base64url (-_) formats
  */
 function base64ToBytes(base64) {
+    // Convert base64url to standard base64 if needed
+    // Base64url uses - instead of + and _ instead of /
+    let standardBase64 = base64.replace(/-/g, "+").replace(/_/g, "/");
+    // Add padding if needed (base64url often omits padding)
+    const paddingNeeded = (4 - (standardBase64.length % 4)) % 4;
+    standardBase64 += "=".repeat(paddingNeeded);
     // For platforms that don't have Buffer
     if (typeof atob !== "undefined") {
-        const binaryString = atob(base64);
+        const binaryString = atob(standardBase64);
         const bytes = new Uint8Array(binaryString.length);
         for (let i = 0; i < binaryString.length; i++) {
             bytes[i] = binaryString.charCodeAt(i);
@@ -123,7 +157,7 @@ function base64ToBytes(base64) {
         return bytes;
     }
     // For Node.js environments
-    return new Uint8Array(Buffer.from(base64, "base64"));
+    return new Uint8Array(Buffer.from(standardBase64, "base64"));
 }
 /**
  * Add padding to base64url string if needed

package/dist/utils/storage-keys.js

@@ -94,9 +94,9 @@ async function migrateDelegationKeys(storage, options = {}) {
     };
     try {
         // Find all legacy delegation keys
-        const legacyKeys = await storage.list('agent:');
+        const legacyKeys = await storage.list("agent:");
         const delegationKeys = legacyKeys.filter((key) => key.match(/^agent:[^:]+:delegation$/));
-        console.log(`Found ${delegationKeys.length} legacy delegation keys to migrate`);
+        console.error(`Found ${delegationKeys.length} legacy delegation keys to migrate`);
         for (const oldKey of delegationKeys) {
             try {
                 // Extract agentDid from key: `agent:${agentDid}:delegation`
@@ -104,7 +104,7 @@ async function migrateDelegationKeys(storage, options = {}) {
                 if (!match) {
                     result.errors.push({
                         key: oldKey,
-                        error: 'Invalid legacy key format',
+                        error: "Invalid legacy key format",
                     });
                     result.failed++;
                     continue;
@@ -120,7 +120,7 @@ async function migrateDelegationKeys(storage, options = {}) {
                 let userDid = null;
                 let sessionId = undefined;
                 // First, attempt to extract from session data to get both userDid and sessionId
-                const sessionKeys = await storage.list('session:');
+                const sessionKeys = await storage.list("session:");
                 for (const sessionKey of sessionKeys) {
                     const sessionData = await storage.get(sessionKey);
                     if (sessionData) {
@@ -153,7 +153,7 @@ async function migrateDelegationKeys(storage, options = {}) {
                     // Cannot migrate without userDid - skip for now
                     result.errors.push({
                         key: oldKey,
-                        error: 'Cannot resolve userDid - skipping migration',
+                        error: "Cannot resolve userDid - skipping migration",
                     });
                     result.failed++;
                     continue;
@@ -187,7 +187,7 @@ async function migrateDelegationKeys(storage, options = {}) {
     }
     catch (error) {
         result.errors.push({
-            key: 'migration',
+            key: "migration",
             error: error instanceof Error ? error.message : String(error),
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kya-os/mcp-i-core",
-  "version": "1.3.24",
+  "version": "1.3.26",
   "description": "Core runtime and types for MCP-I framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,7 +28,7 @@
     "prepublishOnly": "npm run build && node ../create-mcpi-app/scripts/validate-no-workspace.js"
   },
   "dependencies": {
-    "@kya-os/contracts": "^1.6.17",
+    "@kya-os/contracts": "^1.6.18",
     "jose": "^5.6.3",
     "json-canonicalize": "^2.0.0",
     "zod": "^3.25.76"