@trigger.dev/core 0.0.0-prerelease-20250503193704 → 0.0.0-process-keep-alive-20250618160907

package/dist/esm/v3/runEngineWorker/supervisor/http.js

@@ -1,19 +1,23 @@
 import { z } from "zod";
-import { WorkerApiConnectResponseBody, WorkerApiContinueRunExecutionRequestBody, WorkerApiDequeueResponseBody, WorkerApiHeartbeatResponseBody, WorkerApiRunAttemptCompleteResponseBody, WorkerApiRunAttemptStartResponseBody, WorkerApiRunHeartbeatResponseBody, WorkerApiRunLatestSnapshotResponseBody, WorkerApiSuspendRunResponseBody, } from "./schemas.js";
+import { WorkerApiConnectResponseBody, WorkerApiContinueRunExecutionRequestBody, WorkerApiDequeueResponseBody, WorkerApiHeartbeatResponseBody, WorkerApiRunAttemptCompleteResponseBody, WorkerApiRunAttemptStartResponseBody, WorkerApiRunHeartbeatResponseBody, WorkerApiRunLatestSnapshotResponseBody, WorkerApiSuspendRunResponseBody, WorkerApiRunSnapshotsSinceResponseBody, } from "./schemas.js";
 import { getDefaultWorkerHeaders } from "./util.js";
 import { wrapZodFetch } from "../../zodfetch.js";
 import { createHeaders } from "../util.js";
 import { WORKER_HEADERS } from "../consts.js";
+import { SimpleStructuredLogger } from "../../utils/structuredLogger.js";
 export class SupervisorHttpClient {
     apiUrl;
     workerToken;
     instanceName;
     defaultHeaders;
+    sendRunDebugLogs;
+    logger = new SimpleStructuredLogger("supervisor-http-client");
     constructor(opts) {
         this.apiUrl = opts.apiUrl.replace(/\/$/, "");
         this.workerToken = opts.workerToken;
         this.instanceName = opts.instanceName;
         this.defaultHeaders = getDefaultWorkerHeaders(opts);
+        this.sendRunDebugLogs = opts.sendRunDebugLogs ?? false;
         if (!this.apiUrl) {
             throw new Error("apiURL is required and needs to be a non-empty string");
         }
@@ -103,7 +107,19 @@ export class SupervisorHttpClient {
             },
         });
     }
