inngest 2.0.2 → 2.2.0
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/CHANGELOG.md +48 -0
- package/api/api.d.ts +17 -0
- package/api/api.d.ts.map +1 -0
- package/api/api.js +60 -0
- package/api/api.js.map +1 -0
- package/api/schema.d.ts +18 -0
- package/api/schema.d.ts.map +1 -0
- package/api/schema.js +14 -0
- package/api/schema.js.map +1 -0
- package/components/Inngest.d.ts +33 -1
- package/components/Inngest.d.ts.map +1 -1
- package/components/Inngest.js +9 -0
- package/components/Inngest.js.map +1 -1
- package/components/InngestCommHandler.d.ts +1 -0
- package/components/InngestCommHandler.d.ts.map +1 -1
- package/components/InngestCommHandler.js +14 -53
- package/components/InngestCommHandler.js.map +1 -1
- package/components/InngestStepTools.d.ts +6 -6
- package/components/InngestStepTools.d.ts.map +1 -1
- package/components/InngestStepTools.js +25 -8
- package/components/InngestStepTools.js.map +1 -1
- package/helpers/consts.d.ts +1 -0
- package/helpers/consts.d.ts.map +1 -1
- package/helpers/consts.js +1 -0
- package/helpers/consts.js.map +1 -1
- package/helpers/functions.d.ts +5 -0
- package/helpers/functions.d.ts.map +1 -1
- package/helpers/functions.js +57 -1
- package/helpers/functions.js.map +1 -1
- package/helpers/strings.d.ts +1 -0
- package/helpers/strings.d.ts.map +1 -1
- package/helpers/strings.js +13 -1
- package/helpers/strings.js.map +1 -1
- package/landing.d.ts +1 -1
- package/landing.d.ts.map +1 -1
- package/landing.js +1 -1
- package/landing.js.map +1 -1
- package/package.json +1 -1
- package/types.d.ts +129 -2
- package/types.d.ts.map +1 -1
- package/types.js +51 -1
- package/types.js.map +1 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
|
@@ -23,16 +23,26 @@ const createStepTools = (client, state) => {
|
|
|
23
23
|
state.tickOps = state.allFoundOps;
|
|
24
24
|
/**
|
|
25
25
|
* Create a unique hash of an operation using only a subset of the operation's
|
|
26
|
-
* properties; will never use `data` and will guarantee the order of the
|
|
27
|
-
* so we don't rely on individual tools for that.
|
|
26
|
+
* properties; will never use `data` and will guarantee the order of the
|
|
27
|
+
* object so we don't rely on individual tools for that.
|
|
28
|
+
*
|
|
29
|
+
* If the operation already contains an ID, the current ID will be used
|
|
30
|
+
* instead, so that users can provide their own IDs.
|
|
28
31
|
*/
|
|
29
32
|
const hashOp = (
|
|
30
33
|
/**
|
|
31
|
-
* The op to generate a hash from. We only use a subset of the op's
|
|
32
|
-
* when creating the hash.
|
|
34
|
+
* The op to generate a hash from. We only use a subset of the op's
|
|
35
|
+
* properties when creating the hash.
|
|
33
36
|
*/
|
|
34
37
|
op) => {
|
|
35
38
|
var _a, _b, _c, _d;
|
|
39
|
+
/**
|
|
40
|
+
* If the op already has an ID, we don't need to generate one. This allows
|
|
41
|
+
* users to specify their own IDs.
|
|
42
|
+
*/
|
|
43
|
+
if (op.id) {
|
|
44
|
+
return op;
|
|
45
|
+
}
|
|
36
46
|
const obj = {
|
|
37
47
|
parent: (_b = (_a = state.currentOp) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null,
|
|
38
48
|
op: op.op,
|
|
@@ -120,8 +130,9 @@ const createStepTools = (client, state) => {
|
|
|
120
130
|
*
|
|
121
131
|
* Returns a promise that will resolve once the event has been sent.
|
|
122
132
|
*/
|
|
123
|
-
sendEvent: createTool(() => {
|
|
133
|
+
sendEvent: createTool((_payload, opts) => {
|
|
124
134
|
return {
|
|
135
|
+
id: opts === null || opts === void 0 ? void 0 : opts.id,
|
|
125
136
|
op: types_1.StepOpCode.StepPlanned,
|
|
126
137
|
name: "sendEvent",
|
|
127
138
|
};
|
|
@@ -153,7 +164,9 @@ const createStepTools = (client, state) => {
|
|
|
153
164
|
const matchOpts = {
|
|
154
165
|
timeout: (0, strings_1.timeStr)(typeof opts === "string" ? opts : opts.timeout),
|
|
155
166
|
};
|
|
167
|
+
let id;
|
|
156
168
|
if (typeof opts !== "string") {
|
|
169
|
+
id = opts === null || opts === void 0 ? void 0 : opts.id;
|
|
157
170
|
if (opts === null || opts === void 0 ? void 0 : opts.match) {
|
|
158
171
|
matchOpts.if = `event.${opts.match} == async.${opts.match}`;
|
|
159
172
|
}
|
|
@@ -162,6 +175,7 @@ const createStepTools = (client, state) => {
|
|
|
162
175
|
}
|
|
163
176
|
}
|
|
164
177
|
return {
|
|
178
|
+
id,
|
|
165
179
|
op: types_1.StepOpCode.WaitForEvent,
|
|
166
180
|
name: event,
|
|
167
181
|
opts: matchOpts,
|
|
@@ -179,8 +193,9 @@ const createStepTools = (client, state) => {
|
|
|
179
193
|
* of the `run` tool, meaning you can return and reason about return data
|
|
180
194
|
* for next steps.
|
|
181
195
|
*/
|
|
182
|
-
run: createTool((name) => {
|
|
196
|
+
run: createTool((name, _fn, opts) => {
|
|
183
197
|
return {
|
|
198
|
+
id: opts === null || opts === void 0 ? void 0 : opts.id,
|
|
184
199
|
op: types_1.StepOpCode.StepPlanned,
|
|
185
200
|
name,
|
|
186
201
|
};
|
|
@@ -195,12 +210,13 @@ const createStepTools = (client, state) => {
|
|
|
195
210
|
*
|
|
196
211
|
* To wait until a particular date, use `sleepUntil` instead.
|
|
197
212
|
*/
|
|
198
|
-
sleep: createTool((time) => {
|
|
213
|
+
sleep: createTool((time, opts) => {
|
|
199
214
|
/**
|
|
200
215
|
* The presence of this operation in the returned stack indicates that the
|
|
201
216
|
* sleep is over and we should continue execution.
|
|
202
217
|
*/
|
|
203
218
|
return {
|
|
219
|
+
id: opts === null || opts === void 0 ? void 0 : opts.id,
|
|
204
220
|
op: types_1.StepOpCode.Sleep,
|
|
205
221
|
name: (0, strings_1.timeStr)(time),
|
|
206
222
|
};
|
|
@@ -211,7 +227,7 @@ const createStepTools = (client, state) => {
|
|
|
211
227
|
* To wait for a particular amount of time from now, always use `sleep`
|
|
212
228
|
* instead.
|
|
213
229
|
*/
|
|
214
|
-
sleepUntil: createTool((time) => {
|
|
230
|
+
sleepUntil: createTool((time, opts) => {
|
|
215
231
|
const date = typeof time === "string" ? new Date(time) : time;
|
|
216
232
|
/**
|
|
217
233
|
* The presence of this operation in the returned stack indicates that the
|
|
@@ -219,6 +235,7 @@ const createStepTools = (client, state) => {
|
|
|
219
235
|
*/
|
|
220
236
|
try {
|
|
221
237
|
return {
|
|
238
|
+
id: opts === null || opts === void 0 ? void 0 : opts.id,
|
|
222
239
|
op: types_1.StepOpCode.Sleep,
|
|
223
240
|
name: date.toISOString(),
|
|
224
241
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InngestStepTools.js","sourceRoot":"","sources":["../../src/components/InngestStepTools.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAwC;AACxC,qCAA+B;AAE/B,8CAI2B;AAC3B,gDAA6C;
|
|
1
|
+
{"version":3,"file":"InngestStepTools.js","sourceRoot":"","sources":["../../src/components/InngestStepTools.ts"],"names":[],"mappings":"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"}
|
package/helpers/consts.d.ts
CHANGED
|
@@ -20,6 +20,7 @@ export declare enum envKeys {
|
|
|
20
20
|
DevServerUrl = "INNGEST_DEVSERVER_URL",
|
|
21
21
|
Environment = "INNGEST_ENV",
|
|
22
22
|
BranchName = "BRANCH_NAME",
|
|
23
|
+
InngestApiBaseUrl = "INNGEST_API_BASE_URL",
|
|
23
24
|
/**
|
|
24
25
|
* The git branch of the commit the deployment was triggered by. Example:
|
|
25
26
|
* `improve-about-page`.
|
package/helpers/consts.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/helpers/consts.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,oBAAY,SAAS;IACnB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,QAAQ,aAAa;CACtB;AAED,oBAAY,OAAO;IACjB,UAAU,wBAAwB;IAClC,QAAQ,sBAAsB;IAC9B,WAAW,yBAAyB;IACpC,YAAY,0BAA0B;IACtC,WAAW,gBAAgB;IAC3B,UAAU,gBAAgB;
|
|
1
|
+
{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/helpers/consts.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,oBAAY,SAAS;IACnB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,QAAQ,aAAa;CACtB;AAED,oBAAY,OAAO;IACjB,UAAU,wBAAwB;IAClC,QAAQ,sBAAsB;IAC9B,WAAW,yBAAyB;IACpC,YAAY,0BAA0B;IACtC,WAAW,gBAAgB;IAC3B,UAAU,gBAAgB;IAC1B,iBAAiB,yBAAyB;IAE1C;;;;;OAKG;IACH,YAAY,0BAA0B;IAEtC;;OAEG;IACH,QAAQ,WAAW;IAEnB;;;;;OAKG;IACH,qBAAqB,oBAAoB;IAEzC;;OAEG;IACH,iBAAiB,aAAa;IAE9B;;;;OAIG;IACH,aAAa,WAAW;IAExB;;OAEG;IACH,SAAS,YAAY;IAErB;;;;OAIG;IACH,YAAY,sBAAsB;IAElC;;OAEG;IACH,QAAQ,WAAW;IAEnB;;;;OAIG;IACH,aAAa,uBAAuB;IAEpC;;;;OAIG;IACH,kBAAkB,wBAAwB;CAC3C;AAED,oBAAY,WAAW;IACrB,UAAU,aAAa;IACvB,YAAY,eAAe;IAC3B,aAAa,YAAY;CAC1B;AAED;;;;;;;;GAQG;AACH,oBAAY,UAAU;IACpB,SAAS,wBAAwB;IACjC,UAAU,kBAAkB;IAC5B,WAAW,kBAAkB;IAC7B,QAAQ,uBAAuB;IAC/B,SAAS,wBAAwB;CAClC;AAED,eAAO,MAAM,oBAAoB,2BAA2B,CAAC;AAE7D;;;;;GAKG;AACH,oBAAY,cAAc;IACxB;;;OAGG;IACH,cAAc,4BAA4B;CAC3C"}
|
package/helpers/consts.js
CHANGED
|
@@ -25,6 +25,7 @@ var envKeys;
|
|
|
25
25
|
envKeys["DevServerUrl"] = "INNGEST_DEVSERVER_URL";
|
|
26
26
|
envKeys["Environment"] = "INNGEST_ENV";
|
|
27
27
|
envKeys["BranchName"] = "BRANCH_NAME";
|
|
28
|
+
envKeys["InngestApiBaseUrl"] = "INNGEST_API_BASE_URL";
|
|
28
29
|
/**
|
|
29
30
|
* The git branch of the commit the deployment was triggered by. Example:
|
|
30
31
|
* `improve-about-page`.
|
package/helpers/consts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/helpers/consts.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;GAQG;AACH,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,0BAAa,CAAA;IACb,8BAAiB,CAAA;IACjB,sCAAyB,CAAA;IACzB,kCAAqB,CAAA;AACvB,CAAC,EALW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAKpB;AAED,IAAY,
|
|
1
|
+
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/helpers/consts.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;GAQG;AACH,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,0BAAa,CAAA;IACb,8BAAiB,CAAA;IACjB,sCAAyB,CAAA;IACzB,kCAAqB,CAAA;AACvB,CAAC,EALW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAKpB;AAED,IAAY,OAwEX;AAxED,WAAY,OAAO;IACjB,6CAAkC,CAAA;IAClC,yCAA8B,CAAA;IAC9B,+CAAoC,CAAA;IACpC,iDAAsC,CAAA;IACtC,sCAA2B,CAAA;IAC3B,qCAA0B,CAAA;IAC1B,qDAA0C,CAAA;IAE1C;;;;;OAKG;IACH,iDAAsC,CAAA;IAEtC;;OAEG;IACH,8BAAmB,CAAA;IAEnB;;;;;OAKG;IACH,oDAAyC,CAAA;IAEzC;;OAEG;IACH,yCAA8B,CAAA;IAE9B;;;;OAIG;IACH,mCAAwB,CAAA;IAExB;;OAEG;IACH,gCAAqB,CAAA;IAErB;;;;OAIG;IACH,6CAAkC,CAAA;IAElC;;OAEG;IACH,8BAAmB,CAAA;IAEnB;;;;OAIG;IACH,+CAAoC,CAAA;IAEpC;;;;OAIG;IACH,qDAA0C,CAAA;AAC5C,CAAC,EAxEW,OAAO,GAAP,eAAO,KAAP,eAAO,QAwElB;AAED,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,sCAAuB,CAAA;IACvB,0CAA2B,CAAA;IAC3B,wCAAyB,CAAA;AAC3B,CAAC,EAJW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAItB;AAED;;;;;;;;GAQG;AACH,IAAY,UAMX;AAND,WAAY,UAAU;IACpB,+CAAiC,CAAA;IACjC,0CAA4B,CAAA;IAC5B,2CAA6B,CAAA;IAC7B,6CAA+B,CAAA;IAC/B,+CAAiC,CAAA;AACnC,CAAC,EANW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAMrB;AAEY,QAAA,oBAAoB,GAAG,wBAAwB,CAAC;AAE7D;;;;;GAKG;AACH,IAAY,cAMX;AAND,WAAY,cAAc;IACxB;;;OAGG;IACH,4DAA0C,CAAA;AAC5C,CAAC,EANW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAMzB"}
|
package/helpers/functions.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { type Await } from "./types";
|
|
2
|
+
import { type FnData, type Result } from "../types";
|
|
3
|
+
import { type InngestApi } from "../api/api";
|
|
2
4
|
/**
|
|
3
5
|
* Wraps a function with a cache. When the returned function is run, it will
|
|
4
6
|
* cache the result and return it on subsequent calls.
|
|
@@ -18,4 +20,7 @@ export declare const cacheFn: <T extends (...args: unknown[]) => unknown>(fn: T)
|
|
|
18
20
|
* TODO Add a second function that decides how to merge results from prev and current results.
|
|
19
21
|
*/
|
|
20
22
|
export declare const waterfall: <TFns extends ((arg?: any) => any)[]>(fns: TFns, transform?: ((prev: any, output: any) => any) | undefined) => (...args: Parameters<TFns[number]>) => Promise<Await<TFns[number]>>;
|
|
23
|
+
type ParseErr = string;
|
|
24
|
+
export declare const parseFnData: (data: unknown, api: InngestApi) => Promise<Result<FnData, ParseErr>>;
|
|
25
|
+
export {};
|
|
21
26
|
//# sourceMappingURL=functions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../src/helpers/functions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;;GAGG;AACH,eAAO,MAAM,OAAO,uBAAwB,OAAO,EAAE,KAAK,OAAO,aAahE,CAAC;AAEF;;;;;;;;;;;;GAYG;AAEH,eAAO,MAAM,SAAS,wBAAyB,GAAG,KAAK,GAAG,oCAUrC,GAAG,UAAU,GAAG,KAAK,GAAG,qFAc5C,CAAC"}
|
|
1
|
+
{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../src/helpers/functions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,EAAgB,KAAK,MAAM,EAAE,KAAK,MAAM,EAAW,MAAM,UAAU,CAAC;AAC3E,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C;;;GAGG;AACH,eAAO,MAAM,OAAO,uBAAwB,OAAO,EAAE,KAAK,OAAO,aAahE,CAAC;AAEF;;;;;;;;;;;;GAYG;AAEH,eAAO,MAAM,SAAS,wBAAyB,GAAG,KAAK,GAAG,oCAUrC,GAAG,UAAU,GAAG,KAAK,GAAG,qFAc5C,CAAC;AAEF,KAAK,QAAQ,GAAG,MAAM,CAAC;AACvB,eAAO,MAAM,WAAW,SAChB,OAAO,OACR,UAAU,KACd,QAAQ,OAAO,MAAM,EAAE,QAAQ,CAAC,CA8DlC,CAAC"}
|
package/helpers/functions.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.waterfall = exports.cacheFn = void 0;
|
|
3
|
+
exports.parseFnData = exports.waterfall = exports.cacheFn = void 0;
|
|
4
|
+
const errors_1 = require("./errors");
|
|
5
|
+
const types_1 = require("../types");
|
|
4
6
|
/**
|
|
5
7
|
* Wraps a function with a cache. When the returned function is run, it will
|
|
6
8
|
* cache the result and return it on subsequent calls.
|
|
@@ -51,4 +53,58 @@ transform) => {
|
|
|
51
53
|
};
|
|
52
54
|
};
|
|
53
55
|
exports.waterfall = waterfall;
|
|
56
|
+
const parseFnData = async (data, api) => {
|
|
57
|
+
var _a, _b, _c;
|
|
58
|
+
try {
|
|
59
|
+
const result = types_1.fnDataSchema.parse(data);
|
|
60
|
+
if (result.use_api) {
|
|
61
|
+
if (!((_a = result.ctx) === null || _a === void 0 ? void 0 : _a.run_id)) {
|
|
62
|
+
return (0, types_1.err)((0, errors_1.prettyError)({
|
|
63
|
+
whatHappened: "failed to attempt retrieving data from API",
|
|
64
|
+
consequences: "function execution can't continue",
|
|
65
|
+
why: "run_id is missing from context",
|
|
66
|
+
stack: true,
|
|
67
|
+
}));
|
|
68
|
+
}
|
|
69
|
+
const [evtResp, stepResp] = await Promise.all([
|
|
70
|
+
api.getRunBatch(result.ctx.run_id),
|
|
71
|
+
api.getRunSteps(result.ctx.run_id),
|
|
72
|
+
]);
|
|
73
|
+
if (evtResp.ok) {
|
|
74
|
+
result.events = evtResp.value;
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
return (0, types_1.err)((0, errors_1.prettyError)({
|
|
78
|
+
whatHappened: "failed to retrieve list of events",
|
|
79
|
+
consequences: "function execution can't continue",
|
|
80
|
+
why: (_b = evtResp.error) === null || _b === void 0 ? void 0 : _b.error,
|
|
81
|
+
stack: true,
|
|
82
|
+
}));
|
|
83
|
+
}
|
|
84
|
+
if (stepResp.ok) {
|
|
85
|
+
result.steps = stepResp.value;
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
return (0, types_1.err)((0, errors_1.prettyError)({
|
|
89
|
+
whatHappened: "failed to retrieve steps for function run",
|
|
90
|
+
consequences: "function execution can't continue",
|
|
91
|
+
why: (_c = stepResp.error) === null || _c === void 0 ? void 0 : _c.error,
|
|
92
|
+
stack: true,
|
|
93
|
+
}));
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
return (0, types_1.ok)(result);
|
|
97
|
+
}
|
|
98
|
+
catch (error) {
|
|
99
|
+
// print it out for now.
|
|
100
|
+
// move to something like protobuf so we don't have to deal with this
|
|
101
|
+
console.error(error);
|
|
102
|
+
return (0, types_1.err)((0, errors_1.prettyError)({
|
|
103
|
+
whatHappened: "failed to parse data from executor",
|
|
104
|
+
consequences: "function execution can't continue",
|
|
105
|
+
stack: true,
|
|
106
|
+
}));
|
|
107
|
+
}
|
|
108
|
+
};
|
|
109
|
+
exports.parseFnData = parseFnData;
|
|
54
110
|
//# sourceMappingURL=functions.js.map
|
package/helpers/functions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functions.js","sourceRoot":"","sources":["../../src/helpers/functions.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"functions.js","sourceRoot":"","sources":["../../src/helpers/functions.ts"],"names":[],"mappings":"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"}
|
package/helpers/strings.d.ts
CHANGED
|
@@ -16,4 +16,5 @@ export declare const timeStr: (input: string | number | Date) => string;
|
|
|
16
16
|
* string, else return `undefined`.
|
|
17
17
|
*/
|
|
18
18
|
export declare const stringifyUnknown: (input: unknown) => string | undefined;
|
|
19
|
+
export declare const hashSigningKey: (signingKey: string | undefined) => string;
|
|
19
20
|
//# sourceMappingURL=strings.d.ts.map
|
package/helpers/strings.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strings.d.ts","sourceRoot":"","sources":["../../src/helpers/strings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"strings.d.ts","sourceRoot":"","sources":["../../src/helpers/strings.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE3D;;GAEG;AACH,eAAO,MAAM,OAAO,QAAS,MAAM,KAAG,MASrC,CAAC;AAqBF;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,UAIX,MAAM,GAAG,MAAM,GAAG,IAAI,KAC5B,MAqBF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,UAAW,OAAO,KAAG,MAAM,GAAG,SAQ1D,CAAC;AAEF,eAAO,MAAM,cAAc,eAAgB,MAAM,GAAG,SAAS,KAAG,MAU/D,CAAC"}
|
package/helpers/strings.js
CHANGED
|
@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.stringifyUnknown = exports.timeStr = exports.slugify = exports.stringify = void 0;
|
|
6
|
+
exports.hashSigningKey = exports.stringifyUnknown = exports.timeStr = exports.slugify = exports.stringify = void 0;
|
|
7
7
|
const ms_1 = __importDefault(require("ms"));
|
|
8
|
+
const hash_js_1 = require("hash.js");
|
|
8
9
|
var json_stringify_safe_1 = require("json-stringify-safe");
|
|
9
10
|
Object.defineProperty(exports, "stringify", { enumerable: true, get: function () { return __importDefault(json_stringify_safe_1).default; } });
|
|
10
11
|
/**
|
|
@@ -76,4 +77,15 @@ const stringifyUnknown = (input) => {
|
|
|
76
77
|
}
|
|
77
78
|
};
|
|
78
79
|
exports.stringifyUnknown = stringifyUnknown;
|
|
80
|
+
const hashSigningKey = (signingKey) => {
|
|
81
|
+
var _a;
|
|
82
|
+
if (!signingKey) {
|
|
83
|
+
return "";
|
|
84
|
+
}
|
|
85
|
+
const prefix = ((_a = signingKey.match(/^signkey-[\w]+-/)) === null || _a === void 0 ? void 0 : _a.shift()) || "";
|
|
86
|
+
const key = signingKey.replace(/^signkey-[\w]+-/, "");
|
|
87
|
+
// Decode the key from its hex representation into a bytestream
|
|
88
|
+
return `${prefix}${(0, hash_js_1.sha256)().update(key, "hex").digest("hex")}`;
|
|
89
|
+
};
|
|
90
|
+
exports.hashSigningKey = hashSigningKey;
|
|
79
91
|
//# sourceMappingURL=strings.js.map
|
package/helpers/strings.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strings.js","sourceRoot":"","sources":["../../src/helpers/strings.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;
|
|
1
|
+
{"version":3,"file":"strings.js","sourceRoot":"","sources":["../../src/helpers/strings.ts"],"names":[],"mappings":"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"}
|