@nocobase/app-server 5.0.0-beta.0 → 5.0.0-beta.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.
- 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/node/server.d.ts +8 -0
- package/dist/node/server.d.ts.map +1 -1
- package/dist/node/server.js +9 -0
- package/dist/node/server.js.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 +10 -10
package/dist/jobs/config.d.ts
CHANGED
|
@@ -1,2 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
import { type JobsConfig } from '@nocobase/jobs';
|
|
2
|
+
import type { ConfigValidationContext } from '../config/index.js';
|
|
3
|
+
export type AppJobsConfig = JobsConfig;
|
|
4
|
+
/** Pure validation of the merged application section, including unselected legacy fields. */
|
|
5
|
+
export declare function validateAppJobsConfig(value: AppJobsConfig, context: ConfigValidationContext): void;
|
|
2
6
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/jobs/config.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/jobs/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC;AAEvC,6FAA6F;AAC7F,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,uBAAuB,GAC/B,IAAI,CAON"}
|
package/dist/jobs/config.js
CHANGED
|
@@ -1,2 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
import { validateJobsConfig } from '@nocobase/jobs';
|
|
2
|
+
/** Pure validation of the merged application section, including unselected legacy fields. */
|
|
3
|
+
export function validateAppJobsConfig(value, context) {
|
|
4
|
+
try {
|
|
5
|
+
validateJobsConfig(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/jobs/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/jobs/config.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/jobs/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAmB,MAAM,gBAAgB,CAAC;AAKrE,6FAA6F;AAC7F,MAAM,UAAU,qBAAqB,CACnC,KAAoB,EACpB,OAAgC;IAEhC,IAAI,CAAC;QACH,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC5B,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"}
|
package/dist/node/proxy.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/node/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,eAAe,EAErB,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,MAAM,EAAY,MAAM,aAAa,CAAC;AAU/C,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9C,uFAAuF;IACvF,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,IAAI,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;CACzD;AAED,uFAAuF;AACvF,qBAAa,eAAe;IAMP,OAAO,CAAC,QAAQ,CAAC,OAAO;IAL3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4B;IACrD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,cAAc,CAAS;gBAEK,OAAO,EAAE,sBAAsB;IAE5D,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAI5B,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/node/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,eAAe,EAErB,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,MAAM,EAAY,MAAM,aAAa,CAAC;AAU/C,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9C,uFAAuF;IACvF,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,IAAI,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;CACzD;AAED,uFAAuF;AACvF,qBAAa,eAAe;IAMP,OAAO,CAAC,QAAQ,CAAC,OAAO;IAL3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4B;IACrD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,cAAc,CAAS;gBAEK,OAAO,EAAE,sBAAsB;IAE5D,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAI5B,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAwE1C,OAAO,CAClB,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC;IA8FhB,uFAAuF;IAChF,eAAe,IAAI,IAAI;IAMvB,KAAK,IAAI,IAAI;IAOpB,OAAO,CAAC,OAAO;YASD,aAAa;CAc5B"}
|
package/dist/node/proxy.js
CHANGED
|
@@ -79,13 +79,15 @@ export class NodeServerProxy {
|
|
|
79
79
|
}
|
|
80
80
|
});
|
|
81
81
|
}
|
|
82
|
-
catch {
|
|
82
|
+
catch (error) {
|
|
83
|
+
if (isConnectionFailure(error))
|
|
84
|
+
return unavailableResponse();
|
|
83
85
|
return Response.json({ error: 'Upstream server is unavailable.' }, { status: 502 });
|
|
84
86
|
}
|
|
85
87
|
}
|
|
86
88
|
async upgrade(req, socket, head) {
|
|
87
89
|
if (this.closed || this.upgradesClosed) {
|
|
88
|
-
rejectWebSocketUpgrade(socket, 503);
|
|
90
|
+
rejectWebSocketUpgrade(socket, 503, retryHeaders());
|
|
89
91
|
return;
|
|
90
92
|
}
|
|
91
93
|
this.webSockets.add(socket);
|
|
@@ -101,7 +103,7 @@ export class NodeServerProxy {
|
|
|
101
103
|
if (socket.destroyed)
|
|
102
104
|
return;
|
|
103
105
|
if (!target || this.closed || this.upgradesClosed) {
|
|
104
|
-
rejectWebSocketUpgrade(socket, 503);
|
|
106
|
+
rejectWebSocketUpgrade(socket, 503, retryHeaders());
|
|
105
107
|
return;
|
|
106
108
|
}
|
|
107
109
|
const headers = forwardedHeaders(request);
|
|
@@ -121,7 +123,7 @@ export class NodeServerProxy {
|
|
|
121
123
|
};
|
|
122
124
|
outgoing.once('error', () => {
|
|
123
125
|
if (!socket.destroyed)
|
|
124
|
-
rejectWebSocketUpgrade(socket,
|
|
126
|
+
rejectWebSocketUpgrade(socket, 503, retryHeaders());
|
|
125
127
|
finish();
|
|
126
128
|
});
|
|
127
129
|
outgoing.once('response', (incoming) => {
|
|
@@ -163,7 +165,7 @@ export class NodeServerProxy {
|
|
|
163
165
|
}
|
|
164
166
|
catch {
|
|
165
167
|
if (!socket.destroyed)
|
|
166
|
-
rejectWebSocketUpgrade(socket,
|
|
168
|
+
rejectWebSocketUpgrade(socket, 503, retryHeaders());
|
|
167
169
|
}
|
|
168
170
|
}
|
|
169
171
|
/** Stop upgraded connections before draining HTTP; Node does not close them for us. */
|
|
@@ -221,9 +223,22 @@ function readHeaders(message) {
|
|
|
221
223
|
return headers;
|
|
222
224
|
}
|
|
223
225
|
function unavailableResponse() {
|
|
224
|
-
return Response.json({ error: 'Upstream server is not ready.' }, { status: 503 });
|
|
226
|
+
return Response.json({ error: 'Upstream server is not ready.' }, { status: 503, headers: retryHeaders() });
|
|
225
227
|
}
|
|
226
228
|
function toError(error) {
|
|
227
229
|
return error instanceof Error ? error : new Error(String(error));
|
|
228
230
|
}
|
|
231
|
+
function retryHeaders() {
|
|
232
|
+
return new Headers({ 'retry-after': '2', 'cache-control': 'no-store' });
|
|
233
|
+
}
|
|
234
|
+
function isConnectionFailure(error) {
|
|
235
|
+
return [
|
|
236
|
+
'ECONNREFUSED',
|
|
237
|
+
'ECONNRESET',
|
|
238
|
+
'EPIPE',
|
|
239
|
+
'ETIMEDOUT',
|
|
240
|
+
'EHOSTUNREACH',
|
|
241
|
+
'ENETUNREACH',
|
|
242
|
+
].includes(error?.code ?? '');
|
|
243
|
+
}
|
|
229
244
|
//# sourceMappingURL=proxy.js.map
|
package/dist/node/proxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/node/proxy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/node/proxy.ts"],"names":[],"mappings":"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"}
|
package/dist/node/server.d.ts
CHANGED
|
@@ -4,6 +4,12 @@ import type { AppServer } from '../runtime/index.js';
|
|
|
4
4
|
import type { NodeServerProxy } from './proxy.js';
|
|
5
5
|
export declare const DEFAULT_HTTP_DRAIN_TIMEOUT_MS: number;
|
|
6
6
|
export declare const DEFAULT_FORCE_EXIT_TIMEOUT_MS: number;
|
|
7
|
+
/**
|
|
8
|
+
* How long a client may take to send one whole request, body included. Node's own default of five minutes cuts off
|
|
9
|
+
* an upload of about 100 MB over a slow link, such as a build archive sent to a deployment API, with HTTP 408. The
|
|
10
|
+
* header phase keeps Node's separate 60 second `headersTimeout`.
|
|
11
|
+
*/
|
|
12
|
+
export declare const DEFAULT_HTTP_REQUEST_TIMEOUT_MS: number;
|
|
7
13
|
/**
|
|
8
14
|
* Total shutdown budget, when the host supplies one. A supervisor that kills
|
|
9
15
|
* the process after a fixed wait — `tsx watch` escalates to SIGKILL after five
|
|
@@ -26,6 +32,8 @@ export interface StartNodeAppServerOptions {
|
|
|
26
32
|
readonly onListen?: (info: AddressInfo) => void;
|
|
27
33
|
readonly logger?: NodeAppServerLogger;
|
|
28
34
|
readonly registerProcessSignals?: boolean;
|
|
35
|
+
/** Node's `requestTimeout`; `0` turns it off. */
|
|
36
|
+
readonly requestTimeoutMs?: number;
|
|
29
37
|
readonly httpDrainTimeoutMs?: number;
|
|
30
38
|
readonly forceExitTimeoutMs?: number;
|
|
31
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/node/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAG5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAQlD,eAAO,MAAM,6BAA6B,EAAE,MAAe,CAAC;AAC5D,eAAO,MAAM,6BAA6B,EAAE,MAAe,CAAC;AAE5D;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,4BAA4B,CAAC;AAM9D,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC;AAE3C,MAAM,WAAW,qBAAsB,SAAQ,SAAS;IACtD,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC9B,QAAQ,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC;IACjC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC/C;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IAChD,QAAQ,CAAC,MAAM,CAAC,EAAE,mBAAmB,CAAC;IACtC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,CAAC,EAAE,mBAAmB,CAAC;IACtC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CACtC;AAaD;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,GAChD,mBAAmB,CAWrB;AA2BD,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,qBAAqB,EAC1B,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/node/server.ts"],"names":[],"mappings":"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"}
|
package/dist/node/server.js
CHANGED
|
@@ -2,6 +2,12 @@ import { serve } from '@hono/node-server';
|
|
|
2
2
|
import { acceptWebSocketUpgrade, createWebSocketUpgradeRequest, isWebSocketUpgrade, rejectWebSocketUpgrade, } from '@nocobase/app-websocket';
|
|
3
3
|
export const DEFAULT_HTTP_DRAIN_TIMEOUT_MS = 30_000;
|
|
4
4
|
export const DEFAULT_FORCE_EXIT_TIMEOUT_MS = 35_000;
|
|
5
|
+
/**
|
|
6
|
+
* How long a client may take to send one whole request, body included. Node's own default of five minutes cuts off
|
|
7
|
+
* an upload of about 100 MB over a slow link, such as a build archive sent to a deployment API, with HTTP 408. The
|
|
8
|
+
* header phase keeps Node's separate 60 second `headersTimeout`.
|
|
9
|
+
*/
|
|
10
|
+
export const DEFAULT_HTTP_REQUEST_TIMEOUT_MS = 10 * 60_000;
|
|
5
11
|
/**
|
|
6
12
|
* Total shutdown budget, when the host supplies one. A supervisor that kills
|
|
7
13
|
* the process after a fixed wait — `tsx watch` escalates to SIGKILL after five
|
|
@@ -65,6 +71,9 @@ export function startNodeAppServer(app, options) {
|
|
|
65
71
|
fetch: withoutConnectionHeaders(app.fetch),
|
|
66
72
|
hostname: options.hostname,
|
|
67
73
|
port: options.port,
|
|
74
|
+
serverOptions: {
|
|
75
|
+
requestTimeout: options.requestTimeoutMs ?? DEFAULT_HTTP_REQUEST_TIMEOUT_MS,
|
|
76
|
+
},
|
|
68
77
|
}, (info) => {
|
|
69
78
|
listening = true;
|
|
70
79
|
try {
|
package/dist/node/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/node/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAmB,MAAM,mBAAmB,CAAC;AAO3D,OAAO,EACL,sBAAsB,EACtB,6BAA6B,EAC7B,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,CAAC,MAAM,6BAA6B,GAAW,MAAM,CAAC;AAC5D,MAAM,CAAC,MAAM,6BAA6B,GAAW,MAAM,CAAC;AAE5D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,yBAAyB,CAAC;AAE9D,4EAA4E;AAC5E,MAAM,6BAA6B,GAAG,KAAK,CAAC;AAC5C,MAAM,yBAAyB,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/node/server.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.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"prettier": "@nocobase/dev-config/prettier",
|
|
6
6
|
"engines": {
|
|
@@ -125,11 +125,11 @@
|
|
|
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
|
-
"@nocobase/
|
|
132
|
-
"@nocobase/
|
|
131
|
+
"@nocobase/snowflake": "^1.0.0-beta.4",
|
|
132
|
+
"@nocobase/mailer": "^1.0.0-beta.2"
|
|
133
133
|
},
|
|
134
134
|
"devDependencies": {
|
|
135
135
|
"@types/node": "^24.0.0",
|
|
@@ -151,17 +151,17 @@
|
|
|
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.26",
|
|
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
|
+
"@nocobase/db-mysql": "^0.1.0-beta.5",
|
|
161
162
|
"@nocobase/db-postgres": "^0.1.0-beta.5",
|
|
162
163
|
"@nocobase/db-mssql": "^0.1.0-beta.5",
|
|
163
|
-
"@nocobase/db-oracle": "^0.1.0-beta.5"
|
|
164
|
-
"@nocobase/db-mysql": "^0.1.0-beta.5"
|
|
164
|
+
"@nocobase/db-oracle": "^0.1.0-beta.5"
|
|
165
165
|
},
|
|
166
166
|
"peerDependenciesMeta": {
|
|
167
167
|
"@nocobase/db-sqlite": {
|