raffel 1.1.25 → 1.1.26-next.338e909

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.
@@ -1 +1 @@
1
- {"version":3,"file":"lifecycle-executor.d.ts","sourceRoot":"","sources":["../../../src/server/builder/lifecycle-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,KAAK,EAEV,iBAAiB,EAEjB,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,oBAAoB,CAAA;AAW3B,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAA;AAG3E,MAAM,WAAW,uBAAuB;IACtC,iBAAiB,EAAE,MAAM,IAAI,CAAA;IAC7B,gBAAgB,EAAE,CAChB,WAAW,EAAE,iBAAiB,EAC9B,cAAc,EAAE,cAAc,EAAE,EAChC,gBAAgB,EAAE,CAAC,KAAK,EAAE,0BAA0B,EAAE,IAAI,EAAE,QAAQ,KAAK,IAAI,KAC1E,OAAO,CAAC,IAAI,CAAC,CAAA;CACnB;AAED,MAAM,WAAW,8BAA+B,SAAQ,uBAAuB;IAC7E,mBAAmB,EAAE,CACnB,WAAW,EAAE,iBAAiB,EAC9B,KAAK,EAAE,yBAAyB,EAChC,cAAc,EAAE,cAAc,EAAE,EAChC,gBAAgB,EAAE,CAAC,KAAK,EAAE,0BAA0B,EAAE,IAAI,EAAE,QAAQ,KAAK,IAAI,KAC1E,OAAO,CAAC,IAAI,CAAC,CAAA;CACnB;AAED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,+BAA+B,GACvC,8BAA8B,CAoLhC"}
1
+ {"version":3,"file":"lifecycle-executor.d.ts","sourceRoot":"","sources":["../../../src/server/builder/lifecycle-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,KAAK,EAEV,iBAAiB,EAEjB,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,oBAAoB,CAAA;AAW3B,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAA;AAG3E,MAAM,WAAW,uBAAuB;IACtC,iBAAiB,EAAE,MAAM,IAAI,CAAA;IAC7B,gBAAgB,EAAE,CAChB,WAAW,EAAE,iBAAiB,EAC9B,cAAc,EAAE,cAAc,EAAE,EAChC,gBAAgB,EAAE,CAAC,KAAK,EAAE,0BAA0B,EAAE,IAAI,EAAE,QAAQ,KAAK,IAAI,KAC1E,OAAO,CAAC,IAAI,CAAC,CAAA;CACnB;AAED,MAAM,WAAW,8BAA+B,SAAQ,uBAAuB;IAC7E,mBAAmB,EAAE,CACnB,WAAW,EAAE,iBAAiB,EAC9B,KAAK,EAAE,yBAAyB,EAChC,cAAc,EAAE,cAAc,EAAE,EAChC,gBAAgB,EAAE,CAAC,KAAK,EAAE,0BAA0B,EAAE,IAAI,EAAE,QAAQ,KAAK,IAAI,KAC1E,OAAO,CAAC,IAAI,CAAC,CAAA;CACnB;AAED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,+BAA+B,GACvC,8BAA8B,CAyMhC"}
@@ -113,6 +113,19 @@ export function createServerLifecycleExecutor(context) {
113
113
  for (const step of runtimePlan.execution.postPortBinding) {
114
114
  await executePostPortBindingStep(runtimePlan, step, (task) => registerStopTask('post-port-binding', task));
115
115
  }
116
+ // Lazy expansion of FS-discovered TCP/UDP handlers.
117
+ // Discovery runs during the 'discovery' phase, AFTER the plan was
118
+ // built — so iterating handlers at build time would miss them.
119
+ // We invoke `plan.getTcpHandlers()` / `plan.getUdpHandlers()` here
120
+ // to pick up whatever discovery registered. Single-port (multiplex)
121
+ // TCP/gRPC takes a different code path (kind: 'tcp' / 'grpc') and
122
+ // is unaffected by this lazy expansion.
123
+ for (const handler of runtimePlan.getTcpHandlers?.() ?? []) {
124
+ await executePostPortBindingStep(runtimePlan, { kind: 'tcp-handler', handler }, (task) => registerStopTask('post-port-binding', task));
125
+ }
126
+ for (const handler of runtimePlan.getUdpHandlers?.() ?? []) {
127
+ await executePostPortBindingStep(runtimePlan, { kind: 'udp-handler', handler }, (task) => registerStopTask('post-port-binding', task));
128
+ }
116
129
  }
117
130
  }
118
131
  }
