fix: should return default value when env is empty string (#759)

pick from #754

Author: fengmk2

app/common/EnvUtil.ts

@@ -4,9 +4,9 @@ import { join } from 'node:path';
 import { EggAppConfig, PowerPartial, Context } from 'egg';
 import OSSClient from 'oss-cnpm';
 import S3Client from 's3-cnpmcore';
+import { env } from 'read-env-value';
 import { patchAjv } from '../app/port/typebox';
 import { ChangesStreamMode, NOT_IMPLEMENTED_PATH, SyncDeleteMode, SyncMode } from '../app/common/constants';
-import { env } from '../app/common/EnvUtil';
 import type { CnpmcoreConfig } from '../app/port/config';
 import { database } from './database';
 
@@ -86,7 +86,7 @@ export default (appInfo: EggAppConfig): Config => {
   config.dataDir = env('CNPMCORE_DATA_DIR', 'string', join(appInfo.root, '.cnpmcore'));
   config.orm = {
     ...database,
-    database: database.name || 'cnpmcore',
+    database: database.name ?? 'cnpmcore',
     charset: 'utf8mb4',
     logger: {
       // https://github.com/cyjake/leoric/blob/master/docs/zh/logging.md#logqueryerror

config/config.default.ts

@@ -10,7 +10,7 @@ export default (appInfo: EggAppConfig) => {
   config.dataDir = join(appInfo.root, '.cnpmcore_unittest');
 
   config.orm = {
-    database: database.name || 'cnpmcore_unittest',
+    database: database.name ?? 'cnpmcore_unittest',
   };
 
   config.nfs = {

config/config.unittest.ts

@@ -1,4 +1,4 @@
-import { env } from '../app/common/EnvUtil';
+import { env } from 'read-env-value';
 
 export enum DATABASE_TYPE {
   MySQL = 'MySQL',
@@ -7,27 +7,27 @@ export enum DATABASE_TYPE {
 }
 
 const dbType = env('CNPMCORE_DATABASE_TYPE', 'string', DATABASE_TYPE.MySQL);
-let dbName = env('CNPMCORE_DATABASE_NAME', 'string', '');
-let dbHost = env('CNPMCORE_DATABASE_HOST', 'string', '');
-let dbPort = env('CNPMCORE_DATABASE_PORT', 'number', 0);
-let dbUser = env('CNPMCORE_DATABASE_USER', 'string', '');
-let dbPassword = env('CNPMCORE_DATABASE_PASSWORD', 'string', '');
+let dbName = env('CNPMCORE_DATABASE_NAME', 'string');
+let dbHost = env('CNPMCORE_DATABASE_HOST', 'string');
+let dbPort = env('CNPMCORE_DATABASE_PORT', 'number');
+let dbUser = env('CNPMCORE_DATABASE_USER', 'string');
+let dbPassword = env('CNPMCORE_DATABASE_PASSWORD', 'string');
 let dialect = 'mysql';
 let dbClient = 'mysql2';
 if (dbType === DATABASE_TYPE.MySQL) {
   // Compatible mysql configurations
-  dbName = dbName || env('CNPMCORE_MYSQL_DATABASE', 'string', '') || env('MYSQL_DATABASE', 'string', '') || '';
-  dbHost = dbHost || env('CNPMCORE_MYSQL_HOST', 'string', '') || env('MYSQL_HOST', 'string', '') || '127.0.0.1';
-  dbPort = dbPort || env('CNPMCORE_MYSQL_PORT', 'number', 0) || env('MYSQL_PORT', 'number', 0) || 3306;
-  dbUser = dbUser || env('CNPMCORE_MYSQL_USER', 'string', '') || env('MYSQL_USER', 'string', '') || 'root';
-  dbPassword = dbPassword || env('CNPMCORE_MYSQL_PASSWORD', 'string', '') || env('MYSQL_PASSWORD', 'string', '');
+  dbName = dbName ?? env('CNPMCORE_MYSQL_DATABASE', 'string') ?? env('MYSQL_DATABASE', 'string');
+  dbHost = dbHost ?? env('CNPMCORE_MYSQL_HOST', 'string') ?? env('MYSQL_HOST', 'string') ?? '127.0.0.1';
+  dbPort = dbPort ?? env('CNPMCORE_MYSQL_PORT', 'number') ?? env('MYSQL_PORT', 'number') ?? 3306;
+  dbUser = dbUser ?? env('CNPMCORE_MYSQL_USER', 'string') ?? env('MYSQL_USER', 'string') ?? 'root';
+  dbPassword = dbPassword ?? env('CNPMCORE_MYSQL_PASSWORD', 'string') ?? env('MYSQL_PASSWORD', 'string');
 } else if (dbType === DATABASE_TYPE.PostgreSQL) {
   dbClient = 'pg';
   dialect = 'postgres';
-  dbHost = dbHost || env('CNPMCORE_POSTGRES_HOST', 'string', '') || env('POSTGRES_HOST', 'string', '') || '127.0.0.1';
-  dbPort = dbPort || env('CNPMCORE_POSTGRES_PORT', 'number', 0) || env('POSTGRES_PORT', 'number', 0) || 5432;
-  dbUser = dbUser || env('CNPMCORE_POSTGRES_USER', 'string', '') || env('POSTGRES_USER', 'string', '') || 'postgres';
-  dbPassword = dbPassword || env('CNPMCORE_POSTGRES_PASSWORD', 'string', '') || env('POSTGRES_PASSWORD', 'string', '') || 'postgres';
+  dbHost = dbHost ?? env('CNPMCORE_POSTGRES_HOST', 'string') ?? env('POSTGRES_HOST', 'string') ?? '127.0.0.1';
+  dbPort = dbPort ?? env('CNPMCORE_POSTGRES_PORT', 'number') ?? env('POSTGRES_PORT', 'number') ?? 5432;
+  dbUser = dbUser ?? env('CNPMCORE_POSTGRES_USER', 'string') ?? env('POSTGRES_USER', 'string') ?? 'postgres';
+  dbPassword = dbPassword ?? env('CNPMCORE_POSTGRES_PASSWORD', 'string') ?? env('POSTGRES_PASSWORD', 'string') ?? 'postgres';
 } else if (dbType === DATABASE_TYPE.SQLite) {
   // TODO: Implement SQLite
   dbClient = 'sqlite';

config/database.ts

@@ -122,6 +122,7 @@
     "oss-cnpm": "^5.0.1",
     "p-map": "^4.0.0",
     "pg": "^8.13.1",
+    "read-env-value": "^1.0.0",
     "s3-cnpmcore": "^1.1.2",
     "semver": "^7.3.5",
     "ssri": "^8.0.1",

package.json

@@ -49,7 +49,7 @@ export class TestUtil {
   static getDatabaseConfig() {
     return {
       ...database,
-      database: database.name || 'cnpmcore_unittest',
+      database: database.name ?? 'cnpmcore_unittest',
       multipleStatements: true,
     };
   }