@nest-omni/core 1.0.57 → 2.0.1-1

package/common/abstract.entity.d.ts

@@ -14,4 +14,5 @@ export declare class AbstractTranslationEntity<DTO extends AbstractTranslationDt
 }
 export declare class AbstractUuidPrimaryEntity<DTO extends AbstractDto = AbstractDto, O = never> extends AbstractBaseEntity<DTO, O> {
     id: string;
+    generateId(): void;
 }

package/common/abstract.entity.js

@@ -13,6 +13,7 @@ exports.AbstractUuidPrimaryEntity = exports.AbstractTranslationEntity = exports.
 const typeorm_1 = require("typeorm");
 const decorators_1 = require("../decorators");
 const constants_1 = require("../constants");
+const uuid_1 = require("uuid");
 class AbstractBaseEntity {
     toDto(options) {
         const dtoClass = Object.getPrototypeOf(this).dtoClass;
@@ -51,6 +52,12 @@ __decorate([
     __metadata("design:type", String)
 ], AbstractTranslationEntity.prototype, "languageCode", void 0);
 class AbstractUuidPrimaryEntity extends AbstractBaseEntity {
+    generateId() {
+        var _a;
+        if (!this.id || ((_a = this.id) === null || _a === void 0 ? void 0 : _a.length) < 2) {
+            this.id = (0, uuid_1.v4)();
+        }
+    }
 }
 exports.AbstractUuidPrimaryEntity = AbstractUuidPrimaryEntity;
 __decorate([
@@ -63,3 +70,9 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], AbstractUuidPrimaryEntity.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.BeforeInsert)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], AbstractUuidPrimaryEntity.prototype, "generateId", null);

package/decorators/field.decorators.d.ts

@@ -1,5 +1,5 @@
 import type { ApiPropertyOptions } from '@nestjs/swagger';