@@ -1 +1 @@
1
- {"version":3,"file":"lifecycle-executor.js","sourceRoot":"","sources":["../../../src/server/builder/lifecycle-executor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lifecycle-executor.js","sourceRoot":"","sources":["../../../src/server/builder/lifecycle-executor.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,54 @@
1
+ /**
2
+ * Discovery Source Resolution
3
+ *
4
+ * Helpers shared between the loader and the watcher for normalizing the
5
+ * `DiscoveryConfig` shape into a flat list of `{ dir, prefix }` entries.
6
+ *
7
+ * The discovery config accepts a union per slot:
8
+ * - `false` → disabled
9
+ * - `true` → use default directory, no prefix
10
+ * - `string` → single custom directory, no prefix
11
+ * - `DiscoverySourceEntry` → single dir with optional prefix
12
+ * - `Array<string | DiscoverySourceEntry>` → multiple sources (domain-driven)
13
+ *
14
+ * Both `loader.ts` (route loading) and `watcher.ts` (hot-reload watching)
15
+ * need to iterate over the same set of resolved directories, so the
16
+ * resolution logic lives here in one place.
17
+ */
18
+ import type { DiscoveryConfig, DiscoverySourceValue } from './types.js';
19
+ /** Resolved discovery source — what consumers iterate over. */
20
+ export interface ResolvedDiscoverySource {
21
+ dir: string;
22
+ /** Cleaned prefix (no leading/trailing slashes). Empty string means "no prefix". */
23
+ prefix: string;
24
+ }
25
+ /** Default directories used when a slot is `true`. */
26
+ export declare const DISCOVERY_DEFAULTS: Record<keyof DiscoveryConfig, string>;
27
+ /**
28
+ * Resolve a single directory path (absolute or relative to baseDir).
29
+ */
30
+ export declare function resolveDiscoveryDir(baseDir: string, dir: string): string;
31
+ /**
32
+ * Strip leading/trailing slashes from a prefix. Returns '' if empty/undefined.
33
+ * `'/leads/'` → `'leads'`, `'leads'` → `'leads'`, `undefined` → `''`.
34
+ */
35
+ export declare function normalizeDiscoveryPrefix(prefix: string | undefined): string;
36
+ /**
37
+ * Prefix a discovered name with the source's prefix.
38
+ * `prefix=''` returns name unchanged.
39
+ * `prefix='leads', name='list/get'` → `'leads/list/get'`.
40
+ */
41
+ export declare function applyDiscoveryPrefix(prefix: string, name: string): string;
42
+ /**
43
+ * Normalize a discovery slot value into a flat list of resolved sources.
44
+ *
45
+ * Handles the union: `false | true | string | DiscoverySourceEntry | Array<...>`.
46
+ * Returns an empty array for disabled slots.
47
+ */
48
+ export declare function resolveDiscoverySources(baseDir: string, value: DiscoverySourceValue | undefined, defaultPath: string): ResolvedDiscoverySource[];
49
+ /**
50
+ * Normalize a DiscoveryConfig (or boolean shortcut) into an explicit config.
51
+ * `true` expands to every slot enabled; `false` becomes an empty object.
52
+ */
53
+ export declare function normalizeDiscoveryConfig(config: DiscoveryConfig | boolean): DiscoveryConfig;
54
+ //# sourceMappingURL=discovery-sources.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"discovery-sources.d.ts","sourceRoot":"","sources":["../../../src/server/fs-routes/discovery-sources.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAwB,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAE7F,+DAA+D;AAC/D,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAA;IACX,oFAAoF;IACpF,MAAM,EAAE,MAAM,CAAA;CACf;AAED,sDAAsD;AACtD,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,eAAe,EAAE,MAAM,CASpE,CAAA;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAExE;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAG3E;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAGzE;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,oBAAoB,GAAG,SAAS,EACvC,WAAW,EAAE,MAAM,GAClB,uBAAuB,EAAE,CA0B3B;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,GAAG,eAAe,CAe3F"}
@@ -0,0 +1,108 @@
1
+ /**
2
+ * Discovery Source Resolution
3
+ *
4
+ * Helpers shared between the loader and the watcher for normalizing the
5
+ * `DiscoveryConfig` shape into a flat list of `{ dir, prefix }` entries.
6
+ *
7
+ * The discovery config accepts a union per slot:
8
+ * - `false` → disabled
9
+ * - `true` → use default directory, no prefix
10
+ * - `string` → single custom directory, no prefix
11
+ * - `DiscoverySourceEntry` → single dir with optional prefix
12
+ * - `Array<string | DiscoverySourceEntry>` → multiple sources (domain-driven)
13
+ *
14
+ * Both `loader.ts` (route loading) and `watcher.ts` (hot-reload watching)
15
+ * need to iterate over the same set of resolved directories, so the
16
+ * resolution logic lives here in one place.
17
+ */
18
+ import { isAbsolute, join } from 'node:path';
19
+ /** Default directories used when a slot is `true`. */
20
+ export const DISCOVERY_DEFAULTS = {
21
+ http: './src/http',
22
+ channels: './src/channels',
23
+ rpc: './src/rpc',
24
+ streams: './src/streams',
25
+ rest: './src/rest',
26
+ resources: './src/resources',
27
+ tcp: './src/tcp',
28
+ udp: './src/udp',
29
+ };
30
+ /**
31
+ * Resolve a single directory path (absolute or relative to baseDir).
32
+ */
33
+ export function resolveDiscoveryDir(baseDir, dir) {
34
+ return isAbsolute(dir) ? dir : join(baseDir, dir);
35
+ }
36
+ /**
37
+ * Strip leading/trailing slashes from a prefix. Returns '' if empty/undefined.
38
+ * `'/leads/'` → `'leads'`, `'leads'` → `'leads'`, `undefined` → `''`.
39
+ */
40
+ export function normalizeDiscoveryPrefix(prefix) {
41
+ if (!prefix)
42
+ return '';
43
+ return prefix.replace(/^\/+|\/+$/g, '');
44
+ }
45
+ /**
46
+ * Prefix a discovered name with the source's prefix.
47
+ * `prefix=''` returns name unchanged.
48
+ * `prefix='leads', name='list/get'` → `'leads/list/get'`.
49
+ */
50
+ export function applyDiscoveryPrefix(prefix, name) {
51
+ if (!prefix)
52
+ return name;
53
+ return name ? `${prefix}/${name}` : prefix;
54
+ }
55
+ /**
56
+ * Normalize a discovery slot value into a flat list of resolved sources.
57
+ *
58
+ * Handles the union: `false | true | string | DiscoverySourceEntry | Array<...>`.
59
+ * Returns an empty array for disabled slots.
60
+ */
61
+ export function resolveDiscoverySources(baseDir, value, defaultPath) {
62
+ if (value === false || value === undefined)
63
+ return [];
64
+ if (value === true) {
65
+ return [{ dir: resolveDiscoveryDir(baseDir, defaultPath), prefix: '' }];
66
+ }
67
+ if (typeof value === 'string') {
68
+ return [{ dir: resolveDiscoveryDir(baseDir, value), prefix: '' }];
69
+ }
70
+ if (Array.isArray(value)) {
71
+ return value.map((entry) => typeof entry === 'string'
72
+ ? { dir: resolveDiscoveryDir(baseDir, entry), prefix: '' }
73
+ : {
74
+ dir: resolveDiscoveryDir(baseDir, entry.dir),
75
+ prefix: normalizeDiscoveryPrefix(entry.prefix),
76
+ });
77
+ }
78
+ // Single DiscoverySourceEntry object
79
+ const entry = value;
80
+ return [
81
+ {
82
+ dir: resolveDiscoveryDir(baseDir, entry.dir),
83
+ prefix: normalizeDiscoveryPrefix(entry.prefix),
84
+ },
85
+ ];
86
+ }
87
+ /**
88
+ * Normalize a DiscoveryConfig (or boolean shortcut) into an explicit config.
89
+ * `true` expands to every slot enabled; `false` becomes an empty object.
90
+ */
91
+ export function normalizeDiscoveryConfig(config) {
92
+ if (config === true) {
93
+ return {
94
+ http: true,
95
+ channels: true,
96
+ rpc: true,
97
+ streams: true,
98
+ rest: true,
99
+ resources: true,
100
+ tcp: true,
101
+ udp: true,
102
+ };
103
+ }
104
+ if (config === false)
105
+ return {};
106
+ return config;
107
+ }
108
+ //# sourceMappingURL=discovery-sources.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"discovery-sources.js","sourceRoot":"","sources":["../../../src/server/fs-routes/discovery-sources.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/server/fs-routes/loader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,EAAyD,KAAK,sBAAsB,EAAE,KAAK,oBAAoB,EAAkC,MAAM,uBAAuB,CAAA;AAKrL,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACtD,OAAO,KAAK,EAEV,sBAAsB,EACtB,cAAc,EACd,WAAW,EACX,aAAa,EAWd,MAAM,YAAY,CAAA;AA+GnB;;GAEG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CAkK7F;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,aAAa,EAAE,kBAAkB,EAAE,CAAA;IACnC,SAAS,EAAE,cAAc,EAAE,CAAA;IAC3B,WAAW,EAAE,gBAAgB,EAAE,CAAA;IAC/B,WAAW,EAAE,gBAAgB,EAAE,CAAA;IAC/B,KAAK,EAAE,cAAc,CAAA;IACrB,WAAW,EAAE,oBAAoB,CAAA;IACjC,QAAQ,EAAE,sBAAsB,EAAE,CAAA;CACnC;AAqfD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAIvD"}
1
+ {"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/server/fs-routes/loader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,EAAyD,KAAK,sBAAsB,EAAE,KAAK,oBAAoB,EAAkC,MAAM,uBAAuB,CAAA;AAWrL,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACtD,OAAO,KAAK,EACV,sBAAsB,EACtB,cAAc,EACd,WAAW,EACX,aAAa,EAWd,MAAM,YAAY,CAAA;AAsGnB;;GAEG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CAwJ7F;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,aAAa,EAAE,kBAAkB,EAAE,CAAA;IACnC,SAAS,EAAE,cAAc,EAAE,CAAA;IAC3B,WAAW,EAAE,gBAAgB,EAAE,CAAA;IAC/B,WAAW,EAAE,gBAAgB,EAAE,CAAA;IAC/B,KAAK,EAAE,cAAc,CAAA;IACrB,WAAW,EAAE,oBAAoB,CAAA;IACjC,QAAQ,EAAE,sBAAsB,EAAE,CAAA;CACnC;AAwgBD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAIvD"}
@@ -3,27 +3,19 @@
3
3
  *
4
4
  * Auto-discovers and loads handlers from the file system.
5
5
  */
6
- import { join, relative, parse as parsePath, extname, isAbsolute } from 'node:path';
6
+ import { join, relative, parse as parsePath, extname } from 'node:path';
7
7
  import { createLogger } from '../../utils/logger.js';
8
8
  import { loadCoLocatedPolicies } from '../../middleware/policy/co-located/loader.js';
9
9
  import { resolveCoLocatedPolicies } from '../../middleware/policy/co-located/resolver.js';
10
10
  import { createFileSystemDiscoverySource } from './discovery-source.js';
11
+ import { DISCOVERY_DEFAULTS, applyDiscoveryPrefix, normalizeDiscoveryConfig, resolveDiscoverySources, } from './discovery-sources.js';
11
12
  import { loadRestResources } from './rest/loader.js';
12
13
  import { loadResources } from './resources/loader.js';
13
14
  import { loadTcpHandlers } from './tcp/loader.js';
14
15
  import { loadUdpHandlers } from './udp/loader.js';
15
16
  const logger = createLogger('fs-discovery');
16
- // Default directories
17
- const DEFAULTS = {
18
- http: './src/http',
19
- channels: './src/channels',
20
- rpc: './src/rpc',
21
- streams: './src/streams',
22
- rest: './src/rest',
23
- resources: './src/resources',
24
- tcp: './src/tcp',
25
- udp: './src/udp',
26
- };
17
+ // Default directories shared with the watcher.
18
+ const DEFAULTS = DISCOVERY_DEFAULTS;
27
19
  // Special files
28
20
  const MIDDLEWARE_FILE = '_middleware';
29
21
  const AUTH_FILE = '_auth';
@@ -132,108 +124,106 @@ export async function loadDiscovery(options) {
132
124
  const config = normalizeDiscoveryConfig(options.discovery);
133
125
  const coLocatedEnabled = options.coLocatedPolicies?.enabled !== false;
134
126
  const coLocatedCustomConditions = options.coLocatedPolicies?.customConditions;
135
- // Load HTTP routes
136
- if (config.http) {
137
- const dir = resolveDir(baseDir, config.http, DEFAULTS.http);
138
- if (dir && await source.exists(dir)) {
139
- const loaded = await loadDirectory(source, dir, 'procedure', extensions);
140
- applyHttpVerbConvention(loaded.routes);
141
- if (coLocatedEnabled) {
142
- await attachCoLocatedPolicies(source, loaded.routes, coLocatedCustomConditions, dir);
143
- }
144
- routes.push(...loaded.routes);
145
- stats.http = loaded.routes.length;
146
- stats.middlewares += loaded.middlewareCount;
147
- logger.info({ count: stats.http, dir }, 'Loaded HTTP routes');
127
+ // Load HTTP routes (multi-source aware)
128
+ for (const src of resolveSources(baseDir, config.http, DEFAULTS.http)) {
129
+ if (!(await source.exists(src.dir)))
130
+ continue;
131
+ const loaded = await loadDirectory(source, src.dir, 'procedure', extensions);
132
+ prefixRouteNames(loaded.routes, src.prefix);
133
+ applyHttpVerbConvention(loaded.routes);
134
+ if (coLocatedEnabled) {
135
+ await attachCoLocatedPolicies(source, loaded.routes, coLocatedCustomConditions, src.dir);
148
136
  }
137
+ routes.push(...loaded.routes);
138
+ stats.http += loaded.routes.length;
139
+ stats.middlewares += loaded.middlewareCount;
140
+ logger.info({ count: loaded.routes.length, dir: src.dir, prefix: src.prefix || undefined }, 'Loaded HTTP routes');
149
141
  }
150
142
  // Load RPC routes
151
- if (config.rpc) {
152
- const dir = resolveDir(baseDir, config.rpc, DEFAULTS.rpc);
153
- if (dir && await source.exists(dir)) {
154
- const loaded = await loadDirectory(source, dir, 'procedure', extensions);
155
- if (coLocatedEnabled) {
156
- await attachCoLocatedPolicies(source, loaded.routes, coLocatedCustomConditions, dir);
157
- }
158
- routes.push(...loaded.routes);
159
- stats.rpc = loaded.routes.length;
160
- stats.middlewares += loaded.middlewareCount;
161
- logger.info({ count: stats.rpc, dir }, 'Loaded RPC routes');
143
+ for (const src of resolveSources(baseDir, config.rpc, DEFAULTS.rpc)) {
144
+ if (!(await source.exists(src.dir)))
145
+ continue;
146
+ const loaded = await loadDirectory(source, src.dir, 'procedure', extensions);
147
+ prefixRouteNames(loaded.routes, src.prefix);
148
+ if (coLocatedEnabled) {
149
+ await attachCoLocatedPolicies(source, loaded.routes, coLocatedCustomConditions, src.dir);
162
150
  }
151
+ routes.push(...loaded.routes);
152
+ stats.rpc += loaded.routes.length;
153
+ stats.middlewares += loaded.middlewareCount;
154
+ logger.info({ count: loaded.routes.length, dir: src.dir, prefix: src.prefix || undefined }, 'Loaded RPC routes');
163
155
  }
164
156
  // Load Stream routes
165
- if (config.streams) {
166
- const dir = resolveDir(baseDir, config.streams, DEFAULTS.streams);
167
- if (dir && await source.exists(dir)) {
168
- const loaded = await loadDirectory(source, dir, 'stream', extensions);
169
- if (coLocatedEnabled) {
170
- await attachCoLocatedPolicies(source, loaded.routes, coLocatedCustomConditions, dir);
171
- }
172
- routes.push(...loaded.routes);
173
- stats.streams = loaded.routes.length;
174
- stats.middlewares += loaded.middlewareCount;
175
- logger.info({ count: stats.streams, dir }, 'Loaded stream routes');
157
+ for (const src of resolveSources(baseDir, config.streams, DEFAULTS.streams)) {
158
+ if (!(await source.exists(src.dir)))
159
+ continue;
160
+ const loaded = await loadDirectory(source, src.dir, 'stream', extensions);
161
+ prefixRouteNames(loaded.routes, src.prefix);
162
+ if (coLocatedEnabled) {
163
+ await attachCoLocatedPolicies(source, loaded.routes, coLocatedCustomConditions, src.dir);
176
164
  }
165
+ routes.push(...loaded.routes);
166
+ stats.streams += loaded.routes.length;
167
+ stats.middlewares += loaded.middlewareCount;
168
+ logger.info({ count: loaded.routes.length, dir: src.dir, prefix: src.prefix || undefined }, 'Loaded stream routes');
177
169
  }
178
- // Load Channel routes
179
- if (config.channels) {
180
- const dir = resolveDir(baseDir, config.channels, DEFAULTS.channels);
181
- if (dir && await source.exists(dir)) {
182
- const loaded = await loadChannels(source, dir, extensions);
183
- if (coLocatedEnabled) {
184
- await attachCoLocatedPoliciesToFileItems(source, loaded.channels, coLocatedCustomConditions, dir);
185
- }
186
- channels.push(...loaded.channels);
187
- stats.channels = loaded.channels.length;
188
- stats.middlewares += loaded.middlewareCount;
189
- logger.info({ count: stats.channels, dir }, 'Loaded channels');
170
+ // Load Channels
171
+ for (const src of resolveSources(baseDir, config.channels, DEFAULTS.channels)) {
172
+ if (!(await source.exists(src.dir)))
173
+ continue;
174
+ const loaded = await loadChannels(source, src.dir, extensions);
175
+ prefixChannelNames(loaded.channels, src.prefix);
176
+ if (coLocatedEnabled) {
177
+ await attachCoLocatedPoliciesToFileItems(source, loaded.channels, coLocatedCustomConditions, src.dir);
190
178
  }
179
+ channels.push(...loaded.channels);
180
+ stats.channels += loaded.channels.length;
181
+ stats.middlewares += loaded.middlewareCount;
182
+ logger.info({ count: loaded.channels.length, dir: src.dir, prefix: src.prefix || undefined }, 'Loaded channels');
191
183
  }
192
184
  // Load REST resources
193
- if (config.rest) {
194
- const dir = resolveDir(baseDir, config.rest, DEFAULTS.rest);
195
- if (dir && await source.exists(dir)) {
196
- const loaded = await loadRestResources({ baseDir, restDir: dir, extensions, source });
197
- if (coLocatedEnabled) {
198
- await attachCoLocatedPoliciesToFileItems(source, loaded.resources, coLocatedCustomConditions, dir);
199
- }
200
- restResources.push(...loaded.resources);
201
- stats.rest = loaded.stats.resources;
202
- logger.info({ count: stats.rest, dir }, 'Loaded REST resources');
185
+ for (const src of resolveSources(baseDir, config.rest, DEFAULTS.rest)) {
186
+ if (!(await source.exists(src.dir)))
187
+ continue;
188
+ const loaded = await loadRestResources({ baseDir, restDir: src.dir, extensions, source });
189
+ prefixRestResourceNames(loaded.resources, src.prefix);
190
+ if (coLocatedEnabled) {
191
+ await attachCoLocatedPoliciesToFileItems(source, loaded.resources, coLocatedCustomConditions, src.dir);
203
192
  }
193
+ restResources.push(...loaded.resources);
194
+ stats.rest += loaded.stats.resources;
195
+ logger.info({ count: loaded.stats.resources, dir: src.dir, prefix: src.prefix || undefined }, 'Loaded REST resources');
204
196
  }
205
197
  // Load resource handlers
206
- if (config.resources) {
207
- const dir = resolveDir(baseDir, config.resources, DEFAULTS.resources);
208
- if (dir && await source.exists(dir)) {
209
- const loaded = await loadResources({ baseDir, resourcesDir: dir, extensions, source });
210
- if (coLocatedEnabled) {
211
- await attachCoLocatedPoliciesToFileItems(source, loaded.resources, coLocatedCustomConditions, dir);
212
- }
213
- resources.push(...loaded.resources);
214
- stats.resources = loaded.stats.resources;
215
- logger.info({ count: stats.resources, dir }, 'Loaded resources');
198
+ for (const src of resolveSources(baseDir, config.resources, DEFAULTS.resources)) {
199
+ if (!(await source.exists(src.dir)))
200
+ continue;
201
+ const loaded = await loadResources({ baseDir, resourcesDir: src.dir, extensions, source });
202
+ prefixResourceNames(loaded.resources, src.prefix);
203
+ if (coLocatedEnabled) {
204
+ await attachCoLocatedPoliciesToFileItems(source, loaded.resources, coLocatedCustomConditions, src.dir);
216
205
  }
206
+ resources.push(...loaded.resources);
207
+ stats.resources += loaded.stats.resources;
208
+ logger.info({ count: loaded.stats.resources, dir: src.dir, prefix: src.prefix || undefined }, 'Loaded resources');
217
209
  }
218
- // Load TCP handlers
219
- if (config.tcp) {
220
- const dir = resolveDir(baseDir, config.tcp, DEFAULTS.tcp);
221
- if (dir && await source.exists(dir)) {
222
- const loaded = await loadTcpHandlers({ baseDir, tcpDir: dir, extensions, source });
223
- tcpHandlers.push(...loaded.handlers);
224
- stats.tcp = loaded.stats.handlers;
225
- logger.info({ count: stats.tcp, dir }, 'Loaded TCP handlers');
226
- }
210
+ // Load TCP handlers (prefix has no semantic effect — handlers route by port)
211
+ for (const src of resolveSources(baseDir, config.tcp, DEFAULTS.tcp)) {
212
+ if (!(await source.exists(src.dir)))
213
+ continue;
214
+ const loaded = await loadTcpHandlers({ baseDir, tcpDir: src.dir, extensions, source });
215
+ tcpHandlers.push(...loaded.handlers);
216
+ stats.tcp += loaded.stats.handlers;
217
+ logger.info({ count: loaded.stats.handlers, dir: src.dir }, 'Loaded TCP handlers');
227
218
  }
228
- // Load UDP handlers
229
- if (config.udp) {
230
- const dir = resolveDir(baseDir, config.udp, DEFAULTS.udp);
231
- if (dir && await source.exists(dir)) {
232
- const loaded = await loadUdpHandlers({ baseDir, udpDir: dir, extensions, source });
233
- udpHandlers.push(...loaded.handlers);
234
- stats.udp = loaded.stats.handlers;
235
- logger.info({ count: stats.udp, dir }, 'Loaded UDP handlers');
236
- }
219
+ // Load UDP handlers (prefix has no semantic effect — handlers route by port)
220
+ for (const src of resolveSources(baseDir, config.udp, DEFAULTS.udp)) {
221
+ if (!(await source.exists(src.dir)))
222
+ continue;
223
+ const loaded = await loadUdpHandlers({ baseDir, udpDir: src.dir, extensions, source });
224
+ udpHandlers.push(...loaded.handlers);
225
+ stats.udp += loaded.stats.handlers;
226
+ logger.info({ count: loaded.stats.handlers, dir: src.dir }, 'Loaded UDP handlers');
237
227
  }
238
228
  stats.total = stats.http + stats.rpc + stats.streams + stats.channels + stats.rest + stats.resources + stats.tcp + stats.udp;
239
229
  stats.duration = Date.now() - startTime;
@@ -252,36 +242,54 @@ export async function loadDiscovery(options) {
252
242
  failures: source.snapshotFailures(),
253
243
  };
254
244
  }
245
+ // Discovery source resolution helpers live in ./discovery-sources.ts so the
246
+ // watcher can use the same logic. We alias to the previous local names to
247
+ // minimize diff churn in the call sites below.
248
+ const resolveSources = resolveDiscoverySources;
249
+ const applyPrefix = applyDiscoveryPrefix;
255
250
  /**
256
- * Normalize discovery config
251
+ * In-place: prefix each route's `name` with the source's prefix.
252
+ * Called BEFORE `applyHttpVerbConvention` so that the verb-derived
253
+ * httpPath includes the prefix automatically.
257
254
  */
258
- function normalizeDiscoveryConfig(config) {
259
- if (config === true) {
260
- return {
261
- http: true,
262
- channels: true,
263
- rpc: true,
264
- streams: true,
265
- rest: true,
266
- resources: true,
267
- tcp: true,
268
- udp: true,
269
- };
255
+ function prefixRouteNames(routes, prefix) {
256
+ if (!prefix)
257
+ return;
258
+ for (const route of routes) {
259
+ route.name = applyPrefix(prefix, route.name);
270
260
  }
271
- if (config === false) {
272
- return {};
261
+ }
262
+ function prefixChannelNames(channels, prefix) {
263
+ if (!prefix)
264
+ return;
265
+ for (const channel of channels) {
266
+ channel.name = applyPrefix(prefix, channel.name);
273
267
  }
274
- return config;
275
268
  }
276
- /**
277
- * Resolve directory path
278
- */
279
- function resolveDir(baseDir, config, defaultPath) {
280
- if (config === false)
281
- return null;
282
- if (config === true)
283
- return join(baseDir, defaultPath);
284
- return isAbsolute(config) ? config : join(baseDir, config);
269
+ function prefixRestResourceNames(items, prefix) {
270
+ if (!prefix)
271
+ return;
272
+ for (const item of items) {
273
+ item.name = applyPrefix(prefix, item.name);
274
+ if (item.config?.basePath) {
275
+ item.config.basePath = `/${prefix}${item.config.basePath}`;
276
+ }
277
+ // REST routes are pre-generated with concrete paths — rewrite them too.
278
+ for (const route of item.routes ?? []) {
279
+ route.path = `/${prefix}${route.path}`;
280
+ }
281
+ }
282
+ }
283
+ function prefixResourceNames(items, prefix) {
284
+ if (!prefix)
285
+ return;
286
+ for (const item of items) {
287
+ item.name = applyPrefix(prefix, item.name);
288
+ // Resources compute paths from `config.basePath` at registration time.
289
+ if (item.config?.basePath) {
290
+ item.config.basePath = `/${prefix}${item.config.basePath}`;
291
+ }
292
+ }
285
293
  }
286
294
  /**
287
295
  * Load all routes from a directory