vona-core 5.0.89 → 5.0.90
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.
|
@@ -21,7 +21,7 @@ export class VonaApplication extends KoaApplication {
|
|
|
21
21
|
const koaOptions = {
|
|
22
22
|
env: cast(env).NODE_ENV,
|
|
23
23
|
keys: options.config.server.keys,
|
|
24
|
-
proxy: options.config.proxy.
|
|
24
|
+
proxy: options.config.proxy.enable,
|
|
25
25
|
subdomainOffset: options.config.server.subdomainOffset,
|
|
26
26
|
proxyIpHeader: options.config.proxy.ipHeaders,
|
|
27
27
|
maxIpsCount: options.config.proxy.maxIpsCount,
|
|
@@ -4,9 +4,11 @@ import type { VonaConfigEnv } from '../../types/utils/env.ts';
|
|
|
4
4
|
import type { PowerPartial } from '../../types/utils/powerPartial.ts';
|
|
5
5
|
import type { VonaApplication } from './application.ts';
|
|
6
6
|
export declare function combineAppConfigDefault(appInfo: VonaAppInfo, env: VonaConfigEnv): PowerPartial<import("../../types/config/config.ts").VonaConfig>;
|
|
7
|
-
export declare function configDefault(
|
|
7
|
+
export declare function configDefault(_appInfo: VonaAppInfo, _env: VonaConfigEnv): VonaConfigOptional;
|
|
8
8
|
export declare function configDev(_env: VonaConfigEnv): VonaConfigOptional;
|
|
9
9
|
export declare function configProd(_env: VonaConfigEnv): VonaConfigOptional;
|
|
10
10
|
export declare function configTest(_env: VonaConfigEnv): VonaConfigOptional;
|
|
11
11
|
export type TypeConfigLoader<T> = (app: VonaApplication) => Promise<PowerPartial<T>>;
|
|
12
12
|
export declare function combineConfigDefault<T>(app: VonaApplication, configDefault: TypeConfigLoader<T>, configDev?: TypeConfigLoader<T>, configProd?: TypeConfigLoader<T>, configTest?: TypeConfigLoader<T>): Promise<PowerPartial<T>>;
|
|
13
|
+
export declare function getLoggerPathPhysicalRoot(appInfo: VonaAppInfo): string;
|
|
14
|
+
export declare function getPublicPathPhysicalRoot(appInfo: VonaAppInfo): string;
|
package/dist/lib/core/config.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import os from 'node:os';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import fse from 'fs-extra';
|
|
4
|
-
import { cast } from "../../types/utils/cast.js";
|
|
5
4
|
import { deepExtend } from "../utils/util.js";
|
|
6
5
|
export function combineAppConfigDefault(appInfo, env) {
|
|
7
6
|
let config = configDefault(appInfo, env);
|
|
@@ -17,63 +16,33 @@ export function combineAppConfigDefault(appInfo, env) {
|
|
|
17
16
|
}
|
|
18
17
|
return config;
|
|
19
18
|
}
|
|
20
|
-
export function configDefault(
|
|
21
|
-
|
|
22
|
-
const publicDir = env.SERVER_PUBLICDIR || getPublicPathPhysicalRoot(appInfo);
|
|
23
|
-
const loggerDir = env.SERVER_LOGGERDIR || getLoggerPathPhysicalRoot(appInfo);
|
|
24
|
-
const subdomainOffset = Number.parseInt(env.SERVER_SUBDOMAINOFFSET || '1');
|
|
25
|
-
const workers = Number.parseInt(env.SERVER_WORKERS);
|
|
26
|
-
return {
|
|
27
|
-
meta: {
|
|
28
|
-
flavor: cast(env).META_FLAVOR,
|
|
29
|
-
mode: cast(env).META_MODE,
|
|
30
|
-
},
|
|
31
|
-
server: {
|
|
32
|
-
keys: (env.SERVER_KEYS || '').split(','),
|
|
33
|
-
globalPrefix: env.SERVER_GLOBALPREFIX || '/api',
|
|
34
|
-
publicDir,
|
|
35
|
-
loggerDir,
|
|
36
|
-
subdomainOffset,
|
|
37
|
-
workers,
|
|
38
|
-
listen: {
|
|
39
|
-
hostname: env.SERVER_LISTEN_HOSTNAME,
|
|
40
|
-
port: Number.parseInt(env.SERVER_LISTEN_PORT),
|
|
41
|
-
disable: env.SERVER_LISTEN_DISABLE === 'true',
|
|
42
|
-
},
|
|
43
|
-
serve: {},
|
|
44
|
-
},
|
|
45
|
-
proxy: {
|
|
46
|
-
enabled: true,
|
|
47
|
-
ipHeaders: 'x-real-ip,x-forwarded-for',
|
|
48
|
-
hostHeaders: 'x-forwarded-host,host',
|
|
49
|
-
protocolHeaders: 'x-forwarded-proto',
|
|
50
|
-
maxProxyCount: 1,
|
|
51
|
-
maxIpsCount: 15,
|
|
52
|
-
},
|
|
53
|
-
};
|
|
19
|
+
export function configDefault(_appInfo, _env) {
|
|
20
|
+
return {};
|
|
54
21
|
}
|
|
55
22
|
export function configDev(_env) {
|
|
56
|
-
return {
|
|
57
|
-
proxy: {
|
|
58
|
-
enabled: true,
|
|
59
|
-
},
|
|
60
|
-
};
|
|
23
|
+
return {};
|
|
61
24
|
}
|
|
62
25
|
export function configProd(_env) {
|
|
63
|
-
return {
|
|
64
|
-
proxy: {
|
|
65
|
-
enabled: true,
|
|
66
|
-
},
|
|
67
|
-
};
|
|
26
|
+
return {};
|
|
68
27
|
}
|
|
69
28
|
export function configTest(_env) {
|
|
70
|
-
return {
|
|
71
|
-
proxy: {
|
|
72
|
-
enabled: false,
|
|
73
|
-
},
|
|
74
|
-
};
|
|
29
|
+
return {};
|
|
75
30
|
}
|
|
76
|
-
function
|
|
31
|
+
export async function combineConfigDefault(app, configDefault, configDev, configProd, configTest) {
|
|
32
|
+
let config = await configDefault(app);
|
|
33
|
+
const mode = app.config.meta.mode;
|
|
34
|
+
if (mode === 'dev' && configDev) {
|
|
35
|
+
config = deepExtend(config, await configDev(app));
|
|
36
|
+
}
|
|
37
|
+
else if (mode === 'prod' && configProd) {
|
|
38
|
+
config = deepExtend(config, await configProd(app));
|
|
39
|
+
}
|
|
40
|
+
else if (mode === 'test' && configTest) {
|
|
41
|
+
config = deepExtend(config, await configTest(app));
|
|
42
|
+
}
|
|
43
|
+
return config;
|
|
44
|
+
}
|
|
45
|
+
export function getLoggerPathPhysicalRoot(appInfo) {
|
|
77
46
|
const mode = appInfo.configMeta.mode;
|
|
78
47
|
let loggerDir;
|
|
79
48
|
if (mode === 'test' || mode === 'dev') {
|
|
@@ -85,7 +54,7 @@ function getLoggerPathPhysicalRoot(appInfo) {
|
|
|
85
54
|
fse.ensureDirSync(loggerDir);
|
|
86
55
|
return loggerDir;
|
|
87
56
|
}
|
|
88
|
-
function getPublicPathPhysicalRoot(appInfo) {
|
|
57
|
+
export function getPublicPathPhysicalRoot(appInfo) {
|
|
89
58
|
const mode = appInfo.configMeta.mode;
|
|
90
59
|
let publicDir;
|
|
91
60
|
if (mode === 'test' || mode === 'dev') {
|
|
@@ -97,17 +66,3 @@ function getPublicPathPhysicalRoot(appInfo) {
|
|
|
97
66
|
fse.ensureDirSync(publicDir);
|
|
98
67
|
return publicDir;
|
|
99
68
|
}
|
|
100
|
-
export async function combineConfigDefault(app, configDefault, configDev, configProd, configTest) {
|
|
101
|
-
let config = await configDefault(app);
|
|
102
|
-
const mode = app.config.meta.mode;
|
|
103
|
-
if (mode === 'dev' && configDev) {
|
|
104
|
-
config = deepExtend(config, await configDev(app));
|
|
105
|
-
}
|
|
106
|
-
else if (mode === 'prod' && configProd) {
|
|
107
|
-
config = deepExtend(config, await configProd(app));
|
|
108
|
-
}
|
|
109
|
-
else if (mode === 'test' && configTest) {
|
|
110
|
-
config = deepExtend(config, await configTest(app));
|
|
111
|
-
}
|
|
112
|
-
return config;
|
|
113
|
-
}
|