cnpmcore 3.73.0 → 3.74.0

package/dist/app/common/EnvUtil.d.ts

@@ -0,0 +1,4 @@
+export type ValueType = 'string' | 'boolean' | 'number';
+export declare function env(key: string, valueType: ValueType, defaultValue: string): string;
+export declare function env(key: string, valueType: ValueType, defaultValue: boolean): boolean;
+export declare function env(key: string, valueType: ValueType, defaultValue: number): number;

package/dist/app/common/EnvUtil.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.env = void 0;
+function env(key, valueType, defaultValue) {
+    const value = process.env[key];
+    if (value === undefined) {
+        return defaultValue;
+    }
+    if (valueType === 'string') {
+        return value;
+    }
+    if (valueType === 'boolean') {
+        let booleanValue = false;
+        if (value === 'true' || value === '1') {
+            booleanValue = true;
+        }
+        else if (value === 'false' || value === '0') {
+            booleanValue = false;
+        }
+        else {
+            throw new TypeError(`Invalid boolean value: ${value} on process.env.${key}`);
+        }
+        return booleanValue;
+    }
+    if (valueType === 'number') {
+        const numberValue = Number(value);
+        if (isNaN(numberValue)) {
+            throw new TypeError(`Invalid number value: ${value} on process.env.${key}`);
+        }
+        return numberValue;
+    }
+    throw new TypeError(`Invalid value type: ${valueType}`);
+}
+exports.env = env;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52VXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9jb21tb24vRW52VXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFLQSxTQUFnQixHQUFHLENBQUMsR0FBVyxFQUFFLFNBQW9CLEVBQUUsWUFBdUM7SUFDNUYsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMvQixJQUFJLEtBQUssS0FBSyxTQUFTLEVBQUU7UUFDdkIsT0FBTyxZQUFZLENBQUM7S0FDckI7SUFFRCxJQUFJLFNBQVMsS0FBSyxRQUFRLEVBQUU7UUFDMUIsT0FBTyxLQUFLLENBQUM7S0FDZDtJQUVELElBQUksU0FBUyxLQUFLLFNBQVMsRUFBRTtRQUMzQixJQUFJLFlBQVksR0FBRyxLQUFLLENBQUM7UUFDekIsSUFBSSxLQUFLLEtBQUssTUFBTSxJQUFJLEtBQUssS0FBSyxHQUFHLEVBQUU7WUFDckMsWUFBWSxHQUFHLElBQUksQ0FBQztTQUNyQjthQUFNLElBQUksS0FBSyxLQUFLLE9BQU8sSUFBSSxLQUFLLEtBQUssR0FBRyxFQUFFO1lBQzdDLFlBQVksR0FBRyxLQUFLLENBQUM7U0FDdEI7YUFBTTtZQUNMLE1BQU0sSUFBSSxTQUFTLENBQUMsMEJBQTBCLEtBQUssbUJBQW1CLEdBQUcsRUFBRSxDQUFDLENBQUM7U0FDOUU7UUFDRCxPQUFPLFlBQVksQ0FBQztLQUNyQjtJQUVELElBQUksU0FBUyxLQUFLLFFBQVEsRUFBRTtRQUMxQixNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDbEMsSUFBSSxLQUFLLENBQUMsV0FBVyxDQUFDLEVBQUU7WUFDdEIsTUFBTSxJQUFJLFNBQVMsQ0FBQyx5QkFBeUIsS0FBSyxtQkFBbUIsR0FBRyxFQUFFLENBQUMsQ0FBQztTQUM3RTtRQUNELE9BQU8sV0FBVyxDQUFDO0tBQ3BCO0lBRUQsTUFBTSxJQUFJLFNBQVMsQ0FBQyx1QkFBdUIsU0FBUyxFQUFFLENBQUMsQ0FBQztBQUMxRCxDQUFDO0FBL0JELGtCQStCQyJ9

package/dist/app/port/webauth/WebauthController.d.ts

