@nest-omni/core 2.0.1-1 → 2.0.1-11

package/decorators/user.decorator.js

@@ -15,7 +15,7 @@ function getOmniAuthData(request, key) {
     let user;
     const configService = new config_1.ConfigService(request);
     if ((0, lodash_1.isEmpty)(headers['x-user-id']) && (0, lodash_1.isEmpty)(headers['x-app-id'])) {
-        if (process.env.NODE_ENV === 'dev') {
+        if (process.env.NODE_ENV === 'dev' || process.env.MOCK_ENABLED === 'true') {
             user = {
                 uid: configService.get('MOCK_UID'),
                 username: configService.get('MOCK_USERNAME'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "2.0.1-1",
+  "version": "2.0.1-11",
   "description": "framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,7 +17,8 @@
   "author": "Jinpy",
   "license": "Apache-2.0",
   "devDependencies": {
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "@types/compression": "^1.8.1"
   },
   "peerDependencies": {
     "@dataui/crud": "^5.3.0",
@@ -56,7 +57,6 @@
     "pino-pretty": "^10.2.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",
-    "skywalking-backend-js": "^0.6.0",
     "source-map-support": "^0.5.21",
     "sprintf-js": "^1.1.3",
     "typeorm": "^0.3.17",
@@ -64,6 +64,13 @@
     "uuid": "^9.0.1"
   },
   "dependencies": {
-    "hygen": "^6.2.11"
+    "hygen": "^6.2.11",
+    "nestjs-cls": "^4.3.0",
+    "compression": "^1.8.0",
+    "@sentry/nestjs": "~9.17.0",
+    "@sentry/profiling-node": "~9.17.0"
+  },
+  "overrides": {
+    "@sentry-internal/node-cpu-profiler": "2.1.0"
   }
 }

package/setup/bootstrap.setup.js

@@ -15,18 +15,50 @@ const profiling_node_1 = require("@sentry/profiling-node");
 const dotenv = require("dotenv");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const possibleRootPaths = [process.cwd(), __dirname];
-const path0 = (0, path_1.join)(possibleRootPaths[0], 'config/base.env');
-const path1 = (0, path_1.join)(possibleRootPaths[1], 'config/base.env');
-if ((0, fs_1.existsSync)(path0)) {
-    dotenv.config({ path: path0 });
-}
-else if ((0, fs_1.existsSync)(path1)) {
-    dotenv.config({ path: path1 });
-}
-else {
-    throw new Error(`No valid base.env file: ${path0} or ${path1}`);
+const process = require("process");
+function findValidRootPath() {
+    const getAppRootPath = () => {
+        if (require.main && require.main.filename) {
+            return (0, path_1.dirname)(require.main.filename);
+        }
+        if (process.argv[1]) {
+            return (0, path_1.dirname)(process.argv[1]);
+        }
+        return process.cwd();
+    };
+    const possibleRootPaths = [getAppRootPath(), process.cwd(), __dirname];
+    const envFile = `${process.env.NODE_ENV || ''}.env`;
+    const isTest = process.env.NODE_ENV === 'test';
+    let envFilePath = '';
+    for (const rootPath of possibleRootPaths) {
+        const configPath = (0, path_1.join)(rootPath, 'config');
+        const baseEnvFilePath = (0, path_1.join)(configPath, 'base.env');
+        if (isTest) {
+            envFilePath = (0, path_1.join)(configPath, 'test.env');
+            if ((0, fs_1.existsSync)(envFilePath)) {
+                return { rootPath, baseEnvFilePath, envFilePath };
+            }
+            else {
+                envFilePath = (0, path_1.join)(configPath, 'dev.env');
+                if ((0, fs_1.existsSync)(envFilePath)) {
+                    return { rootPath, baseEnvFilePath, envFilePath };
+                }
+            }
+        }
+        else {
+            envFilePath = (0, path_1.join)(configPath, envFile);
+            if ((0, fs_1.existsSync)(envFilePath)) {
+                return { rootPath, baseEnvFilePath, envFilePath };
+            }
+        }
+    }
+    throw new Error(`No valid .env file: ${envFilePath}`);
 }
+const { envFilePath, rootPath, baseEnvFilePath } = findValidRootPath();
+dotenv.config({ path: [envFilePath, baseEnvFilePath] });
+process.env.ROOT_PATH = rootPath;
+process.env.ENV_FILE_PATH = envFilePath;
+process.env.BASE_ENV_FILE_PATH = baseEnvFilePath;
 const requiredEnvVars = ['SENTRY_DSN', 'API_VERSION', 'NODE_ENV'];
 requiredEnvVars.forEach((envVar) => {
     if (!process.env[envVar]) {
@@ -38,13 +70,26 @@ Sentry.init({
     release: process.env.API_VERSION || '',
     environment: process.env.NODE_ENV || 'unkown',
     debug: process.env.NODE_ENV === 'dev',
-    tracesSampleRate: 1.0,
-    profileSessionSampleRate: 1.0,
+    sampleRate: 1.0,
+    tracesSampleRate: 0.01,
+    profileSessionSampleRate: 0.01,
     profileLifecycle: 'trace',
     sendDefaultPii: true,
     integrations: [profiling_node_1.nodeProfilingIntegration],
 });
 const crud_1 = require("@dataui/crud");
+const core_1 = require("@nestjs/core");
+const typeorm_transactional_1 = require("typeorm-transactional");
+const nestjs_pino_1 = require("nestjs-pino");
+const session = require("express-session");
+const bodyParse = require("body-parser");
+const __1 = require("../");
+const common_1 = require("@nestjs/common");
+const nestjs_i18n_1 = require("nestjs-i18n");
+const nestjs_cls_1 = require("nestjs-cls");
+const compression = require("compression");
+const class_validator_1 = require("class-validator");
+const setup_1 = require("@sentry/nestjs/setup");
 crud_1.CrudConfigService.load({
     auth: {
         property: 'user',
@@ -72,16 +117,6 @@ crud_1.CrudConfigService.load({
         },
     },
 });
-const core_1 = require("@nestjs/core");
-const typeorm_transactional_1 = require("typeorm-transactional");
-const nestjs_pino_1 = require("nestjs-pino");
-const session = require("express-session");
-const bodyParse = require("body-parser");
-const __1 = require("../");
-const common_1 = require("@nestjs/common");
-const nestjs_i18n_1 = require("nestjs-i18n");
-const nestjs_cls_1 = require("nestjs-cls");
-const setup_1 = require("@sentry/nestjs/setup");
 const setupProcessHandlers = (app) => {
     const logger = app.get(nestjs_pino_1.Logger);
     process.on('uncaughtException', (error) => {
@@ -149,6 +184,7 @@ function bootstrapSetup(AppModule, SetupSwagger) {
         const app = yield core_1.NestFactory.create(AppModule, {
             bufferLogs: true,
         });
+        (0, class_validator_1.useContainer)(app.select(AppModule), { fallbackOnErrors: true });
         const configService = app.select(__1.ServiceRegistryModule).get(__1.ApiConfigService);
         const logger = app.get(nestjs_pino_1.Logger);
         setupProcessHandlers(app);
@@ -156,7 +192,7 @@ function bootstrapSetup(AppModule, SetupSwagger) {
         setupGracefulShutdown(app);
         app.enableVersioning();
         app.enable('trust proxy');
-        app.use(bodyParse.json({ limit: '50mb' }), new nestjs_cls_1.ClsMiddleware({}).use, (0, __1.RequestIdMiddleware)(), (0, __1.PowerByMiddleware)(), (0, __1.OmniAuthMiddleware)());
+        app.use(bodyParse.json({ limit: '50mb' }), new nestjs_cls_1.ClsMiddleware({}).use, (0, __1.RequestIdMiddleware)(), (0, __1.PowerByMiddleware)(), (0, __1.OmniAuthMiddleware)(), compression());
         const reflector = app.get(core_1.Reflector);
         app.useGlobalFilters(new setup_1.SentryGlobalFilter(), new __1.HttpExceptionFilter(), new __1.QueryFailedFilter(reflector));
         app.useGlobalInterceptors(new __1.LanguageInterceptor(), new __1.TranslationInterceptor(), new nestjs_pino_1.LoggerErrorInterceptor());

package/shared/serviceRegistryModule.js

@@ -14,6 +14,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceRegistryModule = void 0;
 const path = require("path");
@@ -31,53 +32,29 @@ const typeorm_transactional_1 = require("typeorm-transactional");
 const nestjs_i18n_1 = require("nestjs-i18n");
 const health_checker_module_1 = require("../health-checker/health-checker.module");
 const services_1 = require("./services");
-const fs_1 = require("fs");
-const path_1 = require("path");
+const nestjs_cls_1 = require("nestjs-cls");
 const providers = [
     services_1.ApiConfigService,
     services_1.ValidatorService,
     services_1.GeneratorService,
     services_1.TranslationService,
 ];
-const isTest = process.env.NODE_ENV === 'test';
-function findValidRootPath() {
-    const possibleRootPaths = [process.cwd(), __dirname];
-    const envFile = `${process.env.NODE_ENV || ''}.env`;
-    let envFilePath = '';
-    for (const rootPath of possibleRootPaths) {
-        const configPath = (0, path_1.join)(rootPath, 'config');
-        const baseEnvFilePath = (0, path_1.join)(configPath, 'base.env');
-        if (isTest) {
-            envFilePath = (0, path_1.join)(configPath, 'test.env');
-            if ((0, fs_1.existsSync)(envFilePath)) {
-                return { rootPath, baseEnvFilePath, envFilePath };
-            }
-            else {
-                envFilePath = (0, path_1.join)(configPath, 'dev.env');
-                if ((0, fs_1.existsSync)(envFilePath)) {
-                    return { rootPath, baseEnvFilePath, envFilePath };
-                }
-            }
-        }
-        else {
-            envFilePath = (0, path_1.join)(configPath, envFile);
-            if ((0, fs_1.existsSync)(envFilePath)) {
-                return { rootPath, baseEnvFilePath, envFilePath };
-            }
-        }
-    }
-    throw new Error(`No valid .env file: ${envFilePath}`);
+if (!((_a = process === null || process === void 0 ? void 0 : process.env) === null || _a === void 0 ? void 0 : _a.ENV_FILE_PATH)) {
+    require('../setup/bootstrap.setup');
 }
-const { envFilePath, rootPath, baseEnvFilePath } = findValidRootPath();
-services_1.ApiConfigService.rootPath = rootPath;
+services_1.ApiConfigService.rootPath = process.env.ROOT_PATH;
 const modules = [
+    setup_1.SentryModule.forRoot(),
     config_1.ConfigModule.forRoot({
         isGlobal: true,
         cache: true,
         expandVariables: false,
-        envFilePath: [envFilePath, baseEnvFilePath],
+        envFilePath: [process.env.ENV_FILE_PATH, process.env.BASE_ENV_FILE_PATH],
+    }),
+    nestjs_cls_1.ClsModule.forRoot({
+        global: true,
+        middleware: { mount: true },
     }),
-    setup_1.SentryModule.forRoot(),
     nestjs_pino_1.LoggerModule.forRootAsync({
         inject: [services_1.ApiConfigService],
         useFactory: (config) => config.pinoConfig,