Integrate workflow #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

tcely merged 36 commits into tcely-a from tcely-b

Dec 1, 2025

.github/workflows/deno.yml

-Original file line number
+Diff line change
@@ -0,0 +1,49 @@
+    # This workflow uses actions that are not certified by GitHub.
+    # They are provided by a third-party and are governed by
+    # separate terms of service, privacy policy, and support
+    # documentation.
+    # This workflow will install Deno then run:
+    # - `deno fmt`
+    # - `deno lint`
+    # - `deno check`
+    # For more information see: https://github.com/denoland/setup-deno
+    name: Deno
+    on:
+      push:
+        branches: ["master"]
+      pull_request:
+        branches: ["master"]
+    permissions:
+      contents: read
+    jobs:
+      check:
+        runs-on: ubuntu-latest
+        steps:
+          - name: Setup repo
+            uses: actions/checkout@v6
+            with:
+              submodules: recursive
+          - name: Setup Deno
+            uses: denoland/setup-deno@v2
+            with:
+              deno-version: latest
+              cache: true
+          - name: Verify formatting
+            run: deno fmt --check
+          - name: Run linter
+            run: deno lint
+          - name: Check types
+            run: deno check --frozen=false *.ts
+          # - name: Run tests
+          #   run: deno test -A

.gitmodules

-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    [submodule "ejs"]
+    	path = ejs
+    	url = https://github.com/yt-dlp/ejs.git

deno.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,11 +2,21 @@ @@
       "compilerOptions": {
         "lib": [ "deno.worker" ]
       },
+      "fmt": {
+        "include": ["src/", "*.ts"],
+        "indentWidth": 4
+      },
       "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/"
+      },
+      "lint": {
+        "include": ["src/", "*.ts"],
+        "rules": {
+          "exclude": [ "no-import-prefix" ]
+        }
       }
     }

ejs

Submodule ejs added at 2655b1

server.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -28,7 +28,7 @@ async function baseHandler(req: Request): Promise<Response> {
  
                        {

                            status: 404,

                            headers: { "Content-Type": "text/plain" },

                        }

                        },

                    );

                }

            }

    @@ -48,7 +48,7 @@ async function baseHandler(req: Request): Promise<Response> {
  
            }

        }

        if (pathname === '/metrics') {

        if (pathname === "/metrics") {

            return new Response(registry.metrics(), {

                headers: { "Content-Type": "text/plain" },

            });

    @@ -57,28 +57,39 @@ async function baseHandler(req: Request): Promise<Response> {
  
        const authHeader = req.headers.get("authorization");

        if (API_TOKEN && API_TOKEN !== "") {

            if (authHeader !== API_TOKEN) {

                const error = authHeader ? 'Invalid API token' : 'Missing API token';

                return new Response(JSON.stringify({ error }), { status: 401, headers: { "Content-Type": "application/json" } });

                const error = authHeader

                    ? "Invalid API token"

                    : "Missing API token";

                return new Response(JSON.stringify({ error }), {

                    status: 401,

                    headers: { "Content-Type": "application/json" },

                });

            }

        }

        let handle: (ctx: RequestContext) => Promise<Response>;

        if (pathname === '/decrypt_signature') {

        if (pathname === "/decrypt_signature") {

            handle = handleDecryptSignature;

        } else if (pathname === '/get_sts') {

        } else if (pathname === "/get_sts") {

            handle = handleGetSts;

        } else if (pathname === '/resolve_url') {

        } else if (pathname === "/resolve_url") {

            handle = handleResolveUrl;

        } else {

            return new Response(JSON.stringify({ error: 'Not Found' }), { status: 404, headers: { "Content-Type": "application/json" } });

            return new Response(JSON.stringify({ error: "Not Found" }), {

                status: 404,

                headers: { "Content-Type": "application/json" },

            });

        }

        let body;

        try {

            body = await req.json() as ApiRequest;

        } catch {

            return new Response(JSON.stringify({ error: 'Invalid JSON body' }), { status: 400, headers: { "Content-Type": "application/json" } });

            return new Response(JSON.stringify({ error: "Invalid JSON body" }), {

                status: 400,

                headers: { "Content-Type": "application/json" },

            });

        }

        const ctx: RequestContext = { req, body };

    @@ -88,8 +99,8 @@ async function baseHandler(req: Request): Promise<Response> {
  
    const handler = baseHandler;

    const port = Deno.env.get("PORT") || 8001;

    const host = Deno.env.get("HOST") || '0.0.0.0';

    const port = Deno.env.get("PORT") || "8001";

    const host = Deno.env.get("HOST") || "0.0.0.0";

    await initializeCache();

    initializeWorkers();

src/handlers/decryptSignature.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,21 +1,33 @@
  
    import { getSolvers } from "../solver.ts";

    import type { RequestContext, SignatureRequest, SignatureResponse } from "../types.ts";

    import type {

        RequestContext,

        SignatureRequest,

        SignatureResponse,

    } from "../types.ts";

    export async function handleDecryptSignature(ctx: RequestContext): Promise<Response> {

        const { encrypted_signature, n_param, player_url } = ctx.body as SignatureRequest;

    export async function handleDecryptSignature(

        ctx: RequestContext,

    ): Promise<Response> {

        const { encrypted_signature, n_param, player_url } = ctx

            .body as SignatureRequest;

        const solvers = await getSolvers(player_url);

        if (!solvers) {

            return new Response(JSON.stringify({ error: "Failed to generate solvers from player script" }), { status: 500, headers: { "Content-Type": "application/json" } });

            return new Response(

                JSON.stringify({

                    error: "Failed to generate solvers from player script",

                }),

                { status: 500, headers: { "Content-Type": "application/json" } },

            );

        }

        let decrypted_signature = '';

        let decrypted_signature = "";

        if (encrypted_signature && solvers.sig) {

            decrypted_signature = solvers.sig(encrypted_signature);

        }

        let decrypted_n_sig = '';

        let decrypted_n_sig = "";

        if (n_param && solvers.n) {

            decrypted_n_sig = solvers.n(n_param);

        }

    @@ -25,5 +37,8 @@ export async function handleDecryptSignature(ctx: RequestContext): Promise<Respo
  
            decrypted_n_sig,

        };

        return new Response(JSON.stringify(response), { status: 200, headers: { "Content-Type": "application/json" } });

    }
      
        return new Response(JSON.stringify(response), {

            status: 200,

            headers: { "Content-Type": "application/json" },

        });

    }

src/handlers/getSts.ts

-Original file line number
+Diff line change
@@ Expand Up @@
             const response: StsResponse = { sts: cachedSts };
             return new Response(JSON.stringify(response), {
                 status: 200,
-                headers: { "Content-Type": "application/json", "X-Cache-Hit": "true" },
+                headers: {
+                    "Content-Type": "application/json",
+                    "X-Cache-Hit": "true",
+                },
             });
         }
@@ Expand All @@
             const response: StsResponse = { sts };
             return new Response(JSON.stringify(response), {
                 status: 200,
-                headers: { "Content-Type": "application/json", "X-Cache-Hit": "false" },
+                headers: {
+                    "Content-Type": "application/json",
+                    "X-Cache-Hit": "false",
+                },
             });
         } else {
-            return new Response(JSON.stringify({ error: "Timestamp not found in player script" }), {
-                status: 404,
-                headers: { "Content-Type": "application/json" },
-            });
+            return new Response(
+                JSON.stringify({ error: "Timestamp not found in player script" }),
+                {
+                    status: 404,
+                    headers: { "Content-Type": "application/json" },
+                },
+            );
         }
-    }
+    }

