Skip to content

Commit e209313

Browse files
nicktrnnicktrn
committed
Merge branch 'main' into v3/fix-abort-controller
2 parents 3c1d8c7 + de135e4 commit e209313

17 files changed

+83
-38
lines changed

‎.changeset/calm-berries-trade.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.changeset/poor-starfishes-act.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"trigger.dev": patch
3+
---
4+
5+
Configurable deployed heartbeat interval via HEARTBEAT_INTERVAL_MS env var

‎apps/webapp/app/env.server.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,11 @@ const EnvironmentSchema = z.object({
177177

178178
LOOPS_API_KEY: z.string().optional(),
179179
MARQS_DISABLE_REBALANCING: z.coerce.boolean().default(false),
180+
MARQS_VISIBILITY_TIMEOUT_MS: z.coerce
181+
.number()
182+
.int()
183+
.default(60 * 1000 * 15),
184+
PROD_TASK_HEARTBEAT_INTERVAL_MS: z.coerce.number().int().optional(),
180185

181186
VERBOSE_GRAPHILE_LOGGING: z.string().default("false"),
182187
V2_MARQS_ENABLED: z.string().default("0"),

‎apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -798,6 +798,15 @@ async function resolveBuiltInProdVariables(runtimeEnvironment: RuntimeEnvironmen
798798
]);
799799
}
800800

801+
if (env.PROD_TASK_HEARTBEAT_INTERVAL_MS) {
802+
result = result.concat([
803+
{
804+
key: "HEARTBEAT_INTERVAL_MS",
805+
value: String(env.PROD_TASK_HEARTBEAT_INTERVAL_MS),
806+
},
807+
]);
808+
}
809+
801810
const commonVariables = await resolveCommonBuiltInVariables(runtimeEnvironment);
802811

803812
return [...result, ...commonVariables];

