@trigger.dev/sdk 2.0.0-next.14 → 2.0.0-next.16

package/dist/index.d.ts

@@ -15,10 +15,10 @@ declare class Logger {
     constructor(name: string, level?: LogLevel, filteredKeys?: string[], jsonReplacer?: (key: string, value: unknown) => unknown);
     filter(...keys: string[]): Logger;
     static satisfiesLogLevel(logLevel: LogLevel, setLevel: LogLevel): boolean;
-    log(...args: any[]): void;
-    error(...args: any[]): void;
-    warn(...args: any[]): void;
-    info(...args: any[]): void;
+    log(message: string, ...args: Array<Record<string, unknown> | undefined>): void;
+    error(message: string, ...args: Array<Record<string, unknown> | undefined>): void;
+    warn(message: string, ...args: Array<Record<string, unknown> | undefined>): void;
+    info(message: string, ...args: Array<Record<string, unknown> | undefined>): void;
     debug(message: string, ...args: Array<Record<string, unknown> | undefined>): void;
 }
 
@@ -48,7 +48,7 @@ declare const ServerTaskSchema: z.ZodObject<{
     startedAt: z.ZodNullable<z.ZodOptional<z.ZodDate>>;
     completedAt: z.ZodNullable<z.ZodOptional<z.ZodDate>>;
     delayUntil: z.ZodNullable<z.ZodOptional<z.ZodDate>>;
-    status: z.ZodEnum<["PENDING", "WAITING", "RUNNING", "COMPLETED", "ERRORED"]>;
+    status: z.ZodEnum<["PENDING", "WAITING", "RUNNING", "COMPLETED", "ERRORED", "CANCELED"]>;
     description: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     params: z.ZodNullable<z.ZodOptional<z.ZodType<DeserializedJson, z.ZodTypeDef, DeserializedJson>>>;
     properties: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -97,7 +97,7 @@ declare const ServerTaskSchema: z.ZodObject<{
     id: string;
     name: string;
     noop: boolean;
-    status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED";
+    status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED" | "CANCELED";
     idempotencyKey: string;
     attempts: number;
     icon?: string | null | undefined;
@@ -128,7 +128,7 @@ declare const ServerTaskSchema: z.ZodObject<{
     id: string;
     name: string;
     noop: boolean;
-    status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED";
+    status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED" | "CANCELED";
     idempotencyKey: string;
     attempts: number;
     icon?: string | null | undefined;
@@ -160,20 +160,20 @@ type ServerTask = z.infer<typeof ServerTaskSchema>;
 declare const CachedTaskSchema: z.ZodObject<{
     id: z.ZodString;
     idempotencyKey: z.ZodString;
-    status: z.ZodEnum<["PENDING", "WAITING", "RUNNING", "COMPLETED", "ERRORED"]>;
+    status: z.ZodEnum<["PENDING", "WAITING", "RUNNING", "COMPLETED", "ERRORED", "CANCELED"]>;
     noop: z.ZodDefault<z.ZodBoolean>;
     output: z.ZodNullable<z.ZodOptional<z.ZodType<DeserializedJson, z.ZodTypeDef, DeserializedJson>>>;
     parentId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
 }, "strip", z.ZodTypeAny, {
     id: string;
     noop: boolean;
-    status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED";
+    status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED" | "CANCELED";
     idempotencyKey: string;
     output?: DeserializedJson | undefined;
     parentId?: string | null | undefined;
 }, {
     id: string;
-    status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED";
+    status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED" | "CANCELED";
     idempotencyKey: string;
     noop?: boolean | undefined;
     output?: DeserializedJson | undefined;
@@ -3168,7 +3168,7 @@ declare class ApiClient {
         id: string;
         name: string;
         noop: boolean;
-        status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED";
+        status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED" | "CANCELED";
         idempotencyKey: string;
         attempts: number;
         icon?: string | null | undefined;
@@ -3200,7 +3200,7 @@ declare class ApiClient {
         id: string;
         name: string;
         noop: boolean;
-        status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED";
+        status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED" | "CANCELED";
         idempotencyKey: string;
         attempts: number;
         icon?: string | null | undefined;
@@ -3232,7 +3232,7 @@ declare class ApiClient {
         id: string;
         name: string;
         noop: boolean;
-        status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED";
+        status: "PENDING" | "WAITING" | "RUNNING" | "COMPLETED" | "ERRORED" | "CANCELED";
         idempotencyKey: string;
         attempts: number;
         icon?: string | null | undefined;
@@ -4275,13 +4275,17 @@ declare class RetryWithTaskError {
     retryAt: Date;
     constructor(cause: ErrorWithStack, task: ServerTask, retryAt: Date);
 }
+declare class CanceledWithTaskError {
+    task: ServerTask;
+    constructor(task: ServerTask);
+}
 /** Use this function if you're using a `try/catch` block to catch errors.
  * It checks if a thrown error is a special internal error that you should ignore.
  * If this returns `true` then you must rethrow the error: `throw err;`
  * @param err The error to check
  * @returns `true` if the error is a Trigger Error, `false` otherwise.
  */
-declare function isTriggerError(err: unknown): err is ResumeWithTaskError | RetryWithTaskError;
+declare function isTriggerError(err: unknown): err is ResumeWithTaskError | RetryWithTaskError | CanceledWithTaskError;
 
 type Task = ServerTask;
 declare function redactString(strings: TemplateStringsArray, ...interpolations: string[]): RedactString;

package/dist/index.js

@@ -154,9 +154,10 @@ var logLevels = [
   "info",
   "debug"
 ];
-var _name, _level, _filteredKeys, _jsonReplacer;
+var _name, _level, _filteredKeys, _jsonReplacer, _structuredLog, structuredLog_fn;
 var _Logger = class {
   constructor(name, level = "info", filteredKeys = [], jsonReplacer) {
+    __privateAdd(this, _structuredLog);
     __privateAdd(this, _name, void 0);
     __privateAdd(this, _level, void 0);
     __privateAdd(this, _filteredKeys, []);
@@ -172,36 +173,30 @@ var _Logger = class {
   static satisfiesLogLevel(logLevel, setLevel) {
     return logLevels.indexOf(logLevel) <= logLevels.indexOf(setLevel);
   }
-  log(...args) {
+  log(message, ...args) {
     if (__privateGet(this, _level) < 0)
       return;
-    console.log(`[${formattedDateTime()}] [${__privateGet(this, _name)}] `, ...args);
+    __privateMethod(this, _structuredLog, structuredLog_fn).call(this, console.log, message, ...args);
   }
-  error(...args) {
+  error(message, ...args) {
     if (__privateGet(this, _level) < 1)
       return;
-    console.error(`[${formattedDateTime()}] [${__privateGet(this, _name)}] `, ...args);
+    __privateMethod(this, _structuredLog, structuredLog_fn).call(this, console.error, message, ...args);
   }
-  warn(...args) {
+  warn(message, ...args) {
     if (__privateGet(this, _level) < 2)
       return;
-    console.warn(`[${formattedDateTime()}] [${__privateGet(this, _name)}] `, ...args);
+    __privateMethod(this, _structuredLog, structuredLog_fn).call(this, console.warn, message, ...args);
   }
-  info(...args) {
+  info(message, ...args) {
     if (__privateGet(this, _level) < 3)
       return;
-    console.info(`[${formattedDateTime()}] [${__privateGet(this, _name)}] `, ...args);
+    __privateMethod(this, _structuredLog, structuredLog_fn).call(this, console.info, message, ...args);
   }
   debug(message, ...args) {
     if (__privateGet(this, _level) < 4)
       return;
-    const structuredLog = {
-      timestamp: new Date(),
-      name: __privateGet(this, _name),
-      message,
-      args: structureArgs(safeJsonClone(args), __privateGet(this, _filteredKeys))
-    };
-    console.debug(JSON.stringify(structuredLog, createReplacer(__privateGet(this, _jsonReplacer))));
+    __privateMethod(this, _structuredLog, structuredLog_fn).call(this, console.debug, message, ...args);
   }
 };
 var Logger = _Logger;
@@ -210,6 +205,16 @@ _name = new WeakMap();
 _level = new WeakMap();
 _filteredKeys = new WeakMap();
 _jsonReplacer = new WeakMap();
+_structuredLog = new WeakSet();
+structuredLog_fn = /* @__PURE__ */ __name(function(loggerFunction, message, ...args) {
+  const structuredLog = {
+    ...structureArgs(safeJsonClone(args), __privateGet(this, _filteredKeys)),
+    timestamp: new Date(),
+    name: __privateGet(this, _name),
+    message
+  };
+  loggerFunction(JSON.stringify(structuredLog, createReplacer(__privateGet(this, _jsonReplacer))));
+}, "#structuredLog");
 function createReplacer(replacer) {
   return (key, value) => {
     if (typeof value === "bigint") {
@@ -237,19 +242,6 @@ function safeJsonClone(obj) {
   }
 }
 __name(safeJsonClone, "safeJsonClone");
-function formattedDateTime() {
-  const date = new Date();
-  const hours = date.getHours();
-  const minutes = date.getMinutes();
-  const seconds = date.getSeconds();
-  const milliseconds = date.getMilliseconds();
-  const formattedHours = hours < 10 ? `0${hours}` : hours;
-  const formattedMinutes = minutes < 10 ? `0${minutes}` : minutes;
-  const formattedSeconds = seconds < 10 ? `0${seconds}` : seconds;
-  const formattedMilliseconds = milliseconds < 10 ? `00${milliseconds}` : milliseconds < 100 ? `0${milliseconds}` : milliseconds;
-  return `${formattedHours}:${formattedMinutes}:${formattedSeconds}.${formattedMilliseconds}`;
-}
-__name(formattedDateTime, "formattedDateTime");
 function structureArgs(args, filteredKeys = []) {
   if (args.length === 0) {
     return;
@@ -417,7 +409,8 @@ var TaskStatusSchema = import_zod7.z.enum([
   "WAITING",
   "RUNNING",
   "COMPLETED",
-  "ERRORED"
+  "ERRORED",
+  "CANCELED"
 ]);
 var TaskSchema = import_zod7.z.object({
   id: import_zod7.z.string(),
@@ -708,6 +701,10 @@ var RunJobRetryWithTaskSchema = import_zod9.z.object({
   error: ErrorWithStackSchema,
   retryAt: import_zod9.z.coerce.date()
 });
+var RunJobCanceledWithTaskSchema = import_zod9.z.object({
+  status: import_zod9.z.literal("CANCELED"),
+  task: TaskSchema
+});
 var RunJobSuccessSchema = import_zod9.z.object({
   status: import_zod9.z.literal("SUCCESS"),
   output: DeserializedJsonSchema.optional()
@@ -716,6 +713,7 @@ var RunJobResponseSchema = import_zod9.z.discriminatedUnion("status", [
   RunJobErrorSchema,
   RunJobResumeWithTaskSchema,
   RunJobRetryWithTaskSchema,
+  RunJobCanceledWithTaskSchema,
   RunJobSuccessSchema
 ]);
 var PreprocessRunBodySchema = import_zod9.z.object({
@@ -1029,6 +1027,7 @@ var currentDate = {
 
 // src/apiClient.ts
 var import_zod12 = require("zod");
+var import_node_fetch = __toESM(require("node-fetch"));
 var _apiUrl, _options, _logger, _apiKey, apiKey_fn;
 var ApiClient = class {
   constructor(options) {
@@ -1046,7 +1045,7 @@ var ApiClient = class {
       url: options.url,
       name: options.name
     });
-    const response = await fetch(`${__privateGet(this, _apiUrl)}/api/v1/endpoints`, {
+    const response = await (0, import_node_fetch.default)(`${__privateGet(this, _apiUrl)}/api/v1/endpoints`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -1260,7 +1259,7 @@ function getApiKey(key) {
 }
 __name(getApiKey, "getApiKey");
 async function zodfetch(schema, url, requestInit, options) {
-  const response = await fetch(url, requestInit);
+  const response = await (0, import_node_fetch.default)(url, requestInit);
   if ((!requestInit || requestInit.method === "GET") && response.status === 404 && options?.optional) {
     return;
   }
@@ -1291,8 +1290,14 @@ var RetryWithTaskError = class {
   }
 };
 __name(RetryWithTaskError, "RetryWithTaskError");
+var CanceledWithTaskError = class {
+  constructor(task) {
+    this.task = task;
+  }
+};
+__name(CanceledWithTaskError, "CanceledWithTaskError");
 function isTriggerError(err) {
-  return err instanceof ResumeWithTaskError || err instanceof RetryWithTaskError;
+  return err instanceof ResumeWithTaskError || err instanceof RetryWithTaskError || err instanceof CanceledWithTaskError;
 }
 __name(isTriggerError, "isTriggerError");
 
@@ -1672,6 +1677,13 @@ var IO = class {
       ...options,
       parentId
     });
+    if (task.status === "CANCELED") {
+      this._logger.debug("Task canceled", {
+        idempotencyKey,
+        task
+      });
+      throw new CanceledWithTaskError(task);
+    }
     if (task.status === "COMPLETED") {
       this._logger.debug("Using task output", {
         idempotencyKey,
@@ -1708,10 +1720,13 @@ var IO = class {
           idempotencyKey,
           task
         });
-        await this._apiClient.completeTask(this._id, task.id, {
+        const completedTask = await this._apiClient.completeTask(this._id, task.id, {
           output: result ?? void 0,
           properties: task.outputProperties ?? void 0
         });
+        if (completedTask.status === "CANCELED") {
+          throw new CanceledWithTaskError(completedTask);
+        }
         return result;
       } catch (error) {
         if (isTriggerError(error)) {
@@ -2117,11 +2132,19 @@ var TriggerClient = class {
             }
           };
         }
-        const sourceRequest = new Request(headers.data["x-ts-http-url"], {
+        const sourceRequestNeedsBody = headers.data["x-ts-http-method"] !== "GET";
+        const sourceRequestInit = {
           method: headers.data["x-ts-http-method"],
           headers: headers.data["x-ts-http-headers"],
-          body: headers.data["x-ts-http-method"] !== "GET" ? request.body : void 0
-        });
+          body: sourceRequestNeedsBody ? request.body : void 0
+        };
+        if (sourceRequestNeedsBody) {
+          try {
+            sourceRequestInit.duplex = "half";
+          } catch (error) {
+          }
+        }
+        const sourceRequest = new Request(headers.data["x-ts-http-url"], sourceRequestInit);
         const key = headers.data["x-ts-key"];
         const dynamicId = headers.data["x-ts-dynamic-id"];
         const secret = headers.data["x-ts-secret"];
@@ -2354,6 +2377,12 @@ executeJob_fn = /* @__PURE__ */ __name(async function(body1, job1) {
         retryAt: error.retryAt
       };
     }
+    if (error instanceof CanceledWithTaskError) {
+      return {
+        status: "CANCELED",
+        task: error.task
+      };
+    }
     if (error instanceof RetryWithTaskError) {
       const errorWithStack2 = ErrorWithStackSchema.safeParse(error.cause);
       if (errorWithStack2.success) {