+    async getSnapshotsSince(runId, snapshotId, runnerId) {
+        return wrapZodFetch(WorkerApiRunSnapshotsSinceResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/since/${snapshotId}`, {
+            method: "GET",
+            headers: {
+                ...this.defaultHeaders,
+                ...this.runnerIdHeader(runnerId),
+            },
+        });
+    }
     async sendDebugLog(runId, body, runnerId) {
+        if (!this.sendRunDebugLogs) {
+            return;
+        }
         try {
             const res = await wrapZodFetch(z.unknown(), `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/logs/debug`, {
                 method: "POST",
@@ -115,11 +131,11 @@ export class SupervisorHttpClient {
                 body: JSON.stringify(body),
             });
             if (!res.success) {
-                console.error("Failed to send debug log", res);
+                this.logger.error("Failed to send debug log", { error: res.error });
             }
         }
         catch (error) {
-            console.error("Failed to send debug log", { error });
+            this.logger.error("Failed to send debug log (caught error)", { error });
         }
     }
     async continueRunExecution(runId, snapshotId, runnerId) {

package/dist/esm/v3/runEngineWorker/supervisor/http.js.map

@@ -1 +1 @@
-{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/http.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/http.ts"],"names":[],"mappings":"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"}

package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.d.ts

@@ -16,6 +16,7 @@ export declare class RunQueueConsumer {
     private readonly preSkip?;
     private readonly maxRunCount?;
     private readonly onDequeue;
+    private readonly logger;
     private intervalMs;
     private idleIntervalMs;
     private isEnabled;

package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.js

@@ -1,9 +1,11 @@
+import { SimpleStructuredLogger } from "../../utils/structuredLogger.js";
 export class RunQueueConsumer {
     client;
     preDequeue;
     preSkip;
     maxRunCount;
     onDequeue;
+    logger = new SimpleStructuredLogger("queue-consumer");
     intervalMs;
     idleIntervalMs;
     isEnabled;
@@ -31,35 +33,44 @@ export class RunQueueConsumer {
         this.isEnabled = false;
     }
     async dequeue() {
-        // Incredibly verbose logging for debugging purposes
-        // console.debug("[RunQueueConsumer] dequeue()", { enabled: this.isEnabled });
+        this.logger.verbose("dequeue()", {
+            enabled: this.isEnabled,
+            intervalMs: this.intervalMs,
+            idleIntervalMs: this.idleIntervalMs,
+            maxRunCount: this.maxRunCount,
+            preDequeue: !!this.preDequeue,
+            preSkip: !!this.preSkip,
+        });
         if (!this.isEnabled) {
+            this.logger.warn("dequeue() - not enabled");
             return;
         }
         let preDequeueResult;
         if (this.preDequeue) {
-            // console.debug("[RunQueueConsumer] preDequeue()");
+            this.logger.verbose("preDequeue()");
             try {
                 preDequeueResult = await this.preDequeue();
             }
             catch (preDequeueError) {
-                console.error("[RunQueueConsumer] preDequeue error", { error: preDequeueError });
+                this.logger.error("preDequeue error", { error: preDequeueError });
             }
         }
-        // console.debug("[RunQueueConsumer] preDequeueResult", { preDequeueResult });
+        this.logger.verbose("preDequeueResult", { preDequeueResult });
         if (preDequeueResult?.skipDequeue ||
             preDequeueResult?.maxResources?.cpu === 0 ||
             preDequeueResult?.maxResources?.memory === 0) {
+            this.logger.debug("skipping dequeue", { preDequeueResult });
             if (this.preSkip) {
-                console.debug("[RunQueueConsumer] preSkip()");
+                this.logger.debug("preSkip()");
                 try {
                     await this.preSkip();
                 }
                 catch (preSkipError) {
-                    console.error("[RunQueueConsumer] preSkip error", { error: preSkipError });
+                    this.logger.error("preSkip error", { error: preSkipError });
                 }
             }
-            return this.scheduleNextDequeue(this.idleIntervalMs);
+            this.scheduleNextDequeue(this.idleIntervalMs);
+            return;
         }
         let nextIntervalMs = this.idleIntervalMs;
         try {
@@ -68,7 +79,7 @@ export class RunQueueConsumer {
                 maxRunCount: this.maxRunCount,
             });
             if (!response.success) {
-                console.error("[RunQueueConsumer] Failed to dequeue", { error: response.error });
+                this.logger.error("Failed to dequeue", { error: response.error });
             }
             else {
                 try {
@@ -78,16 +89,19 @@ export class RunQueueConsumer {
                     }
                 }
                 catch (handlerError) {
-                    console.error("[RunQueueConsumer] onDequeue error", { error: handlerError });
+                    this.logger.error("onDequeue error", { error: handlerError });
                 }
             }
         }
         catch (clientError) {
-            console.error("[RunQueueConsumer] client.dequeue error", { error: clientError });
+            this.logger.error("client.dequeue error", { error: clientError });
         }
         this.scheduleNextDequeue(nextIntervalMs);
     }
     scheduleNextDequeue(delayMs) {
+        if (delayMs === this.idleIntervalMs && this.idleIntervalMs !== this.intervalMs) {
+            this.logger.verbose("scheduled dequeue with idle interval", { delayMs });
+        }
         setTimeout(this.dequeue.bind(this), delayMs);
     }
 }

package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.js.map

@@ -1 +1 @@
-{"version":3,"file":"queueConsumer.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/queueConsumer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queueConsumer.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/queueConsumer.ts"],"names":[],"mappings":"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"}