‎apps/webapp/app/v3/marqs/devQueueConsumer.server.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ export class DevQueueConsumer {
162162
/**
163163
* @deprecated Use `taskRunHeartbeat` instead
164164
*/
165-
public async taskHeartbeat(workerId: string, id: string, seconds: number = 60) {
166-
logger.debug("[DevQueueConsumer] taskHeartbeat()", { id, seconds });
165+
public async taskHeartbeat(workerId: string, id: string) {
166+
logger.debug("[DevQueueConsumer] taskHeartbeat()", { id });
167167

168168
const taskRunAttempt = await prisma.taskRunAttempt.findUnique({
169169
where: { friendlyId: id },
@@ -173,13 +173,13 @@ export class DevQueueConsumer {
173173
return;
174174
}
175175

176-
await marqs?.heartbeatMessage(taskRunAttempt.taskRunId, seconds);
176+
await marqs?.heartbeatMessage(taskRunAttempt.taskRunId);
177177
}
178178

179-
public async taskRunHeartbeat(workerId: string, id: string, seconds: number = 60) {
180-
logger.debug("[DevQueueConsumer] taskRunHeartbeat()", { id, seconds });
179+
public async taskRunHeartbeat(workerId: string, id: string) {
180+
logger.debug("[DevQueueConsumer] taskRunHeartbeat()", { id });
181181

182-
await marqs?.heartbeatMessage(id, seconds);
182+
await marqs?.heartbeatMessage(id);
183183
}
184184

185185
public async stop(reason: string = "CLI disconnected") {

‎apps/webapp/app/v3/marqs/index.server.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -698,8 +698,8 @@ export class MarQS {
698698
}
699699

700700
// This should increment by the number of seconds, but with a max value of Date.now() + visibilityTimeoutInMs
701-
public async heartbeatMessage(messageId: string, seconds: number = 30) {
702-
await this.options.visibilityTimeoutStrategy.heartbeat(messageId, seconds * 1000);
701+
public async heartbeatMessage(messageId: string) {
702+
await this.options.visibilityTimeoutStrategy.heartbeat(messageId, this.visibilityTimeoutInMs);
703703
}
704704

705705
get visibilityTimeoutInMs() {
@@ -1871,7 +1871,7 @@ function getMarQSClient() {
18711871
redis: redisOptions,
18721872
defaultEnvConcurrency: env.DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT,
18731873
defaultOrgConcurrency: env.DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT,
1874-
visibilityTimeoutInMs: 120 * 1000, // 2 minutes,
1874+
visibilityTimeoutInMs: env.MARQS_VISIBILITY_TIMEOUT_MS,
18751875
enableRebalancing: !env.MARQS_DISABLE_REBALANCING,
18761876
subscriber: concurrencyTracker,
18771877
});

‎apps/webapp/app/v3/marqs/sharedQueueConsumer.server.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,8 +1169,8 @@ class SharedQueueTasks {
11691169
} satisfies TaskRunExecutionLazyAttemptPayload;
11701170
}
11711171

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 });
11741174

11751175
const taskRunAttempt = await prisma.taskRunAttempt.findUnique({
11761176
where: { friendlyId: attemptFriendlyId },
@@ -1180,13 +1180,13 @@ class SharedQueueTasks {
11801180
return;
11811181
}
11821182

1183-
await marqs?.heartbeatMessage(taskRunAttempt.taskRunId, seconds);
1183+
await marqs?.heartbeatMessage(taskRunAttempt.taskRunId);
11841184
}
11851185

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 });
11881188

1189-
await marqs?.heartbeatMessage(runId, seconds);
1189+
await marqs?.heartbeatMessage(runId);
11901190
}
11911191

11921192
public async taskRunFailed(completion: TaskRunFailedExecutionResult) {

‎packages/build/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @trigger.dev/build
22

3+
## 3.0.1
4+
5+
### Patch Changes
6+
7+
- 3aa581179: Fixing false-positive package version mismatches
8+
- Updated dependencies [3aa581179]
9+
- @trigger.dev/[email protected]
10+
311
## 3.0.0
412

513
### Major Changes

‎packages/build/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/build",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"description": "trigger.dev build extensions",
55
"license": "MIT",
66
"publishConfig": {
@@ -61,7 +61,7 @@
6161
"check-exports": "attw --pack ."
6262
},
6363
"dependencies": {
64-
"@trigger.dev/core": "workspace:3.0.0",
64+
"@trigger.dev/core": "workspace:3.0.1",
6565
"pkg-types": "^1.1.3",
6666
"tinyglobby": "^0.2.2",
6767
"tsconfck": "3.1.3"

‎packages/cli-v3/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# trigger.dev
22

3+
## 3.0.1
4+
5+
### Patch Changes
6+
7+
- 3aa581179: Fixing false-positive package version mismatches
8+
- Updated dependencies [3aa581179]
9+
- @trigger.dev/[email protected]
10+
- @trigger.dev/[email protected]
11+
312
## 3.0.0
413

514
### Major Changes

‎packages/cli-v3/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "trigger.dev",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"description": "A Command-Line Interface for Trigger.dev (v3) projects",
55
"type": "module",
66
"license": "MIT",
@@ -88,8 +88,8 @@
8888
"@opentelemetry/sdk-trace-base": "1.25.1",
8989
"@opentelemetry/sdk-trace-node": "1.25.1",
9090
"@opentelemetry/semantic-conventions": "1.25.1",
91-
"@trigger.dev/build": "workspace:3.0.0",
92-
"@trigger.dev/core": "workspace:3.0.0",
91+
"@trigger.dev/build": "workspace:3.0.1",
92+
"@trigger.dev/core": "workspace:3.0.1",
9393
"c12": "^1.11.1",
9494
"chalk": "^5.2.0",
9595
"cli-table3": "^0.6.3",

‎packages/cli-v3/src/entryPoints/deploy-run-worker.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,13 @@ process.on("uncaughtException", function (error, origin) {
7777
}
7878
});
7979

80-
const heartbeatIntervalMs = getEnvVar("USAGE_HEARTBEAT_INTERVAL_MS");
80+
const usageIntervalMs = getEnvVar("USAGE_HEARTBEAT_INTERVAL_MS");
8181
const usageEventUrl = getEnvVar("USAGE_EVENT_URL");
8282
const triggerJWT = getEnvVar("TRIGGER_JWT");
83+
const heartbeatIntervalMs = getEnvVar("HEARTBEAT_INTERVAL_MS");
8384

8485
const prodUsageManager = new ProdUsageManager(new DevUsageManager(), {
85-
heartbeatIntervalMs: heartbeatIntervalMs ? parseInt(heartbeatIntervalMs, 10) : undefined,
86+
heartbeatIntervalMs: usageIntervalMs ? parseInt(usageIntervalMs, 10) : undefined,
8687
url: usageEventUrl,
8788
jwt: triggerJWT,
8889
});
@@ -383,7 +384,9 @@ runtime.setGlobalRuntimeManager(prodRuntimeManager);
383384

384385
process.title = "trigger-dev-worker";
385386

386-
for await (const _ of setInterval(15_000)) {
387+
const heartbeatInterval = parseInt(heartbeatIntervalMs ?? "30000", 10);
388+
389+
for await (const _ of setInterval(heartbeatInterval)) {
387390
if (_isRunning && _execution) {
388391
try {
389392
await zodIpc.send("TASK_HEARTBEAT", { id: _execution.attempt.id });

‎packages/core/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# internal-platform
22

3+
## 3.0.1
4+
5+
### Patch Changes
6+
7+
- 3aa581179: Fixing false-positive package version mismatches
8+
39
## 3.0.0
410

511
### Major Changes

‎packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/core",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"description": "Core code used across the Trigger.dev SDK and platform",
55
"license": "MIT",
66
"publishConfig": {

‎packages/trigger-sdk/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @trigger.dev/sdk
22

3+
## 3.0.1
4+
5+
### Patch Changes
6+
7+
- 3aa581179: Fixing false-positive package version mismatches
8+
- Updated dependencies [3aa581179]
9+
- @trigger.dev/[email protected]
10+
311
## 3.0.0
412

513
### Major Changes

‎packages/trigger-sdk/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/sdk",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"description": "trigger.dev Node.JS SDK",
55
"license": "MIT",
66
"publishConfig": {
@@ -48,7 +48,7 @@
4848
"@opentelemetry/api": "1.9.0",
4949
"@opentelemetry/api-logs": "0.52.1",
5050
"@opentelemetry/semantic-conventions": "1.25.1",
51-
"@trigger.dev/core": "workspace:3.0.0",
51+
"@trigger.dev/core": "workspace:3.0.1",
5252
"chalk": "^5.2.0",
5353
"cronstrue": "^2.21.0",
5454
"debug": "^4.3.4",

‎pnpm-lock.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)