Merge branch 'main' into v3/fix-abort-controller

nicktrn · nicktrn · commit e20931380ab0 · 2024-09-16T21:10:34.000+01:00
diff --git a/.changeset/calm-berries-trade.md b/.changeset/calm-berries-trade.md
diff --git a/.changeset/poor-starfishes-act.md b/.changeset/poor-starfishes-act.md
@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Configurable deployed heartbeat interval via HEARTBEAT_INTERVAL_MS env var
diff --git a/apps/webapp/app/env.server.ts b/apps/webapp/app/env.server.ts
@@ -177,6 +177,11 @@ const EnvironmentSchema = z.object({
 
   LOOPS_API_KEY: z.string().optional(),
   MARQS_DISABLE_REBALANCING: z.coerce.boolean().default(false),
+  MARQS_VISIBILITY_TIMEOUT_MS: z.coerce
+    .number()
+    .int()
+    .default(60 * 1000 * 15),
+  PROD_TASK_HEARTBEAT_INTERVAL_MS: z.coerce.number().int().optional(),
 
   VERBOSE_GRAPHILE_LOGGING: z.string().default("false"),
   V2_MARQS_ENABLED: z.string().default("0"),
diff --git a/apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts b/apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts
@@ -798,6 +798,15 @@ async function resolveBuiltInProdVariables(runtimeEnvironment: RuntimeEnvironmen
     ]);
   }
 
+  if (env.PROD_TASK_HEARTBEAT_INTERVAL_MS) {
+    result = result.concat([
+      {
+        key: "HEARTBEAT_INTERVAL_MS",
+        value: String(env.PROD_TASK_HEARTBEAT_INTERVAL_MS),
+      },
+    ]);
+  }
+
   const commonVariables = await resolveCommonBuiltInVariables(runtimeEnvironment);
 
   return [...result, ...commonVariables];
