cnpmcore 3.73.1 → 3.74.0
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.
|
@@ -0,0 +1,4 @@
|
|
|
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;
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.env = void 0;
|
|
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
|
+
exports.env = env;
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52VXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9jb21tb24vRW52VXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFLQSxTQUFnQixHQUFHLENBQUMsR0FBVyxFQUFFLFNBQW9CLEVBQUUsWUFBdUM7SUFDNUYsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMvQixJQUFJLEtBQUssS0FBSyxTQUFTLEVBQUU7UUFDdkIsT0FBTyxZQUFZLENBQUM7S0FDckI7SUFFRCxJQUFJLFNBQVMsS0FBSyxRQUFRLEVBQUU7UUFDMUIsT0FBTyxLQUFLLENBQUM7S0FDZDtJQUVELElBQUksU0FBUyxLQUFLLFNBQVMsRUFBRTtRQUMzQixJQUFJLFlBQVksR0FBRyxLQUFLLENBQUM7UUFDekIsSUFBSSxLQUFLLEtBQUssTUFBTSxJQUFJLEtBQUssS0FBSyxHQUFHLEVBQUU7WUFDckMsWUFBWSxHQUFHLElBQUksQ0FBQztTQUNyQjthQUFNLElBQUksS0FBSyxLQUFLLE9BQU8sSUFBSSxLQUFLLEtBQUssR0FBRyxFQUFFO1lBQzdDLFlBQVksR0FBRyxLQUFLLENBQUM7U0FDdEI7YUFBTTtZQUNMLE1BQU0sSUFBSSxTQUFTLENBQUMsMEJBQTBCLEtBQUssbUJBQW1CLEdBQUcsRUFBRSxDQUFDLENBQUM7U0FDOUU7UUFDRCxPQUFPLFlBQVksQ0FBQztLQUNyQjtJQUVELElBQUksU0FBUyxLQUFLLFFBQVEsRUFBRTtRQUMxQixNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDbEMsSUFBSSxLQUFLLENBQUMsV0FBVyxDQUFDLEVBQUU7WUFDdEIsTUFBTSxJQUFJLFNBQVMsQ0FBQyx5QkFBeUIsS0FBSyxtQkFBbUIsR0FBRyxFQUFFLENBQUMsQ0FBQztTQUM3RTtRQUNELE9BQU8sV0FBVyxDQUFDO0tBQ3BCO0lBRUQsTUFBTSxJQUFJLFNBQVMsQ0FBQyx1QkFBdUIsU0FBUyxFQUFFLENBQUMsQ0FBQztBQUMxRCxDQUFDO0FBL0JELGtCQStCQyJ9
|
|
@@ -10,13 +10,14 @@ const node_path_1 = require("node:path");
|
|
|
10
10
|
const oss_cnpm_1 = __importDefault(require("oss-cnpm"));
|
|
11
11
|
const typebox_1 = require("../app/port/typebox");
|
|
12
12
|
const constants_1 = require("../app/common/constants");
|
|
13
|
+
const EnvUtil_1 = require("../app/common/EnvUtil");
|
|
13
14
|
const database_1 = require("./database");
|
|
14
15
|
exports.cnpmcoreConfig = {
|
|
15
16
|
name: 'cnpm',
|
|
16
17
|
hookEnable: false,
|
|
17
18
|
hooksLimit: 20,
|
|
18
|
-
sourceRegistry: 'https://registry.npmjs.org',
|
|
19
|
-
sourceRegistryIsCNpm: false,
|
|
19
|
+
sourceRegistry: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_SOURCE_REGISTRY', 'string', 'https://registry.npmjs.org'),
|
|
20
|
+
sourceRegistryIsCNpm: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_SOURCE_REGISTRY_IS_CNPM', 'boolean', false),
|
|
20
21
|
syncUpstreamFirst: false,
|
|
21
22
|
sourceRegistrySyncTimeout: 180000,
|
|
22
23
|
taskQueueHighWaterSize: 100,
|
|
@@ -36,7 +37,7 @@ exports.cnpmcoreConfig = {
|
|
|
36
37
|
checkChangesStreamInterval: 500,
|
|
37
38
|
changesStreamRegistry: 'https://replicate.npmjs.com',
|
|
38
39
|
changesStreamRegistryMode: constants_1.ChangesStreamMode.streaming,
|
|
39
|
-
registry:
|
|
40
|
+
registry: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_REGISTRY', 'string', 'http://localhost:7001'),
|
|
40
41
|
alwaysAuth: false,
|
|
41
42
|
allowScopes: [
|
|
42
43
|
'@cnpm',
|
|
@@ -48,7 +49,7 @@ exports.cnpmcoreConfig = {
|
|
|
48
49
|
admins: {
|
|
49
50
|
cnpmcore_admin: 'admin@cnpmjs.org',
|
|
50
51
|
},
|
|
51
|
-
enableWebAuthn:
|
|
52
|
+
enableWebAuthn: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ENABLE_WEB_AUTHN', 'boolean', false),
|
|
52
53
|
enableCDN: false,
|
|
53
54
|
cdnCacheControlHeader: 'public, max-age=300',
|
|
54
55
|
cdnVaryHeader: 'Accept, Accept-Encoding',
|
|
@@ -60,7 +61,7 @@ exports.cnpmcoreConfig = {
|
|
|
60
61
|
enableSyncUnpkgFiles: true,
|
|
61
62
|
enableSyncUnpkgFilesWhiteList: false,
|
|
62
63
|
strictSyncSpecivicVersion: false,
|
|
63
|
-
enableElasticsearch:
|
|
64
|
+
enableElasticsearch: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ENABLE_ES', 'boolean', false),
|
|
64
65
|
elasticsearchIndex: 'cnpmcore_packages',
|
|
65
66
|
strictValidateTarballPkg: false,
|
|
66
67
|
strictValidatePackageDeps: false,
|
|
@@ -70,13 +71,13 @@ exports.cnpmcoreConfig = {
|
|
|
70
71
|
};
|
|
71
72
|
exports.default = (appInfo) => {
|
|
72
73
|
const config = {};
|
|
73
|
-
config.keys =
|
|
74
|
+
config.keys = (0, EnvUtil_1.env)('CNPMCORE_EGG_KEYS', 'string', (0, node_crypto_1.randomUUID)());
|
|
74
75
|
config.cnpmcore = exports.cnpmcoreConfig;
|
|
75
76
|
// override config from framework / plugin
|
|
76
|
-
config.dataDir =
|
|
77
|
+
config.dataDir = (0, EnvUtil_1.env)('CNPMCORE_DATA_DIR', 'string', (0, node_path_1.join)(appInfo.root, '.cnpmcore'));
|
|
77
78
|
config.orm = {
|
|
78
79
|
...database_1.database,
|
|
79
|
-
database: database_1.database.name
|
|
80
|
+
database: database_1.database.name || 'cnpmcore',
|
|
80
81
|
charset: 'utf8mb4',
|
|
81
82
|
logger: {
|
|
82
83
|
// https://github.com/cyjake/leoric/blob/master/docs/zh/logging.md#logqueryerror
|
|
@@ -89,10 +90,10 @@ exports.default = (appInfo) => {
|
|
|
89
90
|
};
|
|
90
91
|
config.redis = {
|
|
91
92
|
client: {
|
|
92
|
-
port:
|
|
93
|
-
host:
|
|
94
|
-
password:
|
|
95
|
-
db:
|
|
93
|
+
port: (0, EnvUtil_1.env)('CNPMCORE_REDIS_PORT', 'number', 6379),
|
|
94
|
+
host: (0, EnvUtil_1.env)('CNPMCORE_REDIS_HOST', 'string', '127.0.0.1'),
|
|
95
|
+
password: (0, EnvUtil_1.env)('CNPMCORE_REDIS_PASSWORD', 'string', ''),
|
|
96
|
+
db: (0, EnvUtil_1.env)('CNPMCORE_REDIS_DB', 'number', 0),
|
|
96
97
|
},
|
|
97
98
|
};
|
|
98
99
|
config.security = {
|
|
@@ -111,59 +112,61 @@ exports.default = (appInfo) => {
|
|
|
111
112
|
};
|
|
112
113
|
config.nfs = {
|
|
113
114
|
client: null,
|
|
114
|
-
dir:
|
|
115
|
+
dir: (0, EnvUtil_1.env)('CNPMCORE_NFS_DIR', 'string', (0, node_path_1.join)(config.dataDir, 'nfs')),
|
|
115
116
|
};
|
|
116
117
|
/* c8 ignore next 17 */
|
|
117
118
|
// enable oss nfs store by env values
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
bucket: process.env.CNPMCORE_NFS_OSS_BUCKET,
|
|
127
|
-
accessKeyId: process.env.CNPMCORE_NFS_OSS_ID,
|
|
128
|
-
accessKeySecret: process.env.CNPMCORE_NFS_OSS_SECRET,
|
|
119
|
+
const nfsType = (0, EnvUtil_1.env)('CNPMCORE_NFS_TYPE', 'string', '');
|
|
120
|
+
if (nfsType === 'oss') {
|
|
121
|
+
const ossConfig = {
|
|
122
|
+
cdnBaseUrl: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_CDN', 'string', ''),
|
|
123
|
+
endpoint: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_ENDPOINT', 'string', ''),
|
|
124
|
+
bucket: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_BUCKET', 'string', ''),
|
|
125
|
+
accessKeyId: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_ID', 'string', ''),
|
|
126
|
+
accessKeySecret: (0, EnvUtil_1.env)('CNPMCORE_NFS_OSS_SECRET', 'string', ''),
|
|
129
127
|
defaultHeaders: {
|
|
130
128
|
'Cache-Control': 'max-age=0, s-maxage=60',
|
|
131
129
|
},
|
|
132
|
-
}
|
|
130
|
+
};
|
|
131
|
+
(0, node_assert_1.strict)(ossConfig.cdnBaseUrl, 'require env CNPMCORE_NFS_OSS_BUCKET');
|
|
132
|
+
(0, node_assert_1.strict)(ossConfig.endpoint, 'require env CNPMCORE_NFS_OSS_ENDPOINT');
|
|
133
|
+
(0, node_assert_1.strict)(ossConfig.accessKeyId, 'require env CNPMCORE_NFS_OSS_ID');
|
|
134
|
+
(0, node_assert_1.strict)(ossConfig.accessKeySecret, 'require env CNPMCORE_NFS_OSS_SECRET');
|
|
135
|
+
config.nfs.client = new oss_cnpm_1.default(ossConfig);
|
|
133
136
|
}
|
|
134
|
-
else if (
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
(0, node_assert_1.strict)(process.env.CNPMCORE_NFS_S3_CLIENT_BUCKET, 'require env CNPMCORE_NFS_S3_CLIENT_BUCKET');
|
|
139
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
140
|
-
const S3Client = require('s3-cnpmcore');
|
|
141
|
-
config.nfs.client = new S3Client({
|
|
142
|
-
region: process.env.CNPMCORE_NFS_S3_CLIENT_REGION || 'default',
|
|
143
|
-
endpoint: process.env.CNPMCORE_NFS_S3_CLIENT_ENDPOINT,
|
|
137
|
+
else if (nfsType === 's3') {
|
|
138
|
+
const s3Config = {
|
|
139
|
+
region: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_REGION', 'string', 'default'),
|
|
140
|
+
endpoint: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_ENDPOINT', 'string', ''),
|
|
144
141
|
credentials: {
|
|
145
|
-
accessKeyId:
|
|
146
|
-
secretAccessKey:
|
|
142
|
+
accessKeyId: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_ID', 'string', ''),
|
|
143
|
+
secretAccessKey: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_SECRET', 'string', ''),
|
|
147
144
|
},
|
|
148
|
-
bucket:
|
|
149
|
-
forcePathStyle:
|
|
150
|
-
disableURL:
|
|
151
|
-
}
|
|
145
|
+
bucket: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_BUCKET', 'string', ''),
|
|
146
|
+
forcePathStyle: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_FORCE_PATH_STYLE', 'boolean', false),
|
|
147
|
+
disableURL: (0, EnvUtil_1.env)('CNPMCORE_NFS_S3_CLIENT_DISABLE_URL', 'boolean', false),
|
|
148
|
+
};
|
|
149
|
+
(0, node_assert_1.strict)(s3Config.endpoint, 'require env CNPMCORE_NFS_S3_CLIENT_ENDPOINT');
|
|
150
|
+
(0, node_assert_1.strict)(s3Config.credentials.accessKeyId, 'require env CNPMCORE_NFS_S3_CLIENT_ID');
|
|
151
|
+
(0, node_assert_1.strict)(s3Config.credentials.secretAccessKey, 'require env CNPMCORE_NFS_S3_CLIENT_SECRET');
|
|
152
|
+
(0, node_assert_1.strict)(s3Config.bucket, 'require env CNPMCORE_NFS_S3_CLIENT_BUCKET');
|
|
153
|
+
// TODO(@fengmk2): should change to use import to support esm
|
|
154
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
155
|
+
const S3Client = require('s3-cnpmcore');
|
|
156
|
+
config.nfs.client = new S3Client(s3Config);
|
|
152
157
|
}
|
|
153
158
|
config.logger = {
|
|
154
159
|
enablePerformanceTimer: true,
|
|
155
160
|
enableFastContextLogger: true,
|
|
156
|
-
appLogName:
|
|
157
|
-
coreLogName:
|
|
158
|
-
agentLogName:
|
|
159
|
-
errorLogName:
|
|
160
|
-
outputJSON:
|
|
161
|
+
appLogName: (0, EnvUtil_1.env)('CNPMCORE_APP_LOG_NAME', 'string', `${appInfo.name}-web.log`),
|
|
162
|
+
coreLogName: (0, EnvUtil_1.env)('CNPMCORE_CORE_LOG_NAME', 'string', 'egg-web.log'),
|
|
163
|
+
agentLogName: (0, EnvUtil_1.env)('CNPMCORE_AGENT_LOG_NAME', 'string', 'egg-agent.log'),
|
|
164
|
+
errorLogName: (0, EnvUtil_1.env)('CNPMCORE_ERROR_LOG_NAME', 'string', 'common-error.log'),
|
|
165
|
+
outputJSON: (0, EnvUtil_1.env)('CNPMCORE_LOG_JSON_OUTPUT', 'boolean', false),
|
|
161
166
|
};
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
if (process.env.CNPMCORE_LOG_JSON_OUTPUT) {
|
|
166
|
-
config.logger.outputJSON = Boolean(process.env.CNPMCORE_LOG_JSON_OUTPUT);
|
|
167
|
+
const logDir = (0, EnvUtil_1.env)('CNPMCORE_LOG_DIR', 'string', '');
|
|
168
|
+
if (logDir) {
|
|
169
|
+
config.logger.dir = logDir;
|
|
167
170
|
}
|
|
168
171
|
config.logrotator = {
|
|
169
172
|
// only keep 1 days log files
|
|
@@ -196,14 +199,14 @@ exports.default = (appInfo) => {
|
|
|
196
199
|
if (config.cnpmcore.enableElasticsearch) {
|
|
197
200
|
config.elasticsearch = {
|
|
198
201
|
client: {
|
|
199
|
-
node:
|
|
202
|
+
node: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ES_CLIENT_NODE', 'string', ''),
|
|
200
203
|
auth: {
|
|
201
|
-
username:
|
|
202
|
-
password:
|
|
204
|
+
username: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ES_CLIENT_AUTH_USERNAME', 'string', ''),
|
|
205
|
+
password: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ES_CLIENT_AUTH_PASSWORD', 'string', ''),
|
|
203
206
|
},
|
|
204
207
|
},
|
|
205
208
|
};
|
|
206
209
|
}
|
|
207
210
|
return config;
|
|
208
211
|
};
|
|
209
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
212
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.default.js","sourceRoot":"","sources":["../../config/config.default.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ exports.default = (appInfo) => {
|
|
|
12
12
|
const config = {};
|
|
13
13
|
config.dataDir = (0, path_1.join)(appInfo.root, '.cnpmcore_unittest');
|
|
14
14
|
config.orm = {
|
|
15
|
-
database: database_1.database.name
|
|
15
|
+
database: database_1.database.name || 'cnpmcore_unittest',
|
|
16
16
|
};
|
|
17
17
|
config.nfs = {
|
|
18
18
|
dir: (0, path_1.join)(config.dataDir, 'nfs'),
|
|
@@ -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:
|
|
13
|
-
user: string
|
|
14
|
-
password: string
|
|
10
|
+
name: string;
|
|
11
|
+
host: string;
|
|
12
|
+
port: number;
|
|
13
|
+
user: string;
|
|
14
|
+
password: string;
|
|
15
15
|
};
|
package/dist/config/database.js
CHANGED
|
@@ -1,38 +1,39 @@
|
|
|
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
5
|
var DATABASE_TYPE;
|
|
5
6
|
(function (DATABASE_TYPE) {
|
|
6
7
|
DATABASE_TYPE["MySQL"] = "MySQL";
|
|
7
8
|
DATABASE_TYPE["PostgreSQL"] = "PostgreSQL";
|
|
8
9
|
DATABASE_TYPE["SQLite"] = "SQLite";
|
|
9
10
|
})(DATABASE_TYPE || (exports.DATABASE_TYPE = DATABASE_TYPE = {}));
|
|
10
|
-
const dbType =
|
|
11
|
-
let dbName =
|
|
12
|
-
let dbHost =
|
|
13
|
-
let dbPort =
|
|
14
|
-
let dbUser =
|
|
15
|
-
let dbPassword =
|
|
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', '');
|
|
16
17
|
let dialect = 'mysql';
|
|
17
18
|
let dbClient = 'mysql2';
|
|
18
19
|
if (dbType === DATABASE_TYPE.MySQL) {
|
|
19
20
|
// Compatible mysql configurations
|
|
20
|
-
dbName = dbName
|
|
21
|
-
dbHost = dbHost
|
|
22
|
-
dbPort = dbPort
|
|
23
|
-
dbUser = dbUser
|
|
24
|
-
dbPassword = dbPassword
|
|
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', '');
|
|
25
26
|
}
|
|
26
27
|
else if (dbType === DATABASE_TYPE.PostgreSQL) {
|
|
27
28
|
dbClient = 'pg';
|
|
28
29
|
dialect = 'postgres';
|
|
29
|
-
dbHost = dbHost
|
|
30
|
-
dbPort = dbPort
|
|
31
|
-
dbUser = dbUser
|
|
32
|
-
dbPassword = dbPassword
|
|
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';
|
|
33
34
|
}
|
|
34
35
|
else if (dbType === DATABASE_TYPE.SQLite) {
|
|
35
|
-
// TODO
|
|
36
|
+
// TODO: Implement SQLite
|
|
36
37
|
dbClient = 'sqlite';
|
|
37
38
|
dialect = 'sqlite';
|
|
38
39
|
}
|
|
@@ -46,4 +47,4 @@ exports.database = {
|
|
|
46
47
|
user: dbUser,
|
|
47
48
|
password: dbPassword,
|
|
48
49
|
};
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb25maWcvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsbURBQTRDO0FBRTVDLElBQVksYUFJWDtBQUpELFdBQVksYUFBYTtJQUN2QixnQ0FBZSxDQUFBO0lBQ2YsMENBQXlCLENBQUE7SUFDekIsa0NBQWlCLENBQUE7QUFDbkIsQ0FBQyxFQUpXLGFBQWEsNkJBQWIsYUFBYSxRQUl4QjtBQUVELE1BQU0sTUFBTSxHQUFHLElBQUEsYUFBRyxFQUFDLHdCQUF3QixFQUFFLFFBQVEsRUFBRSxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDNUUsSUFBSSxNQUFNLEdBQUcsSUFBQSxhQUFHLEVBQUMsd0JBQXdCLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ3pELElBQUksTUFBTSxHQUFHLElBQUEsYUFBRyxFQUFDLHdCQUF3QixFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUN6RCxJQUFJLE1BQU0sR0FBRyxJQUFBLGFBQUcsRUFBQyx3QkFBd0IsRUFBRSxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDeEQsSUFBSSxNQUFNLEdBQUcsSUFBQSxhQUFHLEVBQUMsd0JBQXdCLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ3pELElBQUksVUFBVSxHQUFHLElBQUEsYUFBRyxFQUFDLDRCQUE0QixFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUNqRSxJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUM7QUFDdEIsSUFBSSxRQUFRLEdBQUcsUUFBUSxDQUFDO0FBQ3hCLElBQUksTUFBTSxLQUFLLGFBQWEsQ0FBQyxLQUFLLEVBQUU7SUFDbEMsa0NBQWtDO0lBQ2xDLE1BQU0sR0FBRyxNQUFNLElBQUksSUFBQSxhQUFHLEVBQUMseUJBQXlCLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxJQUFJLElBQUEsYUFBRyxF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
|