Support CF workers

superstreamerapp · Nov 20, 2024 · c273c13 · c273c13
1 parent ae9cd8d
commit c273c13
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 60 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/packages/api/src/env.ts b/packages/api/src/env.ts
@@ -1,13 +1,10 @@
 import { parseEnv } from "shared/env";
 
 export const env = parseEnv((z) => ({
-  // process
   PORT: z.coerce.number().default(52001),
-  HOST: z.string().default("0.0.0.0"),
-
-  // config.env
-  REDIS_HOST: z.string(),
-  REDIS_PORT: z.coerce.number(),
+  HOST: z.string().optional(),
+  REDIS_HOST: z.string().default("localhost"),
+  REDIS_PORT: z.coerce.number().default(6379),
   S3_ENDPOINT: z.string(),
   S3_REGION: z.string(),
   S3_ACCESS_KEY: z.string(),

diff --git a/packages/artisan/src/env.ts b/packages/artisan/src/env.ts
@@ -1,12 +1,11 @@
 import { parseEnv } from "shared/env";
 
 export const env = parseEnv((z) => ({
-  // config.env
+  REDIS_HOST: z.string().default("localhost"),
+  REDIS_PORT: z.coerce.number().default(6379),
   S3_ENDPOINT: z.string(),
   S3_REGION: z.string(),
   S3_ACCESS_KEY: z.string(),
   S3_SECRET_KEY: z.string(),
   S3_BUCKET: z.string(),
-  REDIS_HOST: z.string(),
-  REDIS_PORT: z.coerce.number(),
 }));
diff --git a/packages/bolt/src/env.ts b/packages/bolt/src/env.ts
@@ -2,8 +2,8 @@ import { parseEnv } from "shared/env";
 
 const env = parseEnv((z) => ({
   // config.env
-  REDIS_HOST: z.string(),
-  REDIS_PORT: z.coerce.number(),
+  REDIS_HOST: z.string().default("localhost"),
+  REDIS_PORT: z.coerce.number().default(6379),
 }));
 
 export const connection = {

diff --git a/packages/stitcher/package.json b/packages/stitcher/package.json
@@ -28,13 +28,13 @@
     "@matvp91/elysia-swagger": "^2.0.0",
     "@superstreamer/api": "workspace:*",
     "@xmldom/xmldom": "^0.8.10",
-    "cryptr": "^6.3.0",
     "dom-parser": "^1.1.5",
     "elysia": "^1.1.24",
     "hh-mm-ss": "^1.2.0",
     "lru-cache": "^11.0.2",
     "luxon": "^3.5.0",
     "redis": "^4.7.0",
+    "secure-encrypt": "^1.0.12",
     "shared": "workspace:*",
     "superjson": "^2.2.1",
     "uuid": "^10.0.0",

diff --git a/packages/stitcher/runtime/local.ts b/packages/stitcher/runtime/local.ts
@@ -1,10 +1,5 @@
-import { parseEnv } from "shared/env";
 import { createApp } from "../src";
-
-const env = parseEnv((z) => ({
-  PORT: z.coerce.number().default(52002),
-  HOST: z.string().default("0.0.0.0"),
-}));
+import { env } from "../src/env";
 
 const app = createApp({
   aot: true,

diff --git a/packages/stitcher/src/adapters/kv/index.ts b/packages/stitcher/src/adapters/kv/index.ts
@@ -7,8 +7,9 @@ interface KeyValue {
 
 export let kv: KeyValue;
 
-if (env.SERVERLESS) {
+// Map each KV adapter here to their corresponding import.
+if (env.KV === "cloudflare-kv") {
   kv = await import("./cloudflare-kv");
-} else {
+} else if (env.KV === "redis") {
   kv = await import("./redis");
 }
diff --git a/packages/stitcher/src/env.ts b/packages/stitcher/src/env.ts
@@ -1,10 +1,13 @@
 import { parseEnv } from "shared/env";
 
 export const env = parseEnv((z) => ({
-  SERVERLESS: z.coerce.boolean().default(false),
+  PORT: z.coerce.number().default(52002),
+  HOST: z.string().optional(),
+
+  KV: z.enum(["redis", "cloudflare-kv"]).default("redis"),
+  REDIS_HOST: z.string().default("localhost"),
+  REDIS_PORT: z.coerce.number().default(6379),
 
-  REDIS_HOST: z.string(),
-  REDIS_PORT: z.coerce.number(),
   PUBLIC_S3_ENDPOINT: z.string(),
   PUBLIC_STITCHER_ENDPOINT: z.string(),
   PUBLIC_API_ENDPOINT: z.string(),

diff --git a/packages/stitcher/src/lib/crypto.ts b/packages/stitcher/src/lib/crypto.ts
@@ -1,14 +1,12 @@
-import Cryptr from "cryptr";
+import * as crypto from "secure-encrypt";
 import { env } from "../env";
 
-const cryptr = new Cryptr(env.SUPER_SECRET ?? "__UNSECURE__", {
-  encoding: "base64",
-});
+const secret = env.SUPER_SECRET ?? "__UNSECURE__";
 
 export function encrypt(value: string) {
-  return cryptr.encrypt(value);
+  return btoa(crypto.encrypt(value, secret));
 }
 
 export function decrypt(value: string) {
-  return cryptr.decrypt(value);
+  return crypto.decrypt(atob(value), secret);
 }
diff --git a/packages/stitcher/src/routes/session.ts b/packages/stitcher/src/routes/session.ts
@@ -1,7 +1,6 @@
 import { Elysia, t } from "elysia";
-import { getFilterFromQuery, getQueryParamsFromFilter } from "../filters";
+import { getFilterFromQuery } from "../filters";
 import { decrypt } from "../lib/crypto";
-import { makeUrl } from "../lib/url";
 import {
   formatAssetList,
   formatMasterPlaylist,
@@ -22,8 +21,10 @@ export const sessionRoutes = new Elysia()
 
       const filter = body.filter ?? {};
 
-      const url = makeUrl(`session/${session.id}/master.m3u8`, {
-        ...getQueryParamsFromFilter(filter),
+      const url = makeMasterUrl({
+        url: session.url,
+        filter,
+        session,
       });
 
       return { url };
@@ -87,27 +88,6 @@ export const sessionRoutes = new Elysia()
       }),
     },
   )
-  .get(
-    "/session/:sessionId/master.m3u8",
-    async ({ params, query, redirect }) => {
-      const session = await getSession(params.sessionId);
-      const url = makeMasterUrl({
-        url: session.url,
-        filter: getFilterFromQuery(query),
-        session,
-      });
-      return redirect(url, 302);
-    },
-    {
-      params: t.Object({
-        sessionId: t.String(),
-      }),
-      query: t.Object({
-        "filter.resolution": t.Optional(t.String()),
-        "filter.audioLanguage": t.Optional(t.String()),
-      }),
-    },
-  )
   .get(
     "/out/master.m3u8",
     async ({ set, query }) => {

diff --git a/packages/stitcher/wrangler.toml b/packages/stitcher/wrangler.toml
@@ -1,14 +1,10 @@
-name = "superstreamer-stitcher"
+name = "sprs-stitcher"
 compatibility_flags = [ "nodejs_compat" ]
 compatibility_date = "2024-09-23"
 send_metrics = false
 
 [vars]
-SERVERLESS = "true"
-PORT = "0"
-HOST = "0.0.0.0"
-REDIS_HOST = "redis"
-REDIS_PORT = "0000"
+KV = "cloudflare-kv"
 PUBLIC_S3_ENDPOINT = "https://cdn.superstreamer.xyz"
 PUBLIC_STITCHER_ENDPOINT = "https://stitcher.superstreamer.xyz"
 PUBLIC_API_ENDPOINT = "https://api.tunnel.superstreamer.xyz"