@fastly/remix-server-runtime 2.0.2 → 3.0.0-beta.0

package/build/src/crypto.d.ts

@@ -1,3 +1,4 @@
-export declare function sign(value: string, secret: string): Promise<string>;
-export declare function unsign(signed: string, secret: string): Promise<string | false>;
+import type { SignFunction, UnsignFunction } from "@remix-run/server-runtime";
+export declare const sign: SignFunction;
+export declare const unsign: UnsignFunction;
 //# sourceMappingURL=crypto.d.ts.map

package/build/src/crypto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"AAuBA,wBAAsB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAKvD;AAED,wBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,2BAW1D"}
+{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAI9E,eAAO,MAAM,IAAI,EAAE,YAUlB,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,cAWpB,CAAC"}

package/build/src/crypto.js

@@ -1,54 +1,35 @@
 "use strict";
-/*
- * Copyright Fastly, Inc.
- * Licensed under the MIT license. See LICENSE file for details.
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unsign = exports.sign = void 0;
-const crypto = __importStar(require("crypto"));
 const encoder = new TextEncoder();
-async function calculateHash(value, secret) {
-    const key = encoder.encode(secret);
-    const signature = crypto.createHmac('sha256', key)
-        .update(value)
-        .digest();
-    return btoa(String.fromCharCode(...new Uint8Array(signature))).replace(/=+$/, "");
-}
-async function sign(value, secret) {
-    let hash = await calculateHash(value, secret);
-    return value + '.' + hash;
-}
+const sign = async (value, secret) => {
+    let key = await createKey(secret, ["sign"]);
+    let data = encoder.encode(value);
+    let signature = await crypto.subtle.sign("HMAC", key, data);
+    let hash = btoa(String.fromCharCode(...new Uint8Array(signature))).replace(/=+$/, "");
+    return value + "." + hash;
+};
 exports.sign = sign;
-async function unsign(signed, secret) {
+const unsign = async (signed, secret) => {
     let index = signed.lastIndexOf(".");
     let value = signed.slice(0, index);
     let hash = signed.slice(index + 1);
-    let expectedHash = await calculateHash(value, secret);
-    const valid = hash === expectedHash;
+    let key = await createKey(secret, ["verify"]);
+    let data = encoder.encode(value);
+    let signature = byteStringToUint8Array(atob(hash));
+    let valid = await crypto.subtle.verify("HMAC", key, signature, data);
     return valid ? value : false;
-}
+};
 exports.unsign = unsign;
+async function createKey(secret, usages) {
+    let key = await crypto.subtle.importKey("raw", encoder.encode(secret), { name: "HMAC", hash: "SHA-256" }, false, usages);
+    return key;
+}
+function byteStringToUint8Array(byteString) {
+    let array = new Uint8Array(byteString.length);
+    for (let i = 0; i < byteString.length; i++) {
+        array[i] = byteString.charCodeAt(i);
+    }
+    return array;
+}
 //# sourceMappingURL=crypto.js.map

package/build/src/crypto.js.map

@@ -1 +1 @@
-{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,+CAAiC;AAEjC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;AAElC,KAAK,UAAU,aAAa,CAAC,KAAa,EAAE,MAAc;IAExD,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC;SAC/C,MAAM,CAAC,KAAK,CAAC;SACb,MAAM,EAAE,CAAC;IAEZ,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CACpE,KAAK,EACL,EAAE,CACH,CAAC;AAEJ,CAAC;AAEM,KAAK,UAAU,IAAI,CAAC,KAAa,EAAE,MAAc;IAEtD,IAAI,IAAI,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9C,OAAO,KAAK,GAAG,GAAG,GAAG,IAAI,CAAC;AAE5B,CAAC;AALD,oBAKC;AAEM,KAAK,UAAU,MAAM,CAAC,MAAc,EAAE,MAAc;IAEzD,IAAI,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACpC,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAEnC,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IACnC,IAAI,YAAY,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,IAAI,KAAK,YAAY,CAAC;IAEpC,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;AAE/B,CAAC;AAXD,wBAWC","sourcesContent":["/*\n * Copyright Fastly, Inc.\n * Licensed under the MIT license. See LICENSE file for details.\n */\n\nimport * as crypto from 'crypto';\n\nconst encoder = new TextEncoder();\n\nasync function calculateHash(value: string, secret: string) {\n\n  const key = encoder.encode(secret);\n  const signature = crypto.createHmac('sha256', key)\n    .update(value)\n    .digest();\n\n  return btoa(String.fromCharCode(...new Uint8Array(signature))).replace(\n    /=+$/,\n    \"\"\n  );\n\n}\n\nexport async function sign(value: string, secret: string) {\n\n  let hash = await calculateHash(value, secret);\n  return value + '.' + hash;\n\n}\n\nexport async function unsign(signed: string, secret: string) {\n\n  let index = signed.lastIndexOf(\".\");\n  let value = signed.slice(0, index);\n\n  let hash = signed.slice(index + 1);\n  let expectedHash = await calculateHash(value, secret);\n  const valid = hash === expectedHash;\n\n  return valid ? value : false;\n\n}\n"]}
+{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":";;;AAMA,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;AAE3B,MAAM,IAAI,GAAiB,KAAK,EAAE,KAAa,EAAE,MAAc,EAAE,EAAE;IACxE,IAAI,GAAG,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5C,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,SAAS,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAC5D,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CACxE,KAAK,EACL,EAAE,CACH,CAAC;IAEF,OAAO,KAAK,GAAG,GAAG,GAAG,IAAI,CAAC;AAC5B,CAAC,CAAC;AAVW,QAAA,IAAI,QAUf;AAEK,MAAM,MAAM,GAAmB,KAAK,EAAE,MAAc,EAAE,MAAc,EAAE,EAAE;IAC7E,IAAI,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACpC,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACnC,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAEnC,IAAI,GAAG,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9C,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,SAAS,GAAG,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACnD,IAAI,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IAErE,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;AAC/B,CAAC,CAAC;AAXW,QAAA,MAAM,UAWjB;AAEF,KAAK,UAAU,SAAS,CACtB,MAAc,EACd,MAA2B;IAE3B,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CACrC,KAAK,EACL,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EACtB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,EACjC,KAAK,EACL,MAAM,CACP,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,sBAAsB,CAAC,UAAkB;IAChD,IAAI,KAAK,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,KAAK,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;KACrC;IAED,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["/*\n * Copyright Fastly, Inc.\n * Licensed under the MIT license. See LICENSE file for details.\n */\nimport type { SignFunction, UnsignFunction } from \"@remix-run/server-runtime\";\n\nconst encoder = new TextEncoder();\n\nexport const sign: SignFunction = async (value: string, secret: string) => {\n  let key = await createKey(secret, [\"sign\"]);\n  let data = encoder.encode(value);\n  let signature = await crypto.subtle.sign(\"HMAC\", key, data);\n  let hash = btoa(String.fromCharCode(...new Uint8Array(signature))).replace(\n    /=+$/,\n    \"\"\n  );\n\n  return value + \".\" + hash;\n};\n\nexport const unsign: UnsignFunction = async (signed: string, secret: string) => {\n  let index = signed.lastIndexOf(\".\");\n  let value = signed.slice(0, index);\n  let hash = signed.slice(index + 1);\n\n  let key = await createKey(secret, [\"verify\"]);\n  let data = encoder.encode(value);\n  let signature = byteStringToUint8Array(atob(hash));\n  let valid = await crypto.subtle.verify(\"HMAC\", key, signature, data);\n\n  return valid ? value : false;\n};\n\nasync function createKey(\n  secret: string,\n  usages: CryptoKey[\"usages\"]\n): Promise<CryptoKey> {\n  let key = await crypto.subtle.importKey(\n    \"raw\",\n    encoder.encode(secret),\n    { name: \"HMAC\", hash: \"SHA-256\" },\n    false,\n    usages\n  );\n\n  return key;\n}\n\nfunction byteStringToUint8Array(byteString: string): Uint8Array {\n  let array = new Uint8Array(byteString.length);\n\n  for (let i = 0; i < byteString.length; i++) {\n    array[i] = byteString.charCodeAt(i);\n  }\n\n  return array;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastly/remix-server-runtime",
-  "version": "2.0.2",
+  "version": "3.0.0-beta.0",
   "license": "MIT",
   "description": "Remix Runtime for Fastly Compute@Edge",
   "types": "./build/src/index.d.ts",
@@ -12,7 +12,7 @@
     "@remix-run/server-runtime": "^1.17.1"
   },
   "dependencies": {
-    "@fastly/js-compute": "^2.0.0",
+    "@fastly/js-compute": "^2.5.0",
     "@remix-run/server-runtime": "^1.17.1"
   },
   "devDependencies": {