Merge remote-tracking branch 'origin/main' into docs/task-examples

Author: samejr

.changeset/curvy-beers-camp.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fixed empty env vars overriding in dev runs

.changeset/gentle-planets-return.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/build": patch
+---
+
+Fix issue with emitDecoratorMetadata and tsconfigs with extends

.changeset/mighty-sheep-guess.md

@@ -0,0 +1,7 @@
+---
+"@trigger.dev/sdk": patch
+"trigger.dev": patch
+"@trigger.dev/core": patch
+---
+
+Support self-hosters pushing to a custom registry when running deploy

.changeset/proud-dogs-battle.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/build": patch
+---
+
+Add support for prisma typed sql

.changeset/rude-houses-promise.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fix --project-ref when running deploy

.changeset/strong-years-help.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fixed stuck runs when a child run fails with a process exit

.changeset/tidy-roses-guess.md

@@ -0,0 +1,6 @@
+---
+"trigger.dev": patch
+"@trigger.dev/core": patch
+---
+
+Add remote forced externals system, in case we come across another package that cannot be bundled (spurred on by header-generator)

.changeset/twenty-seahorses-admire.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/sdk": patch
+---
+
+Remove msw and retry.interceptFetch

.changeset/violet-cherries-deny.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/core": patch
+---
+
+fix node10 moduleResolution in @trigger.dev/core

.changeset/wise-pens-agree.md

@@ -0,0 +1,6 @@
+---
+"trigger.dev": patch
+"@trigger.dev/core": patch
+---
+
+Only import import-in-the-middle hook if there are instrumented packages

.vscode/launch.json

@@ -20,15 +20,6 @@
       "url": "http://localhost:3030",
       "webRoot": "${workspaceFolder}/apps/webapp/app"
     },
-    {
-      "type": "node-terminal",
-      "request": "launch",
-      "name": "Debug v2 job catalog",
-      "command": "pnpm run byo-auth",
-      "envFile": "${workspaceFolder}/references/job-catalog/.env",
-      "cwd": "${workspaceFolder}/references/job-catalog",
-      "sourceMaps": true
-    },
     {
       "type": "node-terminal",
       "request": "launch",
@@ -89,9 +80,17 @@
       "type": "node-terminal",
       "request": "launch",
       "name": "Debug CLI e2e tests",
-      "command": "PM=yarn pnpm run test:e2e",
+      "command": "MOD=otel-telemetry-loader pnpm run test:e2e",
       "cwd": "${workspaceFolder}/packages/cli-v3",
       "sourceMaps": true
+    },
+    {
+      "type": "node-terminal",
+      "request": "launch",
+      "name": "debug v3 hello-world dev",
+      "command": "pnpm exec triggerdev dev",
+      "cwd": "${workspaceFolder}/references/hello-world",
+      "sourceMaps": true
     }
   ]
 }

apps/webapp/app/presenters/v3/UsagePresenter.server.ts

