@restorecommerce/facade 1.3.0 → 1.3.2

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.2](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.3.1...@restorecommerce/facade@1.3.2) (2023-06-14)
+
+
+### Bug Fixes
+
+* **facade:** dev:serve script ([b971bec](https://github.com/restorecommerce/libs/commit/b971bec598a388ccbe273d41f68560c16f0ba1c3))
+
+
+
+
+
+## [1.3.1](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.3.0...@restorecommerce/facade@1.3.1) (2023-06-12)
+
+
+### Bug Fixes
+
+* **facade:** add postinstall script ([20af900](https://github.com/restorecommerce/libs/commit/20af900e89854fa4ad733ce44b41ad3647b4ada5))
+
+
+
+
+
 # [1.3.0](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.2.0...@restorecommerce/facade@1.3.0) (2023-06-12)
 
 

package/dist/gql/protos/graphql.js

@@ -67,16 +67,11 @@ export const preprocessGQLInput = (data, model) => __awaiter(void 0, void 0, voi
                 const stream = upload.createReadStream();
                 const chunks = [];
                 try {
-                    for (var _d = true, stream_1 = __asyncValues(stream), stream_1_1; stream_1_1 = yield stream_1.next(), _a = stream_1_1.done, !_a;) {
+                    for (var _d = true, stream_1 = __asyncValues(stream), stream_1_1; stream_1_1 = yield stream_1.next(), _a = stream_1_1.done, !_a; _d = true) {
                         _c = stream_1_1.value;
                         _d = false;
-                        try {
-                            let chunk = _c;
-                            chunks.push(chunk);
-                        }
-                        finally {
-                            _d = true;
-                        }
+                        let chunk = _c;
+                        chunks.push(chunk);
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }

package/dist/gql/protos/registry.js

@@ -1,6 +1,7 @@
 import { GraphQLBoolean, GraphQLFloat, GraphQLInt, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLString, } from 'graphql';
 import { GraphQLEnumType, GraphQLInputObjectType, GraphQLScalarType } from 'graphql/type/definition.js';
-import GraphQLUpload from 'graphql-upload/GraphQLUpload.js';
+// import GraphQLUpload from 'graphql-upload/GraphQLUpload.js';
+import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs';
 import { capitalizeProtoName } from './utils.js';
 import { authSubjectType } from './types.js';
 import { FieldDescriptorProto_Label, FieldDescriptorProto_Type } from 'ts-proto-descriptors';

package/dist/index.js

@@ -31,6 +31,7 @@ import compose from 'koa-compose';
 import { setUseSubscriptions } from './gql/protos/utils.js';
 import bodyParser from 'koa-bodyparser';
 import cors from '@koa/cors';
+import graphqlUploadKoa from 'graphql-upload/graphqlUploadKoa.mjs';
 export * from './modules/index.js';
 export * from './middlewares/index.js';
 export * from './interfaces.js';
@@ -264,6 +265,11 @@ export class RestoreCommerceFacade {
                 },
             });
             yield gqlServer.start();
+            // TODO set maxFile size and maximum files via config
+            this.koa.use(graphqlUploadKoa({
+                maxFileSize: 10000000,
+                maxFiles: 20,
+            }));
             this.koa.use(cors());
             this.koa.use(bodyParser());
             this.koa.use(koaMiddleware(gqlServer, {

package/dist/modules/identity/oidc/in-memory-adapter.js

@@ -7,14 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import LRU from 'lru-cache';
+import { LRUCache } from 'lru-cache';
 import { epochTime } from './utils.js';
 export class InMemoryAdapter {
     constructor(type) {
         this.type = type;
-        this.tokenStorage = new LRU({ max: 1000 });
-        this.sessionStorage = new LRU({ max: 1000 });
-        this.grantIdStorage = new LRU({ max: 1000 });
+        this.tokenStorage = new LRUCache({ max: 1000 });
+        this.sessionStorage = new LRUCache({ max: 1000 });
+        this.grantIdStorage = new LRUCache({ max: 1000 });
     }
     key(id) {
         return `${this.type}:${id}`;
@@ -70,15 +70,15 @@ export class InMemoryAdapter {
     }
     destroy(id) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.tokenStorage.del(this.key(id));
+            this.tokenStorage.delete(this.key(id));
         });
     }
     revokeByGrantId(grantId) {
         return __awaiter(this, void 0, void 0, function* () {
             const grant = this.grantIdStorage.get(grantId);
             if (grant) {
-                grant.forEach((token) => this.tokenStorage.del(token));
-                this.grantIdStorage.del(grantId);
+                grant.forEach((token) => this.tokenStorage.delete(token));
+                this.grantIdStorage.delete(grantId);
             }
         });
     }

package/dist/modules/ostorage/index.d.ts

@@ -1,2 +1,2 @@
-import { type OstorageConfig } from './interfaces.js';
+import { OstorageConfig } from "./interfaces.js";
 export declare const ostorageModule: import("../../interfaces.js").FacadeModuleFactory<OstorageConfig, import("./interfaces.js").OstorageContext>;

package/dist/modules/ostorage/index.js

@@ -8,9 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { FederatedOstorageSchema } from './gql/federation.js';
-import { namespace } from './interfaces.js';
-import { OstorageSrvGrpcClient } from './grpc/index.js';
-import { createFacadeModuleFactory } from '../../utils.js';
+import { namespace } from "./interfaces.js";
+import { OstorageSrvGrpcClient } from "./grpc/index.js";
+import { createFacadeModuleFactory } from "../../utils.js";
+import { handleGetFile } from './objectDownloadReqHandler.js';
+import Router from 'koa-router';
+import bodyParser from 'koa-bodyparser';
 export const ostorageModule = createFacadeModuleFactory(namespace, (facade, config) => {
     const ostorage = {
         client: new OstorageSrvGrpcClient(config.config.client.address, Object.assign(Object.assign({}, config.config.client), { logger: facade.logger }))
@@ -19,6 +22,23 @@ export const ostorageModule = createFacadeModuleFactory(namespace, (facade, conf
         name: namespace,
         schema: FederatedOstorageSchema(config.config)
     });
+    const router = new Router();
+    router.use(bodyParser());
+    router.get(/^\/storage\/([^/]+)\/(.+)/, (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
+        const authToken = ctx.request.header['authorization'];
+        let token;
+        if (authToken && authToken.startsWith('Bearer ')) {
+            token = authToken.split(' ')[1];
+            ctx.subject = { token };
+            ctx.subject = { token };
+        }
+        const bucket = ctx.params[0];
+        const key = ctx.params[1];
+        yield handleGetFile(bucket, key, ctx, ostorage.client);
+        return ctx.response;
+    }));
+    facade.koa.use(router.routes());
+    facade.koa.use(router.allowedMethods());
     facade.koa.use((ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         ctx.ostorage = ostorage;
         yield next();

package/dist/modules/ostorage/objectDownloadReqHandler.d.ts

@@ -0,0 +1 @@
+export declare const handleGetFile: (bucket: string, key: string, ctx: any, client: any) => Promise<any>;

package/dist/modules/ostorage/objectDownloadReqHandler.js

@@ -0,0 +1,134 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+import { createServiceConfig } from '@restorecommerce/service-config';
+import { createLogger } from '@restorecommerce/logger';
+import { isNumber } from 'util';
+const cfg = createServiceConfig(process.cwd());
+const loggerCfg = cfg.get('logger');
+let logger = createLogger(loggerCfg);
+const dlQueryParamExist = (ctx) => {
+    // check if URL contains query parameter 'dl'
+    let filePath, hostName;
+    if (ctx && ctx.request && ctx.request.url) {
+        filePath = ctx.request.url;
+    }
+    if (ctx && ctx.request && ctx.request.header
+        && ctx.request.header.host) {
+        hostName = ctx.request.header.host;
+    }
+    const completeUrl = 'http://' + hostName + filePath;
+    const reqURL = new URL(completeUrl);
+    return reqURL.searchParams.has('dl');
+};
+export const handleGetFile = (bucket, key, ctx, client) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, e_1, _b, _c;
+    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    try {
+        let download = false;
+        download = dlQueryParamExist(ctx);
+        // get the target orgKey from the ostorage meta and set it before making ACS request
+        let req = { bucket, key, download };
+        logger.debug('Received download request', { bucket, key });
+        const ostorageSrv = client['ostorage'];
+        req = { bucket, key, download, subject: ctx.subject };
+        let grpcGetStream = yield ostorageSrv.get(req);
+        let statusCode, statusMessage, objectOptions, objectLastModified, objectBuffer = [], objectKey;
+        try {
+            for (var _t = true, grpcGetStream_1 = __asyncValues(grpcGetStream), grpcGetStream_1_1; grpcGetStream_1_1 = yield grpcGetStream_1.next(), _a = grpcGetStream_1_1.done, !_a; _t = true) {
+                _c = grpcGetStream_1_1.value;
+                _t = false;
+                const data = _c;
+                if (!statusCode) {
+                    statusCode = (_e = (_d = data === null || data === void 0 ? void 0 : data.response) === null || _d === void 0 ? void 0 : _d.status) === null || _e === void 0 ? void 0 : _e.code;
+                }
+                if (!statusMessage) {
+                    statusMessage = (_g = (_f = data === null || data === void 0 ? void 0 : data.response) === null || _f === void 0 ? void 0 : _f.status) === null || _g === void 0 ? void 0 : _g.message;
+                }
+                if (!objectOptions) {
+                    objectOptions = (_j = (_h = data === null || data === void 0 ? void 0 : data.response) === null || _h === void 0 ? void 0 : _h.payload) === null || _j === void 0 ? void 0 : _j.options;
+                }
+                if (!objectLastModified) {
+                    objectLastModified = (_l = (_k = data === null || data === void 0 ? void 0 : data.payload) === null || _k === void 0 ? void 0 : _k.meta) === null || _l === void 0 ? void 0 : _l.modified;
+                }
+                if ((_o = (_m = data === null || data === void 0 ? void 0 : data.response) === null || _m === void 0 ? void 0 : _m.payload) === null || _o === void 0 ? void 0 : _o.object) {
+                    objectBuffer.push((_q = (_p = data === null || data === void 0 ? void 0 : data.response) === null || _p === void 0 ? void 0 : _p.payload) === null || _q === void 0 ? void 0 : _q.object);
+                }
+                if (!objectKey) {
+                    objectKey = (_s = (_r = data === null || data === void 0 ? void 0 : data.response) === null || _r === void 0 ? void 0 : _r.payload) === null || _s === void 0 ? void 0 : _s.key;
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (!_t && !_a && (_b = grpcGetStream_1.return)) yield _b.call(grpcGetStream_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        const setResponseHeaders = () => {
+            if (objectLastModified) {
+                ctx.response.set('Last-Modified', new Date(objectLastModified));
+            }
+            if (!objectOptions) {
+                logger.debug(`Object ${key} from bucket ${bucket} does not have options`);
+            }
+            else {
+                // set response headers on ctx response received from ostorage-srv
+                let { encoding, content_type, content_language, content_disposition, length, version, md5 } = objectOptions;
+                if (encoding) {
+                    ctx.response.set('Content-Encoding', encoding);
+                }
+                if (content_type) {
+                    ctx.response.set('Content-Type', content_type);
+                }
+                if (content_language) {
+                    ctx.response.set('Content-Language', content_language);
+                }
+                if (content_disposition) {
+                    ctx.response.set('Content-Disposition', `${content_disposition};filename=${objectKey}`);
+                }
+                if (length) {
+                    ctx.response.set('Content-Length', length);
+                }
+                if (version) {
+                    ctx.response.set('ETag', version);
+                }
+                if (md5) {
+                    ctx.response.set('Content-MD5', md5);
+                }
+            }
+        };
+        // add status
+        if (statusCode != 200) {
+            logger.error('Error downloading file', { code: statusCode, message: statusMessage });
+        }
+        else if (statusCode === 200) {
+            // assigning the grpcStream object through transform to Koa ctx response
+            setResponseHeaders();
+            logger.info(`Successfully downloaded file ${key}`);
+        }
+        ctx.response.body = Buffer.concat(objectBuffer);
+        ctx.response.status = statusCode ? statusCode : 500;
+        return ctx.response;
+    }
+    catch (error) {
+        logger.error(`Error downloading file ${key}`, { code: error.code, message: error.message, stack: error.stack });
+        ctx.response.body = error.message;
+        ctx.response.status = isNumber(error.code) ? error.code : 500;
+        return ctx.response;
+    }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/facade",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Facade for Restorecommerce microservices",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -18,49 +18,49 @@
   "type": "module",
   "dependencies": {
     "@apollo/federation": "^0.38.1",
-    "@apollo/gateway": "^2.3.2",
-    "@apollo/server": "^4.4.0",
-    "@as-integrations/koa": "^0.3.0",
+    "@apollo/gateway": "^2.4.7",
+    "@apollo/server": "^4.7.1",
+    "@as-integrations/koa": "^1.1.0",
     "@cloudnative/health": "^2.1.2",
-    "@grpc/grpc-js": "^1.8.11",
-    "@grpc/proto-loader": "^0.7.5",
+    "@grpc/grpc-js": "^1.8.14",
+    "@grpc/proto-loader": "^0.7.7",
     "@koa/cors": "^4.0.0",
     "@restorecommerce/grpc-client": "^2.0.1",
-    "@restorecommerce/kafka-client": "^1.0.8",
+    "@restorecommerce/kafka-client": "^1.0.9",
     "@restorecommerce/logger": "^1.2.3",
-    "@restorecommerce/rc-grpc-clients": "^3.1.0",
+    "@restorecommerce/rc-grpc-clients": "^3.1.1",
     "@restorecommerce/service-config": "^1.0.5",
     "array.prototype.flat": "^1.3.1",
     "co": "^4.6.0",
     "debug": "^4.3.4",
     "federation-subscription-tools": "^0.2.1",
     "graphql": "^16.6.0",
-    "graphql-upload": "^15.0.2",
-    "graphql-ws": "^5.11.3",
+    "graphql-upload": "^16.0.2",
+    "graphql-ws": "^5.13.1",
     "handlebars": "^4.7.7",
-    "jose": "^4.12.0",
-    "koa": "^2.14.1",
+    "jose": "^4.14.4",
+    "koa": "^2.14.2",
     "koa-body": "^6.0.1",
-    "koa-bodyparser": "^4.3.0",
+    "koa-bodyparser": "^4.4.0",
     "koa-compose": "^4.1.0",
-    "koa-helmet": "^6.1.0",
+    "koa-helmet": "^7.0.2",
     "koa-mount": "^4.0.0",
     "koa-router": "^12.0.0",
     "koa-websocket": "^7.0.0",
     "lodash": "^4.17.21",
-    "lru-cache": "^7.17.0",
-    "nanoid": "^3.3.4",
-    "node-fetch": "^3.3.0",
+    "lru-cache": "^9.1.2",
+    "nanoid": "^4.0.2",
+    "node-fetch": "^3.3.1",
     "oauth": "^0.10.0",
-    "oidc-provider": "^7.14.3",
+    "oidc-provider": "^8.2.2",
     "querystring": "^0.2.1",
     "request-ip": "^3.3.0",
-    "rxjs": "^7.8.0",
-    "ts-proto-descriptors": "^1.6.0",
+    "rxjs": "^7.8.1",
+    "ts-proto-descriptors": "^1.9.0",
     "useragent": "^2.3.0",
     "uuid": "^9.0.0",
-    "winston": "^3.8.2",
-    "ws": "^8.12.1"
+    "winston": "^3.9.0",
+    "ws": "^8.13.0"
   },
   "devDependencies": {
     "@graphql-codegen/core": "^4.0.0",
@@ -68,24 +68,24 @@
     "@graphql-codegen/typescript-resolvers": "^4.0.0",
     "@types/array.prototype.flat": "^1.2.1",
     "@types/co": "^4.6.3",
-    "@types/debug": "^4.1.7",
+    "@types/debug": "^4.1.8",
     "@types/ejs": "^3.1.2",
     "@types/express": "^4.17.17",
-    "@types/express-serve-static-core": "^4.17.33",
-    "@types/graphql-upload": "^15.0.2",
+    "@types/express-serve-static-core": "^4.17.35",
+    "@types/graphql-upload": "^16.0.0",
     "@types/jest": "^29.4.0",
-    "@types/koa": "^2.13.5",
+    "@types/koa": "^2.13.6",
     "@types/koa-bodyparser": "^4.3.10",
     "@types/koa-helmet": "^6.0.4",
     "@types/koa-mount": "^4.0.2",
     "@types/koa-router": "^7.4.1",
     "@types/koa-websocket": "^5.0.7",
-    "@types/koa__cors": "^3.3.1",
-    "@types/lodash": "^4.14.191",
+    "@types/koa__cors": "^4.0.0",
+    "@types/lodash": "^4.14.195",
     "@types/lru-cache": "^7.10.10",
-    "@types/node": "^18.14.1",
+    "@types/node": "^20.2.5",
     "@types/oauth": "^0.9.1",
-    "@types/oidc-provider": "^8.1.1",
+    "@types/oidc-provider": "^8.2.0",
     "@types/request-ip": "^0.0.37",
     "@types/supertest": "^2.0.12",
     "@types/useragent": "^2.3.1",
@@ -95,13 +95,13 @@
     "jest": "^29.5.0",
     "nodemon": "^2.0.20",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^4.1.2",
+    "rimraf": "^5.0.1",
     "supertest": "^6.3.3",
-    "ts-jest": "~29.1.0",
+    "ts-jest": "29.1.0",
     "ts-jest-resolver": "^2.0.1",
     "ts-node": "^10.9.1",
-    "tsconfig-paths": "^4.1.2",
-    "typescript": "^4.9.5"
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.1.3"
   },
   "scripts": {
     "build": "npm-run-all build:clean generate build:compile build:codegen:clean build:codegen:compile copyhbs",
@@ -111,10 +111,10 @@
     "build:codegen:compile": "tsc -p tsconfig.codegen.json",
     "dev": "npm-run-all build:clean dev:compile",
     "dev:compile": "tsc -w -p tsconfig.json",
-    "pretest": "rm -rf ./node_modules/@josephg/resolvable/index.ts",
+    "postinstall": "rm -rf ./node_modules/@josephg/resolvable/index.ts",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --runInBand --testTimeout=30000",
     "test:watch": "jest --watch",
-    "dev:serve": "TS_NODE_PROJECT=tsconfig.test.json nodemon -e ts,hbs -w ./tests -w ./src -x node --inspect=7000 -r ts-node/register tests/server.ts",
+    "dev:serve": "TS_NODE_PROJECT=tsconfig.test.json nodemon -e ts,hbs -w ./tests -w ./src -x ts-node-esm --project tsconfig.test.json -r ts-node/register tests/server.ts",
     "generate": "ts-node-esm --project tsconfig.generate.json -r tsconfig-paths/register generate.ts",
     "prepublishOnly": "npm run build",
     "debug-run": "ts-node-esm --project tsconfig.debug.json debug-run.ts",
@@ -136,5 +136,5 @@
       }
     }
   },
-  "gitHead": "18bb61bb70fbf8a8e5908edb3332ae015c7f5e54"
+  "gitHead": "4202cabe00d8363f62e3f53159755dca71781328"
 }

package/tsconfig-base.json

@@ -4,6 +4,8 @@
     "typeRoots": [
       "./node_modules/@types"
     ],
+    "allowJs": true,
+    "maxNodeModuleJsDepth": 10,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "declaration": true,