From f43e3f7a4216f09df9ae8b115c0d6e28fab6b0e1 Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Tue, 13 May 2025 12:57:53 +0100 Subject: [PATCH 1/7] import init file in managed worker --- .../cli-v3/src/entryPoints/managed-run-worker.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/cli-v3/src/entryPoints/managed-run-worker.ts b/packages/cli-v3/src/entryPoints/managed-run-worker.ts index 9e84130124..bd6aa7c0d1 100644 --- a/packages/cli-v3/src/entryPoints/managed-run-worker.ts +++ b/packages/cli-v3/src/entryPoints/managed-run-worker.ts @@ -324,6 +324,18 @@ const zodIpc = new ZodIpcConnection({ async () => { const beforeImport = performance.now(); resourceCatalog.setCurrentFileContext(taskManifest.entryPoint, taskManifest.filePath); + + // Load init file if it exists + if (workerManifest.initEntryPoint) { + try { + await import(normalizeImportPath(workerManifest.initEntryPoint)); + console.log(`Loaded init file from ${workerManifest.initEntryPoint}`); + } catch (err) { + console.error(`Failed to load init file`, err); + throw err; + } + } + await import(normalizeImportPath(taskManifest.entryPoint)); resourceCatalog.clearCurrentFileContext(); const durationMs = performance.now() - beforeImport; From 68eb31aa5e99359a44f1fad6cf1cb954e64de39f Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Tue, 13 May 2025 13:01:26 +0100 Subject: [PATCH 2/7] refactor for easier diff --- packages/cli-v3/src/entryPoints/dev-run-worker.ts | 6 +++--- packages/cli-v3/src/entryPoints/managed-run-worker.ts | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/cli-v3/src/entryPoints/dev-run-worker.ts b/packages/cli-v3/src/entryPoints/dev-run-worker.ts index 650143118b..66ed02d0db 100644 --- a/packages/cli-v3/src/entryPoints/dev-run-worker.ts +++ b/packages/cli-v3/src/entryPoints/dev-run-worker.ts @@ -104,12 +104,12 @@ const heartbeatIntervalMs = getEnvVar("HEARTBEAT_INTERVAL_MS"); const standardLocalsManager = new StandardLocalsManager(); localsAPI.setGlobalLocalsManager(standardLocalsManager); -const standardRunTimelineMetricsManager = new StandardRunTimelineMetricsManager(); -runTimelineMetrics.setGlobalManager(standardRunTimelineMetricsManager); - const standardLifecycleHooksManager = new StandardLifecycleHooksManager(); lifecycleHooks.setGlobalLifecycleHooksManager(standardLifecycleHooksManager); +const standardRunTimelineMetricsManager = new StandardRunTimelineMetricsManager(); +runTimelineMetrics.setGlobalManager(standardRunTimelineMetricsManager); + const devUsageManager = new DevUsageManager(); usage.setGlobalUsageManager(devUsageManager); timeout.setGlobalManager(new UsageTimeoutManager(devUsageManager)); diff --git a/packages/cli-v3/src/entryPoints/managed-run-worker.ts b/packages/cli-v3/src/entryPoints/managed-run-worker.ts index bd6aa7c0d1..438ebfc08b 100644 --- a/packages/cli-v3/src/entryPoints/managed-run-worker.ts +++ b/packages/cli-v3/src/entryPoints/managed-run-worker.ts @@ -460,10 +460,7 @@ const zodIpc = new ZodIpcConnection({ }); } }, - FLUSH: async ({ timeoutInMs }, sender) => { - await flushAll(timeoutInMs); - }, - CANCEL: async ({ timeoutInMs }, sender) => { + CANCEL: async ({ timeoutInMs }) => { _isCancelled = true; cancelController.abort("run cancelled"); await callCancelHooks(timeoutInMs); @@ -472,6 +469,9 @@ const zodIpc = new ZodIpcConnection({ } await flushAll(timeoutInMs); }, + FLUSH: async ({ timeoutInMs }) => { + await flushAll(timeoutInMs); + }, RESOLVE_WAITPOINT: async ({ waitpoint }) => { sharedWorkerRuntime.resolveWaitpoints([waitpoint]); }, From 509394df615afcd60e6181f5f36798e78f0b9807 Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Tue, 13 May 2025 13:02:20 +0100 Subject: [PATCH 3/7] managed worker: attach configured incorrectly error details --- packages/cli-v3/src/entryPoints/managed-run-worker.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/cli-v3/src/entryPoints/managed-run-worker.ts b/packages/cli-v3/src/entryPoints/managed-run-worker.ts index 438ebfc08b..d1dc76a27b 100644 --- a/packages/cli-v3/src/entryPoints/managed-run-worker.ts +++ b/packages/cli-v3/src/entryPoints/managed-run-worker.ts @@ -451,6 +451,8 @@ const zodIpc = new ZodIpcConnection({ error: { type: "INTERNAL_ERROR", code: TaskRunErrorCodes.CONFIGURED_INCORRECTLY, + message: err instanceof Error ? err.message : String(err), + stackTrace: err instanceof Error ? err.stack : undefined, }, usage: { durationMs: 0, From 4b3bf5e2464408e4fc178fbf6c31d3dcf5d4f857 Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Tue, 13 May 2025 13:03:02 +0100 Subject: [PATCH 4/7] add changeset --- .changeset/twelve-actors-hide.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/twelve-actors-hide.md diff --git a/.changeset/twelve-actors-hide.md b/.changeset/twelve-actors-hide.md new file mode 100644 index 0000000000..7187b92ab0 --- /dev/null +++ b/.changeset/twelve-actors-hide.md @@ -0,0 +1,5 @@ +--- +"trigger.dev": patch +--- + +Fix init.ts auto-import for deployed workers From 89afe44f6c42d4bd7b5a51f7fda1caec6cab8a24 Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Tue, 13 May 2025 13:06:05 +0100 Subject: [PATCH 5/7] disable pre --- .changeset/pre.json | 54 --------------------------------------------- 1 file changed, 54 deletions(-) delete mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index b18d91cf3b..0000000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "mode": "pre", - "tag": "v4-beta", - "initialVersions": { - "coordinator": "0.0.1", - "docker-provider": "0.0.1", - "kubernetes-provider": "0.0.1", - "supervisor": "0.0.1", - "webapp": "1.0.0", - "@trigger.dev/build": "3.3.17", - "trigger.dev": "3.3.17", - "@trigger.dev/core": "3.3.17", - "@trigger.dev/python": "3.3.17", - "@trigger.dev/react-hooks": "3.3.17", - "@trigger.dev/redis-worker": "3.3.17", - "@trigger.dev/rsc": "3.3.17", - "@trigger.dev/sdk": "3.3.17" - }, - "changesets": [ - "blue-eyes-tickle", - "breezy-turtles-talk", - "curvy-dogs-share", - "eighty-rings-divide", - "four-needles-add", - "gentle-waves-suffer", - "green-lions-relate", - "hip-cups-wave", - "honest-files-decide", - "itchy-games-sort", - "late-chairs-ring", - "moody-squids-count", - "nice-colts-boil", - "plenty-dolphins-act", - "polite-impalas-care", - "polite-lies-fix", - "real-rats-drop", - "red-chairs-begin", - "red-wasps-cover", - "shiny-kiwis-beam", - "smart-coins-hammer", - "sour-mirrors-accept", - "spotty-ducks-punch", - "spotty-pants-wink", - "sweet-dolphins-invent", - "tender-jobs-collect", - "tidy-books-smell", - "tiny-buckets-teach", - "tricky-houses-invite", - "two-tigers-dream", - "weak-jobs-hide", - "wet-deers-think", - "wet-steaks-reflect" - ] -} From 64e9393b062bd296fb959f8503b3bbf48ed6e60e Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Tue, 13 May 2025 13:25:51 +0100 Subject: [PATCH 6/7] we also didn't rewrite the output path --- packages/cli-v3/src/build/buildWorker.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/cli-v3/src/build/buildWorker.ts b/packages/cli-v3/src/build/buildWorker.ts index 8c6e2d1cc3..583a9d2d82 100644 --- a/packages/cli-v3/src/build/buildWorker.ts +++ b/packages/cli-v3/src/build/buildWorker.ts @@ -116,6 +116,9 @@ export function rewriteBuildManifestPaths( loaderEntryPoint: buildManifest.loaderEntryPoint ? rewriteOutputPath(destinationDir, buildManifest.loaderEntryPoint) : undefined, + initEntryPoint: buildManifest.initEntryPoint + ? rewriteOutputPath(destinationDir, buildManifest.initEntryPoint) + : undefined, }; } // Remove any query parameters from the entry path From 2059c713eba3065fe93fc24fd66bf3e5f327eeff Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Tue, 13 May 2025 13:26:42 +0100 Subject: [PATCH 7/7] Revert "disable pre" This reverts commit 89afe44f6c42d4bd7b5a51f7fda1caec6cab8a24. --- .changeset/pre.json | 54 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 0000000000..b18d91cf3b --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,54 @@ +{ + "mode": "pre", + "tag": "v4-beta", + "initialVersions": { + "coordinator": "0.0.1", + "docker-provider": "0.0.1", + "kubernetes-provider": "0.0.1", + "supervisor": "0.0.1", + "webapp": "1.0.0", + "@trigger.dev/build": "3.3.17", + "trigger.dev": "3.3.17", + "@trigger.dev/core": "3.3.17", + "@trigger.dev/python": "3.3.17", + "@trigger.dev/react-hooks": "3.3.17", + "@trigger.dev/redis-worker": "3.3.17", + "@trigger.dev/rsc": "3.3.17", + "@trigger.dev/sdk": "3.3.17" + }, + "changesets": [ + "blue-eyes-tickle", + "breezy-turtles-talk", + "curvy-dogs-share", + "eighty-rings-divide", + "four-needles-add", + "gentle-waves-suffer", + "green-lions-relate", + "hip-cups-wave", + "honest-files-decide", + "itchy-games-sort", + "late-chairs-ring", + "moody-squids-count", + "nice-colts-boil", + "plenty-dolphins-act", + "polite-impalas-care", + "polite-lies-fix", + "real-rats-drop", + "red-chairs-begin", + "red-wasps-cover", + "shiny-kiwis-beam", + "smart-coins-hammer", + "sour-mirrors-accept", + "spotty-ducks-punch", + "spotty-pants-wink", + "sweet-dolphins-invent", + "tender-jobs-collect", + "tidy-books-smell", + "tiny-buckets-teach", + "tricky-houses-invite", + "two-tigers-dream", + "weak-jobs-hide", + "wet-deers-think", + "wet-steaks-reflect" + ] +}