@restorecommerce/facade 1.8.1 → 1.9.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 +23 -0
- package/README.md +16 -0
- package/dist/gql/protos/resolvers.d.ts.map +1 -1
- package/dist/gql/protos/resolvers.js +8 -1
- package/dist/gql/protos/resolvers.js.map +1 -1
- package/dist/modules/identity/oidc/adapter.js +1 -1
- package/dist/modules/identity/oidc/adapter.js.map +1 -1
- package/dist/modules/ostorage/objectDownloadReqHandler.d.ts.map +1 -1
- package/dist/modules/ostorage/objectDownloadReqHandler.js +6 -0
- package/dist/modules/ostorage/objectDownloadReqHandler.js.map +1 -1
- package/dist/tsconfig.lib.tsbuildinfo +1 -1
- package/package.json +6 -5
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,29 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.9.0](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.8.2...@restorecommerce/facade@1.9.0) (2023-12-09)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* header and metadata upstream passing ([fd6df10](https://github.com/restorecommerce/libs/commit/fd6df103b2ef50143bca1dc7716760103a2ce27c))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [1.8.2](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.8.1...@restorecommerce/facade@1.8.2) (2023-11-26)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* logger config ([1f31f47](https://github.com/restorecommerce/libs/commit/1f31f478c76a047ce0ac1f554069fa764101e300))
|
|
23
|
+
* logger message typing ([7791bde](https://github.com/restorecommerce/libs/commit/7791bdede91ea3cd2f824b4410d28075b30199f2))
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
6
29
|
## [1.8.1](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.8.0...@restorecommerce/facade@1.8.1) (2023-11-25)
|
|
7
30
|
|
|
8
31
|
|
package/README.md
CHANGED
|
@@ -27,3 +27,19 @@ facade.start();
|
|
|
27
27
|
## Provided koa middlewares
|
|
28
28
|
|
|
29
29
|
- [reqResLogger](src/middlewares/req-res-logger)
|
|
30
|
+
|
|
31
|
+
## Metadata Passing
|
|
32
|
+
|
|
33
|
+
The facade packages and sends upstream all headers as well as the origin address in the GRPC metadata.
|
|
34
|
+
|
|
35
|
+
The headers are in a JSON serialized format.
|
|
36
|
+
|
|
37
|
+
Example:
|
|
38
|
+
```js
|
|
39
|
+
Metadata({
|
|
40
|
+
'headers': [
|
|
41
|
+
'{"host":"192.168.1.103:5000","user-agent":"Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0","accept":"*/*","accept-language":"en-US,en;q=0.5","accept-encoding":"gzip, deflate","referer":"http://192.168.1.103:5000/graphql","content-type":"application/json","content-length":"540","origin":"http://192.168.1.103:5000","connection":"keep-alive"}'
|
|
42
|
+
],
|
|
43
|
+
'origin-ip': [ '192.168.1.103' ]
|
|
44
|
+
})
|
|
45
|
+
```
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../src/gql/protos/resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,aAAa,EAAE,KAAK,aAAa,EAAE,KAAK,aAAa,EAAE,KAAK,qBAAqB,EAAE,MAAM,YAAY,CAAC;AA0BrI,OAAO,EAAwB,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../src/gql/protos/resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,aAAa,EAAE,KAAK,aAAa,EAAE,KAAK,aAAa,EAAE,KAAK,qBAAqB,EAAE,MAAM,YAAY,CAAC;AA0BrI,OAAO,EAAwB,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,SAAS,CAAC;AASlD,MAAM,MAAM,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,IAAI,CAC1D,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,kBAAkB,KACrB,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;AAEhC,MAAM,MAAM,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,IAAI,CACnE,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,kBAAkB,KACrB,cAAc,CAAC,OAAO,CAAC,CAAC;AAS7B,eAAO,MAAM,uBAAuB,0NAEtB,sBAAsB,+BAA+B,aAAa,+BAmM7E,CAAC;AAYJ,eAAO,MAAM,wBAAwB,2FACvB,MAAM,QAAQ,MAAM,oGACF,MAAM,GAAG,SAAS,YAAwB,sBAAsB,SAgC/F,CAAC;AAEF,eAAO,MAAM,gBAAgB,kBAAmB,MAAM,EAAE,QAqDvD,CAAC;AAEF,eAAO,MAAM,2BAA2B,gGAAiG,aAAa,EAAE,UAAU,qBAAqB,aAAa,MAAM,MAwMzM,CAAC"}
|
|
@@ -9,6 +9,7 @@ import * as stream from 'node:stream';
|
|
|
9
9
|
import _ from 'lodash';
|
|
10
10
|
import { Events } from '@restorecommerce/kafka-client';
|
|
11
11
|
import S2A from './stream-to-async-iterator.js';
|
|
12
|
+
import { Metadata } from 'nice-grpc';
|
|
12
13
|
const inputMethodType = new Map();
|
|
13
14
|
const streamToAsyncIterable = async function* (request, readableStreamKey) {
|
|
14
15
|
const readStream = _.clone(request[readableStreamKey]);
|
|
@@ -108,7 +109,13 @@ export const getGQLResolverFunctions = (service, key, serviceKey, cfg) => {
|
|
|
108
109
|
req = streamToAsyncIterable(req, readableStreamKey[0]);
|
|
109
110
|
}
|
|
110
111
|
}
|
|
111
|
-
const
|
|
112
|
+
const contextRequest = context.req;
|
|
113
|
+
const rawResult = await methodFunc(req, {
|
|
114
|
+
metadata: Metadata({
|
|
115
|
+
headers: JSON.stringify(contextRequest.headers),
|
|
116
|
+
'origin-ip': contextRequest.client.address().address
|
|
117
|
+
})
|
|
118
|
+
});
|
|
112
119
|
const result = postProcessGQLValue(rawResult, outputTyping.output);
|
|
113
120
|
const grpcClientConfig = cfg.client;
|
|
114
121
|
const bufferFields = getKeys(grpcClientConfig?.bufferFields);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../../../src/gql/protos/resolvers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../../../src/gql/protos/resolvers.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,7 @@ export function createIdentityServiceAdapterClass(remoteTokenService, logger, lo
|
|
|
84
84
|
throw new Error('UNSUPPORTED');
|
|
85
85
|
}
|
|
86
86
|
async upsert(id, payload, expiresIn) {
|
|
87
|
-
logger.
|
|
87
|
+
logger.info(`Upserting ${this.type} token ${id}`, payload);
|
|
88
88
|
if (delegateToRemoteService(this.type)) {
|
|
89
89
|
try {
|
|
90
90
|
await remoteTokenService.upsert({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../src/modules/identity/oidc/adapter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../src/modules/identity/oidc/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectDownloadReqHandler.d.ts","sourceRoot":"","sources":["../../../src/modules/ostorage/objectDownloadReqHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"objectDownloadReqHandler.d.ts","sourceRoot":"","sources":["../../../src/modules/ostorage/objectDownloadReqHandler.ts"],"names":[],"mappings":"AAkCA,eAAO,MAAM,aAAa,WAAkB,MAAM,OAAO,MAAM,OAAO,GAAG,UAAU,GAAG,KAAG,QAAQ,GAAG,CA0GnG,CAAC"}
|
|
@@ -7,6 +7,12 @@ import pkg from 'lodash';
|
|
|
7
7
|
const { isEmpty } = pkg;
|
|
8
8
|
const cfg = createServiceConfig(process.cwd());
|
|
9
9
|
const loggerCfg = cfg.get('logger');
|
|
10
|
+
if (loggerCfg) {
|
|
11
|
+
loggerCfg.esTransformer = (msg) => {
|
|
12
|
+
msg.fields = JSON.stringify(msg.fields);
|
|
13
|
+
return msg;
|
|
14
|
+
};
|
|
15
|
+
}
|
|
10
16
|
let logger = createLogger(loggerCfg);
|
|
11
17
|
const dlQueryParamExist = (ctx) => {
|
|
12
18
|
// check if URL contains query parameter 'dl'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectDownloadReqHandler.js","sourceRoot":"","sources":["../../../src/modules/ostorage/objectDownloadReqHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,GAAG,MAAM,QAAQ,CAAC;AACzB,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;AAExB,MAAM,GAAG,GAAG,mBAAmB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,MAAM,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"objectDownloadReqHandler.js","sourceRoot":"","sources":["../../../src/modules/ostorage/objectDownloadReqHandler.ts"],"names":[],"mappings":"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"}
|