@@ -105,18 +105,18 @@ export class UsagePresenter extends BasePresenter {
     //usage by task
     const tasks = this._replica.$queryRaw<TaskUsageItem[]>`
     SELECT
-      tr."taskIdentifier",
-      COUNT(*) AS "runCount",
-      AVG(tr."usageDurationMs") AS "averageDuration",
-      SUM(tr."usageDurationMs") AS "totalDuration",
-      AVG(tr."costInCents") / 100.0 AS "averageCost",
-      SUM(tr."costInCents") / 100.0 AS "totalCost",
-      SUM(tr."baseCostInCents") / 100.0 AS "totalBaseCost"
+    tr."taskIdentifier",
+    COUNT(*) AS "runCount",
+    AVG(tr."usageDurationMs") AS "averageDuration",
+    SUM(tr."usageDurationMs") AS "totalDuration",
+    AVG(tr."costInCents") / 100.0 AS "averageCost",
+    SUM(tr."costInCents") / 100.0 AS "totalCost",
+    SUM(tr."baseCostInCents") / 100.0 AS "totalBaseCost"
   FROM
       ${sqlDatabaseSchema}."TaskRun" tr
       JOIN ${sqlDatabaseSchema}."Project" pr ON pr.id = tr."projectId"
       JOIN ${sqlDatabaseSchema}."Organization" org ON org.id = pr."organizationId"
-      JOIN ${sqlDatabaseSchema}."RuntimeEnvironment" env ON env."projectId" = pr.id
+      JOIN ${sqlDatabaseSchema}."RuntimeEnvironment" env ON env."id" = tr."runtimeEnvironmentId"
   WHERE
       env.type <> 'DEVELOPMENT'
       AND tr."createdAt" > ${startOfMonth}
@@ -132,7 +132,7 @@ export class UsagePresenter extends BasePresenter {
           averageDuration: Number(item.averageDuration),
           averageCost: Number(item.averageCost) + env.CENTS_PER_RUN / 100,
           totalDuration: Number(item.totalDuration),
-          totalCost: Number(item.totalCost + item.totalBaseCost),
+          totalCost: Number(item.totalCost) + Number(item.totalBaseCost),
         }))
         .sort((a, b) => b.totalCost - a.totalCost);
     });

apps/webapp/app/routes/api.v1.deployments.ts

@@ -43,7 +43,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
     externalBuildData:
       deployment.externalBuildData as InitializeDeploymentResponseBody["externalBuildData"],
     imageTag,
-    registryHost: env.DEPLOY_REGISTRY_HOST,
+    registryHost: body.data.registryHost ?? env.DEPLOY_REGISTRY_HOST,
   };
 
   return json(responseBody, { status: 200 });

apps/webapp/app/routes/api.v1.usage.ingest.ts

@@ -9,7 +9,13 @@ export async function action({ request }: ActionFunctionArgs) {
   }
 
   try {
-    return await reportComputeUsage(request);
+    const result = await reportComputeUsage(request);
+
+    if (result === undefined) {
+      return new Response(null, { status: 500 });
+    }
+
+    return result;
   } catch (e) {
     logger.error("Error reporting compute usage", { error: e });
     return new Response(null, { status: 500 });

apps/webapp/app/v3/otlpExporter.server.ts

@@ -693,7 +693,7 @@ function isStringValue(value: AnyValue | undefined): value is { stringValue: str
 function isIntValue(value: AnyValue | undefined): value is { intValue: bigint } {
   if (!value) return false;
 
-  return typeof value.intValue === "number";
+  return typeof value.intValue === "number" || typeof value.intValue === "bigint";
 }
 
 function isDoubleValue(value: AnyValue | undefined): value is { doubleValue: number } {

apps/webapp/app/v3/services/createCheckpoint.server.ts

@@ -169,21 +169,43 @@ export class CreateCheckpointService extends BaseService {
             attemptId: attempt.id,
             taskRunId: attempt.taskRunId,
             type: "WAIT_FOR_TASK",
+            reason,
           });
           await marqs?.cancelHeartbeat(attempt.taskRunId);
 
+          const childRun = await this._prisma.taskRun.findFirst({
+            where: {
+              friendlyId: reason.friendlyId,
+            },
+          });
+
+          if (!childRun) {
+            logger.error("CreateCheckpointService: WAIT_FOR_TASK child run not found", {
+              friendlyId: reason.friendlyId,
+            });
+
+            return {
+              success: true,
+              checkpoint,
+              event: checkpointEvent,
+              keepRunAlive: false,
+            };
+          }
+
           const resumeService = new ResumeDependentParentsService(this._prisma);
-          const result = await resumeService.call({ id: attempt.taskRunId });
+          const result = await resumeService.call({ id: childRun.id });
 
           if (result.success) {
             logger.log("CreateCheckpointService: Resumed dependent parents", {
               result,
+              childRun,
               attempt,
               checkpointEvent,
             });
           } else {
             logger.error("CreateCheckpointService: Failed to resume dependent parents", {
               result,
+              childRun,
               attempt,
               checkpointEvent,
             });

apps/webapp/app/v3/services/createDeploymentBackgroundWorker.server.ts

@@ -9,6 +9,7 @@ import {
   syncDeclarativeSchedules,
 } from "./createBackgroundWorker.server";
 import { TimeoutDeploymentService } from "./timeoutDeployment.server";
+import { logger } from "~/services/logger.server";
 
 export class CreateDeploymentBackgroundWorkerService extends BaseService {
   public async call(

apps/webapp/app/v3/services/initializeDeployment.server.ts

@@ -29,7 +29,9 @@ export class InitializeDeploymentService extends BaseService {
       const nextVersion = calculateNextBuildVersion(latestDeployment?.version);
 
       // Try and create a depot build and get back the external build data
-      const externalBuildData = await createRemoteImageBuild(environment.project);
+      const externalBuildData = !!payload.selfHosted
+        ? await createRemoteImageBuild(environment.project)
+        : undefined;
 
       const triggeredBy = payload.userId
         ? await this._prisma.user.findUnique({
@@ -65,7 +67,9 @@ export class InitializeDeploymentService extends BaseService {
         new Date(Date.now() + 180_000) // 3 minutes
       );
 
-      const imageTag = `${env.DEPLOY_REGISTRY_NAMESPACE}/${environment.project.externalRef}:${deployment.version}.${environment.slug}`;
+      const imageTag = `${payload.namespace ?? env.DEPLOY_REGISTRY_NAMESPACE}/${
+        environment.project.externalRef
+      }:${deployment.version}.${environment.slug}`;
 
       return { deployment, imageTag };
     });

docker/docker-compose.yml

@@ -57,3 +57,16 @@ services:
       - app_network
     ports:
       - 6379:6379
+
+  # otel-collector:
+  #   container_name: otel-collector
+  #   image: otel/opentelemetry-collector-contrib:latest
+  #   restart: always
+  #   command: ["--config", "/etc/otel-collector-config.yaml"]
+  #   volumes:
+  #     - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
+  #   ports:
+  #     - "55680:55680"
+  #     - "55681:55681"
+  #     - "4317:4317" # OTLP gRPC receiver
+  #     - "4318:4318" # OTLP http receiver

docker/otel-collector-config.yaml

@@ -5,21 +5,11 @@ receivers:
         endpoint: 0.0.0.0:4317
       http:
         endpoint: 0.0.0.0:4318
-  otlp/internal:
-    protocols:
-      http:
-        endpoint: 0.0.0.0:4319
 
 processors:
   batch:
 
 exporters:
-  otlphttp/internal:
-    endpoint: "https://otel.baselime.io/v1/"
-    headers:
-      "x-api-key": ${env:BASELIME_API_KEY}
-      "x-service": ${env:BASELIME_SERVICE}
-      "x-baselime-dataset": "otel"
   logging:
     verbosity: normal
   otlphttp:
@@ -36,7 +26,3 @@ service:
       receivers: [otlp]
       processors: [batch]
       exporters: [otlphttp]
-    traces/internal:
-      receivers: [otlp/internal]
-      processors: [batch]
-      exporters: [otlphttp/internal]

docs/errors-retrying.mdx

@@ -200,8 +200,11 @@ In this complicated example:
 - If there are no Response headers we let the normal retrying logic handle it (return undefined).
 - If we've run out of requests or tokens we retry at the time specified in the headers.
 
-```ts
+<CodeGroup>
+
+```ts tasks.ts
 import { task } from "@trigger.dev/sdk/v3";
+import { calculateISO8601DurationOpenAIVariantResetAt, openai } from "./openai.js";
 
 export const openaiTask = task({
   id: "openai-task",
@@ -257,6 +260,48 @@ export const openaiTask = task({
 });
 ```
 
+```ts openai.ts
+import { OpenAI } from "openai";
+
+export const openai = new OpenAI({ apiKey: env.OPENAI_API_KEY });
+
+export function calculateISO8601DurationOpenAIVariantResetAt(
+  resets: string,
+  now: Date = new Date()
+): Date | undefined {
+  // Check if the input is null or undefined
+  if (!resets) return undefined;
+
+  // Regular expression to match the duration string pattern
+  const pattern = /^(?:(\d+)d)?(?:(\d+)h)?(?:(\d+)m)?(?:(\d+(?:\.\d+)?)s)?(?:(\d+)ms)?$/;
+  const match = resets.match(pattern);
+
+  // If the string doesn't match the expected format, return undefined
+  if (!match) return undefined;
+
+  // Extract days, hours, minutes, seconds, and milliseconds from the string
+  const days = parseInt(match[1] ?? "0", 10) || 0;
+  const hours = parseInt(match[2] ?? "0", 10) || 0;
+  const minutes = parseInt(match[3] ?? "0", 10) || 0;
+  const seconds = parseFloat(match[4] ?? "0") || 0;
+  const milliseconds = parseInt(match[5] ?? "0", 10) || 0;
+
+  // Calculate the future date based on the current date plus the extracted time
+  const resetAt = new Date(now);
+  resetAt.setDate(resetAt.getDate() + days);
+  resetAt.setHours(resetAt.getHours() + hours);
+  resetAt.setMinutes(resetAt.getMinutes() + minutes);
+  resetAt.setSeconds(resetAt.getSeconds() + Math.floor(seconds));
+  resetAt.setMilliseconds(
+    resetAt.getMilliseconds() + (seconds - Math.floor(seconds)) * 1000 + milliseconds
+  );
+
+  return resetAt;
+}
+```
+
+</CodeGroup>
+
 ## Preventing retries
 
 ### Using `AbortTaskRunError`