@trigger.dev/sdk 2.0.0-next.4 → 2.0.0-next.7

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -16,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __accessCheck = (obj, member, msg) => {
   if (!member.has(obj))
@@ -112,6 +118,9 @@ var Job = class {
       return acc;
     }, {});
   }
+  get logLevel() {
+    return this.options.logLevel;
+  }
   toJSON() {
     const internal = this.options.__internal;
     return {
@@ -160,6 +169,9 @@ var _Logger = class {
   filter(...keys) {
     return new _Logger(__privateGet(this, _name), logLevels[__privateGet(this, _level)], keys, __privateGet(this, _jsonReplacer));
   }
+  static satisfiesLogLevel(logLevel, setLevel) {
+    return logLevels.indexOf(logLevel) <= logLevels.indexOf(setLevel);
+  }
   log(...args) {
     if (__privateGet(this, _level) < 0)
       return;
@@ -605,12 +617,12 @@ var IndexEndpointResponseSchema = import_zod9.z.object({
   dynamicSchedules: import_zod9.z.array(RegisterDynamicSchedulePayloadSchema)
 });
 var RawEventSchema = import_zod9.z.object({
-  id: import_zod9.z.string().default(() => (0, import_ulid.ulid)()),
   name: import_zod9.z.string(),
-  source: import_zod9.z.string().optional(),
   payload: import_zod9.z.any(),
   context: import_zod9.z.any().optional(),
-  timestamp: import_zod9.z.string().datetime().optional()
+  id: import_zod9.z.string().default(() => (0, import_ulid.ulid)()),
+  timestamp: import_zod9.z.coerce.date().optional(),
+  source: import_zod9.z.string().optional()
 });
 var ApiEventLogSchema = import_zod9.z.object({
   id: import_zod9.z.string(),
@@ -622,7 +634,7 @@ var ApiEventLogSchema = import_zod9.z.object({
   deliveredAt: import_zod9.z.coerce.date().optional().nullable()
 });
 var SendEventOptionsSchema = import_zod9.z.object({
-  deliverAt: import_zod9.z.string().datetime().optional(),
+  deliverAt: import_zod9.z.coerce.date().optional(),
   deliverAfter: import_zod9.z.number().int().optional(),
   accountId: import_zod9.z.string().optional()
 });
@@ -1335,6 +1347,8 @@ var IO = class {
     this._triggerClient = options.client;
     this._logger = options.logger ?? new Logger("trigger.dev", options.logLevel);
     this._cachedTasks = /* @__PURE__ */ new Map();
+    this._jobLogger = options.jobLogger;
+    this._jobLogLevel = options.jobLogLevel;
     if (options.cachedTasks) {
       options.cachedTasks.forEach((task) => {
         this._cachedTasks.set(task.id, task);
@@ -1345,45 +1359,57 @@ var IO = class {
   }
   get logger() {
     return new IOLogger(async (level, message, data) => {
+      let logLevel = "info";
       switch (level) {
+        case "LOG": {
+          this._jobLogger?.log(message, data);
+          logLevel = "log";
+          break;
+        }
         case "DEBUG": {
-          this._logger.debug(message, data);
+          this._jobLogger?.debug(message, data);
+          logLevel = "debug";
           break;
         }
         case "INFO": {
-          this._logger.info(message, data);
+          this._jobLogger?.info(message, data);
+          logLevel = "info";
           break;
         }
         case "WARN": {
-          this._logger.warn(message, data);
+          this._jobLogger?.warn(message, data);
+          logLevel = "warn";
           break;
         }
         case "ERROR": {
-          this._logger.error(message, data);
+          this._jobLogger?.error(message, data);
+          logLevel = "error";
           break;
         }
       }
-      await this.runTask([
-        message,
-        level
-      ], {
-        name: "log",
-        icon: "log",
-        description: message,
-        params: data,
-        properties: [
-          {
-            label: "Level",
-            text: level
-          }
-        ],
-        style: {
-          style: "minimal",
-          variant: level.toLowerCase()
-        },
-        noop: true
-      }, async (task) => {
-      });
+      if (Logger.satisfiesLogLevel(logLevel, this._jobLogLevel)) {
+        await this.runTask([
+          message,
+          level
+        ], {
+          name: "log",
+          icon: "log",
+          description: message,
+          params: data,
+          properties: [
+            {
+              label: "Level",
+              text: level
+            }
+          ],
+          style: {
+            style: "minimal",
+            variant: level.toLowerCase()
+          },
+          noop: true
+        }, async (task) => {
+        });
+      }
     });
   }
   async wait(key, seconds) {
@@ -1438,7 +1464,19 @@ var IO = class {
       params: {
         event,
         options
-      }
+      },
+      properties: [
+        {
+          label: "name",
+          text: event.name
+        },
+        ...event?.id ? [
+          {
+            label: "ID",
+            text: event.id
+          }
+        ] : []
+      ]
     }, async (task) => {
       return await this._triggerClient.sendEvent(event, options);
     });
@@ -1758,6 +1796,9 @@ var IOLogger = class {
   constructor(callback) {
     this.callback = callback;
   }
+  log(message, properties) {
+    return this.callback("LOG", message, properties);
+  }
   debug(message, properties) {
     return this.callback("DEBUG", message, properties);
   }
@@ -1830,7 +1871,7 @@ var registerSourceEvent = {
   icon: "register-source",
   parsePayload: RegisterSourceEventSchema.parse
 };
-var _options3, _registeredJobs, _registeredSources, _registeredHttpSourceHandlers, _registeredDynamicTriggers, _jobMetadataByDynamicTriggers, _registeredSchedules, _client, _logger2, _preprocessRun, preprocessRun_fn, _executeJob, executeJob_fn, _createRunContext, createRunContext_fn, _createPreprocessRunContext, createPreprocessRunContext_fn, _handleHttpSourceRequest, handleHttpSourceRequest_fn;
+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 {
   constructor(options) {
     __privateAdd(this, _preprocessRun);
@@ -1846,18 +1887,14 @@ var TriggerClient = class {
     __privateAdd(this, _jobMetadataByDynamicTriggers, {});
     __privateAdd(this, _registeredSchedules, {});
     __privateAdd(this, _client, void 0);
-    __privateAdd(this, _logger2, void 0);
+    __privateAdd(this, _internalLogger, void 0);
     this.id = options.id;
-    this._url = buildClientUrl(options.url);
     __privateSet(this, _options3, options);
     __privateSet(this, _client, new ApiClient(__privateGet(this, _options3)));
-    __privateSet(this, _logger2, new Logger("trigger.dev", __privateGet(this, _options3).logLevel));
-  }
-  get url() {
-    return `${this._url}${this.path ? `${this.path.startsWith("/") ? "" : "/"}${this.path}` : ""}`;
+    __privateSet(this, _internalLogger, new Logger("trigger.dev", __privateGet(this, _options3).verbose ? "debug" : "log"));
   }
   async handleRequest(request) {
-    __privateGet(this, _logger2).debug("handling request", {
+    __privateGet(this, _internalLogger).debug("handling request", {
       url: request.url,
       headers: Object.fromEntries(request.headers.entries()),
       method: request.method
@@ -1918,7 +1955,7 @@ var TriggerClient = class {
             status: 200,
             body: {
               ok: false,
-              message: "Missing endpoint ID"
+              error: "Missing endpoint ID"
             }
           };
         }
@@ -1927,7 +1964,7 @@ var TriggerClient = class {
             status: 200,
             body: {
               ok: false,
-              message: `Endpoint ID mismatch error. Expected ${this.id}, got ${endpointId}`
+              error: `Endpoint ID mismatch error. Expected ${this.id}, got ${endpointId}`
             }
           };
         }
@@ -2143,7 +2180,7 @@ var TriggerClient = class {
   }
   attachSource(options) {
     __privateGet(this, _registeredHttpSourceHandlers)[options.key] = async (s, r) => {
-      return await options.source.handle(s, r, __privateGet(this, _logger2));
+      return await options.source.handle(s, r, __privateGet(this, _internalLogger));
     };
     let registeredSource = __privateGet(this, _registeredSources)[options.key];
     if (!registeredSource) {
@@ -2245,7 +2282,7 @@ _registeredDynamicTriggers = new WeakMap();
 _jobMetadataByDynamicTriggers = new WeakMap();
 _registeredSchedules = new WeakMap();
 _client = new WeakMap();
-_logger2 = new WeakMap();
+_internalLogger = new WeakMap();
 _preprocessRun = new WeakSet();
 preprocessRun_fn = /* @__PURE__ */ __name(async function(body, job) {
   const context = __privateMethod(this, _createPreprocessRunContext, createPreprocessRunContext_fn).call(this, body);
@@ -2258,7 +2295,7 @@ preprocessRun_fn = /* @__PURE__ */ __name(async function(body, job) {
 }, "#preprocessRun");
 _executeJob = new WeakSet();
 executeJob_fn = /* @__PURE__ */ __name(async function(body1, job1) {
-  __privateGet(this, _logger2).debug("executing job", {
+  __privateGet(this, _internalLogger).debug("executing job", {
     execution: body1,
     job: job1.toJSON()
   });
@@ -2267,9 +2304,11 @@ executeJob_fn = /* @__PURE__ */ __name(async function(body1, job1) {
     id: body1.run.id,
     cachedTasks: body1.tasks,
     apiClient: __privateGet(this, _client),
-    logger: __privateGet(this, _logger2),
+    logger: __privateGet(this, _internalLogger),
     client: this,
-    context
+    context,
+    jobLogLevel: job1.logLevel ?? __privateGet(this, _options3).logLevel ?? "info",
+    jobLogger: __privateGet(this, _options3).ioLogLocalEnabled ? new Logger(job1.id, job1.logLevel ?? __privateGet(this, _options3).logLevel ?? "info") : void 0
   });
   const ioWithConnections = createIOWithIntegrations(io, body1.connections, job1.options.integrations);
   try {
@@ -2362,13 +2401,13 @@ createPreprocessRunContext_fn = /* @__PURE__ */ __name(function(body2) {
 }, "#createPreprocessRunContext");
 _handleHttpSourceRequest = new WeakSet();
 handleHttpSourceRequest_fn = /* @__PURE__ */ __name(async function(source, sourceRequest) {
-  __privateGet(this, _logger2).debug("Handling HTTP source request", {
+  __privateGet(this, _internalLogger).debug("Handling HTTP source request", {
     source
   });
   if (source.dynamicId) {
     const dynamicTrigger = __privateGet(this, _registeredDynamicTriggers)[source.dynamicId];
     if (!dynamicTrigger) {
-      __privateGet(this, _logger2).debug("No dynamic trigger registered for HTTP source", {
+      __privateGet(this, _internalLogger).debug("No dynamic trigger registered for HTTP source", {
         source
       });
       return {
@@ -2381,7 +2420,7 @@ handleHttpSourceRequest_fn = /* @__PURE__ */ __name(async function(source, sourc
         events: []
       };
     }
-    const results2 = await dynamicTrigger.source.handle(source, sourceRequest, __privateGet(this, _logger2));
+    const results2 = await dynamicTrigger.source.handle(source, sourceRequest, __privateGet(this, _internalLogger));
     if (!results2) {
       return {
         events: [],
@@ -2405,7 +2444,7 @@ handleHttpSourceRequest_fn = /* @__PURE__ */ __name(async function(source, sourc
   }
   const handler = __privateGet(this, _registeredHttpSourceHandlers)[source.key];
   if (!handler) {
-    __privateGet(this, _logger2).debug("No handler registered for HTTP source", {
+    __privateGet(this, _internalLogger).debug("No handler registered for HTTP source", {
       source
     });
     return {
@@ -2440,20 +2479,6 @@ handleHttpSourceRequest_fn = /* @__PURE__ */ __name(async function(source, sourc
     }
   };
 }, "#handleHttpSourceRequest");
-function buildClientUrl(url) {
-  if (!url) {
-    const host = process.env.TRIGGER_CLIENT_HOST ?? process.env.HOST ?? process.env.HOSTNAME ?? process.env.NOW_URL ?? process.env.VERCEL_URL;
-    if (host) {
-      return "https://" + host;
-    }
-    throw new Error("Could not determine the url for this TriggerClient. Please set the TRIGGER_CLIENT_HOST environment variable or pass in the `url` option to the TriggerClient constructor.");
-  }
-  if (!url.startsWith("http")) {
-    return "https://" + url;
-  }
-  return url;
-}
-__name(buildClientUrl, "buildClientUrl");
 
 // src/integrations.ts
 function authenticatedTask(options) {
@@ -2628,6 +2653,7 @@ _client2 = new WeakMap();
 _options4 = new WeakMap();
 
 // src/triggers/scheduled.ts
+var import_cronstrue = __toESM(require("cronstrue"));
 var examples = [
   {
     id: "now",
@@ -2686,6 +2712,9 @@ var CronTrigger = class {
     this.options = options;
   }
   get event() {
+    const humanReadable = import_cronstrue.default.toString(this.options.cron, {
+      throwExceptionOnParseError: false
+    });
     return {
       name: "trigger.scheduled",
       title: "Cron Schedule",
@@ -2695,8 +2724,12 @@ var CronTrigger = class {
       parsePayload: ScheduledPayloadSchema.parse,
       properties: [
         {
-          label: "Expression",
+          label: "cron",
           text: this.options.cron
+        },
+        {
+          label: "Schedule",
+          text: humanReadable
         }
       ]
     };