refactor(@remix-run/cloudflare): implement crypto-dependent interface…

… functions
remix-run · Mar 19, 2022 · 27bf12e · 27bf12e
1 parent afcb21e
commit 27bf12e
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 28 deletions.
diff --git a/packages/remix-cloudflare/cookieSigning.ts → packages/remix-cloudflare/crypto.ts b/packages/remix-cloudflare/cookieSigning.ts → packages/remix-cloudflare/crypto.ts
@@ -1,6 +1,8 @@
+import type { SignFunction, UnsignFunction } from "@remix-run/server-runtime";
+
 const encoder = new TextEncoder();
 
-export async function sign(value: string, secret: string): Promise<string> {
+export const sign: SignFunction = async (value, secret) => {
   let key = await crypto.subtle.importKey(
     "raw",
     encoder.encode(secret),
@@ -19,10 +21,7 @@ export async function sign(value: string, secret: string): Promise<string> {
   return value + "." + hash;
 }
 
-export async function unsign(
-  cookie: string,
-  secret: string
-): Promise<string | false> {
+export const unsign: UnsignFunction = async (cookie, secret) => {
   let key = await crypto.subtle.importKey(
     "raw",
     encoder.encode(secret),
@@ -49,4 +48,4 @@ function byteStringToUint8Array(byteString: string): Uint8Array {
   }
 
   return array;
-}
+}
diff --git a/packages/remix-cloudflare/globals.d.ts b/packages/remix-cloudflare/globals.d.ts
@@ -0,0 +1,9 @@
+declare global {
+  interface ProcessEnv {
+    NODE_ENV: "development" | "production" | "test";
+  }
+
+  interface WorkerGlobalScope {
+    process: { env: ProcessEnv };
+  }
+}
diff --git a/packages/remix-cloudflare/globals.ts b/packages/remix-cloudflare/globals.ts
diff --git a/packages/remix-cloudflare/implementations.ts b/packages/remix-cloudflare/implementations.ts
@@ -0,0 +1,13 @@
+import {
+  createCookieFactory,
+  createCookieSessionStorageFactory,
+  createMemorySessionStorageFactory,
+  createSessionStorageFactory,
+} from "@remix-run/server-runtime";
+
+import { sign, unsign } from "./crypto";
+
+export const createCookie = createCookieFactory({ sign, unsign });
+export const createCookieSessionStorage = createCookieSessionStorageFactory(createCookie);
+export const createSessionStorage = createSessionStorageFactory(createCookie);
+export const createMemorySessionStorage = createMemorySessionStorageFactory(createSessionStorage);
diff --git a/packages/remix-cloudflare/index.ts b/packages/remix-cloudflare/index.ts
@@ -6,9 +6,12 @@ export {
   createCookie,
   createCookieSessionStorage,
   createMemorySessionStorage,
+  createSessionStorage,
+} from './implementations';
+
+export {
   createRequestHandler,
   createSession,
-  createSessionStorage,
   isCookie,
   isSession,
   json,

diff --git a/packages/remix-cloudflare/sessions/KVSessionStorage.ts b/packages/remix-cloudflare/sessions/KVSessionStorage.ts
@@ -2,7 +2,8 @@ import type {
   SessionStorage,
   SessionIdStorageStrategy,
 } from "@remix-run/server-runtime";
-import { createSessionStorage } from "@remix-run/server-runtime";
+
+import { createSessionStorage } from "../implementations";
 
 interface KVSessionStorageOptions {
   /**