-import ValidatorJS from 'validator';
+import * as ValidatorJS from 'validator';
 type RequireField<T, K extends keyof T> = T & Required<Pick<T, K>>;
 interface IFieldOptions {
     each?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "1.0.57",
+  "version": "2.0.1-1",
   "description": "framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -34,8 +34,6 @@
     "@nestjs/swagger": "^7.1.11",
     "@nestjs/terminus": "^10.1.1",
     "@nestjs/typeorm": "^10.0.0",
-    "@ntegral/nestjs-sentry": "^4.0.0",
-    "@sentry/node": "^7.69.0",
     "axios": "^1.5.0",
     "axios-retry": "^3.7.0",
     "bcrypt": "5.1.0",

package/setup/bootstrap.setup.d.ts

@@ -1,2 +1,2 @@
 import type { NestExpressApplication } from '@nestjs/platform-express';
-export declare function bootstrapSetup(AppModule: any, SetupSwagger: any): Promise<NestExpressApplication<import("http").Server>>;
+export declare function bootstrapSetup(AppModule: any, SetupSwagger: any): Promise<NestExpressApplication<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>>>;

package/setup/bootstrap.setup.js

@@ -10,19 +10,41 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bootstrapSetup = bootstrapSetup;
-const core_1 = require("@nestjs/core");
-const typeorm_transactional_1 = require("typeorm-transactional");
-const skywalking_backend_js_1 = require("skywalking-backend-js");
-const nestjs_pino_1 = require("nestjs-pino");
-const session = require("express-session");
-const bodyParse = require("body-parser");
+const Sentry = require("@sentry/nestjs");
+const profiling_node_1 = require("@sentry/profiling-node");
+const dotenv = require("dotenv");
+const fs_1 = require("fs");
 const path_1 = require("path");
-const __1 = require("../");
-const common_1 = require("@nestjs/common");
-const nestjs_sentry_1 = require("@ntegral/nestjs-sentry");
-const nestjs_i18n_1 = require("nestjs-i18n");
+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 requiredEnvVars = ['SENTRY_DSN', 'API_VERSION', 'NODE_ENV'];
+requiredEnvVars.forEach((envVar) => {
+    if (!process.env[envVar]) {
+        throw new Error(`Missing required environment variable: ${envVar}`);
+    }
+});
+Sentry.init({
+    dsn: process.env.SENTRY_DSN || '',
+    release: process.env.API_VERSION || '',
+    environment: process.env.NODE_ENV || 'unkown',
+    debug: process.env.NODE_ENV === 'dev',
+    tracesSampleRate: 1.0,
+    profileSessionSampleRate: 1.0,
+    profileLifecycle: 'trace',
+    sendDefaultPii: true,
+    integrations: [profiling_node_1.nodeProfilingIntegration],
+});
 const crud_1 = require("@dataui/crud");
-const nestjs_cls_1 = require("nestjs-cls");
 crud_1.CrudConfigService.load({
     auth: {
         property: 'user',
@@ -50,6 +72,16 @@ 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) => {
@@ -126,18 +158,8 @@ function bootstrapSetup(AppModule, SetupSwagger) {
         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)());
         const reflector = app.get(core_1.Reflector);
-        app.useGlobalFilters(new __1.HttpExceptionFilter(), new __1.QueryFailedFilter(reflector));
-        app.useGlobalInterceptors(new __1.LanguageInterceptor(), new __1.TranslationInterceptor(), new nestjs_pino_1.LoggerErrorInterceptor(), new nestjs_sentry_1.SentryInterceptor({
-            filters: [
-                {
-                    type: common_1.HttpException,
-                    filter: (exception) => {
-                        const status = exception.getStatus();
-                        return status === 401 || status === 404 || 200 > status;
-                    },
-                },
-            ],
-        }));
+        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());
         app.useGlobalPipes(new nestjs_i18n_1.I18nValidationPipe({
             whitelist: true,
             errorHttpStatusCode: common_1.HttpStatus.UNPROCESSABLE_ENTITY,
@@ -145,10 +167,6 @@ function bootstrapSetup(AppModule, SetupSwagger) {
             stopAtFirstError: true,
             validationError: { target: false, value: false },
         }));
-        if (configService.skywalkingEnabled) {
-            skywalking_backend_js_1.default.start();
-            logger.log('SkyWalking agent initialized');
-        }
         if (configService.documentationEnabled && SetupSwagger) {
             SetupSwagger(app, configService.documentationPath);
             logger.log(`Swagger docs available at ${configService.documentationPath}`);

package/shared/serviceRegistryModule.js

@@ -25,7 +25,7 @@ const config_1 = require("@nestjs/config");
 const common_1 = require("@nestjs/common");
 const typeorm_2 = require("@nestjs/typeorm");
 const schedule_1 = require("@nestjs/schedule");
-const nestjs_sentry_1 = require("@ntegral/nestjs-sentry");
+const setup_1 = require("@sentry/nestjs/setup");
 const cache_manager_1 = require("@nestjs/cache-manager");
 const typeorm_transactional_1 = require("typeorm-transactional");
 const nestjs_i18n_1 = require("nestjs-i18n");
@@ -77,12 +77,7 @@ const modules = [
         expandVariables: false,
         envFilePath: [envFilePath, baseEnvFilePath],
     }),
-    nestjs_sentry_1.SentryModule.forRootAsync({
-        inject: [services_1.ApiConfigService],
-        useFactory(configService) {
-            return configService.sentryConfig;
-        },
-    }),
+    setup_1.SentryModule.forRoot(),
     nestjs_pino_1.LoggerModule.forRootAsync({
         inject: [services_1.ApiConfigService],
         useFactory: (config) => config.pinoConfig,
@@ -101,9 +96,6 @@ const modules = [
     }),
     health_checker_module_1.HealthCheckerModule,
 ];
-if (services_1.ApiConfigService.toBoolean(process.env.S3_ENABLED, false)) {
-    providers.push(services_1.AwsS3Service);
-}
 if (services_1.ApiConfigService.toBoolean(process.env.DB_ENABLED, true)) {
     modules.push(typeorm_2.TypeOrmModule.forRootAsync({
         inject: [services_1.ApiConfigService],
@@ -122,6 +114,7 @@ if (services_1.ApiConfigService.toBoolean(process.env.BULL_ENABLED)) {
 if (services_1.ApiConfigService.toBoolean(process.env.CACHE_ENABLED)) {
     modules.push(cache_manager_1.CacheModule.registerAsync({
         inject: [services_1.ApiConfigService],
+        isGlobal: true,
         useFactory: (config) => config.cacheConfig(),
     }));
 }
@@ -136,6 +129,6 @@ exports.ServiceRegistryModule = ServiceRegistryModule = __decorate([
     (0, common_1.Module)({
         providers,
         imports: modules,
-        exports: [...providers, ...modules],
+        exports: [...providers],
     })
 ], ServiceRegistryModule);

package/shared/services/api-config.service.d.ts

@@ -1,6 +1,5 @@
 import { ConfigService } from '@nestjs/config';
 import type { TypeOrmModuleOptions } from '@nestjs/typeorm';
-import { SentryModuleOptions } from '@ntegral/nestjs-sentry/lib/sentry.interfaces';
 import session from 'express-session';
 import { Params } from 'nestjs-pino';
 import { BullRootModuleOptions } from '@nestjs/bull/dist/interfaces/bull-module-options.interface';
@@ -12,36 +11,25 @@ export declare class ApiConfigService {
     constructor(configService: ConfigService);
     static getRootPath(): string;
     get isDev(): boolean;
+    get apiVersion(): string;
     get isProd(): boolean;
     get isSit(): boolean;
     get isUat(): boolean;
     get isTest(): boolean;
-    getNumber(key: string): number;
-    getBoolean(key: string): boolean;
+    getNumber(key: string, defaultValue?: number): number;
+    getBoolean(key: string, defaultValue?: boolean): boolean;
     static toBoolean(value: string, defaultValue?: any): boolean;
     getString(key: string): string;
     get nodeEnv(): string;
     get fallbackLanguage(): string;
-    get sentryConfig(): SentryModuleOptions;
     get typeormConfig(): TypeOrmModuleOptions;
-    get awsS3Config(): {
-        bucketRegion: string;
-        bucketApiVersion: string;
-        bucketName: string;
-    };
     get documentationEnabled(): boolean;
     get documentationPath(): string;
-    get skywalkingEnabled(): boolean;
     get viewsEnabled(): boolean;
     get sessionEnabled(): boolean;
     get corsEnabled(): boolean;
     get corsConfig(): CorsOptions;
     get sessionConfig(): session.SessionOptions;
-    get natsEnabled(): boolean;
-    get natsConfig(): {
-        host: string;
-        port: number;
-    };
     get authConfig(): {
         privateKey: string;
         publicKey: string;

package/shared/services/api-config.service.js

@@ -40,6 +40,9 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
     get isDev() {
         return this.nodeEnv === 'dev';
     }
+    get apiVersion() {
+        return this.getString('API_VERSION');
+    }
     get isProd() {
         return this.nodeEnv === 'prod';
     }
@@ -52,8 +55,8 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
     get isTest() {
         return this.nodeEnv === 'test';
     }
-    getNumber(key) {
-        const value = this.get(key);
+    getNumber(key, defaultValue) {
+        const value = this.get(key, defaultValue);
         try {
             return Number(value);
         }
@@ -61,8 +64,8 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
             throw new Error(`key:${key}, value:${value} - is not a number`);
         }
     }
-    getBoolean(key) {
-        const value = this.get(key);
+    getBoolean(key, defaultValue) {
+        const value = this.get(key, defaultValue);
         return ApiConfigService_1.toBoolean(value);
     }
     static toBoolean(value, defaultValue = null) {
@@ -86,20 +89,6 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
     get fallbackLanguage() {
         return this.getString('FALLBACK_LANGUAGE');
     }
-    get sentryConfig() {
-        return {
-            dsn: this.getString('SENTRY_DSN'),
-            debug: this.isDev,
-            environment: this.nodeEnv,
-            tracesSampleRate: 1.0,
-            release: '0.0.1',
-            logLevels: ['warn', 'error'],
-            close: {
-                enabled: true,
-                timeout: 10 * 1000,
-            },
-        };
-    }
     get typeormConfig() {
         return {
             autoLoadEntities: true,
@@ -125,22 +114,12 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
                 : false,
         };
     }
-    get awsS3Config() {
-        return {
-            bucketRegion: this.getString('AWS_S3_BUCKET_REGION'),
-            bucketApiVersion: this.getString('AWS_S3_API_VERSION'),
-            bucketName: this.getString('AWS_S3_BUCKET_NAME'),
-        };
-    }
     get documentationEnabled() {
         return this.getBoolean('SWAGGER_ENABLED');
     }
     get documentationPath() {
         return this.getString('SWAGGER_PATH');
     }
-    get skywalkingEnabled() {
-        return this.getBoolean('SW_ENABLED');
-    }
     get viewsEnabled() {
         return this.getBoolean('VIEWS_ENABLED');
     }
@@ -198,15 +177,6 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
         }
         return config;
     }
-    get natsEnabled() {
-        return this.getBoolean('NATS_ENABLED');
-    }
-    get natsConfig() {
-        return {
-            host: this.getString('NATS_HOST'),
-            port: this.getNumber('NATS_PORT'),
-        };
-    }
     get authConfig() {
         return {
             privateKey: this.getString('JWT_PRIVATE_KEY'),
@@ -244,12 +214,12 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
             defaultJobOptions: {
                 removeOnComplete: true,
                 removeOnFail: true,
-                attempts: this.getNumber('BULL_JOB_ATTEMPTS') || 5,
+                attempts: this.getNumber('BULL_JOB_ATTEMPTS', 5),
                 backoff: {
                     type: 'exponential',
-                    delay: this.getNumber('BULL_JOB_BACKOFF_DELAY_MS') || 5000,
+                    delay: this.getNumber('BULL_JOB_BACKOFF_DELAY_MS', 5000),
                 },
-                timeout: this.getNumber('BULL_JOB_TIMEOUT_MS') || 30 * 1000,
+                timeout: this.getNumber('BULL_JOB_TIMEOUT_MS', 30 * 1000),
             },
             settings: {
                 maxStalledCount: 2,
@@ -257,7 +227,7 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
                 retryProcessDelay: 1000,
             },
             limiter: {
-                max: this.getNumber('BULL_MAX_CONCURRENT_JOBS') || 100,
+                max: this.getNumber('BULL_MAX_CONCURRENT_JOBS', 100),
                 duration: 1000,
             },
         };
@@ -314,9 +284,12 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
             port: this.getNumber('DIRECT_PROXY_PORT'),
         };
     }
-    get(key) {
+    get(key, defaultValue) {
         const value = this.configService.get(key);
         if ((0, lodash_1.isNil)(value)) {
+            if (defaultValue) {
+                return defaultValue;
+            }
             throw new Error(`key:'${key}' - environment does not set`);
         }
         return value;

package/shared/services/index.d.ts

@@ -1,5 +1,4 @@
 export * from './api-config.service';
-export * from './aws-s3.service';
 export * from './generator.service';
 export * from './translation.service';
 export * from './validator.service';

package/shared/services/index.js

@@ -15,7 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./api-config.service"), exports);
-__exportStar(require("./aws-s3.service"), exports);
 __exportStar(require("./generator.service"), exports);
 __exportStar(require("./translation.service"), exports);
 __exportStar(require("./validator.service"), exports);