@trigger.dev/core 3.0.0-beta.37 → 3.0.0-beta.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/{catalog-XTlJQaMn.d.mts → catalog-EP9DGAGm.d.ts} +43 -3
- package/dist/{catalog-dRKTgwQ7.d.ts → catalog-Gjy5NtAB.d.mts} +43 -3
- package/dist/{manager-JkbddlcO.d.mts → manager-S98VaLUy.d.mts} +244 -1
- package/dist/{manager-JkbddlcO.d.ts → manager-S98VaLUy.d.ts} +244 -1
- package/dist/{messages-9lty-Du5.d.mts → messages--WkQvA2l.d.mts} +2370 -141
- package/dist/{messages-9lty-Du5.d.ts → messages--WkQvA2l.d.ts} +2370 -141
- package/dist/{schemas-r4ZP9S-F.d.mts → schemas-Sb0sJcEt.d.mts} +199 -33
- package/dist/{schemas-r4ZP9S-F.d.ts → schemas-Sb0sJcEt.d.ts} +199 -33
- package/dist/v3/dev/index.d.mts +1 -1
- package/dist/v3/dev/index.d.ts +1 -1
- package/dist/v3/index.d.mts +129 -55
- package/dist/v3/index.d.ts +129 -55
- package/dist/v3/index.js +208 -57
- package/dist/v3/index.js.map +1 -1
- package/dist/v3/index.mjs +203 -57
- package/dist/v3/index.mjs.map +1 -1
- package/dist/v3/otel/index.js +15 -5
- package/dist/v3/otel/index.js.map +1 -1
- package/dist/v3/otel/index.mjs +15 -5
- package/dist/v3/otel/index.mjs.map +1 -1
- package/dist/v3/prod/index.d.mts +2 -2
- package/dist/v3/prod/index.d.ts +2 -2
- package/dist/v3/prod/index.js.map +1 -1
- package/dist/v3/prod/index.mjs.map +1 -1
- package/dist/v3/workers/index.d.mts +54 -8
- package/dist/v3/workers/index.d.ts +54 -8
- package/dist/v3/workers/index.js +408 -42
- package/dist/v3/workers/index.js.map +1 -1
- package/dist/v3/workers/index.mjs +406 -43
- package/dist/v3/workers/index.mjs.map +1 -1
- package/dist/v3/zodIpc.js.map +1 -1
- package/dist/v3/zodIpc.mjs.map +1 -1
- package/dist/v3/zodfetch.d.mts +1 -1
- package/dist/v3/zodfetch.d.ts +1 -1
- package/package.json +1 -1
package/dist/v3/workers/index.js
CHANGED
|
@@ -15,6 +15,7 @@ var formDataEncoder = require('form-data-encoder');
|
|
|
15
15
|
var stream = require('stream');
|
|
16
16
|
var preciseDate = require('@google-cloud/precise-date');
|
|
17
17
|
var util = require('util');
|
|
18
|
+
var promises = require('timers/promises');
|
|
18
19
|
|
|
19
20
|
function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
20
21
|
|
|
@@ -110,6 +111,10 @@ var SemanticInternalAttributes = {
|
|
|
110
111
|
TASK_EXPORT_NAME: "ctx.task.exportName",
|
|
111
112
|
QUEUE_NAME: "ctx.queue.name",
|
|
112
113
|
QUEUE_ID: "ctx.queue.id",
|
|
114
|
+
MACHINE_PRESET_NAME: "ctx.machine.name",
|
|
115
|
+
MACHINE_PRESET_CPU: "ctx.machine.cpu",
|
|
116
|
+
MACHINE_PRESET_MEMORY: "ctx.machine.memory",
|
|
117
|
+
MACHINE_PRESET_CENTS_PER_MS: "ctx.machine.centsPerMs",
|
|
113
118
|
SPAN_PARTIAL: "$span.partial",
|
|
114
119
|
SPAN_ID: "$span.span_id",
|
|
115
120
|
OUTPUT: "$output",
|
|
@@ -133,7 +138,9 @@ var SemanticInternalAttributes = {
|
|
|
133
138
|
RETRY_DELAY: "retry.delay",
|
|
134
139
|
RETRY_COUNT: "retry.count",
|
|
135
140
|
LINK_TITLE: "$link.title",
|
|
136
|
-
IDEMPOTENCY_KEY: "ctx.run.idempotencyKey"
|
|
141
|
+
IDEMPOTENCY_KEY: "ctx.run.idempotencyKey",
|
|
142
|
+
USAGE_DURATION_MS: "$usage.durationMs",
|
|
143
|
+
USAGE_COST_IN_CENTS: "$usage.costInCents"
|
|
137
144
|
};
|
|
138
145
|
|
|
139
146
|
// src/v3/utils/flattenAttributes.ts
|
|
@@ -279,7 +286,11 @@ var _TaskContextAPI = class _TaskContextAPI {
|
|
|
279
286
|
[SemanticInternalAttributes.ORGANIZATION_SLUG]: this.ctx.organization.slug,
|
|
280
287
|
[SemanticInternalAttributes.ORGANIZATION_NAME]: this.ctx.organization.name,
|
|
281
288
|
[SemanticInternalAttributes.BATCH_ID]: this.ctx.batch?.id,
|
|
282
|
-
[SemanticInternalAttributes.IDEMPOTENCY_KEY]: this.ctx.run.idempotencyKey
|
|
289
|
+
[SemanticInternalAttributes.IDEMPOTENCY_KEY]: this.ctx.run.idempotencyKey,
|
|
290
|
+
[SemanticInternalAttributes.MACHINE_PRESET_NAME]: this.ctx.machine?.name,
|
|
291
|
+
[SemanticInternalAttributes.MACHINE_PRESET_CPU]: this.ctx.machine?.cpu,
|
|
292
|
+
[SemanticInternalAttributes.MACHINE_PRESET_MEMORY]: this.ctx.machine?.memory,
|
|
293
|
+
[SemanticInternalAttributes.MACHINE_PRESET_CENTS_PER_MS]: this.ctx.machine?.centsPerMs
|
|
283
294
|
};
|
|
284
295
|
}
|
|
285
296
|
return {};
|
|
@@ -361,7 +372,7 @@ function getEnvVar(name) {
|
|
|
361
372
|
__name(getEnvVar, "getEnvVar");
|
|
362
373
|
|
|
363
374
|
// package.json
|
|
364
|
-
var version = "3.0.0-beta.
|
|
375
|
+
var version = "3.0.0-beta.39";
|
|
365
376
|
|
|
366
377
|
// src/v3/otel/tracingSDK.ts
|
|
367
378
|
var _a;
|
|
@@ -404,7 +415,7 @@ var _TracingSDK = class _TracingSDK {
|
|
|
404
415
|
[SemanticInternalAttributes.CLI_VERSION]: version
|
|
405
416
|
})).merge(config.resource ?? new resources.Resource({})).merge(new resources.Resource(envResourceAttributes));
|
|
406
417
|
const traceProvider = new sdkTraceNode.NodeTracerProvider({
|
|
407
|
-
forceFlushTimeoutMillis: config.forceFlushTimeoutMillis
|
|
418
|
+
forceFlushTimeoutMillis: config.forceFlushTimeoutMillis,
|
|
408
419
|
resource: commonResources,
|
|
409
420
|
spanLimits: {
|
|
410
421
|
attributeCountLimit: OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT,
|
|
@@ -417,7 +428,7 @@ var _TracingSDK = class _TracingSDK {
|
|
|
417
428
|
});
|
|
418
429
|
const spanExporter = new exporterTraceOtlpHttp.OTLPTraceExporter({
|
|
419
430
|
url: `${config.url}/v1/traces`,
|
|
420
|
-
timeoutMillis: config.forceFlushTimeoutMillis
|
|
431
|
+
timeoutMillis: config.forceFlushTimeoutMillis
|
|
421
432
|
});
|
|
422
433
|
traceProvider.addSpanProcessor(new TaskContextSpanProcessor(getEnvVar("OTEL_BATCH_PROCESSING_ENABLED") === "1" ? new sdkTraceNode.BatchSpanProcessor(spanExporter, {
|
|
423
434
|
maxExportBatchSize: parseInt(getEnvVar("OTEL_SPAN_MAX_EXPORT_BATCH_SIZE") ?? "64"),
|
|
@@ -509,6 +520,41 @@ function recordSpanException(span, error) {
|
|
|
509
520
|
});
|
|
510
521
|
}
|
|
511
522
|
__name(recordSpanException, "recordSpanException");
|
|
523
|
+
var MachineCpu = zod.z.union([
|
|
524
|
+
zod.z.literal(0.25),
|
|
525
|
+
zod.z.literal(0.5),
|
|
526
|
+
zod.z.literal(1),
|
|
527
|
+
zod.z.literal(2),
|
|
528
|
+
zod.z.literal(4)
|
|
529
|
+
]);
|
|
530
|
+
var MachineMemory = zod.z.union([
|
|
531
|
+
zod.z.literal(0.25),
|
|
532
|
+
zod.z.literal(0.5),
|
|
533
|
+
zod.z.literal(1),
|
|
534
|
+
zod.z.literal(2),
|
|
535
|
+
zod.z.literal(4),
|
|
536
|
+
zod.z.literal(8)
|
|
537
|
+
]);
|
|
538
|
+
var MachinePresetName = zod.z.enum([
|
|
539
|
+
"micro",
|
|
540
|
+
"small-1x",
|
|
541
|
+
"small-2x",
|
|
542
|
+
"medium-1x",
|
|
543
|
+
"medium-2x",
|
|
544
|
+
"large-1x",
|
|
545
|
+
"large-2x"
|
|
546
|
+
]);
|
|
547
|
+
var MachineConfig = zod.z.object({
|
|
548
|
+
cpu: MachineCpu.optional(),
|
|
549
|
+
memory: MachineMemory.optional(),
|
|
550
|
+
preset: MachinePresetName.optional()
|
|
551
|
+
});
|
|
552
|
+
var MachinePreset = zod.z.object({
|
|
553
|
+
name: MachinePresetName,
|
|
554
|
+
cpu: zod.z.number(),
|
|
555
|
+
memory: zod.z.number(),
|
|
556
|
+
centsPerMs: zod.z.number()
|
|
557
|
+
});
|
|
512
558
|
var TaskRunBuiltInError = zod.z.object({
|
|
513
559
|
type: zod.z.literal("BUILT_IN_ERROR"),
|
|
514
560
|
name: zod.z.string(),
|
|
@@ -570,7 +616,11 @@ var TaskRun = zod.z.object({
|
|
|
570
616
|
tags: zod.z.array(zod.z.string()),
|
|
571
617
|
isTest: zod.z.boolean().default(false),
|
|
572
618
|
createdAt: zod.z.coerce.date(),
|
|
573
|
-
|
|
619
|
+
startedAt: zod.z.coerce.date().default(() => /* @__PURE__ */ new Date()),
|
|
620
|
+
idempotencyKey: zod.z.string().optional(),
|
|
621
|
+
durationMs: zod.z.number().default(0),
|
|
622
|
+
costInCents: zod.z.number().default(0),
|
|
623
|
+
baseCostInCents: zod.z.number().default(0)
|
|
574
624
|
});
|
|
575
625
|
var TaskRunExecutionTask = zod.z.object({
|
|
576
626
|
id: zod.z.string(),
|
|
@@ -621,7 +671,8 @@ var TaskRunExecution = zod.z.object({
|
|
|
621
671
|
environment: TaskRunExecutionEnvironment,
|
|
622
672
|
organization: TaskRunExecutionOrganization,
|
|
623
673
|
project: TaskRunExecutionProject,
|
|
624
|
-
batch: TaskRunExecutionBatch.optional()
|
|
674
|
+
batch: TaskRunExecutionBatch.optional(),
|
|
675
|
+
machine: MachinePreset.optional()
|
|
625
676
|
});
|
|
626
677
|
var TaskRunContext = zod.z.object({
|
|
627
678
|
task: TaskRunExecutionTask,
|
|
@@ -637,25 +688,31 @@ var TaskRunContext = zod.z.object({
|
|
|
637
688
|
environment: TaskRunExecutionEnvironment,
|
|
638
689
|
organization: TaskRunExecutionOrganization,
|
|
639
690
|
project: TaskRunExecutionProject,
|
|
640
|
-
batch: TaskRunExecutionBatch.optional()
|
|
691
|
+
batch: TaskRunExecutionBatch.optional(),
|
|
692
|
+
machine: MachinePreset.optional()
|
|
641
693
|
});
|
|
642
694
|
var TaskRunExecutionRetry = zod.z.object({
|
|
643
695
|
timestamp: zod.z.number(),
|
|
644
696
|
delay: zod.z.number(),
|
|
645
697
|
error: zod.z.unknown().optional()
|
|
646
698
|
});
|
|
699
|
+
var TaskRunExecutionUsage = zod.z.object({
|
|
700
|
+
durationMs: zod.z.number()
|
|
701
|
+
});
|
|
647
702
|
var TaskRunFailedExecutionResult = zod.z.object({
|
|
648
703
|
ok: zod.z.literal(false),
|
|
649
704
|
id: zod.z.string(),
|
|
650
705
|
error: TaskRunError,
|
|
651
706
|
retry: TaskRunExecutionRetry.optional(),
|
|
652
|
-
skippedRetrying: zod.z.boolean().optional()
|
|
707
|
+
skippedRetrying: zod.z.boolean().optional(),
|
|
708
|
+
usage: TaskRunExecutionUsage.optional()
|
|
653
709
|
});
|
|
654
710
|
var TaskRunSuccessfulExecutionResult = zod.z.object({
|
|
655
711
|
ok: zod.z.literal(true),
|
|
656
712
|
id: zod.z.string(),
|
|
657
713
|
output: zod.z.string().optional(),
|
|
658
|
-
outputType: zod.z.string()
|
|
714
|
+
outputType: zod.z.string(),
|
|
715
|
+
usage: TaskRunExecutionUsage.optional()
|
|
659
716
|
});
|
|
660
717
|
var TaskRunExecutionResult = zod.z.discriminatedUnion("ok", [
|
|
661
718
|
TaskRunSuccessfulExecutionResult,
|
|
@@ -673,26 +730,6 @@ zod.z.enum([
|
|
|
673
730
|
"DEVELOPMENT",
|
|
674
731
|
"PREVIEW"
|
|
675
732
|
]);
|
|
676
|
-
var MachineCpu = zod.z.union([
|
|
677
|
-
zod.z.literal(0.25),
|
|
678
|
-
zod.z.literal(0.5),
|
|
679
|
-
zod.z.literal(1),
|
|
680
|
-
zod.z.literal(2),
|
|
681
|
-
zod.z.literal(4)
|
|
682
|
-
]).default(0.5);
|
|
683
|
-
var MachineMemory = zod.z.union([
|
|
684
|
-
zod.z.literal(0.25),
|
|
685
|
-
zod.z.literal(0.5),
|
|
686
|
-
zod.z.literal(1),
|
|
687
|
-
zod.z.literal(2),
|
|
688
|
-
zod.z.literal(4),
|
|
689
|
-
zod.z.literal(8)
|
|
690
|
-
]).default(1);
|
|
691
|
-
var Machine = zod.z.object({
|
|
692
|
-
version: zod.z.literal("v1").default("v1"),
|
|
693
|
-
cpu: MachineCpu,
|
|
694
|
-
memory: MachineMemory
|
|
695
|
-
});
|
|
696
733
|
zod.z.object({
|
|
697
734
|
execution: TaskRunExecution,
|
|
698
735
|
traceContext: zod.z.record(zod.z.unknown()),
|
|
@@ -703,6 +740,12 @@ var ProdTaskRunExecution = TaskRunExecution.extend({
|
|
|
703
740
|
id: zod.z.string(),
|
|
704
741
|
contentHash: zod.z.string(),
|
|
705
742
|
version: zod.z.string()
|
|
743
|
+
}),
|
|
744
|
+
machine: MachinePreset.default({
|
|
745
|
+
name: "small-1x",
|
|
746
|
+
cpu: 1,
|
|
747
|
+
memory: 1,
|
|
748
|
+
centsPerMs: 0
|
|
706
749
|
})
|
|
707
750
|
});
|
|
708
751
|
zod.z.object({
|
|
@@ -807,7 +850,7 @@ zod.z.object({
|
|
|
807
850
|
packageVersion: zod.z.string(),
|
|
808
851
|
queue: QueueOptions.optional(),
|
|
809
852
|
retry: RetryOptions.optional(),
|
|
810
|
-
machine:
|
|
853
|
+
machine: MachineConfig.optional(),
|
|
811
854
|
triggerSource: zod.z.string().optional()
|
|
812
855
|
});
|
|
813
856
|
zod.z.object({
|
|
@@ -819,7 +862,7 @@ zod.z.object({
|
|
|
819
862
|
packageVersion: zod.z.string(),
|
|
820
863
|
queue: QueueOptions.optional(),
|
|
821
864
|
retry: RetryOptions.optional(),
|
|
822
|
-
machine:
|
|
865
|
+
machine: MachineConfig.optional(),
|
|
823
866
|
triggerSource: zod.z.string().optional(),
|
|
824
867
|
filePath: zod.z.string(),
|
|
825
868
|
exportName: zod.z.string()
|
|
@@ -879,7 +922,7 @@ var TaskResource = zod.z.object({
|
|
|
879
922
|
exportName: zod.z.string(),
|
|
880
923
|
queue: QueueOptions.optional(),
|
|
881
924
|
retry: RetryOptions.optional(),
|
|
882
|
-
machine:
|
|
925
|
+
machine: MachineConfig.optional(),
|
|
883
926
|
triggerSource: zod.z.string().optional()
|
|
884
927
|
});
|
|
885
928
|
var BackgroundWorkerMetadata = zod.z.object({
|
|
@@ -1042,19 +1085,30 @@ zod.z.object({
|
|
|
1042
1085
|
You can use this to remove the schedule, update it, etc */
|
|
1043
1086
|
scheduleId: zod.z.string(),
|
|
1044
1087
|
/** When the task was scheduled to run.
|
|
1045
|
-
* Note this will be slightly different from `new Date()` because it takes a few ms to run the task.
|
|
1088
|
+
* Note this will be slightly different from `new Date()` because it takes a few ms to run the task.
|
|
1089
|
+
*
|
|
1090
|
+
* This date is UTC. To output it as a string with a timezone you would do this:
|
|
1091
|
+
* ```ts
|
|
1092
|
+
* const formatted = payload.timestamp.toLocaleString("en-US", {
|
|
1093
|
+
timeZone: payload.timezone,
|
|
1094
|
+
});
|
|
1095
|
+
``` */
|
|
1046
1096
|
timestamp: zod.z.date(),
|
|
1047
1097
|
/** When the task was last run (it has been).
|
|
1048
|
-
This can be undefined if it's never been run */
|
|
1098
|
+
This can be undefined if it's never been run. This date is UTC. */
|
|
1049
1099
|
lastTimestamp: zod.z.date().optional(),
|
|
1050
1100
|
/** You can optionally provide an external id when creating the schedule.
|
|
1051
1101
|
Usually you would use a userId or some other unique identifier.
|
|
1052
1102
|
This defaults to undefined if you didn't provide one. */
|
|
1053
1103
|
externalId: zod.z.string().optional(),
|
|
1104
|
+
/** The IANA timezone the schedule is set to. The default is UTC.
|
|
1105
|
+
* You can see the full list of supported timezones here: https://cloud.trigger.dev/timezones
|
|
1106
|
+
*/
|
|
1107
|
+
timezone: zod.z.string(),
|
|
1054
1108
|
/** The next 5 dates this task is scheduled to run */
|
|
1055
1109
|
upcoming: zod.z.array(zod.z.date())
|
|
1056
1110
|
});
|
|
1057
|
-
zod.z.object({
|
|
1111
|
+
var CreateScheduleOptions = zod.z.object({
|
|
1058
1112
|
/** The id of the task you want to attach to. */
|
|
1059
1113
|
task: zod.z.string(),
|
|
1060
1114
|
/** The schedule in CRON format.
|
|
@@ -1074,15 +1128,29 @@ zod.z.object({
|
|
|
1074
1128
|
|
|
1075
1129
|
*/
|
|
1076
1130
|
cron: zod.z.string(),
|
|
1077
|
-
/**
|
|
1131
|
+
/** You can only create one schedule with this key. If you use it twice, the second call will update the schedule.
|
|
1078
1132
|
*
|
|
1079
|
-
* This is
|
|
1080
|
-
deduplicationKey: zod.z.string()
|
|
1133
|
+
* This is required to prevent you from creating duplicate schedules. */
|
|
1134
|
+
deduplicationKey: zod.z.string(),
|
|
1081
1135
|
/** Optionally, you can specify your own IDs (like a user ID) and then use it inside the run function of your task.
|
|
1082
1136
|
*
|
|
1083
1137
|
* This allows you to have per-user CRON tasks.
|
|
1084
1138
|
*/
|
|
1085
|
-
externalId: zod.z.string().optional()
|
|
1139
|
+
externalId: zod.z.string().optional(),
|
|
1140
|
+
/** Optionally, you can specify a timezone in the IANA format. If unset it will use UTC.
|
|
1141
|
+
* If specified then the CRON will be evaluated in that timezone and will respect daylight savings.
|
|
1142
|
+
*
|
|
1143
|
+
* 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.
|
|
1144
|
+
*
|
|
1145
|
+
* You can see the full list of supported timezones here: https://cloud.trigger.dev/timezones
|
|
1146
|
+
*
|
|
1147
|
+
* @example "America/New_York", "Europe/London", "Asia/Tokyo", "Africa/Cairo"
|
|
1148
|
+
*
|
|
1149
|
+
*/
|
|
1150
|
+
timezone: zod.z.string().optional()
|
|
1151
|
+
});
|
|
1152
|
+
CreateScheduleOptions.omit({
|
|
1153
|
+
deduplicationKey: true
|
|
1086
1154
|
});
|
|
1087
1155
|
var ScheduleGenerator = zod.z.object({
|
|
1088
1156
|
type: zod.z.literal("CRON"),
|
|
@@ -1096,6 +1164,7 @@ var ScheduleObject = zod.z.object({
|
|
|
1096
1164
|
deduplicationKey: zod.z.string().nullish(),
|
|
1097
1165
|
externalId: zod.z.string().nullish(),
|
|
1098
1166
|
generator: ScheduleGenerator,
|
|
1167
|
+
timezone: zod.z.string(),
|
|
1099
1168
|
nextRun: zod.z.coerce.date().nullish(),
|
|
1100
1169
|
environments: zod.z.array(zod.z.object({
|
|
1101
1170
|
id: zod.z.string(),
|
|
@@ -1118,6 +1187,9 @@ zod.z.object({
|
|
|
1118
1187
|
page: zod.z.number().optional(),
|
|
1119
1188
|
perPage: zod.z.number().optional()
|
|
1120
1189
|
});
|
|
1190
|
+
zod.z.object({
|
|
1191
|
+
timezones: zod.z.array(zod.z.string())
|
|
1192
|
+
});
|
|
1121
1193
|
var RunStatus = zod.z.enum([
|
|
1122
1194
|
/// Task hasn't been deployed yet but is waiting to be executed
|
|
1123
1195
|
"WAITING_FOR_DEPLOY",
|
|
@@ -2472,7 +2544,7 @@ var _TaskExecutor = class _TaskExecutor {
|
|
|
2472
2544
|
this._importedConfig = options.importedConfig;
|
|
2473
2545
|
this._handleErrorFn = options.handleErrorFn;
|
|
2474
2546
|
}
|
|
2475
|
-
async execute(execution, worker, traceContext) {
|
|
2547
|
+
async execute(execution, worker, traceContext, usage2) {
|
|
2476
2548
|
const ctx = TaskRunContext.parse(execution);
|
|
2477
2549
|
const attemptMessage = `Attempt ${execution.attempt.number}`;
|
|
2478
2550
|
const originalPacket = {
|
|
@@ -2573,7 +2645,9 @@ var _TaskExecutor = class _TaskExecutor {
|
|
|
2573
2645
|
})
|
|
2574
2646
|
}
|
|
2575
2647
|
}, this._tracer.extractContext(traceContext));
|
|
2576
|
-
return
|
|
2648
|
+
return {
|
|
2649
|
+
result
|
|
2650
|
+
};
|
|
2577
2651
|
}
|
|
2578
2652
|
};
|
|
2579
2653
|
_callRun = new WeakSet();
|
|
@@ -3229,9 +3303,300 @@ var _StandardTaskCatalog = class _StandardTaskCatalog {
|
|
|
3229
3303
|
__name(_StandardTaskCatalog, "StandardTaskCatalog");
|
|
3230
3304
|
var StandardTaskCatalog = _StandardTaskCatalog;
|
|
3231
3305
|
|
|
3306
|
+
// src/v3/usage/noopUsageManager.ts
|
|
3307
|
+
var _NoopUsageManager = class _NoopUsageManager {
|
|
3308
|
+
disable() {
|
|
3309
|
+
}
|
|
3310
|
+
start() {
|
|
3311
|
+
return {
|
|
3312
|
+
sample: () => ({
|
|
3313
|
+
cpuTime: 0,
|
|
3314
|
+
wallTime: 0
|
|
3315
|
+
})
|
|
3316
|
+
};
|
|
3317
|
+
}
|
|
3318
|
+
stop(measurement) {
|
|
3319
|
+
return measurement.sample();
|
|
3320
|
+
}
|
|
3321
|
+
pauseAsync(cb) {
|
|
3322
|
+
return cb();
|
|
3323
|
+
}
|
|
3324
|
+
sample() {
|
|
3325
|
+
return void 0;
|
|
3326
|
+
}
|
|
3327
|
+
};
|
|
3328
|
+
__name(_NoopUsageManager, "NoopUsageManager");
|
|
3329
|
+
var NoopUsageManager = _NoopUsageManager;
|
|
3330
|
+
|
|
3331
|
+
// src/v3/usage/api.ts
|
|
3332
|
+
var API_NAME4 = "usage";
|
|
3333
|
+
var NOOP_USAGE_MANAGER = new NoopUsageManager();
|
|
3334
|
+
var _getUsageManager, getUsageManager_fn;
|
|
3335
|
+
var _UsageAPI = class _UsageAPI {
|
|
3336
|
+
constructor() {
|
|
3337
|
+
__privateAdd(this, _getUsageManager);
|
|
3338
|
+
}
|
|
3339
|
+
static getInstance() {
|
|
3340
|
+
if (!this._instance) {
|
|
3341
|
+
this._instance = new _UsageAPI();
|
|
3342
|
+
}
|
|
3343
|
+
return this._instance;
|
|
3344
|
+
}
|
|
3345
|
+
setGlobalUsageManager(manager) {
|
|
3346
|
+
return registerGlobal(API_NAME4, manager);
|
|
3347
|
+
}
|
|
3348
|
+
disable() {
|
|
3349
|
+
__privateMethod(this, _getUsageManager, getUsageManager_fn).call(this).disable();
|
|
3350
|
+
unregisterGlobal(API_NAME4);
|
|
3351
|
+
}
|
|
3352
|
+
start() {
|
|
3353
|
+
return __privateMethod(this, _getUsageManager, getUsageManager_fn).call(this).start();
|
|
3354
|
+
}
|
|
3355
|
+
stop(measurement) {
|
|
3356
|
+
return __privateMethod(this, _getUsageManager, getUsageManager_fn).call(this).stop(measurement);
|
|
3357
|
+
}
|
|
3358
|
+
pauseAsync(cb) {
|
|
3359
|
+
return __privateMethod(this, _getUsageManager, getUsageManager_fn).call(this).pauseAsync(cb);
|
|
3360
|
+
}
|
|
3361
|
+
sample() {
|
|
3362
|
+
return __privateMethod(this, _getUsageManager, getUsageManager_fn).call(this).sample();
|
|
3363
|
+
}
|
|
3364
|
+
};
|
|
3365
|
+
_getUsageManager = new WeakSet();
|
|
3366
|
+
getUsageManager_fn = /* @__PURE__ */ __name(function() {
|
|
3367
|
+
return getGlobal(API_NAME4) ?? NOOP_USAGE_MANAGER;
|
|
3368
|
+
}, "#getUsageManager");
|
|
3369
|
+
__name(_UsageAPI, "UsageAPI");
|
|
3370
|
+
var UsageAPI = _UsageAPI;
|
|
3371
|
+
|
|
3372
|
+
// src/v3/usage-api.ts
|
|
3373
|
+
var usage = UsageAPI.getInstance();
|
|
3374
|
+
|
|
3375
|
+
// src/v3/clock/clock.ts
|
|
3376
|
+
function calculateDurationInMs(start, end) {
|
|
3377
|
+
const [startSeconds, startNanoseconds] = start;
|
|
3378
|
+
const [endSeconds, endNanoseconds] = end;
|
|
3379
|
+
const seconds = endSeconds - startSeconds;
|
|
3380
|
+
const nanoseconds = endNanoseconds - startNanoseconds;
|
|
3381
|
+
return Math.floor(seconds * 1e3 + nanoseconds / 1e6);
|
|
3382
|
+
}
|
|
3383
|
+
__name(calculateDurationInMs, "calculateDurationInMs");
|
|
3384
|
+
|
|
3385
|
+
// src/v3/usage/devUsageManager.ts
|
|
3386
|
+
var _a2;
|
|
3387
|
+
var DevUsageMeasurement = (_a2 = class {
|
|
3388
|
+
constructor(id, startedAt = clock.preciseNow()) {
|
|
3389
|
+
this.id = id;
|
|
3390
|
+
this.startedAt = startedAt;
|
|
3391
|
+
this._pauses = /* @__PURE__ */ new Map();
|
|
3392
|
+
}
|
|
3393
|
+
stop() {
|
|
3394
|
+
this._endedAt = clock.preciseNow();
|
|
3395
|
+
}
|
|
3396
|
+
sample() {
|
|
3397
|
+
const endedAt = this._endedAt ?? clock.preciseNow();
|
|
3398
|
+
const wallTime = this.startedAt ? calculateDurationInMs(this.startedAt, endedAt) : 0;
|
|
3399
|
+
if (wallTime === 0) {
|
|
3400
|
+
return {
|
|
3401
|
+
cpuTime: 0,
|
|
3402
|
+
wallTime: 0
|
|
3403
|
+
};
|
|
3404
|
+
}
|
|
3405
|
+
const totalPauses = Array.from(this._pauses.values()).reduce((total, pause) => {
|
|
3406
|
+
return total + calculateDurationInMs(pause.start, pause.end ?? endedAt);
|
|
3407
|
+
}, 0);
|
|
3408
|
+
const cpuTime = wallTime - totalPauses;
|
|
3409
|
+
return {
|
|
3410
|
+
wallTime,
|
|
3411
|
+
cpuTime
|
|
3412
|
+
};
|
|
3413
|
+
}
|
|
3414
|
+
registerPause(pauseId, start, end) {
|
|
3415
|
+
this._pauses.set(pauseId, {
|
|
3416
|
+
start,
|
|
3417
|
+
end
|
|
3418
|
+
});
|
|
3419
|
+
}
|
|
3420
|
+
}, __name(_a2, "DevUsageMeasurement"), _a2);
|
|
3421
|
+
var _DevUsageManager = class _DevUsageManager {
|
|
3422
|
+
constructor() {
|
|
3423
|
+
__publicField(this, "_currentMeasurements", /* @__PURE__ */ new Map());
|
|
3424
|
+
__publicField(this, "_pauses", /* @__PURE__ */ new Map());
|
|
3425
|
+
}
|
|
3426
|
+
disable() {
|
|
3427
|
+
}
|
|
3428
|
+
sample() {
|
|
3429
|
+
return this._firstMeasurement?.sample();
|
|
3430
|
+
}
|
|
3431
|
+
start() {
|
|
3432
|
+
const id = generateRandomString();
|
|
3433
|
+
const measurement = new DevUsageMeasurement(id);
|
|
3434
|
+
if (!this._firstMeasurement) {
|
|
3435
|
+
this._firstMeasurement = measurement;
|
|
3436
|
+
}
|
|
3437
|
+
this._currentMeasurements.set(id, measurement);
|
|
3438
|
+
return measurement;
|
|
3439
|
+
}
|
|
3440
|
+
stop(measurement) {
|
|
3441
|
+
measurement.stop();
|
|
3442
|
+
const sample = measurement.sample();
|
|
3443
|
+
this._currentMeasurements.delete(measurement.id);
|
|
3444
|
+
return sample;
|
|
3445
|
+
}
|
|
3446
|
+
async pauseAsync(cb) {
|
|
3447
|
+
const pauseId = generateRandomString();
|
|
3448
|
+
const pauseStart = clock.preciseNow();
|
|
3449
|
+
try {
|
|
3450
|
+
this._pauses.set(pauseId, {
|
|
3451
|
+
start: pauseStart
|
|
3452
|
+
});
|
|
3453
|
+
for (const measurement of this._currentMeasurements.values()) {
|
|
3454
|
+
measurement.registerPause(pauseId, pauseStart);
|
|
3455
|
+
}
|
|
3456
|
+
return await cb();
|
|
3457
|
+
} finally {
|
|
3458
|
+
const pauseEnd = clock.preciseNow();
|
|
3459
|
+
this._pauses.set(pauseId, {
|
|
3460
|
+
start: pauseStart,
|
|
3461
|
+
end: pauseEnd
|
|
3462
|
+
});
|
|
3463
|
+
for (const measurement of this._currentMeasurements.values()) {
|
|
3464
|
+
measurement.registerPause(pauseId, pauseStart, pauseEnd);
|
|
3465
|
+
}
|
|
3466
|
+
}
|
|
3467
|
+
}
|
|
3468
|
+
};
|
|
3469
|
+
__name(_DevUsageManager, "DevUsageManager");
|
|
3470
|
+
var DevUsageManager = _DevUsageManager;
|
|
3471
|
+
function generateRandomString() {
|
|
3472
|
+
let result = "";
|
|
3473
|
+
const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
|
3474
|
+
const charactersLength = characters.length;
|
|
3475
|
+
for (var i = 0; i < 16; i++) {
|
|
3476
|
+
result += characters.charAt(Math.floor(Math.random() * charactersLength));
|
|
3477
|
+
}
|
|
3478
|
+
return result;
|
|
3479
|
+
}
|
|
3480
|
+
__name(generateRandomString, "generateRandomString");
|
|
3481
|
+
|
|
3482
|
+
// src/v3/usage/usageClient.ts
|
|
3483
|
+
var _UsageClient = class _UsageClient {
|
|
3484
|
+
constructor(url, jwt) {
|
|
3485
|
+
this.url = url;
|
|
3486
|
+
this.jwt = jwt;
|
|
3487
|
+
}
|
|
3488
|
+
async sendUsageEvent(event) {
|
|
3489
|
+
try {
|
|
3490
|
+
const response = await fetch(this.url, {
|
|
3491
|
+
method: "POST",
|
|
3492
|
+
body: JSON.stringify(event),
|
|
3493
|
+
headers: {
|
|
3494
|
+
"content-type": "application/json",
|
|
3495
|
+
"x-trigger-jwt": this.jwt,
|
|
3496
|
+
accept: "application/json",
|
|
3497
|
+
authorization: `Bearer ${apiClientManager.accessToken}`
|
|
3498
|
+
}
|
|
3499
|
+
});
|
|
3500
|
+
if (response.ok) {
|
|
3501
|
+
const renewedJwt = response.headers.get("x-trigger-jwt");
|
|
3502
|
+
if (renewedJwt) {
|
|
3503
|
+
this.jwt = renewedJwt;
|
|
3504
|
+
}
|
|
3505
|
+
}
|
|
3506
|
+
} catch (error) {
|
|
3507
|
+
console.error(`Failed to send usage event: ${error}`);
|
|
3508
|
+
}
|
|
3509
|
+
}
|
|
3510
|
+
};
|
|
3511
|
+
__name(_UsageClient, "UsageClient");
|
|
3512
|
+
var UsageClient = _UsageClient;
|
|
3513
|
+
|
|
3514
|
+
// src/v3/usage/prodUsageManager.ts
|
|
3515
|
+
var _startReportingHeartbeat, startReportingHeartbeat_fn, _reportUsage, reportUsage_fn;
|
|
3516
|
+
var _ProdUsageManager = class _ProdUsageManager {
|
|
3517
|
+
constructor(delegageUsageManager, options) {
|
|
3518
|
+
__privateAdd(this, _startReportingHeartbeat);
|
|
3519
|
+
__privateAdd(this, _reportUsage);
|
|
3520
|
+
this.delegageUsageManager = delegageUsageManager;
|
|
3521
|
+
this.options = options;
|
|
3522
|
+
if (this.options.url && this.options.jwt) {
|
|
3523
|
+
this._usageClient = new UsageClient(this.options.url, this.options.jwt);
|
|
3524
|
+
}
|
|
3525
|
+
}
|
|
3526
|
+
get isReportingEnabled() {
|
|
3527
|
+
return typeof this._usageClient !== "undefined";
|
|
3528
|
+
}
|
|
3529
|
+
disable() {
|
|
3530
|
+
this.delegageUsageManager.disable();
|
|
3531
|
+
this._abortController?.abort();
|
|
3532
|
+
}
|
|
3533
|
+
sample() {
|
|
3534
|
+
return this._measurement?.sample();
|
|
3535
|
+
}
|
|
3536
|
+
start() {
|
|
3537
|
+
if (!this.isReportingEnabled || !this.options.heartbeatIntervalMs) {
|
|
3538
|
+
return this.delegageUsageManager.start();
|
|
3539
|
+
}
|
|
3540
|
+
if (!this._measurement) {
|
|
3541
|
+
this._measurement = this.delegageUsageManager.start();
|
|
3542
|
+
__privateMethod(this, _startReportingHeartbeat, startReportingHeartbeat_fn).call(this).catch(console.error);
|
|
3543
|
+
return this._measurement;
|
|
3544
|
+
}
|
|
3545
|
+
return this.delegageUsageManager.start();
|
|
3546
|
+
}
|
|
3547
|
+
stop(measurement) {
|
|
3548
|
+
return this.delegageUsageManager.stop(measurement);
|
|
3549
|
+
}
|
|
3550
|
+
async pauseAsync(cb) {
|
|
3551
|
+
return this.delegageUsageManager.pauseAsync(cb);
|
|
3552
|
+
}
|
|
3553
|
+
async flush() {
|
|
3554
|
+
return await __privateMethod(this, _reportUsage, reportUsage_fn).call(this);
|
|
3555
|
+
}
|
|
3556
|
+
};
|
|
3557
|
+
_startReportingHeartbeat = new WeakSet();
|
|
3558
|
+
startReportingHeartbeat_fn = /* @__PURE__ */ __name(async function() {
|
|
3559
|
+
if (!this._measurement || !this.isReportingEnabled || !this.options.heartbeatIntervalMs) {
|
|
3560
|
+
return;
|
|
3561
|
+
}
|
|
3562
|
+
this._abortController = new AbortController();
|
|
3563
|
+
for await (const _ of promises.setInterval(this.options.heartbeatIntervalMs)) {
|
|
3564
|
+
if (this._abortController.signal.aborted) {
|
|
3565
|
+
break;
|
|
3566
|
+
}
|
|
3567
|
+
await __privateMethod(this, _reportUsage, reportUsage_fn).call(this);
|
|
3568
|
+
}
|
|
3569
|
+
}, "#startReportingHeartbeat");
|
|
3570
|
+
_reportUsage = new WeakSet();
|
|
3571
|
+
reportUsage_fn = /* @__PURE__ */ __name(async function() {
|
|
3572
|
+
if (!this._measurement) {
|
|
3573
|
+
return;
|
|
3574
|
+
}
|
|
3575
|
+
if (!this.isReportingEnabled) {
|
|
3576
|
+
return;
|
|
3577
|
+
}
|
|
3578
|
+
const client = this._usageClient;
|
|
3579
|
+
if (!client) {
|
|
3580
|
+
return;
|
|
3581
|
+
}
|
|
3582
|
+
const sample = this._measurement.sample();
|
|
3583
|
+
const cpuTimeSinceLastSample = this._lastSample ? sample.cpuTime - this._lastSample.cpuTime : sample.cpuTime;
|
|
3584
|
+
this._lastSample = sample;
|
|
3585
|
+
if (cpuTimeSinceLastSample <= 0) {
|
|
3586
|
+
return;
|
|
3587
|
+
}
|
|
3588
|
+
await client.sendUsageEvent({
|
|
3589
|
+
durationMs: cpuTimeSinceLastSample
|
|
3590
|
+
});
|
|
3591
|
+
}, "#reportUsage");
|
|
3592
|
+
__name(_ProdUsageManager, "ProdUsageManager");
|
|
3593
|
+
var ProdUsageManager = _ProdUsageManager;
|
|
3594
|
+
|
|
3232
3595
|
exports.ConsoleInterceptor = ConsoleInterceptor;
|
|
3596
|
+
exports.DevUsageManager = DevUsageManager;
|
|
3233
3597
|
exports.DurableClock = PreciseWallClock;
|
|
3234
3598
|
exports.OtelTaskLogger = OtelTaskLogger;
|
|
3599
|
+
exports.ProdUsageManager = ProdUsageManager;
|
|
3235
3600
|
exports.StandardTaskCatalog = StandardTaskCatalog;
|
|
3236
3601
|
exports.TaskContextLogProcessor = TaskContextLogProcessor;
|
|
3237
3602
|
exports.TaskContextSpanProcessor = TaskContextSpanProcessor;
|
|
@@ -3240,5 +3605,6 @@ exports.TracingSDK = TracingSDK;
|
|
|
3240
3605
|
exports.getEnvVar = getEnvVar;
|
|
3241
3606
|
exports.logLevels = logLevels;
|
|
3242
3607
|
exports.recordSpanException = recordSpanException;
|
|
3608
|
+
exports.usage = usage;
|
|
3243
3609
|
//# sourceMappingURL=out.js.map
|
|
3244
3610
|
//# sourceMappingURL=index.js.map
|