@nextage/nx-frame-be 1.0.34 → 1.0.35

package/build/common/base/base.controller.d.ts

@@ -15,13 +15,14 @@
 /// <reference types="mongoose/types/populate" />
 /// <reference types="mongoose/types/query" />
 /// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/session" />
 /// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferhydrateddoctype" />
 /// <reference types="mongoose/types/inferrawdoctype" />
 import mongoose from 'mongoose';
 import { NxContext, NxObject } from '../interfaces';

package/build/common/base/base.interfaces.d.ts

@@ -15,13 +15,14 @@
 /// <reference types="mongoose/types/populate" />
 /// <reference types="mongoose/types/query" />
 /// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/session" />
 /// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferhydrateddoctype" />
 /// <reference types="mongoose/types/inferrawdoctype" />
 import mongoose from 'mongoose';
 import { ModelCrudEventType } from '../enums';

package/build/common/base/base.model.d.ts

@@ -16,13 +16,14 @@
 /// <reference types="mongoose/types/populate" />
 /// <reference types="mongoose/types/query" />
 /// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/session" />
 /// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferhydrateddoctype" />
 /// <reference types="mongoose/types/inferrawdoctype" />
 import mongoose from 'mongoose';
 import { EventEmitter } from 'events';
@@ -42,11 +43,7 @@ export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel ex
     /**
      *
      */
-    get schema(): {
-        id?: mongoose.SchemaDefinitionProperty<string | undefined, BaseMongoDoc> | undefined;
-        _id?: mongoose.SchemaDefinitionProperty<unknown, BaseMongoDoc> | undefined;
-        __v?: mongoose.SchemaDefinitionProperty<any, BaseMongoDoc> | undefined;
-    };
+    get schema(): any;
     /**
      * Get mongodb collection name
      */
@@ -95,9 +92,13 @@ export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel ex
      * @param {*} fields
      * @param {*} options
      */
-    find(params: FilterParams, fields: NxObject, options: mongoose.QueryOptions<TDoc>): Promise<(mongoose.Document<unknown, {}, BaseMongoDoc> & BaseMongoDoc & Required<{
-        _id: unknown;
-    }>)[]>;
+    find(params: FilterParams, fields: NxObject, options: mongoose.QueryOptions<TDoc>): Promise<(mongoose.Document<unknown, {}, BaseMongoDoc, {}, mongoose.DefaultSchemaOptions> & BaseMongoDoc & Required<{
+        _id: mongoose.Types.ObjectId;
+    }> & {
+        __v: number;
+    } & {
+        id: string;
+    })[]>;
     list(params?: FilterParams, fields?: mongoose.ProjectionType<BaseMongoDoc>, pagination?: QueryPagination, context?: NxContext): Promise<TDoc[]>;
     list(params: FilterParams, fields: mongoose.ProjectionType<BaseMongoDoc>, pagination: QueryPagination, queryActions: NxObject, context: NxContext): Promise<TDoc[]>;
     /**
@@ -106,7 +107,7 @@ export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel ex
      * @param {*} params
      * @param {*} callback
      */
