integreat 1.4.0 → 1.4.2
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/README.md +15 -6
- package/dist/jobs/Job.js +4 -3
- package/dist/jobs/Job.js.map +1 -1
- package/dist/jobs/Step.d.ts +11 -3
- package/dist/jobs/Step.js +70 -87
- package/dist/jobs/Step.js.map +1 -1
- package/dist/service/utils/incoming.js +1 -1
- package/dist/service/utils/incoming.js.map +1 -1
- package/dist/utils/action.d.ts +17 -1
- package/dist/utils/action.js +11 -2
- package/dist/utils/action.js.map +1 -1
- package/dist/utils/deepClone.d.ts +2 -0
- package/dist/utils/deepClone.js +3 -0
- package/dist/utils/deepClone.js.map +1 -0
- package/dist/utils/response.d.ts +1 -1
- package/dist/utils/response.js +3 -1
- package/dist/utils/response.js.map +1 -1
- package/package.json +8 -8
package/README.md
CHANGED
|
@@ -248,9 +248,10 @@ incoming actions, provide an array of `<auth id | true>`, and they will be run
|
|
|
248
248
|
from first to last until one of them returns an ident or an error other than
|
|
249
249
|
`noaccess`.
|
|
250
250
|
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
251
|
+
> [!NOTE]
|
|
252
|
+
> When connecting to a service for listening, the `outgoing` auth is
|
|
253
|
+
> used. `incoming` is only used for validating the actions being dispatched "back"
|
|
254
|
+
> from the service.
|
|
254
255
|
|
|
255
256
|
In `options`, you may provide options for transporters and adapters. It is
|
|
256
257
|
merged with the `options` object on the endpoint. See
|
|
@@ -280,7 +281,8 @@ one, creating, updating, and the same all over for users. Instead of urls and
|
|
|
280
281
|
http verbs, as for REST, these endpoints will address different databases and
|
|
281
282
|
different database operations (through the transporter).
|
|
282
283
|
|
|
283
|
-
>
|
|
284
|
+
> [!NOTE]
|
|
285
|
+
> This is not to say that Integreat requires you to set up endpoints
|
|
284
286
|
> exactly as described in these examples, it might be that you would like to set
|
|
285
287
|
> up an endpoint that handles many of these cases. The intention here is just to
|
|
286
288
|
> give you an understanding of what an endpoint is in Integreat.
|
|
@@ -403,10 +405,12 @@ An endpoint may specify none or more of the following match properties:
|
|
|
403
405
|
rely on JavaScript definition of 'truthy' here, so any value that is not
|
|
404
406
|
`false`, `null`, `undefined`, `0`, `NaN`, or `''` will be considered truthy.
|
|
405
407
|
|
|
408
|
+
> [!NOTE]
|
|
406
409
|
> There used to be a `filters` property on the endpoint match object. It is
|
|
407
410
|
> still supported, but it's deprecated and will be removed in v1.1. Please use
|
|
408
411
|
> `conditions` instead.
|
|
409
412
|
|
|
413
|
+
> [!NOTE]
|
|
410
414
|
> Editor's note: Describe what incoming actions are, and give more details on
|
|
411
415
|
> filters.
|
|
412
416
|
|
|
@@ -1208,7 +1212,8 @@ page at a time, the following properties may be supported:
|
|
|
1208
1212
|
that this id may hold internal logic from the transporter, but you should
|
|
1209
1213
|
never rely on this logic and simply use it as an id.
|
|
1210
1214
|
|
|
1211
|
-
>
|
|
1215
|
+
> [!IMPORTANT]
|
|
1216
|
+
> Pagination has to be supported by the service and your
|
|
1212
1217
|
> service configuration, and sometimes also the transporter. Integreat prepares
|
|
1213
1218
|
> and passes on these pagination properties, but if the service disregards them,
|
|
1214
1219
|
> there is little Integreat can do – except limiting the number of items
|
|
@@ -1337,6 +1342,7 @@ When you dispatch an action, you will get a response object back in this format:
|
|
|
1337
1342
|
`SYNC` or `RUN`. The action handlers _may_ then provide an array of all the
|
|
1338
1343
|
sub-response objects here.
|
|
1339
1344
|
|
|
1345
|
+
> [!NOTE]
|
|
1340
1346
|
> Editor's note: Is it correct that queues return the id in the data?
|
|
1341
1347
|
|
|
1342
1348
|
When the status is `queued`, the id of the queued action may found in
|
|
@@ -1763,12 +1769,14 @@ to have one set per individual item, you may set `setMember` to `true` on the
|
|
|
1763
1769
|
payload object. (This is almost the same as setting `maxPerSet` to `1`, except
|
|
1764
1770
|
it won't be wrapped in an array.)
|
|
1765
1771
|
|
|
1772
|
+
> [!NOTE]
|
|
1766
1773
|
> There are more options than these, and the documentation will be updated to
|
|
1767
1774
|
> include them later.
|
|
1768
1775
|
|
|
1769
1776
|
#### `EXPIRE`
|
|
1770
1777
|
|
|
1771
|
-
>
|
|
1778
|
+
> [!NOTE]
|
|
1779
|
+
> This action will change before we reach v1.0.
|
|
1772
1780
|
|
|
1773
1781
|
The `EXPIRE` action will `GET` expired data items from a service, and the then
|
|
1774
1782
|
`DELETE` them.
|
|
@@ -1927,6 +1935,7 @@ You may also use queues directly, by dispatching to it as a server and getting
|
|
|
1927
1935
|
incoming actions from its `listen()` method. In that case, it's just as any
|
|
1928
1936
|
other service with no need for any special handling.
|
|
1929
1937
|
|
|
1938
|
+
> [!NOTE]
|
|
1930
1939
|
> Queueing actions are actually done through an action handler, but this handler
|
|
1931
1940
|
> is not available from outside Integreat.
|
|
1932
1941
|
|
package/dist/jobs/Job.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { nanoid } from 'nanoid';
|
|
2
2
|
import Schedule from './Schedule.js';
|
|
3
|
-
import Step, { getPrevStepId, getLastJobWithResponse, prepareMutation, mutateResponse, } from './Step.js';
|
|
3
|
+
import Step, { getPrevStepId, getLastJobWithResponse, prepareMutation, mutateResponse, breakSymbol, } from './Step.js';
|
|
4
4
|
import { isObject, isOkResponse, isErrorResponse } from '../utils/is.js';
|
|
5
|
+
import { setResponseOnAction } from '../utils/action.js';
|
|
5
6
|
import { setOrigin } from '../utils/response.js';
|
|
6
7
|
const isJobStep = (job) => isObject(job) && isObject(job.action);
|
|
7
8
|
const generateSubMeta = ({ ident, project, queue, cid }, jobId) => ({
|
|
@@ -93,7 +94,7 @@ export default class Job {
|
|
|
93
94
|
let actionResponses = { action };
|
|
94
95
|
const meta = generateSubMeta(action.meta || {}, this.id);
|
|
95
96
|
for (const step of this.#steps) {
|
|
96
|
-
const [
|
|
97
|
+
const { [breakSymbol]: doBreak, ...responses } = await step.run(meta, actionResponses, dispatch);
|
|
97
98
|
actionResponses = { ...actionResponses, ...responses };
|
|
98
99
|
if (doBreak) {
|
|
99
100
|
break;
|
|
@@ -102,7 +103,7 @@ export default class Job {
|
|
|
102
103
|
const response = getResponse(this.id, this.#steps, actionResponses, this.#isFlow);
|
|
103
104
|
actionResponses = { ...actionResponses, action: { ...action, response } };
|
|
104
105
|
if (this.#postmutator) {
|
|
105
|
-
const { response: mutatedResponse } = await mutateResponse(action, `job:${this.id}`,
|
|
106
|
+
const { response: mutatedResponse } = await mutateResponse(setResponseOnAction(action, response), actionResponses, `job:${this.id}`, this.#postmutator);
|
|
106
107
|
return mutatedResponse || response;
|
|
107
108
|
}
|
|
108
109
|
else {
|
package/dist/jobs/Job.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Job.js","sourceRoot":"","sources":["../../src/jobs/Job.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,QAAQ,MAAM,eAAe,CAAA;AACpC,OAAO,IAAI,EAAE,EACX,aAAa,EACb,sBAAsB,EACtB,eAAe,EACf,cAAc,
|
|
1
|
+
{"version":3,"file":"Job.js","sourceRoot":"","sources":["../../src/jobs/Job.ts"],"names":[],"mappings":"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"}
|
package/dist/jobs/Step.d.ts
CHANGED
|
@@ -1,14 +1,22 @@
|
|
|
1
1
|
import type { TransformObject, Pipeline, DataMapper, InitialState } from 'map-transform/types.js';
|
|
2
2
|
import type { Action, Response, Meta, HandlerDispatch, MapOptions } from '../types.js';
|
|
3
3
|
import type { JobStepDef } from './types.js';
|
|
4
|
+
export declare const breakSymbol: unique symbol;
|
|
5
|
+
export interface ResponsesObject extends Record<string, Action> {
|
|
6
|
+
[breakSymbol]?: boolean;
|
|
7
|
+
}
|
|
4
8
|
export declare function getLastJobWithResponse(steps: Step[], actionResponses: Record<string, Action>): Response<unknown> | undefined;
|
|
5
|
-
export declare function mutateResponse(action: Action,
|
|
9
|
+
export declare function mutateResponse(action: Action, responses: Record<string, Action>, origin: string, postmutator?: DataMapper<InitialState>): Promise<Action>;
|
|
6
10
|
export declare const prepareMutation: (pipeline: TransformObject | Pipeline, mapOptions: MapOptions, useMagic?: boolean) => DataMapper<InitialState>;
|
|
7
11
|
export declare function getPrevStepId(index: number, steps: (JobStepDef | JobStepDef[])[]): string | undefined;
|
|
8
12
|
export default class Step {
|
|
9
13
|
#private;
|
|
10
14
|
id: string;
|
|
11
15
|
constructor(stepDef: JobStepDef | JobStepDef[], mapOptions: MapOptions, prevStepId?: string);
|
|
12
|
-
|
|
13
|
-
|
|
16
|
+
runIteration(actionResponses: Record<string, Action>, dispatch: HandlerDispatch, meta: Meta): Promise<{
|
|
17
|
+
[k: string]: Action<import("../types.js").Payload<unknown>, unknown>;
|
|
18
|
+
} | undefined>;
|
|
19
|
+
runAction(actionResponses: Record<string, Action>, dispatch: HandlerDispatch, meta: Meta): Promise<ResponsesObject>;
|
|
20
|
+
runSubSteps(actionResponses: Record<string, Action>, dispatch: HandlerDispatch, meta: Meta): Promise<{}>;
|
|
21
|
+
run(meta: Meta, actionResponses: Record<string, Action>, dispatch: HandlerDispatch): Promise<ResponsesObject>;
|
|
14
22
|
}
|
package/dist/jobs/Step.js
CHANGED
|
@@ -2,10 +2,12 @@ import mapTransform from 'map-transform';
|
|
|
2
2
|
import pLimit from 'p-limit';
|
|
3
3
|
import { ensureArray } from '../utils/array.js';
|
|
4
4
|
import { isObject, isOkResponse } from '../utils/is.js';
|
|
5
|
-
import { setDataOnActionPayload, setResponseOnAction } from '../utils/action.js';
|
|
5
|
+
import { setDataOnActionPayload, setResponseOnAction, setOriginOnAction, setErrorOnAction, setMetaOnAction, } from '../utils/action.js';
|
|
6
6
|
import { combineResponses, setOrigin } from '../utils/response.js';
|
|
7
7
|
import validateFilters from '../utils/validateFilters.js';
|
|
8
8
|
import prepareValidator from '../utils/validation.js';
|
|
9
|
+
import { populateActionAfterMutation } from '../utils/mutationHelpers.js';
|
|
10
|
+
export const breakSymbol = Symbol('break');
|
|
9
11
|
const adjustValidationResponse = ({ break: _, message, ...response }) => message
|
|
10
12
|
? isOkResponse(response)
|
|
11
13
|
? { ...response, warning: message }
|
|
@@ -46,19 +48,10 @@ export function getLastJobWithResponse(steps, actionResponses) {
|
|
|
46
48
|
}
|
|
47
49
|
return undefined;
|
|
48
50
|
}
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
? 'error'
|
|
54
|
-
: response.status || 'ok',
|
|
55
|
-
...(response.error && {
|
|
56
|
-
error: Array.isArray(response.error)
|
|
57
|
-
? response.error.join(' | ')
|
|
58
|
-
: response.error,
|
|
59
|
-
}),
|
|
60
|
-
}, String(origin))
|
|
61
|
-
: { status: 'ok' };
|
|
51
|
+
const setResponseStatus = (response = {}) => ({
|
|
52
|
+
...response,
|
|
53
|
+
status: response.status ? response.status : response.error ? 'error' : 'ok',
|
|
54
|
+
});
|
|
62
55
|
const addModify = (mutation) => isObject(mutation) ? { $modify: true, ...mutation } : mutation;
|
|
63
56
|
const putMutationInPipeline = (mutation, useMagic) => Array.isArray(mutation)
|
|
64
57
|
? ['$action', ...mutation.map(addModify)]
|
|
@@ -77,9 +70,9 @@ async function mutateAction(action, mutator, actionsWithResponses) {
|
|
|
77
70
|
return action;
|
|
78
71
|
}
|
|
79
72
|
}
|
|
80
|
-
export async function mutateResponse(action,
|
|
81
|
-
const { response: mutatedResponse } = await mutateAction(
|
|
82
|
-
return setResponseOnAction(action,
|
|
73
|
+
export async function mutateResponse(action, responses, origin, postmutator) {
|
|
74
|
+
const { response: mutatedResponse } = await mutateAction(action, postmutator, responses);
|
|
75
|
+
return setOriginOnAction(populateActionAfterMutation(action, setResponseOnAction(action, setResponseStatus(mutatedResponse))), origin);
|
|
83
76
|
}
|
|
84
77
|
function responseFromSteps(actionResponses) {
|
|
85
78
|
const errorResponses = Object.values(actionResponses)
|
|
@@ -97,23 +90,22 @@ function responseFromSteps(actionResponses) {
|
|
|
97
90
|
};
|
|
98
91
|
}
|
|
99
92
|
}
|
|
100
|
-
function generateIterateResponse(
|
|
93
|
+
function generateIterateResponse(action, responses) {
|
|
94
|
+
const actionsWithResponses = Object.values(responses);
|
|
101
95
|
const errorResponses = actionsWithResponses
|
|
102
96
|
.map(({ response }) => response)
|
|
103
|
-
.filter((response) => response && !isOkResponse(response));
|
|
97
|
+
.filter((response) => !!response && !isOkResponse(response));
|
|
104
98
|
const status = errorResponses.length === 0 ? 'ok' : 'error';
|
|
105
99
|
const error = errorResponses
|
|
106
100
|
.map((response) => response ? `[${response.status}] ${response.error}` : undefined)
|
|
107
101
|
.filter(Boolean)
|
|
108
102
|
.join(' | ');
|
|
109
103
|
const data = actionsWithResponses.flatMap(({ response }) => response?.data);
|
|
110
|
-
return {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
},
|
|
116
|
-
};
|
|
104
|
+
return setResponseOnAction(action, {
|
|
105
|
+
status,
|
|
106
|
+
data,
|
|
107
|
+
...(error && { error, responses: errorResponses }),
|
|
108
|
+
});
|
|
117
109
|
}
|
|
118
110
|
export const prepareMutation = (pipeline, mapOptions, useMagic = false) => mapTransform(putMutationInPipeline(pipeline, useMagic), mapOptions);
|
|
119
111
|
function getIterateMutator(step, mapOptions) {
|
|
@@ -125,13 +117,6 @@ function getIterateMutator(step, mapOptions) {
|
|
|
125
117
|
return undefined;
|
|
126
118
|
}
|
|
127
119
|
}
|
|
128
|
-
const prepareAction = (action, meta) => ({
|
|
129
|
-
...action,
|
|
130
|
-
meta: {
|
|
131
|
-
...meta,
|
|
132
|
-
...(action.meta?.queue ?? meta?.queue ? { queue: true } : {}),
|
|
133
|
-
},
|
|
134
|
-
});
|
|
135
120
|
export function getPrevStepId(index, steps) {
|
|
136
121
|
const prevStep = index > 0 ? steps[index - 1] : undefined;
|
|
137
122
|
return Array.isArray(prevStep)
|
|
@@ -141,6 +126,14 @@ export function getPrevStepId(index, steps) {
|
|
|
141
126
|
.join(':')
|
|
142
127
|
: prevStep?.id;
|
|
143
128
|
}
|
|
129
|
+
async function runOneAction(action, dispatch) {
|
|
130
|
+
try {
|
|
131
|
+
return setResponseOnAction(action, await dispatch(action));
|
|
132
|
+
}
|
|
133
|
+
catch (error) {
|
|
134
|
+
return setErrorOnAction(action, error);
|
|
135
|
+
}
|
|
136
|
+
}
|
|
144
137
|
export default class Step {
|
|
145
138
|
id;
|
|
146
139
|
#action;
|
|
@@ -171,71 +164,61 @@ export default class Step {
|
|
|
171
164
|
this.#iterateConcurrency = stepDef.iterateConcurrency;
|
|
172
165
|
}
|
|
173
166
|
}
|
|
174
|
-
async
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
try {
|
|
178
|
-
response = await dispatch(action);
|
|
167
|
+
async runIteration(actionResponses, dispatch, meta) {
|
|
168
|
+
if (!this.#iterateMutator || !this.#action) {
|
|
169
|
+
return undefined;
|
|
179
170
|
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
171
|
+
const action = setMetaOnAction(this.#action, meta);
|
|
172
|
+
const items = ensureArray(await this.#iterateMutator(actionResponses));
|
|
173
|
+
const actions = items.map((item) => setDataOnActionPayload(action, item));
|
|
174
|
+
const limit = pLimit(this.#iterateConcurrency ?? Infinity);
|
|
175
|
+
return Object.fromEntries((await Promise.all(actions.map((action) => limit(async () => runOneAction(await mutateAction(action, this.#premutator, actionResponses), dispatch))))).map((response, index) => [
|
|
176
|
+
`${this.id}_${index}`,
|
|
177
|
+
setOriginOnAction(response, `${this.id}_${index}`),
|
|
178
|
+
]));
|
|
179
|
+
}
|
|
180
|
+
async runAction(actionResponses, dispatch, meta) {
|
|
181
|
+
if (!this.#action) {
|
|
182
|
+
return {};
|
|
185
183
|
}
|
|
186
|
-
const
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
184
|
+
const action = setMetaOnAction(this.#action, meta);
|
|
185
|
+
const responses = await this.runIteration(actionResponses, dispatch, meta);
|
|
186
|
+
const responseAction = responses
|
|
187
|
+
? generateIterateResponse(action, responses)
|
|
188
|
+
: await runOneAction(await mutateAction(action, this.#premutator, actionResponses), dispatch);
|
|
189
|
+
return {
|
|
190
|
+
...responses,
|
|
191
|
+
[this.id]: await mutateResponse(responseAction, actionResponses, this.id, this.#postmutator),
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
async runSubSteps(actionResponses, dispatch, meta) {
|
|
195
|
+
if (!this.#subSteps) {
|
|
196
|
+
return {};
|
|
197
|
+
}
|
|
198
|
+
const arrayOfResponses = await Promise.all(this.#subSteps.map((step) => step.run(meta, actionResponses, dispatch)));
|
|
199
|
+
const doBreak = arrayOfResponses.some((response) => response[breakSymbol]);
|
|
200
|
+
const responsesObj = Object.fromEntries(arrayOfResponses.flatMap((responses) => Object.entries(responses)));
|
|
201
|
+
const thisStep = responseFromSteps(responsesObj);
|
|
202
|
+
return thisStep
|
|
203
|
+
? { ...responsesObj, [this.id]: thisStep, [breakSymbol]: doBreak }
|
|
204
|
+
: { ...responsesObj, [breakSymbol]: doBreak };
|
|
193
205
|
}
|
|
194
206
|
async run(meta, actionResponses, dispatch) {
|
|
195
207
|
const [validateResponse, doBreak] = await this.#validatePreconditions(actionResponses);
|
|
196
208
|
if (validateResponse || doBreak) {
|
|
197
|
-
return
|
|
198
|
-
{
|
|
199
|
-
|
|
200
|
-
response: setOrigin(validateResponse || {}, this.id),
|
|
201
|
-
},
|
|
209
|
+
return {
|
|
210
|
+
[this.id]: {
|
|
211
|
+
response: setOrigin(validateResponse || {}, this.id),
|
|
202
212
|
},
|
|
203
|
-
doBreak,
|
|
204
|
-
|
|
205
|
-
}
|
|
206
|
-
let arrayOfStepResponses;
|
|
207
|
-
const action = this.#action;
|
|
208
|
-
if (action) {
|
|
209
|
-
let actions;
|
|
210
|
-
if (this.#iterateMutator) {
|
|
211
|
-
const items = ensureArray(await this.#iterateMutator(actionResponses));
|
|
212
|
-
actions = items.map((item) => setDataOnActionPayload(action, item));
|
|
213
|
-
}
|
|
214
|
-
else {
|
|
215
|
-
actions = [action];
|
|
216
|
-
}
|
|
217
|
-
const limit = pLimit(this.#iterateConcurrency ?? Infinity);
|
|
218
|
-
arrayOfStepResponses = await Promise.all(actions.map((action, index) => limit(() => this.runAction(action, actions.length === 1 ? undefined : index, actionResponses, dispatch, meta))));
|
|
213
|
+
[breakSymbol]: doBreak,
|
|
214
|
+
};
|
|
219
215
|
}
|
|
220
|
-
|
|
221
|
-
|
|
216
|
+
if (this.#action) {
|
|
217
|
+
return await this.runAction(actionResponses, dispatch, meta);
|
|
222
218
|
}
|
|
223
219
|
else {
|
|
224
|
-
return
|
|
220
|
+
return await this.runSubSteps(actionResponses, dispatch, meta);
|
|
225
221
|
}
|
|
226
|
-
const stepResponses = arrayOfStepResponses.reduce((allResponses, [stepResponses]) => ({
|
|
227
|
-
...allResponses,
|
|
228
|
-
...stepResponses,
|
|
229
|
-
}), {});
|
|
230
|
-
const thisStep = this.#subSteps
|
|
231
|
-
? responseFromSteps(stepResponses)
|
|
232
|
-
: this.#iterateMutator
|
|
233
|
-
? generateIterateResponse(Object.values(stepResponses))
|
|
234
|
-
: undefined;
|
|
235
|
-
return [
|
|
236
|
-
thisStep ? { ...stepResponses, [this.id]: thisStep } : stepResponses,
|
|
237
|
-
arrayOfStepResponses.some(([_, doBreak]) => doBreak),
|
|
238
|
-
];
|
|
239
222
|
}
|
|
240
223
|
}
|
|
241
224
|
//# sourceMappingURL=Step.js.map
|
package/dist/jobs/Step.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Step.js","sourceRoot":"","sources":["../../src/jobs/Step.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,
|
|
1
|
+
{"version":3,"file":"Step.js","sourceRoot":"","sources":["../../src/jobs/Step.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,7 @@ async function runAuths(auths, authentication, action) {
|
|
|
68
68
|
}
|
|
69
69
|
export const authenticateCallback = (service, incomingAuth) => async function authenticateFromListen(authentication, action) {
|
|
70
70
|
const endpoint = action
|
|
71
|
-
? await service.endpointFromAction(action)
|
|
71
|
+
? await service.endpointFromAction(action, true)
|
|
72
72
|
: undefined;
|
|
73
73
|
const auths = endpoint?.incomingAuth || incomingAuth;
|
|
74
74
|
if (auths === undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incoming.js","sourceRoot":"","sources":["../../../src/service/utils/incoming.ts"],"names":[],"mappings":"AACA,OAAO,SAA+B,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAW5C,MAAM,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAA;AAE7D,MAAM,mCAAmC,GAAG,CAC1C,MAAc,EACd,SAAiB,EACT,EAAE,CAAC,CAAC;IACZ,GAAG,MAAM;IACT,OAAO,EAAE;QACP,GAAG,MAAM,CAAC,OAAO;QACjB,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,IAAI,SAAS;KACzD;CACF,CAAC,CAAA;AAEF,MAAM,OAAO,GAAG,CAAC,KAAc,EAAkB,EAAE,CACjD,QAAQ,CAAC,KAAK,CAAC;IACf,CAAC,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ;QAC3B,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ;QACnC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAA;AAE/E,MAAM,YAAY,GAAG,CAAC,KAAoD,EAAE,EAAE,CAC5E,KAAK,CAAC,qBAAqB,CAAC,KAAK,IAAI,CAAA;AAEvC,SAAS,gBAAgB,CAAC,QAAkB;IAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAA;IACpC,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;QAClB,OAAO;YACL,GAAG,QAAQ;YACX,MAAM,EAAE;gBACN,GAAG,QAAQ,CAAC,MAAM;gBAClB,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE;aACnD;SACF,CAAA;KACF;SAAM;QACL,OAAO,QAAQ,CAAA;KAChB;AACH,CAAC;AAED,MAAM,sBAAsB,GAAG,CAAC,EAC9B,CAAC,qBAAqB,CAAC,EAAE,CAAC,EAC1B,GAAG,kBAAkB,EACyB,EAAE,EAAE,CAAC,kBAAkB,CAAA;AAEvE,KAAK,UAAU,iBAAiB,CAAC,MAAc,EAAE,SAAiB;IAChE,IAAI,OAAO,MAAM,CAAC,QAAQ,EAAE,MAAM,KAAK,QAAQ,EAAE;QAC/C,OAAO,MAAM,CAAA;KACd;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,KAAK,CAAA;IAChC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACnB,OAAO,gBAAgB,CACrB,MAAM,EACN,sCAAsC,EACtC,gBAAgB,SAAS,EAAE,EAC3B,UAAU,CACX,CAAA;KACF;SAAM;QACL,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE;gBACJ,GAAG,MAAM,CAAC,IAAI;gBACd,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;gBACtE,IAAI,EAAE,SAAS;aAChB;SACF,CAAA;KACF;AACH,CAAC;AAED,MAAM,oBAAoB,GAAG,CAC3B,QAAkB,EAClB,WAA6B,EAC7B,SAAiB,EACjB,EAAE,CACF,KAAK,WAAW,MAAc;IAC5B,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC1B,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;IACzB,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAA;IACxB,OAAO,SAAS,CAAC,QAAQ,EAAE,WAAW,SAAS,EAAE,CAAC,CAAA;AACpD,CAAC,CAAA;AAEH,KAAK,UAAU,QAAQ,CACrB,KAAa,EACb,cAA8B,EAC9B,MAAqB;IAErB,IAAI,QAAQ,GAAyB,SAAS,CAAA;IAC9C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;QACtD,IAAI,QAAQ,CAAC,MAAM,KAAK,UAAU,IAAI,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE;YAC5D,OAAO,QAAQ,CAAA;SAChB;KACF;IACD,OAAO,QAAQ,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAA;AAC/E,CAAC;AAID,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,OAAgB,EAAE,YAAqB,EAAE,EAAE,CAC9E,KAAK,UAAU,sBAAsB,CACnC,cAA8B,EAC9B,MAAsB;IAEtB,MAAM,QAAQ,GAAG,MAAM;QACrB,CAAC,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"incoming.js","sourceRoot":"","sources":["../../../src/service/utils/incoming.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/action.d.ts
CHANGED
|
@@ -30,6 +30,22 @@ export declare function setResponseOnAction(action: Action, response?: Response)
|
|
|
30
30
|
payload: Payload<unknown>;
|
|
31
31
|
meta?: Meta | undefined;
|
|
32
32
|
};
|
|
33
|
+
export declare function setMetaOnAction(action: Action, { queue, ...meta }: Meta): {
|
|
34
|
+
meta: {
|
|
35
|
+
queue?: boolean | undefined;
|
|
36
|
+
id?: string | undefined;
|
|
37
|
+
cid?: string | undefined;
|
|
38
|
+
ident?: import("../types.js").Ident | undefined;
|
|
39
|
+
dispatchedAt?: number | undefined;
|
|
40
|
+
queuedAt?: number | undefined;
|
|
41
|
+
cache?: boolean | undefined;
|
|
42
|
+
auth?: Record<string, unknown> | null | undefined;
|
|
43
|
+
options?: import("../service/types.js").TransporterOptions | undefined;
|
|
44
|
+
};
|
|
45
|
+
type: string;
|
|
46
|
+
payload: Payload<unknown>;
|
|
47
|
+
response?: Response<unknown> | undefined;
|
|
48
|
+
};
|
|
33
49
|
export declare function setOptionsOnAction(action: Action, endpoint: Endpoint): Action;
|
|
34
|
-
export declare function setErrorOnAction(action: Action, error: unknown, origin
|
|
50
|
+
export declare function setErrorOnAction(action: Action, error: unknown, origin?: string, status?: string): Action;
|
|
35
51
|
export declare const setOriginOnAction: (action: Action, origin: string, doPrefix?: boolean) => Action<Payload<unknown>, unknown>;
|
package/dist/utils/action.js
CHANGED
|
@@ -14,6 +14,15 @@ export function setDataOnActionPayload(action, data) {
|
|
|
14
14
|
export function setResponseOnAction(action, response) {
|
|
15
15
|
return { ...action, response: response || {} };
|
|
16
16
|
}
|
|
17
|
+
export function setMetaOnAction(action, { queue, ...meta }) {
|
|
18
|
+
return {
|
|
19
|
+
...action,
|
|
20
|
+
meta: {
|
|
21
|
+
...meta,
|
|
22
|
+
...(action.meta?.queue ?? queue ? { queue: true } : {}),
|
|
23
|
+
},
|
|
24
|
+
};
|
|
25
|
+
}
|
|
17
26
|
export function setOptionsOnAction(action, endpoint) {
|
|
18
27
|
return {
|
|
19
28
|
...action,
|
|
@@ -26,8 +35,8 @@ export function setErrorOnAction(action, error, origin, status = 'error') {
|
|
|
26
35
|
...createErrorResponse(error, origin, status),
|
|
27
36
|
});
|
|
28
37
|
}
|
|
29
|
-
export const setOriginOnAction = (action, origin, doPrefix = false) => typeof action.response?.status === 'string'
|
|
30
|
-
action.response?.
|
|
38
|
+
export const setOriginOnAction = (action, origin, doPrefix = false) => typeof action.response?.status === 'string' ||
|
|
39
|
+
typeof action.response?.error === 'string'
|
|
31
40
|
? { ...action, response: setOrigin(action.response, origin, doPrefix) }
|
|
32
41
|
: action;
|
|
33
42
|
//# sourceMappingURL=action.js.map
|
package/dist/utils/action.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../src/utils/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAO9D,MAAM,UAAU,YAAY,CAC1B,IAAa,EACb,UAAmB,EAAE,EACrB,OAAa,EAAE;IAEf,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;AAChC,CAAC;AAKD,MAAM,UAAU,sBAAsB,CAAC,MAAc,EAAE,IAAc;IACnE,OAAO;QACL,GAAG,MAAM;QACT,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE;KACrC,CAAA;AACH,CAAC;AAKD,MAAM,UAAU,mBAAmB,CAAC,MAAc,EAAE,QAAmB;IACrE,OAAO,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,QAAQ,IAAI,EAAE,EAAE,CAAA;AAChD,CAAC;AAKD,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,QAAkB;IACnE,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE;KACvE,CAAA;AACH,CAAC;AAKD,MAAM,UAAU,gBAAgB,CAC9B,MAAc,EACd,KAAc,EACd,
|
|
1
|
+
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../src/utils/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAO9D,MAAM,UAAU,YAAY,CAC1B,IAAa,EACb,UAAmB,EAAE,EACrB,OAAa,EAAE;IAEf,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;AAChC,CAAC;AAKD,MAAM,UAAU,sBAAsB,CAAC,MAAc,EAAE,IAAc;IACnE,OAAO;QACL,GAAG,MAAM;QACT,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE;KACrC,CAAA;AACH,CAAC;AAKD,MAAM,UAAU,mBAAmB,CAAC,MAAc,EAAE,QAAmB;IACrE,OAAO,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,QAAQ,IAAI,EAAE,EAAE,CAAA;AAChD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAc,EAAE,EAAE,KAAK,EAAE,GAAG,IAAI,EAAQ;IACtE,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE;YACJ,GAAG,IAAI;YACP,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxD;KACF,CAAA;AACH,CAAC;AAKD,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,QAAkB;IACnE,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE;KACvE,CAAA;AACH,CAAC;AAKD,MAAM,UAAU,gBAAgB,CAC9B,MAAc,EACd,KAAc,EACd,MAAe,EACf,MAAM,GAAG,OAAO;IAEhB,OAAO,mBAAmB,CAAC,MAAM,EAAE;QACjC,GAAG,MAAM,CAAC,QAAQ;QAClB,GAAG,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC;KAC9C,CAAC,CAAA;AACJ,CAAC;AAQD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,MAAc,EACd,MAAc,EACd,QAAQ,GAAG,KAAK,EAChB,EAAE,CACF,OAAO,MAAM,CAAC,QAAQ,EAAE,MAAM,KAAK,QAAQ;IAC3C,OAAO,MAAM,CAAC,QAAQ,EAAE,KAAK,KAAK,QAAQ;IACxC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE;IACvE,CAAC,CAAC,MAAM,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deepClone.js","sourceRoot":"","sources":["../../src/utils/deepClone.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,eAAe,IAAI,EAAE,CAAA"}
|
package/dist/utils/response.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Response } from '../types.js';
|
|
2
|
-
export declare function createErrorResponse(error: unknown, origin
|
|
2
|
+
export declare function createErrorResponse(error: unknown, origin?: string, status?: string, reason?: string): Response;
|
|
3
3
|
export declare function createUnknownServiceError(type: string | string[] | undefined, serviceId: string | undefined, actionType: string): Response;
|
|
4
4
|
export declare function combineResponses(responses: Response[]): Response<unknown>;
|
|
5
5
|
export declare const setOrigin: (response: Response, origin: string, doPrefix?: boolean) => Response<unknown>;
|
package/dist/utils/response.js
CHANGED
|
@@ -65,7 +65,9 @@ const generateOrigin = (origin, responseOrigin, doPrefix) => responseOrigin
|
|
|
65
65
|
? `${origin}:${responseOrigin}`
|
|
66
66
|
: responseOrigin
|
|
67
67
|
: origin;
|
|
68
|
-
export const setOrigin = (response, origin, doPrefix = false) => response.status
|
|
68
|
+
export const setOrigin = (response, origin, doPrefix = false) => (typeof response.status !== 'string' && !response.error) ||
|
|
69
|
+
response.status === 'ok' ||
|
|
70
|
+
response.status === 'queued'
|
|
69
71
|
? response
|
|
70
72
|
: {
|
|
71
73
|
...response,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/utils/response.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,OAAO,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAG5E,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;AAK/B,MAAM,UAAU,mBAAmB,CACjC,KAAc,EACd,
|
|
1
|
+
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/utils/response.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "integreat",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.2",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -46,22 +46,22 @@
|
|
|
46
46
|
"map-any": "^1.0.0",
|
|
47
47
|
"map-transform": "^1.0.4",
|
|
48
48
|
"ms": "^2.1.3",
|
|
49
|
-
"nanoid": "^5.0.
|
|
49
|
+
"nanoid": "^5.0.2",
|
|
50
50
|
"p-limit": "^4.0.0",
|
|
51
51
|
"p-pipe": "^4.0.0",
|
|
52
52
|
"p-progress": "^0.6.0",
|
|
53
53
|
"rfdc": "^1.3.0"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
|
-
"@integreat/ts-dev-setup": "^5.0.
|
|
57
|
-
"@types/debug": "^4.1.
|
|
58
|
-
"@types/luxon": "^3.3.
|
|
59
|
-
"@types/sinon": "^10.0.
|
|
56
|
+
"@integreat/ts-dev-setup": "^5.0.2",
|
|
57
|
+
"@types/debug": "^4.1.10",
|
|
58
|
+
"@types/luxon": "^3.3.3",
|
|
59
|
+
"@types/sinon": "^10.0.20",
|
|
60
60
|
"integreat-adapter-json": "^1.0.0",
|
|
61
61
|
"integreat-adapter-uri": "^1.0.0",
|
|
62
62
|
"integreat-transformers": "^1.0.2",
|
|
63
63
|
"integreat-transporter-http": "1.2.1",
|
|
64
|
-
"nock": "^13.3.
|
|
65
|
-
"sinon": "^
|
|
64
|
+
"nock": "^13.3.6",
|
|
65
|
+
"sinon": "^17.0.0"
|
|
66
66
|
}
|
|
67
67
|
}
|