@dollhousemcp/mcp-server 2.0.0-rc.6 → 2.0.1
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/CHANGELOG.md +52 -61
- package/README.github.md +2 -2
- package/README.md +284 -224
- package/README.md.backup +284 -224
- package/README.npm.md +284 -224
- package/dist/cache/LRUCache.d.ts +3 -0
- package/dist/cache/LRUCache.d.ts.map +1 -1
- package/dist/cache/LRUCache.js +36 -26
- package/dist/config/env.d.ts +14 -4
- package/dist/config/env.d.ts.map +1 -1
- package/dist/config/env.js +20 -6
- package/dist/di/Container.d.ts +21 -0
- package/dist/di/Container.d.ts.map +1 -1
- package/dist/di/Container.js +250 -53
- package/dist/elements/BaseElement.d.ts.map +1 -1
- package/dist/elements/BaseElement.js +5 -10
- package/dist/elements/base/BaseElementManager.d.ts +22 -0
- package/dist/elements/base/BaseElementManager.d.ts.map +1 -1
- package/dist/elements/base/BaseElementManager.js +47 -7
- package/dist/elements/memories/Memory.d.ts +1 -0
- package/dist/elements/memories/Memory.d.ts.map +1 -1
- package/dist/elements/memories/Memory.js +12 -8
- package/dist/elements/memories/MemoryManager.d.ts.map +1 -1
- package/dist/elements/memories/MemoryManager.js +23 -42
- package/dist/elements/memories/MemorySearchIndex.js +2 -2
- package/dist/generated/version.d.ts +2 -2
- package/dist/generated/version.d.ts.map +1 -1
- package/dist/generated/version.js +3 -3
- package/dist/handlers/EnhancedIndexHandler.js +6 -6
- package/dist/handlers/element-crud/listElements.d.ts +2 -0
- package/dist/handlers/element-crud/listElements.d.ts.map +1 -1
- package/dist/handlers/element-crud/listElements.js +3 -1
- package/dist/handlers/mcp-aql/Gatekeeper.d.ts.map +1 -1
- package/dist/handlers/mcp-aql/Gatekeeper.js +23 -17
- package/dist/handlers/mcp-aql/MCPAQLHandler.d.ts +14 -0
- package/dist/handlers/mcp-aql/MCPAQLHandler.d.ts.map +1 -1
- package/dist/handlers/mcp-aql/MCPAQLHandler.js +110 -14
- package/dist/handlers/mcp-aql/OperationRouter.d.ts.map +1 -1
- package/dist/handlers/mcp-aql/OperationRouter.js +13 -1
- package/dist/handlers/mcp-aql/OperationSchema.d.ts +7 -0
- package/dist/handlers/mcp-aql/OperationSchema.d.ts.map +1 -1
- package/dist/handlers/mcp-aql/OperationSchema.js +52 -1
- package/dist/handlers/mcp-aql/evaluatePermission.d.ts +53 -0
- package/dist/handlers/mcp-aql/evaluatePermission.d.ts.map +1 -0
- package/dist/handlers/mcp-aql/evaluatePermission.js +132 -0
- package/dist/handlers/mcp-aql/policies/ToolClassification.d.ts.map +1 -1
- package/dist/handlers/mcp-aql/policies/ToolClassification.js +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -3
- package/dist/logging/LogHooks.js +11 -11
- package/dist/logging/LogManager.d.ts +0 -2
- package/dist/logging/LogManager.d.ts.map +1 -1
- package/dist/logging/LogManager.js +1 -3
- package/dist/logging/sinks/MemoryLogSink.d.ts +2 -0
- package/dist/logging/sinks/MemoryLogSink.d.ts.map +1 -1
- package/dist/logging/sinks/MemoryLogSink.js +12 -3
- package/dist/logging/types.d.ts +0 -2
- package/dist/logging/types.d.ts.map +1 -1
- package/dist/logging/types.js +1 -1
- package/dist/metrics/GatekeeperMetricsTracker.d.ts +32 -0
- package/dist/metrics/GatekeeperMetricsTracker.d.ts.map +1 -0
- package/dist/metrics/GatekeeperMetricsTracker.js +42 -0
- package/dist/metrics/MetricsManager.d.ts +47 -0
- package/dist/metrics/MetricsManager.d.ts.map +1 -0
- package/dist/metrics/MetricsManager.js +232 -0
- package/dist/metrics/OperationMetricsTracker.d.ts +32 -0
- package/dist/metrics/OperationMetricsTracker.d.ts.map +1 -0
- package/dist/metrics/OperationMetricsTracker.js +53 -0
- package/dist/metrics/collectors/DefaultElementProviderCollector.d.ts +27 -0
- package/dist/metrics/collectors/DefaultElementProviderCollector.d.ts.map +1 -0
- package/dist/metrics/collectors/DefaultElementProviderCollector.js +69 -0
- package/dist/metrics/collectors/FileLockManagerCollector.d.ts +16 -0
- package/dist/metrics/collectors/FileLockManagerCollector.d.ts.map +1 -0
- package/dist/metrics/collectors/FileLockManagerCollector.js +51 -0
- package/dist/metrics/collectors/GatekeeperMetricsCollector.d.ts +16 -0
- package/dist/metrics/collectors/GatekeeperMetricsCollector.d.ts.map +1 -0
- package/dist/metrics/collectors/GatekeeperMetricsCollector.js +76 -0
- package/dist/metrics/collectors/LRUCacheCollector.d.ts +18 -0
- package/dist/metrics/collectors/LRUCacheCollector.d.ts.map +1 -0
- package/dist/metrics/collectors/LRUCacheCollector.js +95 -0
- package/dist/metrics/collectors/OperationMetricsCollector.d.ts +16 -0
- package/dist/metrics/collectors/OperationMetricsCollector.d.ts.map +1 -0
- package/dist/metrics/collectors/OperationMetricsCollector.js +80 -0
- package/dist/metrics/collectors/OperationalTelemetryCollector.d.ts +17 -0
- package/dist/metrics/collectors/OperationalTelemetryCollector.d.ts.map +1 -0
- package/dist/metrics/collectors/OperationalTelemetryCollector.js +26 -0
- package/dist/metrics/collectors/PerformanceMonitorCollector.d.ts +14 -0
- package/dist/metrics/collectors/PerformanceMonitorCollector.d.ts.map +1 -0
- package/dist/metrics/collectors/PerformanceMonitorCollector.js +141 -0
- package/dist/metrics/collectors/SecurityMonitorCollector.d.ts +21 -0
- package/dist/metrics/collectors/SecurityMonitorCollector.d.ts.map +1 -0
- package/dist/metrics/collectors/SecurityMonitorCollector.js +56 -0
- package/dist/metrics/collectors/SecurityTelemetryCollector.d.ts +15 -0
- package/dist/metrics/collectors/SecurityTelemetryCollector.d.ts.map +1 -0
- package/dist/metrics/collectors/SecurityTelemetryCollector.js +112 -0
- package/dist/metrics/collectors/TriggerMetricsTrackerCollector.d.ts +16 -0
- package/dist/metrics/collectors/TriggerMetricsTrackerCollector.d.ts.map +1 -0
- package/dist/metrics/collectors/TriggerMetricsTrackerCollector.js +26 -0
- package/dist/metrics/collectors/index.d.ts +11 -0
- package/dist/metrics/collectors/index.d.ts.map +1 -0
- package/dist/metrics/collectors/index.js +11 -0
- package/dist/metrics/sinks/MemoryMetricsSink.d.ts +22 -0
- package/dist/metrics/sinks/MemoryMetricsSink.d.ts.map +1 -0
- package/dist/metrics/sinks/MemoryMetricsSink.js +121 -0
- package/dist/metrics/types.d.ts +98 -0
- package/dist/metrics/types.d.ts.map +1 -0
- package/dist/metrics/types.js +24 -0
- package/dist/portfolio/DefaultElementProvider.d.ts.map +1 -1
- package/dist/portfolio/DefaultElementProvider.js +1 -7
- package/dist/portfolio/EnhancedIndexManager.d.ts.map +1 -1
- package/dist/portfolio/EnhancedIndexManager.js +18 -18
- package/dist/portfolio/NLPScoringManager.d.ts.map +1 -1
- package/dist/portfolio/NLPScoringManager.js +5 -9
- package/dist/portfolio/PortfolioIndexManager.js +2 -2
- package/dist/portfolio/RelationshipManager.js +2 -2
- package/dist/portfolio/VerbTriggerManager.d.ts.map +1 -1
- package/dist/portfolio/VerbTriggerManager.js +5 -19
- package/dist/portfolio/config/IndexConfig.d.ts.map +1 -1
- package/dist/portfolio/config/IndexConfig.js +1 -12
- package/dist/portfolio/enhanced-index/ElementDefinitionBuilder.d.ts.map +1 -1
- package/dist/portfolio/enhanced-index/ElementDefinitionBuilder.js +3 -15
- package/dist/portfolio/enhanced-index/SemanticRelationshipService.d.ts.map +1 -1
- package/dist/portfolio/enhanced-index/SemanticRelationshipService.js +2 -16
- package/dist/portfolio/types/RelationshipTypes.d.ts.map +1 -1
- package/dist/portfolio/types/RelationshipTypes.js +3 -17
- package/dist/security/audit/config/suppressions.d.ts.map +1 -1
- package/dist/security/audit/config/suppressions.js +36 -8
- package/dist/security/constants.d.ts.map +1 -1
- package/dist/security/constants.js +10 -6
- package/dist/security/fileLockManager.d.ts.map +1 -1
- package/dist/security/fileLockManager.js +8 -6
- package/dist/security/secureYamlParser.d.ts.map +1 -1
- package/dist/security/secureYamlParser.js +1 -13
- package/dist/security/securityMonitor.d.ts +2 -1
- package/dist/security/securityMonitor.d.ts.map +1 -1
- package/dist/security/securityMonitor.js +14 -3
- package/dist/security/telemetry/SecurityTelemetry.d.ts +16 -0
- package/dist/security/telemetry/SecurityTelemetry.d.ts.map +1 -1
- package/dist/security/telemetry/SecurityTelemetry.js +30 -2
- package/dist/security/tokenManager.d.ts +3 -0
- package/dist/security/tokenManager.d.ts.map +1 -1
- package/dist/security/tokenManager.js +13 -5
- package/dist/security/validation/BackgroundValidator.d.ts.map +1 -1
- package/dist/security/validation/BackgroundValidator.js +7 -7
- package/dist/server/startup.d.ts.map +1 -1
- package/dist/server/startup.js +8 -24
- package/dist/server/tools/MCPAQLTools.js +4 -1
- package/dist/services/ActivationStore.d.ts.map +1 -1
- package/dist/services/ActivationStore.js +9 -3
- package/dist/services/FileWatchService.d.ts +1 -0
- package/dist/services/FileWatchService.d.ts.map +1 -1
- package/dist/services/FileWatchService.js +83 -48
- package/dist/services/MetadataService.d.ts.map +1 -1
- package/dist/services/MetadataService.js +7 -2
- package/dist/services/query/ElementQueryService.d.ts.map +1 -1
- package/dist/services/query/ElementQueryService.js +1 -41
- package/dist/services/query/PaginationService.d.ts.map +1 -1
- package/dist/services/query/PaginationService.js +1 -14
- package/dist/services/query/SortService.d.ts.map +1 -1
- package/dist/services/query/SortService.js +1 -6
- package/dist/services/validation/ValidationService.d.ts.map +1 -1
- package/dist/services/validation/ValidationService.js +3 -8
- package/dist/storage/ElementStorageLayer.d.ts.map +1 -1
- package/dist/storage/ElementStorageLayer.js +5 -2
- package/dist/storage/MemoryStorageLayer.d.ts.map +1 -1
- package/dist/storage/MemoryStorageLayer.js +5 -2
- package/dist/telemetry/OperationalTelemetry.js +2 -2
- package/dist/utils/EventDeduplicator.d.ts +44 -0
- package/dist/utils/EventDeduplicator.d.ts.map +1 -0
- package/dist/utils/EventDeduplicator.js +93 -0
- package/dist/utils/FileLock.d.ts.map +1 -1
- package/dist/utils/FileLock.js +1 -9
- package/dist/utils/PerformanceMonitor.d.ts.map +1 -1
- package/dist/utils/PerformanceMonitor.js +5 -5
- package/dist/utils/SlidingWindowRateLimiter.d.ts +13 -0
- package/dist/utils/SlidingWindowRateLimiter.d.ts.map +1 -0
- package/dist/utils/SlidingWindowRateLimiter.js +23 -0
- package/dist/web/console/IngestRoutes.d.ts +84 -0
- package/dist/web/console/IngestRoutes.d.ts.map +1 -0
- package/dist/web/console/IngestRoutes.js +252 -0
- package/dist/web/console/LeaderElection.d.ts +89 -0
- package/dist/web/console/LeaderElection.d.ts.map +1 -0
- package/dist/web/console/LeaderElection.js +205 -0
- package/dist/web/console/LeaderForwardingSink.d.ts +61 -0
- package/dist/web/console/LeaderForwardingSink.d.ts.map +1 -0
- package/dist/web/console/LeaderForwardingSink.js +197 -0
- package/dist/web/console/SessionNames.d.ts +46 -0
- package/dist/web/console/SessionNames.d.ts.map +1 -0
- package/dist/web/console/SessionNames.js +257 -0
- package/dist/web/console/UnifiedConsole.d.ts +64 -0
- package/dist/web/console/UnifiedConsole.d.ts.map +1 -0
- package/dist/web/console/UnifiedConsole.js +119 -0
- package/dist/web/contentPipeline.d.ts +58 -0
- package/dist/web/contentPipeline.d.ts.map +1 -0
- package/dist/web/contentPipeline.js +112 -0
- package/dist/web/portDiscovery.d.ts +58 -0
- package/dist/web/portDiscovery.d.ts.map +1 -0
- package/dist/web/portDiscovery.js +143 -0
- package/dist/web/public/app.js +148 -60
- package/dist/web/public/logs.js +638 -0
- package/dist/web/public/metrics.js +682 -0
- package/dist/web/public/permissions.js +394 -0
- package/dist/web/public/sessions.js +369 -0
- package/dist/web/routes/healthRoutes.d.ts +16 -0
- package/dist/web/routes/healthRoutes.d.ts.map +1 -0
- package/dist/web/routes/healthRoutes.js +29 -0
- package/dist/web/routes/logRoutes.d.ts +18 -0
- package/dist/web/routes/logRoutes.d.ts.map +1 -0
- package/dist/web/routes/logRoutes.js +126 -0
- package/dist/web/routes/metricsRoutes.d.ts +17 -0
- package/dist/web/routes/metricsRoutes.d.ts.map +1 -0
- package/dist/web/routes/metricsRoutes.js +90 -0
- package/dist/web/routes/permissionRoutes.d.ts +16 -0
- package/dist/web/routes/permissionRoutes.d.ts.map +1 -0
- package/dist/web/routes/permissionRoutes.js +133 -0
- package/dist/web/routes.d.ts.map +1 -1
- package/dist/web/routes.js +309 -339
- package/dist/web/server.d.ts +21 -1
- package/dist/web/server.d.ts.map +1 -1
- package/dist/web/server.js +42 -4
- package/dist/web/sinks/WebSSELogSink.d.ts +15 -0
- package/dist/web/sinks/WebSSELogSink.d.ts.map +1 -0
- package/dist/web/sinks/WebSSELogSink.js +22 -0
- package/dist/web/sinks/WebSSEMetricsSink.d.ts +16 -0
- package/dist/web/sinks/WebSSEMetricsSink.d.ts.map +1 -0
- package/dist/web/sinks/WebSSEMetricsSink.js +23 -0
- package/package.json +2 -2
- package/server.json +2 -2
- package/dist/web/public/public/app.js +0 -1878
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Unified web console orchestrator.
|
|
3
|
+
*
|
|
4
|
+
* Ties together leader election, console startup, follower wiring,
|
|
5
|
+
* and session lifecycle management. This is the main entry point
|
|
6
|
+
* called by the DI container during deferred setup.
|
|
7
|
+
*
|
|
8
|
+
* Flow:
|
|
9
|
+
* 1. Run leader election (read lock file, claim or follow)
|
|
10
|
+
* 2. If leader: start web server on fixed port, mount ingest routes, start heartbeat
|
|
11
|
+
* 3. If follower: register forwarding sinks with LogManager, start session heartbeat
|
|
12
|
+
*
|
|
13
|
+
* @since v2.1.0 — Issue #1700
|
|
14
|
+
*/
|
|
15
|
+
import type { UnifiedLogEntry } from '../../logging/types.js';
|
|
16
|
+
import type { MetricSnapshot } from '../../metrics/types.js';
|
|
17
|
+
import type { MemoryLogSink } from '../../logging/sinks/MemoryLogSink.js';
|
|
18
|
+
import type { MemoryMetricsSink } from '../../metrics/sinks/MemoryMetricsSink.js';
|
|
19
|
+
import { type ElectionResult } from './LeaderElection.js';
|
|
20
|
+
/**
|
|
21
|
+
* Options for starting the unified console.
|
|
22
|
+
*/
|
|
23
|
+
export interface UnifiedConsoleOptions {
|
|
24
|
+
/** This process's unique session ID */
|
|
25
|
+
sessionId: string;
|
|
26
|
+
/** Portfolio base directory (for startWebServer) */
|
|
27
|
+
portfolioDir: string;
|
|
28
|
+
/** Log memory sink (for console history) */
|
|
29
|
+
memorySink: MemoryLogSink;
|
|
30
|
+
/** Metrics memory sink */
|
|
31
|
+
metricsSink?: MemoryMetricsSink;
|
|
32
|
+
/** MCP-AQL handler for permission routes (typed as any to avoid circular imports) */
|
|
33
|
+
mcpAqlHandler?: any;
|
|
34
|
+
/** Callback to register a log sink with the LogManager */
|
|
35
|
+
registerLogSink: (sink: {
|
|
36
|
+
write(entry: UnifiedLogEntry): void;
|
|
37
|
+
flush(): Promise<void>;
|
|
38
|
+
close(): Promise<void>;
|
|
39
|
+
}) => void;
|
|
40
|
+
/** Callback to wire SSE broadcasts after web server starts */
|
|
41
|
+
wireSSEBroadcasts: (webResult: {
|
|
42
|
+
logBroadcast?: (entry: UnifiedLogEntry) => void;
|
|
43
|
+
metricsOnSnapshot?: (snapshot: MetricSnapshot) => void;
|
|
44
|
+
}, metricsSink?: MemoryMetricsSink) => void;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Result of starting the unified console.
|
|
48
|
+
*/
|
|
49
|
+
export interface UnifiedConsoleResult {
|
|
50
|
+
role: 'leader' | 'follower';
|
|
51
|
+
election: ElectionResult;
|
|
52
|
+
/** Port the console is running on (leader only) */
|
|
53
|
+
port?: number;
|
|
54
|
+
/** Cleanup function to call on shutdown */
|
|
55
|
+
cleanup: () => Promise<void>;
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Start the unified web console.
|
|
59
|
+
*
|
|
60
|
+
* Runs leader election, then either starts the full console (leader)
|
|
61
|
+
* or sets up event forwarding (follower).
|
|
62
|
+
*/
|
|
63
|
+
export declare function startUnifiedConsole(options: UnifiedConsoleOptions): Promise<UnifiedConsoleResult>;
|
|
64
|
+
//# sourceMappingURL=UnifiedConsole.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UnifiedConsole.d.ts","sourceRoot":"","sources":["../../../src/web/console/UnifiedConsole.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAElF,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAU7B;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,uCAAuC;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,4CAA4C;IAC5C,UAAU,EAAE,aAAa,CAAC;IAC1B,0BAA0B;IAC1B,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,qFAAqF;IACrF,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,0DAA0D;IAC1D,eAAe,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;QAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;QAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,KAAK,IAAI,CAAC;IACzH,8DAA8D;IAC9D,iBAAiB,EAAE,CAAC,SAAS,EAAE;QAAE,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;QAAC,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,IAAI,CAAA;KAAE,EAAE,WAAW,CAAC,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACtL;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC5B,QAAQ,EAAE,cAAc,CAAC;IACzB,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2CAA2C;IAC3C,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAQvG"}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Unified web console orchestrator.
|
|
3
|
+
*
|
|
4
|
+
* Ties together leader election, console startup, follower wiring,
|
|
5
|
+
* and session lifecycle management. This is the main entry point
|
|
6
|
+
* called by the DI container during deferred setup.
|
|
7
|
+
*
|
|
8
|
+
* Flow:
|
|
9
|
+
* 1. Run leader election (read lock file, claim or follow)
|
|
10
|
+
* 2. If leader: start web server on fixed port, mount ingest routes, start heartbeat
|
|
11
|
+
* 3. If follower: register forwarding sinks with LogManager, start session heartbeat
|
|
12
|
+
*
|
|
13
|
+
* @since v2.1.0 — Issue #1700
|
|
14
|
+
*/
|
|
15
|
+
import { logger } from '../../utils/logger.js';
|
|
16
|
+
import { electLeader, startHeartbeat, registerLeaderCleanup, } from './LeaderElection.js';
|
|
17
|
+
import { createIngestRoutes } from './IngestRoutes.js';
|
|
18
|
+
import { LeaderForwardingLogSink, SessionHeartbeat, } from './LeaderForwardingSink.js';
|
|
19
|
+
/** Fixed port for the unified console leader */
|
|
20
|
+
const CONSOLE_PORT = 3939;
|
|
21
|
+
/**
|
|
22
|
+
* Start the unified web console.
|
|
23
|
+
*
|
|
24
|
+
* Runs leader election, then either starts the full console (leader)
|
|
25
|
+
* or sets up event forwarding (follower).
|
|
26
|
+
*/
|
|
27
|
+
export async function startUnifiedConsole(options) {
|
|
28
|
+
const election = await electLeader(options.sessionId, CONSOLE_PORT);
|
|
29
|
+
if (election.role === 'leader') {
|
|
30
|
+
return startAsLeader(options, election);
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
return startAsFollower(options, election);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Start as the console leader.
|
|
38
|
+
* Binds port 3939, mounts all routes including ingestion, starts heartbeat.
|
|
39
|
+
*/
|
|
40
|
+
async function startAsLeader(options, election) {
|
|
41
|
+
const { startWebServer } = await import('../server.js');
|
|
42
|
+
// Pre-create a placeholder broadcast that we'll wire up after the server starts
|
|
43
|
+
let liveBroadcast;
|
|
44
|
+
let liveMetricsOnSnapshot;
|
|
45
|
+
// Create ingestion routes with a deferred broadcast (wired after server starts)
|
|
46
|
+
const ingestResult = createIngestRoutes({
|
|
47
|
+
logBroadcast: (entry) => liveBroadcast?.(entry),
|
|
48
|
+
metricsOnSnapshot: (snapshot) => liveMetricsOnSnapshot?.(snapshot),
|
|
49
|
+
});
|
|
50
|
+
// Register the leader as a session
|
|
51
|
+
ingestResult.registerLeaderSession(options.sessionId, process.pid);
|
|
52
|
+
// Start the web server with ingest routes mounted before the SPA fallback
|
|
53
|
+
const webResult = await startWebServer({
|
|
54
|
+
portfolioDir: options.portfolioDir,
|
|
55
|
+
memorySink: options.memorySink,
|
|
56
|
+
metricsSink: options.metricsSink,
|
|
57
|
+
port: CONSOLE_PORT,
|
|
58
|
+
additionalRouters: [ingestResult.router],
|
|
59
|
+
...(options.mcpAqlHandler ? { mcpAqlHandler: options.mcpAqlHandler } : {}),
|
|
60
|
+
});
|
|
61
|
+
// Wire SSE broadcasts for this leader's own events
|
|
62
|
+
options.wireSSEBroadcasts(webResult, options.metricsSink);
|
|
63
|
+
// Now wire the live broadcast functions into the ingest routes
|
|
64
|
+
if (webResult.logBroadcast) {
|
|
65
|
+
const originalBroadcast = webResult.logBroadcast;
|
|
66
|
+
// Stamp leader's own entries with session ID
|
|
67
|
+
liveBroadcast = (entry) => {
|
|
68
|
+
const stamped = {
|
|
69
|
+
...entry,
|
|
70
|
+
data: { ...entry.data, _sessionId: options.sessionId },
|
|
71
|
+
};
|
|
72
|
+
originalBroadcast(stamped);
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
liveMetricsOnSnapshot = webResult.metricsOnSnapshot;
|
|
76
|
+
logger.info('[UnifiedConsole] Ingestion routes mounted');
|
|
77
|
+
// Start heartbeat and register cleanup
|
|
78
|
+
const stopHeartbeat = startHeartbeat(election.leaderInfo);
|
|
79
|
+
registerLeaderCleanup();
|
|
80
|
+
logger.info('[UnifiedConsole] Leader started', {
|
|
81
|
+
sessionId: options.sessionId, port: CONSOLE_PORT, pid: process.pid,
|
|
82
|
+
role: 'leader', ingestRoutes: ['/api/ingest/logs', '/api/ingest/metrics', '/api/ingest/session', '/api/sessions'],
|
|
83
|
+
});
|
|
84
|
+
return {
|
|
85
|
+
role: 'leader',
|
|
86
|
+
election,
|
|
87
|
+
port: CONSOLE_PORT,
|
|
88
|
+
cleanup: async () => {
|
|
89
|
+
stopHeartbeat();
|
|
90
|
+
},
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Start as a follower.
|
|
95
|
+
* Registers forwarding sinks with the LogManager, starts session heartbeat.
|
|
96
|
+
*/
|
|
97
|
+
async function startAsFollower(options, election) {
|
|
98
|
+
const leaderUrl = `http://127.0.0.1:${election.leaderInfo.port}`;
|
|
99
|
+
// Register a forwarding log sink
|
|
100
|
+
const forwardingSink = new LeaderForwardingLogSink(leaderUrl, options.sessionId);
|
|
101
|
+
options.registerLogSink(forwardingSink);
|
|
102
|
+
// Start session heartbeat to the leader
|
|
103
|
+
const sessionHeartbeat = new SessionHeartbeat(leaderUrl, options.sessionId, process.pid);
|
|
104
|
+
await sessionHeartbeat.start();
|
|
105
|
+
logger.info('[UnifiedConsole] Follower started', {
|
|
106
|
+
sessionId: options.sessionId, pid: process.pid, role: 'follower',
|
|
107
|
+
leaderSession: election.leaderInfo.sessionId, leaderPid: election.leaderInfo.pid,
|
|
108
|
+
leaderPort: election.leaderInfo.port, leaderUrl,
|
|
109
|
+
});
|
|
110
|
+
return {
|
|
111
|
+
role: 'follower',
|
|
112
|
+
election,
|
|
113
|
+
cleanup: async () => {
|
|
114
|
+
await sessionHeartbeat.stop();
|
|
115
|
+
await forwardingSink.close();
|
|
116
|
+
},
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"UnifiedConsole.js","sourceRoot":"","sources":["../../../src/web/console/UnifiedConsole.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Unified web console orchestrator.\n *\n * Ties together leader election, console startup, follower wiring,\n * and session lifecycle management. This is the main entry point\n * called by the DI container during deferred setup.\n *\n * Flow:\n * 1. Run leader election (read lock file, claim or follow)\n * 2. If leader: start web server on fixed port, mount ingest routes, start heartbeat\n * 3. If follower: register forwarding sinks with LogManager, start session heartbeat\n *\n * @since v2.1.0 — Issue #1700\n */\n\nimport type { UnifiedLogEntry } from '../../logging/types.js';\nimport type { MetricSnapshot } from '../../metrics/types.js';\nimport type { MemoryLogSink } from '../../logging/sinks/MemoryLogSink.js';\nimport type { MemoryMetricsSink } from '../../metrics/sinks/MemoryMetricsSink.js';\nimport { logger } from '../../utils/logger.js';\nimport {\n  electLeader,\n  startHeartbeat,\n  registerLeaderCleanup,\n  type ElectionResult,\n} from './LeaderElection.js';\nimport { createIngestRoutes } from './IngestRoutes.js';\nimport {\n  LeaderForwardingLogSink,\n  SessionHeartbeat,\n} from './LeaderForwardingSink.js';\n\n/** Fixed port for the unified console leader */\nconst CONSOLE_PORT = 3939;\n\n/**\n * Options for starting the unified console.\n */\nexport interface UnifiedConsoleOptions {\n  /** This process's unique session ID */\n  sessionId: string;\n  /** Portfolio base directory (for startWebServer) */\n  portfolioDir: string;\n  /** Log memory sink (for console history) */\n  memorySink: MemoryLogSink;\n  /** Metrics memory sink */\n  metricsSink?: MemoryMetricsSink;\n  /** MCP-AQL handler for permission routes (typed as any to avoid circular imports) */\n  mcpAqlHandler?: any;\n  /** Callback to register a log sink with the LogManager */\n  registerLogSink: (sink: { write(entry: UnifiedLogEntry): void; flush(): Promise<void>; close(): Promise<void> }) => void;\n  /** Callback to wire SSE broadcasts after web server starts */\n  wireSSEBroadcasts: (webResult: { logBroadcast?: (entry: UnifiedLogEntry) => void; metricsOnSnapshot?: (snapshot: MetricSnapshot) => void }, metricsSink?: MemoryMetricsSink) => void;\n}\n\n/**\n * Result of starting the unified console.\n */\nexport interface UnifiedConsoleResult {\n  role: 'leader' | 'follower';\n  election: ElectionResult;\n  /** Port the console is running on (leader only) */\n  port?: number;\n  /** Cleanup function to call on shutdown */\n  cleanup: () => Promise<void>;\n}\n\n/**\n * Start the unified web console.\n *\n * Runs leader election, then either starts the full console (leader)\n * or sets up event forwarding (follower).\n */\nexport async function startUnifiedConsole(options: UnifiedConsoleOptions): Promise<UnifiedConsoleResult> {\n  const election = await electLeader(options.sessionId, CONSOLE_PORT);\n\n  if (election.role === 'leader') {\n    return startAsLeader(options, election);\n  } else {\n    return startAsFollower(options, election);\n  }\n}\n\n/**\n * Start as the console leader.\n * Binds port 3939, mounts all routes including ingestion, starts heartbeat.\n */\nasync function startAsLeader(\n  options: UnifiedConsoleOptions,\n  election: ElectionResult,\n): Promise<UnifiedConsoleResult> {\n  const { startWebServer } = await import('../server.js');\n\n  // Pre-create a placeholder broadcast that we'll wire up after the server starts\n  let liveBroadcast: ((entry: UnifiedLogEntry) => void) | undefined;\n  let liveMetricsOnSnapshot: ((snapshot: MetricSnapshot) => void) | undefined;\n\n  // Create ingestion routes with a deferred broadcast (wired after server starts)\n  const ingestResult = createIngestRoutes({\n    logBroadcast: (entry) => liveBroadcast?.(entry),\n    metricsOnSnapshot: (snapshot) => liveMetricsOnSnapshot?.(snapshot),\n  });\n\n  // Register the leader as a session\n  ingestResult.registerLeaderSession(options.sessionId, process.pid);\n\n  // Start the web server with ingest routes mounted before the SPA fallback\n  const webResult = await startWebServer({\n    portfolioDir: options.portfolioDir,\n    memorySink: options.memorySink,\n    metricsSink: options.metricsSink,\n    port: CONSOLE_PORT,\n    additionalRouters: [ingestResult.router],\n    ...(options.mcpAqlHandler ? { mcpAqlHandler: options.mcpAqlHandler } : {}),\n  });\n\n  // Wire SSE broadcasts for this leader's own events\n  options.wireSSEBroadcasts(webResult, options.metricsSink);\n\n  // Now wire the live broadcast functions into the ingest routes\n  if (webResult.logBroadcast) {\n    const originalBroadcast = webResult.logBroadcast;\n    // Stamp leader's own entries with session ID\n    liveBroadcast = (entry: UnifiedLogEntry) => {\n      const stamped: UnifiedLogEntry = {\n        ...entry,\n        data: { ...entry.data, _sessionId: options.sessionId },\n      };\n      originalBroadcast(stamped);\n    };\n  }\n  liveMetricsOnSnapshot = webResult.metricsOnSnapshot;\n\n  logger.info('[UnifiedConsole] Ingestion routes mounted');\n\n  // Start heartbeat and register cleanup\n  const stopHeartbeat = startHeartbeat(election.leaderInfo);\n  registerLeaderCleanup();\n\n  logger.info('[UnifiedConsole] Leader started', {\n    sessionId: options.sessionId, port: CONSOLE_PORT, pid: process.pid,\n    role: 'leader', ingestRoutes: ['/api/ingest/logs', '/api/ingest/metrics', '/api/ingest/session', '/api/sessions'],\n  });\n\n  return {\n    role: 'leader',\n    election,\n    port: CONSOLE_PORT,\n    cleanup: async () => {\n      stopHeartbeat();\n    },\n  };\n}\n\n/**\n * Start as a follower.\n * Registers forwarding sinks with the LogManager, starts session heartbeat.\n */\nasync function startAsFollower(\n  options: UnifiedConsoleOptions,\n  election: ElectionResult,\n): Promise<UnifiedConsoleResult> {\n  const leaderUrl = `http://127.0.0.1:${election.leaderInfo.port}`;\n\n  // Register a forwarding log sink\n  const forwardingSink = new LeaderForwardingLogSink(leaderUrl, options.sessionId);\n  options.registerLogSink(forwardingSink);\n\n  // Start session heartbeat to the leader\n  const sessionHeartbeat = new SessionHeartbeat(leaderUrl, options.sessionId, process.pid);\n  await sessionHeartbeat.start();\n\n  logger.info('[UnifiedConsole] Follower started', {\n    sessionId: options.sessionId, pid: process.pid, role: 'follower',\n    leaderSession: election.leaderInfo.sessionId, leaderPid: election.leaderInfo.pid,\n    leaderPort: election.leaderInfo.port, leaderUrl,\n  });\n\n  return {\n    role: 'follower',\n    election,\n    cleanup: async () => {\n      await sessionHeartbeat.stop();\n      await forwardingSink.close();\n    },\n  };\n}\n"]}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Content Validation Pipeline for Web UI
|
|
3
|
+
*
|
|
4
|
+
* Composes the standalone security validators into a single pipeline
|
|
5
|
+
* for validating portfolio element content before serving to the browser.
|
|
6
|
+
*
|
|
7
|
+
* Uses the same validators as the MCPAQLHandler but without coupling
|
|
8
|
+
* to the handler's operation dispatch. This is the extraction point
|
|
9
|
+
* for the upcoming MCPAQLHandler decomposition.
|
|
10
|
+
*
|
|
11
|
+
* auto-dollhouse#5 / upstream #1679
|
|
12
|
+
* DMCP-SEC-004 compliant: uses UnicodeValidator.normalize() on all inputs
|
|
13
|
+
*/
|
|
14
|
+
/** Known metadata fields extracted from YAML frontmatter for web display */
|
|
15
|
+
export interface ElementDisplayMetadata {
|
|
16
|
+
name?: string;
|
|
17
|
+
description?: string;
|
|
18
|
+
version?: string;
|
|
19
|
+
author?: string;
|
|
20
|
+
category?: string;
|
|
21
|
+
created?: string;
|
|
22
|
+
created_date?: string;
|
|
23
|
+
modified?: string;
|
|
24
|
+
tags?: string[];
|
|
25
|
+
license?: string;
|
|
26
|
+
age_rating?: string;
|
|
27
|
+
triggers?: string[];
|
|
28
|
+
instructions?: string;
|
|
29
|
+
coordination_strategy?: string;
|
|
30
|
+
use_cases?: string[];
|
|
31
|
+
proficiency_levels?: Record<string, string>;
|
|
32
|
+
gatekeeper?: Record<string, unknown>;
|
|
33
|
+
goal?: Record<string, unknown>;
|
|
34
|
+
autonomy?: Record<string, unknown>;
|
|
35
|
+
memoryType?: string;
|
|
36
|
+
[key: string]: unknown;
|
|
37
|
+
}
|
|
38
|
+
export interface PipelineResult {
|
|
39
|
+
valid: boolean;
|
|
40
|
+
content: string;
|
|
41
|
+
metadata: ElementDisplayMetadata;
|
|
42
|
+
body: string;
|
|
43
|
+
rejection?: {
|
|
44
|
+
reason: string;
|
|
45
|
+
severity?: string;
|
|
46
|
+
patterns?: string[];
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Validate element content through the security pipeline.
|
|
51
|
+
*
|
|
52
|
+
* @param filename - The element filename (e.g., "alex-sterling.md")
|
|
53
|
+
* @param rawContent - The raw file content string
|
|
54
|
+
* @param elementType - The plural element type directory (e.g., "personas")
|
|
55
|
+
* @returns Validated content with parsed metadata, or rejection with reason
|
|
56
|
+
*/
|
|
57
|
+
export declare function validateElementContent(filename: string, rawContent: string, elementType: string): PipelineResult;
|
|
58
|
+
//# sourceMappingURL=contentPipeline.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contentPipeline.d.ts","sourceRoot":"","sources":["../../src/web/contentPipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAiBH,4EAA4E;AAC5E,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,sBAAsB,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE;QACV,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,GAClB,cAAc,CAgFhB"}
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Content Validation Pipeline for Web UI
|
|
3
|
+
*
|
|
4
|
+
* Composes the standalone security validators into a single pipeline
|
|
5
|
+
* for validating portfolio element content before serving to the browser.
|
|
6
|
+
*
|
|
7
|
+
* Uses the same validators as the MCPAQLHandler but without coupling
|
|
8
|
+
* to the handler's operation dispatch. This is the extraction point
|
|
9
|
+
* for the upcoming MCPAQLHandler decomposition.
|
|
10
|
+
*
|
|
11
|
+
* auto-dollhouse#5 / upstream #1679
|
|
12
|
+
* DMCP-SEC-004 compliant: uses UnicodeValidator.normalize() on all inputs
|
|
13
|
+
*/
|
|
14
|
+
import { extname } from 'node:path';
|
|
15
|
+
import { SecureYamlParser } from '../security/secureYamlParser.js';
|
|
16
|
+
import { ContentValidator } from '../security/contentValidator.js';
|
|
17
|
+
import { UnicodeValidator } from '../security/validators/unicodeValidator.js';
|
|
18
|
+
import { logger } from '../utils/logger.js';
|
|
19
|
+
/** Element types that map to content validation contexts */
|
|
20
|
+
const TYPE_TO_CONTEXT = {
|
|
21
|
+
personas: 'persona',
|
|
22
|
+
skills: 'skill',
|
|
23
|
+
templates: 'template',
|
|
24
|
+
agents: 'agent',
|
|
25
|
+
memories: 'memory',
|
|
26
|
+
};
|
|
27
|
+
/**
|
|
28
|
+
* Validate element content through the security pipeline.
|
|
29
|
+
*
|
|
30
|
+
* @param filename - The element filename (e.g., "alex-sterling.md")
|
|
31
|
+
* @param rawContent - The raw file content string
|
|
32
|
+
* @param elementType - The plural element type directory (e.g., "personas")
|
|
33
|
+
* @returns Validated content with parsed metadata, or rejection with reason
|
|
34
|
+
*/
|
|
35
|
+
export function validateElementContent(filename, rawContent, elementType) {
|
|
36
|
+
// DMCP-SEC-004: Normalize all inputs via UnicodeValidator to prevent
|
|
37
|
+
// homograph attacks, direction override bypasses, and suspicious patterns.
|
|
38
|
+
const filenameValidation = UnicodeValidator.normalize(filename);
|
|
39
|
+
const contentValidation = UnicodeValidator.normalize(rawContent);
|
|
40
|
+
const normalizedFilename = filenameValidation.normalizedContent;
|
|
41
|
+
const normalizedContent = contentValidation.normalizedContent;
|
|
42
|
+
const normalizedType = elementType.normalize('NFC');
|
|
43
|
+
const ext = extname(normalizedFilename);
|
|
44
|
+
const isYaml = ext === '.yaml' || ext === '.yml';
|
|
45
|
+
const contentContext = TYPE_TO_CONTEXT[normalizedType];
|
|
46
|
+
// Step 1: Parse and validate structure (YAML bomb detection, circular refs)
|
|
47
|
+
let metadata = {};
|
|
48
|
+
let body = '';
|
|
49
|
+
try {
|
|
50
|
+
if (isYaml) {
|
|
51
|
+
// Pure YAML file (memories) — use parseRawYaml for structural validation
|
|
52
|
+
// (bomb detection, circular refs, size limits).
|
|
53
|
+
// Skip ContentValidator.validateYamlContent() — it produces false positives
|
|
54
|
+
// on memory content that legitimately contains code patterns, security
|
|
55
|
+
// keywords, and technical documentation. Memories are locally-generated
|
|
56
|
+
// trusted content, not untrusted external submissions.
|
|
57
|
+
const parsed = SecureYamlParser.parseRawYaml(normalizedContent);
|
|
58
|
+
metadata = (typeof parsed === 'object' && parsed !== null) ? parsed : {};
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
// Markdown with YAML frontmatter
|
|
62
|
+
const parsed = SecureYamlParser.parse(normalizedContent, { contentContext });
|
|
63
|
+
metadata = parsed.data;
|
|
64
|
+
body = parsed.content;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
catch (err) {
|
|
68
|
+
return {
|
|
69
|
+
valid: false,
|
|
70
|
+
content: normalizedContent,
|
|
71
|
+
metadata: {},
|
|
72
|
+
body: '',
|
|
73
|
+
rejection: { reason: `Parse validation failed: ${err.message}`, severity: 'high' },
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
// Step 2: Content injection pattern detection (markdown elements only)
|
|
77
|
+
// YAML memories skip this — they contain legitimate code patterns and
|
|
78
|
+
// technical content that triggers false positives. The structural YAML
|
|
79
|
+
// parsing above (bomb/circular ref detection) is sufficient for local content.
|
|
80
|
+
if (!isYaml) {
|
|
81
|
+
const validation = ContentValidator.validateAndSanitize(normalizedContent, {
|
|
82
|
+
contentContext,
|
|
83
|
+
});
|
|
84
|
+
if (!validation.isValid) {
|
|
85
|
+
logger.warn('[ContentPipeline] Content rejected', {
|
|
86
|
+
filename,
|
|
87
|
+
elementType,
|
|
88
|
+
patterns: validation.detectedPatterns,
|
|
89
|
+
severity: validation.severity,
|
|
90
|
+
});
|
|
91
|
+
return {
|
|
92
|
+
valid: false,
|
|
93
|
+
content: normalizedContent,
|
|
94
|
+
metadata,
|
|
95
|
+
body,
|
|
96
|
+
rejection: {
|
|
97
|
+
reason: 'Content failed security validation',
|
|
98
|
+
severity: validation.severity,
|
|
99
|
+
patterns: validation.detectedPatterns,
|
|
100
|
+
},
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
// Step 3: Return validated content
|
|
105
|
+
return {
|
|
106
|
+
valid: true,
|
|
107
|
+
content: rawContent,
|
|
108
|
+
metadata,
|
|
109
|
+
body,
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"contentPipeline.js","sourceRoot":"","sources":["../../src/web/contentPipeline.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Content Validation Pipeline for Web UI\n *\n * Composes the standalone security validators into a single pipeline\n * for validating portfolio element content before serving to the browser.\n *\n * Uses the same validators as the MCPAQLHandler but without coupling\n * to the handler's operation dispatch. This is the extraction point\n * for the upcoming MCPAQLHandler decomposition.\n *\n * auto-dollhouse#5 / upstream #1679\n * DMCP-SEC-004 compliant: uses UnicodeValidator.normalize() on all inputs\n */\n\nimport { extname } from 'node:path';\nimport { SecureYamlParser } from '../security/secureYamlParser.js';\nimport { ContentValidator, type ContentValidationResult } from '../security/contentValidator.js';\nimport { UnicodeValidator } from '../security/validators/unicodeValidator.js';\nimport { logger } from '../utils/logger.js';\n\n/** Element types that map to content validation contexts */\nconst TYPE_TO_CONTEXT: Record<string, 'persona' | 'skill' | 'template' | 'agent' | 'memory'> = {\n  personas: 'persona',\n  skills: 'skill',\n  templates: 'template',\n  agents: 'agent',\n  memories: 'memory',\n};\n\n/** Known metadata fields extracted from YAML frontmatter for web display */\nexport interface ElementDisplayMetadata {\n  name?: string;\n  description?: string;\n  version?: string;\n  author?: string;\n  category?: string;\n  created?: string;\n  created_date?: string;\n  modified?: string;\n  tags?: string[];\n  license?: string;\n  age_rating?: string;\n  triggers?: string[];\n  instructions?: string;\n  coordination_strategy?: string;\n  use_cases?: string[];\n  proficiency_levels?: Record<string, string>;\n  gatekeeper?: Record<string, unknown>;\n  goal?: Record<string, unknown>;\n  autonomy?: Record<string, unknown>;\n  memoryType?: string;\n  [key: string]: unknown;\n}\n\nexport interface PipelineResult {\n  valid: boolean;\n  content: string;\n  metadata: ElementDisplayMetadata;\n  body: string;\n  rejection?: {\n    reason: string;\n    severity?: string;\n    patterns?: string[];\n  };\n}\n\n/**\n * Validate element content through the security pipeline.\n *\n * @param filename - The element filename (e.g., \"alex-sterling.md\")\n * @param rawContent - The raw file content string\n * @param elementType - The plural element type directory (e.g., \"personas\")\n * @returns Validated content with parsed metadata, or rejection with reason\n */\nexport function validateElementContent(\n  filename: string,\n  rawContent: string,\n  elementType: string,\n): PipelineResult {\n  // DMCP-SEC-004: Normalize all inputs via UnicodeValidator to prevent\n  // homograph attacks, direction override bypasses, and suspicious patterns.\n  const filenameValidation = UnicodeValidator.normalize(filename);\n  const contentValidation = UnicodeValidator.normalize(rawContent);\n  const normalizedFilename = filenameValidation.normalizedContent;\n  const normalizedContent = contentValidation.normalizedContent;\n  const normalizedType = elementType.normalize('NFC');\n\n  const ext = extname(normalizedFilename);\n  const isYaml = ext === '.yaml' || ext === '.yml';\n  const contentContext = TYPE_TO_CONTEXT[normalizedType];\n\n  // Step 1: Parse and validate structure (YAML bomb detection, circular refs)\n  let metadata: ElementDisplayMetadata = {};\n  let body = '';\n\n  try {\n    if (isYaml) {\n      // Pure YAML file (memories) — use parseRawYaml for structural validation\n      // (bomb detection, circular refs, size limits).\n      // Skip ContentValidator.validateYamlContent() — it produces false positives\n      // on memory content that legitimately contains code patterns, security\n      // keywords, and technical documentation. Memories are locally-generated\n      // trusted content, not untrusted external submissions.\n      const parsed = SecureYamlParser.parseRawYaml(normalizedContent);\n      metadata = (typeof parsed === 'object' && parsed !== null) ? parsed : {};\n    } else {\n      // Markdown with YAML frontmatter\n      const parsed = SecureYamlParser.parse(normalizedContent, { contentContext });\n      metadata = parsed.data;\n      body = parsed.content;\n    }\n  } catch (err) {\n    return {\n      valid: false,\n      content: normalizedContent,\n      metadata: {},\n      body: '',\n      rejection: { reason: `Parse validation failed: ${(err as Error).message}`, severity: 'high' },\n    };\n  }\n\n  // Step 2: Content injection pattern detection (markdown elements only)\n  // YAML memories skip this — they contain legitimate code patterns and\n  // technical content that triggers false positives. The structural YAML\n  // parsing above (bomb/circular ref detection) is sufficient for local content.\n  if (!isYaml) {\n    const validation: ContentValidationResult = ContentValidator.validateAndSanitize(normalizedContent, {\n      contentContext,\n    });\n\n    if (!validation.isValid) {\n      logger.warn('[ContentPipeline] Content rejected', {\n        filename,\n        elementType,\n        patterns: validation.detectedPatterns,\n        severity: validation.severity,\n      });\n      return {\n        valid: false,\n        content: normalizedContent,\n        metadata,\n        body,\n        rejection: {\n          reason: 'Content failed security validation',\n          severity: validation.severity,\n          patterns: validation.detectedPatterns,\n        },\n      };\n    }\n  }\n\n  // Step 3: Return validated content\n  return {\n    valid: true,\n    content: rawContent,\n    metadata,\n    body,\n  };\n}\n"]}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Dynamic port allocation and port file discovery for the web console.
|
|
3
|
+
*
|
|
4
|
+
* When multiple DollhouseMCP sessions run simultaneously (e.g., multiple
|
|
5
|
+
* Claude Code windows, IDE instances, or agent sessions), each needs its
|
|
6
|
+
* own web console port. This module handles:
|
|
7
|
+
*
|
|
8
|
+
* 1. Finding an available port starting from the default (3939)
|
|
9
|
+
* 2. Writing port discovery files so external tools know which port to use
|
|
10
|
+
* 3. Cleaning up port files on process exit
|
|
11
|
+
*
|
|
12
|
+
* Port files are written to ~/.dollhouse/run/:
|
|
13
|
+
* - permission-server-{pid}.port — per-process file (cleaned on exit)
|
|
14
|
+
* - permission-server.port — latest port (convenience for scripts)
|
|
15
|
+
*/
|
|
16
|
+
/**
|
|
17
|
+
* Find an available port starting from the given port.
|
|
18
|
+
*
|
|
19
|
+
* Tries sequential ports, logging each attempt. Returns both the port number
|
|
20
|
+
* and a held server to prevent TOCTOU race conditions. The caller should
|
|
21
|
+
* close the held server after binding their own Express app to the port.
|
|
22
|
+
*
|
|
23
|
+
* @param startPort - Port to try first (default: 3939)
|
|
24
|
+
* @param maxAttempts - Maximum ports to try (default: 10, configurable via DOLLHOUSE_MAX_PORT_ATTEMPTS)
|
|
25
|
+
* @returns Object with port number and held server, or throws if all attempts fail
|
|
26
|
+
*/
|
|
27
|
+
export declare function findAvailablePort(startPort: number, maxAttempts?: number): Promise<number>;
|
|
28
|
+
/**
|
|
29
|
+
* Write the active server port to a discoverable file.
|
|
30
|
+
*
|
|
31
|
+
* Creates two files:
|
|
32
|
+
* - PID-keyed file for per-process cleanup
|
|
33
|
+
* - Latest file for convenience (scripts can read this without knowing the PID)
|
|
34
|
+
*
|
|
35
|
+
* @param port - The port the web server is listening on
|
|
36
|
+
* @returns Path to the PID-keyed port file
|
|
37
|
+
*/
|
|
38
|
+
export declare function writePortFile(port: number): Promise<string>;
|
|
39
|
+
/**
|
|
40
|
+
* Clean up port file on shutdown.
|
|
41
|
+
*/
|
|
42
|
+
export declare function cleanupPortFile(): Promise<void>;
|
|
43
|
+
/**
|
|
44
|
+
* Register process exit handlers to clean up port files.
|
|
45
|
+
* Should be called once after the web server successfully starts.
|
|
46
|
+
*/
|
|
47
|
+
export declare function registerPortCleanup(): void;
|
|
48
|
+
/**
|
|
49
|
+
* Discover an available port, write discovery files, and register cleanup.
|
|
50
|
+
*
|
|
51
|
+
* This is the recommended entry point for Container startup. Combines
|
|
52
|
+
* port discovery, file writing, and cleanup registration in one call.
|
|
53
|
+
*
|
|
54
|
+
* @param defaultPort - Port to try first (default: 3939)
|
|
55
|
+
* @returns The port the server should bind to, or undefined if discovery failed
|
|
56
|
+
*/
|
|
57
|
+
export declare function discoverAndBindPort(defaultPort?: number): Promise<number | undefined>;
|
|
58
|
+
//# sourceMappingURL=portDiscovery.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"portDiscovery.d.ts","sourceRoot":"","sources":["../../src/web/portDiscovery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAwCH;;;;;;;;;;GAUG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,MAAqF,GACjG,OAAO,CAAC,MAAM,CAAC,CAuBjB;AAED;;;;;;;;;GASG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASjE;AAED;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAIrD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAK1C;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CAAC,WAAW,GAAE,MAAa,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAYjG"}
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Dynamic port allocation and port file discovery for the web console.
|
|
3
|
+
*
|
|
4
|
+
* When multiple DollhouseMCP sessions run simultaneously (e.g., multiple
|
|
5
|
+
* Claude Code windows, IDE instances, or agent sessions), each needs its
|
|
6
|
+
* own web console port. This module handles:
|
|
7
|
+
*
|
|
8
|
+
* 1. Finding an available port starting from the default (3939)
|
|
9
|
+
* 2. Writing port discovery files so external tools know which port to use
|
|
10
|
+
* 3. Cleaning up port files on process exit
|
|
11
|
+
*
|
|
12
|
+
* Port files are written to ~/.dollhouse/run/:
|
|
13
|
+
* - permission-server-{pid}.port — per-process file (cleaned on exit)
|
|
14
|
+
* - permission-server.port — latest port (convenience for scripts)
|
|
15
|
+
*/
|
|
16
|
+
import { createServer } from 'node:net';
|
|
17
|
+
import { homedir } from 'node:os';
|
|
18
|
+
import { join } from 'node:path';
|
|
19
|
+
import { mkdir, writeFile, unlink } from 'node:fs/promises';
|
|
20
|
+
import { logger } from '../utils/logger.js';
|
|
21
|
+
/** Default maximum port attempts before giving up */
|
|
22
|
+
const DEFAULT_MAX_PORT_ATTEMPTS = 10;
|
|
23
|
+
/** Directory for runtime state files (port discovery, PID files) */
|
|
24
|
+
const RUN_DIR = join(homedir(), '.dollhouse', 'run');
|
|
25
|
+
/** Track port file path for cleanup */
|
|
26
|
+
let portFilePath = null;
|
|
27
|
+
/**
|
|
28
|
+
* Attempt to bind to a single port. Returns the port if successful, null if in use.
|
|
29
|
+
* Keeps the server listening to prevent TOCTOU race conditions — caller must
|
|
30
|
+
* close the returned server after their own server binds.
|
|
31
|
+
*/
|
|
32
|
+
function tryBindPort(port) {
|
|
33
|
+
return new Promise((resolve) => {
|
|
34
|
+
const server = createServer();
|
|
35
|
+
server.once('error', (err) => {
|
|
36
|
+
if (err.code === 'EADDRINUSE') {
|
|
37
|
+
resolve(null);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
resolve(null);
|
|
41
|
+
logger.debug(`[PortDiscovery] Unexpected error on port ${port}: ${err.code}`);
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
server.once('listening', () => {
|
|
45
|
+
resolve({ port, server });
|
|
46
|
+
});
|
|
47
|
+
server.listen(port, '127.0.0.1');
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Find an available port starting from the given port.
|
|
52
|
+
*
|
|
53
|
+
* Tries sequential ports, logging each attempt. Returns both the port number
|
|
54
|
+
* and a held server to prevent TOCTOU race conditions. The caller should
|
|
55
|
+
* close the held server after binding their own Express app to the port.
|
|
56
|
+
*
|
|
57
|
+
* @param startPort - Port to try first (default: 3939)
|
|
58
|
+
* @param maxAttempts - Maximum ports to try (default: 10, configurable via DOLLHOUSE_MAX_PORT_ATTEMPTS)
|
|
59
|
+
* @returns Object with port number and held server, or throws if all attempts fail
|
|
60
|
+
*/
|
|
61
|
+
export async function findAvailablePort(startPort, maxAttempts = Number(process.env.DOLLHOUSE_MAX_PORT_ATTEMPTS) || DEFAULT_MAX_PORT_ATTEMPTS) {
|
|
62
|
+
for (let attempt = 0; attempt < maxAttempts; attempt++) {
|
|
63
|
+
const port = startPort + attempt;
|
|
64
|
+
logger.debug(`[PortDiscovery] Trying port ${port} (attempt ${attempt + 1}/${maxAttempts})`);
|
|
65
|
+
const result = await tryBindPort(port);
|
|
66
|
+
if (result) {
|
|
67
|
+
// Close the probe server — there's a brief TOCTOU window here between
|
|
68
|
+
// closing and the caller binding, but it's negligible on localhost.
|
|
69
|
+
// A future improvement could return the server for the caller to adopt.
|
|
70
|
+
result.server.close();
|
|
71
|
+
if (attempt > 0) {
|
|
72
|
+
logger.info(`[PortDiscovery] Port ${startPort} in use, using ${port} (after ${attempt} skip${attempt > 1 ? 's' : ''})`);
|
|
73
|
+
}
|
|
74
|
+
return port;
|
|
75
|
+
}
|
|
76
|
+
logger.debug(`[PortDiscovery] Port ${port} in use, trying next`);
|
|
77
|
+
}
|
|
78
|
+
throw new Error(`No available port found in range ${startPort}-${startPort + maxAttempts - 1} ` +
|
|
79
|
+
`after ${maxAttempts} attempts. Set DOLLHOUSE_MAX_PORT_ATTEMPTS to increase the range.`);
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* Write the active server port to a discoverable file.
|
|
83
|
+
*
|
|
84
|
+
* Creates two files:
|
|
85
|
+
* - PID-keyed file for per-process cleanup
|
|
86
|
+
* - Latest file for convenience (scripts can read this without knowing the PID)
|
|
87
|
+
*
|
|
88
|
+
* @param port - The port the web server is listening on
|
|
89
|
+
* @returns Path to the PID-keyed port file
|
|
90
|
+
*/
|
|
91
|
+
export async function writePortFile(port) {
|
|
92
|
+
await mkdir(RUN_DIR, { recursive: true });
|
|
93
|
+
const pidFile = join(RUN_DIR, `permission-server-${process.pid}.port`);
|
|
94
|
+
const latestFile = join(RUN_DIR, 'permission-server.port');
|
|
95
|
+
await writeFile(pidFile, String(port), 'utf-8');
|
|
96
|
+
await writeFile(latestFile, String(port), 'utf-8');
|
|
97
|
+
portFilePath = pidFile;
|
|
98
|
+
logger.debug(`[PortDiscovery] Port file written: ${pidFile}`);
|
|
99
|
+
return pidFile;
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
* Clean up port file on shutdown.
|
|
103
|
+
*/
|
|
104
|
+
export async function cleanupPortFile() {
|
|
105
|
+
if (portFilePath) {
|
|
106
|
+
try {
|
|
107
|
+
await unlink(portFilePath);
|
|
108
|
+
}
|
|
109
|
+
catch { /* already gone */ }
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
* Register process exit handlers to clean up port files.
|
|
114
|
+
* Should be called once after the web server successfully starts.
|
|
115
|
+
*/
|
|
116
|
+
export function registerPortCleanup() {
|
|
117
|
+
const exitCleanup = () => { cleanupPortFile().catch(() => { }); };
|
|
118
|
+
process.once('exit', exitCleanup);
|
|
119
|
+
process.once('SIGTERM', exitCleanup);
|
|
120
|
+
process.once('SIGINT', exitCleanup);
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* Discover an available port, write discovery files, and register cleanup.
|
|
124
|
+
*
|
|
125
|
+
* This is the recommended entry point for Container startup. Combines
|
|
126
|
+
* port discovery, file writing, and cleanup registration in one call.
|
|
127
|
+
*
|
|
128
|
+
* @param defaultPort - Port to try first (default: 3939)
|
|
129
|
+
* @returns The port the server should bind to, or undefined if discovery failed
|
|
130
|
+
*/
|
|
131
|
+
export async function discoverAndBindPort(defaultPort = 3939) {
|
|
132
|
+
try {
|
|
133
|
+
const port = await findAvailablePort(defaultPort);
|
|
134
|
+
await writePortFile(port);
|
|
135
|
+
registerPortCleanup();
|
|
136
|
+
return port;
|
|
137
|
+
}
|
|
138
|
+
catch (err) {
|
|
139
|
+
logger.warn('[PortDiscovery] Port discovery failed:', err);
|
|
140
|
+
return undefined;
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"portDiscovery.js","sourceRoot":"","sources":["../../src/web/portDiscovery.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Dynamic port allocation and port file discovery for the web console.\n *\n * When multiple DollhouseMCP sessions run simultaneously (e.g., multiple\n * Claude Code windows, IDE instances, or agent sessions), each needs its\n * own web console port. This module handles:\n *\n * 1. Finding an available port starting from the default (3939)\n * 2. Writing port discovery files so external tools know which port to use\n * 3. Cleaning up port files on process exit\n *\n * Port files are written to ~/.dollhouse/run/:\n * - permission-server-{pid}.port — per-process file (cleaned on exit)\n * - permission-server.port — latest port (convenience for scripts)\n */\n\nimport { createServer, type Server } from 'node:net';\nimport { homedir } from 'node:os';\nimport { join } from 'node:path';\nimport { mkdir, writeFile, unlink } from 'node:fs/promises';\nimport { logger } from '../utils/logger.js';\n\n/** Default maximum port attempts before giving up */\nconst DEFAULT_MAX_PORT_ATTEMPTS = 10;\n\n/** Directory for runtime state files (port discovery, PID files) */\nconst RUN_DIR = join(homedir(), '.dollhouse', 'run');\n\n/** Track port file path for cleanup */\nlet portFilePath: string | null = null;\n\n/**\n * Attempt to bind to a single port. Returns the port if successful, null if in use.\n * Keeps the server listening to prevent TOCTOU race conditions — caller must\n * close the returned server after their own server binds.\n */\nfunction tryBindPort(port: number): Promise<{ port: number; server: Server } | null> {\n  return new Promise((resolve) => {\n    const server = createServer();\n    server.once('error', (err: NodeJS.ErrnoException) => {\n      if (err.code === 'EADDRINUSE') {\n        resolve(null);\n      } else {\n        resolve(null);\n        logger.debug(`[PortDiscovery] Unexpected error on port ${port}: ${err.code}`);\n      }\n    });\n    server.once('listening', () => {\n      resolve({ port, server });\n    });\n    server.listen(port, '127.0.0.1');\n  });\n}\n\n/**\n * Find an available port starting from the given port.\n *\n * Tries sequential ports, logging each attempt. Returns both the port number\n * and a held server to prevent TOCTOU race conditions. The caller should\n * close the held server after binding their own Express app to the port.\n *\n * @param startPort - Port to try first (default: 3939)\n * @param maxAttempts - Maximum ports to try (default: 10, configurable via DOLLHOUSE_MAX_PORT_ATTEMPTS)\n * @returns Object with port number and held server, or throws if all attempts fail\n */\nexport async function findAvailablePort(\n  startPort: number,\n  maxAttempts: number = Number(process.env.DOLLHOUSE_MAX_PORT_ATTEMPTS) || DEFAULT_MAX_PORT_ATTEMPTS,\n): Promise<number> {\n  for (let attempt = 0; attempt < maxAttempts; attempt++) {\n    const port = startPort + attempt;\n    logger.debug(`[PortDiscovery] Trying port ${port} (attempt ${attempt + 1}/${maxAttempts})`);\n\n    const result = await tryBindPort(port);\n    if (result) {\n      // Close the probe server — there's a brief TOCTOU window here between\n      // closing and the caller binding, but it's negligible on localhost.\n      // A future improvement could return the server for the caller to adopt.\n      result.server.close();\n      if (attempt > 0) {\n        logger.info(`[PortDiscovery] Port ${startPort} in use, using ${port} (after ${attempt} skip${attempt > 1 ? 's' : ''})`);\n      }\n      return port;\n    }\n    logger.debug(`[PortDiscovery] Port ${port} in use, trying next`);\n  }\n\n  throw new Error(\n    `No available port found in range ${startPort}-${startPort + maxAttempts - 1} ` +\n    `after ${maxAttempts} attempts. Set DOLLHOUSE_MAX_PORT_ATTEMPTS to increase the range.`\n  );\n}\n\n/**\n * Write the active server port to a discoverable file.\n *\n * Creates two files:\n * - PID-keyed file for per-process cleanup\n * - Latest file for convenience (scripts can read this without knowing the PID)\n *\n * @param port - The port the web server is listening on\n * @returns Path to the PID-keyed port file\n */\nexport async function writePortFile(port: number): Promise<string> {\n  await mkdir(RUN_DIR, { recursive: true });\n  const pidFile = join(RUN_DIR, `permission-server-${process.pid}.port`);\n  const latestFile = join(RUN_DIR, 'permission-server.port');\n  await writeFile(pidFile, String(port), 'utf-8');\n  await writeFile(latestFile, String(port), 'utf-8');\n  portFilePath = pidFile;\n  logger.debug(`[PortDiscovery] Port file written: ${pidFile}`);\n  return pidFile;\n}\n\n/**\n * Clean up port file on shutdown.\n */\nexport async function cleanupPortFile(): Promise<void> {\n  if (portFilePath) {\n    try { await unlink(portFilePath); } catch { /* already gone */ }\n  }\n}\n\n/**\n * Register process exit handlers to clean up port files.\n * Should be called once after the web server successfully starts.\n */\nexport function registerPortCleanup(): void {\n  const exitCleanup = () => { cleanupPortFile().catch(() => {}); };\n  process.once('exit', exitCleanup);\n  process.once('SIGTERM', exitCleanup);\n  process.once('SIGINT', exitCleanup);\n}\n\n/**\n * Discover an available port, write discovery files, and register cleanup.\n *\n * This is the recommended entry point for Container startup. Combines\n * port discovery, file writing, and cleanup registration in one call.\n *\n * @param defaultPort - Port to try first (default: 3939)\n * @returns The port the server should bind to, or undefined if discovery failed\n */\nexport async function discoverAndBindPort(defaultPort: number = 3939): Promise<number | undefined> {\n  try {\n    const port = await findAvailablePort(defaultPort);\n\n    await writePortFile(port);\n    registerPortCleanup();\n\n    return port;\n  } catch (err) {\n    logger.warn('[PortDiscovery] Port discovery failed:', err);\n    return undefined;\n  }\n}\n"]}
|