cc-core-cli 1.0.150 → 1.0.153

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-core-cli",
-  "version": "1.0.150",
+  "version": "1.0.153",
   "description": "Command Line Interface tool for generating project templates for the (Your Platform's Name) platform.",
   "main": "bin/index.js",
   "scripts": {

package/template/core/package.json

@@ -23,17 +23,17 @@
     "sonar:coverage": "jest --coverage --coverageReporters=lcov --coverageDirectory=coverage"
   },
   "dependencies": {
-    "@shopstack/cc-core-lib": "2.5.328",
+    "@shopstack/cc-core-lib": "^2.6.0",
     "reflect-metadata": "^0.1.14"
   },
   "devDependencies": {
-    "@nestjs/testing": "^10.3.5",
+    "@nestjs/testing": "^11.1.11",
     "@types/bcrypt": "^5.0.2",
     "@types/bull": "^3.14.4",
     "@types/chroma-js": "^2.4.0",
     "@types/express": "^4.17.8",
     "@types/jest": "^29.5.14",
-    "@types/node": "^13.13.27",
+    "@types/node": "^24.10.4",
     "@types/numeral": "^2.0.2",
     "@types/supertest": "^2.0.10",
     "@typescript-eslint/eslint-plugin": "^6.1.0",

package/template/core/src/app.module.ts

@@ -1,6 +1,7 @@
 import * as _ from "lodash";
 import { Module } from "@nestjs/common";
 import { MongooseModule } from "@nestjs/mongoose";
+import * as mongoose from "mongoose";
 import { ClsModule } from "nestjs-cls";
 import * as dotenv from "dotenv";
 
@@ -56,6 +57,7 @@ const RUN_CUSTOM_MODULES =
     ? CUSTOM_MODULES.map((c) => c.module)
     : CUSTOM_MODULES.filter((c) => SPECIFY_CUSTOM_MODULES.includes(c.module.name)).map((c) => c.module);
 
+mongoose.set('strictQuery', false);
 const mongoConfig = {};
 
 if (+process.env.MONGODB_MIN_POOL_SIZE) {
@@ -92,7 +94,7 @@ if (+process.env.MONGODB_MAX_POOL_SIZE) {
             headers: _.get(req, "headers", {}),
             ip: _.get(req, "ip"),
             protocol: _.get(req, "protocol"),
-            hostname: _.get(req, "hostname"),
+            hostname: req.host || req.headers.host || _.get(req, "hostname"),
             url: _.get(req, "url"),
             method: _.get(req, "method"),
             body: _.get(req, "body", {}),
@@ -113,9 +115,11 @@ if (+process.env.MONGODB_MAX_POOL_SIZE) {
             roles: _.get(req, "roles", []),
             headers: _.get(req, "headers", {}),
             // ip: req.connection.remoteAddress,
-            ip: _.get(req, "socket.remoteAddress") || _.get(req, "connection.remoteAddress"),
+            ip:
+              _.get(req, "socket.remoteAddress") ||
+              _.get(req, "connection.remoteAddress"),
             protocol: _.get(req, "protocol"),
-            hostname: _.get(req, "hostname"),
+            hostname: req.host || req.headers.host || _.get(req, "hostname"),
             url: _.get(req, "url"),
             method: _.get(req, "method"),
             body: _.get(req, "body", {}),

package/template/core/src/app_cluster.service.ts

@@ -1,9 +1,9 @@
 import * as _ from "lodash";
-import * as cluster from "cluster";
 import * as os from "os";
 import { Injectable } from "@nestjs/common";
 import axios, { AxiosInstance } from "axios";
 import { CONST } from '@shopstack/cc-core-lib/core'
+const cluster = require('node:cluster') as any
 
 CONST.INTERNAL_DOMAIN = `http://${process.env.LOOP_BACK_IP}:${process.env
   .PORT || 3000}/api/v1`;
@@ -11,8 +11,8 @@ CONST.INTERNAL_DOMAIN = `http://${process.env.LOOP_BACK_IP}:${process.env
 const numCPUs = _.isEmpty(process.env.MAX_WORKER)
   ? os.cpus().length
   : parseInt(process.env.MAX_WORKER, 10) === 0
-    ? os.cpus().length
-    : parseInt(process.env.MAX_WORKER, 10);
+  ? os.cpus().length
+  : parseInt(process.env.MAX_WORKER, 10);
 console.log("MAXIMUM WORKER PROCESS: " + numCPUs);
 // const numCPUs = 2;
 let checkInit = false;
@@ -21,7 +21,7 @@ let mainPID = 0;
 @Injectable()
 export class AppClusterService {
   static async clusterize(callback: Function): Promise<void> {
-    if (cluster.isMaster) {
+    if (cluster.isPrimary) {
       console.log(`Master server started on ${process.pid}`);
       CONST.MAIN_PROCESS = true;
       for (let i = 0; i < numCPUs; i++) {

package/template/core/src/main.ts

@@ -233,7 +233,7 @@ async function bootstrap() {
   const app = await NestFactory.create<NestFastifyApplication>(AppModule, fastify);
 
   app.useStaticAssets({
-    root: `${process.cwd()}/storage/public`,
+    root: path.resolve(process.cwd(), "storage/public"),
     prefix: `/public`,
   });
 
@@ -266,9 +266,16 @@ async function bootstrap() {
     .getInstance()
     .addHook("onRoute", (route) => {
       if (!ignoreRouteRegex.test(route.path)) {
+        let method = route.method;
+        if (_.isArray(method)) {
+          method = method[0] || "GET";
+        } else if (_.isObject(method)) {
+          method = Object.keys(method)[0] || "GET";
+        }
+        method = String(method).toUpperCase();
         routes.push({
           path: route.path.replace("/api/v1/", ""),
-          method: route.method,
+          method: method
         });
       }
     });

package/template/core_v3/package.json

@@ -27,13 +27,13 @@
     "reflect-metadata": "^0.1.14"
   },
   "devDependencies": {
-    "@nestjs/testing": "^10.3.5",
+    "@nestjs/testing": "^11.1.11",
     "@types/bcrypt": "^5.0.2",
     "@types/bull": "^3.14.4",
     "@types/chroma-js": "^2.4.0",
     "@types/express": "^4.17.8",
     "@types/jest": "^29.5.14",
-    "@types/node": "^13.13.27",
+    "@types/node": "^24.10.4",
     "@types/numeral": "^2.0.2",
     "@types/supertest": "^2.0.10",
     "@typescript-eslint/eslint-plugin": "^6.1.0",

package/template/core_v3/src/app.module.ts

@@ -1,8 +1,7 @@
 import * as _ from "lodash";
-import {
-  Module,
-} from "@nestjs/common";
+import { Module } from "@nestjs/common";
 import { MongooseModule } from "@nestjs/mongoose";
+import * as mongoose from "mongoose";
 import { ClsModule } from "nestjs-cls";
 import * as dotenv from "dotenv";
 
@@ -42,26 +41,23 @@ import {
   CacheModule,
   PipelineModule,
   RewriteUrlModule,
-  ExternalProviderModule
-} from '@shopstack/cc-core-lib/core'
+  SearchTextModule,
+  ExternalProviderModule,
+} from "@shopstack/cc-core-lib/core";
 
-import { CoreModule } from './core/core.module'
+import { CoreModule } from "./core/core.module";
 
 // const { CoreModule } = core
 
 dotenv.config();
 
-const SPECIFY_CUSTOM_MODULES =
-  process.env.CUSTOM_MODULES === "" || process.env.CUSTOM_MODULES === undefined
-    ? []
-    : process.env.CUSTOM_MODULES.split(",");
+const SPECIFY_CUSTOM_MODULES = process.env.CUSTOM_MODULES === "" || process.env.CUSTOM_MODULES === undefined ? [] : process.env.CUSTOM_MODULES.split(",");
 const RUN_CUSTOM_MODULES =
   SPECIFY_CUSTOM_MODULES.length === 0
-    ? CUSTOM_MODULES.map(c => c.module)
-    : CUSTOM_MODULES.filter(c =>
-      SPECIFY_CUSTOM_MODULES.includes(c.module.name)
-    ).map(c => c.module);
+    ? CUSTOM_MODULES.map((c) => c.module)
+    : CUSTOM_MODULES.filter((c) => SPECIFY_CUSTOM_MODULES.includes(c.module.name)).map((c) => c.module);
 
+mongoose.set('strictQuery', false);
 const mongoConfig = {};
 
 if (+process.env.MONGODB_MIN_POOL_SIZE) {
@@ -98,15 +94,15 @@ if (+process.env.MONGODB_MAX_POOL_SIZE) {
             headers: _.get(req, "headers", {}),
             ip: _.get(req, "ip"),
             protocol: _.get(req, "protocol"),
-            hostname: _.get(req, "hostname"),
+            hostname: req.host || req.headers.host || _.get(req, "hostname"),
             url: _.get(req, "url"),
             method: _.get(req, "method"),
             body: _.get(req, "body", {}),
             action_profile: _.get(req, "action_profile", {}),
             permisson_entities: _.get(req, "permisson_entities", {}),
-            permisson_tab: _.get(req, "permisson_tab", {})
+            permisson_tab: _.get(req, "permisson_tab", {}),
           });
-        }
+        },
       },
       interceptor: {
         mount: true,
@@ -123,16 +119,16 @@ if (+process.env.MONGODB_MAX_POOL_SIZE) {
               _.get(req, "socket.remoteAddress") ||
               _.get(req, "connection.remoteAddress"),
             protocol: _.get(req, "protocol"),
-            hostname: _.get(req, "hostname"),
+            hostname: req.host || req.headers.host || _.get(req, "hostname"),
             url: _.get(req, "url"),
             method: _.get(req, "method"),
             body: _.get(req, "body", {}),
             action_profile: _.get(req, "action_profile", {}),
             permisson_entities: _.get(req, "permisson_entities", {}),
-            permisson_tab: _.get(req, "permisson_tab", {})
+            permisson_tab: _.get(req, "permisson_tab", {}),
           });
-        }
-      }
+        },
+      },
     }),
 
     EntitiesModule,
@@ -164,12 +160,13 @@ if (+process.env.MONGODB_MAX_POOL_SIZE) {
     PipelineModule,
     LayoutModule,
     RewriteUrlModule,
+    SearchTextModule,
     ExternalProviderModule,
     // ...RUN_CUSTOM_MODULES,
 
-    CoreModule
+    CoreModule,
   ],
   controllers: [AppController, StoragePrivateController],
-  providers: [AppService]
+  providers: [AppService],
 })
-export class AppModule { }
+export class AppModule {}

package/template/core_v3/src/app_cluster.service.ts

@@ -1,9 +1,9 @@
 import * as _ from "lodash";
-import * as cluster from "cluster";
 import * as os from "os";
 import { Injectable } from "@nestjs/common";
 import axios, { AxiosInstance } from "axios";
 import { CONST } from '@shopstack/cc-core-lib/core'
+const cluster = require('node:cluster') as any
 
 CONST.INTERNAL_DOMAIN = `http://${process.env.LOOP_BACK_IP}:${process.env
   .PORT || 3000}/api/v1`;
@@ -11,8 +11,8 @@ CONST.INTERNAL_DOMAIN = `http://${process.env.LOOP_BACK_IP}:${process.env
 const numCPUs = _.isEmpty(process.env.MAX_WORKER)
   ? os.cpus().length
   : parseInt(process.env.MAX_WORKER, 10) === 0
-    ? os.cpus().length
-    : parseInt(process.env.MAX_WORKER, 10);
+  ? os.cpus().length
+  : parseInt(process.env.MAX_WORKER, 10);
 console.log("MAXIMUM WORKER PROCESS: " + numCPUs);
 // const numCPUs = 2;
 let checkInit = false;
@@ -21,7 +21,7 @@ let mainPID = 0;
 @Injectable()
 export class AppClusterService {
   static async clusterize(callback: Function): Promise<void> {
-    if (cluster.isMaster) {
+    if (cluster.isPrimary) {
       console.log(`Master server started on ${process.pid}`);
       CONST.MAIN_PROCESS = true;
       for (let i = 0; i < numCPUs; i++) {

package/template/core_v3/src/main.ts

@@ -249,7 +249,7 @@ async function bootstrap() {
   );
 
   app.useStaticAssets({
-    root: `${process.cwd()}/storage/public`,
+    root: path.resolve(process.cwd(), "storage/public"),
     prefix: `/public`
   });
 
@@ -284,9 +284,16 @@ async function bootstrap() {
     .getInstance()
     .addHook("onRoute", route => {
       if (!ignoreRouteRegex.test(route.path)) {
+        let method = route.method;
+        if (_.isArray(method)) {
+          method = method[0] || "GET";
+        } else if (_.isObject(method)) {
+          method = Object.keys(method)[0] || "GET";
+        }
+        method = String(method).toUpperCase();
         routes.push({
           path: route.path.replace("/api/v1/", ""),
-          method: route.method
+          method: method
         });
       }
     });