diff --git a/apps/proxy/CHANGELOG.md b/apps/proxy/CHANGELOG.md index 309dc0e53..a91bc334f 100644 --- a/apps/proxy/CHANGELOG.md +++ b/apps/proxy/CHANGELOG.md @@ -1,5 +1,18 @@ # proxy +## 0.0.8 + +### Patch Changes + +- @trigger.dev/core@2.3.2 + +## 0.0.7 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/core@2.3.1 + ## 0.0.6 ### Patch Changes diff --git a/apps/proxy/package.json b/apps/proxy/package.json index d84eba9f7..3d8beddea 100644 --- a/apps/proxy/package.json +++ b/apps/proxy/package.json @@ -1,6 +1,6 @@ { "name": "proxy", - "version": "0.0.6", + "version": "0.0.8", "private": true, "scripts": { "deploy": "wrangler deploy", diff --git a/apps/webapp/app/services/db/pgListen.server.ts b/apps/webapp/app/services/db/pgListen.server.ts index 94474f69f..ddcc54c7b 100644 --- a/apps/webapp/app/services/db/pgListen.server.ts +++ b/apps/webapp/app/services/db/pgListen.server.ts @@ -1,9 +1,9 @@ +import { Logger } from "@trigger.dev/core-backend"; import type { PoolClient } from "pg"; import { z } from "zod"; -import { Logger } from "@trigger.dev/core"; import { logger } from "~/services/logger.server"; -import { NotificationCatalog, NotificationChannel, notificationCatalog } from "./types"; import { safeJsonParse } from "~/utils/json"; +import { NotificationCatalog, NotificationChannel, notificationCatalog } from "./types"; export class PgListenService { #poolClient: PoolClient; diff --git a/apps/webapp/app/services/logger.server.ts b/apps/webapp/app/services/logger.server.ts index c9a4d2b66..c2a413e2d 100644 --- a/apps/webapp/app/services/logger.server.ts +++ b/apps/webapp/app/services/logger.server.ts @@ -1,5 +1,5 @@ -import type { LogLevel } from "@trigger.dev/core"; -import { Logger } from "@trigger.dev/core"; +import type { LogLevel } from "@trigger.dev/core-backend"; +import { Logger } from "@trigger.dev/core-backend"; import { sensitiveDataReplacer } from "./sensitiveDataReplacer"; import { AsyncLocalStorage } from "async_hooks"; diff --git a/apps/webapp/app/services/runs/performRunExecutionV3.server.ts b/apps/webapp/app/services/runs/performRunExecutionV3.server.ts index f45e7dd34..c06e9ec00 100644 --- a/apps/webapp/app/services/runs/performRunExecutionV3.server.ts +++ b/apps/webapp/app/services/runs/performRunExecutionV3.server.ts @@ -1053,20 +1053,24 @@ export class PerformRunExecutionV3Service { return await this.#failRunExecution(this.#prismaClient, run, output); } - await this.#prismaClient.jobRun.update({ + const updatedJob = await this.#prismaClient.jobRun.update({ where: { id: run.id }, data: { status: "WAITING_TO_EXECUTE", - executionDuration: { - increment: durationInMs, - }, - executionCount: { + executionFailureCount: { increment: 1, }, }, }); - await ResumeRunService.enqueue(run, this.#prismaClient); + if (updatedJob.executionFailureCount >= 10) { + return await this.#failRunExecution(this.#prismaClient, run, output); + } + + // Use the job.executionFailureCount to determine how long to wait before retrying, using an exponential backoff + const runAt = new Date(Date.now() + Math.pow(1.5, updatedJob.executionFailureCount) * 500); // 500ms, 750ms, 1125ms, 1687ms, 2531ms, 3796ms, 5694ms, 8541ms, 12812ms, 19218ms + + await ResumeRunService.enqueue(run, this.#prismaClient, runAt); } async #failRunExecution( diff --git a/integrations/airtable/CHANGELOG.md b/integrations/airtable/CHANGELOG.md index 8e5f48c61..51b9c9a4e 100644 --- a/integrations/airtable/CHANGELOG.md +++ b/integrations/airtable/CHANGELOG.md @@ -1,5 +1,21 @@ # @trigger.dev/airtable +## 2.3.2 + +### Patch Changes + +- 0c14e4cd: Fixed importing package subpath + - @trigger.dev/integration-kit@2.3.2 + - @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/integration-kit@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/airtable/package.json b/integrations/airtable/package.json index 15cced933..a8a647506 100644 --- a/integrations/airtable/package.json +++ b/integrations/airtable/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/airtable", - "version": "2.3.0", + "version": "2.3.2", "description": "Trigger.dev integration for airtable", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -25,8 +25,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@trigger.dev/integration-kit": "workspace:^2.3.0", - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/integration-kit": "workspace:^2.3.2", + "@trigger.dev/sdk": "workspace:^2.3.2", "airtable": "^0.12.1", "zod": "3.22.3" }, diff --git a/integrations/airtable/src/webhooks.ts b/integrations/airtable/src/webhooks.ts index 20da13e78..a50defc43 100644 --- a/integrations/airtable/src/webhooks.ts +++ b/integrations/airtable/src/webhooks.ts @@ -4,8 +4,8 @@ import { z } from "zod"; import * as events from "./events"; import { Airtable, AirtableRunTask } from "./index"; import { ListWebhooksResponse, ListWebhooksResponseSchema } from "./schemas"; -import { WebhookSource, WebhookTrigger } from "@trigger.dev/sdk/triggers/webhook"; -import { registerJobNamespace } from "@trigger.dev/integration-kit/webhooks"; +import { WebhookSource, WebhookTrigger } from "@trigger.dev/sdk"; +import { registerJobNamespace } from "@trigger.dev/integration-kit"; import { Buffer } from "node:buffer"; const WebhookFromSourceSchema = z.union([ diff --git a/integrations/github/CHANGELOG.md b/integrations/github/CHANGELOG.md index ba4d5a515..116b4eb17 100644 --- a/integrations/github/CHANGELOG.md +++ b/integrations/github/CHANGELOG.md @@ -1,5 +1,20 @@ # @trigger.dev/github +## 2.3.2 + +### Patch Changes + +- @trigger.dev/integration-kit@2.3.2 +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/integration-kit@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/github/package.json b/integrations/github/package.json index cce893e33..5f59b08f9 100644 --- a/integrations/github/package.json +++ b/integrations/github/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/github", - "version": "2.3.0", + "version": "2.3.2", "description": "The official GitHub integration for Trigger.dev", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -29,8 +29,8 @@ "@octokit/request": "^6.2.5", "@octokit/request-error": "^4.0.1", "@octokit/webhooks": "^10.4.0", - "@trigger.dev/integration-kit": "workspace:^2.3.0", - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/integration-kit": "workspace:^2.3.2", + "@trigger.dev/sdk": "workspace:^2.3.2", "octokit": "^2.0.14", "zod": "3.22.3" }, diff --git a/integrations/linear/CHANGELOG.md b/integrations/linear/CHANGELOG.md index 59537580d..0d6748dc4 100644 --- a/integrations/linear/CHANGELOG.md +++ b/integrations/linear/CHANGELOG.md @@ -1,5 +1,20 @@ # @trigger.dev/linear +## 2.3.2 + +### Patch Changes + +- @trigger.dev/integration-kit@2.3.2 +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/integration-kit@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/linear/package.json b/integrations/linear/package.json index 3e8c1ec4f..00376b054 100644 --- a/integrations/linear/package.json +++ b/integrations/linear/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/linear", - "version": "2.3.0", + "version": "2.3.2", "description": "Trigger.dev integration for @linear/sdk", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -26,8 +26,8 @@ }, "dependencies": { "@linear/sdk": "^8.0.0", - "@trigger.dev/integration-kit": "workspace:^2.3.0", - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/integration-kit": "workspace:^2.3.2", + "@trigger.dev/sdk": "workspace:^2.3.2", "zod": "3.22.3" }, "engines": { diff --git a/integrations/openai/CHANGELOG.md b/integrations/openai/CHANGELOG.md index ecf43a926..aed88b0a4 100644 --- a/integrations/openai/CHANGELOG.md +++ b/integrations/openai/CHANGELOG.md @@ -1,5 +1,20 @@ # @trigger.dev/slack +## 2.3.2 + +### Patch Changes + +- @trigger.dev/integration-kit@2.3.2 +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/integration-kit@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/openai/package.json b/integrations/openai/package.json index 574f05077..981edb371 100644 --- a/integrations/openai/package.json +++ b/integrations/openai/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/openai", - "version": "2.3.0", + "version": "2.3.2", "description": "The official OpenAI integration for Trigger.dev", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -42,8 +42,8 @@ }, "dependencies": { "openai": "^4.16.1", - "@trigger.dev/sdk": "workspace:^2.3.0", - "@trigger.dev/integration-kit": "workspace:^2.3.0" + "@trigger.dev/sdk": "workspace:^2.3.2", + "@trigger.dev/integration-kit": "workspace:^2.3.2" }, "engines": { "node": ">=18.0.0" diff --git a/integrations/plain/CHANGELOG.md b/integrations/plain/CHANGELOG.md index f19758b4d..fbdcfa80a 100644 --- a/integrations/plain/CHANGELOG.md +++ b/integrations/plain/CHANGELOG.md @@ -1,5 +1,21 @@ # @trigger.dev/plain +## 2.3.2 + +### Patch Changes + +- 0c14e4cd: Fixed importing package subpath + - @trigger.dev/integration-kit@2.3.2 + - @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/integration-kit@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/plain/package.json b/integrations/plain/package.json index 0759905a8..d2af81aa7 100644 --- a/integrations/plain/package.json +++ b/integrations/plain/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/plain", - "version": "2.3.0", + "version": "2.3.2", "description": "The official Plain.com integration for Trigger.dev", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -24,8 +24,8 @@ "build:tsup": "tsup" }, "dependencies": { - "@trigger.dev/integration-kit": "workspace:^2.3.0", - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/integration-kit": "workspace:^2.3.2", + "@trigger.dev/sdk": "workspace:^2.3.2", "@team-plain/typescript-sdk": "^2.7.0" }, "engines": { diff --git a/integrations/plain/src/types.ts b/integrations/plain/src/types.ts index 6b3d8c4b5..53239c59c 100644 --- a/integrations/plain/src/types.ts +++ b/integrations/plain/src/types.ts @@ -1,5 +1,5 @@ import { PlainClient } from "@team-plain/typescript-sdk"; -import { Prettify } from "@trigger.dev/integration-kit/prettify"; +import { Prettify } from "@trigger.dev/integration-kit"; export type PlainSDK = InstanceType; diff --git a/integrations/replicate/CHANGELOG.md b/integrations/replicate/CHANGELOG.md index 97b4356d7..01eacb67a 100644 --- a/integrations/replicate/CHANGELOG.md +++ b/integrations/replicate/CHANGELOG.md @@ -1,5 +1,20 @@ # @trigger.dev/replicate +## 2.3.2 + +### Patch Changes + +- @trigger.dev/integration-kit@2.3.2 +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/integration-kit@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/replicate/package.json b/integrations/replicate/package.json index 470399e04..fc13457d0 100644 --- a/integrations/replicate/package.json +++ b/integrations/replicate/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/replicate", - "version": "2.3.0", + "version": "2.3.2", "description": "Trigger.dev integration for replicate", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -25,8 +25,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@trigger.dev/integration-kit": "workspace:^2.3.0", - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/integration-kit": "workspace:^2.3.2", + "@trigger.dev/sdk": "workspace:^2.3.2", "replicate": "^0.18.1", "zod": "3.22.3" }, diff --git a/integrations/resend/CHANGELOG.md b/integrations/resend/CHANGELOG.md index 37d3ec902..7f72fcb77 100644 --- a/integrations/resend/CHANGELOG.md +++ b/integrations/resend/CHANGELOG.md @@ -1,5 +1,20 @@ # @trigger.dev/resend +## 2.3.2 + +### Patch Changes + +- @trigger.dev/integration-kit@2.3.2 +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/integration-kit@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/resend/package.json b/integrations/resend/package.json index d0d5e2347..923e5f2c8 100644 --- a/integrations/resend/package.json +++ b/integrations/resend/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/resend", - "version": "2.3.0", + "version": "2.3.2", "description": "The official Resend.com integration for Trigger.dev", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -24,8 +24,8 @@ "build:tsup": "tsup" }, "dependencies": { - "@trigger.dev/integration-kit": "workspace:^2.3.0", - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/integration-kit": "workspace:^2.3.2", + "@trigger.dev/sdk": "workspace:^2.3.2", "resend": "^2.0.0" }, "engines": { diff --git a/integrations/sendgrid/CHANGELOG.md b/integrations/sendgrid/CHANGELOG.md index d1e7998e4..1c0b94ab7 100644 --- a/integrations/sendgrid/CHANGELOG.md +++ b/integrations/sendgrid/CHANGELOG.md @@ -1,5 +1,20 @@ # @trigger.dev/sendgrid +## 2.3.2 + +### Patch Changes + +- @trigger.dev/integration-kit@2.3.2 +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/integration-kit@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/sendgrid/package.json b/integrations/sendgrid/package.json index 156e82ef6..569e594c1 100644 --- a/integrations/sendgrid/package.json +++ b/integrations/sendgrid/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/sendgrid", - "version": "2.3.0", + "version": "2.3.2", "description": "Trigger.dev integration for @sendgrid/mail", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -26,8 +26,8 @@ }, "dependencies": { "@sendgrid/mail": "^7.7.0", - "@trigger.dev/sdk": "workspace:^2.3.0", - "@trigger.dev/integration-kit": "workspace:^2.3.0" + "@trigger.dev/sdk": "workspace:^2.3.2", + "@trigger.dev/integration-kit": "workspace:^2.3.2" }, "engines": { "node": ">=16.8.0" diff --git a/integrations/shopify/CHANGELOG.md b/integrations/shopify/CHANGELOG.md index 2eefda4b0..a339cafc0 100644 --- a/integrations/shopify/CHANGELOG.md +++ b/integrations/shopify/CHANGELOG.md @@ -1,5 +1,20 @@ # @trigger.dev/shopify +## 2.3.2 + +### Patch Changes + +- @trigger.dev/integration-kit@2.3.2 +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/integration-kit@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/shopify/package.json b/integrations/shopify/package.json index a605d22a0..2307e7a44 100644 --- a/integrations/shopify/package.json +++ b/integrations/shopify/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/shopify", - "version": "2.3.0", + "version": "2.3.2", "description": "Trigger.dev integration for @shopify/shopify-api", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -26,8 +26,8 @@ }, "dependencies": { "@shopify/shopify-api": "^8.0.2", - "@trigger.dev/sdk": "workspace:^2.3.0", - "@trigger.dev/integration-kit": "workspace:^2.3.0", + "@trigger.dev/sdk": "workspace:^2.3.2", + "@trigger.dev/integration-kit": "workspace:^2.3.2", "zod": "3.22.3" }, "engines": { diff --git a/integrations/slack/CHANGELOG.md b/integrations/slack/CHANGELOG.md index f4997c753..9a4429af0 100644 --- a/integrations/slack/CHANGELOG.md +++ b/integrations/slack/CHANGELOG.md @@ -1,5 +1,18 @@ # @trigger.dev/slack +## 2.3.2 + +### Patch Changes + +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/slack/package.json b/integrations/slack/package.json index 0007d0a92..c2175d231 100644 --- a/integrations/slack/package.json +++ b/integrations/slack/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/slack", - "version": "2.3.0", + "version": "2.3.2", "description": "The official Slack integration for Trigger.dev", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -25,7 +25,7 @@ }, "dependencies": { "@slack/web-api": "^6.8.1", - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/sdk": "workspace:^2.3.2", "zod": "3.22.3" }, "engines": { diff --git a/integrations/stripe/CHANGELOG.md b/integrations/stripe/CHANGELOG.md index 4f45324a2..aae6266b5 100644 --- a/integrations/stripe/CHANGELOG.md +++ b/integrations/stripe/CHANGELOG.md @@ -1,5 +1,20 @@ # @trigger.dev/stripe +## 2.3.2 + +### Patch Changes + +- @trigger.dev/integration-kit@2.3.2 +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/integration-kit@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/stripe/package.json b/integrations/stripe/package.json index b6bfd66e3..23d0084e9 100644 --- a/integrations/stripe/package.json +++ b/integrations/stripe/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/stripe", - "version": "2.3.0", + "version": "2.3.2", "description": "Trigger.dev integration for stripe", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -25,8 +25,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@trigger.dev/integration-kit": "workspace:^2.3.0", - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/integration-kit": "workspace:^2.3.2", + "@trigger.dev/sdk": "workspace:^2.3.2", "stripe": "^12.14.0", "zod": "3.22.3" }, diff --git a/integrations/supabase/CHANGELOG.md b/integrations/supabase/CHANGELOG.md index 658c61b1e..3493247e4 100644 --- a/integrations/supabase/CHANGELOG.md +++ b/integrations/supabase/CHANGELOG.md @@ -1,5 +1,20 @@ # @trigger.dev/supabase +## 2.3.2 + +### Patch Changes + +- @trigger.dev/integration-kit@2.3.2 +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/integration-kit@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/supabase/package.json b/integrations/supabase/package.json index ffa173888..86096adb7 100644 --- a/integrations/supabase/package.json +++ b/integrations/supabase/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/supabase", - "version": "2.3.0", + "version": "2.3.2", "description": "Trigger.dev integration for @supabase/supabase-js", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -26,8 +26,8 @@ }, "dependencies": { "@supabase/supabase-js": "^2.26.0", - "@trigger.dev/integration-kit": "workspace:^2.3.0", - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/integration-kit": "workspace:^2.3.2", + "@trigger.dev/sdk": "workspace:^2.3.2", "supabase-management-js": "^1.0.0", "zod": "3.22.3" }, diff --git a/integrations/typeform/CHANGELOG.md b/integrations/typeform/CHANGELOG.md index bed47988e..2d442aab6 100644 --- a/integrations/typeform/CHANGELOG.md +++ b/integrations/typeform/CHANGELOG.md @@ -1,5 +1,20 @@ # @trigger.dev/typeform +## 2.3.2 + +### Patch Changes + +- @trigger.dev/integration-kit@2.3.2 +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/integration-kit@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/integrations/typeform/package.json b/integrations/typeform/package.json index f125e8871..fd94e08ca 100644 --- a/integrations/typeform/package.json +++ b/integrations/typeform/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/typeform", - "version": "2.3.0", + "version": "2.3.2", "description": "The official Typeform integration for Trigger.dev", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -24,8 +24,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@trigger.dev/integration-kit": "workspace:^2.3.0", - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/integration-kit": "workspace:^2.3.2", + "@trigger.dev/sdk": "workspace:^2.3.2", "@typeform/api-client": "^1.8.0", "zod": "3.22.3" }, diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 3aa93883d..36543a7fe 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,18 @@ # @trigger.dev/astro +## 2.3.2 + +### Patch Changes + +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + ## 2.3.0 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 5cb6d19cd..56be9f2be 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,7 +1,7 @@ { "name": "@trigger.dev/astro", "description": "An Astro-native integration for Trigger.dev background jobs platform", - "version": "2.3.0", + "version": "2.3.2", "main": "./dist/index.js", "types": "./dist/index.d.ts", "files": [ @@ -20,7 +20,7 @@ "build:tsup": "tsup" }, "peerDependencies": { - "@trigger.dev/sdk": "workspace:^2.3.0" + "@trigger.dev/sdk": "workspace:^2.3.2" }, "devDependencies": { "astro": "^3.0.12", diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index c84dbea92..615f5b6e5 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -1,5 +1,18 @@ # create-trigger +## 2.3.2 + +### Patch Changes + +- @trigger.dev/core@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/core@2.3.1 + ## 2.3.0 ### Patch Changes diff --git a/packages/cli/package.json b/packages/cli/package.json index a644cbf17..2a3eba20c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/cli", - "version": "2.3.0", + "version": "2.3.2", "description": "The Trigger.dev CLI", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/core-backend/CHANGELOG.md b/packages/core-backend/CHANGELOG.md index 6a3170736..d512386c8 100644 --- a/packages/core-backend/CHANGELOG.md +++ b/packages/core-backend/CHANGELOG.md @@ -1,5 +1,13 @@ # @trigger.dev/core-backend +## 2.3.2 + +## 2.3.1 + +### Patch Changes + +- f3efcc0c: Moved Logger to core-backend, no longer importing node:buffer in core/react + ## 2.3.0 ### Minor Changes diff --git a/packages/core-backend/package.json b/packages/core-backend/package.json index 9df52ddd6..6aee27e7f 100644 --- a/packages/core-backend/package.json +++ b/packages/core-backend/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/core-backend", - "version": "2.3.0", + "version": "2.3.2", "description": "Core code used across `@trigger.dev/sdk` and Trigger.dev server", "license": "MIT", "main": "./dist/index.js", diff --git a/packages/core-backend/src/index.ts b/packages/core-backend/src/index.ts index 01deb504c..9b274c474 100644 --- a/packages/core-backend/src/index.ts +++ b/packages/core-backend/src/index.ts @@ -1 +1,2 @@ export * from "./bloom"; +export * from "./logger"; diff --git a/packages/core/src/logger.ts b/packages/core-backend/src/logger.ts similarity index 96% rename from packages/core/src/logger.ts rename to packages/core-backend/src/logger.ts index c83ad131e..4dee93820 100644 --- a/packages/core/src/logger.ts +++ b/packages/core-backend/src/logger.ts @@ -196,11 +196,5 @@ function prettyPrintBytes(value: unknown): string { function getSizeInBytes(value: unknown) { const jsonString = JSON.stringify(value); - if (typeof window === "undefined") { - // Node.js environment - return Buffer.byteLength(jsonString, "utf8"); - } else { - // Browser environment - return new TextEncoder().encode(jsonString).length; - } + return Buffer.byteLength(jsonString, "utf8"); } diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 2794b265e..7bf140860 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,5 +1,13 @@ # internal-platform +## 2.3.2 + +## 2.3.1 + +### Patch Changes + +- f3efcc0c: Moved Logger to core-backend, no longer importing node:buffer in core/react + ## 2.3.0 ### Minor Changes diff --git a/packages/core/package.json b/packages/core/package.json index d090dd93d..29957bd0d 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/core", - "version": "2.3.0", + "version": "2.3.2", "description": "Core code used across the Trigger.dev SDK and platform", "license": "MIT", "main": "./dist/index.js", diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index ae8fad15c..63ef65dc0 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -1,4 +1,3 @@ -export * from "./logger"; export * from "./schemas"; export * from "./types"; export * from "./utils"; diff --git a/packages/database/prisma/migrations/20231206205233_add_execution_failure_count_to_runs/migration.sql b/packages/database/prisma/migrations/20231206205233_add_execution_failure_count_to_runs/migration.sql new file mode 100644 index 000000000..f8d6f52f9 --- /dev/null +++ b/packages/database/prisma/migrations/20231206205233_add_execution_failure_count_to_runs/migration.sql @@ -0,0 +1,2 @@ +-- AlterTable +ALTER TABLE "JobRun" ADD COLUMN "executionFailureCount" INTEGER NOT NULL DEFAULT 0; diff --git a/packages/database/prisma/schema.prisma b/packages/database/prisma/schema.prisma index 9acc56c9f..48df26263 100644 --- a/packages/database/prisma/schema.prisma +++ b/packages/database/prisma/schema.prisma @@ -811,8 +811,9 @@ model JobRun { timedOutAt DateTime? timedOutReason String? - executionCount Int @default(0) - executionDuration Int @default(0) + executionCount Int @default(0) + executionFailureCount Int @default(0) + executionDuration Int @default(0) isTest Boolean @default(false) preprocess Boolean @default(false) diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md index 8a2c239e5..56dd4aebc 100644 --- a/packages/eslint-plugin/CHANGELOG.md +++ b/packages/eslint-plugin/CHANGELOG.md @@ -1,5 +1,9 @@ # @trigger.dev/eslint-plugin +## 2.3.2 + +## 2.3.1 + ## 2.3.0 ## 2.2.11 diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index 273ce7db2..245853309 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/eslint-plugin", - "version": "2.3.0", + "version": "2.3.2", "description": "ESLint plugin with trigger.dev best practices", "keywords": [ "eslint", diff --git a/packages/express/CHANGELOG.md b/packages/express/CHANGELOG.md index cc49ee6ee..be155b32c 100644 --- a/packages/express/CHANGELOG.md +++ b/packages/express/CHANGELOG.md @@ -1,5 +1,18 @@ # @trigger.dev/express +## 2.3.2 + +### Patch Changes + +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/packages/express/package.json b/packages/express/package.json index ca172ec86..34162be2a 100644 --- a/packages/express/package.json +++ b/packages/express/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/express", - "version": "2.3.0", + "version": "2.3.2", "description": "Official Express adapter for Trigger.dev", "license": "MIT", "main": "./dist/index.js", @@ -23,7 +23,7 @@ "./package.json": "./package.json" }, "devDependencies": { - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/sdk": "workspace:^2.3.2", "@trigger.dev/tsconfig": "workspace:*", "@types/debug": "^4.1.7", "@types/express": "^4.17.13", @@ -39,7 +39,7 @@ "build:tsup": "tsup" }, "peerDependencies": { - "@trigger.dev/sdk": "workspace:^2.3.0" + "@trigger.dev/sdk": "workspace:^2.3.2" }, "dependencies": { "debug": "^4.3.4", diff --git a/packages/hono/CHANGELOG.md b/packages/hono/CHANGELOG.md index 5ced844bf..b9616ae4e 100644 --- a/packages/hono/CHANGELOG.md +++ b/packages/hono/CHANGELOG.md @@ -1,5 +1,18 @@ # @trigger.dev/hono +## 2.3.2 + +### Patch Changes + +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + ## 2.3.0 ### Patch Changes diff --git a/packages/hono/package.json b/packages/hono/package.json index 2ddb452d6..6cb66c53d 100644 --- a/packages/hono/package.json +++ b/packages/hono/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/hono", - "version": "2.3.0", + "version": "2.3.2", "description": "A Trigger.dev adapter for Hono.dev", "license": "MIT", "main": "./dist/index.js", @@ -32,7 +32,7 @@ }, "peerDependencies": { "hono": "3.x", - "@trigger.dev/sdk": "workspace:^2.3.0" + "@trigger.dev/sdk": "workspace:^2.3.2" }, "devDependencies": { "@trigger.dev/tsconfig": "workspace:*", diff --git a/packages/integration-kit/CHANGELOG.md b/packages/integration-kit/CHANGELOG.md index df648e75d..188d01647 100644 --- a/packages/integration-kit/CHANGELOG.md +++ b/packages/integration-kit/CHANGELOG.md @@ -1,5 +1,18 @@ # @trigger.dev/integration-kit +## 2.3.2 + +### Patch Changes + +- @trigger.dev/core@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/core@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/packages/integration-kit/package.json b/packages/integration-kit/package.json index 0360f4d7a..99e43be42 100644 --- a/packages/integration-kit/package.json +++ b/packages/integration-kit/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/integration-kit", - "version": "2.3.0", + "version": "2.3.2", "description": "Trigger.dev Integration Kit has helpers to make creating integrations easier", "license": "MIT", "main": "./dist/index.js", diff --git a/packages/nestjs/CHANGELOG.md b/packages/nestjs/CHANGELOG.md index bd89f6c49..02153209f 100644 --- a/packages/nestjs/CHANGELOG.md +++ b/packages/nestjs/CHANGELOG.md @@ -1,5 +1,18 @@ # @trigger.dev/nestjs +## 2.3.2 + +### Patch Changes + +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json index 9f505d64f..e83bfee34 100644 --- a/packages/nestjs/package.json +++ b/packages/nestjs/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/nestjs", - "version": "2.3.0", + "version": "2.3.2", "description": "Official NestJS adapter for Trigger.dev", "license": "MIT", "main": "./dist/index.js", @@ -23,7 +23,7 @@ "./package.json": "./package.json" }, "devDependencies": { - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/sdk": "workspace:^2.3.2", "@trigger.dev/tsconfig": "workspace:*", "@types/debug": "^4.1.7", "@types/express": "^4.17.13", @@ -41,7 +41,7 @@ }, "peerDependencies": { "@nestjs/common": ">=10.0.0", - "@trigger.dev/sdk": "workspace:^2.3.0" + "@trigger.dev/sdk": "workspace:^2.3.2" }, "dependencies": { "@nestjs/common": "^10.2.4", diff --git a/packages/nextjs/CHANGELOG.md b/packages/nextjs/CHANGELOG.md index 757b05553..47373954c 100644 --- a/packages/nextjs/CHANGELOG.md +++ b/packages/nextjs/CHANGELOG.md @@ -1,5 +1,18 @@ # @trigger.dev/nextjs +## 2.3.2 + +### Patch Changes + +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index c266dff1e..81cefda01 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/nextjs", - "version": "2.3.0", + "version": "2.3.2", "description": "Trigger.dev Next.js integration", "license": "MIT", "main": "./dist/index.js", @@ -41,7 +41,7 @@ "build:tsup": "tsup" }, "peerDependencies": { - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/sdk": "workspace:^2.3.2", "next": ">=12.0.0" }, "dependencies": { diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 3a72ad7cd..d98e81566 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -1,5 +1,18 @@ # @trigger.dev/react +## 2.3.2 + +### Patch Changes + +- @trigger.dev/core@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/core@2.3.1 + ## 2.3.0 ### Patch Changes diff --git a/packages/react/package.json b/packages/react/package.json index ab1081cda..85347b9ce 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/react", - "version": "2.3.0", + "version": "2.3.2", "description": "Trigger.dev React SDK", "license": "MIT", "types": "dist/index.d.ts", @@ -27,7 +27,7 @@ }, "dependencies": { "@tanstack/react-query": "5.0.0-beta.2", - "@trigger.dev/core": "workspace:^2.3.0", + "@trigger.dev/core": "workspace:^2.3.2", "debug": "^4.3.4", "zod": "3.22.3" }, diff --git a/packages/remix/CHANGELOG.md b/packages/remix/CHANGELOG.md index 290bcd939..4595499d7 100644 --- a/packages/remix/CHANGELOG.md +++ b/packages/remix/CHANGELOG.md @@ -1,5 +1,18 @@ # @trigger.dev/remix +## 2.3.2 + +### Patch Changes + +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/packages/remix/package.json b/packages/remix/package.json index 3a6767656..da3c43db0 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/remix", - "version": "2.3.0", + "version": "2.3.2", "description": "Trigger.dev Remix integration", "license": "MIT", "main": "./dist/index.js", @@ -39,7 +39,7 @@ "build:tsup": "tsup" }, "peerDependencies": { - "@trigger.dev/sdk": "workspace:^2.3.0", + "@trigger.dev/sdk": "workspace:^2.3.2", "@remix-run/server-runtime": ">1.19.0" }, "dependencies": { diff --git a/packages/sveltekit/CHANGELOG.md b/packages/sveltekit/CHANGELOG.md index 2ed6c0be1..f74cd790c 100644 --- a/packages/sveltekit/CHANGELOG.md +++ b/packages/sveltekit/CHANGELOG.md @@ -1,5 +1,18 @@ # @trigger.dev/sveltekit +## 2.3.2 + +### Patch Changes + +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json index bed976e42..6d6322e95 100644 --- a/packages/sveltekit/package.json +++ b/packages/sveltekit/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/sveltekit", - "version": "2.3.0", + "version": "2.3.2", "description": "Trigger.dev svelteKit integration", "license": "MIT", "main": "./dist/index.js", @@ -39,7 +39,7 @@ "build:tsup": "tsup" }, "peerDependencies": { - "@trigger.dev/sdk": "workspace:^2.3.0" + "@trigger.dev/sdk": "workspace:^2.3.2" }, "dependencies": { "debug": "^4.3.4" diff --git a/packages/testing/CHANGELOG.md b/packages/testing/CHANGELOG.md index e65625570..96f2dfbd2 100644 --- a/packages/testing/CHANGELOG.md +++ b/packages/testing/CHANGELOG.md @@ -1,5 +1,20 @@ # @trigger.dev/testing +## 2.3.2 + +### Patch Changes + +- @trigger.dev/core@2.3.2 +- @trigger.dev/sdk@2.3.2 + +## 2.3.1 + +### Patch Changes + +- Updated dependencies [f3efcc0c] + - @trigger.dev/sdk@2.3.1 + - @trigger.dev/core@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/packages/testing/package.json b/packages/testing/package.json index 6db9145b9..cf240f216 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,7 +1,7 @@ { "name": "@trigger.dev/testing", "description": "A collection of useful tools to write tests for Trigger.dev.", - "version": "2.3.0", + "version": "2.3.2", "license": "MIT", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/trigger-sdk/CHANGELOG.md b/packages/trigger-sdk/CHANGELOG.md index a8bf7986f..bc4f7b566 100644 --- a/packages/trigger-sdk/CHANGELOG.md +++ b/packages/trigger-sdk/CHANGELOG.md @@ -1,5 +1,21 @@ # @trigger.dev/sdk +## 2.3.2 + +### Patch Changes + +- @trigger.dev/core@2.3.2 +- @trigger.dev/core-backend@2.3.2 + +## 2.3.1 + +### Patch Changes + +- f3efcc0c: Moved Logger to core-backend, no longer importing node:buffer in core/react +- Updated dependencies [f3efcc0c] + - @trigger.dev/core-backend@2.3.1 + - @trigger.dev/core@2.3.1 + ## 2.3.0 ### Minor Changes diff --git a/packages/trigger-sdk/package.json b/packages/trigger-sdk/package.json index f329caea4..aaa453722 100644 --- a/packages/trigger-sdk/package.json +++ b/packages/trigger-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@trigger.dev/sdk", - "version": "2.3.0", + "version": "2.3.2", "description": "trigger.dev Node.JS SDK", "license": "MIT", "main": "./dist/index.js", @@ -30,8 +30,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@trigger.dev/core": "workspace:^2.3.0", - "@trigger.dev/core-backend": "workspace:^2.3.0", + "@trigger.dev/core": "workspace:^2.3.2", + "@trigger.dev/core-backend": "workspace:^2.3.2", "chalk": "^5.2.0", "cronstrue": "^2.21.0", "debug": "^4.3.4", diff --git a/packages/trigger-sdk/src/apiClient.ts b/packages/trigger-sdk/src/apiClient.ts index 951aadada..a21c07368 100644 --- a/packages/trigger-sdk/src/apiClient.ts +++ b/packages/trigger-sdk/src/apiClient.ts @@ -20,8 +20,6 @@ import { JobRunStatusRecordSchema, KeyValueStoreResponseBody, KeyValueStoreResponseBodySchema, - LogLevel, - Logger, RegisterScheduleResponseBodySchema, RegisterSourceEventSchemaV2, RegisterSourceEventV2, @@ -40,6 +38,7 @@ import { assertExhaustive, urlWithSearchParams, } from "@trigger.dev/core"; +import { LogLevel, Logger } from "@trigger.dev/core-backend"; import { env } from "node:process"; import { z } from "zod"; diff --git a/packages/trigger-sdk/src/io.ts b/packages/trigger-sdk/src/io.ts index 909f84739..27138526e 100644 --- a/packages/trigger-sdk/src/io.ts +++ b/packages/trigger-sdk/src/io.ts @@ -11,8 +11,6 @@ import { FetchTimeoutOptions, InitialStatusUpdate, IntervalOptions, - LogLevel, - Logger, RunTaskOptions, SendEvent, SendEventOptions, @@ -21,6 +19,7 @@ import { UpdateWebhookBody, supportsFeature, } from "@trigger.dev/core"; +import { LogLevel, Logger } from "@trigger.dev/core-backend"; import { BloomFilter } from "@trigger.dev/core-backend"; import { AsyncLocalStorage } from "node:async_hooks"; import { webcrypto } from "node:crypto"; diff --git a/packages/trigger-sdk/src/job.ts b/packages/trigger-sdk/src/job.ts index e00db5c61..a6497e5bb 100644 --- a/packages/trigger-sdk/src/job.ts +++ b/packages/trigger-sdk/src/job.ts @@ -4,11 +4,11 @@ import { IntegrationConfig, InvokeOptions, JobMetadata, - LogLevel, Prettify, RunNotification, SuccessfulRunNotification, } from "@trigger.dev/core"; +import { LogLevel } from "@trigger.dev/core-backend"; import { ConcurrencyLimit } from "./concurrencyLimit"; import { IOWithIntegrations, TriggerIntegration } from "./integrations"; import { runLocalStorage } from "./runLocalStorage"; diff --git a/packages/trigger-sdk/src/triggerClient.ts b/packages/trigger-sdk/src/triggerClient.ts index 83405d344..e5a36f999 100644 --- a/packages/trigger-sdk/src/triggerClient.ts +++ b/packages/trigger-sdk/src/triggerClient.ts @@ -20,8 +20,6 @@ import { IntegrationConfig, InvokeOptions, JobMetadata, - LogLevel, - Logger, NormalizedResponse, PreprocessRunBody, PreprocessRunBodySchema, @@ -52,8 +50,13 @@ import { WebhookSourceRequestBodySchema, WebhookSourceRequestHeadersSchema, } from "@trigger.dev/core"; +import { LogLevel, Logger } from "@trigger.dev/core-backend"; +import { z } from "zod"; +import EventEmitter from "node:events"; import { env } from "node:process"; +import * as packageJson from "../package.json"; import { ApiClient } from "./apiClient"; +import { ConcurrencyLimit, ConcurrencyLimitOptions } from "./concurrencyLimit"; import { AutoYieldExecutionError, AutoYieldWithCompletedTaskExecutionError, @@ -71,19 +74,22 @@ import { IO, IOStats } from "./io"; import { createIOWithIntegrations } from "./ioWithIntegrations"; import { Job, JobOptions } from "./job"; import { runLocalStorage } from "./runLocalStorage"; +import { KeyValueStore } from "./store/keyValueStore"; import { DynamicTrigger, DynamicTriggerOptions } from "./triggers/dynamic"; import { EventTrigger } from "./triggers/eventTrigger"; import { ExternalSource } from "./triggers/externalSource"; import { DynamicIntervalOptions, DynamicSchedule } from "./triggers/scheduled"; -import type { - EventSpecification, - GenericTriggerContext, - NotificationsEventEmitter, - Trigger, - TriggerContext, - TriggerPreprocessContext, - VerifyResult, +import { WebhookDeliveryContext, WebhookSource } from "./triggers/webhook"; +import { + type EventSpecification, + type GenericTriggerContext, + type NotificationsEventEmitter, + type Trigger, + type TriggerContext, + type TriggerPreprocessContext, + type VerifyResult, } from "./types"; +import { formatSchemaErrors } from "./utils/formatSchemaErrors"; const parseRequestPayload = (rawPayload: any) => { const result = RequestWithRawBodySchema.safeParse(rawPayload); @@ -99,14 +105,6 @@ const parseRequestPayload = (rawPayload: any) => { }); }; -const deliverWebhookEvent = (key: string): EventSpecification => ({ - name: `${DELIVER_WEBHOOK_REQUEST}.${key}`, - title: "Deliver Webhook", - source: "internal", - icon: "mail-fast", - parsePayload: parseRequestPayload, -}); - const registerWebhookEvent = (key: string): EventSpecification => ({ name: `${REGISTER_WEBHOOK}.${key}`, title: "Register Webhook", @@ -123,14 +121,6 @@ const registerSourceEvent: EventSpecification = { parsePayload: RegisterSourceEventSchemaV2.parse, }; -import EventEmitter from "node:events"; -import * as packageJson from "../package.json"; -import { ConcurrencyLimit, ConcurrencyLimitOptions } from "./concurrencyLimit"; -import { KeyValueStore } from "./store/keyValueStore"; -import { WebhookDeliveryContext, WebhookSource } from "./triggers/webhook"; -import { formatSchemaErrors } from "./utils/formatSchemaErrors"; -import { z } from "zod"; - export type TriggerClientOptions = { /** The `id` property is used to uniquely identify the client. */ diff --git a/packages/trigger-sdk/src/triggers/externalSource.ts b/packages/trigger-sdk/src/triggers/externalSource.ts index 7602147b2..5ba7ff45b 100644 --- a/packages/trigger-sdk/src/triggers/externalSource.ts +++ b/packages/trigger-sdk/src/triggers/externalSource.ts @@ -1,25 +1,25 @@ import { + ConnectionAuth, DisplayProperty, EventFilter, HandleTriggerSource, HttpSourceResponseMetadata, - Logger, NormalizedResponse, + Prettify, RegisterTriggerSource, SendEvent, + SerializableJson, TriggerMetadata, deepMergeFilters, } from "@trigger.dev/core"; +import { Logger } from "@trigger.dev/core-backend"; +import type { Buffer } from "buffer"; import { IOWithIntegrations, TriggerIntegration } from "../integrations"; import { IO } from "../io"; import { Job } from "../job"; import { TriggerClient } from "../triggerClient"; import type { EventSpecification, SchemaParser, Trigger, TriggerContext } from "../types"; import { slugifyId } from "../utils"; -import { SerializableJson } from "@trigger.dev/core"; -import { ConnectionAuth } from "@trigger.dev/core"; -import { Prettify } from "@trigger.dev/core"; -import type { Buffer } from "buffer"; export type HttpSourceEvent = { url: string; diff --git a/packages/trigger-sdk/src/types.ts b/packages/trigger-sdk/src/types.ts index 6b96e1b57..3c232c205 100644 --- a/packages/trigger-sdk/src/types.ts +++ b/packages/trigger-sdk/src/types.ts @@ -2,25 +2,22 @@ import type { DisplayProperty, EventFilter, FailedRunNotification, - Logger, OverridableRunTaskOptions, Prettify, RedactString, RegisteredOptionsDiff, - RunNotificationJobMetadata, - RunNotificationRunMetadata, RunTaskOptions, RuntimeEnvironmentType, - ServerTask, SomeRequired, SourceEventOption, SuccessfulRunNotification, TriggerMetadata, } from "@trigger.dev/core"; +import { Logger } from "@trigger.dev/core-backend"; +import type TypedEmitter from "typed-emitter"; +import { z } from "zod"; import { Job } from "./job"; import { TriggerClient } from "./triggerClient"; -import { z } from "zod"; -import type TypedEmitter from "typed-emitter"; export type { DisplayProperty, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ab3aaefd3..a09d01c3c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -425,8 +425,8 @@ importers: integrations/airtable: specifiers: - '@trigger.dev/integration-kit': workspace:^2.3.0 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/integration-kit': workspace:^2.3.2 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/node': 16.x @@ -455,8 +455,8 @@ importers: '@octokit/types': ^9.2.3 '@octokit/webhooks': ^10.4.0 '@octokit/webhooks-types': ^6.10.0 - '@trigger.dev/integration-kit': workspace:^2.3.0 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/integration-kit': workspace:^2.3.2 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/node': '18' @@ -486,8 +486,8 @@ importers: integrations/linear: specifiers: '@linear/sdk': ^8.0.0 - '@trigger.dev/integration-kit': workspace:^2.3.0 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/integration-kit': workspace:^2.3.2 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/node': 16.x @@ -510,8 +510,8 @@ importers: integrations/openai: specifiers: - '@trigger.dev/integration-kit': workspace:^2.3.0 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/integration-kit': workspace:^2.3.2 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/jest': ^29.5.3 @@ -540,8 +540,8 @@ importers: integrations/plain: specifiers: '@team-plain/typescript-sdk': ^2.7.0 - '@trigger.dev/integration-kit': workspace:^2.3.0 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/integration-kit': workspace:^2.3.2 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/node': '18' @@ -562,8 +562,8 @@ importers: integrations/replicate: specifiers: - '@trigger.dev/integration-kit': workspace:^2.3.0 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/integration-kit': workspace:^2.3.2 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/node': 16.x @@ -587,8 +587,8 @@ importers: integrations/resend: specifiers: - '@trigger.dev/integration-kit': workspace:^2.3.0 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/integration-kit': workspace:^2.3.2 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/node': '18' @@ -611,8 +611,8 @@ importers: integrations/sendgrid: specifiers: '@sendgrid/mail': ^7.7.0 - '@trigger.dev/integration-kit': workspace:^2.3.0 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/integration-kit': workspace:^2.3.2 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/node': 16.x @@ -634,8 +634,8 @@ importers: integrations/shopify: specifiers: '@shopify/shopify-api': ^8.0.2 - '@trigger.dev/integration-kit': workspace:^2.3.0 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/integration-kit': workspace:^2.3.2 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/node': 16.x @@ -659,7 +659,7 @@ importers: integrations/slack: specifiers: '@slack/web-api': ^6.8.1 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/node': '18' @@ -681,8 +681,8 @@ importers: integrations/stripe: specifiers: - '@trigger.dev/integration-kit': workspace:^2.3.0 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/integration-kit': workspace:^2.3.2 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsup': workspace:* '@types/node': 16.x rimraf: ^3.0.2 @@ -707,8 +707,8 @@ importers: integrations/supabase: specifiers: '@supabase/supabase-js': ^2.26.0 - '@trigger.dev/integration-kit': workspace:^2.3.0 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/integration-kit': workspace:^2.3.2 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/node': 18.x @@ -733,8 +733,8 @@ importers: integrations/typeform: specifiers: - '@trigger.dev/integration-kit': workspace:^2.3.0 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/integration-kit': workspace:^2.3.2 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsup': workspace:* '@typeform/api-client': ^1.8.0 '@types/node': 16.x @@ -994,7 +994,7 @@ importers: packages/express: specifiers: - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/debug': ^4.1.7 @@ -1064,7 +1064,7 @@ importers: specifiers: '@nestjs/common': ^10.2.4 '@remix-run/web-fetch': ^4.3.5 - '@trigger.dev/sdk': workspace:^2.3.0 + '@trigger.dev/sdk': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/debug': ^4.1.7 @@ -1123,7 +1123,7 @@ importers: packages/react: specifiers: '@tanstack/react-query': 5.0.0-beta.2 - '@trigger.dev/core': workspace:^2.3.0 + '@trigger.dev/core': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@types/debug': ^4.1.7 '@types/react': 18.2.17 @@ -1226,8 +1226,8 @@ importers: packages/trigger-sdk: specifiers: - '@trigger.dev/core': workspace:^2.3.0 - '@trigger.dev/core-backend': workspace:^2.3.0 + '@trigger.dev/core': workspace:^2.3.2 + '@trigger.dev/core-backend': workspace:^2.3.2 '@trigger.dev/tsconfig': workspace:* '@trigger.dev/tsup': workspace:* '@types/debug': ^4.1.7