Merge branch 'main' into issue/ffmpegv7

Author: Rudra-Sankha-Sinhamahapatra

.cursor/rules/writing-tasks.mdc

@@ -1,44 +1,23 @@
-\*.log
-.git
-.github
-
-# editor
-
-.idea
-.vscode
-
-# dependencies
-
+**/*.log
+**/*.pem
+**/*.tsbuildinfo
+
+**/.cache
+**/.env
+**/.next
+**/.output
+**/.trigger
+**/.tshy
+**/.tshy-build
+**/.turbo
+**/.vercel
+**/.wrangler
+
+**/dist
 **/node_modules
-.pnp
-.pnp.js
-
-# testing
-
-coverage
-
-# next.js
 
-.next/
-build
-
-# packages
-
-build
-dist
-packages/\*\*/dist
-
-# misc
-
-.DS_Store
-\*.pem
-
-.turbo
-.vercel
-.cache
-.output
-.trigger
-apps/\*\*/public/build
+apps/webapp/build
+apps/webapp/public/build
 
 cypress/screenshots
 cypress/videos
@@ -47,8 +26,21 @@ apps/**/styles/tailwind.css
 packages/**/styles/tailwind.css
 
 .changeset
-references
+.DS_Store
+.git
+.github
+.idea
+.pnp
+.pnp.js
+.vscode
+
+coverage
+build
+docs
 examples
+out
+references
+
 CHANGESETS.md
 CONTRIBUTING.md
 README.md

.dockerignore

@@ -1,4 +1,5 @@
 link-workspace-packages=false
 public-hoist-pattern[]=*prisma*
 prefer-workspace-packages=true
-update-notifier=false
+update-notifier=false
+side-effects-cache=false

.npmrc

@@ -6,7 +6,6 @@ FROM node-22-alpine AS pruner
 
 COPY --chown=node:node . .
 RUN npx -q turbo@1.10.9 prune --scope=supervisor --docker
-RUN find . -name "node_modules" -type d -prune -exec rm -rf '{}' +
 
 FROM node-22-alpine AS base
 
@@ -17,26 +16,17 @@ COPY --from=pruner --chown=node:node /app/out/json/ .
 COPY --from=pruner --chown=node:node /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
 COPY --from=pruner --chown=node:node /app/out/pnpm-workspace.yaml ./pnpm-workspace.yaml
 
-FROM base AS dev-deps
-RUN corepack enable
-ENV NODE_ENV development
-
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm fetch --no-frozen-lockfile
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --ignore-scripts --no-frozen-lockfile
-
-FROM base AS prod-deps
-RUN corepack enable
-ENV NODE_ENV production
+RUN corepack enable && corepack prepare --activate
 
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --prod --no-frozen-lockfile
+FROM base AS deps-fetcher
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm fetch --frozen-lockfile
 
-COPY --from=pruner --chown=node:node /app/internal-packages/database/prisma/schema.prisma /app/internal-packages/database/prisma/schema.prisma
+FROM deps-fetcher AS dev-deps
+ENV NODE_ENV development
 
-ENV NPM_CONFIG_IGNORE_WORKSPACE_ROOT_CHECK true
-RUN pnpx prisma@5.4.1 generate --schema /app/internal-packages/database/prisma/schema.prisma
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --frozen-lockfile --offline --ignore-scripts
 
 FROM base AS builder
-RUN corepack enable
 
 COPY --from=pruner --chown=node:node /app/out/full/ .
 COPY --from=dev-deps --chown=node:node /app/ .
@@ -45,19 +35,19 @@ COPY --chown=node:node .configs/tsconfig.base.json .configs/tsconfig.base.json
 COPY --chown=node:node scripts/updateVersion.ts scripts/updateVersion.ts
 
 RUN pnpm run generate && \
-  pnpm run -r --filter supervisor... build
+  pnpm run --filter supervisor... build&& \
+  pnpm deploy --filter=supervisor --prod /prod/supervisor
 
 FROM base AS runner
 
-RUN corepack enable
 ENV NODE_ENV production
 
-COPY --from=pruner --chown=node:node /app/out/full/ .
-COPY --from=prod-deps --chown=node:node /app .
-COPY --from=builder --chown=node:node /app/apps/supervisor ./apps/supervisor
+COPY --from=builder /prod/supervisor /app/apps/supervisor
 
 EXPOSE 8000
-
 USER node
 
