@nocobase/app-server 3.0.0-beta.1 → 3.0.0-beta.3
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.
- package/dist/config/app-config.d.ts.map +1 -1
- package/dist/config/app-config.js +3 -0
- package/dist/config/app-config.js.map +1 -1
- package/dist/config/channel-type.d.ts +9 -0
- package/dist/config/channel-type.d.ts.map +1 -0
- package/dist/config/channel-type.js +40 -0
- package/dist/config/channel-type.js.map +1 -0
- package/dist/config/index.d.ts +1 -0
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +1 -0
- package/dist/config/index.js.map +1 -1
- package/dist/mailer/index.d.ts.map +1 -1
- package/dist/mailer/index.js +38 -12
- package/dist/mailer/index.js.map +1 -1
- package/dist/support/paths.d.ts +2 -0
- package/dist/support/paths.d.ts.map +1 -1
- package/dist/support/paths.js +4 -0
- package/dist/support/paths.js.map +1 -1
- package/package.json +7 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-config.d.ts","sourceRoot":"","sources":["../../src/config/app-config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACpB,eAAe,EACf,qBAAqB,EACrB,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"app-config.d.ts","sourceRoot":"","sources":["../../src/config/app-config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACpB,eAAe,EACf,qBAAqB,EACrB,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAKL,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IACjD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAGtB;IACJ,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;IAC9D,OAAO,CAAC,aAAa,CAA6C;IAClE,OAAO,CAAC,MAAM,CAAC,CAAwB;IACvC,OAAO,CAAC,cAAc,CAAC,CAAS;IAEhC,4EAA4E;IACrE,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAW9C,IAAI,CACT,QAAQ,EAAE,eAAe,CAAC,UAAU,CAAC,EACrC,MAAM,CAAC,EAAE,eAAe,CAAC,QAAQ,CAAC,EAClC,OAAO,CAAC,EAAE,eAAe,CAAC,SAAS,CAAC,GACnC,IAAI;IAQA,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,oBAAyB,GAAG,IAAI;IAmB9D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ9B,GAAG,CAAC,MAAM,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAItD,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAW7C;;;OAGG;IACI,cAAc,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,IAAI;IAgB1E;;;;OAIG;IACU,sBAAsB,CACjC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,GACxD,OAAO,CAAC,IAAI,CAAC;IAwBhB,iIAAiI;IAC1H,2BAA2B,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAStE;;;OAGG;IACI,2BAA2B,IAAI,QAAQ,CAC5C,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CACnC;IAaD,2GAA2G;IAC9F,QAAQ,IAAI,OAAO,CAAC,SAAS,WAAW,EAAE,CAAC;IASxD,oFAAoF;IAC7E,YAAY,IAAI,SAAS;IAKhC,mFAAmF;IAC5E,WAAW,IAAI,SAAS,MAAM,EAAE;IAIhC,GAAG,IAAI,SAAS;IAIvB,iHAAiH;IAC1G,MAAM,IAAI,eAAe;IAQzB,SAAS,CAAC,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,uBAAuB,CAAC,MAAM,CAAC,GACxC,MAAM,IAAI;IASN,MAAM,IAAI,OAAO,CAAC,qBAAqB,CAAC;YAmBjC,aAAa;YAyCb,UAAU;IAYxB,OAAO,CAAC,cAAc;CAMvB;AAUD,qFAAqF;AACrF,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,GACzC,MAAM,CAIR"}
|
|
@@ -7,6 +7,7 @@ import { tomlParser } from '@nocobase/config/parsers/toml';
|
|
|
7
7
|
import { yamlParser } from '@nocobase/config/parsers/yaml';
|
|
8
8
|
import { fileProvider } from '@nocobase/config/providers/file';
|
|
9
9
|
import { environmentProvider, } from '@nocobase/config/providers/env';
|
|
10
|
+
import { normalizeNotificationChannelAliases } from './channel-type.js';
|
|
10
11
|
import { AppConfigInvalidError, collectPublicConfig, listPublicPaths, validateConfigSections, } from './validation.js';
|
|
11
12
|
export class AppConfig {
|
|
12
13
|
sources = [];
|
|
@@ -65,6 +66,7 @@ export class AppConfig {
|
|
|
65
66
|
defaults.merge(new Config({}, values));
|
|
66
67
|
const next = defaults.copy();
|
|
67
68
|
next.merge(this.overrides);
|
|
69
|
+
normalizeNotificationChannelAliases(next);
|
|
68
70
|
this.defaults = defaults;
|
|
69
71
|
this.current = next;
|
|
70
72
|
}
|
|
@@ -222,6 +224,7 @@ export class AppConfig {
|
|
|
222
224
|
}
|
|
223
225
|
const next = this.defaults.copy();
|
|
224
226
|
next.merge(overrides);
|
|
227
|
+
normalizeNotificationChannelAliases(next);
|
|
225
228
|
this.overrides = overrides;
|
|
226
229
|
return next;
|
|
227
230
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-config.js","sourceRoot":"","sources":["../../src/config/app-config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app-config.js","sourceRoot":"","sources":["../../src/config/app-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { Config } from '@nocobase/config';
|
|
2
|
+
/** Resolve a named channel's type while accepting the legacy provider discriminator. */
|
|
3
|
+
export declare function resolveChannelType(config: {
|
|
4
|
+
readonly type?: unknown;
|
|
5
|
+
readonly provider?: unknown;
|
|
6
|
+
}): string;
|
|
7
|
+
/** Keep legacy application readers working without adding derived aliases to the source layers. */
|
|
8
|
+
export declare function normalizeNotificationChannelAliases(config: Config): void;
|
|
9
|
+
//# sourceMappingURL=channel-type.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channel-type.d.ts","sourceRoot":"","sources":["../../src/config/channel-type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wFAAwF;AACxF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE;IACzC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B,GAAG,MAAM,CAuBT;AAED,mGAAmG;AACnG,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAuBxE"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
/** Resolve a named channel's type while accepting the legacy provider discriminator. */
|
|
2
|
+
export function resolveChannelType(config) {
|
|
3
|
+
for (const key of ['type', 'provider']) {
|
|
4
|
+
const value = config[key];
|
|
5
|
+
if (value !== undefined &&
|
|
6
|
+
(typeof value !== 'string' || !value || value !== value.trim()))
|
|
7
|
+
throw new Error(`Channel ${key} must be a non-empty trimmed string.`);
|
|
8
|
+
}
|
|
9
|
+
if (config.type !== undefined &&
|
|
10
|
+
config.provider !== undefined &&
|
|
11
|
+
config.type !== config.provider)
|
|
12
|
+
throw new Error('Channel type and provider must match when both are configured.');
|
|
13
|
+
const type = config.type ?? config.provider;
|
|
14
|
+
if (typeof type !== 'string')
|
|
15
|
+
throw new Error('Channel type is required (legacy provider is also supported).');
|
|
16
|
+
return type;
|
|
17
|
+
}
|
|
18
|
+
/** Keep legacy application readers working without adding derived aliases to the source layers. */
|
|
19
|
+
export function normalizeNotificationChannelAliases(config) {
|
|
20
|
+
const channels = config.get('notification.channels');
|
|
21
|
+
if (!channels || typeof channels !== 'object' || Array.isArray(channels))
|
|
22
|
+
return;
|
|
23
|
+
const normalized = Object.fromEntries(Object.entries(channels).map(([name, channel]) => {
|
|
24
|
+
if (!channel || typeof channel !== 'object' || Array.isArray(channel))
|
|
25
|
+
return [name, channel];
|
|
26
|
+
let type;
|
|
27
|
+
try {
|
|
28
|
+
const typeValue = Reflect.get(channel, 'type');
|
|
29
|
+
const provider = Reflect.get(channel, 'provider');
|
|
30
|
+
type = resolveChannelType({ type: typeValue, provider });
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
// Leave invalid input intact so startup validation and config check can report it.
|
|
34
|
+
return [name, channel];
|
|
35
|
+
}
|
|
36
|
+
return [name, { ...channel, type, provider: type }];
|
|
37
|
+
}));
|
|
38
|
+
config.set('notification.channels', normalized);
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=channel-type.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channel-type.js","sourceRoot":"","sources":["../../src/config/channel-type.ts"],"names":[],"mappings":"AAEA,wFAAwF;AACxF,MAAM,UAAU,kBAAkB,CAAC,MAGlC;IACC,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,UAAU,CAAU,EAAE,CAAC;QAChD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IACE,KAAK,KAAK,SAAS;YACnB,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YAE/D,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,sCAAsC,CAAC,CAAC;IAC1E,CAAC;IACD,IACE,MAAM,CAAC,IAAI,KAAK,SAAS;QACzB,MAAM,CAAC,QAAQ,KAAK,SAAS;QAC7B,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,QAAQ;QAE/B,MAAM,IAAI,KAAK,CACb,gEAAgE,CACjE,CAAC;IACJ,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC;IAC5C,IAAI,OAAO,IAAI,KAAK,QAAQ;QAC1B,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;IACJ,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mGAAmG;AACnG,MAAM,UAAU,mCAAmC,CAAC,MAAc;IAChE,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACrD,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QACtE,OAAO;IACT,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CACnC,MAAM,CAAC,OAAO,CAAC,QAAmC,CAAC,CAAC,GAAG,CACrD,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;QAClB,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YACnE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,IAAI,IAAY,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,SAAS,GAAY,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACxD,MAAM,QAAQ,GAAY,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAC3D,IAAI,GAAG,kBAAkB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;QAAC,MAAM,CAAC;YACP,mFAAmF;YACnF,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC,CACF,CACF,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE,UAAU,CAAC,CAAC;AAClD,CAAC"}
|
package/dist/config/index.d.ts
CHANGED
|
@@ -10,4 +10,5 @@ export * from './placeholder-secret.js';
|
|
|
10
10
|
export * from './paths.js';
|
|
11
11
|
export { RUNTIME_ENVIRONMENT_VARIABLES, type RuntimeEnvironmentVariable, } from './runtime-environment.js';
|
|
12
12
|
export type * from './types.js';
|
|
13
|
+
export { resolveChannelType } from './channel-type.js';
|
|
13
14
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,EACL,UAAU,EACV,UAAU,EACV,SAAS,EACT,UAAU,EACV,YAAY,EACZ,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,yBAAyB,GAC/B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,0BAA0B,EAC1B,UAAU,EACV,KAAK,6BAA6B,EAClC,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,GAC5B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAC5B,KAAK,eAAe,GACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,KAAK,WAAW,GACjB,MAAM,iBAAiB,CAAC;AACzB,mBAAmB,uBAAuB,CAAC;AAC3C,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,OAAO,EACL,6BAA6B,EAC7B,KAAK,0BAA0B,GAChC,MAAM,0BAA0B,CAAC;AAClC,mBAAmB,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,EACL,UAAU,EACV,UAAU,EACV,SAAS,EACT,UAAU,EACV,YAAY,EACZ,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,yBAAyB,GAC/B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,0BAA0B,EAC1B,UAAU,EACV,KAAK,6BAA6B,EAClC,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,GAC5B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAC5B,KAAK,eAAe,GACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,KAAK,WAAW,GACjB,MAAM,iBAAiB,CAAC;AACzB,mBAAmB,uBAAuB,CAAC;AAC3C,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,OAAO,EACL,6BAA6B,EAC7B,KAAK,0BAA0B,GAChC,MAAM,0BAA0B,CAAC;AAClC,mBAAmB,YAAY,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC"}
|
package/dist/config/index.js
CHANGED
|
@@ -8,4 +8,5 @@ export * from './not-configured.js';
|
|
|
8
8
|
export * from './placeholder-secret.js';
|
|
9
9
|
export * from './paths.js';
|
|
10
10
|
export { RUNTIME_ENVIRONMENT_VARIABLES, } from './runtime-environment.js';
|
|
11
|
+
export { resolveChannelType } from './channel-type.js';
|
|
11
12
|
//# sourceMappingURL=index.js.map
|
package/dist/config/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,EACL,UAAU,EACV,UAAU,EACV,SAAS,EACT,UAAU,EACV,YAAY,GAIb,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,0BAA0B,EAC1B,UAAU,GAIX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EACf,iBAAiB,GAQlB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,GAEnB,MAAM,iBAAiB,CAAC;AAEzB,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,OAAO,EACL,6BAA6B,GAE9B,MAAM,0BAA0B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,EACL,UAAU,EACV,UAAU,EACV,SAAS,EACT,UAAU,EACV,YAAY,GAIb,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,0BAA0B,EAC1B,UAAU,GAIX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EACf,iBAAiB,GAQlB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,GAEnB,MAAM,iBAAiB,CAAC;AAEzB,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,OAAO,EACL,6BAA6B,GAE9B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mailer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,eAAe,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mailer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,eAAe,EAGrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,eAAe,EACf,KAAK,YAAY,EAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAIL,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAEhE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACtD;AAED,MAAM,WAAW,MAAM;IACrB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IACpC,IAAI,CACF,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,UAAU,CAAC,CAAC;IACvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,MAAM,CAE5C,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,eAAe,CAAC,kBAAkB,CA+BpE,CAAC;AAkBF,4FAA4F;AAC5F,wBAAgB,wBAAwB,CAAC,CAAC,SAAS,kBAAkB,EACnE,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,GACjC,gBAAgB,CAAC,CAAC,CAAC,CAqBrB;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAmC/D;AAED,qBAAa,cAAe,SAAQ,eAAe,CAAC,oBAAoB,CAAC;IACvE,SAAgB,IAAI,EAAE,MAAM,CAAiC;IAC7C,QAAQ,IAAI,IAAI;IASV,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAGhD"}
|
package/dist/mailer/index.js
CHANGED
|
@@ -1,19 +1,45 @@
|
|
|
1
1
|
import { createMailTransport, isMailChannelConfig, } from '@nocobase/mailer';
|
|
2
2
|
import { createServiceToken, ServiceProvider, } from '@nocobase/service-provider';
|
|
3
|
-
import { defineAppConfig, envString, } from '../config/index.js';
|
|
3
|
+
import { defineAppConfig, resolveChannelType, envString, } from '../config/index.js';
|
|
4
4
|
export const mailerToken = createServiceToken('@nocobase/app-server/mailer');
|
|
5
5
|
export const validateMailChannels = (config, context) => {
|
|
6
6
|
for (const [name, channel] of Object.entries(config.channels ?? {})) {
|
|
7
|
-
if (!channel ||
|
|
8
|
-
typeof channel !== 'object' ||
|
|
9
|
-
Reflect.get(channel, 'enabled') === false)
|
|
7
|
+
if (!channel || typeof channel !== 'object')
|
|
10
8
|
continue;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
9
|
+
if (Reflect.get(channel, 'enabled') === false &&
|
|
10
|
+
Reflect.get(channel, 'type') === undefined &&
|
|
11
|
+
Reflect.get(channel, 'provider') === undefined)
|
|
12
|
+
continue;
|
|
13
|
+
try {
|
|
14
|
+
const normalized = normalizeChannel(channel);
|
|
15
|
+
if (Reflect.get(channel, 'enabled') === false)
|
|
16
|
+
continue;
|
|
17
|
+
const provider = Reflect.get(normalized, 'provider');
|
|
18
|
+
if ((provider === 'smtp' || provider === 'resend') &&
|
|
19
|
+
!isMailChannelConfig(normalized))
|
|
20
|
+
context.error(`channels.${name}`, 'Invalid built-in email channel configuration.');
|
|
21
|
+
}
|
|
22
|
+
catch (error) {
|
|
23
|
+
context.error(`channels.${name}`, error instanceof Error ? error.message : String(error));
|
|
24
|
+
}
|
|
15
25
|
}
|
|
16
26
|
};
|
|
27
|
+
function normalizeChannel(channel) {
|
|
28
|
+
const type = Reflect.get(channel, 'type');
|
|
29
|
+
const provider = Reflect.get(channel, 'provider');
|
|
30
|
+
return { ...channel, provider: resolveChannelType({ type, provider }) };
|
|
31
|
+
}
|
|
32
|
+
function mailChannel(channel) {
|
|
33
|
+
if (!channel || typeof channel !== 'object')
|
|
34
|
+
return undefined;
|
|
35
|
+
try {
|
|
36
|
+
const normalized = normalizeChannel(channel);
|
|
37
|
+
return isMailChannelConfig(normalized) ? normalized : undefined;
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
return undefined;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
17
43
|
/** Declare the existing notification section without installing any notification plugin. */
|
|
18
44
|
export function defineMailChannelsConfig(definition) {
|
|
19
45
|
const extra = definition.validate
|
|
@@ -41,14 +67,14 @@ export function createMailer(config) {
|
|
|
41
67
|
const transports = new Map();
|
|
42
68
|
let closed = false;
|
|
43
69
|
const available = (channel) => {
|
|
44
|
-
const value = config.channels[channel];
|
|
45
|
-
return !closed &&
|
|
70
|
+
const value = mailChannel(config.channels[channel]);
|
|
71
|
+
return !closed && value !== undefined && value.enabled !== false;
|
|
46
72
|
};
|
|
47
73
|
return {
|
|
48
74
|
available,
|
|
49
75
|
async send(channel, message, options) {
|
|
50
|
-
const value = config.channels[channel];
|
|
51
|
-
if (
|
|
76
|
+
const value = mailChannel(config.channels[channel]);
|
|
77
|
+
if (closed || !value || value.enabled === false)
|
|
52
78
|
return {
|
|
53
79
|
status: 'failed',
|
|
54
80
|
disposition: 'never',
|
package/dist/mailer/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mailer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mailer/index.ts"],"names":[],"mappings":"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"}
|
package/dist/support/paths.d.ts
CHANGED
|
@@ -6,5 +6,7 @@ export declare const DEFAULT_APP_BASE_PATH: string;
|
|
|
6
6
|
export declare function resolveAppName(value: string | undefined): string;
|
|
7
7
|
export declare function resolveAppNameFromBasePath(value: string | undefined, fallback?: string): string;
|
|
8
8
|
export declare function normalizeBasePath(value: string): string;
|
|
9
|
+
/** A cookie-name-safe scope for the complete public mount path, including the origin root. */
|
|
10
|
+
export declare function createAppCookieScope(publicBasePath: string): string;
|
|
9
11
|
export declare function joinBasePath(basePath: string, pathInsideBase: string): string;
|
|
10
12
|
//# sourceMappingURL=paths.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/support/paths.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAAgB,CAAC;AAErD,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAGhE;AAED,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,SAAQ,GACf,MAAM,CAKR;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAI7E"}
|
|
1
|
+
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/support/paths.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAAgB,CAAC;AAErD,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAGhE;AAED,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,SAAQ,GACf,MAAM,CAKR;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED,8FAA8F;AAC9F,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAKnE;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAI7E"}
|
package/dist/support/paths.js
CHANGED
|
@@ -17,6 +17,10 @@ export function normalizeBasePath(value) {
|
|
|
17
17
|
const normalized = value.trim().replace(/^\/+|\/+$/g, '');
|
|
18
18
|
return normalized ? `/${normalized}` : '';
|
|
19
19
|
}
|
|
20
|
+
/** A cookie-name-safe scope for the complete public mount path, including the origin root. */
|
|
21
|
+
export function createAppCookieScope(publicBasePath) {
|
|
22
|
+
return encodeURIComponent(normalizeBasePath(publicBasePath) || '/').replace(/[!'()*]/gu, (character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`);
|
|
23
|
+
}
|
|
20
24
|
export function joinBasePath(basePath, pathInsideBase) {
|
|
21
25
|
const normalizedBasePath = normalizeBasePath(basePath);
|
|
22
26
|
const normalizedPath = normalizeBasePath(pathInsideBase);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/support/paths.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAW,OAAO,CAAC;AAErD,MAAM,UAAU,cAAc,CAAC,KAAyB;IACtD,MAAM,UAAU,GAAG,KAAK,EAAE,IAAI,EAAE,IAAI,KAAK,CAAC;IAC1C,OAAO,UAAU,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,KAAyB,EACzB,QAAQ,GAAG,KAAK;IAEhB,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,IAAI,EAAE,CAAC;SAC5C,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,OAAO,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC7C,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAC1D,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,QAAgB,EAAE,cAAsB;IACnE,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;IACzD,OAAO,GAAG,kBAAkB,GAAG,cAAc,EAAE,IAAI,GAAG,CAAC;AACzD,CAAC"}
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/support/paths.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAW,OAAO,CAAC;AAErD,MAAM,UAAU,cAAc,CAAC,KAAyB;IACtD,MAAM,UAAU,GAAG,KAAK,EAAE,IAAI,EAAE,IAAI,KAAK,CAAC;IAC1C,OAAO,UAAU,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,KAAyB,EACzB,QAAQ,GAAG,KAAK;IAEhB,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,IAAI,EAAE,CAAC;SAC5C,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,OAAO,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC7C,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAC1D,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5C,CAAC;AAED,8FAA8F;AAC9F,MAAM,UAAU,oBAAoB,CAAC,cAAsB;IACzD,OAAO,kBAAkB,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,CAAC,OAAO,CACzE,WAAW,EACX,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CACxE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,QAAgB,EAAE,cAAsB;IACnE,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;IACzD,OAAO,GAAG,kBAAkB,GAAG,cAAc,EAAE,IAAI,GAAG,CAAC;AACzD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/app-server",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.3",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"prettier": "@nocobase/dev-config/prettier",
|
|
6
6
|
"engines": {
|
|
@@ -120,12 +120,12 @@
|
|
|
120
120
|
"@nocobase/app-websocket": "^0.1.0-beta.1",
|
|
121
121
|
"@nocobase/config": "^0.1.0-beta.3",
|
|
122
122
|
"@nocobase/drive": "^0.1.0-beta.7",
|
|
123
|
-
"@nocobase/realtime": "^0.1.0-beta.3",
|
|
124
123
|
"@nocobase/logging": "^0.1.0-beta.7",
|
|
124
|
+
"@nocobase/realtime": "^0.1.0-beta.3",
|
|
125
125
|
"@nocobase/secrets": "^0.1.0-beta.1",
|
|
126
|
+
"@nocobase/session": "^0.1.0-beta.3",
|
|
126
127
|
"@nocobase/snowflake": "^1.0.0-beta.4",
|
|
127
|
-
"@nocobase/mailer": "^0.1.0-beta.0"
|
|
128
|
-
"@nocobase/session": "^0.1.0-beta.3"
|
|
128
|
+
"@nocobase/mailer": "^0.1.0-beta.0"
|
|
129
129
|
},
|
|
130
130
|
"devDependencies": {
|
|
131
131
|
"@types/node": "^24.0.0",
|
|
@@ -147,8 +147,9 @@
|
|
|
147
147
|
"@nocobase/db-dameng": "^0.1.0-beta.4",
|
|
148
148
|
"@nocobase/db-kingbase": "^0.1.0-beta.4",
|
|
149
149
|
"@nocobase/db-oceanbase": "^0.1.0-beta.4",
|
|
150
|
+
"@nocobase/i18n": "^2.0.0-beta.1",
|
|
150
151
|
"@nocobase/caching": "^0.1.0-beta.3",
|
|
151
|
-
"@nocobase/db": "^1.0.0-beta.
|
|
152
|
+
"@nocobase/db": "^1.0.0-beta.22",
|
|
152
153
|
"@nocobase/service-provider": "^0.0.2-beta.2",
|
|
153
154
|
"@nocobase/queue": "^0.1.0-beta.9",
|
|
154
155
|
"@nocobase/jobs": "^0.1.0-beta.3",
|
|
@@ -156,8 +157,7 @@
|
|
|
156
157
|
"@nocobase/db-mysql": "^0.1.0-beta.5",
|
|
157
158
|
"@nocobase/db-postgres": "^0.1.0-beta.5",
|
|
158
159
|
"@nocobase/db-mssql": "^0.1.0-beta.5",
|
|
159
|
-
"@nocobase/db-oracle": "^0.1.0-beta.5"
|
|
160
|
-
"@nocobase/i18n": "^2.0.0-beta.1"
|
|
160
|
+
"@nocobase/db-oracle": "^0.1.0-beta.5"
|
|
161
161
|
},
|
|
162
162
|
"peerDependenciesMeta": {
|
|
163
163
|
"@nocobase/db-sqlite": {
|