@nest-omni/core 2.0.1-10 → 2.0.1-2

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' || process.env.MOCK_ENABLED === 'true') {
+        if (process.env.NODE_ENV === 'dev') {
             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-10",
+  "version": "2.0.1-2",
   "description": "framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,8 +17,7 @@
   "author": "Jinpy",
   "license": "Apache-2.0",
   "devDependencies": {
-    "typescript": "^5.4.5",
-    "@types/compression": "^1.8.1"
+    "typescript": "^5.4.5"
   },
   "peerDependencies": {
     "@dataui/crud": "^5.3.0",
@@ -34,6 +33,8 @@
     "@nestjs/schedule": "^3.0.3",
     "@nestjs/swagger": "^7.1.11",
     "@nestjs/terminus": "^10.1.1",
+    "@sentry/nestjs": "^10.10.0",
+    "@sentry/profiling-node": "^10.10.0",
     "@nestjs/typeorm": "^10.0.0",
     "axios": "^1.5.0",
     "axios-retry": "^3.7.0",
@@ -64,13 +65,6 @@
     "uuid": "^9.0.1"
   },
   "dependencies": {
-    "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"
+    "hygen": "^6.2.11"
   }
 }

package/setup/bootstrap.setup.js

@@ -15,50 +15,18 @@ const profiling_node_1 = require("@sentry/profiling-node");
 const dotenv = require("dotenv");
 const fs_1 = require("fs");
 const path_1 = require("path");
-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 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 { 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]) {
@@ -77,18 +45,6 @@ Sentry.init({
     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',
@@ -116,6 +72,18 @@ 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 compression = require("compression");
+const class_validator_1 = require("class-validator");
+const setup_1 = require("@sentry/nestjs/setup");
 const setupProcessHandlers = (app) => {
     const logger = app.get(nestjs_pino_1.Logger);
     process.on('uncaughtException', (error) => {

package/shared/serviceRegistryModule.js

@@ -14,7 +14,6 @@ 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");
@@ -32,6 +31,8 @@ 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,
@@ -39,17 +40,44 @@ const providers = [
     services_1.GeneratorService,
     services_1.TranslationService,
 ];
-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 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}`);
 }
-services_1.ApiConfigService.rootPath = process.env.ROOT_PATH;
+const { envFilePath, rootPath, baseEnvFilePath } = findValidRootPath();
+services_1.ApiConfigService.rootPath = rootPath;
 const modules = [
     setup_1.SentryModule.forRoot(),
     config_1.ConfigModule.forRoot({
         isGlobal: true,
         cache: true,
         expandVariables: false,
-        envFilePath: [process.env.ENV_FILE_PATH, process.env.BASE_ENV_FILE_PATH],
+        envFilePath: [envFilePath, baseEnvFilePath],
     }),
     nestjs_cls_1.ClsModule.forRoot({
         global: true,