+# ensure pnpm is installed during build and not silently downloaded at runtime
+RUN pnpm -v
+
 CMD [ "/usr/bin/dumb-init", "--", "pnpm", "run", "--filter", "supervisor", "start"]

apps/supervisor/Containerfile

@@ -87,6 +87,10 @@ class ManagedSupervisor {
     });
 
     if (env.TRIGGER_CHECKPOINT_URL) {
+      this.logger.log("[ManagedWorker] 🥶 Checkpoints enabled", {
+        checkpointUrl: env.TRIGGER_CHECKPOINT_URL,
+      });
+
       this.checkpointClient = new CheckpointClient({
         apiUrl: new URL(env.TRIGGER_CHECKPOINT_URL),
         workerClient: this.workerSession.httpClient,
@@ -126,8 +130,13 @@ class ManagedSupervisor {
       if (message.checkpoint) {
         this.logger.log("[ManagedWorker] Restoring run", { runId: message.run.id });
 
+        if (!this.checkpointClient) {
+          this.logger.error("[ManagedWorker] No checkpoint client", { runId: message.run.id });
+          return;
+        }
+
         try {
-          const didRestore = await this.checkpointClient?.restoreRun({
+          const didRestore = await this.checkpointClient.restoreRun({
             runFriendlyId: message.run.friendlyId,
             snapshotFriendlyId: message.snapshot.friendlyId,
             checkpoint: message.checkpoint,
@@ -214,33 +223,41 @@ class ManagedSupervisor {
 
     const warmStartUrlWithPath = new URL("/warm-start", this.warmStartUrl);
 
-    const res = await fetch(warmStartUrlWithPath.href, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({ dequeuedMessage }),
-    });
-
-    if (!res.ok) {
-      this.logger.error("[ManagedWorker] Warm start failed", {
-        runId: dequeuedMessage.run.id,
+    try {
+      const res = await fetch(warmStartUrlWithPath.href, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ dequeuedMessage }),
       });
-      return false;
-    }
 
-    const data = await res.json();
-    const parsedData = z.object({ didWarmStart: z.boolean() }).safeParse(data);
+      if (!res.ok) {
+        this.logger.error("[ManagedWorker] Warm start failed", {
+          runId: dequeuedMessage.run.id,
+        });
+        return false;
+      }
+
+      const data = await res.json();
+      const parsedData = z.object({ didWarmStart: z.boolean() }).safeParse(data);
 
-    if (!parsedData.success) {
-      this.logger.error("[ManagedWorker] Warm start response invalid", {
+      if (!parsedData.success) {
+        this.logger.error("[ManagedWorker] Warm start response invalid", {
+          runId: dequeuedMessage.run.id,
+          data,
+        });
+        return false;
+      }
+
+      return parsedData.data.didWarmStart;
+    } catch (error) {
+      this.logger.error("[ManagedWorker] Warm start error", {
         runId: dequeuedMessage.run.id,
-        data,
+        error,
       });
       return false;
     }
-
-    return parsedData.data.didWarmStart;
   }
 
   async start() {

apps/supervisor/src/index.ts

@@ -1,30 +1,6 @@
-import { customAlphabet } from "nanoid";
-
 export function getDockerHostDomain() {
   const isMacOs = process.platform === "darwin";
   const isWindows = process.platform === "win32";
 
   return isMacOs || isWindows ? "host.docker.internal" : "localhost";
 }
-
-export class IdGenerator {
-  private alphabet: string;
-  private length: number;
-  private prefix: string;
-
-  constructor({ alphabet, length, prefix }: { alphabet: string; length: number; prefix: string }) {
-    this.alphabet = alphabet;
-    this.length = length;
-    this.prefix = prefix;
-  }
-
-  generate(): string {
-    return `${this.prefix}${customAlphabet(this.alphabet, this.length)()}`;
-  }
-}
-
-export const RunnerId = new IdGenerator({
-  alphabet: "123456789abcdefghijkmnopqrstuvwxyz",
-  length: 20,
-  prefix: "runner_",
-});

apps/supervisor/src/util.ts

@@ -1,12 +1,13 @@
 import { SimpleStructuredLogger } from "@trigger.dev/core/v3/utils/structuredLogger";
+import { RunnerId } from "@trigger.dev/core/v3/isomorphic";
 import {
   type WorkloadManager,
   type WorkloadManagerCreateOptions,
   type WorkloadManagerOptions,
 } from "./types.js";
 import { x } from "tinyexec";
 import { env } from "../env.js";
-import { getDockerHostDomain, RunnerId } from "../util.js";
+import { getDockerHostDomain } from "../util.js";
 
 export class DockerWorkloadManager implements WorkloadManager {
   private readonly logger = new SimpleStructuredLogger("docker-workload-provider");

apps/supervisor/src/workloadManager/docker.ts

@@ -4,7 +4,7 @@ import {
   type WorkloadManagerCreateOptions,
   type WorkloadManagerOptions,
 } from "./types.js";
-import { RunnerId } from "../util.js";
+import { RunnerId } from "@trigger.dev/core/v3/isomorphic";
 import type { EnvironmentType, MachinePreset } from "@trigger.dev/core/v3";
 import { env } from "../env.js";
 import { type K8sApi, createK8sApi, type k8s } from "../clients/kubernetes.js";
@@ -48,15 +48,14 @@ export class KubernetesWorkloadManager implements WorkloadManager {
               app: "task-run",
               "app.kubernetes.io/part-of": "trigger-worker",
               "app.kubernetes.io/component": "create",
-              run: opts.runId,
             },
           },
           spec: {
             ...this.#defaultPodSpec,
             terminationGracePeriodSeconds: 60 * 60,
             containers: [
               {
-                name: runnerId,
+                name: "run-controller",
                 image: opts.image,
                 ports: [
                   {

apps/supervisor/src/workloadManager/kubernetes.ts

@@ -200,30 +200,29 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
           handler: async ({ reply, params, req }) => {
             console.debug("Suspend request", { params, headers: req.headers });
 
-            const runnerId = this.runnerIdFromRequest(req);
-
-            if (!runnerId) {
-              console.error("Invalid headers for suspend request", {
-                ...params,
-                headers: req.headers,
-              });
+            if (!this.checkpointClient) {
               reply.json(
                 {
                   ok: false,
-                  error: "Invalid headers",
+                  error: "Checkpoints disabled",
                 } satisfies WorkloadSuspendRunResponseBody,
                 false,
                 400
               );
               return;
             }
 
-            if (!this.checkpointClient) {
-              console.error("Checkpoint client unavailable - suspending impossible", { params });
+            const runnerId = this.runnerIdFromRequest(req);
+
+            if (!runnerId) {
+              console.error("Invalid headers for suspend request", {
+                ...params,
+                headers: req.headers,
+              });
               reply.json(
                 {
                   ok: false,
-                  error: "Suspends are not enabled",
+                  error: "Invalid headers",
                 } satisfies WorkloadSuspendRunResponseBody,
                 false,
                 400

apps/supervisor/src/workloadServer/index.ts

@@ -1,4 +1,6 @@
-FROM node:20.11.1-bullseye-slim@sha256:5a5a92b3a8d392691c983719dbdc65d9f30085d6dcd65376e7a32e6fe9bf4cbe AS pruner
+ARG NODE_IMAGE=node:20.11.1-bullseye-slim@sha256:5a5a92b3a8d392691c983719dbdc65d9f30085d6dcd65376e7a32e6fe9bf4cbe
+
+FROM ${NODE_IMAGE} AS pruner
 
 WORKDIR /triggerdotdev
 
@@ -7,7 +9,7 @@ RUN npx -q turbo@1.10.9 prune --scope=webapp --docker
 RUN find . -name "node_modules" -type d -prune -exec rm -rf '{}' +
 
 # Base strategy to have layer caching
-FROM node:20.11.1-bullseye-slim@sha256:5a5a92b3a8d392691c983719dbdc65d9f30085d6dcd65376e7a32e6fe9bf4cbe AS base
+FROM ${NODE_IMAGE} AS base
 RUN apt-get update && apt-get install -y openssl dumb-init
 WORKDIR /triggerdotdev
 COPY --chown=node:node .gitignore .gitignore
@@ -53,7 +55,7 @@ RUN pnpm run generate
 RUN pnpm run build --filter=webapp...
 
 # Runner
-FROM node:20.11.1-bullseye-slim@sha256:5a5a92b3a8d392691c983719dbdc65d9f30085d6dcd65376e7a32e6fe9bf4cbe AS runner
+FROM ${NODE_IMAGE} AS runner
 RUN apt-get update && apt-get install -y openssl netcat-openbsd ca-certificates
 WORKDIR /triggerdotdev
 RUN corepack enable