integreat 1.5.4 → 1.5.6
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/dispatch.js +10 -7
- package/dist/dispatch.js.map +1 -1
- package/package.json +5 -5
package/dist/dispatch.js
CHANGED
|
@@ -7,7 +7,8 @@ import { setErrorOnAction, setResponseOnAction, setOptionsOnAction, } from './ut
|
|
|
7
7
|
import { createErrorResponse, setOrigin } from './utils/response.js';
|
|
8
8
|
const debug = debugLib('great');
|
|
9
9
|
export const compose = (...fns) => fns.reduce((f, g) => (...args) => f(g(...args)));
|
|
10
|
-
const shouldQueue = (
|
|
10
|
+
const shouldQueue = (mutatedAction, originalAction, options) => !!options.queueService &&
|
|
11
|
+
(mutatedAction.meta?.queue ?? originalAction.meta?.queue);
|
|
11
12
|
function getActionHandlerFromType(type, handlers) {
|
|
12
13
|
if (type) {
|
|
13
14
|
const handler = handlers[type];
|
|
@@ -17,7 +18,7 @@ function getActionHandlerFromType(type, handlers) {
|
|
|
17
18
|
}
|
|
18
19
|
return undefined;
|
|
19
20
|
}
|
|
20
|
-
function cleanUpActionAndSetIds({ payload: { service, ...payload }, meta: {
|
|
21
|
+
function cleanUpActionAndSetIds({ payload: { service, ...payload }, meta: { auth, ...meta } = {}, ...action }) {
|
|
21
22
|
const id = meta?.id || nanoid();
|
|
22
23
|
const cid = meta?.cid || id;
|
|
23
24
|
return {
|
|
@@ -33,6 +34,7 @@ const cleanUpResponseAndSetAccessAndOrigin = (response, ident) => ({
|
|
|
33
34
|
? { origin: response.origin || 'dispatch' }
|
|
34
35
|
: {}),
|
|
35
36
|
});
|
|
37
|
+
const removeQueueFlag = ({ meta: { queue, ...meta } = {}, ...action }) => ({ ...action, meta });
|
|
36
38
|
async function mutateIncomingAction(action, getService) {
|
|
37
39
|
const { sourceService } = action.payload;
|
|
38
40
|
if (typeof sourceService !== 'string') {
|
|
@@ -79,9 +81,9 @@ export default function createDispatch({ handlers = {}, schemas = new Map(), ser
|
|
|
79
81
|
const middlewareFn = middleware.length > 0
|
|
80
82
|
? compose(...middleware)
|
|
81
83
|
: (next) => async (action) => next(action);
|
|
82
|
-
const dispatch = (
|
|
83
|
-
debug('Dispatch: %o',
|
|
84
|
-
if (!
|
|
84
|
+
const dispatch = (originalAction) => pProgress(async (setProgress) => {
|
|
85
|
+
debug('Dispatch: %o', originalAction);
|
|
86
|
+
if (!originalAction) {
|
|
85
87
|
return {
|
|
86
88
|
status: 'noaction',
|
|
87
89
|
error: 'Dispatched no action',
|
|
@@ -89,14 +91,15 @@ export default function createDispatch({ handlers = {}, schemas = new Map(), ser
|
|
|
89
91
|
};
|
|
90
92
|
}
|
|
91
93
|
let response;
|
|
92
|
-
const { action, service: incomingService, endpoint: incomingEndpoint, } = await mutateIncomingAction(cleanUpActionAndSetIds(
|
|
94
|
+
const { action: mutatedAction, service: incomingService, endpoint: incomingEndpoint, } = await mutateIncomingAction(cleanUpActionAndSetIds(originalAction), getService);
|
|
95
|
+
const action = removeQueueFlag(mutatedAction);
|
|
93
96
|
if (action.response?.status) {
|
|
94
97
|
response = action.response;
|
|
95
98
|
}
|
|
96
99
|
else {
|
|
97
100
|
const resources = { dispatch, getService, options, setProgress };
|
|
98
101
|
try {
|
|
99
|
-
if (shouldQueue(
|
|
102
|
+
if (shouldQueue(mutatedAction, originalAction, options)) {
|
|
100
103
|
response = await handleAction(QUEUE_SYMBOL, action, resources, handlers);
|
|
101
104
|
}
|
|
102
105
|
else {
|
package/dist/dispatch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../src/dispatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,QAAQ,MAAM,OAAO,CAAA;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,eAAe,MAAM,uBAAuB,CAAA;AACnD,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAiBpE,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;AAU/B,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,GAAG,GAAiB,EAAc,EAAE,CAC1D,GAAG,CAAC,MAAM,CACR,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACP,CAAC,GAAG,IAAI,EAAE,EAAE,CACV,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAClB,CAAA;
|
|
1
|
+
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../src/dispatch.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "integreat",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.6",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"debug": "^4.3.4",
|
|
45
45
|
"deepmerge-ts": "^5.1.0",
|
|
46
46
|
"map-any": "^1.0.0",
|
|
47
|
-
"map-transform": "^1.
|
|
47
|
+
"map-transform": "^1.4.0",
|
|
48
48
|
"ms": "^2.1.3",
|
|
49
49
|
"nanoid": "^5.0.4",
|
|
50
50
|
"p-limit": "^4.0.0",
|
|
@@ -55,13 +55,13 @@
|
|
|
55
55
|
"devDependencies": {
|
|
56
56
|
"@integreat/ts-dev-setup": "^5.0.4",
|
|
57
57
|
"@types/debug": "^4.1.12",
|
|
58
|
-
"@types/luxon": "^3.
|
|
59
|
-
"@types/sinon": "^17.0.
|
|
58
|
+
"@types/luxon": "^3.4.1",
|
|
59
|
+
"@types/sinon": "^17.0.3",
|
|
60
60
|
"integreat-adapter-json": "^1.0.1",
|
|
61
61
|
"integreat-adapter-uri": "^1.0.0",
|
|
62
62
|
"integreat-transformers": "^1.0.5",
|
|
63
63
|
"integreat-transporter-http": "^1.3.0",
|
|
64
|
-
"nock": "^13.
|
|
64
|
+
"nock": "^13.5.0",
|
|
65
65
|
"sinon": "^17.0.1"
|
|
66
66
|
}
|
|
67
67
|
}
|