@trigger.dev/sdk 2.0.13 → 2.1.0-beta.0

package/dist/index.js

@@ -62,7 +62,6 @@ __export(src_exports, {
   MissingConnectionNotification: () => MissingConnectionNotification,
   MissingConnectionResolvedNotification: () => MissingConnectionResolvedNotification,
   TriggerClient: () => TriggerClient,
-  authenticatedTask: () => authenticatedTask,
   cronTrigger: () => cronTrigger,
   eventTrigger: () => eventTrigger,
   intervalTrigger: () => intervalTrigger,
@@ -70,7 +69,8 @@ __export(src_exports, {
   missingConnectionNotification: () => missingConnectionNotification,
   missingConnectionResolvedNotification: () => missingConnectionResolvedNotification,
   omit: () => omit,
-  redactString: () => redactString
+  redactString: () => redactString,
+  retry: () => retry
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -113,7 +113,7 @@ var Job = class {
       acc[key] = {
         id: integration.id,
         metadata: integration.metadata,
-        authSource: integration.client.usesLocalAuth ? "LOCAL" : "HOSTED"
+        authSource: integration.authSource
       };
       return acc;
     }, {});
@@ -269,7 +269,7 @@ var ApiClient = class {
     __privateGet(this, _logger).debug("activating http source", {
       source
     });
-    const response = await zodfetch(import_core.TriggerSourceSchema, `${__privateGet(this, _apiUrl)}/api/v1/${client}/sources/${key}`, {
+    const response = await zodfetch(import_core.TriggerSourceSchema, `${__privateGet(this, _apiUrl)}/api/v2/${client}/sources/${key}`, {
       method: "PUT",
       headers: {
         "Content-Type": "application/json",
@@ -285,7 +285,7 @@ var ApiClient = class {
       id,
       payload
     });
-    const response = await zodfetch(import_core.RegisterSourceEventSchema, `${__privateGet(this, _apiUrl)}/api/v1/${client}/triggers/${id}/registrations/${key}`, {
+    const response = await zodfetch(import_core.RegisterSourceEventSchemaV2, `${__privateGet(this, _apiUrl)}/api/v2/${client}/triggers/${id}/registrations/${key}`, {
       method: "PUT",
       headers: {
         "Content-Type": "application/json",
@@ -465,70 +465,17 @@ var import_core3 = require("@trigger.dev/core");
 var import_node_async_hooks = require("async_hooks");
 var import_node_crypto = require("crypto");
 
-// src/ioWithIntegrations.ts
-function createIOWithIntegrations(io, auths, integrations) {
-  if (!integrations) {
-    return io;
-  }
-  const connections = Object.entries(integrations).reduce((acc, [connectionKey, integration]) => {
-    let auth = auths?.[connectionKey];
-    const client = integration.client.usesLocalAuth ? integration.client.client : auth ? integration.client.clientFactory?.(auth) : void 0;
-    if (!client) {
-      return acc;
-    }
-    auth = integration.client.usesLocalAuth ? integration.client.auth : auth;
-    const ioConnection = {
-      client
-    };
-    ioConnection.runTask = async (key, callback, options) => {
-      return await io.runTask(key, {
-        name: "Task",
-        icon: integration.metadata.id,
-        retry: {
-          limit: 10,
-          minTimeoutInMs: 1e3,
-          maxTimeoutInMs: 3e4,
-          factor: 2,
-          randomize: true
-        },
-        ...options
-      }, async (ioTask) => {
-        return await callback(client, ioTask, io);
-      });
-    };
-    if (integration.client.tasks) {
-      const tasks = integration.client.tasks;
-      Object.keys(tasks).forEach((taskName) => {
-        const authenticatedTask2 = tasks[taskName];
-        ioConnection[taskName] = async (key, params) => {
-          const options = authenticatedTask2.init(params);
-          options.connectionKey = connectionKey;
-          return await io.runTask(key, options, async (ioTask) => {
-            return authenticatedTask2.run(params, client, ioTask, io, auth);
-          }, authenticatedTask2.onError);
-        };
-      });
-    }
-    acc[connectionKey] = ioConnection;
-    return acc;
-  }, {});
-  return new Proxy(io, {
-    get(target, prop, receiver) {
-      if (prop === "__io") {
-        return io;
-      }
-      if (prop in connections) {
-        return connections[prop];
-      }
-      const value = Reflect.get(target, prop, receiver);
-      return typeof value == "function" ? value.bind(target) : value;
-    }
-  });
-}
-__name(createIOWithIntegrations, "createIOWithIntegrations");
-
 // src/retry.ts
 var import_core2 = require("@trigger.dev/core");
+var retry = {
+  standardBackoff: {
+    limit: 8,
+    factor: 1.8,
+    minTimeoutInMs: 500,
+    maxTimeoutInMs: 3e4,
+    randomize: true
+  }
+};
 
 // src/io.ts
 var _addToCachedTasks, addToCachedTasks_fn;
@@ -584,7 +531,8 @@ var IO = class {
         await this.runTask([
           message,
           level
-        ], {
+        ], async (task) => {
+        }, {
           name: "log",
           icon: "log",
           description: message,
@@ -600,13 +548,13 @@ var IO = class {
             variant: level.toLowerCase()
           },
           noop: true
-        }, async (task) => {
         });
       }
     });
   }
   async wait(key, seconds) {
-    return await this.runTask(key, {
+    return await this.runTask(key, async (task) => {
+    }, {
       name: "wait",
       icon: "clock",
       params: {
@@ -617,17 +565,18 @@ var IO = class {
       style: {
         style: "minimal"
       }
-    }, async (task) => {
     });
   }
-  async backgroundFetch(key, url, requestInit, retry) {
+  async backgroundFetch(key, url, requestInit, retry2) {
     const urlObject = new URL(url);
-    return await this.runTask(key, {
+    return await this.runTask(key, async (task) => {
+      return task.output;
+    }, {
       name: `fetch ${urlObject.hostname}${urlObject.pathname}`,
       params: {
         url,
         requestInit,
-        retry
+        retry: retry2
       },
       operation: "fetch",
       icon: "background",
@@ -647,12 +596,12 @@ var IO = class {
           text: "true"
         }
       ]
-    }, async (task) => {
-      return task.output;
     });
   }
   async sendEvent(key, event, options) {
-    return await this.runTask(key, {
+    return await this.runTask(key, async (task) => {
+      return await this._triggerClient.sendEvent(event, options);
+    }, {
       name: "sendEvent",
       params: {
         event,
@@ -670,12 +619,12 @@ var IO = class {
           }
         ] : []
       ]
-    }, async (task) => {
-      return await this._triggerClient.sendEvent(event, options);
     });
   }
   async getEvent(key, id) {
-    return await this.runTask(key, {
+    return await this.runTask(key, async (task) => {
+      return await this._triggerClient.getEvent(id);
+    }, {
       name: "getEvent",
       params: {
         id
@@ -686,12 +635,12 @@ var IO = class {
           text: id
         }
       ]
-    }, async (task) => {
-      return await this._triggerClient.getEvent(id);
     });
   }
   async cancelEvent(key, eventId) {
-    return await this.runTask(key, {
+    return await this.runTask(key, async (task) => {
+      return await this._triggerClient.cancelEvent(eventId);
+    }, {
       name: "cancelEvent",
       params: {
         eventId
@@ -702,12 +651,12 @@ var IO = class {
           text: eventId
         }
       ]
-    }, async (task) => {
-      return await this._triggerClient.cancelEvent(eventId);
     });
   }
   async updateSource(key, options) {
-    return this.runTask(key, {
+    return this.runTask(key, async (task) => {
+      return await this._apiClient.updateSource(this._triggerClient.id, options.key, options);
+    }, {
       name: "Update Source",
       description: "Update Source",
       properties: [
@@ -722,12 +671,15 @@ var IO = class {
           "secret"
         ]
       }
-    }, async (task) => {
-      return await this._apiClient.updateSource(this._triggerClient.id, options.key, options);
     });
   }
   async registerInterval(key, dynamicSchedule, id, options) {
-    return await this.runTask(key, {
+    return await this.runTask(key, async (task) => {
+      return dynamicSchedule.register(id, {
+        type: "interval",
+        options
+      });
+    }, {
       name: "register-interval",
       properties: [
         {
@@ -744,15 +696,12 @@ var IO = class {
         }
       ],
       params: options
-    }, async (task) => {
-      return dynamicSchedule.register(id, {
-        type: "interval",
-        options
-      });
     });
   }
   async unregisterInterval(key, dynamicSchedule, id) {
-    return await this.runTask(key, {
+    return await this.runTask(key, async (task) => {
+      return dynamicSchedule.unregister(id);
+    }, {
       name: "unregister-interval",
       properties: [
         {
@@ -764,12 +713,15 @@ var IO = class {
           text: id
         }
       ]
-    }, async (task) => {
-      return dynamicSchedule.unregister(id);
     });
   }
   async registerCron(key, dynamicSchedule, id, options) {
-    return await this.runTask(key, {
+    return await this.runTask(key, async (task) => {
+      return dynamicSchedule.register(id, {
+        type: "cron",
+        options
+      });
+    }, {
       name: "register-cron",
       properties: [
         {
@@ -786,15 +738,12 @@ var IO = class {
         }
       ],
       params: options
-    }, async (task) => {
-      return dynamicSchedule.register(id, {
-        type: "cron",
-        options
-      });
     });
   }
   async unregisterCron(key, dynamicSchedule, id) {
-    return await this.runTask(key, {
+    return await this.runTask(key, async (task) => {
+      return dynamicSchedule.unregister(id);
+    }, {
       name: "unregister-cron",
       properties: [
         {
@@ -806,12 +755,20 @@ var IO = class {
           text: id
         }
       ]
-    }, async (task) => {
-      return dynamicSchedule.unregister(id);
     });
   }
   async registerTrigger(key, trigger, id, params) {
-    return await this.runTask(key, {
+    return await this.runTask(key, async (task) => {
+      const registration = await this.runTask("register-source", async (subtask1) => {
+        return trigger.register(id, params);
+      }, {
+        name: "register-source"
+      });
+      return {
+        id: registration.id,
+        key: registration.source.key
+      };
+    }, {
       name: "register-trigger",
       properties: [
         {
@@ -824,43 +781,19 @@ var IO = class {
         }
       ],
       params
-    }, async (task) => {
-      const registration = await this.runTask("register-source", {
-        name: "register-source"
-      }, async (subtask1) => {
-        return trigger.register(id, params);
-      });
-      const connection = await this.getAuth("get-auth", registration.source.clientId);
-      const io = createIOWithIntegrations(
-        this,
-        {
-          integration: connection
-        },
-        {
-          integration: trigger.source.integration
-        }
-      );
-      const updates = await trigger.source.register(params, registration, io, this._context);
-      if (!updates) {
-        return;
-      }
-      return await this.updateSource("update-source", {
-        key: registration.source.key,
-        ...updates
-      });
     });
   }
   async getAuth(key, clientId) {
     if (!clientId) {
       return;
     }
-    return this.runTask(key, {
-      name: "get-auth"
-    }, async (task) => {
+    return this.runTask(key, async (task) => {
       return await this._triggerClient.getAuth(clientId);
+    }, {
+      name: "get-auth"
     });
   }
-  async runTask(key, options, callback, onError) {
+  async runTask(key, callback, options, onError) {
     const parentId = this._taskStorage.getStore()?.taskId;
     if (parentId) {
       this._logger.debug("Using parent task", {
@@ -886,7 +819,7 @@ var IO = class {
       idempotencyKey,
       displayKey: typeof key === "string" ? key : void 0,
       noop: false,
-      ...options,
+      ...options ?? {},
       parentId
     });
     if (task.status === "CANCELED") {
@@ -966,7 +899,7 @@ var IO = class {
           }
         }
         const parsedError = import_core3.ErrorWithStackSchema.safeParse(error);
-        if (options.retry) {
+        if (options?.retry) {
           const retryAt = (0, import_core2.calculateRetryAt)(options.retry, task.attempts - 1);
           if (retryAt) {
             throw new RetryWithTaskError(parsedError.success ? parsedError.data : {
@@ -1063,6 +996,35 @@ var IOLogger = class {
 };
 __name(IOLogger, "IOLogger");
 
+// src/ioWithIntegrations.ts
+function createIOWithIntegrations(io, auths, integrations) {
+  if (!integrations) {
+    return io;
+  }
+  const connections = Object.entries(integrations).reduce((acc, [connectionKey, integration]) => {
+    let auth = auths?.[connectionKey];
+    acc[connectionKey] = {
+      integration,
+      auth
+    };
+    return acc;
+  }, {});
+  return new Proxy(io, {
+    get(target, prop, receiver) {
+      if (prop === "__io") {
+        return io;
+      }
+      if (typeof prop === "string" && prop in connections) {
+        const { integration, auth } = connections[prop];
+        return integration.cloneForRun(io, prop, auth);
+      }
+      const value = Reflect.get(target, prop, receiver);
+      return typeof value == "function" ? value.bind(target) : value;
+    }
+  });
+}
+__name(createIOWithIntegrations, "createIOWithIntegrations");
+
 // src/triggers/eventTrigger.ts
 var import_core4 = require("@trigger.dev/core");
 var _options2;
@@ -1116,11 +1078,11 @@ __name(eventTrigger, "eventTrigger");
 
 // src/triggerClient.ts
 var registerSourceEvent = {
-  name: import_core5.REGISTER_SOURCE_EVENT,
+  name: import_core5.REGISTER_SOURCE_EVENT_V2,
   title: "Register Source",
   source: "internal",
   icon: "register-source",
-  parsePayload: import_core5.RegisterSourceEventSchema.parse
+  parsePayload: import_core5.RegisterSourceEventSchemaV2.parse
 };
 var _options3, _registeredJobs, _registeredSources, _registeredHttpSourceHandlers, _registeredDynamicTriggers, _jobMetadataByDynamicTriggers, _registeredSchedules, _client, _internalLogger, _preprocessRun, preprocessRun_fn, _executeJob, executeJob_fn, _createRunContext, createRunContext_fn, _createPreprocessRunContext, createPreprocessRunContext_fn, _handleHttpSourceRequest, handleHttpSourceRequest_fn;
 var TriggerClient = class {
@@ -1372,19 +1334,24 @@ var TriggerClient = class {
         const secret = headers.data["x-ts-secret"];
         const params = headers.data["x-ts-params"];
         const data = headers.data["x-ts-data"];
+        const auth = headers.data["x-ts-auth"];
+        const inputMetadata = headers.data["x-ts-metadata"];
         const source = {
           key,
           dynamicId,
           secret,
           params,
-          data
+          data,
+          auth,
+          metadata: inputMetadata
         };
-        const { response, events } = await __privateMethod(this, _handleHttpSourceRequest, handleHttpSourceRequest_fn).call(this, source, sourceRequest);
+        const { response, events, metadata } = await __privateMethod(this, _handleHttpSourceRequest, handleHttpSourceRequest_fn).call(this, source, sourceRequest);
         return {
           status: 200,
           body: {
             events,
-            response
+            response,
+            metadata
           }
         };
       }
@@ -1454,14 +1421,15 @@ var TriggerClient = class {
     let registeredSource = __privateGet(this, _registeredSources)[options.key];
     if (!registeredSource) {
       registeredSource = {
+        version: "2",
         channel: options.source.channel,
         key: options.key,
         params: options.params,
-        events: [],
+        options: {},
         integration: {
           id: options.source.integration.id,
           metadata: options.source.integration.metadata,
-          authSource: options.source.integration.client.usesLocalAuth ? "LOCAL" : "HOSTED"
+          authSource: options.source.integration.authSource
         },
         registerSourceJob: {
           id: options.key,
@@ -1469,12 +1437,12 @@ var TriggerClient = class {
         }
       };
     }
-    registeredSource.events = Array.from(/* @__PURE__ */ new Set([
-      ...registeredSource.events,
-      ...typeof options.event.name === "string" ? [
+    const newOptions = deepMergeOptions({
+      event: typeof options.event.name === "string" ? [
         options.event.name
       ] : options.event.name
-    ]));
+    }, options.options ?? {});
+    registeredSource.options = deepMergeOptions(registeredSource.options, newOptions);
     __privateGet(this, _registeredSources)[options.key] = registeredSource;
     new Job(this, {
       id: options.key,
@@ -1730,7 +1698,8 @@ handleHttpSourceRequest_fn = /* @__PURE__ */ __name(async function(source, sourc
         body: {
           ok: true
         }
-      }
+      },
+      metadata: results2.metadata
     };
   }
   const handler = __privateGet(this, _registeredHttpSourceHandlers)[source.key];
@@ -1767,19 +1736,33 @@ handleHttpSourceRequest_fn = /* @__PURE__ */ __name(async function(source, sourc
       body: {
         ok: true
       }
-    }
+    },
+    metadata: results.metadata
   };
 }, "#handleHttpSourceRequest");
 function dynamicTriggerRegisterSourceJobId(id) {
   return `register-dynamic-trigger-${id}`;
 }
 __name(dynamicTriggerRegisterSourceJobId, "dynamicTriggerRegisterSourceJobId");
-
-// src/integrations.ts
-function authenticatedTask(options) {
-  return options;
+function deepMergeOptions(obj1, obj2) {
+  const mergedOptions = {
+    ...obj1
+  };
+  for (const key in obj2) {
+    if (obj2.hasOwnProperty(key)) {
+      if (key in mergedOptions) {
+        mergedOptions[key] = [
+          ...mergedOptions[key],
+          ...obj2[key]
+        ];
+      } else {
+        mergedOptions[key] = obj2[key];
+      }
+    }
+  }
+  return mergedOptions;
 }
-__name(authenticatedTask, "authenticatedTask");
+__name(deepMergeOptions, "deepMergeOptions");
 
 // src/triggers/externalSource.ts
 var import_core6 = require("@trigger.dev/core");
@@ -1795,10 +1778,10 @@ var ExternalSource = class {
         params: source.params
       },
       rawEvent
-    }, logger);
+    }, logger, this.options.integration);
   }
-  filter(params) {
-    return this.options.filter?.(params) ?? {};
+  filter(params, options) {
+    return this.options.filter?.(params, options) ?? {};
   }
   properties(params) {
     return this.options.properties?.(params) ?? [];
@@ -1856,7 +1839,7 @@ var ExternalSourceTrigger = class {
       title: "External Source",
       rule: {
         event: this.event.name,
-        payload: (0, import_core6.deepMergeFilters)(this.options.source.filter(this.options.params), this.event.filter ?? {}, this.options.params.filter ?? {}),
+        payload: (0, import_core6.deepMergeFilters)(this.options.source.filter(this.options.params, this.options.options), this.event.filter ?? {}, this.options.params.filter ?? {}),
         source: this.event.source
       },
       properties: this.options.source.properties(this.options.params)
@@ -1867,7 +1850,8 @@ var ExternalSourceTrigger = class {
       key: slugifyId(this.options.source.key(this.options.params)),
       source: this.options.source,
       event: this.options.event,
-      params: this.options.params
+      params: this.options.params,
+      options: this.options.options
     });
   }
   get preprocessRuns() {
@@ -1922,16 +1906,19 @@ var DynamicTrigger = class {
         payload: (0, import_core7.deepMergeFilters)(this.source.filter(params), this.event.filter ?? {})
       },
       source: {
+        version: "2",
         key,
         channel: this.source.channel,
         params,
-        events: typeof this.event.name === "string" ? [
-          this.event.name
-        ] : this.event.name,
+        options: {
+          event: typeof this.event.name === "string" ? [
+            this.event.name
+          ] : this.event.name
+        },
         integration: {
           id: this.source.integration.id,
           metadata: this.source.integration.metadata,
-          authSource: this.source.integration.client.usesLocalAuth ? "LOCAL" : "HOSTED"
+          authSource: this.source.integration.authSource
         }
       }
     };
@@ -2215,7 +2202,6 @@ __name(redactString, "redactString");
   MissingConnectionNotification,
   MissingConnectionResolvedNotification,
   TriggerClient,
-  authenticatedTask,
   cronTrigger,
   eventTrigger,
   intervalTrigger,
@@ -2223,6 +2209,7 @@ __name(redactString, "redactString");
   missingConnectionNotification,
   missingConnectionResolvedNotification,
   omit,
-  redactString
+  redactString,
+  retry
 });
 //# sourceMappingURL=index.js.map