Merge remote-tracking branch 'origin/run-engine-2' into run-engine-batch-trigger

Author: matt-aitken

.github/workflows/e2e.yml

@@ -38,6 +38,9 @@ jobs:
       - name: 📥 Download deps
         run: pnpm install --frozen-lockfile --filter trigger.dev...
 
+      - name: 📀 Generate Prisma Client
+        run: pnpm run generate
+
       - name: 🔧 Build v3 cli monorepo dependencies
         run: pnpm run build --filter trigger.dev^...
 

.github/workflows/pr_checks.yml

@@ -54,6 +54,9 @@ jobs:
       - name: 📥 Download deps
         run: pnpm install --frozen-lockfile
 
+      - name: 📀 Generate Prisma Client
+        run: pnpm run generate
+
       - name: 🏗️ Build
         run: pnpm run build --filter "@trigger.dev/*" --filter "trigger.dev"
 

.github/workflows/unit-tests.yml

@@ -24,6 +24,13 @@ jobs:
           node-version: 20.11.1
           cache: "pnpm"
 
+      # ..to avoid rate limits when pulling images
+      - name: 🐳 Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: 📥 Download deps
         run: pnpm install --frozen-lockfile
 

apps/coordinator/package.json

@@ -23,10 +23,8 @@
     "tinyexec": "^0.3.0"
   },
   "devDependencies": {
-    "@types/node": "^18",
     "dotenv": "^16.4.2",
     "esbuild": "^0.19.11",
-    "tsx": "^4.7.0",
-    "typescript": "^5.3.3"
+    "tsx": "^4.7.0"
   }
 }

apps/coordinator/src/checkpointer.ts

@@ -193,7 +193,7 @@ export class Checkpointer {
     const start = performance.now();
     this.#logger.log(`checkpointAndPush() start`, { start, opts });
 
-    let interval: NodeJS.Timer | undefined;
+    let interval: NodeJS.Timeout | undefined;
 
     if (opts.shouldHeartbeat) {
       interval = setInterval(() => {

apps/docker-provider/package.json

@@ -20,10 +20,8 @@
     "execa": "^8.0.1"
   },
   "devDependencies": {
-    "@types/node": "^18.19.8",
     "dotenv": "^16.4.2",
     "esbuild": "^0.19.11",
-    "tsx": "^4.7.0",
-    "typescript": "^5.3.3"
+    "tsx": "^4.7.0"
   }
 }

apps/kubernetes-provider/package.json

@@ -23,7 +23,6 @@
   "devDependencies": {
     "dotenv": "^16.4.2",
     "esbuild": "^0.19.11",
-    "tsx": "^4.7.0",
-    "typescript": "^5.3.3"
+    "tsx": "^4.7.0"
   }
 }

apps/proxy/package.json

@@ -9,7 +9,6 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20240512.0",
-    "typescript": "^5.0.4",
     "wrangler": "^3.57.1"
   },
   "dependencies": {

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

@@ -6,6 +6,7 @@ import {
 import { env } from "~/env.server";
 import { authenticateApiRequest } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
+import { ServiceValidationError } from "~/v3/services/baseService.server";
 import { InitializeDeploymentService } from "~/v3/services/initializeDeployment.server";
 
 export async function action({ request, params }: ActionFunctionArgs) {
@@ -33,18 +34,30 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
   const service = new InitializeDeploymentService();
 
-  const { deployment, imageTag } = await service.call(authenticatedEnv, body.data);
-
-  const responseBody: InitializeDeploymentResponseBody = {
-    id: deployment.friendlyId,
-    contentHash: deployment.contentHash,
-    shortCode: deployment.shortCode,
-    version: deployment.version,
-    externalBuildData:
-      deployment.externalBuildData as InitializeDeploymentResponseBody["externalBuildData"],
-    imageTag,
-    registryHost: body.data.registryHost ?? env.DEPLOY_REGISTRY_HOST,
-  };
-
-  return json(responseBody, { status: 200 });
+  try {
+    const { deployment, imageTag } = await service.call(authenticatedEnv, body.data);
+
+    const responseBody: InitializeDeploymentResponseBody = {
+      id: deployment.friendlyId,
+      contentHash: deployment.contentHash,
+      shortCode: deployment.shortCode,
+      version: deployment.version,
+      externalBuildData:
+        deployment.externalBuildData as InitializeDeploymentResponseBody["externalBuildData"],
+      imageTag,
+      registryHost: body.data.registryHost ?? env.DEPLOY_REGISTRY_HOST,
+    };
+
+    return json(responseBody, { status: 200 });
+  } catch (error) {
+    if (error instanceof ServiceValidationError) {
+      return json({ error: error.message }, { status: 400 });
+    } else if (error instanceof Error) {
+      logger.error("Error initializing deployment", { error: error.message });
+      return json({ error: `Internal server error: ${error.message}` }, { status: 500 });
+    } else {
+      logger.error("Error initializing deployment", { error: String(error) });
+      return json({ error: "Internal server error" }, { status: 500 });
+    }
+  }
 }

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

@@ -15,7 +15,13 @@ export const loader = createLoaderApiRoute(
     corsStrategy: "all",
     findResource: async () => 1, // This is a dummy function, we don't need to find a resource
   },
-  async ({ authentication }): Promise<TypedResponse<WorkersListResponseBody>> => {
+  async ({
+    authentication,
+  }): Promise<TypedResponse<WorkersListResponseBody | { error: string }>> => {
+    if (authentication.environment.project.engine !== "V2") {
+      return json({ error: "Not supported for V1 projects" }, { status: 400 });
+    }
+
     const service = new WorkerGroupService();
     const workers = await service.listWorkerGroups({
       projectId: authentication.environment.projectId,
@@ -33,12 +39,19 @@ export const loader = createLoaderApiRoute(
   }
 );
 
-export const action = createActionApiRoute(
+export const { action } = createActionApiRoute(
   {
     corsStrategy: "all",
     body: WorkersCreateRequestBody,
   },
-  async ({ authentication, body }): Promise<TypedResponse<WorkersCreateResponseBody>> => {
+  async ({
+    authentication,
+    body,
+  }): Promise<TypedResponse<WorkersCreateResponseBody | { error: string }>> => {
+    if (authentication.environment.project.engine !== "V2") {
+      return json({ error: "Not supported" }, { status: 400 });
+    }
+
     const service = new WorkerGroupService();
     const { workerGroup, token } = await service.createWorkerGroup({
       projectId: authentication.environment.projectId,