cnpmcore 4.0.0 → 4.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/app/port/controller/AccessController.js +1 -1
  2. package/dist/config/config.default.js +38 -38
  3. package/dist/config/config.unittest.js +1 -1
  4. package/dist/config/database.d.ts +5 -5
  5. package/dist/config/database.js +17 -17
  6. package/package.json +6 -2
  7. package/dist/app/common/EnvUtil.d.ts +0 -4
  8. package/dist/app/common/EnvUtil.js +0 -34
package/dist/app/port/controller/AccessController.js CHANGED
@@ -70,4 +70,4 @@ __decorate([
70
70
  exports.AccessController = AccessController = __decorate([
71
71
  (0, tegg_1.HTTPController)()
72
72
  ], AccessController);
73
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWNjZXNzQ29udHJvbGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9wb3J0L2NvbnRyb2xsZXIvQWNjZXNzQ29udHJvbGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzQ0FLcUI7QUFDckIsNkRBQTBEO0FBQzFELDBEQUE2RjtBQUM3RixzREFBNEQ7QUFDNUQsMkNBQTJEO0FBR3BELElBQU0sZ0JBQWdCLEdBQXRCLE1BQU0sZ0JBQWlCLFNBQVEsdUNBQWtCO0lBS2hELEFBQU4sS0FBSyxDQUFDLGlCQUFpQixDQUFjLFFBQWdCO1FBQ25ELE1BQU0sQ0FBRSxLQUFLLEVBQUUsSUFBSSxDQUFFLEdBQUcsSUFBQSw2QkFBZSxFQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2xELE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDbEUsK0JBQStCO1FBQy9CLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNULE1BQU0sSUFBSSwyQkFBYyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3hDLENBQUM7UUFFRCxNQUFNLFdBQVcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxzQkFBc0IsQ0FBQyxHQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDeEYsTUFBTSxHQUFHLEdBQTJCLEVBQUUsQ0FBQztRQUN2QyxXQUFXLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUFFO1lBQy9CLEdBQUcsQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLEdBQUcsOEJBQWtCLENBQUMsS0FBSyxDQUFDO1FBQ3pELENBQUMsQ0FBQyxDQUFDO1FBRUgsT0FBTyxHQUFHLENBQUM7SUFDYixDQUFDO0lBTUssQUFBTixLQUFLLENBQUMsa0JBQWtCLENBQWMsUUFBZ0I7UUFDcEQsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNoRSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDVixNQUFNLElBQUksMEJBQWEsQ0FBQyxTQUFTLFFBQVEsYUFBYSxDQUFDLENBQUM7UUFDMUQsQ0FBQztRQUVELE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM1RSxNQUFNLEdBQUcsR0FBMkIsRUFBRSxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDakIsR0FBRyxDQUFDLElBQUEseUJBQVcsRUFBQyxHQUFHLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLDhCQUFrQixDQUFDLEtBQUssQ0FBQztRQUNuRSxDQUFDLENBQUMsQ0FBQztRQUVILE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQztDQUdGLENBQUE7QUExQ1ksNENBQWdCO0FBS3JCO0lBSkwsSUFBQSxpQkFBVSxFQUFDO1FBQ1YsSUFBSSxFQUFFLHdCQUF3QixpQ0FBbUIsaUJBQWlCO1FBQ2xFLE1BQU0sRUFBRSxxQkFBYyxDQUFDLEdBQUc7S0FDM0IsQ0FBQztJQUN1QixXQUFBLElBQUEsZ0JBQVMsR0FBRSxDQUFBOzs7O3lEQWVuQztBQU1LO0lBSkwsSUFBQSxpQkFBVSxFQUFDO1FBQ1YsSUFBSSxFQUFFLDBCQUEwQjtRQUNoQyxNQUFNLEVBQUUscUJBQWMsQ0FBQyxHQUFHO0tBQzNCLENBQUM7SUFDd0IsV0FBQSxJQUFBLGdCQUFTLEdBQUUsQ0FBQTs7OzswREFhcEM7MkJBdkNVLGdCQUFnQjtJQUQ1QixJQUFBLHFCQUFjLEdBQUU7R0FDSixnQkFBZ0IsQ0EwQzVCIn0=
73
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWNjZXNzQ29udHJvbGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9wb3J0L2NvbnRyb2xsZXIvQWNjZXNzQ29udHJvbGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzQ0FLcUI7QUFDckIsNkRBQTBEO0FBQzFELDBEQUE2RjtBQUM3RixzREFBNEQ7QUFDNUQsMkNBQTJEO0FBR3BELElBQU0sZ0JBQWdCLEdBQXRCLE1BQU0sZ0JBQWlCLFNBQVEsdUNBQWtCO0lBS2hELEFBQU4sS0FBSyxDQUFDLGlCQUFpQixDQUFjLFFBQWdCO1FBQ25ELE1BQU0sQ0FBRSxLQUFLLEVBQUUsSUFBSSxDQUFFLEdBQUcsSUFBQSw2QkFBZSxFQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2xELE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDbEUsK0JBQStCO1FBQy9CLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNULE1BQU0sSUFBSSwyQkFBYyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3hDLENBQUM7UUFFRCxNQUFNLFdBQVcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxzQkFBc0IsQ0FBQyxHQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDeEYsTUFBTSxHQUFHLEdBQTJCLEVBQUUsQ0FBQztRQUN2QyxXQUFXLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUFFO1lBQy9CLEdBQUcsQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLEdBQUcsOEJBQWtCLENBQUMsS0FBSyxDQUFDO1FBQ3pELENBQUMsQ0FBQyxDQUFDO1FBRUgsT0FBTyxHQUFHLENBQUM7SUFDYixDQUFDO0lBTUssQUFBTixLQUFLLENBQUMsa0JBQWtCLENBQWMsUUFBZ0I7UUFDcEQsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNoRSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDVixNQUFNLElBQUksMEJBQWEsQ0FBQyxTQUFTLFFBQVEsYUFBYSxDQUFDLENBQUM7UUFDMUQsQ0FBQztRQUVELE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM1RSxNQUFNLEdBQUcsR0FBMkIsRUFBRSxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDakIsR0FBRyxDQUFDLElBQUEseUJBQVcsRUFBQyxHQUFHLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLDhCQUFrQixDQUFDLEtBQUssQ0FBQztRQUNuRSxDQUFDLENBQUMsQ0FBQztRQUVILE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQztDQUNGLENBQUE7QUF4Q1ksNENBQWdCO0FBS3JCO0lBSkwsSUFBQSxpQkFBVSxFQUFDO1FBQ1YsSUFBSSxFQUFFLHdCQUF3QixpQ0FBbUIsaUJBQWlCO1FBQ2xFLE1BQU0sRUFBRSxxQkFBYyxDQUFDLEdBQUc7S0FDM0IsQ0FBQztJQUN1QixXQUFBLElBQUEsZ0JBQVMsR0FBRSxDQUFBOzs7O3lEQWVuQztBQU1LO0lBSkwsSUFBQSxpQkFBVSxFQUFDO1FBQ1YsSUFBSSxFQUFFLDBCQUEwQjtRQUNoQyxNQUFNLEVBQUUscUJBQWMsQ0FBQyxHQUFHO0tBQzNCLENBQUM7SUFDd0IsV0FBQSxJQUFBLGdCQUFTLEdBQUUsQ0FBQTs7OzswREFhcEM7MkJBdkNVLGdCQUFnQjtJQUQ1QixJQUFBLHFCQUFjLEdBQUU7R0FDSixnQkFBZ0IsQ0F3QzVCIn0=
package/dist/config/config.default.js CHANGED
@@ -9,16 +9,16 @@ const node_crypto_1 = require("node:crypto");
9
9
  const node_path_1 = require("node:path");
10
10
  const oss_cnpm_1 = __importDefault(require("oss-cnpm"));
11
11
  const s3_cnpmcore_1 = __importDefault(require("s3-cnpmcore"));
12
+ const read_env_value_1 = require("read-env-value");
12
13
  const typebox_1 = require("../app/port/typebox");
13
14
  const constants_1 = require("../app/common/constants");
14
- const EnvUtil_1 = require("../app/common/EnvUtil");
15
15
  const database_1 = require("./database");
16
16
  exports.cnpmcoreConfig = {
17
17
  name: 'cnpm',
18
18
  hookEnable: false,
19
19
  hooksLimit: 20,
20
- sourceRegistry: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_SOURCE_REGISTRY', 'string', 'https://registry.npmjs.org'),
21
- sourceRegistryIsCNpm: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_SOURCE_REGISTRY_IS_CNPM', 'boolean', false),
20
+ sourceRegistry: (0, read_env_value_1.env)('CNPMCORE_CONFIG_SOURCE_REGISTRY', 'string', 'https://registry.npmjs.org'),
21
+ sourceRegistryIsCNpm: (0, read_env_value_1.env)('CNPMCORE_CONFIG_SOURCE_REGISTRY_IS_CNPM', 'boolean', false),
22
22
  syncUpstreamFirst: false,
23
23
  sourceRegistrySyncTimeout: 180000,
24
24
  taskQueueHighWaterSize: 100,
@@ -38,7 +38,7 @@ exports.cnpmcoreConfig = {
38
38
  checkChangesStreamInterval: 500,
39
39
  changesStreamRegistry: 'https://replicate.npmjs.com',
40
40
  changesStreamRegistryMode: constants_1.ChangesStreamMode.streaming,
41
- registry: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_REGISTRY', 'string', 'http://localhost:7001'),
41
+ registry: (0, read_env_value_1.env)('CNPMCORE_CONFIG_REGISTRY', 'string', 'http://localhost:7001'),
42
42
  alwaysAuth: false,
43
43
  allowScopes: [
44
44
  '@cnpm',
@@ -50,7 +50,7 @@ exports.cnpmcoreConfig = {
50
50
  admins: {
51
51
  cnpmcore_admin: 'admin@cnpmjs.org',
52
52
  },
53
- enableWebAuthn: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ENABLE_WEB_AUTHN', 'boolean', false),
53
+ enableWebAuthn: (0, read_env_value_1.env)('CNPMCORE_CONFIG_ENABLE_WEB_AUTHN', 'boolean', false),
54
54
  enableCDN: false,
55
55
  cdnCacheControlHeader: 'public, max-age=300',
56
56
  cdnVaryHeader: 'Accept, Accept-Encoding',
@@ -62,7 +62,7 @@ exports.cnpmcoreConfig = {
62
62
  enableSyncUnpkgFiles: true,
63
63
  enableSyncUnpkgFilesWhiteList: false,
64
64
  strictSyncSpecivicVersion: false,
65
- enableElasticsearch: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ENABLE_ES', 'boolean', false),
65
+ enableElasticsearch: (0, read_env_value_1.env)('CNPMCORE_CONFIG_ENABLE_ES', 'boolean', false),
66
66
  elasticsearchIndex: 'cnpmcore_packages',
67
67
  strictValidateTarballPkg: false,
68
68
  strictValidatePackageDeps: false,
@@ -72,13 +72,13 @@ exports.cnpmcoreConfig = {
72
72
  };
73
73
  exports.default = (appInfo) => {
74
74
  const config = {};
75
- config.keys = (0, EnvUtil_1.env)('CNPMCORE_EGG_KEYS', 'string', (0, node_crypto_1.randomUUID)());
75
+ config.keys = (0, read_env_value_1.env)('CNPMCORE_EGG_KEYS', 'string', (0, node_crypto_1.randomUUID)());
76
76
  config.cnpmcore = exports.cnpmcoreConfig;
77
77
  // override config from framework / plugin
78
- config.dataDir = (0, EnvUtil_1.env)('CNPMCORE_DATA_DIR', 'string', (0, node_path_1.join)(appInfo.root, '.cnpmcore'));
78
+ config.dataDir = (0, read_env_value_1.env)('CNPMCORE_DATA_DIR', 'string', (0, node_path_1.join)(appInfo.root, '.cnpmcore'));
79
79
  config.orm = {
80
80
  ...database_1.database,
81
- database: database_1.database.name || 'cnpmcore',
81
+ database: database_1.database.name ?? 'cnpmcore',
82
82
  charset: 'utf8mb4',
83
83
  logger: {
84
84
  // https://github.com/cyjake/leoric/blob/master/docs/zh/logging.md#logqueryerror
@@ -91,10 +91,10 @@ exports.default = (appInfo) => {
91
91
  };
92
92
  config.redis = {
93
93
  client: {
94
- port: (0, EnvUtil_1.env)('CNPMCORE_REDIS_PORT', 'number', 6379),
95
- host: (0, EnvUtil_1.env)('CNPMCORE_REDIS_HOST', 'string', '127.0.0.1'),
96
- password: (0, EnvUtil_1.env)('CNPMCORE_REDIS_PASSWORD', 'string', ''),
97
- db: (0, EnvUtil_1.env)('CNPMCORE_REDIS_DB', 'number', 0),
94
+ port: (0, read_env_value_1.env)('CNPMCORE_REDIS_PORT', 'number', 6379),
95
+ host: (0, read_env_value_1.env)('CNPMCORE_REDIS_HOST', 'string', '127.0.0.1'),
96
+ password: (0, read_env_value_1.env)('CNPMCORE_REDIS_PASSWORD', 'string', ''),
97
+ db: (0, read_env_value_1.env)('CNPMCORE_REDIS_DB', 'number', 0),
98
98
  },
99
99
  };
100
100
  config.security = {
@@ -113,19 +113,19 @@ exports.default = (appInfo) => {
113
113
  };
114
114
  config.nfs = {
115
115
  client: null,
116
- dir: (0, EnvUtil_1.env)('CNPMCORE_NFS_DIR', 'string', (0, node_path_1.join)(config.dataDir, 'nfs')),
117
- removeBeforeUpload: (0, EnvUtil_1.env)('CNPMCORE_NFS_REMOVE_BEFORE_UPLOAD', 'boolean', false),
116
+ dir: (0, read_env_value_1.env)('CNPMCORE_NFS_DIR', 'string', (0, node_path_1.join)(config.dataDir, 'nfs')),
117
+ removeBeforeUpload: (0, read_env_value_1.env)('CNPMCORE_NFS_REMOVE_BEFORE_UPLOAD', 'boolean', false),
118
118
  };
119
119
  /* c8 ignore next 17 */
120
120
  // enable oss nfs store by env values
121
- const nfsType = (0, EnvUtil_1.env)('CNPMCORE_NFS_TYPE', 'string', '');
121
+ const nfsType = (0, read_env_value_1.env)('CNPMCORE_NFS_TYPE', 'string', '');
122
122
  if (nfsType === 'oss') {
123
123
  const ossConfig = {
124
- cdnBaseUrl: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_CDN', 'string', ''),
125
- endpoint: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_ENDPOINT', 'string', ''),
126
- bucket: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_BUCKET', 'string', ''),
127
- accessKeyId: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_ID', 'string', ''),
128
- accessKeySecret: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_SECRET', 'string', ''),
124
+ cdnBaseUrl: (0, read_env_value_1.env)('CNPMCORE_NFS_OSS_CDN', 'string', ''),
125
+ endpoint: (0, read_env_value_1.env)('CNPMCORE_NFS_OSS_ENDPOINT', 'string', ''),
126
+ bucket: (0, read_env_value_1.env)('CNPMCORE_NFS_OSS_BUCKET', 'string', ''),
127
+ accessKeyId: (0, read_env_value_1.env)('CNPMCORE_NFS_OSS_ID', 'string', ''),
128
+ accessKeySecret: (0, read_env_value_1.env)('CNPMCORE_NFS_OSS_SECRET', 'string', ''),
129
129
  defaultHeaders: {
130
130
  'Cache-Control': 'max-age=0, s-maxage=60',
131
131
  },
@@ -138,15 +138,15 @@ exports.default = (appInfo) => {
138
138
  }
139
139
  else if (nfsType === 's3') {
140
140
  const s3Config = {
141
- region: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_REGION', 'string', 'default'),
142
- endpoint: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_ENDPOINT', 'string', ''),
141
+ region: (0, read_env_value_1.env)('CNPMCORE_NFS_S3_CLIENT_REGION', 'string', 'default'),
142
+ endpoint: (0, read_env_value_1.env)('CNPMCORE_NFS_S3_CLIENT_ENDPOINT', 'string', ''),
143
143
  credentials: {
144
- accessKeyId: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_ID', 'string', ''),
145
- secretAccessKey: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_SECRET', 'string', ''),
144
+ accessKeyId: (0, read_env_value_1.env)('CNPMCORE_NFS_S3_CLIENT_ID', 'string', ''),
145
+ secretAccessKey: (0, read_env_value_1.env)('CNPMCORE_NFS_S3_CLIENT_SECRET', 'string', ''),
146
146
  },
147
- bucket: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_BUCKET', 'string', ''),
148
- forcePathStyle: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_FORCE_PATH_STYLE', 'boolean', false),
149
- disableURL: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_DISABLE_URL', 'boolean', false),
147
+ bucket: (0, read_env_value_1.env)('CNPMCORE_NFS_S3_CLIENT_BUCKET', 'string', ''),
148
+ forcePathStyle: (0, read_env_value_1.env)('CNPMCORE_NFS_S3_CLIENT_FORCE_PATH_STYLE', 'boolean', false),
149
+ disableURL: (0, read_env_value_1.env)('CNPMCORE_NFS_S3_CLIENT_DISABLE_URL', 'boolean', false),
150
150
  };
151
151
  (0, node_assert_1.strict)(s3Config.endpoint, 'require env CNPMCORE_NFS_S3_CLIENT_ENDPOINT');
152
152
  (0, node_assert_1.strict)(s3Config.credentials.accessKeyId, 'require env CNPMCORE_NFS_S3_CLIENT_ID');
@@ -157,13 +157,13 @@ exports.default = (appInfo) => {
157
157
  config.logger = {
158
158
  enablePerformanceTimer: true,
159
159
  enableFastContextLogger: true,
160
- appLogName: (0, EnvUtil_1.env)('CNPMCORE_APP_LOG_NAME', 'string', `${appInfo.name}-web.log`),
161
- coreLogName: (0, EnvUtil_1.env)('CNPMCORE_CORE_LOG_NAME', 'string', 'egg-web.log'),
162
- agentLogName: (0, EnvUtil_1.env)('CNPMCORE_AGENT_LOG_NAME', 'string', 'egg-agent.log'),
163
- errorLogName: (0, EnvUtil_1.env)('CNPMCORE_ERROR_LOG_NAME', 'string', 'common-error.log'),
164
- outputJSON: (0, EnvUtil_1.env)('CNPMCORE_LOG_JSON_OUTPUT', 'boolean', false),
160
+ appLogName: (0, read_env_value_1.env)('CNPMCORE_APP_LOG_NAME', 'string', `${appInfo.name}-web.log`),
161
+ coreLogName: (0, read_env_value_1.env)('CNPMCORE_CORE_LOG_NAME', 'string', 'egg-web.log'),
162
+ agentLogName: (0, read_env_value_1.env)('CNPMCORE_AGENT_LOG_NAME', 'string', 'egg-agent.log'),
163
+ errorLogName: (0, read_env_value_1.env)('CNPMCORE_ERROR_LOG_NAME', 'string', 'common-error.log'),
164
+ outputJSON: (0, read_env_value_1.env)('CNPMCORE_LOG_JSON_OUTPUT', 'boolean', false),
165
165
  };
166
- const logDir = (0, EnvUtil_1.env)('CNPMCORE_LOG_DIR', 'string', '');
166
+ const logDir = (0, read_env_value_1.env)('CNPMCORE_LOG_DIR', 'string', '');
167
167
  if (logDir) {
168
168
  config.logger.dir = logDir;
169
169
  }
@@ -198,14 +198,14 @@ exports.default = (appInfo) => {
198
198
  if (config.cnpmcore.enableElasticsearch) {
199
199
  config.elasticsearch = {
200
200
  client: {
201
- node: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ES_CLIENT_NODE', 'string', ''),
201
+ node: (0, read_env_value_1.env)('CNPMCORE_CONFIG_ES_CLIENT_NODE', 'string', ''),
202
202
  auth: {
203
- username: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ES_CLIENT_AUTH_USERNAME', 'string', ''),
204
- password: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ES_CLIENT_AUTH_PASSWORD', 'string', ''),
203
+ username: (0, read_env_value_1.env)('CNPMCORE_CONFIG_ES_CLIENT_AUTH_USERNAME', 'string', ''),
204
+ password: (0, read_env_value_1.env)('CNPMCORE_CONFIG_ES_CLIENT_AUTH_PASSWORD', 'string', ''),
205
205
  },
206
206
  },
207
207
  };
208
208
  }
209
209
  return config;
210
210
  };
211
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.default.js","sourceRoot":"","sources":["../../config/config.default.ts"],"names":[],"mappings":"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"}
211
+ //# 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 CHANGED
@@ -12,7 +12,7 @@ exports.default = (appInfo) => {
12
12
  const config = {};
13
13
  config.dataDir = (0, node_path_1.join)(appInfo.root, '.cnpmcore_unittest');
14
14
  config.orm = {
15
- database: database_1.database.name || 'cnpmcore_unittest',
15
+ database: database_1.database.name ?? 'cnpmcore_unittest',
16
16
  };
17
17
  config.nfs = {
18
18
  dir: (0, node_path_1.join)(config.dataDir, 'nfs'),
package/dist/config/database.d.ts CHANGED
@@ -7,9 +7,9 @@ export declare const database: {
7
7
  type: string;
8
8
  dialect: string;
9
9
  client: string;
10
- name: string;
11
- host: string;
12
- port: number;
13
- user: string;
14
- password: string;
10
+ name: string | undefined;
11
+ host: string | undefined;
12
+ port: number | undefined;
13
+ user: string | undefined;
14
+ password: string | undefined;
15
15
  };
package/dist/config/database.js CHANGED
@@ -1,36 +1,36 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.database = exports.DATABASE_TYPE = void 0;
4
- const EnvUtil_1 = require("../app/common/EnvUtil");
4
+ const read_env_value_1 = require("read-env-value");
5
5
  var DATABASE_TYPE;
6
6
  (function (DATABASE_TYPE) {
7
7
  DATABASE_TYPE["MySQL"] = "MySQL";
8
8
  DATABASE_TYPE["PostgreSQL"] = "PostgreSQL";
9
9
  DATABASE_TYPE["SQLite"] = "SQLite";
10
10
  })(DATABASE_TYPE || (exports.DATABASE_TYPE = DATABASE_TYPE = {}));
11
- const dbType = (0, EnvUtil_1.env)('CNPMCORE_DATABASE_TYPE', 'string', DATABASE_TYPE.MySQL);
12
- let dbName = (0, EnvUtil_1.env)('CNPMCORE_DATABASE_NAME', 'string', '');
13
- let dbHost = (0, EnvUtil_1.env)('CNPMCORE_DATABASE_HOST', 'string', '');
14
- let dbPort = (0, EnvUtil_1.env)('CNPMCORE_DATABASE_PORT', 'number', 0);
15
- let dbUser = (0, EnvUtil_1.env)('CNPMCORE_DATABASE_USER', 'string', '');
16
- let dbPassword = (0, EnvUtil_1.env)('CNPMCORE_DATABASE_PASSWORD', 'string', '');
11
+ const dbType = (0, read_env_value_1.env)('CNPMCORE_DATABASE_TYPE', 'string', DATABASE_TYPE.MySQL);
12
+ let dbName = (0, read_env_value_1.env)('CNPMCORE_DATABASE_NAME', 'string');
13
+ let dbHost = (0, read_env_value_1.env)('CNPMCORE_DATABASE_HOST', 'string');
14
+ let dbPort = (0, read_env_value_1.env)('CNPMCORE_DATABASE_PORT', 'number');
15
+ let dbUser = (0, read_env_value_1.env)('CNPMCORE_DATABASE_USER', 'string');
16
+ let dbPassword = (0, read_env_value_1.env)('CNPMCORE_DATABASE_PASSWORD', 'string');
17
17
  let dialect = 'mysql';
18
18
  let dbClient = 'mysql2';
19
19
  if (dbType === DATABASE_TYPE.MySQL) {
20
20
  // Compatible mysql configurations
21
- dbName = dbName || (0, EnvUtil_1.env)('CNPMCORE_MYSQL_DATABASE', 'string', '') || (0, EnvUtil_1.env)('MYSQL_DATABASE', 'string', '') || '';
22
- dbHost = dbHost || (0, EnvUtil_1.env)('CNPMCORE_MYSQL_HOST', 'string', '') || (0, EnvUtil_1.env)('MYSQL_HOST', 'string', '') || '127.0.0.1';
23
- dbPort = dbPort || (0, EnvUtil_1.env)('CNPMCORE_MYSQL_PORT', 'number', 0) || (0, EnvUtil_1.env)('MYSQL_PORT', 'number', 0) || 3306;
24
- dbUser = dbUser || (0, EnvUtil_1.env)('CNPMCORE_MYSQL_USER', 'string', '') || (0, EnvUtil_1.env)('MYSQL_USER', 'string', '') || 'root';
25
- dbPassword = dbPassword || (0, EnvUtil_1.env)('CNPMCORE_MYSQL_PASSWORD', 'string', '') || (0, EnvUtil_1.env)('MYSQL_PASSWORD', 'string', '');
21
+ dbName = dbName ?? (0, read_env_value_1.env)('CNPMCORE_MYSQL_DATABASE', 'string') ?? (0, read_env_value_1.env)('MYSQL_DATABASE', 'string');
22
+ dbHost = dbHost ?? (0, read_env_value_1.env)('CNPMCORE_MYSQL_HOST', 'string') ?? (0, read_env_value_1.env)('MYSQL_HOST', 'string') ?? '127.0.0.1';
23
+ dbPort = dbPort ?? (0, read_env_value_1.env)('CNPMCORE_MYSQL_PORT', 'number') ?? (0, read_env_value_1.env)('MYSQL_PORT', 'number') ?? 3306;
24
+ dbUser = dbUser ?? (0, read_env_value_1.env)('CNPMCORE_MYSQL_USER', 'string') ?? (0, read_env_value_1.env)('MYSQL_USER', 'string') ?? 'root';
25
+ dbPassword = dbPassword ?? (0, read_env_value_1.env)('CNPMCORE_MYSQL_PASSWORD', 'string') ?? (0, read_env_value_1.env)('MYSQL_PASSWORD', 'string');
26
26
  }
27
27
  else if (dbType === DATABASE_TYPE.PostgreSQL) {
28
28
  dbClient = 'pg';
29
29
  dialect = 'postgres';
30
- dbHost = dbHost || (0, EnvUtil_1.env)('CNPMCORE_POSTGRES_HOST', 'string', '') || (0, EnvUtil_1.env)('POSTGRES_HOST', 'string', '') || '127.0.0.1';
31
- dbPort = dbPort || (0, EnvUtil_1.env)('CNPMCORE_POSTGRES_PORT', 'number', 0) || (0, EnvUtil_1.env)('POSTGRES_PORT', 'number', 0) || 5432;
32
- dbUser = dbUser || (0, EnvUtil_1.env)('CNPMCORE_POSTGRES_USER', 'string', '') || (0, EnvUtil_1.env)('POSTGRES_USER', 'string', '') || 'postgres';
33
- dbPassword = dbPassword || (0, EnvUtil_1.env)('CNPMCORE_POSTGRES_PASSWORD', 'string', '') || (0, EnvUtil_1.env)('POSTGRES_PASSWORD', 'string', '') || 'postgres';
30
+ dbHost = dbHost ?? (0, read_env_value_1.env)('CNPMCORE_POSTGRES_HOST', 'string') ?? (0, read_env_value_1.env)('POSTGRES_HOST', 'string') ?? '127.0.0.1';
31
+ dbPort = dbPort ?? (0, read_env_value_1.env)('CNPMCORE_POSTGRES_PORT', 'number') ?? (0, read_env_value_1.env)('POSTGRES_PORT', 'number') ?? 5432;
32
+ dbUser = dbUser ?? (0, read_env_value_1.env)('CNPMCORE_POSTGRES_USER', 'string') ?? (0, read_env_value_1.env)('POSTGRES_USER', 'string') ?? 'postgres';
33
+ dbPassword = dbPassword ?? (0, read_env_value_1.env)('CNPMCORE_POSTGRES_PASSWORD', 'string') ?? (0, read_env_value_1.env)('POSTGRES_PASSWORD', 'string') ?? 'postgres';
34
34
  }
35
35
  else if (dbType === DATABASE_TYPE.SQLite) {
36
36
  // TODO: Implement SQLite
@@ -47,4 +47,4 @@ exports.database = {
47
47
  user: dbUser,
48
48
  password: dbPassword,
49
49
  };
50
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb25maWcvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsbURBQTRDO0FBRTVDLElBQVksYUFJWDtBQUpELFdBQVksYUFBYTtJQUN2QixnQ0FBZSxDQUFBO0lBQ2YsMENBQXlCLENBQUE7SUFDekIsa0NBQWlCLENBQUE7QUFDbkIsQ0FBQyxFQUpXLGFBQWEsNkJBQWIsYUFBYSxRQUl4QjtBQUVELE1BQU0sTUFBTSxHQUFHLElBQUEsYUFBRyxFQUFDLHdCQUF3QixFQUFFLFFBQVEsRUFBRSxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDNUUsSUFBSSxNQUFNLEdBQUcsSUFBQSxhQUFHLEVBQUMsd0JBQXdCLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ3pELElBQUksTUFBTSxHQUFHLElBQUEsYUFBRyxFQUFDLHdCQUF3QixFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUN6RCxJQUFJLE1BQU0sR0FBRyxJQUFBLGFBQUcsRUFBQyx3QkFBd0IsRUFBRSxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDeEQsSUFBSSxNQUFNLEdBQUcsSUFBQSxhQUFHLEVBQUMsd0JBQXdCLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ3pELElBQUksVUFBVSxHQUFHLElBQUEsYUFBRyxFQUFDLDRCQUE0QixFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUNqRSxJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUM7QUFDdEIsSUFBSSxRQUFRLEdBQUcsUUFBUSxDQUFDO0FBQ3hCLElBQUksTUFBTSxLQUFLLGFBQWEsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUNuQyxrQ0FBa0M7SUFDbEMsTUFBTSxHQUFHLE1BQU0sSUFBSSxJQUFBLGFBQUcsRUFBQyx5QkFBeUIsRUFBRSxRQUFRLEVBQUUsRUFBRSxDQUFDLElBQUksSUFBQSxhQUFHLEVBQUMsZ0JBQWdCLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUM3RyxNQUFNLEdBQUcsTUFBTSxJQUFJLElBQUEsYUFBRyxFQUFDLHFCQUFxQixFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsSUFBSSxJQUFBLGFBQUcsRUFBQyxZQUFZLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxJQUFJLFdBQVcsQ0FBQztJQUM5RyxNQUFNLEdBQUcsTUFBTSxJQUFJLElBQUEsYUFBRyxFQUFDLHFCQUFxQixFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUMsSUFBSSxJQUFBLGFBQUcsRUFBQyxZQUFZLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQyxJQUFJLElBQUksQ0FBQztJQUNyRyxNQUFNLEdBQUcsTUFBTSxJQUFJLElBQUEsYUFBRyxFQUFDLHFCQUFxQixFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsSUFBSSxJQUFBLGFBQUcsRUFBQyxZQUFZLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxJQUFJLE1BQU0sQ0FBQztJQUN6RyxVQUFVLEdBQUcsVUFBVSxJQUFJLElBQUEsYUFBRyxFQUFDLHlCQUF5QixFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsSUFBSSxJQUFBLGFBQUcsRUFBQyxnQkFBZ0IsRUFBRSxRQUFRLEVBQUUsRUFBRSxDQUFDLENBQUM7QUFDakgsQ0FBQztLQUFNLElBQUksTUFBTSxLQUFLLGFBQWEsQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUMvQyxRQUFRLEdBQUcsSUFBSSxDQUFDO0lBQ2hCLE9BQU8sR0FBRyxVQUFVLENBQUM7SUFDckIsTUFBTSxHQUFHLE1BQU0sSUFBSSxJQUFBLGFBQUcsRUFBQyx3QkFBd0IsRUFBRSxRQUFRLEVBQUUsRUFBRSxDQUFDLElBQUksSUFBQSxhQUFHLEVBQUMsZUFBZSxFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsSUFBSSxXQUFXLENBQUM7SUFDcEgsTUFBTSxHQUFHLE1BQU0sSUFBSSxJQUFBLGFBQUcsRUFBQyx3QkFBd0IsRUFBRSxRQUFRLEVBQUUsQ0FBQyxDQUFDLElBQUksSUFBQSxhQUFHLEVBQUMsZUFBZSxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUMsSUFBSSxJQUFJLENBQUM7SUFDM0csTUFBTSxHQUFHLE1BQU0sSUFBSSxJQUFBLGFBQUcsRUFBQyx3QkFBd0IsRUFBRSxRQUFRLEVBQUUsRUFBRSxDQUFDLElBQUksSUFBQSxhQUFHLEVBQUMsZUFBZSxFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsSUFBSSxVQUFVLENBQUM7SUFDbkgsVUFBVSxHQUFHLFVBQVUsSUFBSSxJQUFBLGFBQUcsRUFBQyw0QkFBNEIsRUFBRSxRQUFRLEVBQUUsRUFBRSxDQUFDLElBQUksSUFBQSxhQUFHLEVBQUMsbUJBQW1CLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxJQUFJLFVBQVUsQ0FBQztBQUNySSxDQUFDO0tBQU0sSUFBSSxNQUFNLEtBQUssYUFBYSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQzNDLHlCQUF5QjtJQUN6QixRQUFRLEdBQUcsUUFBUSxDQUFDO0lBQ3BCLE9BQU8sR0FBRyxRQUFRLENBQUM7QUFDckIsQ0FBQztBQUVZLFFBQUEsUUFBUSxHQUFHO0lBQ3RCLElBQUksRUFBRSxNQUFNO0lBQ1osT0FBTztJQUNQLE1BQU0sRUFBRSxRQUFRO0lBQ2hCLElBQUksRUFBRSxNQUFNO0lBQ1osSUFBSSxFQUFFLE1BQU07SUFDWixJQUFJLEVBQUUsTUFBTTtJQUNaLElBQUksRUFBRSxNQUFNO0lBQ1osUUFBUSxFQUFFLFVBQVU7Q0FDckIsQ0FBQyJ9
50
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb25maWcvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsbURBQXFDO0FBRXJDLElBQVksYUFJWDtBQUpELFdBQVksYUFBYTtJQUN2QixnQ0FBZSxDQUFBO0lBQ2YsMENBQXlCLENBQUE7SUFDekIsa0NBQWlCLENBQUE7QUFDbkIsQ0FBQyxFQUpXLGFBQWEsNkJBQWIsYUFBYSxRQUl4QjtBQUVELE1BQU0sTUFBTSxHQUFHLElBQUEsb0JBQUcsRUFBQyx3QkFBd0IsRUFBRSxRQUFRLEVBQUUsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFDO0FBQzVFLElBQUksTUFBTSxHQUFHLElBQUEsb0JBQUcsRUFBQyx3QkFBd0IsRUFBRSxRQUFRLENBQUMsQ0FBQztBQUNyRCxJQUFJLE1BQU0sR0FBRyxJQUFBLG9CQUFHLEVBQUMsd0JBQXdCLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDckQsSUFBSSxNQUFNLEdBQUcsSUFBQSxvQkFBRyxFQUFDLHdCQUF3QixFQUFFLFFBQVEsQ0FBQyxDQUFDO0FBQ3JELElBQUksTUFBTSxHQUFHLElBQUEsb0JBQUcsRUFBQyx3QkFBd0IsRUFBRSxRQUFRLENBQUMsQ0FBQztBQUNyRCxJQUFJLFVBQVUsR0FBRyxJQUFBLG9CQUFHLEVBQUMsNEJBQTRCLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDN0QsSUFBSSxPQUFPLEdBQUcsT0FBTyxDQUFDO0FBQ3RCLElBQUksUUFBUSxHQUFHLFFBQVEsQ0FBQztBQUN4QixJQUFJLE1BQU0sS0FBSyxhQUFhLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDbkMsa0NBQWtDO0lBQ2xDLE1BQU0sR0FBRyxNQUFNLElBQUksSUFBQSxvQkFBRyxFQUFDLHlCQUF5QixFQUFFLFFBQVEsQ0FBQyxJQUFJLElBQUEsb0JBQUcsRUFBQyxnQkFBZ0IsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUMvRixNQUFNLEdBQUcsTUFBTSxJQUFJLElBQUEsb0JBQUcsRUFBQyxxQkFBcUIsRUFBRSxRQUFRLENBQUMsSUFBSSxJQUFBLG9CQUFHLEVBQUMsWUFBWSxFQUFFLFFBQVEsQ0FBQyxJQUFJLFdBQVcsQ0FBQztJQUN0RyxNQUFNLEdBQUcsTUFBTSxJQUFJLElBQUEsb0JBQUcsRUFBQyxxQkFBcUIsRUFBRSxRQUFRLENBQUMsSUFBSSxJQUFBLG9CQUFHLEVBQUMsWUFBWSxFQUFFLFFBQVEsQ0FBQyxJQUFJLElBQUksQ0FBQztJQUMvRixNQUFNLEdBQUcsTUFBTSxJQUFJLElBQUEsb0JBQUcsRUFBQyxxQkFBcUIsRUFBRSxRQUFRLENBQUMsSUFBSSxJQUFBLG9CQUFHLEVBQUMsWUFBWSxFQUFFLFFBQVEsQ0FBQyxJQUFJLE1BQU0sQ0FBQztJQUNqRyxVQUFVLEdBQUcsVUFBVSxJQUFJLElBQUEsb0JBQUcsRUFBQyx5QkFBeUIsRUFBRSxRQUFRLENBQUMsSUFBSSxJQUFBLG9CQUFHLEVBQUMsZ0JBQWdCLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDekcsQ0FBQztLQUFNLElBQUksTUFBTSxLQUFLLGFBQWEsQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUMvQyxRQUFRLEdBQUcsSUFBSSxDQUFDO0lBQ2hCLE9BQU8sR0FBRyxVQUFVLENBQUM7SUFDckIsTUFBTSxHQUFHLE1BQU0sSUFBSSxJQUFBLG9CQUFHLEVBQUMsd0JBQXdCLEVBQUUsUUFBUSxDQUFDLElBQUksSUFBQSxvQkFBRyxFQUFDLGVBQWUsRUFBRSxRQUFRLENBQUMsSUFBSSxXQUFXLENBQUM7SUFDNUcsTUFBTSxHQUFHLE1BQU0sSUFBSSxJQUFBLG9CQUFHLEVBQUMsd0JBQXdCLEVBQUUsUUFBUSxDQUFDLElBQUksSUFBQSxvQkFBRyxFQUFDLGVBQWUsRUFBRSxRQUFRLENBQUMsSUFBSSxJQUFJLENBQUM7SUFDckcsTUFBTSxHQUFHLE1BQU0sSUFBSSxJQUFBLG9CQUFHLEVBQUMsd0JBQXdCLEVBQUUsUUFBUSxDQUFDLElBQUksSUFBQSxvQkFBRyxFQUFDLGVBQWUsRUFBRSxRQUFRLENBQUMsSUFBSSxVQUFVLENBQUM7SUFDM0csVUFBVSxHQUFHLFVBQVUsSUFBSSxJQUFBLG9CQUFHLEVBQUMsNEJBQTRCLEVBQUUsUUFBUSxDQUFDLElBQUksSUFBQSxvQkFBRyxFQUFDLG1CQUFtQixFQUFFLFFBQVEsQ0FBQyxJQUFJLFVBQVUsQ0FBQztBQUM3SCxDQUFDO0tBQU0sSUFBSSxNQUFNLEtBQUssYUFBYSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQzNDLHlCQUF5QjtJQUN6QixRQUFRLEdBQUcsUUFBUSxDQUFDO0lBQ3BCLE9BQU8sR0FBRyxRQUFRLENBQUM7QUFDckIsQ0FBQztBQUVZLFFBQUEsUUFBUSxHQUFHO0lBQ3RCLElBQUksRUFBRSxNQUFNO0lBQ1osT0FBTztJQUNQLE1BQU0sRUFBRSxRQUFRO0lBQ2hCLElBQUksRUFBRSxNQUFNO0lBQ1osSUFBSSxFQUFFLE1BQU07SUFDWixJQUFJLEVBQUUsTUFBTTtJQUNaLElBQUksRUFBRSxNQUFNO0lBQ1osUUFBUSxFQUFFLFVBQVU7Q0FDckIsQ0FBQyJ9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cnpmcore",
3
- "version": "4.0.0",
3
+ "version": "4.0.2",
4
4
  "description": "Private NPM Registry for Enterprise",
5
5
  "files": [
6
6
  "dist/**/*"
@@ -36,6 +36,7 @@
36
36
  }
37
37
  },
38
38
  "scripts": {
39
+ "predev": "npm run clean",
39
40
  "dev": "egg-bin dev",
40
41
  "dev:postgresql": "CNPMCORE_DATABASE_TYPE=PostgreSQL egg-bin dev",
41
42
  "lint": "eslint --cache --ext .ts .",
@@ -61,6 +62,9 @@
61
62
  "tsc": "npm run clean && tsc -p ./tsconfig.json",
62
63
  "tsc:prod": "npm run clean && tsc -p ./tsconfig.prod.json",
63
64
  "prepublishOnly": "npm run tsc:prod",
65
+ "images": "npm run images:alpine && npm run images:debian",
66
+ "images:alpine": "docker build -t cnpmcore:alpine-latest -f .docker/alpine/Dockerfile .",
67
+ "images:debian": "docker build -t cnpmcore:latest -f .docker/debian/Dockerfile .",
64
68
  "start": "eggctl start --daemon && touch egg.status",
65
69
  "start:foreground": "eggctl start",
66
70
  "stop": "rm -f egg.status && sleep 15 && eggctl stop"
@@ -118,6 +122,7 @@
118
122
  "oss-cnpm": "^5.0.1",
119
123
  "p-map": "^4.0.0",
120
124
  "pg": "^8.13.1",
125
+ "read-env-value": "^1.0.0",
121
126
  "s3-cnpmcore": "^1.1.2",
122
127
  "semver": "^7.3.5",
123
128
  "ssri": "^8.0.1",
@@ -129,7 +134,6 @@
129
134
  "s3-cnpmcore": "^1.1.2"
130
135
  },
131
136
  "devDependencies": {
132
- "@cnpmjs/npm-cli-login": "^1.1.0",
133
137
  "@eggjs/bin": "^7.1.0",
134
138
  "@eggjs/mock": "^6.0.7",
135
139
  "@elastic/elasticsearch-mock": "^2.0.0",
package/dist/app/common/EnvUtil.d.ts DELETED
@@ -1,4 +0,0 @@
1
- export type ValueType = 'string' | 'boolean' | 'number';
2
- export declare function env(key: string, valueType: ValueType, defaultValue: string): string;
3
- export declare function env(key: string, valueType: ValueType, defaultValue: boolean): boolean;
4
- export declare function env(key: string, valueType: ValueType, defaultValue: number): number;
package/dist/app/common/EnvUtil.js DELETED
@@ -1,34 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.env = env;
4
- function env(key, valueType, defaultValue) {
5
- const value = process.env[key];
6
- if (value === undefined) {
7
- return defaultValue;
8
- }
9
- if (valueType === 'string') {
10
- return value;
11
- }
12
- if (valueType === 'boolean') {
13
- let booleanValue = false;
14
- if (value === 'true' || value === '1') {
15
- booleanValue = true;
16
- }
17
- else if (value === 'false' || value === '0') {
18
- booleanValue = false;
19
- }
20
- else {
21
- throw new TypeError(`Invalid boolean value: ${value} on process.env.${key}`);
22
- }
23
- return booleanValue;
24
- }
25
- if (valueType === 'number') {
26
- const numberValue = Number(value);
27
- if (isNaN(numberValue)) {
28
- throw new TypeError(`Invalid number value: ${value} on process.env.${key}`);
29
- }
30
- return numberValue;
31
- }
32
- throw new TypeError(`Invalid value type: ${valueType}`);
33
- }
34
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52VXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9jb21tb24vRW52VXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUtBLGtCQStCQztBQS9CRCxTQUFnQixHQUFHLENBQUMsR0FBVyxFQUFFLFNBQW9CLEVBQUUsWUFBdUM7SUFDNUYsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMvQixJQUFJLEtBQUssS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUN4QixPQUFPLFlBQVksQ0FBQztJQUN0QixDQUFDO0lBRUQsSUFBSSxTQUFTLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDM0IsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRUQsSUFBSSxTQUFTLEtBQUssU0FBUyxFQUFFLENBQUM7UUFDNUIsSUFBSSxZQUFZLEdBQUcsS0FBSyxDQUFDO1FBQ3pCLElBQUksS0FBSyxLQUFLLE1BQU0sSUFBSSxLQUFLLEtBQUssR0FBRyxFQUFFLENBQUM7WUFDdEMsWUFBWSxHQUFHLElBQUksQ0FBQztRQUN0QixDQUFDO2FBQU0sSUFBSSxLQUFLLEtBQUssT0FBTyxJQUFJLEtBQUssS0FBSyxHQUFHLEVBQUUsQ0FBQztZQUM5QyxZQUFZLEdBQUcsS0FBSyxDQUFDO1FBQ3ZCLENBQUM7YUFBTSxDQUFDO1lBQ04sTUFBTSxJQUFJLFNBQVMsQ0FBQywwQkFBMEIsS0FBSyxtQkFBbUIsR0FBRyxFQUFFLENBQUMsQ0FBQztRQUMvRSxDQUFDO1FBQ0QsT0FBTyxZQUFZLENBQUM7SUFDdEIsQ0FBQztJQUVELElBQUksU0FBUyxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQzNCLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNsQyxJQUFJLEtBQUssQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDO1lBQ3ZCLE1BQU0sSUFBSSxTQUFTLENBQUMseUJBQXlCLEtBQUssbUJBQW1CLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDOUUsQ0FBQztRQUNELE9BQU8sV0FBVyxDQUFDO0lBQ3JCLENBQUM7SUFFRCxNQUFNLElBQUksU0FBUyxDQUFDLHVCQUF1QixTQUFTLEVBQUUsQ0FBQyxDQUFDO0FBQzFELENBQUMifQ==