-    listNative(params?: FilterParams, options?: mongoose.mongo.FindOptions<mongoose.mongo.BSON.Document>): mongoose.mongo.FindCursor<mongoose.mongo.WithId<mongoose.mongo.BSON.Document>>;
+    listNative(params?: FilterParams, options?: mongoose.mongo.FindOptions): mongoose.mongo.FindCursor<mongoose.mongo.WithId<mongoose.mongo.BSON.Document>>;
     /**
      *
      * @param params

package/build/common/base/base.model.js

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseModel = void 0;
 const events_1 = require("events");
@@ -517,8 +528,9 @@ class BaseModel extends events_1.EventEmitter {
                 return null;
             const fiAttrs = foundItem.toObject();
             delete fiAttrs.id;
-            delete fiAttrs._id;
-            item = Object.assign(fiAttrs, item);
+            // delete fiAttrs._id;
+            const { _id } = fiAttrs, cleanAttrs = __rest(fiAttrs, ["_id"]);
+            item = Object.assign(cleanAttrs, item);
             item = yield this.beforeCopy(item, context);
             const newItem = this.mgModel.build(item);
             const res = yield (newItem === null || newItem === void 0 ? void 0 : newItem.save());

package/build/common/base/mongo-utils.d.ts

@@ -15,13 +15,14 @@
 /// <reference types="mongoose/types/populate" />
 /// <reference types="mongoose/types/query" />
 /// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/session" />
 /// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferhydrateddoctype" />
 /// <reference types="mongoose/types/inferrawdoctype" />
 import mongoose from 'mongoose';
 import { BaseDBItem } from '../types';

package/build/common/crypto/encryption.plugin.d.ts

@@ -0,0 +1,38 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferhydrateddoctype" />
+/// <reference types="mongoose/types/inferrawdoctype" />
+import { Schema } from 'mongoose';
+type Path = string;
+interface EncryptionPluginOptions {
+    fields: Path[];
+    getKey: (keyId?: string) => Buffer;
+    currentKeyId: string;
+    algorithm?: string;
+}
+export declare function encryptionPlugin(schema: Schema, options: EncryptionPluginOptions): void;
+export {};

package/build/common/crypto/encryption.plugin.js

@@ -0,0 +1,94 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encryptionPlugin = void 0;
+// encryptionPlugin.ts
+const node_crypto_1 = __importDefault(require("node:crypto"));
+function encryptionPlugin(schema, options) {
+    const { fields, getKey, currentKeyId, algorithm = 'aes-256-cbc' } = options;
+    // --- utils nested ---
+    const getNested = (obj, path) => path.split('.').reduce((o, k) => (o ? o[k] : undefined), obj);
+    const setNested = (obj, path, value) => {
+        const keys = path.split('.');
+        const last = keys.pop();
+        const target = keys.reduce((o, k) => {
+            if (!o[k])
+                o[k] = {};
+            return o[k];
+        }, obj);
+        target[last] = value;
+    };
+    // --- crypto ---
+    const encrypt = (data) => {
+        const iv = node_crypto_1.default.randomBytes(16);
+        const key = getKey(currentKeyId);
+        const cipher = node_crypto_1.default.createCipheriv(algorithm, key, iv);
+        const json = JSON.stringify(data);
+        let encrypted = cipher.update(json);
+        encrypted = Buffer.concat([encrypted, cipher.final()]);
+        return {
+            _enc: true,
+            v: encrypted.toString('hex'),
+            iv: iv.toString('hex'),
+            k: currentKeyId
+        };
+    };
+    const decrypt = (payload) => {
+        const key = getKey(payload.k);
+        const iv = Buffer.from(payload.iv, 'hex');
+        const encryptedText = Buffer.from(payload.v, 'hex');
+        const decipher = node_crypto_1.default.createDecipheriv(algorithm, key, iv);
+        let decrypted = decipher.update(encryptedText);
+        decrypted = Buffer.concat([decrypted, decipher.final()]);
+        return JSON.parse(decrypted.toString());
+    };
+    const isEncrypted = (val) => (val === null || val === void 0 ? void 0 : val._enc) === true;
+    // --- encrypt fields ---
+    const encryptFields = (obj) => {
+        for (const path of fields) {
+            const value = getNested(obj, path);
+            if (value && !isEncrypted(value))
+                setNested(obj, path, encrypt(value));
+        }
+    };
+    // --- decrypt fields ---
+    const decryptFields = (obj) => {
+        for (const path of fields) {
+            const value = getNested(obj, path);
+            if (isEncrypted(value)) {
+                try {
+                    setNested(obj, path, decrypt(value));
+                }
+                catch (e) {
+                    //console.log(e);
+                    // fallback safe
+                }
+            }
+        }
+    };
+    // --- hooks ---
+    // schema.pre('save', function (next) {
+    //   encryptFields(this);
+    //   next();
+    // });
+    // schema.post('init', function (doc) {
+    //   decryptFields(doc);
+    // });
+    // schema.post('save', function (doc) {
+    //   decryptFields(doc);
+    // });
+    // // update hooks
+    // schema.pre(['updateOne', 'findOneAndUpdate'], (next: Function) => {
+    //   const update: any = this.getUpdate();
+    //   if (!update) return next();
+    //   // support $set
+    //   if (update.$set)
+    //     encryptFields(update.$set);
+    //   else
+    //     encryptFields(update);
+    //   next();
+    // });
+}
+exports.encryptionPlugin = encryptionPlugin;

package/build/common/crypto/index.d.ts

@@ -1,3 +1,4 @@
 export * from './crypto.interfaces';
 export * from './crypto.classes';
 export * from './crypto.utils';
+export * from './encryption.plugin';

package/build/common/crypto/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./crypto.interfaces"), exports);
 __exportStar(require("./crypto.classes"), exports);
 __exportStar(require("./crypto.utils"), exports);
+__exportStar(require("./encryption.plugin"), exports);

package/build/common/grid-fs/gridfs-base.model.d.ts

@@ -16,13 +16,14 @@
 /// <reference types="mongoose/types/populate" />
 /// <reference types="mongoose/types/query" />
 /// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/session" />
 /// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferhydrateddoctype" />
 /// <reference types="mongoose/types/inferrawdoctype" />
 import mongoose from 'mongoose';
 import { Stream } from 'stream';

package/build/common/grid-fs/gridfs-base.model.js

@@ -32,7 +32,7 @@ class GridFsBaseModel {
             throw new Error('Error, you need to open mongo connection');
         const promise = connection.db ? Promise.resolve(connection) : connection.asPromise();
         promise.then((conn) => {
-            if (!conn)
+            if (!(conn === null || conn === void 0 ? void 0 : conn.db))
                 return;
             this.bucket = new mongodb_1.GridFSBucket(conn.db, bucketOptions);
         });

package/build/common/grid-fs/gridfs.interfaces.d.ts

@@ -15,13 +15,14 @@
 /// <reference types="mongoose/types/populate" />
 /// <reference types="mongoose/types/query" />
 /// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/session" />
 /// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferhydrateddoctype" />
 /// <reference types="mongoose/types/inferrawdoctype" />
 import mongoose from 'mongoose';
 import { NxObject } from '../interfaces';

package/build/common/manager/bulk-manager.d.ts

@@ -15,13 +15,14 @@
 /// <reference types="mongoose/types/populate" />
 /// <reference types="mongoose/types/query" />
 /// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/session" />
 /// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferhydrateddoctype" />
 /// <reference types="mongoose/types/inferrawdoctype" />
 import mongoose from 'mongoose';
 import { ClassElement } from 'typescript';

package/build/common/types.d.ts

@@ -15,13 +15,14 @@
 /// <reference types="mongoose/types/populate" />
 /// <reference types="mongoose/types/query" />
 /// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/session" />
 /// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/utility" />
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/schematypes" />
 /// <reference types="mongoose/types/inferschematype" />
+/// <reference types="mongoose/types/inferhydrateddoctype" />
 /// <reference types="mongoose/types/inferrawdoctype" />
 import { Mongoose } from 'mongoose';
 import { Sequelize } from 'sequelize';

package/build/test/setup.js

@@ -29,9 +29,10 @@ beforeAll(() => __awaiter(void 0, void 0, void 0, function* () {
     yield mongoose_1.default.connect(mongoUri, {});
 }));
 beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     jest.clearAllMocks();
-    const collections = yield mongoose_1.default.connection.db.collections();
-    for (let collection of collections) {
+    const collections = yield ((_a = mongoose_1.default.connection.db) === null || _a === void 0 ? void 0 : _a.collections());
+    for (let collection of collections !== null && collections !== void 0 ? collections : []) {
         yield collection.deleteMany({});
     }
 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextage/nx-frame-be",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -24,9 +24,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@apollo/server": "^4.10.4",
-    "@apollo/server-plugin-landing-page-graphql-playground": "^4.0.1",
+    "@apollo/server": "^5.5.0",
     "@apollo/subgraph": "^2.11.2",
+    "@as-integrations/express5": "^1.1.2",
     "@aws-sdk/client-ecs": "^3.592.0",
     "@aws-sdk/client-s3": "^3.1017.0",
     "@aws-sdk/client-ses": "^3.592.0",
@@ -35,14 +35,14 @@
     "@types/async": "^3.2.24",
     "@types/cookie-session": "^2.0.49",
     "@types/crypto-js": "^4.2.2",
-    "@types/express": "^4.17.21",
+    "@types/express": "^5.0.6",
     "@types/express-validator": "^3.0.0",
     "@types/graphql": "^14.5.0",
     "@types/jsonwebtoken": "^9.0.6",
     "@types/jszip": "^3.4.1",
     "@types/lodash": "^4.17.4",
     "@types/moment": "^2.13.0",
-    "@types/mongoose": "^5.11.97",
+    "@types/mongoose": "^5.11.96",
     "@types/node-schedule": "^2.1.7",
     "@types/sequelize": "^4.28.20",
     "@types/socket.io": "^3.0.2",
@@ -52,9 +52,9 @@
     "@types/ua-parser-js": "^0.7.39",
     "@types/uuid": "^9.0.8",
     "async": "^3.2.5",
-    "cookie": "^0.6.0",
+    "cookie": "^1.1.1",
     "crypto-js": "^4.2.0",
-    "express": "^4.19.2",
+    "express": "^5.2.1",
     "express-validator": "^7.1.0",
     "graphql": "^16.11.0",
     "graphql-constraint-directive": "^5.4.3",
@@ -67,7 +67,7 @@
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
-    "mongoose": "^8.4.0",
+    "mongoose": "^9.3.3",
     "mongoose-update-if-current": "^1.4.0",
     "node-schedule": "^2.1.1",
     "sequelize": "^6.37.3",