@useparagon/core 1.0.26-canary.1 → 1.0.26-canary.3
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/errors/codes.d.ts +1 -2
- package/dist/errors/codes.js +0 -1
- package/dist/errors/codes.js.map +1 -1
- package/dist/errors/step.error.d.ts +0 -8
- package/dist/errors/step.error.js +1 -8
- package/dist/errors/step.error.js.map +1 -1
- package/dist/resolvers/resolver.utils.d.ts +0 -1
- package/dist/resolvers/resolver.utils.js +8 -6
- package/dist/resolvers/resolver.utils.js.map +1 -1
- package/dist/triggers/cron/cron.interface.d.ts +2 -8
- package/dist/triggers/cron/cron.interface.js +0 -1
- package/dist/triggers/cron/cron.interface.js.map +1 -1
- package/dist/triggers/cron/cron.step.js +1 -11
- package/dist/triggers/cron/cron.step.js.map +1 -1
- package/dist/triggers/cron/cron.utils.d.ts +3 -4
- package/dist/triggers/cron/cron.utils.js +50 -95
- package/dist/triggers/cron/cron.utils.js.map +1 -1
- package/package.json +1 -1
package/dist/errors/codes.d.ts
CHANGED
package/dist/errors/codes.js
CHANGED
|
@@ -4,6 +4,5 @@ exports.ERROR_CODE = void 0;
|
|
|
4
4
|
var ERROR_CODE;
|
|
5
5
|
(function (ERROR_CODE) {
|
|
6
6
|
ERROR_CODE["DOWN_STREAM_STEP_REFERENCE_ERROR"] = "0001";
|
|
7
|
-
ERROR_CODE["INVALID_CON_EXPRESSION"] = "0002";
|
|
8
7
|
})(ERROR_CODE || (exports.ERROR_CODE = ERROR_CODE = {}));
|
|
9
8
|
//# sourceMappingURL=codes.js.map
|
package/dist/errors/codes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codes.js","sourceRoot":"","sources":["../../src/errors/codes.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"codes.js","sourceRoot":"","sources":["../../src/errors/codes.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IAEpB,uDAAyC,CAAA;AAC3C,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB"}
|
|
@@ -9,12 +9,4 @@ export declare class DownStreamStepReferenceError extends ParagraphError<DownStr
|
|
|
9
9
|
name: string;
|
|
10
10
|
constructor(meta: DownStreamStepReferenceErrorMeta);
|
|
11
11
|
}
|
|
12
|
-
export declare class InvalidCronExpression extends ParagraphError<{
|
|
13
|
-
cron: string;
|
|
14
|
-
}> {
|
|
15
|
-
name: string;
|
|
16
|
-
constructor(msg: string, meta: {
|
|
17
|
-
cron: string;
|
|
18
|
-
});
|
|
19
|
-
}
|
|
20
12
|
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.DownStreamStepReferenceError = void 0;
|
|
4
4
|
const base_error_1 = require("./base.error");
|
|
5
5
|
const codes_1 = require("./codes");
|
|
6
6
|
class DownStreamStepReferenceError extends base_error_1.ParagraphError {
|
|
@@ -10,11 +10,4 @@ class DownStreamStepReferenceError extends base_error_1.ParagraphError {
|
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
12
|
exports.DownStreamStepReferenceError = DownStreamStepReferenceError;
|
|
13
|
-
class InvalidCronExpression extends base_error_1.ParagraphError {
|
|
14
|
-
name = 'InvalidCronExpression';
|
|
15
|
-
constructor(msg, meta) {
|
|
16
|
-
super(codes_1.ERROR_CODE.INVALID_CON_EXPRESSION, msg, meta);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
exports.InvalidCronExpression = InvalidCronExpression;
|
|
20
13
|
//# sourceMappingURL=step.error.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step.error.js","sourceRoot":"","sources":["../../src/errors/step.error.ts"],"names":[],"mappings":";;;AAAA,6CAA8C;AAC9C,mCAAqC;AASrC,MAAa,4BAA6B,SAAQ,2BAAgD;IAChG,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IAE7B,YAAY,IAAsC;QAChD,KAAK,CACH,kBAAU,CAAC,gCAAgC,EAC3C,sCAAsC,EACtC,IAAI,CACL,CAAC;IACJ,CAAC;CACF;AAVD,oEAUC
|
|
1
|
+
{"version":3,"file":"step.error.js","sourceRoot":"","sources":["../../src/errors/step.error.ts"],"names":[],"mappings":";;;AAAA,6CAA8C;AAC9C,mCAAqC;AASrC,MAAa,4BAA6B,SAAQ,2BAAgD;IAChG,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IAE7B,YAAY,IAAsC;QAChD,KAAK,CACH,kBAAU,CAAC,gCAAgC,EAC3C,sCAAsC,EACtC,IAAI,CACL,CAAC;IACJ,CAAC;CACF;AAVD,oEAUC"}
|
|
@@ -8,4 +8,3 @@ export declare const parseUrlParams: (url: string, existingParams?: Record<strin
|
|
|
8
8
|
export declare const buildUrlWithParams: (url: string, params?: Record<string, string>) => string;
|
|
9
9
|
export declare const resolveToTokenizedSource: <T extends DataType>(value: unknown, dataType: T, dependencies?: StepDependencies) => TokenizedSource<T>;
|
|
10
10
|
export declare const resolveParamsToSources: <T extends DataType = DataType.ANY>(param: Record<string, unknown>, dataType?: T, resolveToTokenized?: boolean, dependencies?: StepDependencies) => KeyedSource<T>[];
|
|
11
|
-
export declare const isTokenizedString: (str: string) => boolean;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.resolveParamsToSources = exports.resolveToTokenizedSource = exports.buildUrlWithParams = exports.parseUrlParams = exports.resolveToSource = void 0;
|
|
4
4
|
const context_constants_1 = require("../execution/context.constants");
|
|
5
5
|
const context_interface_1 = require("../execution/context.interface");
|
|
6
6
|
const context_utils_1 = require("../execution/context.utils");
|
|
@@ -207,6 +207,13 @@ const resolveToSource = (value, dataType, dependencies) => {
|
|
|
207
207
|
};
|
|
208
208
|
}
|
|
209
209
|
else if (value && (Array.isArray(value) || typeof value === 'object')) {
|
|
210
|
+
if (Array.isArray(value) && dataType === resolvers_interface_1.DataType.ARRAY) {
|
|
211
|
+
return {
|
|
212
|
+
type: 'VALUE',
|
|
213
|
+
value: value,
|
|
214
|
+
dataType,
|
|
215
|
+
};
|
|
216
|
+
}
|
|
210
217
|
const stringifiedValue = JSON.stringify(value);
|
|
211
218
|
return (0, exports.resolveToSource)(stringifiedValue, dataType, dependencies);
|
|
212
219
|
}
|
|
@@ -276,9 +283,4 @@ const resolveParamsToSources = (param, dataType = resolvers_interface_1.DataType
|
|
|
276
283
|
return paramsWithSources;
|
|
277
284
|
};
|
|
278
285
|
exports.resolveParamsToSources = resolveParamsToSources;
|
|
279
|
-
const isTokenizedString = (str) => {
|
|
280
|
-
return (str.startsWith(context_constants_1.TokenizedIdentifiers.START) &&
|
|
281
|
-
str.endsWith(context_constants_1.TokenizedIdentifiers.END));
|
|
282
|
-
};
|
|
283
|
-
exports.isTokenizedString = isTokenizedString;
|
|
284
286
|
//# sourceMappingURL=resolver.utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.utils.js","sourceRoot":"","sources":["../../src/resolvers/resolver.utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"resolver.utils.js","sourceRoot":"","sources":["../../src/resolvers/resolver.utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,7 @@ export declare enum Unit {
|
|
|
6
6
|
MINUTES = "MINUTES",
|
|
7
7
|
HOURLY = "HOURLY",
|
|
8
8
|
DAILY = "DAILY",
|
|
9
|
-
WEEKLY = "WEEKLY"
|
|
10
|
-
CUSTOM = "CUSTOM"
|
|
9
|
+
WEEKLY = "WEEKLY"
|
|
11
10
|
}
|
|
12
11
|
export declare enum Weekday {
|
|
13
12
|
MONDAY = "MONDAY",
|
|
@@ -45,12 +44,7 @@ export type WeeklySchedule<T = Time> = {
|
|
|
45
44
|
weekday: Weekday;
|
|
46
45
|
time: T;
|
|
47
46
|
};
|
|
48
|
-
export type
|
|
49
|
-
unit: Unit.CUSTOM;
|
|
50
|
-
expression: string;
|
|
51
|
-
timezone: string | TokenizedSource<DataType.STRING>;
|
|
52
|
-
};
|
|
53
|
-
export type Schedule = SecondsSchedule | MinutesSchedule | HourlySchedule | DailySchedule | WeeklySchedule | CustomSchedule;
|
|
47
|
+
export type Schedule = SecondsSchedule | MinutesSchedule | HourlySchedule | DailySchedule | WeeklySchedule;
|
|
54
48
|
export type Timezone = {
|
|
55
49
|
offset: string;
|
|
56
50
|
label: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.interface.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.interface.ts"],"names":[],"mappings":";;;AAIA,IAAY,
|
|
1
|
+
{"version":3,"file":"cron.interface.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.interface.ts"],"names":[],"mappings":";;;AAIA,IAAY,IAMX;AAND,WAAY,IAAI;IACd,2BAAmB,CAAA;IACnB,2BAAmB,CAAA;IACnB,yBAAiB,CAAA;IACjB,uBAAe,CAAA;IACf,yBAAiB,CAAA;AACnB,CAAC,EANW,IAAI,oBAAJ,IAAI,QAMf;AAED,IAAY,OAQX;AARD,WAAY,OAAO;IACjB,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;IACnB,kCAAuB,CAAA;IACvB,gCAAqB,CAAA;IACrB,4BAAiB,CAAA;IACjB,gCAAqB,CAAA;IACrB,4BAAiB,CAAA;AACnB,CAAC,EARW,OAAO,uBAAP,OAAO,QAQlB"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CronStep = void 0;
|
|
4
|
-
const resolvers_1 = require("../../resolvers");
|
|
5
|
-
const resolver_utils_1 = require("../../resolvers/resolver.utils");
|
|
6
4
|
const step_interface_1 = require("../../steps/step.interface");
|
|
7
5
|
const trigger_1 = require("../trigger");
|
|
8
6
|
const cron_utils_1 = require("./cron.utils");
|
|
@@ -17,17 +15,9 @@ class CronStep extends trigger_1.TriggerStep {
|
|
|
17
15
|
}
|
|
18
16
|
serializeParameters() {
|
|
19
17
|
const cronParameters = this._parameters;
|
|
20
|
-
let timezoneSource;
|
|
21
|
-
if (cronParameters.timezone &&
|
|
22
|
-
typeof cronParameters.timezone === 'string' &&
|
|
23
|
-
(0, resolver_utils_1.isTokenizedString)(cronParameters.timezone)) {
|
|
24
|
-
const cronSources = (0, resolver_utils_1.resolveParamsToSources)(cronParameters, resolvers_1.DataType.STRING, undefined, this.dependencies);
|
|
25
|
-
timezoneSource = cronSources.find((source) => source.key === 'timezone')
|
|
26
|
-
?.source;
|
|
27
|
-
}
|
|
28
18
|
return {
|
|
29
19
|
...this.parameters,
|
|
30
|
-
schedule: (0, cron_utils_1.getSchedule)(cronParameters.cron,
|
|
20
|
+
schedule: (0, cron_utils_1.getSchedule)(cronParameters.cron, cronParameters.timezone),
|
|
31
21
|
};
|
|
32
22
|
}
|
|
33
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.step.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.step.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"cron.step.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.step.ts"],"names":[],"mappings":";;;AAAA,+DAAsD;AACtD,wCAAyC;AAMzC,6CAA2C;AAK3C,MAAa,QAAS,SAAQ,qBAAW;IAOvC,IAAI,GAAkB,yBAAQ,CAAC,IAAI,CAAC;IAQ5B,WAAW,CAA0B;IAK7C,UAAU,CAAsB;IAEhC,YAAY,MAA+B;QACzC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;QAE1B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC/C,CAAC;IAKD,mBAAmB;QACjB,MAAM,cAAc,GAA4B,IAAI,CAAC,WAAW,CAAC;QACjE,OAAO;YACL,GAAG,IAAI,CAAC,UAAU;YAClB,QAAQ,EAAE,IAAA,wBAAW,EAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;SACpE,CAAC;IACJ,CAAC;CACF;AAvCD,4BAuCC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { DataType, TokenizedSource } from '../../resolvers';
|
|
2
1
|
import { Schedule } from './cron.interface';
|
|
3
|
-
export declare const getCronOptions: (schedule: Schedule
|
|
2
|
+
export declare const getCronOptions: (schedule: Schedule) => {
|
|
4
3
|
cron: string;
|
|
5
|
-
|
|
4
|
+
timeZone?: string;
|
|
6
5
|
};
|
|
7
|
-
export declare const getSchedule: (cron: string, timezone?: string
|
|
6
|
+
export declare const getSchedule: (cron: string, timezone?: string) => Schedule;
|
|
@@ -2,9 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getSchedule = exports.getCronOptions = void 0;
|
|
4
4
|
const cron_parser_1 = require("cron-parser");
|
|
5
|
-
const errors_1 = require("../../errors");
|
|
6
5
|
const cron_interface_1 = require("./cron.interface");
|
|
7
|
-
const getCronOptions = (schedule
|
|
6
|
+
const getCronOptions = (schedule) => {
|
|
8
7
|
switch (schedule.unit) {
|
|
9
8
|
case cron_interface_1.Unit.SECONDS:
|
|
10
9
|
return { cron: `*/${schedule.seconds} * * * * *` };
|
|
@@ -21,7 +20,7 @@ const getCronOptions = (schedule, timezone = 'America/Los_Angeles') => {
|
|
|
21
20
|
const dailyHours = Math.floor(schedule.time.minutes / 60);
|
|
22
21
|
return {
|
|
23
22
|
cron: `0 ${dailyMinutes} ${dailyHours} */${schedule.days} * *`,
|
|
24
|
-
|
|
23
|
+
timeZone: 'America/Los_Angeles',
|
|
25
24
|
};
|
|
26
25
|
case cron_interface_1.Unit.WEEKLY:
|
|
27
26
|
const weeklyMinutes = schedule.time.minutes % 60;
|
|
@@ -29,106 +28,62 @@ const getCronOptions = (schedule, timezone = 'America/Los_Angeles') => {
|
|
|
29
28
|
const weeklyWeekday = Object.keys(cron_interface_1.Weekday).indexOf(schedule.weekday) + 1;
|
|
30
29
|
return {
|
|
31
30
|
cron: `0 ${weeklyMinutes} ${weeklyHours} * * ${weeklyWeekday}`,
|
|
32
|
-
|
|
33
|
-
};
|
|
34
|
-
case cron_interface_1.Unit.CUSTOM:
|
|
35
|
-
return {
|
|
36
|
-
cron: schedule.expression,
|
|
37
|
-
timezone,
|
|
31
|
+
timeZone: 'America/Los_Angeles',
|
|
38
32
|
};
|
|
39
33
|
}
|
|
40
34
|
};
|
|
41
35
|
exports.getCronOptions = getCronOptions;
|
|
42
|
-
const extractValue = (cronExpression, index, withSecond = false) => {
|
|
43
|
-
const parts = cronExpression.split(' ');
|
|
44
|
-
const hasSeconds = parts.length === 6;
|
|
45
|
-
const actualIndex = withSecond ? index : hasSeconds ? index + 1 : index;
|
|
46
|
-
return (parts[actualIndex] || '').replace('*/', '');
|
|
47
|
-
};
|
|
48
|
-
const validatePart = (cron, index, min, max, name, withSecond = false) => {
|
|
49
|
-
const value = parseInt(extractValue(cron, index, withSecond));
|
|
50
|
-
if (isNaN(value) || value < min || value > max) {
|
|
51
|
-
throw new errors_1.InvalidCronExpression(`Invalid ${name} value in cron expression "${cron}". The value must be between ${min} and ${max}.`, { cron });
|
|
52
|
-
}
|
|
53
|
-
return true;
|
|
54
|
-
};
|
|
55
|
-
const validateSeconds = (cron) => validatePart(cron, 0, 0, 59, 'seconds', true);
|
|
56
|
-
const validateMinutes = (cron) => validatePart(cron, 0, 0, 59, 'minutes');
|
|
57
|
-
const validateHours = (cron) => validatePart(cron, 1, 0, 23, 'hours');
|
|
58
|
-
const validateDays = (cron) => validatePart(cron, 2, 1, 366, 'days');
|
|
59
|
-
const WEEKDAY_FORMATTER = new Intl.DateTimeFormat('en-US', { weekday: 'long' });
|
|
60
|
-
const calculateTimeDiffs = (date1, date2) => {
|
|
61
|
-
const diffMs = date2.getTime() - date1.getTime();
|
|
62
|
-
return {
|
|
63
|
-
seconds: Math.floor(diffMs / 1000),
|
|
64
|
-
minutes: Math.floor(diffMs / (1000 * 60)),
|
|
65
|
-
hours: Math.floor(diffMs / (1000 * 60 * 60)),
|
|
66
|
-
};
|
|
67
|
-
};
|
|
68
|
-
const isCustomSchedule = (cron) => cron.includes('-') || cron.includes(',');
|
|
69
|
-
const getCustomSchedule = (cron, timezone) => ({
|
|
70
|
-
unit: cron_interface_1.Unit.CUSTOM,
|
|
71
|
-
expression: cron,
|
|
72
|
-
timezone,
|
|
73
|
-
});
|
|
74
|
-
const getTimeComponents = (date) => ({
|
|
75
|
-
minutes: date.getHours() * 60 + date.getMinutes(),
|
|
76
|
-
seconds: date.getSeconds(),
|
|
77
|
-
});
|
|
78
36
|
const getSchedule = (cron, timezone = 'America/Los_Angeles') => {
|
|
79
|
-
|
|
80
|
-
try {
|
|
81
|
-
parser = (0, cron_parser_1.parseExpression)(cron);
|
|
82
|
-
}
|
|
83
|
-
catch (err) {
|
|
84
|
-
throw new errors_1.InvalidCronExpression(`Error parsing cron "${cron}": ${err.message}`, { cron });
|
|
85
|
-
}
|
|
86
|
-
const customSchedule = getCustomSchedule(cron, timezone);
|
|
87
|
-
if (isCustomSchedule(cron))
|
|
88
|
-
return customSchedule;
|
|
37
|
+
const parser = (0, cron_parser_1.parseExpression)(cron);
|
|
89
38
|
const firstIteration = parser.next().toDate();
|
|
90
39
|
const secondIteration = parser.next().toDate();
|
|
91
|
-
const
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
: {
|
|
105
|
-
unit: cron_interface_1.Unit.MINUTES,
|
|
106
|
-
minutes: parseCronValue(0),
|
|
107
|
-
};
|
|
108
|
-
case timeDiffs.hours < 24:
|
|
109
|
-
validateMinutes(cron);
|
|
110
|
-
const hours = parseCronValue(1);
|
|
111
|
-
const offset = parseCronValue(0) ||
|
|
112
|
-
(timeDiffs.minutes % 5 === 0 ? timeDiffs.minutes % 60 : 0);
|
|
113
|
-
return offset % 5 === 0 && seconds === 0
|
|
114
|
-
? { unit: cron_interface_1.Unit.HOURLY, hours, offset }
|
|
115
|
-
: customSchedule;
|
|
116
|
-
case timeDiffs.hours >= 24:
|
|
117
|
-
validateHours(cron);
|
|
118
|
-
const days = parseInt(extractValue(cron, 2));
|
|
119
|
-
if (!isNaN(days)) {
|
|
120
|
-
validateDays(cron);
|
|
121
|
-
return minutes % 15 === 0 && seconds === 0
|
|
122
|
-
? { unit: cron_interface_1.Unit.DAILY, days, time: { minutes, timezone } }
|
|
123
|
-
: customSchedule;
|
|
124
|
-
}
|
|
125
|
-
const weekday = WEEKDAY_FORMATTER.format(firstIteration).toUpperCase();
|
|
126
|
-
return minutes % 15 === 0 && seconds === 0
|
|
127
|
-
? { unit: cron_interface_1.Unit.WEEKLY, weekday, time: { minutes, timezone } }
|
|
128
|
-
: customSchedule;
|
|
129
|
-
default:
|
|
130
|
-
return customSchedule;
|
|
40
|
+
const diffSeconds = Math.floor((secondIteration.getTime() - firstIteration.getTime()) / 1000);
|
|
41
|
+
if (diffSeconds < 60) {
|
|
42
|
+
return {
|
|
43
|
+
unit: cron_interface_1.Unit.SECONDS,
|
|
44
|
+
seconds: diffSeconds,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
const diffMinutes = Math.floor(diffSeconds / 60);
|
|
48
|
+
if (diffMinutes < 60) {
|
|
49
|
+
return {
|
|
50
|
+
unit: cron_interface_1.Unit.MINUTES,
|
|
51
|
+
minutes: diffMinutes,
|
|
52
|
+
};
|
|
131
53
|
}
|
|
54
|
+
const diffHours = Math.floor(diffMinutes / 60);
|
|
55
|
+
if (diffHours < 24) {
|
|
56
|
+
return {
|
|
57
|
+
unit: cron_interface_1.Unit.HOURLY,
|
|
58
|
+
hours: diffHours,
|
|
59
|
+
offset: (diffMinutes / 60) % 60,
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
const diffDays = Math.floor(diffHours / 24);
|
|
63
|
+
const minutes = firstIteration.getHours() * 60 + firstIteration.getMinutes();
|
|
64
|
+
if (diffDays !== 7) {
|
|
65
|
+
return {
|
|
66
|
+
unit: cron_interface_1.Unit.DAILY,
|
|
67
|
+
days: diffDays,
|
|
68
|
+
time: {
|
|
69
|
+
minutes,
|
|
70
|
+
timezone,
|
|
71
|
+
},
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
const weekday = new Intl.DateTimeFormat('en-US', {
|
|
75
|
+
weekday: 'long',
|
|
76
|
+
})
|
|
77
|
+
.format(firstIteration)
|
|
78
|
+
.toUpperCase();
|
|
79
|
+
return {
|
|
80
|
+
unit: cron_interface_1.Unit.WEEKLY,
|
|
81
|
+
weekday,
|
|
82
|
+
time: {
|
|
83
|
+
minutes,
|
|
84
|
+
timezone: timezone,
|
|
85
|
+
},
|
|
86
|
+
};
|
|
132
87
|
};
|
|
133
88
|
exports.getSchedule = getSchedule;
|
|
134
89
|
//# sourceMappingURL=cron.utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.utils.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.utils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"cron.utils.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.utils.ts"],"names":[],"mappings":"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"}
|