@furystack/rest-service 6.1.5 → 6.1.7
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/incoming-message-extensions.js.map +1 -1
- package/dist/rest-service.integration.spec.js +3 -2
- package/dist/rest-service.integration.spec.js.map +1 -1
- package/dist/utils.js +6 -2
- package/dist/utils.js.map +1 -1
- package/package.json +7 -7
- package/src/incoming-message-extensions.ts +1 -0
- package/src/rest-service.integration.spec.ts +3 -2
- package/src/utils.ts +7 -2
- package/types/incoming-message-extensions.d.ts +1 -0
- package/types/incoming-message-extensions.d.ts.map +1 -1
- package/types/utils.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incoming-message-extensions.js","sourceRoot":"","sources":["../src/incoming-message-extensions.ts"],"names":[],"mappings":";;;;;AAAA,gDAAuB;AACvB,mCAA+B;
|
|
1
|
+
{"version":3,"file":"incoming-message-extensions.js","sourceRoot":"","sources":["../src/incoming-message-extensions.ts"],"names":[],"mappings":";;;;;AAAA,gDAAuB;AACvB,mCAA+B;AAU/B,cAAI,CAAC,eAAe,CAAC,SAAS,CAAC,YAAY,GAAG,KAAK;IACjD,MAAM,KAAK,GAAG,IAAI,aAAK,EAAE,CAAA;IACzB,OAAO,MAAM,KAAK,CAAC,YAAY,CAAI,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAA;AAED,cAAI,CAAC,eAAe,CAAC,SAAS,CAAC,eAAe,GAAG,KAAK;IACpD,MAAM,KAAK,GAAG,IAAI,aAAK,EAAE,CAAA;IACzB,OAAO,MAAM,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAA"}
|
|
@@ -45,7 +45,8 @@ const prepareInjector = async (i) => {
|
|
|
45
45
|
'/logout': actions_1.LogoutAction,
|
|
46
46
|
'/testPostBody': async (options) => {
|
|
47
47
|
const body = await options.getBody();
|
|
48
|
-
|
|
48
|
+
const body2 = await options.getBody();
|
|
49
|
+
return (0, request_action_implementation_1.JsonResult)({ bodyValue: body.value, body2Value: body2.value });
|
|
49
50
|
},
|
|
50
51
|
},
|
|
51
52
|
},
|
|
@@ -109,7 +110,7 @@ describe('@furystack/rest-service inregration tests', () => {
|
|
|
109
110
|
retry: 0,
|
|
110
111
|
});
|
|
111
112
|
expect(response.statusCode).toBe(200);
|
|
112
|
-
expect(JSON.parse(response.body)).toStrictEqual({ bodyValue: 'baz' });
|
|
113
|
+
expect(JSON.parse(response.body)).toStrictEqual({ bodyValue: 'baz', body2Value: 'baz' });
|
|
113
114
|
});
|
|
114
115
|
});
|
|
115
116
|
it('Should respond with OK to OPTIONS requests', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-service.integration.spec.js","sourceRoot":"","sources":["../src/rest-service.integration.spec.ts"],"names":[],"mappings":";;;;;AAAA,8CAA4C;AAC5C,qBAAkB;AAClB,4CAAyD;AACzD,uCAAsF;AAEtF,0CAA+D;AAC/D,8DAAyD;AACzD,8CAAqB;AACrB,mFAA4D;AAC5D,uCAAiE;AAEjE,MAAM,gBAAiB,SAAQ,WAAI;CAElC;AAgBD,MAAM,IAAI,GAAG,KAAK,CAAA;AAClB,MAAM,QAAQ,GAAG,WAAW,CAAA;AAC5B,MAAM,IAAI,GAAG,UAAU,CAAA;AAEvB,MAAM,eAAe,GAAG,KAAK,EAAE,CAAW,EAAE,EAAE;IAC5C,IAAA,eAAQ,EAAC,CAAC,EAAE,IAAI,oBAAa,CAAC,EAAE,KAAK,EAAE,WAAI,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,QAAQ,CAC9E,IAAI,oBAAa,CAAC,EAAE,KAAK,EAAE,gCAAc,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CACtE,CAAA;IACD,IAAA,+BAAqB,EAAC,CAAC,EAAE;QACvB,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,gBAAgB,EAAE,UAAU,CAAC;QAClE,eAAe,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,gCAAc,EAAE,WAAW,CAAC;KACrE,CAAC,CAAA;IACF,MAAM,IAAA,wBAAc,EAAqB;QACvC,QAAQ,EAAE,CAAC;QACX,IAAI;QACJ,IAAI;QACJ,QAAQ;QACR,IAAI,EAAE;YACJ,WAAW,EAAE,IAAI;YACjB,OAAO,EAAE,CAAC,uBAAuB,CAAC;YAClC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC;SACnC;QACD,GAAG,EAAE;YACH,GAAG,EAAE;gBACH,cAAc,EAAE,wBAAc;gBAC9B,kBAAkB,EAAE,yBAAe;gBACnC,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,IAAA,0CAAU,EAAC,EAAE,WAAW,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC;gBACvF,0BAA0B,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,IAAA,0CAAU,EAAC,EAAE,aAAa,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,CAAC;aAC9G;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,qBAAW;gBACrB,SAAS,EAAE,sBAAY;gBACvB,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;oBACjC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;oBACpC,OAAO,IAAA,0CAAU,EAAC,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"rest-service.integration.spec.js","sourceRoot":"","sources":["../src/rest-service.integration.spec.ts"],"names":[],"mappings":"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"}
|
package/dist/utils.js
CHANGED
|
@@ -13,6 +13,9 @@ const inject_1 = require("@furystack/inject");
|
|
|
13
13
|
*/
|
|
14
14
|
let Utils = class Utils {
|
|
15
15
|
async readPostBodyRaw(incomingMessage) {
|
|
16
|
+
if (!incomingMessage.readable) {
|
|
17
|
+
throw Error('Incoming message is not readable');
|
|
18
|
+
}
|
|
16
19
|
let body = '';
|
|
17
20
|
await new Promise((resolve, reject) => {
|
|
18
21
|
incomingMessage.on('readable', () => {
|
|
@@ -37,8 +40,9 @@ let Utils = class Utils {
|
|
|
37
40
|
* @returns the parsed object from the post body
|
|
38
41
|
*/
|
|
39
42
|
async readPostBody(incomingMessage) {
|
|
40
|
-
const body = await this.readPostBodyRaw(incomingMessage);
|
|
41
|
-
|
|
43
|
+
const body = incomingMessage.postBody || JSON.parse(await this.readPostBodyRaw(incomingMessage));
|
|
44
|
+
incomingMessage.postBody = body;
|
|
45
|
+
return body;
|
|
42
46
|
}
|
|
43
47
|
/**
|
|
44
48
|
* Adds the specified CORS headers to the response
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;AACA,8CAA8C;AAG9C;;GAEG;AAEI,IAAM,KAAK,GAAX,MAAM,KAAK;IACT,KAAK,CAAC,eAAe,CAAC,eAAgC;QAC3D,IAAI,IAAI,GAAG,EAAE,CAAA;QACb,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;gBAClC,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,CAAA;gBACnC,IAAI,IAAI,EAAE;oBACR,IAAI,IAAI,IAAI,CAAA;iBACb;YACH,CAAC,CAAC,CAAA;YACF,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBAC7B,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,CAAA;YACF,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBAClC,MAAM,CAAC,GAAG,CAAC,CAAA;YACb,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,YAAY,CAAI,eAAgC;QAC3D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;AACA,8CAA8C;AAG9C;;GAEG;AAEI,IAAM,KAAK,GAAX,MAAM,KAAK;IACT,KAAK,CAAC,eAAe,CAAC,eAAgC;QAC3D,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE;YAC7B,MAAM,KAAK,CAAC,kCAAkC,CAAC,CAAA;SAChD;QAED,IAAI,IAAI,GAAG,EAAE,CAAA;QACb,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;gBAClC,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,CAAA;gBACnC,IAAI,IAAI,EAAE;oBACR,IAAI,IAAI,IAAI,CAAA;iBACb;YACH,CAAC,CAAC,CAAA;YACF,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBAC7B,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,CAAA;YACF,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBAClC,MAAM,CAAC,GAAG,CAAC,CAAA;YACb,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,YAAY,CAAI,eAAgC;QAC3D,MAAM,IAAI,GAAG,eAAe,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAA;QAChG,eAAe,CAAC,QAAQ,GAAG,IAAI,CAAA;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;OAMG;IACI,cAAc,CAAC,OAAoB,EAAE,eAAgC,EAAE,cAA8B;QAC1G,IACE,eAAe,CAAC,OAAO;YACvB,eAAe,CAAC,OAAO,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,CAAC,IAAI;YAC/D,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,EAC3E;YACA,cAAc,CAAC,SAAS,CAAC,6BAA6B,EAAE,eAAe,CAAC,OAAO,CAAC,MAAgB,CAAC,CAAA;YACjG,IAAI,OAAO,CAAC,WAAW,EAAE;gBACvB,cAAc,CAAC,SAAS,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAA;aACrE;YACD,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE;gBAC7C,cAAc,CAAC,SAAS,CAAC,8BAA8B,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;aACrF;YACD,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE;gBAC7C,cAAc,CAAC,SAAS,CAAC,8BAA8B,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;aACrF;SACF;IACH,CAAC;CACF,CAAA;AA7DY,KAAK;IADjB,IAAA,mBAAU,EAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;GACzB,KAAK,CA6DjB;AA7DY,sBAAK"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@furystack/rest-service",
|
|
3
|
-
"version": "6.1.
|
|
3
|
+
"version": "6.1.7",
|
|
4
4
|
"description": "Repository implementation for FuryStack",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"files": [
|
|
@@ -29,12 +29,12 @@
|
|
|
29
29
|
},
|
|
30
30
|
"homepage": "https://github.com/furystack/furystack",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@furystack/core": "^11.0.
|
|
32
|
+
"@furystack/core": "^11.0.14",
|
|
33
33
|
"@furystack/inject": "^7.0.5",
|
|
34
34
|
"@furystack/logging": "^3.0.9",
|
|
35
|
-
"@furystack/repository": "^6.0.
|
|
36
|
-
"@furystack/rest": "^4.0.
|
|
37
|
-
"@furystack/security": "^2.0.
|
|
35
|
+
"@furystack/repository": "^6.0.14",
|
|
36
|
+
"@furystack/rest": "^4.0.13",
|
|
37
|
+
"@furystack/security": "^2.0.14",
|
|
38
38
|
"@furystack/utils": "^3.0.9",
|
|
39
39
|
"ajv": "^8.11.0",
|
|
40
40
|
"ajv-formats": "^2.1.1",
|
|
@@ -42,9 +42,9 @@
|
|
|
42
42
|
"semaphore-async-await": "^1.5.1"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
-
"@furystack/rest-client-got": "^2.0.
|
|
45
|
+
"@furystack/rest-client-got": "^2.0.15",
|
|
46
46
|
"@types/jest": "^29.0.3",
|
|
47
|
-
"@types/node": "^18.7.
|
|
47
|
+
"@types/node": "^18.7.23",
|
|
48
48
|
"got": "^11.8.5"
|
|
49
49
|
},
|
|
50
50
|
"typings": "./types/index.d.ts",
|
|
@@ -61,7 +61,8 @@ const prepareInjector = async (i: Injector) => {
|
|
|
61
61
|
'/logout': LogoutAction,
|
|
62
62
|
'/testPostBody': async (options) => {
|
|
63
63
|
const body = await options.getBody()
|
|
64
|
-
|
|
64
|
+
const body2 = await options.getBody()
|
|
65
|
+
return JsonResult({ bodyValue: body.value, body2Value: body2.value })
|
|
65
66
|
},
|
|
66
67
|
},
|
|
67
68
|
},
|
|
@@ -140,7 +141,7 @@ describe('@furystack/rest-service inregration tests', () => {
|
|
|
140
141
|
retry: 0,
|
|
141
142
|
})
|
|
142
143
|
expect(response.statusCode).toBe(200)
|
|
143
|
-
expect(JSON.parse(response.body)).toStrictEqual({ bodyValue: 'baz' })
|
|
144
|
+
expect(JSON.parse(response.body)).toStrictEqual({ bodyValue: 'baz', body2Value: 'baz' })
|
|
144
145
|
})
|
|
145
146
|
})
|
|
146
147
|
|
package/src/utils.ts
CHANGED
|
@@ -8,6 +8,10 @@ import { CorsOptions } from './models/cors-options'
|
|
|
8
8
|
@Injectable({ lifetime: 'transient' })
|
|
9
9
|
export class Utils {
|
|
10
10
|
public async readPostBodyRaw(incomingMessage: IncomingMessage) {
|
|
11
|
+
if (!incomingMessage.readable) {
|
|
12
|
+
throw Error('Incoming message is not readable')
|
|
13
|
+
}
|
|
14
|
+
|
|
11
15
|
let body = ''
|
|
12
16
|
await new Promise<void>((resolve, reject) => {
|
|
13
17
|
incomingMessage.on('readable', () => {
|
|
@@ -33,8 +37,9 @@ export class Utils {
|
|
|
33
37
|
* @returns the parsed object from the post body
|
|
34
38
|
*/
|
|
35
39
|
public async readPostBody<T>(incomingMessage: IncomingMessage): Promise<T> {
|
|
36
|
-
const body = await this.readPostBodyRaw(incomingMessage)
|
|
37
|
-
|
|
40
|
+
const body = incomingMessage.postBody || JSON.parse(await this.readPostBodyRaw(incomingMessage))
|
|
41
|
+
incomingMessage.postBody = body
|
|
42
|
+
return body
|
|
38
43
|
}
|
|
39
44
|
|
|
40
45
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incoming-message-extensions.d.ts","sourceRoot":"","sources":["../src/incoming-message-extensions.ts"],"names":[],"mappings":"AAGA,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,eAAe;QAC9B,eAAe,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;QACtC,YAAY,EAAE,CAAC,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"incoming-message-extensions.d.ts","sourceRoot":"","sources":["../src/incoming-message-extensions.ts"],"names":[],"mappings":"AAGA,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,eAAe;QAC9B,eAAe,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;QACtC,YAAY,EAAE,CAAC,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAA;QACjC,QAAQ,EAAE,OAAO,CAAA;KAClB;CACF"}
|
package/types/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAEnD;;GAEG;AACH,qBACa,KAAK;IACH,eAAe,CAAC,eAAe,EAAE,eAAe;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAEnD;;GAEG;AACH,qBACa,KAAK;IACH,eAAe,CAAC,eAAe,EAAE,eAAe;IAuB7D;;;;;OAKG;IACU,YAAY,CAAC,CAAC,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC;IAM1E;;;;;;OAMG;IACI,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc;CAkB7G"}
|