integreat 0.8.0-alpha.67 → 0.8.0-alpha.68
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/index.js +1 -1
- package/dist/service/index.js +25 -18
- package/dist/service/index.js.map +1 -1
- package/package.json +2 -2
package/dist/index.js
CHANGED
|
@@ -15,7 +15,7 @@ Object.defineProperty(exports, "transformers", { enumerable: true, get: function
|
|
|
15
15
|
var middleware_1 = require("./middleware");
|
|
16
16
|
Object.defineProperty(exports, "middleware", { enumerable: true, get: function () { return middleware_1.default; } });
|
|
17
17
|
exports.default = {
|
|
18
|
-
version: '0.8.0-alpha.
|
|
18
|
+
version: '0.8.0-alpha.67',
|
|
19
19
|
create: create_1.default,
|
|
20
20
|
mergeDefinitions: mergeDefinitions_1.default,
|
|
21
21
|
mergeResources: mergeResources_1.default,
|
package/dist/service/index.js
CHANGED
|
@@ -10,24 +10,30 @@ const deepClone_1 = require("../utils/deepClone");
|
|
|
10
10
|
const authorizeData = require("./authorize/data");
|
|
11
11
|
const action_1 = require("./authorize/action");
|
|
12
12
|
const dispatch_1 = require("../dispatch");
|
|
13
|
-
const setServiceIdAsSourceServiceOnAction = (
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
payload
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
13
|
+
const setServiceIdAsSourceServiceOnAction = (serviceId, incomingIdent) => (next) => async (action) => next({
|
|
14
|
+
...action,
|
|
15
|
+
payload: {
|
|
16
|
+
...action.payload,
|
|
17
|
+
sourceService: action.payload.sourceService || serviceId,
|
|
18
|
+
},
|
|
19
|
+
meta: {
|
|
20
|
+
ident: incomingIdent ? { id: incomingIdent } : undefined,
|
|
21
|
+
...action.meta,
|
|
22
|
+
},
|
|
23
|
+
});
|
|
24
|
+
const dispatchIncomingWithMiddleware = (dispatch, middleware) => (action) => new PProgress(async (resolve, _reject, setProgress) => {
|
|
25
|
+
if (action) {
|
|
26
|
+
const response = await middleware(async (action) => {
|
|
27
|
+
const p = dispatch(action);
|
|
28
|
+
p.onProgress(setProgress);
|
|
29
|
+
const response = await p;
|
|
30
|
+
return { ...action, response };
|
|
31
|
+
})(action);
|
|
32
|
+
resolve(response.response);
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
resolve({ status: 'noaction', error: 'No action was dispatched' });
|
|
24
36
|
}
|
|
25
|
-
: null;
|
|
26
|
-
const setServiceIdOnDispatchedAction = (dispatch, serviceId, incomingIdent) => (action) => new PProgress(async (resolve, _reject, setProgress) => {
|
|
27
|
-
const p = dispatch(setServiceIdAsSourceServiceOnAction(action, serviceId, incomingIdent));
|
|
28
|
-
p.onProgress(setProgress);
|
|
29
|
-
const response = await p;
|
|
30
|
-
resolve(response);
|
|
31
37
|
});
|
|
32
38
|
const isTransporter = (transporter) => (0, is_1.isObject)(transporter);
|
|
33
39
|
const sendToTransporter = (transporter, connection, serviceId) => async function send(action) {
|
|
@@ -128,7 +134,8 @@ exports.default = ({ transporters, auths, schemas, mapOptions = {}, middleware =
|
|
|
128
134
|
if (!(await connection.connect(authorization?.getAuthObject(transporter)))) {
|
|
129
135
|
return (0, createError_1.createErrorResponse)(`Could not listen to '${serviceId}' service. Failed to connect`);
|
|
130
136
|
}
|
|
131
|
-
|
|
137
|
+
const incomingMiddleware = (0, dispatch_1.compose)(runThroughMiddleware, setServiceIdAsSourceServiceOnAction(serviceId, incomingIdent));
|
|
138
|
+
return transporter.listen(dispatchIncomingWithMiddleware(dispatch, incomingMiddleware), connection.object);
|
|
132
139
|
},
|
|
133
140
|
async close() {
|
|
134
141
|
if (!isTransporter(transporter) || !connection) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":";;AAAA,wCAAwC;AACxC,2CAA+C;AAC/C,sDAA+E;AAG/E,6CAAqC;AAGrC,oDAAgD;AAChD,oCAAsC;AACtC,kDAA0C;AAC1C,kDAAiD;AACjD,+CAAgD;AAChD,0CAAqC;AAUrC,MAAM,mCAAmC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "integreat",
|
|
3
|
-
"version": "0.8.0-alpha.
|
|
3
|
+
"version": "0.8.0-alpha.68",
|
|
4
4
|
"description": "Node.js integration layer",
|
|
5
5
|
"author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
|
|
6
6
|
"license": "ISC",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"map-any": "^0.2.1",
|
|
50
50
|
"map-transform": "0.4.0-alpha.4",
|
|
51
51
|
"ms": "^2.1.3",
|
|
52
|
-
"nanoid": "^3.
|
|
52
|
+
"nanoid": "^3.3.1",
|
|
53
53
|
"p-limit": "^3.1.0",
|
|
54
54
|
"p-pipe": "^3.1.0",
|
|
55
55
|
"p-progress": "^0.5.1",
|