src/handlers/resolveUrl.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,23 +1,46 @@
  
    import { getSolvers } from "../solver.ts";

    import type { RequestContext, ResolveUrlRequest, ResolveUrlResponse } from "../types.ts";

    import type {

        RequestContext,

        ResolveUrlRequest,

        ResolveUrlResponse,

    } from "../types.ts";

    export async function handleResolveUrl(ctx: RequestContext): Promise<Response> {

        const { stream_url, player_url, encrypted_signature, signature_key, n_param: nParamFromRequest } = ctx.body as ResolveUrlRequest;

        const {

            stream_url,

            player_url,

            encrypted_signature,

            signature_key,

            n_param: nParamFromRequest,

        } = ctx.body as ResolveUrlRequest;

        const solvers = await getSolvers(player_url);

        if (!solvers) {

            return new Response(JSON.stringify({ error: "Failed to generate solvers from player script" }), { status: 500, headers: { "Content-Type": "application/json" } });

            return new Response(

                JSON.stringify({

                    error: "Failed to generate solvers from player script",

                }),

                { status: 500, headers: { "Content-Type": "application/json" } },

            );

        }

        const url = new URL(stream_url);

        if (encrypted_signature) {

            if (!solvers.sig) {

                return new Response(JSON.stringify({ error: "No signature solver found for this player" }), { status: 500, headers: { "Content-Type": "application/json" } });

                return new Response(

                    JSON.stringify({

                        error: "No signature solver found for this player",

                    }),

                    {

                        status: 500,

                        headers: { "Content-Type": "application/json" },

                    },

                );

            }

            const decryptedSig = solvers.sig(encrypted_signature);

            const sigKey = signature_key || 'sig';

            const sigKey = signature_key || "sig";

            url.searchParams.set(sigKey, decryptedSig);

            url.searchParams.delete("s");

        }

    @@ -29,15 +52,26 @@ export async function handleResolveUrl(ctx: RequestContext): Promise<Response> {
  
        if (solvers.n) {

            if (!nParam) {

                return new Response(JSON.stringify({ error: "n_param not found in request or stream_url" }), { status: 400, headers: { "Content-Type": "application/json" } });

                return new Response(

                    JSON.stringify({

                        error: "n_param not found in request or stream_url",

                    }),

                    {

                        status: 400,

                        headers: { "Content-Type": "application/json" },

                    },

                );

            }

            const decryptedN = solvers.n(nParam);

            url.searchParams.set("n", decryptedN);

        }

        const response: ResolveUrlResponse = {

            resolved_url: url.toString(),

        };

        return new Response(JSON.stringify(response), { status: 200, headers: { "Content-Type": "application/json" } });

    }
      
        return new Response(JSON.stringify(response), {

            status: 200,

            headers: { "Content-Type": "application/json" },

        });

    }

src/instrumentedCache.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ export class InstrumentedLRU<T> extends LRU<T> { @@
             super.remove(key);
             cacheSize.labels({ cache_name: this.cacheName }).set(this.size);
         }
-    }
+    }

src/metrics.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,14 @@ export const endpointHits = Counter.with({ @@
     export const responseCodes = Counter.with({
         name: "http_responses_total",
         help: "Total number of HTTP responses.",
-        labels: ["method", "pathname", "status", "player_id", "plugin_version", "user_agent"],
+        labels: [
+            "method",
+            "pathname",
+            "status",
+            "player_id",
+            "plugin_version",
+            "user_agent",
+        ],
         registry: [registry],
     });
@@ Expand Down Expand Up / @@ -58,4 +65,4 @@ export const playerScriptFetches = Counter.with({ @@
         help: "Total number of player script fetches.",
         labels: ["player_url", "status"],
         registry: [registry],
-    });
+    });

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrate workflow #7

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!