@morojs/moro 1.0.0 → 1.0.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/README.md +1 -1
- package/dist/core/config/index.d.ts +5 -5
- package/dist/core/config/index.js +1 -1
- package/dist/core/config/index.js.map +1 -1
- package/dist/core/config/loader.d.ts +1 -1
- package/dist/core/config/loader.js +58 -82
- package/dist/core/config/loader.js.map +1 -1
- package/dist/core/config/schema.d.ts +1 -1
- package/dist/core/config/schema.js +52 -111
- package/dist/core/config/schema.js.map +1 -1
- package/dist/core/config/utils.d.ts +2 -2
- package/dist/core/config/utils.js +18 -18
- package/dist/core/config/utils.js.map +1 -1
- package/dist/core/database/adapters/drizzle.d.ts +1 -1
- package/dist/core/database/adapters/drizzle.js +39 -55
- package/dist/core/database/adapters/drizzle.js.map +1 -1
- package/dist/core/database/adapters/index.d.ts +7 -7
- package/dist/core/database/adapters/index.js +11 -11
- package/dist/core/database/adapters/index.js.map +1 -1
- package/dist/core/database/adapters/mongodb.d.ts +1 -1
- package/dist/core/database/adapters/mongodb.js +19 -23
- package/dist/core/database/adapters/mongodb.js.map +1 -1
- package/dist/core/database/adapters/mysql.d.ts +1 -1
- package/dist/core/database/adapters/mysql.js +31 -27
- package/dist/core/database/adapters/mysql.js.map +1 -1
- package/dist/core/database/adapters/postgresql.d.ts +1 -1
- package/dist/core/database/adapters/postgresql.js +27 -35
- package/dist/core/database/adapters/postgresql.js.map +1 -1
- package/dist/core/database/adapters/redis.d.ts +1 -1
- package/dist/core/database/adapters/redis.js +24 -24
- package/dist/core/database/adapters/redis.js.map +1 -1
- package/dist/core/database/adapters/sqlite.d.ts +1 -1
- package/dist/core/database/adapters/sqlite.js +36 -36
- package/dist/core/database/adapters/sqlite.js.map +1 -1
- package/dist/core/database/index.d.ts +2 -2
- package/dist/core/docs/index.d.ts +7 -7
- package/dist/core/docs/index.js +13 -15
- package/dist/core/docs/index.js.map +1 -1
- package/dist/core/docs/openapi-generator.d.ts +5 -5
- package/dist/core/docs/openapi-generator.js +93 -94
- package/dist/core/docs/openapi-generator.js.map +1 -1
- package/dist/core/docs/simple-docs.d.ts +1 -1
- package/dist/core/docs/simple-docs.js +25 -28
- package/dist/core/docs/simple-docs.js.map +1 -1
- package/dist/core/docs/swagger-ui.d.ts +2 -2
- package/dist/core/docs/swagger-ui.js +46 -51
- package/dist/core/docs/swagger-ui.js.map +1 -1
- package/dist/core/docs/zod-to-openapi.d.ts +1 -1
- package/dist/core/docs/zod-to-openapi.js +115 -125
- package/dist/core/docs/zod-to-openapi.js.map +1 -1
- package/dist/core/events/event-bus.d.ts +1 -1
- package/dist/core/events/event-bus.js +15 -21
- package/dist/core/events/event-bus.js.map +1 -1
- package/dist/core/events/index.d.ts +2 -2
- package/dist/core/framework.d.ts +5 -5
- package/dist/core/framework.js +55 -60
- package/dist/core/framework.js.map +1 -1
- package/dist/core/http/http-server.d.ts +2 -2
- package/dist/core/http/http-server.js +228 -261
- package/dist/core/http/http-server.js.map +1 -1
- package/dist/core/http/index.d.ts +3 -3
- package/dist/core/http/router.d.ts +1 -1
- package/dist/core/http/router.js +15 -17
- package/dist/core/http/router.js.map +1 -1
- package/dist/core/logger/filters.d.ts +1 -1
- package/dist/core/logger/filters.js +16 -16
- package/dist/core/logger/filters.js.map +1 -1
- package/dist/core/logger/index.d.ts +3 -3
- package/dist/core/logger/logger.d.ts +1 -1
- package/dist/core/logger/logger.js +48 -59
- package/dist/core/logger/logger.js.map +1 -1
- package/dist/core/logger/outputs.d.ts +4 -4
- package/dist/core/logger/outputs.js +16 -20
- package/dist/core/logger/outputs.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cache/file.d.ts +1 -1
- package/dist/core/middleware/built-in/adapters/cache/file.js +19 -19
- package/dist/core/middleware/built-in/adapters/cache/file.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cache/index.d.ts +4 -4
- package/dist/core/middleware/built-in/adapters/cache/index.js +3 -3
- package/dist/core/middleware/built-in/adapters/cache/index.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cache/memory.d.ts +1 -1
- package/dist/core/middleware/built-in/adapters/cache/memory.js +5 -5
- package/dist/core/middleware/built-in/adapters/cache/memory.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cache/redis.d.ts +1 -1
- package/dist/core/middleware/built-in/adapters/cache/redis.js +18 -18
- package/dist/core/middleware/built-in/adapters/cache/redis.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/azure.d.ts +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/azure.js +8 -8
- package/dist/core/middleware/built-in/adapters/cdn/azure.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/cloudflare.d.ts +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/cloudflare.js +14 -14
- package/dist/core/middleware/built-in/adapters/cdn/cloudflare.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/cloudfront.d.ts +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/cloudfront.js +13 -15
- package/dist/core/middleware/built-in/adapters/cdn/cloudfront.js.map +1 -1
- package/dist/core/middleware/built-in/adapters/cdn/index.d.ts +4 -4
- package/dist/core/middleware/built-in/adapters/cdn/index.js +3 -3
- package/dist/core/middleware/built-in/adapters/index.d.ts +4 -4
- package/dist/core/middleware/built-in/auth.d.ts +1 -1
- package/dist/core/middleware/built-in/auth.js +14 -14
- package/dist/core/middleware/built-in/cache.d.ts +2 -2
- package/dist/core/middleware/built-in/cache.js +43 -45
- package/dist/core/middleware/built-in/cache.js.map +1 -1
- package/dist/core/middleware/built-in/cdn.d.ts +2 -2
- package/dist/core/middleware/built-in/cdn.js +27 -29
- package/dist/core/middleware/built-in/cdn.js.map +1 -1
- package/dist/core/middleware/built-in/cookie.d.ts +2 -2
- package/dist/core/middleware/built-in/cookie.js +17 -17
- package/dist/core/middleware/built-in/cookie.js.map +1 -1
- package/dist/core/middleware/built-in/cors.d.ts +1 -1
- package/dist/core/middleware/built-in/cors.js +13 -13
- package/dist/core/middleware/built-in/csp.d.ts +1 -1
- package/dist/core/middleware/built-in/csp.js +22 -25
- package/dist/core/middleware/built-in/csp.js.map +1 -1
- package/dist/core/middleware/built-in/csrf.d.ts +1 -1
- package/dist/core/middleware/built-in/csrf.js +21 -24
- package/dist/core/middleware/built-in/csrf.js.map +1 -1
- package/dist/core/middleware/built-in/error-tracker.js +2 -2
- package/dist/core/middleware/built-in/index.d.ts +14 -14
- package/dist/core/middleware/built-in/performance-monitor.js +2 -2
- package/dist/core/middleware/built-in/rate-limit.d.ts +1 -1
- package/dist/core/middleware/built-in/rate-limit.js +12 -12
- package/dist/core/middleware/built-in/request-logger.js.map +1 -1
- package/dist/core/middleware/built-in/session.d.ts +5 -5
- package/dist/core/middleware/built-in/session.js +35 -38
- package/dist/core/middleware/built-in/session.js.map +1 -1
- package/dist/core/middleware/built-in/sse.d.ts +1 -1
- package/dist/core/middleware/built-in/sse.js +20 -22
- package/dist/core/middleware/built-in/sse.js.map +1 -1
- package/dist/core/middleware/built-in/validation.d.ts +1 -1
- package/dist/core/middleware/built-in/validation.js +13 -13
- package/dist/core/middleware/index.d.ts +5 -5
- package/dist/core/middleware/index.js +16 -16
- package/dist/core/middleware/index.js.map +1 -1
- package/dist/core/modules/auto-discovery.d.ts +2 -2
- package/dist/core/modules/auto-discovery.js +12 -13
- package/dist/core/modules/auto-discovery.js.map +1 -1
- package/dist/core/modules/index.d.ts +2 -2
- package/dist/core/modules/index.js.map +1 -1
- package/dist/core/modules/modules.d.ts +3 -3
- package/dist/core/modules/modules.js +3 -6
- package/dist/core/modules/modules.js.map +1 -1
- package/dist/core/networking/index.d.ts +2 -2
- package/dist/core/networking/index.js.map +1 -1
- package/dist/core/networking/service-discovery.d.ts +2 -2
- package/dist/core/networking/service-discovery.js +27 -27
- package/dist/core/networking/service-discovery.js.map +1 -1
- package/dist/core/networking/websocket-manager.d.ts +3 -3
- package/dist/core/networking/websocket-manager.js +15 -16
- package/dist/core/networking/websocket-manager.js.map +1 -1
- package/dist/core/routing/app-integration.d.ts +2 -2
- package/dist/core/routing/app-integration.js +13 -13
- package/dist/core/routing/app-integration.js.map +1 -1
- package/dist/core/routing/index.d.ts +3 -3
- package/dist/core/routing/index.js +43 -52
- package/dist/core/routing/index.js.map +1 -1
- package/dist/core/runtime/aws-lambda-adapter.d.ts +3 -3
- package/dist/core/runtime/aws-lambda-adapter.js +14 -16
- package/dist/core/runtime/aws-lambda-adapter.js.map +1 -1
- package/dist/core/runtime/base-adapter.d.ts +2 -2
- package/dist/core/runtime/base-adapter.js +11 -12
- package/dist/core/runtime/base-adapter.js.map +1 -1
- package/dist/core/runtime/cloudflare-workers-adapter.d.ts +3 -3
- package/dist/core/runtime/cloudflare-workers-adapter.js +20 -21
- package/dist/core/runtime/cloudflare-workers-adapter.js.map +1 -1
- package/dist/core/runtime/index.d.ts +9 -9
- package/dist/core/runtime/index.js +4 -4
- package/dist/core/runtime/index.js.map +1 -1
- package/dist/core/runtime/node-adapter.d.ts +5 -5
- package/dist/core/runtime/node-adapter.js +35 -35
- package/dist/core/runtime/node-adapter.js.map +1 -1
- package/dist/core/runtime/vercel-edge-adapter.d.ts +3 -3
- package/dist/core/runtime/vercel-edge-adapter.js +12 -15
- package/dist/core/runtime/vercel-edge-adapter.js.map +1 -1
- package/dist/core/utilities/circuit-breaker.js +6 -6
- package/dist/core/utilities/container.d.ts +1 -1
- package/dist/core/utilities/container.js +17 -22
- package/dist/core/utilities/container.js.map +1 -1
- package/dist/core/utilities/hooks.d.ts +3 -3
- package/dist/core/utilities/hooks.js +11 -11
- package/dist/core/utilities/hooks.js.map +1 -1
- package/dist/core/utilities/index.d.ts +4 -4
- package/dist/core/validation/index.d.ts +3 -3
- package/dist/core/validation/index.js +15 -15
- package/dist/core/validation/index.js.map +1 -1
- package/dist/index.d.ts +41 -30
- package/dist/index.js +50 -1
- package/dist/index.js.map +1 -1
- package/dist/moro.d.ts +14 -14
- package/dist/moro.js +79 -88
- package/dist/moro.js.map +1 -1
- package/dist/types/cache.d.ts +1 -1
- package/dist/types/core.d.ts +2 -2
- package/dist/types/events.d.ts +19 -19
- package/dist/types/hooks.d.ts +1 -1
- package/dist/types/http.d.ts +2 -2
- package/dist/types/logger.d.ts +3 -3
- package/dist/types/module.d.ts +2 -2
- package/dist/types/runtime.d.ts +2 -2
- package/dist/types/session.d.ts +4 -4
- package/package.json +183 -165
- package/src/core/config/index.ts +7 -9
- package/src/core/config/loader.ts +86 -158
- package/src/core/config/schema.ts +59 -122
- package/src/core/config/utils.ts +27 -45
- package/src/core/database/adapters/drizzle.ts +53 -75
- package/src/core/database/adapters/index.ts +26 -29
- package/src/core/database/adapters/mongodb.ts +31 -54
- package/src/core/database/adapters/mysql.ts +40 -50
- package/src/core/database/adapters/postgresql.ts +32 -42
- package/src/core/database/adapters/redis.ts +31 -36
- package/src/core/database/adapters/sqlite.ts +43 -51
- package/src/core/database/index.ts +2 -2
- package/src/core/docs/index.ts +25 -39
- package/src/core/docs/openapi-generator.ts +104 -117
- package/src/core/docs/simple-docs.ts +29 -39
- package/src/core/docs/swagger-ui.ts +57 -76
- package/src/core/docs/zod-to-openapi.ts +121 -153
- package/src/core/events/event-bus.ts +22 -45
- package/src/core/events/index.ts +2 -2
- package/src/core/framework.ts +119 -197
- package/src/core/http/http-server.ts +260 -360
- package/src/core/http/index.ts +3 -8
- package/src/core/http/router.ts +19 -31
- package/src/core/logger/filters.ts +19 -22
- package/src/core/logger/index.ts +3 -3
- package/src/core/logger/logger.ts +59 -100
- package/src/core/logger/outputs.ts +23 -27
- package/src/core/middleware/built-in/adapters/cache/file.ts +21 -23
- package/src/core/middleware/built-in/adapters/cache/index.ts +11 -14
- package/src/core/middleware/built-in/adapters/cache/memory.ts +7 -7
- package/src/core/middleware/built-in/adapters/cache/redis.ts +21 -24
- package/src/core/middleware/built-in/adapters/cdn/azure.ts +10 -18
- package/src/core/middleware/built-in/adapters/cdn/cloudflare.ts +19 -36
- package/src/core/middleware/built-in/adapters/cdn/cloudfront.ts +17 -26
- package/src/core/middleware/built-in/adapters/cdn/index.ts +10 -10
- package/src/core/middleware/built-in/adapters/index.ts +4 -4
- package/src/core/middleware/built-in/auth.ts +16 -16
- package/src/core/middleware/built-in/cache.ts +50 -67
- package/src/core/middleware/built-in/cdn.ts +34 -61
- package/src/core/middleware/built-in/cookie.ts +23 -28
- package/src/core/middleware/built-in/cors.ts +17 -17
- package/src/core/middleware/built-in/csp.ts +25 -31
- package/src/core/middleware/built-in/csrf.ts +24 -29
- package/src/core/middleware/built-in/error-tracker.ts +3 -3
- package/src/core/middleware/built-in/index.ts +28 -28
- package/src/core/middleware/built-in/performance-monitor.ts +4 -4
- package/src/core/middleware/built-in/rate-limit.ts +15 -15
- package/src/core/middleware/built-in/request-logger.ts +1 -3
- package/src/core/middleware/built-in/session.ts +47 -70
- package/src/core/middleware/built-in/sse.ts +23 -28
- package/src/core/middleware/built-in/validation.ts +15 -15
- package/src/core/middleware/index.ts +26 -37
- package/src/core/modules/auto-discovery.ts +21 -31
- package/src/core/modules/index.ts +2 -5
- package/src/core/modules/modules.ts +11 -20
- package/src/core/networking/index.ts +2 -6
- package/src/core/networking/service-discovery.ts +41 -61
- package/src/core/networking/websocket-manager.ts +27 -36
- package/src/core/routing/app-integration.ts +19 -32
- package/src/core/routing/index.ts +57 -88
- package/src/core/runtime/aws-lambda-adapter.ts +20 -30
- package/src/core/runtime/base-adapter.ts +17 -27
- package/src/core/runtime/cloudflare-workers-adapter.ts +28 -42
- package/src/core/runtime/index.ts +21 -33
- package/src/core/runtime/node-adapter.ts +59 -73
- package/src/core/runtime/vercel-edge-adapter.ts +18 -29
- package/src/core/utilities/circuit-breaker.ts +7 -7
- package/src/core/utilities/container.ts +52 -89
- package/src/core/utilities/hooks.ts +17 -23
- package/src/core/utilities/index.ts +4 -4
- package/src/core/validation/index.ts +25 -51
- package/src/index.ts +104 -60
- package/src/moro.ts +119 -191
- package/src/types/cache.ts +1 -1
- package/src/types/core.ts +2 -2
- package/src/types/database.ts +2 -10
- package/src/types/events.ts +23 -31
- package/src/types/hooks.ts +1 -1
- package/src/types/http.ts +5 -8
- package/src/types/logger.ts +7 -23
- package/src/types/module.ts +2 -2
- package/src/types/runtime.ts +6 -21
- package/src/types/session.ts +4 -4
|
@@ -2,35 +2,33 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.sse = void 0;
|
|
4
4
|
const logger_1 = require("../../logger");
|
|
5
|
-
const logger = (0, logger_1.createFrameworkLogger)(
|
|
5
|
+
const logger = (0, logger_1.createFrameworkLogger)('SSEMiddleware');
|
|
6
6
|
const sse = (options = {}) => ({
|
|
7
|
-
name:
|
|
8
|
-
version:
|
|
7
|
+
name: 'sse',
|
|
8
|
+
version: '1.0.0',
|
|
9
9
|
metadata: {
|
|
10
|
-
name:
|
|
11
|
-
version:
|
|
12
|
-
description:
|
|
13
|
-
author:
|
|
10
|
+
name: 'sse',
|
|
11
|
+
version: '1.0.0',
|
|
12
|
+
description: 'Server-Sent Events middleware with heartbeat and retry support',
|
|
13
|
+
author: 'MoroJS Team',
|
|
14
14
|
},
|
|
15
15
|
install: async (hooks, middlewareOptions = {}) => {
|
|
16
|
-
logger.debug(
|
|
17
|
-
hooks.before(
|
|
16
|
+
logger.debug('Installing SSE middleware', 'Installation');
|
|
17
|
+
hooks.before('request', async (context) => {
|
|
18
18
|
const req = context.request;
|
|
19
19
|
const res = context.response;
|
|
20
20
|
// Only handle SSE requests
|
|
21
|
-
if (!req.headers.accept?.includes(
|
|
21
|
+
if (!req.headers.accept?.includes('text/event-stream')) {
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
24
|
-
logger.debug(
|
|
24
|
+
logger.debug('Setting up SSE connection', 'SSESetup');
|
|
25
25
|
// Set SSE headers
|
|
26
26
|
res.writeHead(200, {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
Connection:
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
? "Cache-Control"
|
|
33
|
-
: undefined,
|
|
27
|
+
'Content-Type': 'text/event-stream',
|
|
28
|
+
'Cache-Control': 'no-cache',
|
|
29
|
+
Connection: 'keep-alive',
|
|
30
|
+
'Access-Control-Allow-Origin': options.cors ? '*' : undefined,
|
|
31
|
+
'Access-Control-Allow-Headers': options.cors ? 'Cache-Control' : undefined,
|
|
34
32
|
});
|
|
35
33
|
// Add SSE methods to response
|
|
36
34
|
res.sendEvent = (data, event, id) => {
|
|
@@ -38,7 +36,7 @@ const sse = (options = {}) => ({
|
|
|
38
36
|
res.write(`id: ${id}\n`);
|
|
39
37
|
if (event)
|
|
40
38
|
res.write(`event: ${event}\n`);
|
|
41
|
-
res.write(`data: ${typeof data ===
|
|
39
|
+
res.write(`data: ${typeof data === 'string' ? data : JSON.stringify(data)}\n\n`);
|
|
42
40
|
};
|
|
43
41
|
res.sendComment = (comment) => {
|
|
44
42
|
res.write(`: ${comment}\n\n`);
|
|
@@ -50,7 +48,7 @@ const sse = (options = {}) => ({
|
|
|
50
48
|
let heartbeatInterval = null;
|
|
51
49
|
if (options.heartbeat) {
|
|
52
50
|
heartbeatInterval = setInterval(() => {
|
|
53
|
-
res.sendComment(
|
|
51
|
+
res.sendComment('heartbeat');
|
|
54
52
|
}, options.heartbeat);
|
|
55
53
|
}
|
|
56
54
|
// Set retry if configured
|
|
@@ -58,11 +56,11 @@ const sse = (options = {}) => ({
|
|
|
58
56
|
res.sendRetry(options.retry);
|
|
59
57
|
}
|
|
60
58
|
// Clean up on close
|
|
61
|
-
req.on(
|
|
59
|
+
req.on('close', () => {
|
|
62
60
|
if (heartbeatInterval) {
|
|
63
61
|
clearInterval(heartbeatInterval);
|
|
64
62
|
}
|
|
65
|
-
logger.debug(
|
|
63
|
+
logger.debug('SSE connection closed', 'SSECleanup');
|
|
66
64
|
});
|
|
67
65
|
// Mark that this middleware handled the request
|
|
68
66
|
context.handled = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse.js","sourceRoot":"","sources":["../../../../src/core/middleware/built-in/sse.ts"],"names":[],"mappings":";;;AAEA,yCAAqD;AAErD,MAAM,MAAM,GAAG,IAAA,8BAAqB,EAAC,eAAe,CAAC,CAAC;AAE/C,MAAM,GAAG,GAAG,CACjB,UAII,EAAE,EACe,EAAE,CAAC,CAAC;IACzB,IAAI,EAAE,KAAK;IACX,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE;QACR,IAAI,EAAE,KAAK;QACX,OAAO,EAAE,OAAO;QAChB,WAAW,
|
|
1
|
+
{"version":3,"file":"sse.js","sourceRoot":"","sources":["../../../../src/core/middleware/built-in/sse.ts"],"names":[],"mappings":";;;AAEA,yCAAqD;AAErD,MAAM,MAAM,GAAG,IAAA,8BAAqB,EAAC,eAAe,CAAC,CAAC;AAE/C,MAAM,GAAG,GAAG,CACjB,UAII,EAAE,EACe,EAAE,CAAC,CAAC;IACzB,IAAI,EAAE,KAAK;IACX,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE;QACR,IAAI,EAAE,KAAK;QACX,OAAO,EAAE,OAAO;QAChB,WAAW,EAAE,gEAAgE;QAC7E,MAAM,EAAE,aAAa;KACtB;IAED,OAAO,EAAE,KAAK,EAAE,KAAU,EAAE,oBAAyB,EAAE,EAAE,EAAE;QACzD,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,cAAc,CAAC,CAAC;QAE1D,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,OAAoB,EAAE,EAAE;YACrD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAc,CAAC;YACnC,MAAM,GAAG,GAAG,OAAO,CAAC,QAAe,CAAC;YAEpC,2BAA2B;YAC3B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBACvD,OAAO;YACT,CAAC;YAED,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,UAAU,CAAC,CAAC;YAEtD,kBAAkB;YAClB,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;gBACjB,cAAc,EAAE,mBAAmB;gBACnC,eAAe,EAAE,UAAU;gBAC3B,UAAU,EAAE,YAAY;gBACxB,6BAA6B,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;gBAC7D,8BAA8B,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;aAC3E,CAAC,CAAC;YAEH,8BAA8B;YAC9B,GAAG,CAAC,SAAS,GAAG,CAAC,IAAS,EAAE,KAAc,EAAE,EAAW,EAAE,EAAE;gBACzD,IAAI,EAAE;oBAAE,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBACjC,IAAI,KAAK;oBAAE,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC;gBAC1C,GAAG,CAAC,KAAK,CAAC,SAAS,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnF,CAAC,CAAC;YAEF,GAAG,CAAC,WAAW,GAAG,CAAC,OAAe,EAAE,EAAE;gBACpC,GAAG,CAAC,KAAK,CAAC,KAAK,OAAO,MAAM,CAAC,CAAC;YAChC,CAAC,CAAC;YAEF,GAAG,CAAC,SAAS,GAAG,CAAC,EAAU,EAAE,EAAE;gBAC7B,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAChC,CAAC,CAAC;YAEF,iCAAiC;YACjC,IAAI,iBAAiB,GAA0B,IAAI,CAAC;YACpD,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;gBACtB,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;oBACnC,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBAC/B,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;YACxB,CAAC;YAED,0BAA0B;YAC1B,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBAClB,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;YAED,oBAAoB;YACpB,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACnB,IAAI,iBAAiB,EAAE,CAAC;oBACtB,aAAa,CAAC,iBAAiB,CAAC,CAAC;gBACnC,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;YAEH,gDAAgD;YAC/C,OAAe,CAAC,OAAO,GAAG,IAAI,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AA/EU,QAAA,GAAG,OA+Eb"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { MiddlewareInterface } from
|
|
1
|
+
import { MiddlewareInterface } from '../../../types/hooks';
|
|
2
2
|
export declare const validation: () => MiddlewareInterface;
|
|
@@ -2,25 +2,25 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.validation = void 0;
|
|
4
4
|
const logger_1 = require("../../logger");
|
|
5
|
-
const logger = (0, logger_1.createFrameworkLogger)(
|
|
5
|
+
const logger = (0, logger_1.createFrameworkLogger)('ValidationMiddleware');
|
|
6
6
|
const validation = () => ({
|
|
7
|
-
name:
|
|
8
|
-
version:
|
|
7
|
+
name: 'validation',
|
|
8
|
+
version: '1.0.0',
|
|
9
9
|
metadata: {
|
|
10
|
-
name:
|
|
11
|
-
version:
|
|
12
|
-
description:
|
|
13
|
-
author:
|
|
10
|
+
name: 'validation',
|
|
11
|
+
version: '1.0.0',
|
|
12
|
+
description: 'Request validation middleware with content type checking',
|
|
13
|
+
author: 'MoroJS Team',
|
|
14
14
|
},
|
|
15
15
|
install: async (hooks, options = {}) => {
|
|
16
|
-
logger.debug(
|
|
17
|
-
hooks.before(
|
|
16
|
+
logger.debug('Installing validation middleware', 'Installation');
|
|
17
|
+
hooks.before('request', async (context) => {
|
|
18
18
|
const request = context.request;
|
|
19
19
|
// Basic content type validation
|
|
20
|
-
if (request.method ===
|
|
21
|
-
const contentType = request.headers[
|
|
22
|
-
if (contentType && contentType.includes(
|
|
23
|
-
logger.debug(
|
|
20
|
+
if (request.method === 'POST' || request.method === 'PUT') {
|
|
21
|
+
const contentType = request.headers['content-type'];
|
|
22
|
+
if (contentType && contentType.includes('application/json')) {
|
|
23
|
+
logger.debug('Validation: JSON content type verified', 'ContentType');
|
|
24
24
|
// Additional validation logic would go here
|
|
25
25
|
}
|
|
26
26
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { EventEmitter } from
|
|
2
|
-
import { MiddlewareInterface, SimpleMiddlewareFunction } from
|
|
3
|
-
export type { MiddlewareInterface, MoroMiddleware } from
|
|
1
|
+
import { EventEmitter } from 'events';
|
|
2
|
+
import { MiddlewareInterface, SimpleMiddlewareFunction } from '../../types/hooks';
|
|
3
|
+
export type { MiddlewareInterface, MoroMiddleware } from '../../types/hooks';
|
|
4
4
|
export declare class MiddlewareManager extends EventEmitter {
|
|
5
5
|
private middleware;
|
|
6
6
|
private simpleMiddleware;
|
|
@@ -17,5 +17,5 @@ export declare class MiddlewareManager extends EventEmitter {
|
|
|
17
17
|
installWithDependencies(middleware: MiddlewareInterface[], options?: Record<string, any>): Promise<void>;
|
|
18
18
|
private topologicalSort;
|
|
19
19
|
}
|
|
20
|
-
export { builtInMiddleware, simpleMiddleware } from
|
|
21
|
-
export * from
|
|
20
|
+
export { builtInMiddleware, simpleMiddleware } from './built-in';
|
|
21
|
+
export * from './built-in';
|
|
@@ -24,7 +24,7 @@ class MiddlewareManager extends events_1.EventEmitter {
|
|
|
24
24
|
super();
|
|
25
25
|
this.middleware = new Map();
|
|
26
26
|
this.simpleMiddleware = new Map();
|
|
27
|
-
this.logger = (0, logger_1.createFrameworkLogger)(
|
|
27
|
+
this.logger = (0, logger_1.createFrameworkLogger)('Middleware');
|
|
28
28
|
this.hooks = new utilities_1.HookManager();
|
|
29
29
|
}
|
|
30
30
|
// Register middleware without installing
|
|
@@ -33,22 +33,22 @@ class MiddlewareManager extends events_1.EventEmitter {
|
|
|
33
33
|
throw new Error(`Middleware ${name} is already registered`);
|
|
34
34
|
}
|
|
35
35
|
this.middleware.set(name, middleware);
|
|
36
|
-
this.logger.debug(`Registered middleware: ${name}`,
|
|
37
|
-
this.emit(
|
|
36
|
+
this.logger.debug(`Registered middleware: ${name}`, 'Registration');
|
|
37
|
+
this.emit('registered', { name, middleware });
|
|
38
38
|
}
|
|
39
39
|
// Install simple function-style middleware
|
|
40
40
|
install(middleware, options = {}) {
|
|
41
|
-
if (typeof middleware ===
|
|
41
|
+
if (typeof middleware === 'function') {
|
|
42
42
|
// Simple function-style middleware
|
|
43
|
-
const simpleName = middleware.name ||
|
|
44
|
-
this.logger.debug(`Installing simple middleware: ${simpleName}`,
|
|
43
|
+
const simpleName = middleware.name || 'anonymous';
|
|
44
|
+
this.logger.debug(`Installing simple middleware: ${simpleName}`, 'Installation');
|
|
45
45
|
this.simpleMiddleware.set(simpleName, middleware);
|
|
46
|
-
this.emit(
|
|
47
|
-
this.logger.info(`Simple middleware installed: ${simpleName}`,
|
|
46
|
+
this.emit('installed', { name: simpleName, type: 'simple' });
|
|
47
|
+
this.logger.info(`Simple middleware installed: ${simpleName}`, 'Installation');
|
|
48
48
|
return;
|
|
49
49
|
}
|
|
50
50
|
// Advanced middleware with dependencies and lifecycle
|
|
51
|
-
const name = middleware.metadata?.name ||
|
|
51
|
+
const name = middleware.metadata?.name || 'unknown';
|
|
52
52
|
if (this.middleware.has(name)) {
|
|
53
53
|
throw new Error(`Middleware ${name} is already installed`);
|
|
54
54
|
}
|
|
@@ -62,13 +62,13 @@ class MiddlewareManager extends events_1.EventEmitter {
|
|
|
62
62
|
}
|
|
63
63
|
// Store middleware
|
|
64
64
|
this.middleware.set(name, middleware);
|
|
65
|
-
this.logger.debug(`Installing middleware: ${name}`,
|
|
65
|
+
this.logger.debug(`Installing middleware: ${name}`, 'Installation');
|
|
66
66
|
// Initialize middleware
|
|
67
67
|
if (middleware.install) {
|
|
68
68
|
middleware.install(this.hooks, options);
|
|
69
69
|
}
|
|
70
|
-
this.emit(
|
|
71
|
-
this.logger.info(`Middleware installed: ${name}`,
|
|
70
|
+
this.emit('installed', { name, middleware, options });
|
|
71
|
+
this.logger.info(`Middleware installed: ${name}`, 'Installation');
|
|
72
72
|
}
|
|
73
73
|
// Uninstall middleware and clean up
|
|
74
74
|
uninstall(name) {
|
|
@@ -76,14 +76,14 @@ class MiddlewareManager extends events_1.EventEmitter {
|
|
|
76
76
|
throw new Error(`Middleware ${name} is not installed`);
|
|
77
77
|
}
|
|
78
78
|
const middleware = this.middleware.get(name);
|
|
79
|
-
this.logger.debug(`Uninstalling middleware: ${name}`,
|
|
79
|
+
this.logger.debug(`Uninstalling middleware: ${name}`, 'Uninstallation');
|
|
80
80
|
// Call cleanup if available
|
|
81
81
|
if (middleware.uninstall) {
|
|
82
82
|
middleware.uninstall(this.hooks);
|
|
83
83
|
}
|
|
84
84
|
this.middleware.delete(name);
|
|
85
|
-
this.emit(
|
|
86
|
-
this.logger.info(`Middleware uninstalled: ${name}`,
|
|
85
|
+
this.emit('uninstalled', { name, middleware });
|
|
86
|
+
this.logger.info(`Middleware uninstalled: ${name}`, 'Uninstallation');
|
|
87
87
|
}
|
|
88
88
|
// Get installed middleware
|
|
89
89
|
getInstalled() {
|
|
@@ -124,7 +124,7 @@ class MiddlewareManager extends events_1.EventEmitter {
|
|
|
124
124
|
// Visit dependencies first
|
|
125
125
|
if (middlewareItem.dependencies) {
|
|
126
126
|
for (const depName of middlewareItem.dependencies) {
|
|
127
|
-
const dependency = middleware.find(
|
|
127
|
+
const dependency = middleware.find(m => m.name === depName);
|
|
128
128
|
if (dependency) {
|
|
129
129
|
visit(dependency);
|
|
130
130
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6BAA6B;AAC7B,mCAAsC;AACtC,4CAA2C;AAQ3C,sCAAkD;AAKlD,MAAa,iBAAkB,SAAQ,qBAAY;IAMjD;QACE,KAAK,EAAE,CAAC;QANF,eAAU,GAAG,IAAI,GAAG,EAA+B,CAAC;QACpD,qBAAgB,GAAG,IAAI,GAAG,EAAoC,CAAC;QAE/D,WAAM,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;QAInD,IAAI,CAAC,KAAK,GAAG,IAAI,uBAAW,EAAE,CAAC;IACjC,CAAC;IAED,yCAAyC;IACzC,QAAQ,CAAC,IAAY,EAAE,UAA+B;QACpD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,wBAAwB,CAAC,CAAC;QAC9D,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,EAAE,EAAE,cAAc,CAAC,CAAC;QACpE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,2CAA2C;IAC3C,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/middleware/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ModuleConfig } from
|
|
2
|
-
import { DiscoveryOptions } from
|
|
1
|
+
import { ModuleConfig } from '../../types/module';
|
|
2
|
+
import { DiscoveryOptions } from '../../types/discovery';
|
|
3
3
|
export declare class ModuleDiscovery {
|
|
4
4
|
private baseDir;
|
|
5
5
|
private options;
|
|
@@ -45,7 +45,7 @@ class ModuleDiscovery {
|
|
|
45
45
|
this.options = {
|
|
46
46
|
pattern: /\.(module|config)\.(ts|js)$/,
|
|
47
47
|
recursive: true,
|
|
48
|
-
extensions: [
|
|
48
|
+
extensions: ['.ts', '.js'],
|
|
49
49
|
...options,
|
|
50
50
|
};
|
|
51
51
|
}
|
|
@@ -68,7 +68,7 @@ class ModuleDiscovery {
|
|
|
68
68
|
return modules;
|
|
69
69
|
}
|
|
70
70
|
// Find modules by directory structure
|
|
71
|
-
async discoverModuleDirectories(modulesDir =
|
|
71
|
+
async discoverModuleDirectories(modulesDir = 'src/modules') {
|
|
72
72
|
const modules = [];
|
|
73
73
|
const fullPath = (0, path_1.join)(this.baseDir, modulesDir);
|
|
74
74
|
try {
|
|
@@ -79,7 +79,7 @@ class ModuleDiscovery {
|
|
|
79
79
|
for (const item of items) {
|
|
80
80
|
const itemPath = (0, path_1.join)(fullPath, item);
|
|
81
81
|
if ((0, fs_1.statSync)(itemPath).isDirectory()) {
|
|
82
|
-
const indexPath = (0, path_1.join)(itemPath,
|
|
82
|
+
const indexPath = (0, path_1.join)(itemPath, 'index.ts');
|
|
83
83
|
try {
|
|
84
84
|
if ((0, fs_1.statSync)(indexPath).isFile()) {
|
|
85
85
|
const module = await this.loadModule(indexPath);
|
|
@@ -91,7 +91,7 @@ class ModuleDiscovery {
|
|
|
91
91
|
}
|
|
92
92
|
catch {
|
|
93
93
|
// Try alternate patterns
|
|
94
|
-
const alternates = [
|
|
94
|
+
const alternates = ['module.ts', `${item}.module.ts`, 'config.ts'];
|
|
95
95
|
for (const alt of alternates) {
|
|
96
96
|
const altPath = (0, path_1.join)(itemPath, alt);
|
|
97
97
|
try {
|
|
@@ -121,7 +121,7 @@ class ModuleDiscovery {
|
|
|
121
121
|
findModuleFiles() {
|
|
122
122
|
const files = [];
|
|
123
123
|
this.scanDirectory(this.baseDir, files);
|
|
124
|
-
return files.filter(
|
|
124
|
+
return files.filter(file => this.options.pattern?.test(file));
|
|
125
125
|
}
|
|
126
126
|
// Recursively scan directories for module files
|
|
127
127
|
scanDirectory(dir, files) {
|
|
@@ -132,8 +132,7 @@ class ModuleDiscovery {
|
|
|
132
132
|
const stat = (0, fs_1.statSync)(fullPath);
|
|
133
133
|
if (stat.isDirectory()) {
|
|
134
134
|
// Skip node_modules and other common directories
|
|
135
|
-
if (![
|
|
136
|
-
this.options.recursive) {
|
|
135
|
+
if (!['node_modules', '.git', 'dist', 'build'].includes(item) && this.options.recursive) {
|
|
137
136
|
this.scanDirectory(fullPath, files);
|
|
138
137
|
}
|
|
139
138
|
}
|
|
@@ -159,7 +158,7 @@ class ModuleDiscovery {
|
|
|
159
158
|
module.module,
|
|
160
159
|
module.config,
|
|
161
160
|
module,
|
|
162
|
-
...Object.values(module).filter(
|
|
161
|
+
...Object.values(module).filter(exp => exp && typeof exp === 'object' && 'name' in exp && 'version' in exp),
|
|
163
162
|
];
|
|
164
163
|
for (const candidate of candidates) {
|
|
165
164
|
if (this.isValidModule(candidate)) {
|
|
@@ -175,18 +174,18 @@ class ModuleDiscovery {
|
|
|
175
174
|
// Validate that an object is a valid ModuleConfig
|
|
176
175
|
isValidModule(obj) {
|
|
177
176
|
return (obj &&
|
|
178
|
-
typeof obj ===
|
|
179
|
-
typeof obj.name ===
|
|
180
|
-
typeof obj.version ===
|
|
177
|
+
typeof obj === 'object' &&
|
|
178
|
+
typeof obj.name === 'string' &&
|
|
179
|
+
typeof obj.version === 'string' &&
|
|
181
180
|
(obj.routes === undefined || Array.isArray(obj.routes)) &&
|
|
182
181
|
(obj.websockets === undefined || Array.isArray(obj.websockets)) &&
|
|
183
182
|
(obj.services === undefined || Array.isArray(obj.services)));
|
|
184
183
|
}
|
|
185
184
|
// Watch for module changes (for development)
|
|
186
185
|
watchModules(callback) {
|
|
187
|
-
const fs = require(
|
|
186
|
+
const fs = require('fs');
|
|
188
187
|
const modulePaths = this.findModuleFiles();
|
|
189
|
-
modulePaths.forEach(
|
|
188
|
+
modulePaths.forEach(path => {
|
|
190
189
|
try {
|
|
191
190
|
fs.watchFile(path, async () => {
|
|
192
191
|
console.log(`Module file changed: ${path}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-discovery.js","sourceRoot":"","sources":["../../../src/core/modules/auto-discovery.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"auto-discovery.js","sourceRoot":"","sources":["../../../src/core/modules/auto-discovery.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+LA,kDAMC;AAED,sEAMC;AA7MD,yCAAyC;AACzC,2BAA2C;AAC3C,+BAAqC;AAIrC,MAAa,eAAe;IAI1B,YAAY,UAAkB,OAAO,CAAC,GAAG,EAAE,EAAE,UAA4B,EAAE;QACzE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG;YACb,OAAO,EAAE,6BAA6B;YACtC,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;YAC1B,GAAG,OAAO;SACX,CAAC;IACJ,CAAC;IAED,0CAA0C;IAC1C,KAAK,CAAC,eAAe;QACnB,MAAM,OAAO,GAAmB,EAAE,CAAC;QACnC,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAE3C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gBACjD,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBACrB,OAAO,CAAC,GAAG,CACT,2BAA2B,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,SAAS,UAAU,EAAE,CAC9E,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,8BAA8B,UAAU,GAAG,EAAE,KAAK,CAAC,CAAC;YACnE,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,sCAAsC;IACtC,KAAK,CAAC,yBAAyB,CAAC,aAAqB,aAAa;QAChE,MAAM,OAAO,GAAmB,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAEhD,IAAI,CAAC;YACH,IAAI,CAAC,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;gBACtC,OAAO,OAAO,CAAC;YACjB,CAAC;YAED,MAAM,KAAK,GAAG,IAAA,gBAAW,EAAC,QAAQ,CAAC,CAAC;YAEpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAEtC,IAAI,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;oBACrC,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;oBAE7C,IAAI,CAAC;wBACH,IAAI,IAAA,aAAQ,EAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;4BACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;4BAChD,IAAI,MAAM,EAAE,CAAC;gCACX,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gCACrB,OAAO,CAAC,GAAG,CAAC,qCAAqC,MAAM,CAAC,IAAI,SAAS,IAAI,GAAG,CAAC,CAAC;4BAChF,CAAC;wBACH,CAAC;oBACH,CAAC;oBAAC,MAAM,CAAC;wBACP,yBAAyB;wBACzB,MAAM,UAAU,GAAG,CAAC,WAAW,EAAE,GAAG,IAAI,YAAY,EAAE,WAAW,CAAC,CAAC;wBAEnE,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;4BAC7B,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;4BACpC,IAAI,CAAC;gCACH,IAAI,IAAA,aAAQ,EAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;oCAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oCAC9C,IAAI,MAAM,EAAE,CAAC;wCACX,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;wCACrB,OAAO,CAAC,GAAG,CAAC,2BAA2B,MAAM,CAAC,IAAI,SAAS,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;wCAC1E,MAAM;oCACR,CAAC;gCACH,CAAC;4BACH,CAAC;4BAAC,MAAM,CAAC;gCACP,kBAAkB;4BACpB,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,uCAAuC;QACzC,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,6CAA6C;IACrC,eAAe;QACrB,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACxC,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,gDAAgD;IACxC,aAAa,CAAC,GAAW,EAAE,KAAe;QAChD,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAA,gBAAW,EAAC,GAAG,CAAC,CAAC;YAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACjC,MAAM,IAAI,GAAG,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC;gBAEhC,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;oBACvB,iDAAiD;oBACjD,IAAI,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;wBACxF,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;oBACtC,CAAC;gBACH,CAAC;qBAAM,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;oBACzB,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;oBAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC3C,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACvB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,iCAAiC;QACnC,CAAC;IACH,CAAC;IAED,iCAAiC;IACzB,KAAK,CAAC,UAAU,CAAC,UAAkB;QACzC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,yBAAa,UAAU,uCAAC,CAAC;YAExC,gCAAgC;YAChC,MAAM,UAAU,GAAG;gBACjB,MAAM,CAAC,OAAO;gBACd,MAAM,CAAC,MAAM;gBACb,MAAM,CAAC,MAAM;gBACb,MAAM;gBACN,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAC7B,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,CAC3E;aACF,CAAC;YAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,IAAI,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;oBAClC,OAAO,SAAyB,CAAC;gBACnC,CAAC;YACH,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,4BAA6B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IAED,kDAAkD;IAC1C,aAAa,CAAC,GAAQ;QAC5B,OAAO,CACL,GAAG;YACH,OAAO,GAAG,KAAK,QAAQ;YACvB,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ;YAC5B,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ;YAC/B,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACvD,CAAC,GAAG,CAAC,UAAU,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC/D,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAC5D,CAAC;IACJ,CAAC;IAED,6CAA6C;IAC7C,YAAY,CAAC,QAA2C;QACtD,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAE3C,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACzB,IAAI,CAAC;gBACH,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;oBAC5B,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC;oBAC5C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;oBAC7C,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACP,wCAAwC;YAC1C,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAtLD,0CAsLC;AAED,wBAAwB;AACjB,KAAK,UAAU,mBAAmB,CACvC,OAAgB,EAChB,OAA0B;IAE1B,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxD,OAAO,SAAS,CAAC,eAAe,EAAE,CAAC;AACrC,CAAC;AAEM,KAAK,UAAU,6BAA6B,CACjD,OAAgB,EAChB,UAAmB;IAEnB,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;IAC/C,OAAO,SAAS,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;AACzD,CAAC;AAED,8CAA8C;AAC9C,MAAa,cAAc;IAA3B;QACU,YAAO,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC1C,kBAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IA4C5C,CAAC;IA1CC,QAAQ,CAAC,MAAoB;QAC3B,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,UAAU,CAAC,UAAkB,EAAE,OAAe;QAC5C,MAAM,GAAG,GAAG,GAAG,UAAU,IAAI,OAAO,EAAE,CAAC;QACvC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,QAAQ,CAAC,UAAkB,EAAE,OAAe;QAC1C,MAAM,GAAG,GAAG,GAAG,UAAU,IAAI,OAAO,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,UAAkB,EAAE,OAAgB;QAC5C,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,UAAU,IAAI,OAAO,EAAE,CAAC,CAAC;QACtD,CAAC;QAED,8CAA8C;QAC9C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;aAC/C,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;aACnD,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,uBAAuB;QAElE,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,aAAa;QACX,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,gBAAgB;QACd,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;aACtC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aAC9C,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;CACF;AA9CD,wCA8CC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { defineModule, ModuleLoader } from
|
|
2
|
-
export { ModuleDiscovery, autoDiscoverModuleDirectories
|
|
1
|
+
export { defineModule, ModuleLoader } from './modules';
|
|
2
|
+
export { ModuleDiscovery, autoDiscoverModuleDirectories } from './auto-discovery';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/modules/index.ts"],"names":[],"mappings":";;;AAAA,sCAAsC;AACtC,qCAAuD;AAA9C,uGAAA,YAAY,OAAA;AAAE,uGAAA,YAAY,OAAA;AACnC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/modules/index.ts"],"names":[],"mappings":";;;AAAA,sCAAsC;AACtC,qCAAuD;AAA9C,uGAAA,YAAY,OAAA;AAAE,uGAAA,YAAY,OAAA;AACnC,mDAAkF;AAAzE,iHAAA,eAAe,OAAA;AAAE,+HAAA,6BAA6B,OAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Container } from
|
|
2
|
-
import { ModuleConfig } from
|
|
3
|
-
import { ModuleDefinition } from
|
|
1
|
+
import { Container } from '../utilities';
|
|
2
|
+
import { ModuleConfig } from '../../types/module';
|
|
3
|
+
import { ModuleDefinition } from '../../types/module';
|
|
4
4
|
export declare function defineModule(definition: ModuleDefinition): ModuleConfig;
|
|
5
5
|
export declare class ModuleLoader {
|
|
6
6
|
private container;
|
|
@@ -99,17 +99,14 @@ class ModuleLoader {
|
|
|
99
99
|
const entries = await fs_1.promises.readdir(moduleDir, { withFileTypes: true });
|
|
100
100
|
for (const entry of entries) {
|
|
101
101
|
if (entry.isDirectory()) {
|
|
102
|
-
const modulePath = path_1.default.join(moduleDir, entry.name,
|
|
102
|
+
const modulePath = path_1.default.join(moduleDir, entry.name, 'index.ts');
|
|
103
103
|
try {
|
|
104
104
|
await fs_1.promises.access(modulePath);
|
|
105
105
|
const moduleExports = await Promise.resolve(`${modulePath}`).then(s => __importStar(require(s)));
|
|
106
106
|
// Look for exported module config
|
|
107
107
|
for (const exportName of Object.keys(moduleExports)) {
|
|
108
108
|
const exported = moduleExports[exportName];
|
|
109
|
-
if (exported &&
|
|
110
|
-
typeof exported === "object" &&
|
|
111
|
-
exported.name &&
|
|
112
|
-
exported.version) {
|
|
109
|
+
if (exported && typeof exported === 'object' && exported.name && exported.version) {
|
|
113
110
|
modules.push(exported);
|
|
114
111
|
}
|
|
115
112
|
}
|
|
@@ -121,7 +118,7 @@ class ModuleLoader {
|
|
|
121
118
|
}
|
|
122
119
|
}
|
|
123
120
|
catch (error) {
|
|
124
|
-
console.error(
|
|
121
|
+
console.error('Failed to discover modules:', error);
|
|
125
122
|
}
|
|
126
123
|
return modules;
|
|
127
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../../src/core/modules/modules.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../../src/core/modules/modules.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { WebSocketManager } from
|
|
2
|
-
export { ServiceRegistry, ServiceInfo, ServiceDiscoveryOptions
|
|
1
|
+
export { WebSocketManager } from './websocket-manager';
|
|
2
|
+
export { ServiceRegistry, ServiceInfo, ServiceDiscoveryOptions } from './service-discovery';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/networking/index.ts"],"names":[],"mappings":";;;AAAA,0CAA0C;AAC1C,yDAAuD;AAA9C,qHAAA,gBAAgB,OAAA;AACzB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/networking/index.ts"],"names":[],"mappings":";;;AAAA,0CAA0C;AAC1C,yDAAuD;AAA9C,qHAAA,gBAAgB,OAAA;AACzB,yDAA4F;AAAnF,oHAAA,eAAe,OAAA"}
|
|
@@ -8,7 +8,7 @@ export interface ServiceInfo {
|
|
|
8
8
|
metadata?: Record<string, any>;
|
|
9
9
|
}
|
|
10
10
|
export interface ServiceDiscoveryOptions {
|
|
11
|
-
type:
|
|
11
|
+
type: 'consul' | 'kubernetes' | 'memory';
|
|
12
12
|
consulUrl?: string;
|
|
13
13
|
kubernetesNamespace?: string;
|
|
14
14
|
healthCheckInterval?: number;
|
|
@@ -32,7 +32,7 @@ export declare class ServiceRegistry {
|
|
|
32
32
|
private startHealthChecks;
|
|
33
33
|
private performHealthChecks;
|
|
34
34
|
private removeUnhealthyService;
|
|
35
|
-
selectService(serviceName: string, strategy?:
|
|
35
|
+
selectService(serviceName: string, strategy?: 'round-robin' | 'random' | 'least-connections'): ServiceInfo | null;
|
|
36
36
|
destroy(): void;
|
|
37
37
|
getAllServices(): Record<string, ServiceInfo[]>;
|
|
38
38
|
}
|