@trigger.dev/core 3.0.0-beta.37 → 3.0.0-beta.39

package/dist/v3/index.js

@@ -35,7 +35,7 @@ var __privateMethod = (obj, member, method) => {
 };
 
 // package.json
-var version = "3.0.0-beta.37";
+var version = "3.0.0-beta.39";
 var dependencies = {
   "@google-cloud/precise-date": "^4.0.0",
   "@opentelemetry/api": "^1.8.0",
@@ -71,6 +71,41 @@ var GetPersonalAccessTokenResponseSchema = zod.z.object({
     obfuscatedToken: zod.z.string()
   }).nullable()
 });
+var MachineCpu = zod.z.union([
+  zod.z.literal(0.25),
+  zod.z.literal(0.5),
+  zod.z.literal(1),
+  zod.z.literal(2),
+  zod.z.literal(4)
+]);
+var MachineMemory = zod.z.union([
+  zod.z.literal(0.25),
+  zod.z.literal(0.5),
+  zod.z.literal(1),
+  zod.z.literal(2),
+  zod.z.literal(4),
+  zod.z.literal(8)
+]);
+var MachinePresetName = zod.z.enum([
+  "micro",
+  "small-1x",
+  "small-2x",
+  "medium-1x",
+  "medium-2x",
+  "large-1x",
+  "large-2x"
+]);
+var MachineConfig = zod.z.object({
+  cpu: MachineCpu.optional(),
+  memory: MachineMemory.optional(),
+  preset: MachinePresetName.optional()
+});
+var MachinePreset = zod.z.object({
+  name: MachinePresetName,
+  cpu: zod.z.number(),
+  memory: zod.z.number(),
+  centsPerMs: zod.z.number()
+});
 var TaskRunBuiltInError = zod.z.object({
   type: zod.z.literal("BUILT_IN_ERROR"),
   name: zod.z.string(),
@@ -132,7 +167,11 @@ var TaskRun = zod.z.object({
   tags: zod.z.array(zod.z.string()),
   isTest: zod.z.boolean().default(false),
   createdAt: zod.z.coerce.date(),
-  idempotencyKey: zod.z.string().optional()
+  startedAt: zod.z.coerce.date().default(() => /* @__PURE__ */ new Date()),
+  idempotencyKey: zod.z.string().optional(),
+  durationMs: zod.z.number().default(0),
+  costInCents: zod.z.number().default(0),
+  baseCostInCents: zod.z.number().default(0)
 });
 var TaskRunExecutionTask = zod.z.object({
   id: zod.z.string(),
@@ -183,7 +222,8 @@ var TaskRunExecution = zod.z.object({
   environment: TaskRunExecutionEnvironment,
   organization: TaskRunExecutionOrganization,
   project: TaskRunExecutionProject,
-  batch: TaskRunExecutionBatch.optional()
+  batch: TaskRunExecutionBatch.optional(),
+  machine: MachinePreset.optional()
 });
 var TaskRunContext = zod.z.object({
   task: TaskRunExecutionTask,
@@ -199,25 +239,31 @@ var TaskRunContext = zod.z.object({
   environment: TaskRunExecutionEnvironment,
   organization: TaskRunExecutionOrganization,
   project: TaskRunExecutionProject,
-  batch: TaskRunExecutionBatch.optional()
+  batch: TaskRunExecutionBatch.optional(),
+  machine: MachinePreset.optional()
 });
 var TaskRunExecutionRetry = zod.z.object({
   timestamp: zod.z.number(),
   delay: zod.z.number(),
   error: zod.z.unknown().optional()
 });
+var TaskRunExecutionUsage = zod.z.object({
+  durationMs: zod.z.number()
+});
 var TaskRunFailedExecutionResult = zod.z.object({
   ok: zod.z.literal(false),
   id: zod.z.string(),
   error: TaskRunError,
   retry: TaskRunExecutionRetry.optional(),
-  skippedRetrying: zod.z.boolean().optional()
+  skippedRetrying: zod.z.boolean().optional(),
+  usage: TaskRunExecutionUsage.optional()
 });
 var TaskRunSuccessfulExecutionResult = zod.z.object({
   ok: zod.z.literal(true),
   id: zod.z.string(),
   output: zod.z.string().optional(),
-  outputType: zod.z.string()
+  outputType: zod.z.string(),
+  usage: TaskRunExecutionUsage.optional()
 });
 var TaskRunExecutionResult = zod.z.discriminatedUnion("ok", [
   TaskRunSuccessfulExecutionResult,
@@ -235,26 +281,6 @@ var EnvironmentType = zod.z.enum([
   "DEVELOPMENT",
   "PREVIEW"
 ]);
-var MachineCpu = zod.z.union([
-  zod.z.literal(0.25),
-  zod.z.literal(0.5),
-  zod.z.literal(1),
-  zod.z.literal(2),
-  zod.z.literal(4)
-]).default(0.5);
-var MachineMemory = zod.z.union([
-  zod.z.literal(0.25),
-  zod.z.literal(0.5),
-  zod.z.literal(1),
-  zod.z.literal(2),
-  zod.z.literal(4),
-  zod.z.literal(8)
-]).default(1);
-var Machine = zod.z.object({
-  version: zod.z.literal("v1").default("v1"),
-  cpu: MachineCpu,
-  memory: MachineMemory
-});
 var TaskRunExecutionPayload = zod.z.object({
   execution: TaskRunExecution,
   traceContext: zod.z.record(zod.z.unknown()),
@@ -265,6 +291,12 @@ var ProdTaskRunExecution = TaskRunExecution.extend({
     id: zod.z.string(),
     contentHash: zod.z.string(),
     version: zod.z.string()
+  }),
+  machine: MachinePreset.default({
+    name: "small-1x",
+    cpu: 1,
+    memory: 1,
+    centsPerMs: 0
   })
 });
 var ProdTaskRunExecutionPayload = zod.z.object({
@@ -369,7 +401,7 @@ var TaskMetadata = zod.z.object({
   packageVersion: zod.z.string(),
   queue: QueueOptions.optional(),
   retry: RetryOptions.optional(),
-  machine: Machine.partial().optional(),
+  machine: MachineConfig.optional(),
   triggerSource: zod.z.string().optional()
 });
 var TaskFileMetadata = zod.z.object({
@@ -381,7 +413,7 @@ var TaskMetadataWithFilePath = zod.z.object({
   packageVersion: zod.z.string(),
   queue: QueueOptions.optional(),
   retry: RetryOptions.optional(),
-  machine: Machine.partial().optional(),
+  machine: MachineConfig.optional(),
   triggerSource: zod.z.string().optional(),
   filePath: zod.z.string(),
   exportName: zod.z.string()
@@ -441,7 +473,7 @@ var TaskResource = zod.z.object({
   exportName: zod.z.string(),
   queue: QueueOptions.optional(),
   retry: RetryOptions.optional(),
-  machine: Machine.partial().optional(),
+  machine: MachineConfig.optional(),
   triggerSource: zod.z.string().optional()
 });
 var BackgroundWorkerMetadata = zod.z.object({
@@ -750,15 +782,26 @@ var ScheduledTaskPayload = zod.z.object({
   You can use this to remove the schedule, update it, etc */
   scheduleId: zod.z.string(),
   /** When the task was scheduled to run.
-  * Note this will be slightly different from `new Date()` because it takes a few ms to run the task. */
+  * Note this will be slightly different from `new Date()` because it takes a few ms to run the task.
+  * 
+  * This date is UTC. To output it as a string with a timezone you would do this: 
+  * ```ts
+  * const formatted = payload.timestamp.toLocaleString("en-US", {
+       timeZone: payload.timezone,
+   });
+   ```  */
   timestamp: zod.z.date(),
   /** When the task was last run (it has been).
-  This can be undefined if it's never been run */
+  This can be undefined if it's never been run. This date is UTC. */
   lastTimestamp: zod.z.date().optional(),
   /** You can optionally provide an external id when creating the schedule.
   Usually you would use a userId or some other unique identifier.
   This defaults to undefined if you didn't provide one. */
   externalId: zod.z.string().optional(),
+  /** The IANA timezone the schedule is set to. The default is UTC.
+  * You can see the full list of supported timezones here: https://cloud.trigger.dev/timezones
+  */
+  timezone: zod.z.string(),
   /** The next 5 dates this task is scheduled to run */
   upcoming: zod.z.array(zod.z.date())
 });
@@ -782,17 +825,30 @@ var CreateScheduleOptions = zod.z.object({
   
      */
   cron: zod.z.string(),
-  /** (Optional) You can only create one schedule with this key. If you use it twice, the second call will update the schedule.
+  /** You can only create one schedule with this key. If you use it twice, the second call will update the schedule.
   *
-  * This is useful if you don't want to create duplicate schedules for a user. */
-  deduplicationKey: zod.z.string().optional(),
+  * This is required to prevent you from creating duplicate schedules. */
+  deduplicationKey: zod.z.string(),
   /** Optionally, you can specify your own IDs (like a user ID) and then use it inside the run function of your task.
   *
   * This allows you to have per-user CRON tasks.
   */
-  externalId: zod.z.string().optional()
+  externalId: zod.z.string().optional(),
+  /** Optionally, you can specify a timezone in the IANA format. If unset it will use UTC.
+  * If specified then the CRON will be evaluated in that timezone and will respect daylight savings.
+  *
+  * If you set the CRON to `0 0 * * *` and the timezone to `America/New_York` then the task will run at midnight in New York time, no matter whether it's daylight savings or not.
+  *
+  * You can see the full list of supported timezones here: https://cloud.trigger.dev/timezones
+  *
+  * @example "America/New_York", "Europe/London", "Asia/Tokyo", "Africa/Cairo"
+  *
+  */
+  timezone: zod.z.string().optional()
+});
+var UpdateScheduleOptions = CreateScheduleOptions.omit({
+  deduplicationKey: true
 });
-var UpdateScheduleOptions = CreateScheduleOptions;
 var ScheduleGenerator = zod.z.object({
   type: zod.z.literal("CRON"),
   expression: zod.z.string(),
@@ -805,6 +861,7 @@ var ScheduleObject = zod.z.object({
   deduplicationKey: zod.z.string().nullish(),
   externalId: zod.z.string().nullish(),
   generator: ScheduleGenerator,
+  timezone: zod.z.string(),
   nextRun: zod.z.coerce.date().nullish(),
   environments: zod.z.array(zod.z.object({
     id: zod.z.string(),
@@ -827,6 +884,9 @@ var ListScheduleOptions = zod.z.object({
   page: zod.z.number().optional(),
   perPage: zod.z.number().optional()
 });
+var TimezonesResult = zod.z.object({
+  timezones: zod.z.array(zod.z.string())
+});
 var RunStatus = zod.z.enum([
   /// Task hasn't been deployed yet but is waiting to be executed
   "WAITING_FOR_DEPLOY",
@@ -950,7 +1010,7 @@ var BackgroundWorkerServerMessages = zod.z.discriminatedUnion("type", [
     type: zod.z.literal("SCHEDULE_ATTEMPT"),
     image: zod.z.string(),
     version: zod.z.string(),
-    machine: Machine,
+    machine: MachinePreset,
     // identifiers
     id: zod.z.string().optional(),
     envId: zod.z.string(),
@@ -1295,7 +1355,7 @@ var PlatformToProviderMessages = {
       location: zod.z.string(),
       reason: zod.z.string().optional(),
       imageRef: zod.z.string(),
-      machine: Machine,
+      machine: MachinePreset,
       // identifiers
       checkpointId: zod.z.string(),
       envId: zod.z.string(),
@@ -2045,6 +2105,10 @@ var SemanticInternalAttributes = {
   TASK_EXPORT_NAME: "ctx.task.exportName",
   QUEUE_NAME: "ctx.queue.name",
   QUEUE_ID: "ctx.queue.id",
+  MACHINE_PRESET_NAME: "ctx.machine.name",
+  MACHINE_PRESET_CPU: "ctx.machine.cpu",
+  MACHINE_PRESET_MEMORY: "ctx.machine.memory",
+  MACHINE_PRESET_CENTS_PER_MS: "ctx.machine.centsPerMs",
   SPAN_PARTIAL: "$span.partial",
   SPAN_ID: "$span.span_id",
   OUTPUT: "$output",
@@ -2068,7 +2132,9 @@ var SemanticInternalAttributes = {
   RETRY_DELAY: "retry.delay",
   RETRY_COUNT: "retry.count",
   LINK_TITLE: "$link.title",
-  IDEMPOTENCY_KEY: "ctx.run.idempotencyKey"
+  IDEMPOTENCY_KEY: "ctx.run.idempotencyKey",
+  USAGE_DURATION_MS: "$usage.durationMs",
+  USAGE_COST_IN_CENTS: "$usage.costInCents"
 };
 
 // src/v3/taskContext/index.ts
@@ -2132,7 +2198,11 @@ var _TaskContextAPI = class _TaskContextAPI {
         [SemanticInternalAttributes.ORGANIZATION_SLUG]: this.ctx.organization.slug,
         [SemanticInternalAttributes.ORGANIZATION_NAME]: this.ctx.organization.name,
         [SemanticInternalAttributes.BATCH_ID]: this.ctx.batch?.id,
-        [SemanticInternalAttributes.IDEMPOTENCY_KEY]: this.ctx.run.idempotencyKey
+        [SemanticInternalAttributes.IDEMPOTENCY_KEY]: this.ctx.run.idempotencyKey,
+        [SemanticInternalAttributes.MACHINE_PRESET_NAME]: this.ctx.machine?.name,
+        [SemanticInternalAttributes.MACHINE_PRESET_CPU]: this.ctx.machine?.cpu,
+        [SemanticInternalAttributes.MACHINE_PRESET_MEMORY]: this.ctx.machine?.memory,
+        [SemanticInternalAttributes.MACHINE_PRESET_CENTS_PER_MS]: this.ctx.machine?.centsPerMs
       };
     }
     return {};
@@ -3500,8 +3570,77 @@ var _NoopRuntimeManager = class _NoopRuntimeManager {
 __name(_NoopRuntimeManager, "NoopRuntimeManager");
 var NoopRuntimeManager = _NoopRuntimeManager;
 
+// src/v3/usage/noopUsageManager.ts
+var _NoopUsageManager = class _NoopUsageManager {
+  disable() {
+  }
+  start() {
+    return {
+      sample: () => ({
+        cpuTime: 0,
+        wallTime: 0
+      })
+    };
+  }
+  stop(measurement) {
+    return measurement.sample();
+  }
+  pauseAsync(cb) {
+    return cb();
+  }
+  sample() {
+    return void 0;
+  }
+};
+__name(_NoopUsageManager, "NoopUsageManager");
+var NoopUsageManager = _NoopUsageManager;
+
+// src/v3/usage/api.ts
+var API_NAME4 = "usage";
+var NOOP_USAGE_MANAGER = new NoopUsageManager();
+var _getUsageManager, getUsageManager_fn;
+var _UsageAPI = class _UsageAPI {
+  constructor() {
+    __privateAdd(this, _getUsageManager);
+  }
+  static getInstance() {
+    if (!this._instance) {
+      this._instance = new _UsageAPI();
+    }
+    return this._instance;
+  }
+  setGlobalUsageManager(manager) {
+    return registerGlobal(API_NAME4, manager);
+  }
+  disable() {
+    __privateMethod(this, _getUsageManager, getUsageManager_fn).call(this).disable();
+    unregisterGlobal(API_NAME4);
+  }
+  start() {
+    return __privateMethod(this, _getUsageManager, getUsageManager_fn).call(this).start();
+  }
+  stop(measurement) {
+    return __privateMethod(this, _getUsageManager, getUsageManager_fn).call(this).stop(measurement);
+  }
+  pauseAsync(cb) {
+    return __privateMethod(this, _getUsageManager, getUsageManager_fn).call(this).pauseAsync(cb);
+  }
+  sample() {
+    return __privateMethod(this, _getUsageManager, getUsageManager_fn).call(this).sample();
+  }
+};
+_getUsageManager = new WeakSet();
+getUsageManager_fn = /* @__PURE__ */ __name(function() {
+  return getGlobal(API_NAME4) ?? NOOP_USAGE_MANAGER;
+}, "#getUsageManager");
+__name(_UsageAPI, "UsageAPI");
+var UsageAPI = _UsageAPI;
+
+// src/v3/usage-api.ts
+var usage = UsageAPI.getInstance();
+
 // src/v3/runtime/index.ts
-var API_NAME4 = "runtime";
+var API_NAME5 = "runtime";
 var NOOP_RUNTIME_MANAGER = new NoopRuntimeManager();
 var _getRuntimeManager, getRuntimeManager_fn;
 var _RuntimeAPI = class _RuntimeAPI {
@@ -3515,28 +3654,28 @@ var _RuntimeAPI = class _RuntimeAPI {
     return this._instance;
   }
   waitForDuration(ms) {
-    return __privateMethod(this, _getRuntimeManager, getRuntimeManager_fn).call(this).waitForDuration(ms);
+    return usage.pauseAsync(() => __privateMethod(this, _getRuntimeManager, getRuntimeManager_fn).call(this).waitForDuration(ms));
   }
   waitUntil(date) {
-    return __privateMethod(this, _getRuntimeManager, getRuntimeManager_fn).call(this).waitUntil(date);
+    return usage.pauseAsync(() => __privateMethod(this, _getRuntimeManager, getRuntimeManager_fn).call(this).waitUntil(date));
   }
   waitForTask(params) {
-    return __privateMethod(this, _getRuntimeManager, getRuntimeManager_fn).call(this).waitForTask(params);
+    return usage.pauseAsync(() => __privateMethod(this, _getRuntimeManager, getRuntimeManager_fn).call(this).waitForTask(params));
   }
   waitForBatch(params) {
-    return __privateMethod(this, _getRuntimeManager, getRuntimeManager_fn).call(this).waitForBatch(params);
+    return usage.pauseAsync(() => __privateMethod(this, _getRuntimeManager, getRuntimeManager_fn).call(this).waitForBatch(params));
   }
   setGlobalRuntimeManager(runtimeManager) {
-    return registerGlobal(API_NAME4, runtimeManager);
+    return registerGlobal(API_NAME5, runtimeManager);
   }
   disable() {
     __privateMethod(this, _getRuntimeManager, getRuntimeManager_fn).call(this).disable();
-    unregisterGlobal(API_NAME4);
+    unregisterGlobal(API_NAME5);
   }
 };
 _getRuntimeManager = new WeakSet();
 getRuntimeManager_fn = /* @__PURE__ */ __name(function() {
-  return getGlobal(API_NAME4) ?? NOOP_RUNTIME_MANAGER;
+  return getGlobal(API_NAME5) ?? NOOP_RUNTIME_MANAGER;
 }, "#getRuntimeManager");
 __name(_RuntimeAPI, "RuntimeAPI");
 var RuntimeAPI = _RuntimeAPI;
@@ -3553,7 +3692,7 @@ function getEnvVar(name) {
 __name(getEnvVar, "getEnvVar");
 
 // src/v3/apiClientManager/index.ts
-var API_NAME5 = "api-client";
+var API_NAME6 = "api-client";
 var _getConfig, getConfig_fn;
 var _APIClientManagerAPI = class _APIClientManagerAPI {
   constructor() {
@@ -3566,10 +3705,10 @@ var _APIClientManagerAPI = class _APIClientManagerAPI {
     return this._instance;
   }
   disable() {
-    unregisterGlobal(API_NAME5);
+    unregisterGlobal(API_NAME6);
   }
   setGlobalAPIClientConfiguration(config) {
-    return registerGlobal(API_NAME5, config);
+    return registerGlobal(API_NAME6, config);
   }
   get baseURL() {
     const store = __privateMethod(this, _getConfig, getConfig_fn).call(this);
@@ -3588,7 +3727,7 @@ var _APIClientManagerAPI = class _APIClientManagerAPI {
 };
 _getConfig = new WeakSet();
 getConfig_fn = /* @__PURE__ */ __name(function() {
-  return getGlobal(API_NAME5);
+  return getGlobal(API_NAME6);
 }, "#getConfig");
 __name(_APIClientManagerAPI, "APIClientManagerAPI");
 var APIClientManagerAPI = _APIClientManagerAPI;
@@ -3623,7 +3762,7 @@ __name(_NoopTaskCatalog, "NoopTaskCatalog");
 var NoopTaskCatalog = _NoopTaskCatalog;
 
 // src/v3/task-catalog/index.ts
-var API_NAME6 = "task-catalog";
+var API_NAME7 = "task-catalog";
 var NOOP_TASK_CATALOG = new NoopTaskCatalog();
 var _getCatalog, getCatalog_fn;
 var _TaskCatalogAPI = class _TaskCatalogAPI {
@@ -3637,10 +3776,10 @@ var _TaskCatalogAPI = class _TaskCatalogAPI {
     return this._instance;
   }
   setGlobalTaskCatalog(taskCatalog2) {
-    return registerGlobal(API_NAME6, taskCatalog2);
+    return registerGlobal(API_NAME7, taskCatalog2);
   }
   disable() {
-    unregisterGlobal(API_NAME6);
+    unregisterGlobal(API_NAME7);
   }
   registerTaskMetadata(task) {
     __privateMethod(this, _getCatalog, getCatalog_fn).call(this).registerTaskMetadata(task);
@@ -3666,7 +3805,7 @@ var _TaskCatalogAPI = class _TaskCatalogAPI {
 };
 _getCatalog = new WeakSet();
 getCatalog_fn = /* @__PURE__ */ __name(function() {
-  return getGlobal(API_NAME6) ?? NOOP_TASK_CATALOG;
+  return getGlobal(API_NAME7) ?? NOOP_TASK_CATALOG;
 }, "#getCatalog");
 __name(_TaskCatalogAPI, "TaskCatalogAPI");
 var TaskCatalogAPI = _TaskCatalogAPI;
@@ -3786,6 +3925,7 @@ var _TriggerTracer = class _TriggerTracer {
           [SemanticInternalAttributes.SPAN_ID]: span.spanContext().spanId
         }
       }, parentContext).end();
+      const usageMeasurement = usage.start();
       try {
         return await fn(span);
       } catch (e) {
@@ -3797,6 +3937,12 @@ var _TriggerTracer = class _TriggerTracer {
         });
         throw e;
       } finally {
+        const usageSample = usage.stop(usageMeasurement);
+        const machine = taskContext.ctx?.machine;
+        span.setAttributes({
+          [SemanticInternalAttributes.USAGE_DURATION_MS]: usageSample.cpuTime,
+          [SemanticInternalAttributes.USAGE_COST_IN_CENTS]: machine?.centsPerMs ? usageSample.cpuTime * machine.centsPerMs : 0
+        });
         span.end(clock.preciseNow());
       }
     });
@@ -4331,9 +4477,11 @@ exports.ListRunResponse = ListRunResponse;
 exports.ListRunResponseItem = ListRunResponseItem;
 exports.ListScheduleOptions = ListScheduleOptions;
 exports.ListSchedulesResult = ListSchedulesResult;
-exports.Machine = Machine;
+exports.MachineConfig = MachineConfig;
 exports.MachineCpu = MachineCpu;
 exports.MachineMemory = MachineMemory;
+exports.MachinePreset = MachinePreset;
+exports.MachinePresetName = MachinePresetName;
 exports.NULL_SENTINEL = NULL_SENTINEL;
 exports.NotFoundError = NotFoundError;
 exports.OFFLOAD_IO_PACKET_LENGTH_LIMIT = OFFLOAD_IO_PACKET_LENGTH_LIMIT;
@@ -4405,10 +4553,12 @@ exports.TaskRunExecutionQueue = TaskRunExecutionQueue;
 exports.TaskRunExecutionResult = TaskRunExecutionResult;
 exports.TaskRunExecutionRetry = TaskRunExecutionRetry;
 exports.TaskRunExecutionTask = TaskRunExecutionTask;
+exports.TaskRunExecutionUsage = TaskRunExecutionUsage;
 exports.TaskRunFailedExecutionResult = TaskRunFailedExecutionResult;
 exports.TaskRunInternalError = TaskRunInternalError;
 exports.TaskRunStringError = TaskRunStringError;
 exports.TaskRunSuccessfulExecutionResult = TaskRunSuccessfulExecutionResult;
+exports.TimezonesResult = TimezonesResult;
 exports.TriggerTaskRequestBody = TriggerTaskRequestBody;
 exports.TriggerTaskResponse = TriggerTaskResponse;
 exports.TriggerTracer = TriggerTracer;
@@ -4461,6 +4611,7 @@ exports.stringifyIO = stringifyIO;
 exports.taskCatalog = taskCatalog;
 exports.taskContext = taskContext;
 exports.unflattenAttributes = unflattenAttributes;
+exports.usage = usage;
 exports.workerToChildMessages = workerToChildMessages;
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.js.map