diff --git a/apps/webapp/app/v3/marqs/devQueueConsumer.server.ts b/apps/webapp/app/v3/marqs/devQueueConsumer.server.ts
@@ -162,8 +162,8 @@ export class DevQueueConsumer {
   /**
    * @deprecated Use `taskRunHeartbeat` instead
    */
-  public async taskHeartbeat(workerId: string, id: string, seconds: number = 60) {
-    logger.debug("[DevQueueConsumer] taskHeartbeat()", { id, seconds });
+  public async taskHeartbeat(workerId: string, id: string) {
+    logger.debug("[DevQueueConsumer] taskHeartbeat()", { id });
 
     const taskRunAttempt = await prisma.taskRunAttempt.findUnique({
       where: { friendlyId: id },
@@ -173,13 +173,13 @@ export class DevQueueConsumer {
       return;
     }
 
-    await marqs?.heartbeatMessage(taskRunAttempt.taskRunId, seconds);
+    await marqs?.heartbeatMessage(taskRunAttempt.taskRunId);
   }
 
-  public async taskRunHeartbeat(workerId: string, id: string, seconds: number = 60) {
-    logger.debug("[DevQueueConsumer] taskRunHeartbeat()", { id, seconds });
+  public async taskRunHeartbeat(workerId: string, id: string) {
+    logger.debug("[DevQueueConsumer] taskRunHeartbeat()", { id });
 
-    await marqs?.heartbeatMessage(id, seconds);
+    await marqs?.heartbeatMessage(id);
   }
 
   public async stop(reason: string = "CLI disconnected") {
diff --git a/apps/webapp/app/v3/marqs/index.server.ts b/apps/webapp/app/v3/marqs/index.server.ts
@@ -698,8 +698,8 @@ export class MarQS {
   }
 
   // This should increment by the number of seconds, but with a max value of Date.now() + visibilityTimeoutInMs
-  public async heartbeatMessage(messageId: string, seconds: number = 30) {
-    await this.options.visibilityTimeoutStrategy.heartbeat(messageId, seconds * 1000);
+  public async heartbeatMessage(messageId: string) {
+    await this.options.visibilityTimeoutStrategy.heartbeat(messageId, this.visibilityTimeoutInMs);
   }
 
   get visibilityTimeoutInMs() {
@@ -1871,7 +1871,7 @@ function getMarQSClient() {
         redis: redisOptions,
         defaultEnvConcurrency: env.DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT,
         defaultOrgConcurrency: env.DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT,
-        visibilityTimeoutInMs: 120 * 1000, // 2 minutes,
+        visibilityTimeoutInMs: env.MARQS_VISIBILITY_TIMEOUT_MS,
         enableRebalancing: !env.MARQS_DISABLE_REBALANCING,
         subscriber: concurrencyTracker,
       });
diff --git a/apps/webapp/app/v3/marqs/sharedQueueConsumer.server.ts b/apps/webapp/app/v3/marqs/sharedQueueConsumer.server.ts
@@ -1169,8 +1169,8 @@ class SharedQueueTasks {
     } satisfies TaskRunExecutionLazyAttemptPayload;
   }
 
-  async taskHeartbeat(attemptFriendlyId: string, seconds: number = 60) {
-    logger.debug("[SharedQueueConsumer] taskHeartbeat()", { id: attemptFriendlyId, seconds });
+  async taskHeartbeat(attemptFriendlyId: string) {
+    logger.debug("[SharedQueueConsumer] taskHeartbeat()", { id: attemptFriendlyId });
 
     const taskRunAttempt = await prisma.taskRunAttempt.findUnique({
       where: { friendlyId: attemptFriendlyId },
@@ -1180,13 +1180,13 @@ class SharedQueueTasks {
       return;
     }
 
-    await marqs?.heartbeatMessage(taskRunAttempt.taskRunId, seconds);
+    await marqs?.heartbeatMessage(taskRunAttempt.taskRunId);
   }
 
-  async taskRunHeartbeat(runId: string, seconds: number = 60) {
-    logger.debug("[SharedQueueConsumer] taskRunHeartbeat()", { runId, seconds });
+  async taskRunHeartbeat(runId: string) {
+    logger.debug("[SharedQueueConsumer] taskRunHeartbeat()", { runId });
 
-    await marqs?.heartbeatMessage(runId, seconds);
+    await marqs?.heartbeatMessage(runId);
   }
 
   public async taskRunFailed(completion: TaskRunFailedExecutionResult) {
diff --git a/packages/build/CHANGELOG.md b/packages/build/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @trigger.dev/build
 
+## 3.0.1
+
+### Patch Changes
+
+- 3aa581179: Fixing false-positive package version mismatches
+- Updated dependencies [3aa581179]
+  - @trigger.dev/core@3.0.1
+
 ## 3.0.0
 
 ### Major Changes
diff --git a/packages/build/package.json b/packages/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/build",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "trigger.dev build extensions",
   "license": "MIT",
   "publishConfig": {
@@ -61,7 +61,7 @@
     "check-exports": "attw --pack ."
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:3.0.0",
+    "@trigger.dev/core": "workspace:3.0.1",
     "pkg-types": "^1.1.3",
     "tinyglobby": "^0.2.2",
     "tsconfck": "3.1.3"
diff --git a/packages/cli-v3/CHANGELOG.md b/packages/cli-v3/CHANGELOG.md
@@ -1,5 +1,14 @@
 # trigger.dev
 
+## 3.0.1
+
+### Patch Changes
+
+- 3aa581179: Fixing false-positive package version mismatches
+- Updated dependencies [3aa581179]
+  - @trigger.dev/build@3.0.1
+  - @trigger.dev/core@3.0.1
+
 ## 3.0.0
 
 ### Major Changes
diff --git a/packages/cli-v3/package.json b/packages/cli-v3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A Command-Line Interface for Trigger.dev (v3) projects",
   "type": "module",
   "license": "MIT",
@@ -88,8 +88,8 @@
     "@opentelemetry/sdk-trace-base": "1.25.1",
     "@opentelemetry/sdk-trace-node": "1.25.1",
     "@opentelemetry/semantic-conventions": "1.25.1",
-    "@trigger.dev/build": "workspace:3.0.0",
-    "@trigger.dev/core": "workspace:3.0.0",
+    "@trigger.dev/build": "workspace:3.0.1",
+    "@trigger.dev/core": "workspace:3.0.1",
     "c12": "^1.11.1",
     "chalk": "^5.2.0",
     "cli-table3": "^0.6.3",
diff --git a/packages/cli-v3/src/entryPoints/deploy-run-worker.ts b/packages/cli-v3/src/entryPoints/deploy-run-worker.ts
@@ -77,12 +77,13 @@ process.on("uncaughtException", function (error, origin) {
   }
 });
 
-const heartbeatIntervalMs = getEnvVar("USAGE_HEARTBEAT_INTERVAL_MS");
+const usageIntervalMs = getEnvVar("USAGE_HEARTBEAT_INTERVAL_MS");
 const usageEventUrl = getEnvVar("USAGE_EVENT_URL");
 const triggerJWT = getEnvVar("TRIGGER_JWT");
+const heartbeatIntervalMs = getEnvVar("HEARTBEAT_INTERVAL_MS");
 
 const prodUsageManager = new ProdUsageManager(new DevUsageManager(), {
-  heartbeatIntervalMs: heartbeatIntervalMs ? parseInt(heartbeatIntervalMs, 10) : undefined,
+  heartbeatIntervalMs: usageIntervalMs ? parseInt(usageIntervalMs, 10) : undefined,
   url: usageEventUrl,
   jwt: triggerJWT,
 });
@@ -383,7 +384,9 @@ runtime.setGlobalRuntimeManager(prodRuntimeManager);
 
 process.title = "trigger-dev-worker";
 
-for await (const _ of setInterval(15_000)) {
+const heartbeatInterval = parseInt(heartbeatIntervalMs ?? "30000", 10);
+
+for await (const _ of setInterval(heartbeatInterval)) {
   if (_isRunning && _execution) {
     try {
       await zodIpc.send("TASK_HEARTBEAT", { id: _execution.attempt.id });
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # internal-platform
 
+## 3.0.1
+
+### Patch Changes
+
+- 3aa581179: Fixing false-positive package version mismatches
+
 ## 3.0.0
 
 ### Major Changes
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/core",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Core code used across the Trigger.dev SDK and platform",
   "license": "MIT",
   "publishConfig": {
diff --git a/packages/trigger-sdk/CHANGELOG.md b/packages/trigger-sdk/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @trigger.dev/sdk
 
+## 3.0.1
+
+### Patch Changes
+
+- 3aa581179: Fixing false-positive package version mismatches
+- Updated dependencies [3aa581179]
+  - @trigger.dev/core@3.0.1
+
 ## 3.0.0
 
 ### Major Changes
diff --git a/packages/trigger-sdk/package.json b/packages/trigger-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/sdk",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "trigger.dev Node.JS SDK",
   "license": "MIT",
   "publishConfig": {
@@ -48,7 +48,7 @@
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/api-logs": "0.52.1",
     "@opentelemetry/semantic-conventions": "1.25.1",
-    "@trigger.dev/core": "workspace:3.0.0",
+    "@trigger.dev/core": "workspace:3.0.1",
     "chalk": "^5.2.0",
     "cronstrue": "^2.21.0",
     "debug": "^4.3.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"trigger.dev": patch
 +---
++
 +Configurable deployed heartbeat interval via HEARTBEAT_INTERVAL_MS env var
Original file line number	Diff line number	Diff line change
`@@ -1169,8 +1169,8 @@ class SharedQueueTasks {`
`1169`	`1169`	`} satisfies TaskRunExecutionLazyAttemptPayload;`
`1170`	`1170`	`}`
`1171`	`1171`
`1172`		`- async taskHeartbeat(attemptFriendlyId: string, seconds: number = 60) {`
`1173`		`- logger.debug("[SharedQueueConsumer] taskHeartbeat()", { id: attemptFriendlyId, seconds });`
	`1172`	`+ async taskHeartbeat(attemptFriendlyId: string) {`
	`1173`	`+ logger.debug("[SharedQueueConsumer] taskHeartbeat()", { id: attemptFriendlyId });`
`1174`	`1174`
`1175`	`1175`	`const taskRunAttempt = await prisma.taskRunAttempt.findUnique({`
`1176`	`1176`	`where: { friendlyId: attemptFriendlyId },`
`@@ -1180,13 +1180,13 @@ class SharedQueueTasks {`
`1180`	`1180`	`return;`
`1181`	`1181`	`}`
`1182`	`1182`
`1183`		`- await marqs?.heartbeatMessage(taskRunAttempt.taskRunId, seconds);`
	`1183`	`+ await marqs?.heartbeatMessage(taskRunAttempt.taskRunId);`
`1184`	`1184`	`}`
`1185`	`1185`
`1186`		`- async taskRunHeartbeat(runId: string, seconds: number = 60) {`
`1187`		`- logger.debug("[SharedQueueConsumer] taskRunHeartbeat()", { runId, seconds });`
	`1186`	`+ async taskRunHeartbeat(runId: string) {`
	`1187`	`+ logger.debug("[SharedQueueConsumer] taskRunHeartbeat()", { runId });`
`1188`	`1188`
`1189`		`- await marqs?.heartbeatMessage(runId, seconds);`
	`1189`	`+ await marqs?.heartbeatMessage(runId);`
`1190`	`1190`	`}`
`1191`	`1191`
`1192`	`1192`	`public async taskRunFailed(completion: TaskRunFailedExecutionResult) {`