@nocobase/app-server 5.0.0-beta.1 → 5.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/README.md +4 -0
- package/dist/database/index.d.ts +4 -1
- package/dist/database/index.d.ts.map +1 -1
- package/dist/database/index.js +3 -0
- package/dist/database/index.js.map +1 -1
- package/dist/database/migrator.d.ts +5 -0
- package/dist/database/migrator.d.ts.map +1 -1
- package/dist/database/migrator.js +2 -1
- package/dist/database/migrator.js.map +1 -1
- package/dist/database/plan.d.ts.map +1 -1
- package/dist/database/plan.js +9 -2
- package/dist/database/plan.js.map +1 -1
- package/dist/database/provider.d.ts.map +1 -1
- package/dist/database/provider.js +9 -2
- package/dist/database/provider.js.map +1 -1
- package/dist/database/seeder.d.ts +5 -0
- package/dist/database/seeder.d.ts.map +1 -1
- package/dist/database/seeder.js +2 -1
- package/dist/database/seeder.js.map +1 -1
- package/dist/database/task-hooks.d.ts +19 -0
- package/dist/database/task-hooks.d.ts.map +1 -0
- package/dist/database/task-hooks.js +22 -0
- package/dist/database/task-hooks.js.map +1 -0
- package/dist/database/tasks.d.ts +34 -4
- package/dist/database/tasks.d.ts.map +1 -1
- package/dist/database/tasks.js +182 -46
- package/dist/database/tasks.js.map +1 -1
- package/dist/database/types.d.ts +5 -0
- package/dist/database/types.d.ts.map +1 -1
- package/dist/jobs/config.d.ts +5 -1
- package/dist/jobs/config.d.ts.map +1 -1
- package/dist/jobs/config.js +12 -1
- package/dist/jobs/config.js.map +1 -1
- package/dist/node/proxy.d.ts.map +1 -1
- package/dist/node/proxy.js +21 -6
- package/dist/node/proxy.js.map +1 -1
- package/dist/plugins/define.d.ts.map +1 -1
- package/dist/plugins/define.js +8 -1
- package/dist/plugins/define.js.map +1 -1
- package/dist/plugins/inspect.d.ts +2 -0
- package/dist/plugins/inspect.d.ts.map +1 -1
- package/dist/plugins/inspect.js +69 -44
- package/dist/plugins/inspect.js.map +1 -1
- package/dist/plugins/resolve.d.ts.map +1 -1
- package/dist/plugins/resolve.js +36 -0
- package/dist/plugins/resolve.js.map +1 -1
- package/dist/plugins/types.d.ts +10 -1
- package/dist/plugins/types.d.ts.map +1 -1
- package/dist/queue/config.d.ts +4 -2
- package/dist/queue/config.d.ts.map +1 -1
- package/dist/queue/config.js +12 -1
- package/dist/queue/config.js.map +1 -1
- package/dist/realtime/broker-registry.d.ts +1 -0
- package/dist/realtime/broker-registry.d.ts.map +1 -1
- package/dist/realtime/broker-registry.js +1 -1
- package/dist/realtime/broker-registry.js.map +1 -1
- package/dist/realtime/config.d.ts +8 -1
- package/dist/realtime/config.d.ts.map +1 -1
- package/dist/realtime/config.js +55 -8
- package/dist/realtime/config.js.map +1 -1
- package/package.json +6 -6
package/dist/plugins/inspect.js
CHANGED
|
@@ -41,48 +41,73 @@ export function inspectResolvedAppServerPlugins(resolved) {
|
|
|
41
41
|
scope: route.scope,
|
|
42
42
|
});
|
|
43
43
|
});
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
44
|
+
const databaseEntries = [
|
|
45
|
+
{
|
|
46
|
+
connection: undefined,
|
|
47
|
+
definition: plugin.definition.database,
|
|
48
|
+
metadata: plugin.metadata,
|
|
49
|
+
},
|
|
50
|
+
...Object.entries(plugin.definition.database?.connections ?? {}).map(([connection, definition]) => ({
|
|
51
|
+
connection,
|
|
52
|
+
definition: {
|
|
53
|
+
migrations: definition.migrations ?? `./database/${connection}/migrations`,
|
|
54
|
+
seeds: definition.seeds ?? `./database/${connection}/seeds`,
|
|
55
|
+
},
|
|
56
|
+
metadata: plugin.metadata.connections?.[connection],
|
|
57
|
+
})),
|
|
58
|
+
];
|
|
59
|
+
for (const entry of databaseEntries) {
|
|
60
|
+
const configuredMigrations = entry.definition?.migrations;
|
|
61
|
+
const configuredSeeds = entry.definition?.seeds;
|
|
62
|
+
if (configuredMigrations || configuredSeeds) {
|
|
63
|
+
database.push({
|
|
64
|
+
packageName: plugin.metadata.packageName,
|
|
65
|
+
...(entry.connection ? { connection: entry.connection } : {}),
|
|
66
|
+
...(configuredMigrations
|
|
67
|
+
? {
|
|
68
|
+
migrations: {
|
|
69
|
+
configured: configuredMigrations,
|
|
70
|
+
...(entry.metadata?.migrationsDirectory
|
|
71
|
+
? { resolved: entry.metadata?.migrationsDirectory }
|
|
72
|
+
: {}),
|
|
73
|
+
},
|
|
74
|
+
}
|
|
75
|
+
: {}),
|
|
76
|
+
...(configuredSeeds
|
|
77
|
+
? {
|
|
78
|
+
seeds: {
|
|
79
|
+
configured: configuredSeeds,
|
|
80
|
+
...(entry.metadata?.seedsDirectory
|
|
81
|
+
? { resolved: entry.metadata?.seedsDirectory }
|
|
82
|
+
: {}),
|
|
83
|
+
},
|
|
84
|
+
}
|
|
85
|
+
: {}),
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
if (configuredMigrations &&
|
|
89
|
+
!entry.metadata?.migrationsDirectory &&
|
|
90
|
+
(entry.connection === undefined ||
|
|
91
|
+
plugin.definition.database?.connections?.[entry.connection]
|
|
92
|
+
?.migrations)) {
|
|
93
|
+
issues.push({
|
|
94
|
+
code: 'SERVER_MIGRATIONS_DIRECTORY_MISSING',
|
|
95
|
+
severity: 'error',
|
|
96
|
+
packageName: plugin.metadata.packageName,
|
|
97
|
+
message: `${plugin.metadata.packageName} declares migrations at ${path.resolve(plugin.metadata.baseDir, configuredMigrations)}, but the directory could not be resolved.`,
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
if (configuredSeeds &&
|
|
101
|
+
!entry.metadata?.seedsDirectory &&
|
|
102
|
+
(entry.connection === undefined ||
|
|
103
|
+
plugin.definition.database?.connections?.[entry.connection]?.seeds)) {
|
|
104
|
+
issues.push({
|
|
105
|
+
code: 'SERVER_SEEDS_DIRECTORY_MISSING',
|
|
106
|
+
severity: 'error',
|
|
107
|
+
packageName: plugin.metadata.packageName,
|
|
108
|
+
message: `${plugin.metadata.packageName} declares seeds at ${path.resolve(plugin.metadata.baseDir, configuredSeeds)}, but the directory could not be resolved.`,
|
|
109
|
+
});
|
|
110
|
+
}
|
|
86
111
|
}
|
|
87
112
|
const configuredJobs = plugin.definition.queue?.jobs ?? [];
|
|
88
113
|
if (plugin.definition.queue) {
|
|
@@ -107,8 +132,8 @@ export function inspectResolvedAppServerPlugins(resolved) {
|
|
|
107
132
|
serviceProviders: plugin.definition.serviceProviders.length,
|
|
108
133
|
routes: plugin.definition.routes.length,
|
|
109
134
|
locales: plugin.definition.locales !== undefined,
|
|
110
|
-
migrations:
|
|
111
|
-
seeds:
|
|
135
|
+
migrations: databaseEntries.some((entry) => entry.definition?.migrations !== undefined),
|
|
136
|
+
seeds: databaseEntries.some((entry) => entry.definition?.seeds !== undefined),
|
|
112
137
|
jobLocations: configuredJobs.length,
|
|
113
138
|
},
|
|
114
139
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/plugins/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/plugins/inspect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/plugins/resolve.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAEV,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CACzC;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,gBAAgB,EAC/B,OAAO,GAAE,8BAAmC,GAC3C,wBAAwB,CAc1B;AAED,qFAAqF;AACrF,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,wBAAwB,GACjC,4BAA4B,
|
|
1
|
+
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/plugins/resolve.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAEV,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CACzC;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,gBAAgB,EAC/B,OAAO,GAAE,8BAAmC,GAC3C,wBAAwB,CAc1B;AAED,qFAAqF;AACrF,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,wBAAwB,GACjC,4BAA4B,CAgC9B;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,SAAS,iBAAiB,EAAE,GACpC,eAAe,EAAE,CAWnB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,SAAS,iBAAiB,EAAE,GACpC,UAAU,EAAE,CAWd;AAED,sFAAsF;AACtF,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,SAAS,iBAAiB,EAAE,GACpC,MAAM,EAAE,CAEV"}
|
package/dist/plugins/resolve.js
CHANGED
|
@@ -16,7 +16,27 @@ export function resolveAppServerPlugins(rootDir, serverPlugins, options = {}) {
|
|
|
16
16
|
/** The application identity and plugin task sources that database planning needs. */
|
|
17
17
|
export function createAppDatabaseTaskContributions(resolved) {
|
|
18
18
|
const plugins = resolved.plugins.map((plugin) => plugin.metadata);
|
|
19
|
+
const connections = new Map();
|
|
20
|
+
for (const plugin of plugins) {
|
|
21
|
+
for (const [name, directories] of Object.entries(plugin.connections ?? {})) {
|
|
22
|
+
const target = connections.get(name) ?? { migrations: [], seeds: [] };
|
|
23
|
+
connections.set(name, target);
|
|
24
|
+
if (directories.migrationsDirectory)
|
|
25
|
+
target.migrations.push({
|
|
26
|
+
packageName: plugin.packageName,
|
|
27
|
+
directory: directories.migrationsDirectory,
|
|
28
|
+
});
|
|
29
|
+
if (directories.seedsDirectory)
|
|
30
|
+
target.seeds.push({
|
|
31
|
+
packageName: plugin.packageName,
|
|
32
|
+
directory: directories.seedsDirectory,
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
}
|
|
19
36
|
return {
|
|
37
|
+
...(connections.size
|
|
38
|
+
? { connections: Object.fromEntries(connections) }
|
|
39
|
+
: {}),
|
|
20
40
|
appPackageName: resolved.appPackageName,
|
|
21
41
|
migrations: createPluginMigrationSources(plugins),
|
|
22
42
|
seeds: createPluginSeedSources(plugins),
|
|
@@ -54,10 +74,26 @@ function resolvePlugin(definition) {
|
|
|
54
74
|
const packageJsonPath = resolvePackageJson(definition.baseDir, definition.packageName);
|
|
55
75
|
const packageJson = readJson(packageJsonPath);
|
|
56
76
|
const packageRoot = path.dirname(packageJsonPath);
|
|
77
|
+
const connections = definition.database?.connections;
|
|
78
|
+
for (const name of Object.keys(connections ?? {})) {
|
|
79
|
+
if (!/^[a-zA-Z0-9_-]+$/.test(name))
|
|
80
|
+
throw new Error(`Invalid database connection name "${name}" in ${definition.packageName}.`);
|
|
81
|
+
}
|
|
57
82
|
return {
|
|
58
83
|
packageName: definition.packageName,
|
|
59
84
|
version: typeof packageJson.version === 'string' ? packageJson.version : 'unknown',
|
|
60
85
|
rootDir: packageRoot,
|
|
86
|
+
...(connections
|
|
87
|
+
? {
|
|
88
|
+
connections: Object.fromEntries(Object.entries(connections).map(([name, config]) => [
|
|
89
|
+
name,
|
|
90
|
+
{
|
|
91
|
+
migrationsDirectory: resolveOptionalDirectoryPath(definition.baseDir, config.migrations ?? `./database/${name}/migrations`),
|
|
92
|
+
seedsDirectory: resolveOptionalDirectoryPath(definition.baseDir, config.seeds ?? `./database/${name}/seeds`),
|
|
93
|
+
},
|
|
94
|
+
])),
|
|
95
|
+
}
|
|
96
|
+
: {}),
|
|
61
97
|
baseDir: definition.baseDir,
|
|
62
98
|
migrationsDirectory: resolveOptionalDirectoryPath(definition.baseDir, definition.database?.migrations),
|
|
63
99
|
seedsDirectory: resolveOptionalDirectoryPath(definition.baseDir, definition.database?.seeds),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/plugins/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,IAAI,MAAM,WAAW,CAAC;AAgB7B,MAAM,UAAU,uBAAuB,CACrC,OAAe,EACf,aAA+B,EAC/B,UAA0C,EAAE;IAE5C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9E,OAAO;QACL,cAAc,EACZ,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ;YACjC,CAAC,CAAC,UAAU,CAAC,IAAI;YACjB,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,IAAI,KAAK,CAAC;QAC9C,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAClD,UAAU;YACV,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC;SACpC,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,kCAAkC,CAChD,QAAkC;IAElC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAClE,OAAO;QACL,cAAc,EAAE,QAAQ,CAAC,cAAc;QACvC,UAAU,EAAE,4BAA4B,CAAC,OAAO,CAAC;QACjD,KAAK,EAAE,uBAAuB,CAAC,OAAO,CAAC;KACxC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,OAAqC;IAErC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAChC,MAAM,CAAC,mBAAmB;QACxB,CAAC,CAAC;YACE;gBACE,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,SAAS,EAAE,MAAM,CAAC,mBAAmB;aACtC;SACF;QACH,CAAC,CAAC,EAAE,CACP,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,OAAqC;IAErC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAChC,MAAM,CAAC,cAAc;QACnB,CAAC,CAAC;YACE;gBACE,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,SAAS,EAAE,MAAM,CAAC,cAAc;aACjC;SACF;QACH,CAAC,CAAC,EAAE,CACP,CAAC;AACJ,CAAC;AAED,sFAAsF;AACtF,MAAM,UAAU,wBAAwB,CACtC,OAAqC;IAErC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,aAAa,CAAC,UAA2B;IAChD,IACE,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ;QACtC,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,EACpC,CAAC;QACD,MAAM,IAAI,KAAK,CACb,kBAAkB,UAAU,CAAC,WAAW,iCAAiC,CAC1E,CAAC;IACJ,CAAC;IACD,MAAM,eAAe,GAAG,kBAAkB,CACxC,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,WAAW,CACvB,CAAC;IACF,MAAM,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/plugins/resolve.ts"],"names":[],"mappings":"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"}
|
package/dist/plugins/types.d.ts
CHANGED
|
@@ -32,10 +32,15 @@ export interface AppPluginProviderConstructor<TConfig = object> {
|
|
|
32
32
|
new (app: AppPluginApplication): ServiceProviderLifecycle;
|
|
33
33
|
readonly __config?: TConfig;
|
|
34
34
|
}
|
|
35
|
-
export interface
|
|
35
|
+
export interface AppServerDatabaseConnectionContribution {
|
|
36
36
|
readonly migrations?: string;
|
|
37
37
|
readonly seeds?: string;
|
|
38
38
|
}
|
|
39
|
+
/** Flat tasks retain the default-connection contract; named tasks use App connection names. */
|
|
40
|
+
export interface AppServerPluginDatabaseContribution extends AppServerDatabaseConnectionContribution {
|
|
41
|
+
/** Empty entries use database/<connection>/{migrations,seeds} relative to baseDir. */
|
|
42
|
+
readonly connections?: Readonly<Record<string, AppServerDatabaseConnectionContribution>>;
|
|
43
|
+
}
|
|
39
44
|
/**
|
|
40
45
|
* @deprecated Job modules are no longer discovered: the field is accepted,
|
|
41
46
|
* ignored, and reported once at startup. Register queue handlers with
|
|
@@ -80,6 +85,10 @@ export interface ResolvedAppPlugin {
|
|
|
80
85
|
readonly baseDir: string;
|
|
81
86
|
readonly version: string;
|
|
82
87
|
readonly rootDir: string;
|
|
88
|
+
readonly connections?: Readonly<Record<string, {
|
|
89
|
+
readonly migrationsDirectory?: string;
|
|
90
|
+
readonly seedsDirectory?: string;
|
|
91
|
+
}>>;
|
|
83
92
|
readonly migrationsDirectory?: string;
|
|
84
93
|
readonly seedsDirectory?: string;
|
|
85
94
|
/** @deprecated Always empty: Job modules are no longer discovered. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/plugins/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EACV,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAE5D,MAAM,WAAW,oBAAoB,CAAC,OAAO,GAAG,MAAM;IACpD,6IAA6I;IAC7I,QAAQ,CAAC,uBAAuB,CAAC,EAAE,SAAS,uBAAuB,EAAE,CAAC;IACtE,QAAQ,CAAC,cAAc,CAAC,EAAE,iBAAiB,CAAC;IAC5C,4EAA4E;IAC5E,QAAQ,CAAC,gBAAgB,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAChD,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC;IAC1C,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,mGAAmG;IACnG,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IACrE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;CACtC;AAED,MAAM,WAAW,4BAA4B,CAAC,OAAO,GAAG,MAAM;IAC5D,KAAK,GAAG,EAAE,oBAAoB,GAAG,wBAAwB,CAAC;IAC1D,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/plugins/types.ts"],"names":[],"mappings":"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"}
|
package/dist/queue/config.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import type
|
|
2
|
-
|
|
1
|
+
import { type QueueConfig } from '@nocobase/queue';
|
|
2
|
+
import type { ConfigValidationContext } from '../config/index.js';
|
|
3
3
|
export type AppQueueConfig = QueueConfig;
|
|
4
|
+
/** Pure validation of the merged application section, including unselected legacy fields. */
|
|
5
|
+
export declare function validateAppQueueConfig(value: AppQueueConfig, context: ConfigValidationContext): void;
|
|
4
6
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/queue/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/queue/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC;AAEzC,6FAA6F;AAC7F,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,uBAAuB,GAC/B,IAAI,CAON"}
|
package/dist/queue/config.js
CHANGED
|
@@ -1,2 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
import { validateQueueConfig } from '@nocobase/queue';
|
|
2
|
+
/** Pure validation of the merged application section, including unselected legacy fields. */
|
|
3
|
+
export function validateAppQueueConfig(value, context) {
|
|
4
|
+
try {
|
|
5
|
+
validateQueueConfig(value);
|
|
6
|
+
}
|
|
7
|
+
catch (error) {
|
|
8
|
+
if (!(error instanceof Error))
|
|
9
|
+
throw error;
|
|
10
|
+
context.error('', error.message);
|
|
11
|
+
}
|
|
12
|
+
}
|
|
2
13
|
//# sourceMappingURL=config.js.map
|
package/dist/queue/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/queue/config.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/queue/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAoB,MAAM,iBAAiB,CAAC;AAKxE,6FAA6F;AAC7F,MAAM,UAAU,sBAAsB,CACpC,KAAqB,EACrB,OAAgC;IAEhC,IAAI,CAAC;QACH,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC;YAAE,MAAM,KAAK,CAAC;QAC3C,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;AACH,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { type RealtimeBroker, type RealtimeServiceOptions } from '@nocobase/real
|
|
|
2
2
|
import { type ServiceToken } from '@nocobase/service-provider';
|
|
3
3
|
export interface RealtimeBrokerFactoryContext {
|
|
4
4
|
readonly namespace: string;
|
|
5
|
+
/** Complete service configuration; implementation options live under config.broker. */
|
|
5
6
|
readonly config: Readonly<Record<string, unknown>>;
|
|
6
7
|
readonly logger?: RealtimeServiceOptions['logger'];
|
|
7
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"broker-registry.d.ts","sourceRoot":"","sources":["../../src/realtime/broker-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACnD,QAAQ,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,QAAQ,CAAC,CAAC;CACpD;AAED,MAAM,MAAM,qBAAqB,GAAG,CAClC,OAAO,EAAE,4BAA4B,KAClC,cAAc,CAAC;AAEpB,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAChE,MAAM,CACJ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,4BAA4B,GACpC,cAAc,CAAC;CACnB;AAED,qFAAqF;AACrF,wBAAgB,4BAA4B,IAAI,sBAAsB,CAmCrE;AAED,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,sBAAsB,CAG1E,CAAC"}
|
|
1
|
+
{"version":3,"file":"broker-registry.d.ts","sourceRoot":"","sources":["../../src/realtime/broker-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,uFAAuF;IACvF,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACnD,QAAQ,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,QAAQ,CAAC,CAAC;CACpD;AAED,MAAM,MAAM,qBAAqB,GAAG,CAClC,OAAO,EAAE,4BAA4B,KAClC,cAAc,CAAC;AAEpB,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAChE,MAAM,CACJ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,4BAA4B,GACpC,cAAc,CAAC;CACnB;AAED,qFAAqF;AACrF,wBAAgB,4BAA4B,IAAI,sBAAsB,CAmCrE;AAED,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,sBAAsB,CAG1E,CAAC"}
|
|
@@ -28,7 +28,7 @@ export function createRealtimeBrokerRegistry() {
|
|
|
28
28
|
selected = true;
|
|
29
29
|
const factory = factories.get(adapter);
|
|
30
30
|
if (!factory)
|
|
31
|
-
throw new Error(
|
|
31
|
+
throw new Error('realtime.broker.adapter is not registered. Install its implementation and register its Server plugin before resolving realtimeServiceToken.');
|
|
32
32
|
return factory(context);
|
|
33
33
|
},
|
|
34
34
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"broker-registry.js","sourceRoot":"","sources":["../../src/realtime/broker-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,GAGrB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kBAAkB,GAEnB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"broker-registry.js","sourceRoot":"","sources":["../../src/realtime/broker-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,GAGrB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kBAAkB,GAEnB,MAAM,4BAA4B,CAAC;AAqBpC,qFAAqF;AACrF,MAAM,UAAU,4BAA4B;IAC1C,MAAM,SAAS,GAAG,IAAI,GAAG,CAAgC;QACvD,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,oBAAoB,EAAE,CAAC;KAC3C,CAAC,CAAC;IACH,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,SAAS,QAAQ,CAAC,OAAe;QAC/B,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YAChD,MAAM,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;IACxE,CAAC;IACD,OAAO;QACL,QAAQ,CAAC,OAAO,EAAE,OAAO;YACvB,QAAQ,CAAC,OAAO,CAAC,CAAC;YAClB,IAAI,QAAQ;gBACV,MAAM,IAAI,KAAK,CACb,iDAAiD,OAAO,8DAA8D,CACvH,CAAC;YACJ,IAAI,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,0BAA0B,CAAC,CAAC;YACzE,IAAI,OAAO,OAAO,KAAK,UAAU;gBAC/B,MAAM,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;YACrE,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC;QACD,MAAM,CAAC,OAAO,EAAE,OAAO;YACrB,QAAQ,CAAC,OAAO,CAAC,CAAC;YAClB,IAAI,QAAQ;gBACV,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAChE,QAAQ,GAAG,IAAI,CAAC;YAChB,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACvC,IAAI,CAAC,OAAO;gBACV,MAAM,IAAI,KAAK,CACb,6IAA6I,CAC9I,CAAC;YACJ,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,2BAA2B,GACtC,kBAAkB,CAChB,+CAA+C,CAChD,CAAC"}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import type { RealtimeServiceOptions } from '@nocobase/realtime/server';
|
|
2
|
+
import { type AppConfigFactory } from '../config/define-app-config.js';
|
|
2
3
|
import { type RealtimeBrokerRegistry } from './broker-registry.js';
|
|
4
|
+
export interface AppRealtimeBrokerConfig {
|
|
5
|
+
readonly [key: string]: unknown;
|
|
6
|
+
readonly adapter: string;
|
|
7
|
+
}
|
|
3
8
|
export interface AppRealtimeConfig {
|
|
4
9
|
readonly [key: string]: unknown;
|
|
5
|
-
readonly
|
|
10
|
+
readonly broker?: AppRealtimeBrokerConfig;
|
|
6
11
|
readonly namespace?: string;
|
|
7
12
|
readonly authorizationTimeoutMs?: number;
|
|
8
13
|
readonly sessionCheckIntervalMs?: number;
|
|
@@ -17,6 +22,8 @@ export interface AppRealtimeConfig {
|
|
|
17
22
|
readonly maxPendingMessagesPerConnection?: number;
|
|
18
23
|
};
|
|
19
24
|
}
|
|
25
|
+
/** No adapter default: an explicitly supplied broker must select its adapter. */
|
|
26
|
+
export declare function defineRealtimeConfig(defaults?: AppRealtimeConfig): AppConfigFactory<AppRealtimeConfig>;
|
|
20
27
|
/** Extension-specific values are validated only by the selected factory. */
|
|
21
28
|
export declare function realtimeServiceOptions(config?: AppRealtimeConfig, appName?: string, registry?: RealtimeBrokerRegistry, logger?: RealtimeServiceOptions['logger']): RealtimeServiceOptions;
|
|
22
29
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/realtime/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/realtime/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,QAAQ,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC;IAC1C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IACzC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IACzC,QAAQ,CAAC,MAAM,CAAC,EAAE;QAChB,QAAQ,CAAC,2BAA2B,CAAC,EAAE,MAAM,CAAC;QAC9C,QAAQ,CAAC,wBAAwB,CAAC,EAAE,MAAM,CAAC;QAC3C,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;QACpC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;QACjC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;QAClC,QAAQ,CAAC,6BAA6B,CAAC,EAAE,MAAM,CAAC;QAChD,QAAQ,CAAC,6BAA6B,CAAC,EAAE,MAAM,CAAC;QAChD,QAAQ,CAAC,+BAA+B,CAAC,EAAE,MAAM,CAAC;KACnD,CAAC;CACH;AAED,iFAAiF;AACjF,wBAAgB,oBAAoB,CAClC,QAAQ,GAAE,iBAAsB,GAC/B,gBAAgB,CAAC,iBAAiB,CAAC,CAQrC;AAED,4EAA4E;AAC5E,wBAAgB,sBAAsB,CACpC,MAAM,GAAE,iBAAsB,EAC9B,OAAO,GAAE,MAAkB,EAC3B,QAAQ,GAAE,sBAAuD,EACjE,MAAM,CAAC,EAAE,sBAAsB,CAAC,QAAQ,CAAC,GACxC,sBAAsB,CAuBxB"}
|
package/dist/realtime/config.js
CHANGED
|
@@ -1,17 +1,26 @@
|
|
|
1
|
+
import { defineAppConfig, } from '../config/define-app-config.js';
|
|
1
2
|
import { createRealtimeBrokerRegistry, } from './broker-registry.js';
|
|
3
|
+
/** No adapter default: an explicitly supplied broker must select its adapter. */
|
|
4
|
+
export function defineRealtimeConfig(defaults = {}) {
|
|
5
|
+
return defineAppConfig({
|
|
6
|
+
defaults,
|
|
7
|
+
validate(value, context) {
|
|
8
|
+
for (const issue of configurationIssues(value))
|
|
9
|
+
context.error(issue.path, issue.message);
|
|
10
|
+
},
|
|
11
|
+
});
|
|
12
|
+
}
|
|
2
13
|
/** Extension-specific values are validated only by the selected factory. */
|
|
3
14
|
export function realtimeServiceOptions(config = {}, appName = 'default', registry = createRealtimeBrokerRegistry(), logger) {
|
|
4
|
-
|
|
5
|
-
|
|
15
|
+
const issues = configurationIssues(config);
|
|
16
|
+
if (issues.length)
|
|
17
|
+
throw new TypeError(issues
|
|
18
|
+
.map(({ path, message }) => `${path ? `realtime.${path}` : 'realtime'} ${message}`)
|
|
19
|
+
.join(' '));
|
|
6
20
|
const namespace = config.namespace ?? appName;
|
|
7
21
|
if (typeof namespace !== 'string' || !namespace.trim())
|
|
8
22
|
throw new TypeError('Realtime namespace must be a non-empty string.');
|
|
9
|
-
const adapter = config.
|
|
10
|
-
if (config.limits !== undefined &&
|
|
11
|
-
(typeof config.limits !== 'object' ||
|
|
12
|
-
config.limits === null ||
|
|
13
|
-
Array.isArray(config.limits)))
|
|
14
|
-
throw new TypeError('Realtime limits must be an object.');
|
|
23
|
+
const adapter = config.broker === undefined ? 'inMemory' : config.broker.adapter;
|
|
15
24
|
return {
|
|
16
25
|
...config.limits,
|
|
17
26
|
broker: registry.create(adapter, { namespace, config, logger }),
|
|
@@ -20,4 +29,42 @@ export function realtimeServiceOptions(config = {}, appName = 'default', registr
|
|
|
20
29
|
sessionCheckIntervalMs: config.sessionCheckIntervalMs,
|
|
21
30
|
};
|
|
22
31
|
}
|
|
32
|
+
function configurationIssues(value) {
|
|
33
|
+
if (!isRecord(value))
|
|
34
|
+
return [{ path: '', message: 'must be an object.' }];
|
|
35
|
+
const issues = [];
|
|
36
|
+
for (const [path, destination] of [
|
|
37
|
+
['adapter', 'Move it to realtime.broker.adapter.'],
|
|
38
|
+
['redis', 'Move its options to realtime.broker.'],
|
|
39
|
+
]) {
|
|
40
|
+
if (Object.hasOwn(value, path))
|
|
41
|
+
issues.push({
|
|
42
|
+
path,
|
|
43
|
+
message: `uses the old configuration format. ${destination}`,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
if (Object.hasOwn(value, 'broker')) {
|
|
47
|
+
if (!isRecord(value.broker))
|
|
48
|
+
issues.push({ path: 'broker', message: 'must be an object.' });
|
|
49
|
+
else {
|
|
50
|
+
if (typeof value.broker.adapter !== 'string' ||
|
|
51
|
+
!value.broker.adapter.trim())
|
|
52
|
+
issues.push({
|
|
53
|
+
path: 'broker.adapter',
|
|
54
|
+
message: 'must be a non-empty string.',
|
|
55
|
+
});
|
|
56
|
+
if (Object.hasOwn(value.broker, 'namespace'))
|
|
57
|
+
issues.push({
|
|
58
|
+
path: 'broker.namespace',
|
|
59
|
+
message: 'is not supported. Use realtime.namespace.',
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
if (value.limits !== undefined && !isRecord(value.limits))
|
|
64
|
+
issues.push({ path: 'limits', message: 'must be an object.' });
|
|
65
|
+
return issues;
|
|
66
|
+
}
|
|
67
|
+
function isRecord(value) {
|
|
68
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
69
|
+
}
|
|
23
70
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/realtime/config.ts"],"names":[],"mappings":"AACA,OAAO,EACL,4BAA4B,GAE7B,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/realtime/config.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/app-server",
|
|
3
|
-
"version": "5.0.0-beta.
|
|
3
|
+
"version": "5.0.0-beta.3",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"prettier": "@nocobase/dev-config/prettier",
|
|
6
6
|
"engines": {
|
|
@@ -125,7 +125,7 @@
|
|
|
125
125
|
"@nocobase/config": "^0.1.0-beta.3",
|
|
126
126
|
"@nocobase/drive": "^0.1.0-beta.7",
|
|
127
127
|
"@nocobase/logging": "^0.1.0-beta.7",
|
|
128
|
-
"@nocobase/realtime": "^1.0.0-beta.
|
|
128
|
+
"@nocobase/realtime": "^1.0.0-beta.2",
|
|
129
129
|
"@nocobase/secrets": "^0.1.0-beta.1",
|
|
130
130
|
"@nocobase/session": "^0.1.0-beta.3",
|
|
131
131
|
"@nocobase/snowflake": "^1.0.0-beta.4",
|
|
@@ -151,12 +151,12 @@
|
|
|
151
151
|
"@nocobase/db-dameng": "^0.1.0-beta.4",
|
|
152
152
|
"@nocobase/db-kingbase": "^0.1.0-beta.4",
|
|
153
153
|
"@nocobase/db-oceanbase": "^0.1.0-beta.4",
|
|
154
|
-
"@nocobase/i18n": "^2.0.0-beta.
|
|
154
|
+
"@nocobase/i18n": "^2.0.0-beta.2",
|
|
155
155
|
"@nocobase/caching": "^1.0.0-beta.4",
|
|
156
|
-
"@nocobase/db": "^1.0.0-beta.
|
|
156
|
+
"@nocobase/db": "^1.0.0-beta.27",
|
|
157
157
|
"@nocobase/service-provider": "^0.0.2-beta.2",
|
|
158
|
-
"@nocobase/queue": "^1.0.0-beta.
|
|
159
|
-
"@nocobase/jobs": "^1.0.0-beta.
|
|
158
|
+
"@nocobase/queue": "^1.0.0-beta.11",
|
|
159
|
+
"@nocobase/jobs": "^1.0.0-beta.6",
|
|
160
160
|
"@nocobase/db-sqlite": "^0.1.0-beta.6",
|
|
161
161
|
"@nocobase/db-mysql": "^0.1.0-beta.5",
|
|
162
162
|
"@nocobase/db-postgres": "^0.1.0-beta.5",
|