trigger.dev 0.0.0-v3-canary-20240321105132 → 0.0.0-v3-canary-20240321121448

package/dist/templates/{trigger.config.ts → trigger.config.ts.template}

@@ -1,6 +1,6 @@
-import type { ProjectConfig } from "@trigger.dev/core/v3";
+import type { TriggerConfig } from "@trigger.dev/sdk/v3";
 
-export const config: ProjectConfig = {
+export const config: TriggerConfig = {
   project: "${projectRef}",
   retries: {
     enabledInDev: false,

package/dist/workers/dev/worker-facade.js

@@ -17,7 +17,7 @@ import {
 } from "@trigger.dev/core/v3";
 
 // package.json
-var version = "0.0.0-v3-canary-20240321105132";
+var version = "0.0.0-v3-canary-20240321121448";
 
 // src/workers/dev/worker-facade.ts
 __WORKER_SETUP__;

package/dist/workers/prod/entry-point.js

@@ -2,9 +2,90 @@
 import {
   CoordinatorToProdWorkerMessages,
   ProdWorkerToCoordinatorMessages,
+  ZodSocketConnection as ZodSocketConnection2
+} from "@trigger.dev/core/v3";
+
+// ../core-apps/src/http.ts
+var getTextBody = (req) => new Promise((resolve) => {
+  let body = "";
+  req.on("readable", () => {
+    const chunk = req.read();
+    if (chunk) {
+      body += chunk;
+    }
+  });
+  req.on("end", () => {
+    resolve(body);
+  });
+});
+var HttpReply = class {
+  constructor(response) {
+    this.response = response;
+  }
+  empty(status) {
+    return this.response.writeHead(status ?? 200).end();
+  }
+  text(text, status, contentType) {
+    return this.response.writeHead(status ?? 200, { "Content-Type": contentType || "text/plain" }).end(text.endsWith("\n") ? text : `${text}
+`);
+  }
+};
+function getRandomInteger(min, max) {
+  const intMin = Math.ceil(min);
+  const intMax = Math.floor(max);
+  return Math.floor(Math.random() * (intMax - intMin + 1)) + intMin;
+}
+function getRandomPortNumber() {
+  return getRandomInteger(8e3, 9999);
+}
+
+// ../core-apps/src/logger.ts
+var SimpleLogger = class {
+  constructor(prefix) {
+    this.prefix = prefix;
+  }
+  #debugEnabled = ["1", "true"].includes(process.env.DEBUG ?? "");
+  log(arg0, ...argN) {
+    console.log(...this.#getPrefixedArgs(arg0, ...argN));
+    return arg0;
+  }
+  debug(arg0, ...argN) {
+    if (!this.#debugEnabled) {
+      return arg0;
+    }
+    console.debug(...this.#getPrefixedArgs("DEBUG", arg0, ...argN));
+    return arg0;
+  }
+  error(arg0, ...argN) {
+    console.error(...this.#getPrefixedArgs(arg0, ...argN));
+    return arg0;
+  }
+  #getPrefixedArgs(...args) {
+    if (!this.prefix) {
+      return args;
+    }
+    return [this.prefix, ...args];
+  }
+};
+
+// ../core-apps/src/provider.ts
+import {
+  ClientToSharedQueueMessages,
+  clientWebsocketMessages,
+  PlatformToProviderMessages,
+  ProviderToPlatformMessages,
+  SharedQueueToClientMessages,
+  ZodMessageSender,
   ZodSocketConnection
 } from "@trigger.dev/core/v3";
-import { HttpReply, getTextBody, SimpleLogger, getRandomPortNumber } from "@trigger.dev/core-apps";
+var HTTP_SERVER_PORT = Number(process.env.HTTP_SERVER_PORT || getRandomPortNumber());
+var MACHINE_NAME = process.env.MACHINE_NAME || "local";
+var PLATFORM_HOST = process.env.PLATFORM_HOST || "127.0.0.1";
+var PLATFORM_WS_PORT = process.env.PLATFORM_WS_PORT || 3030;
+var PLATFORM_SECRET = process.env.PLATFORM_SECRET || "provider-secret";
+var logger = new SimpleLogger(`[${MACHINE_NAME}]`);
+
+// src/workers/prod/entry-point.ts
 import { createServer } from "node:http";
 
 // src/workers/prod/backgroundWorker.ts
@@ -451,13 +532,13 @@ var TaskRunProcess = class {
 };
 
 // src/workers/prod/entry-point.ts
-var HTTP_SERVER_PORT = Number(process.env.HTTP_SERVER_PORT || getRandomPortNumber());
+var HTTP_SERVER_PORT2 = Number(process.env.HTTP_SERVER_PORT || getRandomPortNumber());
 var COORDINATOR_HOST = process.env.COORDINATOR_HOST || "127.0.0.1";
 var COORDINATOR_PORT = Number(process.env.COORDINATOR_PORT || 50080);
-var MACHINE_NAME = process.env.MACHINE_NAME || "local";
+var MACHINE_NAME2 = process.env.MACHINE_NAME || "local";
 var POD_NAME = process.env.POD_NAME || "some-pod";
 var SHORT_HASH = process.env.TRIGGER_CONTENT_HASH.slice(0, 9);
-var logger = new SimpleLogger(`[${MACHINE_NAME}][${SHORT_HASH}]`);
+var logger2 = new SimpleLogger(`[${MACHINE_NAME2}][${SHORT_HASH}]`);
 var ProdWorker = class {
   constructor(port, host = "0.0.0.0") {
     this.host = host;
@@ -480,7 +561,7 @@ var ProdWorker = class {
         "WAIT_FOR_DURATION",
         { version: "v1", ...message }
       );
-      logger.log("WAIT_FOR_DURATION", { willCheckpointAndRestore });
+      logger2.log("WAIT_FOR_DURATION", { willCheckpointAndRestore });
       this.#backgroundWorker.preCheckpointNotification.post({ willCheckpointAndRestore });
       setTimeout(() => {
         if (willCheckpointAndRestore) {
@@ -496,7 +577,7 @@ var ProdWorker = class {
         "WAIT_FOR_TASK",
         { version: "v1", ...message }
       );
-      logger.log("WAIT_FOR_TASK", { willCheckpointAndRestore });
+      logger2.log("WAIT_FOR_TASK", { willCheckpointAndRestore });
       this.#backgroundWorker.preCheckpointNotification.post({ willCheckpointAndRestore });
       setTimeout(() => {
         if (willCheckpointAndRestore) {
@@ -512,7 +593,7 @@ var ProdWorker = class {
         "WAIT_FOR_BATCH",
         { version: "v1", ...message }
       );
-      logger.log("WAIT_FOR_BATCH", { willCheckpointAndRestore });
+      logger2.log("WAIT_FOR_BATCH", { willCheckpointAndRestore });
       this.#backgroundWorker.preCheckpointNotification.post({ willCheckpointAndRestore });
       setTimeout(() => {
         if (willCheckpointAndRestore) {
@@ -552,7 +633,7 @@ var ProdWorker = class {
   }
   #createCoordinatorSocket() {
     const extraHeaders = this.#returnValidatedExtraHeaders({
-      "x-machine-name": MACHINE_NAME,
+      "x-machine-name": MACHINE_NAME2,
       "x-pod-name": POD_NAME,
       "x-trigger-content-hash": this.contentHash,
       "x-trigger-project-ref": this.projectRef,
@@ -561,12 +642,12 @@ var ProdWorker = class {
       "x-trigger-deployment-id": this.deploymentId,
       "x-trigger-run-id": this.runId
     });
-    logger.log("connecting to coordinator", {
+    logger2.log("connecting to coordinator", {
       host: COORDINATOR_HOST,
       port: COORDINATOR_PORT,
       extraHeaders
     });
-    const coordinatorConnection = new ZodSocketConnection({
+    const coordinatorConnection = new ZodSocketConnection2({
       namespace: "prod-worker",
       host: COORDINATOR_HOST,
       port: COORDINATOR_PORT,
@@ -588,16 +669,16 @@ var ProdWorker = class {
         },
         EXECUTE_TASK_RUN: async ({ executionPayload }) => {
           if (this.executing) {
-            logger.error("dropping execute request, already executing");
+            logger2.error("dropping execute request, already executing");
             return;
           }
           if (this.completed.has(executionPayload.execution.attempt.id)) {
-            logger.error("dropping execute request, already completed");
+            logger2.error("dropping execute request, already completed");
             return;
           }
           this.executing = true;
           const completion = await this.#backgroundWorker.executeTaskRun(executionPayload);
-          logger.log("completed", completion);
+          logger2.log("completed", completion);
           this.completed.add(executionPayload.execution.attempt.id);
           this.executing = false;
           await this.#backgroundWorker.flushTelemetry();
@@ -609,7 +690,7 @@ var ProdWorker = class {
               completion
             }
           );
-          logger.log("completion acknowledged", { didCheckpoint, shouldExit });
+          logger2.log("completion acknowledged", { didCheckpoint, shouldExit });
           if (shouldExit) {
             await this.#backgroundWorker.close();
             process.exit(0);
@@ -627,7 +708,7 @@ var ProdWorker = class {
           process.exit(0);
         }
       },
-      onConnection: async (socket, handler, sender, logger2) => {
+      onConnection: async (socket, handler, sender, logger3) => {
         if (process.env.INDEX_TASKS === "true") {
           try {
             const taskResources = await this.#initializeWorker();
@@ -637,15 +718,15 @@ var ProdWorker = class {
               ...taskResources
             });
             if (success) {
-              logger2("indexing done, shutting down..");
+              logger3("indexing done, shutting down..");
               process.exit(0);
             } else {
-              logger2("indexing failure, shutting down..");
+              logger3("indexing failure, shutting down..");
               process.exit(1);
             }
           } catch (e) {
             if (e instanceof UncaughtExceptionError) {
-              logger2("uncaught exception", e.originalError.message);
+              logger3("uncaught exception", e.originalError.message);
               socket.emit("INDEXING_FAILED", {
                 version: "v1",
                 deploymentId: this.deploymentId,
@@ -656,7 +737,7 @@ var ProdWorker = class {
                 }
               });
             } else if (e instanceof Error) {
-              logger2("error", e.message);
+              logger3("error", e.message);
               socket.emit("INDEXING_FAILED", {
                 version: "v1",
                 deploymentId: this.deploymentId,
@@ -667,7 +748,7 @@ var ProdWorker = class {
                 }
               });
             } else if (typeof e === "string") {
-              logger2("string error", e);
+              logger3("string error", e);
               socket.emit("INDEXING_FAILED", {
                 version: "v1",
                 deploymentId: this.deploymentId,
@@ -677,7 +758,7 @@ var ProdWorker = class {
                 }
               });
             } else {
-              logger2("unknown error", e);
+              logger3("unknown error", e);
               socket.emit("INDEXING_FAILED", {
                 version: "v1",
                 deploymentId: this.deploymentId,
@@ -719,7 +800,7 @@ var ProdWorker = class {
   }
   #createHttpServer() {
     const httpServer = createServer(async (req, res) => {
-      logger.log(`[${req.method}]`, req.url);
+      logger2.log(`[${req.method}]`, req.url);
       const reply = new HttpReply(res);
       switch (req.url) {
         case "/complete":
@@ -743,7 +824,7 @@ var ProdWorker = class {
               ms: 6e4
             }
           );
-          logger.log("WAIT_FOR_DURATION", { willCheckpointAndRestore });
+          logger2.log("WAIT_FOR_DURATION", { willCheckpointAndRestore });
           this.#coordinatorSocket.close();
           return reply.text("sent WAIT");
         case "/connect":
@@ -772,7 +853,7 @@ var ProdWorker = class {
           });
           return reply.empty();
         case "/preStop":
-          logger.log("should do preStop stuff, e.g. checkpoint and graceful shutdown");
+          logger2.log("should do preStop stuff, e.g. checkpoint and graceful shutdown");
           return reply.text("got preStop request");
         case "/ready":
           this.#coordinatorSocket.send("READY_FOR_EXECUTION", {
@@ -789,13 +870,13 @@ var ProdWorker = class {
       socket.end("HTTP/1.1 400 Bad Request\r\n\r\n");
     });
     httpServer.on("listening", () => {
-      logger.log("http server listening on port", this.#httpPort);
+      logger2.log("http server listening on port", this.#httpPort);
     });
     httpServer.on("error", (error) => {
       if (error.code != "EADDRINUSE") {
         return;
       }
-      logger.error(`port ${this.#httpPort} already in use, retrying with random port..`);
+      logger2.error(`port ${this.#httpPort} already in use, retrying with random port..`);
       this.#httpPort = getRandomPortNumber();
       setTimeout(() => {
         this.start();
@@ -844,7 +925,7 @@ var ProdWorker = class {
     this.#httpServer.listen(this.#httpPort, this.host);
   }
 };
-var prodWorker = new ProdWorker(HTTP_SERVER_PORT);
+var prodWorker = new ProdWorker(HTTP_SERVER_PORT2);
 prodWorker.start();
 function gatherProcessEnv() {
   const env = {

package/dist/workers/prod/worker-facade.js

@@ -18,7 +18,7 @@ import {
 } from "@trigger.dev/core/v3";
 
 // package.json
-var version = "0.0.0-v3-canary-20240321105132";
+var version = "0.0.0-v3-canary-20240321121448";
 
 // src/workers/prod/worker-facade.ts
 __WORKER_SETUP__;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "0.0.0-v3-canary-20240321105132",
+  "version": "0.0.0-v3-canary-20240321121448",
   "description": "A Command-Line Interface for Trigger.dev (v3) projects",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -55,7 +55,7 @@
     "vitest": "^0.34.4",
     "xdg-app-paths": "^8.3.0",
     "@trigger.dev/tsconfig": "0.0.0",
-    "@trigger.dev/core": "0.0.0-v3-canary-20240321105132"
+    "@trigger.dev/core-apps": "0.0.0-v3-canary-20240321121448"
   },
   "watch": {
     "build:prod-containerfile": "src/Containerfile.prod"
@@ -119,8 +119,7 @@
     "ws": "^8.12.0",
     "zod": "3.22.3",
     "zod-validation-error": "^1.5.0",
-    "@trigger.dev/core": "0.0.0-v3-canary-20240321105132",
-    "@trigger.dev/core-apps": "0.0.0-v3-canary-20240321105132"
+    "@trigger.dev/core": "0.0.0-v3-canary-20240321121448"
   },
   "engines": {
     "node": ">=18.0.0"