@@ -5,7 +5,7 @@ import type { PublicKeyCredentialCreationOptionsJSON, PublicKeyCredentialRequest
 import { UserService } from '../../core/service/UserService';
 import { MiddlewareController } from '../middleware';
 declare const LoginRequestRule: import("@sinclair/typebox").TObject<{
-    hostname: import("@sinclair/typebox").TString;
+    hostname: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
 }>;
 type LoginRequest = Static<typeof LoginRequestRule>;
 type LoginPrepareResult = {

package/dist/app/port/webauth/WebauthController.js

@@ -30,8 +30,8 @@ const AuthAdapter_1 = require("../../infra/AuthAdapter");
 const CryptoUtil_1 = require("../../common/CryptoUtil");
 const UserUtil_1 = require("../../common/UserUtil");
 const LoginRequestRule = typebox_1.Type.Object({
-    // cli 所在机器的 hostname
-    hostname: typebox_1.Type.String({ minLength: 1, maxLength: 100 }),
+    // cli 所在机器的 hostname，最新版本 npm cli 已经不会上报 hostname
+    hostname: typebox_1.Type.Optional(typebox_1.Type.String({ minLength: 1, maxLength: 100 })),
 });
 const UserRule = typebox_1.Type.Object({
     name: typebox_1.Type.String({ minLength: 1, maxLength: 100 }),
@@ -382,4 +382,4 @@ __decorate([
 exports.WebauthController = WebauthController = __decorate([
     (0, tegg_1.HTTPController)()
 ], WebauthController);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"WebauthController.js","sourceRoot":"","sources":["../../../../app/port/webauth/WebauthController.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"WebauthController.js","sourceRoot":"","sources":["../../../../app/port/webauth/WebauthController.ts"],"names":[],"mappings":"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"}

package/dist/config/config.default.js

@@ -10,13 +10,14 @@ const node_path_1 = require("node:path");
 const oss_cnpm_1 = __importDefault(require("oss-cnpm"));
 const typebox_1 = require("../app/port/typebox");
 const constants_1 = require("../app/common/constants");
+const EnvUtil_1 = require("../app/common/EnvUtil");
 const database_1 = require("./database");
 exports.cnpmcoreConfig = {
     name: 'cnpm',
     hookEnable: false,
     hooksLimit: 20,
-    sourceRegistry: 'https://registry.npmjs.org',
-    sourceRegistryIsCNpm: false,
+    sourceRegistry: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_SOURCE_REGISTRY', 'string', 'https://registry.npmjs.org'),
+    sourceRegistryIsCNpm: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_SOURCE_REGISTRY_IS_CNPM', 'boolean', false),
     syncUpstreamFirst: false,
     sourceRegistrySyncTimeout: 180000,
     taskQueueHighWaterSize: 100,
@@ -36,7 +37,7 @@ exports.cnpmcoreConfig = {
     checkChangesStreamInterval: 500,
     changesStreamRegistry: 'https://replicate.npmjs.com',
     changesStreamRegistryMode: constants_1.ChangesStreamMode.streaming,
-    registry: process.env.CNPMCORE_CONFIG_REGISTRY || 'http://localhost:7001',
+    registry: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_REGISTRY', 'string', 'http://localhost:7001'),
     alwaysAuth: false,
     allowScopes: [
         '@cnpm',
@@ -48,7 +49,7 @@ exports.cnpmcoreConfig = {
     admins: {
         cnpmcore_admin: 'admin@cnpmjs.org',
     },
-    enableWebAuthn: !!process.env.CNPMCORE_CONFIG_ENABLE_WEB_AUTHN,
+    enableWebAuthn: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ENABLE_WEB_AUTHN', 'boolean', false),
     enableCDN: false,
     cdnCacheControlHeader: 'public, max-age=300',
     cdnVaryHeader: 'Accept, Accept-Encoding',
@@ -60,7 +61,7 @@ exports.cnpmcoreConfig = {
     enableSyncUnpkgFiles: true,
     enableSyncUnpkgFilesWhiteList: false,
     strictSyncSpecivicVersion: false,
-    enableElasticsearch: !!process.env.CNPMCORE_CONFIG_ENABLE_ES,
+    enableElasticsearch: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ENABLE_ES', 'boolean', false),
     elasticsearchIndex: 'cnpmcore_packages',
     strictValidateTarballPkg: false,
     strictValidatePackageDeps: false,
@@ -70,13 +71,13 @@ exports.cnpmcoreConfig = {
 };
 exports.default = (appInfo) => {
     const config = {};
-    config.keys = process.env.CNPMCORE_EGG_KEYS || (0, node_crypto_1.randomUUID)();
+    config.keys = (0, EnvUtil_1.env)('CNPMCORE_EGG_KEYS', 'string', (0, node_crypto_1.randomUUID)());
     config.cnpmcore = exports.cnpmcoreConfig;
     // override config from framework / plugin
-    config.dataDir = process.env.CNPMCORE_DATA_DIR || (0, node_path_1.join)(appInfo.root, '.cnpmcore');
+    config.dataDir = (0, EnvUtil_1.env)('CNPMCORE_DATA_DIR', 'string', (0, node_path_1.join)(appInfo.root, '.cnpmcore'));
     config.orm = {
         ...database_1.database,
-        database: database_1.database.name ?? 'cnpmcore',
+        database: database_1.database.name || 'cnpmcore',
         charset: 'utf8mb4',
         logger: {
             // https://github.com/cyjake/leoric/blob/master/docs/zh/logging.md#logqueryerror
@@ -89,10 +90,10 @@ exports.default = (appInfo) => {
     };
     config.redis = {
         client: {
-            port: Number(process.env.CNPMCORE_REDIS_PORT || 6379),
-            host: process.env.CNPMCORE_REDIS_HOST || '127.0.0.1',
-            password: process.env.CNPMCORE_REDIS_PASSWORD || '',
-            db: Number(process.env.CNPMCORE_REDIS_DB || 0),
+            port: (0, EnvUtil_1.env)('CNPMCORE_REDIS_PORT', 'number', 6379),
+            host: (0, EnvUtil_1.env)('CNPMCORE_REDIS_HOST', 'string', '127.0.0.1'),
+            password: (0, EnvUtil_1.env)('CNPMCORE_REDIS_PASSWORD', 'string', ''),
+            db: (0, EnvUtil_1.env)('CNPMCORE_REDIS_DB', 'number', 0),
         },
     };
     config.security = {
@@ -111,59 +112,61 @@ exports.default = (appInfo) => {
     };
     config.nfs = {
         client: null,
-        dir: process.env.CNPMCORE_NFS_DIR || (0, node_path_1.join)(config.dataDir, 'nfs'),
+        dir: (0, EnvUtil_1.env)('CNPMCORE_NFS_DIR', 'string', (0, node_path_1.join)(config.dataDir, 'nfs')),
     };
     /* c8 ignore next 17 */
     // enable oss nfs store by env values
-    if (process.env.CNPMCORE_NFS_TYPE === 'oss') {
-        (0, node_assert_1.strict)(process.env.CNPMCORE_NFS_OSS_BUCKET, 'require env CNPMCORE_NFS_OSS_BUCKET');
-        (0, node_assert_1.strict)(process.env.CNPMCORE_NFS_OSS_ENDPOINT, 'require env CNPMCORE_NFS_OSS_ENDPOINT');
-        (0, node_assert_1.strict)(process.env.CNPMCORE_NFS_OSS_ID, 'require env CNPMCORE_NFS_OSS_ID');
-        (0, node_assert_1.strict)(process.env.CNPMCORE_NFS_OSS_SECRET, 'require env CNPMCORE_NFS_OSS_SECRET');
-        config.nfs.client = new oss_cnpm_1.default({
-            cdnBaseUrl: process.env.CNPMCORE_NFS_OSS_CDN,
-            endpoint: process.env.CNPMCORE_NFS_OSS_ENDPOINT,
-            bucket: process.env.CNPMCORE_NFS_OSS_BUCKET,
-            accessKeyId: process.env.CNPMCORE_NFS_OSS_ID,
-            accessKeySecret: process.env.CNPMCORE_NFS_OSS_SECRET,
+    const nfsType = (0, EnvUtil_1.env)('CNPMCORE_NFS_TYPE', 'string', '');
+    if (nfsType === 'oss') {
+        const ossConfig = {
+            cdnBaseUrl: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_CDN', 'string', ''),
+            endpoint: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_ENDPOINT', 'string', ''),
+            bucket: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_BUCKET', 'string', ''),
+            accessKeyId: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_ID', 'string', ''),
+            accessKeySecret: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_SECRET', 'string', ''),
             defaultHeaders: {
                 'Cache-Control': 'max-age=0, s-maxage=60',
             },
-        });
+        };
+        (0, node_assert_1.strict)(ossConfig.cdnBaseUrl, 'require env CNPMCORE_NFS_OSS_BUCKET');
+        (0, node_assert_1.strict)(ossConfig.endpoint, 'require env CNPMCORE_NFS_OSS_ENDPOINT');
+        (0, node_assert_1.strict)(ossConfig.accessKeyId, 'require env CNPMCORE_NFS_OSS_ID');
+        (0, node_assert_1.strict)(ossConfig.accessKeySecret, 'require env CNPMCORE_NFS_OSS_SECRET');
+        config.nfs.client = new oss_cnpm_1.default(ossConfig);
     }
-    else if (process.env.CNPMCORE_NFS_TYPE === 's3') {
-        (0, node_assert_1.strict)(process.env.CNPMCORE_NFS_S3_CLIENT_ENDPOINT, 'require env CNPMCORE_NFS_S3_CLIENT_ENDPOINT');
-        (0, node_assert_1.strict)(process.env.CNPMCORE_NFS_S3_CLIENT_ID, 'require env CNPMCORE_NFS_S3_CLIENT_ID');
-        (0, node_assert_1.strict)(process.env.CNPMCORE_NFS_S3_CLIENT_SECRET, 'require env CNPMCORE_NFS_S3_CLIENT_SECRET');
-        (0, node_assert_1.strict)(process.env.CNPMCORE_NFS_S3_CLIENT_BUCKET, 'require env CNPMCORE_NFS_S3_CLIENT_BUCKET');
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const S3Client = require('s3-cnpmcore');
-        config.nfs.client = new S3Client({
-            region: process.env.CNPMCORE_NFS_S3_CLIENT_REGION || 'default',
-            endpoint: process.env.CNPMCORE_NFS_S3_CLIENT_ENDPOINT,
+    else if (nfsType === 's3') {
+        const s3Config = {
+            region: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_REGION', 'string', 'default'),
+            endpoint: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_ENDPOINT', 'string', ''),
             credentials: {
-                accessKeyId: process.env.CNPMCORE_NFS_S3_CLIENT_ID,
-                secretAccessKey: process.env.CNPMCORE_NFS_S3_CLIENT_SECRET,
+                accessKeyId: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_ID', 'string', ''),
+                secretAccessKey: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_SECRET', 'string', ''),
             },
-            bucket: process.env.CNPMCORE_NFS_S3_CLIENT_BUCKET,
-            forcePathStyle: !!process.env.CNPMCORE_NFS_S3_CLIENT_FORCE_PATH_STYLE,
-            disableURL: !!process.env.CNPMCORE_NFS_S3_CLIENT_DISABLE_URL,
-        });
+            bucket: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_BUCKET', 'string', ''),
+            forcePathStyle: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_FORCE_PATH_STYLE', 'boolean', false),
+            disableURL: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_DISABLE_URL', 'boolean', false),
+        };
+        (0, node_assert_1.strict)(s3Config.endpoint, 'require env CNPMCORE_NFS_S3_CLIENT_ENDPOINT');
+        (0, node_assert_1.strict)(s3Config.credentials.accessKeyId, 'require env CNPMCORE_NFS_S3_CLIENT_ID');
+        (0, node_assert_1.strict)(s3Config.credentials.secretAccessKey, 'require env CNPMCORE_NFS_S3_CLIENT_SECRET');
+        (0, node_assert_1.strict)(s3Config.bucket, 'require env CNPMCORE_NFS_S3_CLIENT_BUCKET');
+        // TODO(@fengmk2): should change to use import to support esm
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const S3Client = require('s3-cnpmcore');
+        config.nfs.client = new S3Client(s3Config);
     }
     config.logger = {
         enablePerformanceTimer: true,
         enableFastContextLogger: true,
-        appLogName: process.env.CNPMCORE_APP_LOG_NAME || `${appInfo.name}-web.log`,
-        coreLogName: process.env.CNPMCORE_CORE_LOG_NAME || 'egg-web.log',
-        agentLogName: process.env.CNPMCORE_AGENT_LOG_NAME || 'egg-agent.log',
-        errorLogName: process.env.CNPMCORE_ERROR_LOG_NAME || 'common-error.log',
-        outputJSON: Boolean(process.env.CNPMCORE_LOG_JSON_OUTPUT || false),
+        appLogName: (0, EnvUtil_1.env)('CNPMCORE_APP_LOG_NAME', 'string', `${appInfo.name}-web.log`),
+        coreLogName: (0, EnvUtil_1.env)('CNPMCORE_CORE_LOG_NAME', 'string', 'egg-web.log'),
+        agentLogName: (0, EnvUtil_1.env)('CNPMCORE_AGENT_LOG_NAME', 'string', 'egg-agent.log'),
+        errorLogName: (0, EnvUtil_1.env)('CNPMCORE_ERROR_LOG_NAME', 'string', 'common-error.log'),
+        outputJSON: (0, EnvUtil_1.env)('CNPMCORE_LOG_JSON_OUTPUT', 'boolean', false),
     };
-    if (process.env.CNPMCORE_LOG_DIR) {
-        config.logger.dir = process.env.CNPMCORE_LOG_DIR;
-    }
-    if (process.env.CNPMCORE_LOG_JSON_OUTPUT) {
-        config.logger.outputJSON = Boolean(process.env.CNPMCORE_LOG_JSON_OUTPUT);
+    const logDir = (0, EnvUtil_1.env)('CNPMCORE_LOG_DIR', 'string', '');
+    if (logDir) {
+        config.logger.dir = logDir;
     }
     config.logrotator = {
         // only keep 1 days log files
@@ -196,14 +199,14 @@ exports.default = (appInfo) => {
     if (config.cnpmcore.enableElasticsearch) {
         config.elasticsearch = {
             client: {
-                node: process.env.CNPMCORE_CONFIG_ES_CLIENT_NODE,
+                node: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ES_CLIENT_NODE', 'string', ''),
                 auth: {
-                    username: process.env.CNPMCORE_CONFIG_ES_CLIENT_AUTH_USERNAME,
-                    password: process.env.CNPMCORE_CONFIG_ES_CLIENT_AUTH_PASSWORD,
+                    username: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ES_CLIENT_AUTH_USERNAME', 'string', ''),
+                    password: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ES_CLIENT_AUTH_PASSWORD', 'string', ''),
                 },
             },
         };
     }
     return config;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmRlZmF1bHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb25maWcvY29uZmlnLmRlZmF1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsNkNBQStDO0FBQy9DLDZDQUF5QztBQUN6Qyx5Q0FBaUM7QUFFakMsd0RBQWlDO0FBQ2pDLGlEQUErQztBQUMvQyx1REFBNEc7QUFFNUcseUNBQXNDO0FBRXpCLFFBQUEsY0FBYyxHQUFtQjtJQUM1QyxJQUFJLEVBQUUsTUFBTTtJQUNaLFVBQVUsRUFBRSxLQUFLO0lBQ2pCLFVBQVUsRUFBRSxFQUFFO0lBQ2QsY0FBYyxFQUFFLDRCQUE0QjtJQUM1QyxvQkFBb0IsRUFBRSxLQUFLO0lBQzNCLGlCQUFpQixFQUFFLEtBQUs7SUFDeEIseUJBQXlCLEVBQUUsTUFBTTtJQUNqQyxzQkFBc0IsRUFBRSxHQUFHO0lBQzNCLFFBQVEsRUFBRSxvQkFBUSxDQUFDLElBQUk7SUFDdkIsY0FBYyxFQUFFLDBCQUFjLENBQUMsTUFBTTtJQUNyQyxtQ0FBbUMsRUFBRSxFQUFFO0lBQ3ZDLG1DQUFtQyxFQUFFLEVBQUU7SUFDdkMseUNBQXlDLEVBQUUsRUFBRTtJQUM3QyxvQkFBb0IsRUFBRSxFQUFFO0lBQ3hCLDBCQUEwQixFQUFFLElBQUk7SUFDaEMsZ0JBQWdCLEVBQUUsS0FBSztJQUN2Qix1QkFBdUIsRUFBRSxFQUFFO0lBQzNCLHNCQUFzQixFQUFFLEtBQUs7SUFDN0IsOEJBQThCLEVBQUUsRUFBRTtJQUNsQyx1QkFBdUIsRUFBRSxFQUFFO0lBQzNCLG1CQUFtQixFQUFFLEtBQUs7SUFDMUIsMEJBQTBCLEVBQUUsR0FBRztJQUMvQixxQkFBcUIsRUFBRSw2QkFBNkI7SUFDcEQseUJBQXlCLEVBQUUsNkJBQWlCLENBQUMsU0FBUztJQUN0RCxRQUFRLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyx3QkFBd0IsSUFBSSx1QkFBdUI7SUFDekUsVUFBVSxFQUFFLEtBQUs7SUFDakIs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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.default.js","sourceRoot":"","sources":["../../config/config.default.ts"],"names":[],"mappings":"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"}

package/dist/config/config.unittest.js

@@ -12,7 +12,7 @@ exports.default = (appInfo) => {
     const config = {};
     config.dataDir = (0, path_1.join)(appInfo.root, '.cnpmcore_unittest');
     config.orm = {
-        database: database_1.database.name ?? 'cnpmcore_unittest',
+        database: database_1.database.name || 'cnpmcore_unittest',
     };
     config.nfs = {
         dir: (0, path_1.join)(config.dataDir, 'nfs'),

package/dist/config/database.d.ts

@@ -7,9 +7,9 @@ export declare const database: {
     type: string;
     dialect: string;
     client: string;
-    name: string | undefined;
-    host: string | undefined;
-    port: string | undefined;
-    user: string | undefined;
-    password: string | undefined;
+    name: string;
+    host: string;
+    port: number;
+    user: string;
+    password: string;
 };

package/dist/config/database.js

@@ -1,38 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.database = exports.DATABASE_TYPE = void 0;
+const EnvUtil_1 = require("../app/common/EnvUtil");
 var DATABASE_TYPE;
 (function (DATABASE_TYPE) {
     DATABASE_TYPE["MySQL"] = "MySQL";
     DATABASE_TYPE["PostgreSQL"] = "PostgreSQL";
     DATABASE_TYPE["SQLite"] = "SQLite";
 })(DATABASE_TYPE || (exports.DATABASE_TYPE = DATABASE_TYPE = {}));
-const dbType = process.env.CNPMCORE_DATABASE_TYPE ?? DATABASE_TYPE.MySQL;
-let dbName = process.env.CNPMCORE_DATABASE_NAME;
-let dbHost = process.env.CNPMCORE_DATABASE_HOST;
-let dbPort = process.env.CNPMCORE_DATABASE_PORT;
-let dbUser = process.env.CNPMCORE_DATABASE_USER;
-let dbPassword = process.env.CNPMCORE_DATABASE_PASSWORD;
+const dbType = (0, EnvUtil_1.env)('CNPMCORE_DATABASE_TYPE', 'string', DATABASE_TYPE.MySQL);
+let dbName = (0, EnvUtil_1.env)('CNPMCORE_DATABASE_NAME', 'string', '');
+let dbHost = (0, EnvUtil_1.env)('CNPMCORE_DATABASE_HOST', 'string', '');
+let dbPort = (0, EnvUtil_1.env)('CNPMCORE_DATABASE_PORT', 'number', 0);
+let dbUser = (0, EnvUtil_1.env)('CNPMCORE_DATABASE_USER', 'string', '');
+let dbPassword = (0, EnvUtil_1.env)('CNPMCORE_DATABASE_PASSWORD', 'string', '');
 let dialect = 'mysql';
 let dbClient = 'mysql2';
 if (dbType === DATABASE_TYPE.MySQL) {
     // Compatible mysql configurations
-    dbName = dbName ?? process.env.CNPMCORE_MYSQL_DATABASE ?? process.env.MYSQL_DATABASE;
-    dbHost = dbHost ?? process.env.CNPMCORE_MYSQL_HOST ?? process.env.MYSQL_HOST ?? '127.0.0.1';
-    dbPort = dbPort ?? process.env.CNPMCORE_MYSQL_PORT ?? process.env.MYSQL_PORT ?? '3306';
-    dbUser = dbUser ?? process.env.CNPMCORE_MYSQL_USER ?? process.env.MYSQL_USER ?? 'root';
-    dbPassword = dbPassword ?? process.env.CNPMCORE_MYSQL_PASSWORD ?? process.env.MYSQL_PASSWORD;
+    dbName = dbName || (0, EnvUtil_1.env)('CNPMCORE_MYSQL_DATABASE', 'string', '') || (0, EnvUtil_1.env)('MYSQL_DATABASE', 'string', '') || '';
+    dbHost = dbHost || (0, EnvUtil_1.env)('CNPMCORE_MYSQL_HOST', 'string', '') || (0, EnvUtil_1.env)('MYSQL_HOST', 'string', '') || '127.0.0.1';
+    dbPort = dbPort || (0, EnvUtil_1.env)('CNPMCORE_MYSQL_PORT', 'number', 0) || (0, EnvUtil_1.env)('MYSQL_PORT', 'number', 0) || 3306;
+    dbUser = dbUser || (0, EnvUtil_1.env)('CNPMCORE_MYSQL_USER', 'string', '') || (0, EnvUtil_1.env)('MYSQL_USER', 'string', '') || 'root';
+    dbPassword = dbPassword || (0, EnvUtil_1.env)('CNPMCORE_MYSQL_PASSWORD', 'string', '') || (0, EnvUtil_1.env)('MYSQL_PASSWORD', 'string', '');
 }
 else if (dbType === DATABASE_TYPE.PostgreSQL) {
     dbClient = 'pg';
     dialect = 'postgres';
-    dbHost = dbHost ?? process.env.CNPMCORE_POSTGRES_HOST ?? process.env.POSTGRES_HOST;
-    dbPort = dbPort ?? process.env.CNPMCORE_POSTGRES_PORT ?? process.env.POSTGRES_PORT ?? '5432';
-    dbUser = dbUser ?? process.env.CNPMCORE_POSTGRES_USER ?? process.env.POSTGRES_USER;
-    dbPassword = dbPassword ?? process.env.CNPMCORE_POSTGRES_PASSWORD ?? process.env.POSTGRES_PASSWORD;
+    dbHost = dbHost || (0, EnvUtil_1.env)('CNPMCORE_POSTGRES_HOST', 'string', '') || (0, EnvUtil_1.env)('POSTGRES_HOST', 'string', '') || '127.0.0.1';
+    dbPort = dbPort || (0, EnvUtil_1.env)('CNPMCORE_POSTGRES_PORT', 'number', 0) || (0, EnvUtil_1.env)('POSTGRES_PORT', 'number', 0) || 5432;
+    dbUser = dbUser || (0, EnvUtil_1.env)('CNPMCORE_POSTGRES_USER', 'string', '') || (0, EnvUtil_1.env)('POSTGRES_USER', 'string', '') || 'postgres';
+    dbPassword = dbPassword || (0, EnvUtil_1.env)('CNPMCORE_POSTGRES_PASSWORD', 'string', '') || (0, EnvUtil_1.env)('POSTGRES_PASSWORD', 'string', '') || 'postgres';
 }
 else if (dbType === DATABASE_TYPE.SQLite) {
-    // TODO
+    // TODO: Implement SQLite
     dbClient = 'sqlite';
     dialect = 'sqlite';
 }
@@ -46,4 +47,4 @@ exports.database = {
     user: dbUser,
     password: dbPassword,
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb25maWcvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsSUFBWSxhQUlYO0FBSkQsV0FBWSxhQUFhO0lBQ3ZCLGdDQUFlLENBQUE7SUFDZiwwQ0FBeUIsQ0FBQTtJQUN6QixrQ0FBaUIsQ0FBQTtBQUNuQixDQUFDLEVBSlcsYUFBYSw2QkFBYixhQUFhLFFBSXhCO0FBRUQsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsSUFBSSxhQUFhLENBQUMsS0FBSyxDQUFDO0FBQ3pFLElBQUksTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsc0JBQXNCLENBQUM7QUFDaEQsSUFBSSxNQUFNLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQztBQUNoRCxJQUFJLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLHNCQUFzQixDQUFDO0FBQ2hELElBQUksTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsc0JBQXNCLENBQUM7QUFDaEQsSUFBSSxVQUFVLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQywwQkFBMEIsQ0FBQztBQUN4RCxJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUM7QUFDdEIsSUFBSSxRQUFRLEdBQUcsUUFBUSxDQUFDO0FBQ3hCLElBQUksTUFBTSxLQUFLLGFBQWEsQ0FBQyxLQUFLLEVBQUU7SUFDbEMsa0NBQWtDO0lBQ2xDLE1BQU0sR0FBRyxNQUFNLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQztJQUNyRixNQUFNLEdBQUcsTUFBTSxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsbUJBQW1CLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLElBQUksV0FBVyxDQUFDO0lBQzVGLE1BQU0sR0FBRyxNQUFNLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxtQkFBbUIsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsSUFBSSxNQUFNLENBQUM7SUFDdkYsTUFBTSxHQUFHLE1BQU0sSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxJQUFJLE1BQU0sQ0FBQztJQUN2RixVQUFVLEdBQUcsVUFBVSxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsdUJBQXVCLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUM7Q0FDOUY7S0FBTSxJQUFJLE1BQU0sS0FBSyxhQUFhLENBQUMsVUFBVSxFQUFFO0lBQzlDLFFBQVEsR0FBRyxJQUFJLENBQUM7SUFDaEIsT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUNyQixNQUFNLEdBQUcsTUFBTSxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsc0JBQXNCLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUM7SUFDbkYsTUFBTSxHQUFHLE1BQU0sSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLHNCQUFzQixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxJQUFJLE1BQU0sQ0FBQztJQUM3RixNQUFNLEdBQUcsTUFBTSxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsc0JBQXNCLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUM7SUFDbkYsVUFBVSxHQUFHLFVBQVUsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLDBCQUEwQixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUM7Q0FDcEc7S0FBTSxJQUFJLE1BQU0sS0FBSyxhQUFhLENBQUMsTUFBTSxFQUFFO0lBQzFDLE9BQU87SUFDUCxRQUFRLEdBQUcsUUFBUSxDQUFDO0lBQ3BCLE9BQU8sR0FBRyxRQUFRLENBQUM7Q0FDcEI7QUFFWSxRQUFBLFFBQVEsR0FBRztJQUN0QixJQUFJLEVBQUUsTUFBTTtJQUNaLE9BQU87SUFDUCxNQUFNLEVBQUUsUUFBUTtJQUNoQixJQUFJLEVBQUUsTUFBTTtJQUNaLElBQUksRUFBRSxNQUFNO0lBQ1osSUFBSSxFQUFFLE1BQU07SUFDWixJQUFJLEVBQUUsTUFBTTtJQUNaLFFBQVEsRUFBRSxVQUFVO0NBQ3JCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb25maWcvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsbURBQTRDO0FBRTVDLElBQVksYUFJWDtBQUpELFdBQVksYUFBYTtJQUN2QixnQ0FBZSxDQUFBO0lBQ2YsMENBQXlCLENBQUE7SUFDekIsa0NBQWlCLENBQUE7QUFDbkIsQ0FBQyxFQUpXLGFBQWEsNkJBQWIsYUFBYSxRQUl4QjtBQUVELE1BQU0sTUFBTSxHQUFHLElBQUEsYUFBRyxFQUFDLHdCQUF3QixFQUFFLFFBQVEsRUFBRSxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDNUUsSUFBSSxNQUFNLEdBQUcsSUFBQSxhQUFHLEVBQUMsd0JBQXdCLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ3pELElBQUksTUFBTSxHQUFHLElBQUEsYUFBRyxFQUFDLHdCQUF3QixFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUN6RCxJQUFJLE1BQU0sR0FBRyxJQUFBLGFBQUcsRUFBQyx3QkFBd0IsRUFBRSxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDeEQsSUFBSSxNQUFNLEdBQUcsSUFBQSxhQUFHLEVBQUMsd0JBQXdCLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ3pELElBQUksVUFBVSxHQUFHLElBQUEsYUFBRyxFQUFDLDRCQUE0QixFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUNqRSxJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUM7QUFDdEIsSUFBSSxRQUFRLEdBQUcsUUFBUSxDQUFDO0FBQ3hCLElBQUksTUFBTSxLQUFLLGFBQWEsQ0FBQyxLQUFLLEVBQUU7SUFDbEMsa0NBQWtDO0lBQ2xDLE1BQU0sR0FBRyxNQUFNLElBQUksSUFBQSxhQUFHLEVBQUMseUJBQXlCLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxJQUFJLElBQUEsYUFBRyxF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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnpmcore",
-  "version": "3.73.0",
+  "version": "3.74.0",
   "description": "Private NPM Registry for Enterprise",
   "files": [
     "dist/**/*"