Correct compile errors

.github/workflows/main.yml

@@ -41,4 +41,4 @@ jobs:
         platforms: linux/amd64,linux/arm64
         push: true
         tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
+        labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -1,2 +1 @@
-ejs/
-.vscode/
+.vscode/

Dockerfile

@@ -1,39 +1,37 @@
-FROM denoland/deno:latest AS builder
+ARG XDG_CACHE_HOME
 
-WORKDIR /usr/src/app
-
-RUN apt-get update && apt-get install -y git
-
-RUN git clone https://github.com/yt-dlp/ejs.git
-# Pin to a specific commit
-RUN cd ejs && git checkout 2655b1f55f98e5870d4e124704a21f4d793b4e1c && cd ..
+FROM denoland/deno:debian AS builder
 
-COPY scripts/patch-ejs.ts ./scripts/patch-ejs.ts
-RUN deno run --allow-read --allow-write ./scripts/patch-ejs.ts
-
-RUN rm -rf ./ejs/.git ./ejs/node_modules || true
+WORKDIR /usr/src/app
 
 COPY . .
 
 RUN deno compile \
-    --no-check \
     --output server \
     --allow-net --allow-read --allow-write --allow-env \
     --include worker.ts \
     server.ts
 
-RUN mkdir -p /usr/src/app/player_cache && \
-    chown -R deno:deno /usr/src/app/player_cache
-
-FROM gcr.io/distroless/cc-debian12
+FROM gcr.io/distroless/cc-debian13:debug
+SHELL ["/busybox/busybox", "sh", "-c"]
 
 WORKDIR /app
 
+COPY --from=builder /tini /tini
 COPY --from=builder /usr/src/app/server /app/server
 
-COPY --from=builder --chown=nonroot:nonroot /usr/src/app/player_cache /app/player_cache
 COPY --from=builder --chown=nonroot:nonroot /usr/src/app/docs /app/docs
 
-USER nonroot
+ARG XDG_CACHE_HOME
+ENV XDG_CACHE_HOME="${XDG_CACHE_HOME}"
+# Create the fall-back cache directories
+RUN install -v -d -o nonroot -g nonroot -m 750 \
+        /app/player_cache /home/nonroot/.cache && \
+    test -z "${XDG_CACHE_HOME}" || install -v -d -m 1777 "${XDG_CACHE_HOME}"
+
 EXPOSE 8001
-ENTRYPOINT ["/app/server"]
+USER nonroot
+ENTRYPOINT ["/tini", "--"]
+# Run the server as nonroot even when /tini runs as root
+# CMD ["/busybox/busybox", "su", "-s", "/app/server", "nonroot"]
+CMD ["/app/server"]

README.md

@@ -39,19 +39,16 @@ docker-compose up
 
 If you have Deno installed, you can run the service directly.
 
-Clone the repository and patch the `ejs` dependency:
+Clone the repository:
 
 ```bash
 git clone https://github.com/kikkia/yt-cipher.git
-cd yt-cipher
-git clone https://github.com/yt-dlp/ejs.git
-cd ejs
-git checkout 5d7bf090bb9a2a8f3e2dd13ded4a21a009224f87
-cd ..
-deno run --allow-read --allow-write ./scripts/patch-ejs.ts
 ```
 
+Run the server:
+
 ```bash
+cd yt-cipher && \
 deno run --allow-net --allow-read --allow-write --allow-env server.ts
 ```
 NOTE: If using an `.env` file then also add the `--env` flag

deno.json

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "lib": [ "deno.worker" ]
+  },
+  "imports": {
+    "@std/crypto": "jsr:@std/crypto@^0.224.0",
+    "@std/fs": "jsr:@std/fs@^0.224.0",
+    "@std/http": "jsr:@std/http@0.224.5",
+    "@std/path": "jsr:@std/path@^0.224.0",
+    "ejs/": "https://esm.sh/gh/yt-dlp/ejs@0.3.0&standalone/"
+  }
+}

server.ts

@@ -1,4 +1,4 @@
-import { serve } from "https://deno.land/std@0.224.0/http/server.ts";
+import { serve } from "@std/http";
 import { initializeWorkers } from "./src/workerPool.ts";
 import { initializeCache } from "./src/playerCache.ts";
 import { handleDecryptSignature } from "./src/handlers/decryptSignature.ts";
@@ -95,4 +95,4 @@ await initializeCache();
 initializeWorkers();
 
 console.log(`Server listening on http://${host}:${port}`);
-await serve(handler, { port: Number(port), hostname: host });
+await serve(handler, { port: Number(port), hostname: host });

src/playerCache.ts

@@ -1,10 +1,18 @@
-import { crypto } from "https://deno.land/std@0.224.0/crypto/mod.ts";
-import { ensureDir } from "https://deno.land/std@0.224.0/fs/ensure_dir.ts";
-import { join } from "https://deno.land/std@0.224.0/path/mod.ts";
+import { crypto } from "@std/crypto";
+import { ensureDir } from "@std/fs";
+import { join } from "@std/path";
 import { cacheSize, playerScriptFetches } from "./metrics.ts";
 
-export const CACHE_HOME = Deno.env.get("XDG_CACHE_HOME") || join(Deno.env.get("HOME"), '.cache');
-export const CACHE_DIR = join(CACHE_HOME, 'yt-cipher', 'player_cache');
+let cache_prefix = Deno.cwd();
+const HOME = Deno.env.get("HOME");
+if ( HOME ) {
+    cache_prefix = join(HOME, '.cache', 'yt-cipher');
+}
+const CACHE_HOME = Deno.env.get("XDG_CACHE_HOME");
+if ( CACHE_HOME ) {
+    cache_prefix = join(CACHE_HOME, 'yt-cipher');
+}
+export const CACHE_DIR = join(cache_prefix, 'player_cache');
 
 export async function getPlayerFilePath(playerUrl: string): Promise<string> {
     // This hash of the player script url will mean that diff region scripts are treated as unequals, even for the same version #

src/solver.ts

@@ -2,7 +2,7 @@ import { execInPool } from "./workerPool.ts";
 import { getPlayerFilePath } from "./playerCache.ts";
 import { preprocessedCache } from "./preprocessedCache.ts";
 import { solverCache } from "./solverCache.ts";
-import { getFromPrepared } from "../ejs/src/yt/solver/solvers.ts";
+import { getFromPrepared } from "ejs/src/yt/solver/solvers.ts";
 import type { Solvers } from "./types.ts";
 import { workerErrors } from "./metrics.ts";
 import { extractPlayerId } from "./utils.ts";

src/types.ts

@@ -1,5 +1,3 @@
-import type { Input as MainInput, Output as MainOutput } from "../ejs/src/yt/solver/main.ts";
-
 export interface Solvers {
     n: ((val: string) => string) | null;
     sig: ((val: string) => string) | null;

worker.ts

@@ -1,4 +1,4 @@
-import { preprocessPlayer } from "./ejs/src/yt/solver/solvers.ts";
+import { preprocessPlayer } from "ejs/src/yt/solver/solvers.ts";
 
 self.onmessage = (e: MessageEvent<string>) => {
     try {