move worker to core

nicktrn · nicktrn · commit f319d3a254de · 2025-01-08T12:23:56.000Z
diff --git a/apps/webapp/app/routes/api.v1.worker-actions.connect.ts b/apps/webapp/app/routes/api.v1.worker-actions.connect.ts
@@ -1,5 +1,5 @@
 import { json, TypedResponse } from "@remix-run/server-runtime";
-import { WorkerApiConnectRequestBody, WorkerApiConnectResponseBody } from "@trigger.dev/worker";
+import { WorkerApiConnectRequestBody, WorkerApiConnectResponseBody } from "@trigger.dev/core/v3/workers";
 import { createActionWorkerApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 
 export const action = createActionWorkerApiRoute(
diff --git a/apps/webapp/app/routes/api.v1.worker-actions.deployments.$deploymentFriendlyId.dequeue.ts b/apps/webapp/app/routes/api.v1.worker-actions.deployments.$deploymentFriendlyId.dequeue.ts
@@ -1,6 +1,6 @@
 import { json, TypedResponse } from "@remix-run/server-runtime";
 import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/apps";
-import { WorkerApiDequeueResponseBody } from "@trigger.dev/worker";
+import { WorkerApiDequeueResponseBody } from "@trigger.dev/core/v3/workers";
 import { z } from "zod";
 import { $replica, prisma } from "~/db.server";
 import { createLoaderWorkerApiRoute } from "~/services/routeBuilders/apiBuilder.server";
diff --git a/apps/webapp/app/routes/api.v1.worker-actions.dequeue.ts b/apps/webapp/app/routes/api.v1.worker-actions.dequeue.ts
@@ -1,5 +1,5 @@
 import { json, TypedResponse } from "@remix-run/server-runtime";
-import { WorkerApiDequeueRequestBody, WorkerApiDequeueResponseBody } from "@trigger.dev/worker";
+import { WorkerApiDequeueRequestBody, WorkerApiDequeueResponseBody } from "@trigger.dev/core/v3/workers";
 import { createActionWorkerApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 
 export const action = createActionWorkerApiRoute(
diff --git a/apps/webapp/app/routes/api.v1.worker-actions.heartbeat.ts b/apps/webapp/app/routes/api.v1.worker-actions.heartbeat.ts
@@ -1,5 +1,5 @@
 import { json, TypedResponse } from "@remix-run/server-runtime";
-import { WorkerApiHeartbeatResponseBody, WorkerApiHeartbeatRequestBody } from "@trigger.dev/worker";
+import { WorkerApiHeartbeatResponseBody, WorkerApiHeartbeatRequestBody } from "@trigger.dev/core/v3/workers";
 import { createActionWorkerApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 
 export const action = createActionWorkerApiRoute(
diff --git a/apps/webapp/app/routes/api.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.complete.ts b/apps/webapp/app/routes/api.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.complete.ts
@@ -2,7 +2,7 @@ import { json, TypedResponse } from "@remix-run/server-runtime";
 import {
   WorkerApiRunAttemptCompleteRequestBody,
   WorkerApiRunAttemptCompleteResponseBody,
-} from "@trigger.dev/worker";
+} from "@trigger.dev/core/v3/workers";
 import { z } from "zod";
 import { createActionWorkerApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 
diff --git a/apps/webapp/app/routes/api.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.start.ts b/apps/webapp/app/routes/api.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.start.ts
@@ -2,7 +2,7 @@ import { json, TypedResponse } from "@remix-run/server-runtime";
 import {
   WorkerApiRunAttemptStartRequestBody,
   WorkerApiRunAttemptStartResponseBody,
-} from "@trigger.dev/worker";
+} from "@trigger.dev/core/v3/workers";
 import { z } from "zod";
 import { createActionWorkerApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 
diff --git a/apps/webapp/app/routes/api.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.heartbeat.ts b/apps/webapp/app/routes/api.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.heartbeat.ts
@@ -1,5 +1,5 @@
 import { json, TypedResponse } from "@remix-run/server-runtime";
-import { WorkloadHeartbeatResponseBody } from "@trigger.dev/worker";
+import { WorkloadHeartbeatResponseBody } from "@trigger.dev/core/v3/workers";
 import { z } from "zod";
 import { createActionWorkerApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 
diff --git a/apps/webapp/app/routes/api.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.wait.duration.ts b/apps/webapp/app/routes/api.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.wait.duration.ts
@@ -2,7 +2,7 @@ import { json, TypedResponse } from "@remix-run/server-runtime";
 import {
   WorkerApiWaitForDurationRequestBody,
   WorkerApiWaitForDurationResponseBody,
-} from "@trigger.dev/worker";
+} from "@trigger.dev/core/v3/workers";
 import { z } from "zod";
 import { createActionWorkerApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 
diff --git a/apps/webapp/app/routes/api.v1.worker-actions.runs.$runFriendlyId.snapshots.latest.ts b/apps/webapp/app/routes/api.v1.worker-actions.runs.$runFriendlyId.snapshots.latest.ts
@@ -1,5 +1,5 @@
 import { json, TypedResponse } from "@remix-run/server-runtime";
-import { WorkerApiRunLatestSnapshotResponseBody } from "@trigger.dev/worker";
+import { WorkerApiRunLatestSnapshotResponseBody } from "@trigger.dev/core/v3/workers";
 import { z } from "zod";
 import { createLoaderWorkerApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 
diff --git a/apps/webapp/app/v3/handleSocketIo.server.ts b/apps/webapp/app/v3/handleSocketIo.server.ts
@@ -26,7 +26,7 @@ import { CrashTaskRunService } from "./services/crashTaskRun.server";
 import { CreateTaskRunAttemptService } from "./services/createTaskRunAttempt.server";
 import { UpdateFatalRunErrorService } from "./services/updateFatalRunError.server";
 import { WorkerGroupTokenService } from "./services/worker/workerGroupTokenService.server";
-import type { WorkerClientToServerEvents, WorkerServerToClientEvents } from "@trigger.dev/worker";
+import type { WorkerClientToServerEvents, WorkerServerToClientEvents } from "@trigger.dev/core/v3/workers";
 
 export const socketIo = singleton("socketIo", initalizeIoServer);
 
diff --git a/apps/webapp/app/v3/services/worker/workerGroupTokenService.server.ts b/apps/webapp/app/v3/services/worker/workerGroupTokenService.server.ts
@@ -9,7 +9,7 @@ import {
   WorkerInstanceGroupType,
 } from "@trigger.dev/database";
 import { z } from "zod";
-import { HEADER_NAME } from "@trigger.dev/worker";
+import { WORKER_HEADER_NAME } from "@trigger.dev/core/v3/workers";
 import {
   TaskRunExecutionResult,
   DequeuedMessage,
@@ -136,7 +136,7 @@ export class WorkerGroupTokenService extends WithRunEngine {
       return;
     }
 
-    const instanceName = request.headers.get(HEADER_NAME.WORKER_INSTANCE_NAME);
+    const instanceName = request.headers.get(WORKER_HEADER_NAME.WORKER_INSTANCE_NAME);
 
     if (!instanceName) {
       logger.error("[WorkerGroupTokenService] Instance name not found in request", {
@@ -153,7 +153,7 @@ export class WorkerGroupTokenService extends WithRunEngine {
     }
 
     if (workerGroup.type === WorkerInstanceGroupType.MANAGED) {
-      const managedWorkerSecret = request.headers.get(HEADER_NAME.WORKER_MANAGED_SECRET);
+      const managedWorkerSecret = request.headers.get(WORKER_HEADER_NAME.WORKER_MANAGED_SECRET);
 
       if (!managedWorkerSecret) {
         logger.error("[WorkerGroupTokenService] Managed secret not found in request", {
@@ -187,7 +187,7 @@ export class WorkerGroupTokenService extends WithRunEngine {
     const workerInstance = await this.getOrCreateWorkerInstance({
       workerGroup,
       instanceName,
-      deploymentId: request.headers.get(HEADER_NAME.WORKER_DEPLOYMENT_ID) ?? undefined,
+      deploymentId: request.headers.get(WORKER_HEADER_NAME.WORKER_DEPLOYMENT_ID) ?? undefined,
     });
 
     if (!workerInstance) {
diff --git a/apps/webapp/package.json b/apps/webapp/package.json
@@ -101,7 +101,6 @@
     "@trigger.dev/otlp-importer": "workspace:*",
     "@trigger.dev/platform": "1.0.14",
     "@trigger.dev/sdk": "workspace:*",
-    "@trigger.dev/worker": "workspace:*",
     "@trigger.dev/yalt": "npm:@trigger.dev/yalt",
     "@types/pg": "8.6.6",
     "@uiw/react-codemirror": "^4.19.5",
diff --git a/apps/webapp/tsconfig.json b/apps/webapp/tsconfig.json
@@ -31,8 +31,6 @@
       "@trigger.dev/yalt/*": ["../../packages/yalt/src/*"],
       "@trigger.dev/otlp-importer": ["../../internal-packages/otlp-importer/src/index"],
       "@trigger.dev/otlp-importer/*": ["../../internal-packages/otlp-importer/src/*"],
-      "@trigger.dev/worker": ["../../packages/worker/src/index"],
-      "@trigger.dev/worker/*": ["../../packages/worker/src/*"],
       "emails": ["../../internal-packages/emails/src/index"],
       "emails/*": ["../../internal-packages/emails/src/*"],
       "@internal/zod-worker": ["../../internal-packages/zod-worker/src/index"],
diff --git a/packages/cli-v3/package.json b/packages/cli-v3/package.json
@@ -88,7 +88,6 @@
     "@opentelemetry/semantic-conventions": "1.25.1",
     "@trigger.dev/build": "workspace:3.3.8",
     "@trigger.dev/core": "workspace:3.3.8",
-    "@trigger.dev/worker": "workspace:3.3.8",
     "c12": "^1.11.1",
     "chalk": "^5.2.0",
     "cli-table3": "^0.6.3",
diff --git a/packages/cli-v3/src/entryPoints/managed-run-controller.ts b/packages/cli-v3/src/entryPoints/managed-run-controller.ts
@@ -16,7 +16,7 @@ import {
   WorkloadHttpClient,
   WorkloadServerToClientEvents,
   type WorkloadRunAttemptStartResponseBody,
-} from "@trigger.dev/worker";
+} from "@trigger.dev/core/v3/workers";
 import { assertExhaustive } from "../utilities/assertExhaustive.js";
 import { setTimeout as wait } from "timers/promises";
 import { io, Socket } from "socket.io-client";
diff --git a/packages/cli-v3/src/entryPoints/unmanaged-run-controller.ts b/packages/cli-v3/src/entryPoints/unmanaged-run-controller.ts
@@ -6,7 +6,7 @@ import { CLOUD_API_URL } from "../consts.js";
 import { randomUUID } from "crypto";
 import { readJSONFile } from "../utilities/fileSystem.js";
 import { WorkerManifest } from "@trigger.dev/core/v3";
-import { SupervisorSession } from "@trigger.dev/worker";
+import { SupervisorSession } from "@trigger.dev/core/v3/workers";
 
 const Env = z.object({
   TRIGGER_API_URL: z.string().url().default(CLOUD_API_URL),
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -203,6 +203,7 @@
     "humanize-duration": "^3.27.3",
     "jose": "^5.4.0",
     "nanoid": "^3.3.4",
+    "socket.io": "4.7.4",
     "socket.io-client": "4.7.5",
     "superjson": "^2.2.1",
     "tinyexec": "^0.3.2",
@@ -221,7 +222,6 @@
     "defu": "^6.1.4",
     "esbuild": "^0.23.0",
     "rimraf": "^3.0.2",
-    "socket.io": "4.7.4",
     "ts-essentials": "10.0.1",
     "tshy": "^3.0.2",
     "tsx": "4.17.0",
diff --git a/packages/core/src/v3/runEngineWorker/consts.ts b/packages/core/src/v3/runEngineWorker/consts.ts
@@ -1,4 +1,4 @@
-export const HEADER_NAME = {
+export const WORKER_HEADER_NAME = {
   WORKER_INSTANCE_NAME: "x-trigger-worker-instance-name",
   WORKER_DEPLOYMENT_ID: "x-trigger-worker-deployment-id",
   WORKER_MANAGED_SECRET: "x-trigger-worker-managed-secret",
diff --git a/packages/core/src/v3/runEngineWorker/index.ts b/packages/core/src/v3/runEngineWorker/index.ts
@@ -1,4 +1,3 @@
-export { VERSION as WORKER_VERSION } from "./version.js";
 export * from "./consts.js";
 export * from "./supervisor/http.js";
 export * from "./supervisor/schemas.js";
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/events.ts b/packages/core/src/v3/runEngineWorker/supervisor/events.ts
@@ -1,8 +1,5 @@
-import {
-  DequeuedMessage,
-  StartRunAttemptResult,
-  TaskRunExecutionResult,
-} from "@trigger.dev/core/v3";
+import { TaskRunExecutionResult } from "../../schemas/common.js";
+import { DequeuedMessage, StartRunAttemptResult } from "../../schemas/runEngine.js";
 
 export type WorkerEvents = {
   runQueueMessage: [
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/http.ts b/packages/core/src/v3/runEngineWorker/supervisor/http.ts
@@ -1,5 +1,4 @@
 import { z } from "zod";
-import { zodfetch, ApiError } from "@trigger.dev/core/v3/zodfetch";
 import {
   WorkerApiConnectRequestBody,
   WorkerApiConnectResponseBody,
@@ -19,6 +18,7 @@ import {
 } from "./schemas.js";
 import { SupervisorClientCommonOptions } from "./types.js";
 import { getDefaultWorkerHeaders } from "./util.js";
+import { ApiError, zodfetch } from "../../zodfetch.js";
 
 type SupervisorHttpClientOptions = SupervisorClientCommonOptions;
 
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/queueConsumer.ts b/packages/core/src/v3/runEngineWorker/supervisor/queueConsumer.ts
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/schemas.ts b/packages/core/src/v3/runEngineWorker/supervisor/schemas.ts
@@ -1,13 +1,13 @@
 import { z } from "zod";
+import { TaskRunExecutionResult } from "../../schemas/common.js";
 import {
-  CompleteRunAttemptResult,
-  DequeuedMessage,
   MachineResources,
-  RunExecutionData,
+  DequeuedMessage,
   StartRunAttemptResult,
-  TaskRunExecutionResult,
+  CompleteRunAttemptResult,
+  RunExecutionData,
   WaitForDurationResult,
-} from "@trigger.dev/core/v3";
+} from "../../schemas/runEngine.js";
 
 export const WorkerApiHeartbeatRequestBody = z.object({
   cpu: z.object({
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/session.ts b/packages/core/src/v3/runEngineWorker/supervisor/session.ts
@@ -1,14 +1,14 @@
-import { HeartbeatService, MachineResources } from "@trigger.dev/core/v3";
 import { SupervisorHttpClient } from "./http.js";
 import { PreDequeueFn, SupervisorClientCommonOptions } from "./types.js";
 import { WorkerApiDequeueResponseBody, WorkerApiHeartbeatRequestBody } from "./schemas.js";
 import { RunQueueConsumer } from "./queueConsumer.js";
 import { WorkerEvents } from "./events.js";
 import EventEmitter from "events";
-import { VERSION } from "../version.js";
+import { VERSION } from "../../../version.js";
 import { io, Socket } from "socket.io-client";
 import { WorkerClientToServerEvents, WorkerServerToClientEvents } from "../types.js";
 import { getDefaultWorkerHeaders } from "./util.js";
+import { HeartbeatService } from "../../utils/heartbeat.js";
 
 type SupervisorSessionOptions = SupervisorClientCommonOptions & {
   heartbeatIntervalSeconds?: number;
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/types.ts b/packages/core/src/v3/runEngineWorker/supervisor/types.ts
@@ -1,4 +1,4 @@
-import type { MachineResources } from "@trigger.dev/core/v3";
+import { MachineResources } from "../../schemas/runEngine.js";
 
 export type SupervisorClientCommonOptions = {
   apiUrl: string;
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/util.ts b/packages/core/src/v3/runEngineWorker/supervisor/util.ts
@@ -1,4 +1,4 @@
-import { HEADER_NAME } from "../consts.js";
+import { WORKER_HEADER_NAME } from "../consts.js";
 import { createHeaders } from "../util.js";
 import { SupervisorClientCommonOptions } from "./types.js";
 
@@ -7,9 +7,9 @@ export function getDefaultWorkerHeaders(
 ): Record<string, string> {
   return createHeaders({
     Authorization: `Bearer ${options.workerToken}`,
-    [HEADER_NAME.WORKER_INSTANCE_NAME]: options.instanceName,
-    [HEADER_NAME.WORKER_DEPLOYMENT_ID]: options.deploymentId,
-    [HEADER_NAME.WORKER_MANAGED_SECRET]: options.managedWorkerSecret,
+    [WORKER_HEADER_NAME.WORKER_INSTANCE_NAME]: options.instanceName,
+    [WORKER_HEADER_NAME.WORKER_DEPLOYMENT_ID]: options.deploymentId,
+    [WORKER_HEADER_NAME.WORKER_MANAGED_SECRET]: options.managedWorkerSecret,
   });
 }
 
diff --git a/packages/core/src/v3/runEngineWorker/types.ts b/packages/core/src/v3/runEngineWorker/types.ts
diff --git a/packages/core/src/v3/runEngineWorker/util.ts b/packages/core/src/v3/runEngineWorker/util.ts
diff --git a/packages/core/src/v3/runEngineWorker/workload/http.ts b/packages/core/src/v3/runEngineWorker/workload/http.ts
@@ -1,5 +1,4 @@
 import { z } from "zod";
-import { zodfetch, ApiError } from "@trigger.dev/core/v3/zodfetch";
 import {
   WorkloadHeartbeatRequestBody,
   WorkloadHeartbeatResponseBody,
@@ -14,6 +13,7 @@ import {
 } from "./schemas.js";
 import { WorkloadClientCommonOptions } from "./types.js";
 import { getDefaultWorkloadHeaders } from "./util.js";
+import { ApiError, zodfetch } from "../../zodfetch.js";
 
 type WorkloadHttpClientOptions = WorkloadClientCommonOptions;
 
diff --git a/packages/core/src/v3/runEngineWorker/workload/schemas.ts b/packages/core/src/v3/runEngineWorker/workload/schemas.ts
diff --git a/packages/core/src/v3/runEngineWorker/workload/types.ts b/packages/core/src/v3/runEngineWorker/workload/types.ts
diff --git a/packages/core/src/v3/runEngineWorker/workload/util.ts b/packages/core/src/v3/runEngineWorker/workload/util.ts
diff --git a/packages/core/src/v3/workers/index.ts b/packages/core/src/v3/workers/index.ts
@@ -18,3 +18,4 @@ export { StandardMetadataManager } from "../runMetadata/manager.js";
 export { StandardWaitUntilManager } from "../waitUntil/manager.js";
 export { ManagedRuntimeManager } from "../runtime/managedRuntimeManager.js";
 export { UnmanagedRuntimeManager } from "../runtime/unmanagedRuntimeManager.js";
+export * from "../runEngineWorker/index.js";
diff --git a/packages/worker/LICENSE b/packages/worker/LICENSE
diff --git a/packages/worker/README.md b/packages/worker/README.md
diff --git a/packages/worker/package.json b/packages/worker/package.json
diff --git a/packages/worker/src/version.ts b/packages/worker/src/version.ts
diff --git a/packages/worker/tsconfig.json b/packages/worker/tsconfig.json
diff --git a/packages/worker/tsconfig.src.json b/packages/worker/tsconfig.src.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
