@omnitron-dev/omnitron 0.3.3 → 0.4.6

package/dist/daemon/daemon.js

@@ -57,7 +57,6 @@ import { SystemInfoService } from '../services/system-info.service.js';
 import { SystemInfoRpcService } from '../services/system-info.rpc-service.js';
 import { PidManager } from './pid-manager.js';
 import { prepareDaemonDatabase } from './database-startup.js';
-import { FileWatcher } from '../orchestrator/file-watcher.js';
 import { InfrastructureService } from '../infrastructure/infrastructure.service.js';
 import { DockerHealthIndicator } from '../monitoring/docker-health.indicator.js';
 import { AppHealthIndicator } from '../monitoring/app-health.indicator.js';
@@ -188,7 +187,6 @@ export class OmnitronDaemon {
     pidManager = null;
     /** Port this daemon serves `/netron/invoke` on; advertised to fleet peers. */
     rpcHttpPort = null;
-    fileWatcher = null;
     /** Last boot/reload configuration, which may come from a registered project outside CWD. */
     watchConfig = null;
     infraService = null;
@@ -269,7 +267,7 @@ export class OmnitronDaemon {
                 terminalSessions: this.terminalRpcService?.activeSessionCount() ?? 0,
                 fileTransfers: (this.filesRpcService?.activeTransferCount() ?? 0) + (this.fileNode?.activeOperationCount() ?? 0),
                 pipelineRuns: this.pipelineService?.activeRunCount() ?? 0,
-                releaseBuilds: this.releaseService?.builds().filter(build => build.state === 'running').length ?? 0,
+                releaseBuilds: this.releaseService?.activeBuildCount ?? 0,
                 backupOperations: this.backupService?.activeOperationCount() ?? 0,
             },
         };
@@ -290,12 +288,9 @@ export class OmnitronDaemon {
             return this.ownerAdmissionProof.build;
         }
         const observe = async () => {
-            const snapshot = await client.recoverySnapshot();
-            const status = snapshot.status, live = client.state();
-            if (live?.phase !== 'active' || live.connection.status !== 'connected' || live.epoch !== epoch ||
-                live.owner.id !== owner.id || live.owner.pid !== owner.pid || live.owner.startedAt !== owner.startedAt ||
-                this.execution !== client || this.isShuttingDown || this.handingOffBackend || this.preparingBackend ||
-                status.phase !== 'active' || status.controller.controllerId !== client.controllerId || status.controller.epoch !== epoch ||
+            const snapshot = await client.controlledOwnerSnapshot({ ownerId: owner.id, controllerId: client.controllerId, epoch });
+            const status = snapshot.status;
+            if (this.execution !== client || this.isShuttingDown || this.handingOffBackend || this.preparingBackend ||
                 status.owner.id !== owner.id || status.owner.pid !== owner.pid || status.owner.startedAt !== owner.startedAt)
                 throw new Error('Application owner or controller changed during admission');
             return snapshot;
@@ -524,7 +519,7 @@ export class OmnitronDaemon {
         this.startupAbort.signal.throwIfAborted();
         // 8. File watching (dev mode)
         if (!options?.backendHandoff)
-            await this.startFileWatcher(config, options, logger);
+            await this.configureWatch(options, logger);
         this.startupAbort.signal.throwIfAborted();
         // 8.5. Configure application-owned topology listeners for in-process ownership.
         {
@@ -944,13 +939,14 @@ export class OmnitronDaemon {
         // second one over RPC would give one machine two reconcilers over one
         // set of containers.
         isSlave
-            ? (infraConfig, declaredServices, presetRegistry, serviceOverrides) => {
+            ? (infraConfig, declaredServices, presetRegistry, serviceOverrides, stackOwned) => {
                 const service = new InfrastructureService(loggerModule.logger.child({ component: 'infra' }), infraConfig, declaredServices, presetRegistry, serviceOverrides, 
                 // A node keeps its own state in SQLite. Provisioning a
                 // control-plane Postgres for it gives the host a database
                 // nobody queries, on default credentials.
                 false);
-                this.infraService = service;
+                if (!stackOwned)
+                    this.infraService = service;
                 return service;
             }
             : undefined, 
@@ -974,7 +970,7 @@ export class OmnitronDaemon {
         // The logger, because the one thing this service says on its own — that
         // a deployment is running on a default credential — is said at error
         // level and reaches nobody without it.
-        loggerModule.logger.child({ component: 'infra' }), undefined, () => projectService.getInfraManager().listInstances().flatMap(({ infra }) => Object.values(infra.getState().services)));
+        loggerModule.logger.child({ component: 'infra' }), undefined, () => projectService.getInfraManager().listInstances().flatMap(({ infra }) => Object.values(infra.getState().services)), isSlave ? projectService.getInfraManager() : undefined);
         // Project + Stack management RPC service
         const stateStore = await container.resolveAsync(DAEMON_STATE_STORE_TOKEN);
         const { clusterDatabaseUrl, clusterEnrollment } = await import('../cluster/enrollment.js');
@@ -1008,9 +1004,32 @@ export class OmnitronDaemon {
         if (!isSlave) {
             const { ReleaseService } = await import('../services/release.service.js');
             const { ReleaseRpcService } = await import('../services/release.rpc-service.js');
-            this.releaseService = new ReleaseService(loggerModule.logger.child({ component: 'release' }));
+            const { readSavedDaemonConfig } = await import('../config/saved.js');
+            this.releaseService = new ReleaseService(loggerModule.logger.child({ component: 'release' }), dc.releaseBuildConcurrency, stateStore, readSavedDaemonConfig()?.releaseStore ? async (id, { signal, progress }) => {
+                if (!audit)
+                    throw Error('Publishing requires audit storage');
+                const { configuredReleaseStore, configuredStoreConfig } = await import('../release/configured-store.js');
+                const { pushRelease } = await import('../release/artifact-store.js');
+                await audit.record({ action: 'release.push.requested', resourceType: 'release', resourceId: id }, true);
+                const store = await configuredReleaseStore(configuredStoreConfig(), key => secretsService.get(key), signal);
+                const cancel = () => { void store.close().catch(() => { }); };
+                signal.addEventListener('abort', cancel, { once: true });
+                try {
+                    signal.throwIfAborted();
+                    const result = await pushRelease(id, store, { signal, onProgress: (done, total) => progress(done.files, total.files) });
+                    await audit.record({ action: 'release.push', resourceType: 'release', resourceId: id,
+                        details: { indexSha256: result.indexSha256, files: result.moved.files, bytes: result.moved.bytes } }, true);
+                    return { indexSha256: result.indexSha256, location: result.location };
+                }
+                finally {
+                    signal.removeEventListener('abort', cancel);
+                    await store.close();
+                }
+            } : undefined);
+            await this.releaseService.restore();
             const releaseAuth = await container.resolveAsync(AUTH_SERVICE_TOKEN);
-            await this.app.netron.peer.exposeService(new ReleaseRpcService(this.releaseService, audit, projectService, releaseAuth));
+            const { releaseStoreStatus } = await import('../release/configured-store.js');
+            await this.app.netron.peer.exposeService(new ReleaseRpcService(this.releaseService, audit, projectService, releaseAuth, releaseStoreStatus));
         }
         // One service owns both the SQLite outbox writer and the replication transport.
         this.syncService = await container.resolveAsync(SYNC_SERVICE_TOKEN);
@@ -1239,7 +1258,20 @@ export class OmnitronDaemon {
             const pipelineService = await container.resolveAsync(PIPELINE_SERVICE_TOKEN);
             if (!audit || !this.nodeManagerService)
                 throw new Error('Pipeline execution requires audit and node services');
-            pipelineService.configure(this.nodeManagerService, (status, duration) => this.metricsBridge?.recordPipelineRun(status, duration));
+            pipelineService.configure(this.nodeManagerService, (status, duration) => this.metricsBridge?.recordPipelineRun(status, duration), {
+                projects: projectService,
+                assertLifecycle: async () => {
+                    const execution = this.execution;
+                    const assertLocal = () => {
+                        if (this.isShuttingDown || this.preparingBackend || this.handingOffBackend || this.execution !== execution)
+                            throw new Error('Controller handoff or shutdown is in progress');
+                    };
+                    assertLocal();
+                    if (execution)
+                        await execution.controlledOwnerSnapshot();
+                    assertLocal();
+                },
+            });
             await pipelineService.initialize();
             this.pipelineService = pipelineService;
             const pipelineRpcService = new PipelineRpc(pipelineService, authService, audit);
@@ -1540,7 +1572,7 @@ export class OmnitronDaemon {
     // ============================================================================
     // File Watching (dev mode)
     // ============================================================================
-    async startFileWatcher(config, options, logger) {
+    async configureWatch(options, logger) {
         if (!this.app)
             return;
         const orchestrator = await this.app.container.resolveAsync(ORCHESTRATOR_TOKEN);
@@ -1549,12 +1581,6 @@ export class OmnitronDaemon {
             logger.warn('File-triggered restarts require standalone lifecycle authority');
         orchestrator.devMode = enabled;
         await orchestrator.setWatchMode(enabled, options?.watchApps);
-        if (this.execution)
-            return;
-        if (!enabled)
-            return;
-        this.fileWatcher = new FileWatcher(logger, orchestrator, config, process.cwd());
-        this.fileWatcher.start(options?.watchApps);
     }
     // ============================================================================
     // Start Managed Apps
@@ -1832,9 +1858,6 @@ export class OmnitronDaemon {
                     ? tsPath
                     : jsPath; // fall through to .js — error will be clear if missing
             const spawnOpts = {};
-            if (process.execArgv.some((a) => a.includes('tsx'))) {
-                spawnOpts.execArgv = ['--import', 'tsx/esm'];
-            }
             // What the worker has to do before it can report ready is create a
             // Titan application — a DI container, a module graph and a PG pool.
             // Managed applications get two to five minutes for that; this was
@@ -2138,20 +2161,9 @@ export class OmnitronDaemon {
         if (!config)
             throw new Error('Daemon watch configuration is unavailable');
         const orchestrator = await this.app.container.resolveAsync(ORCHESTRATOR_TOKEN);
-        const loggerModule = await this.app.container.resolveAsync(LOGGER_SERVICE_TOKEN);
-        if (this.execution) {
-            orchestrator.devMode = true;
-            await orchestrator.setWatchMode(true, apps);
-            return orchestrator.getBuildWatchedApps();
-        }
-        if (this.fileWatcher) {
-            this.fileWatcher.stop();
-        }
-        this.fileWatcher = new FileWatcher(loggerModule.logger, orchestrator, config, process.cwd());
         orchestrator.devMode = true;
         await orchestrator.setWatchMode(true, apps);
-        this.fileWatcher.start(apps);
-        return [...this.fileWatcher.getWatchedApps(), ...orchestrator.getBuildWatchedApps()];
+        return orchestrator.getWatchedApps();
     }
     /**
      * Point the file watcher at a reloaded config, if one is running.
@@ -2163,7 +2175,6 @@ export class OmnitronDaemon {
      */
     async applyWatchConfig(config) {
         this.watchConfig = config;
-        this.fileWatcher?.applyConfig(config);
         if (!this.app)
             return;
         const orchestrator = await this.app.container.resolveAsync(ORCHESTRATOR_TOKEN);
@@ -2185,22 +2196,20 @@ export class OmnitronDaemon {
         }
     }
     async disableWatch() {
-        this.fileWatcher?.stop();
-        this.fileWatcher = null;
         if (this.app) {
             const orchestrator = await this.app.container.resolveAsync(ORCHESTRATOR_TOKEN);
             await orchestrator.setWatchMode(false);
         }
     }
-    /** Reports both watcher engines, including registered bootstrap projects. */
+    /** Reports the owner's native and esbuild registrations for every project. */
     async getWatchStatus() {
         const orchestrator = this.app
             ? await this.app.container.resolveAsync(ORCHESTRATOR_TOKEN) : null;
-        const apps = [...(this.fileWatcher?.getWatchedApps() ?? []), ...(orchestrator?.getBuildWatchedApps() ?? [])];
+        const apps = orchestrator?.getWatchedApps() ?? [];
         return {
-            enabled: this.execution ? !!orchestrator?.devMode : !!this.fileWatcher,
+            enabled: !!orchestrator?.devMode,
             watching: apps.length > 0,
-            ...(apps.length ? {} : { reason: (this.execution ? orchestrator?.devMode : this.fileWatcher) ? 'no enabled app matches the watch policy' : 'watching is disabled' }),
+            ...(apps.length ? {} : { reason: orchestrator?.devMode ? 'no enabled app matches the watch policy' : 'watching is disabled' }),
             apps,
         };
     }
@@ -2370,9 +2379,10 @@ export class OmnitronDaemon {
             this.pipelineService = null;
             this.terminalRpcService?.dispose();
             this.terminalRpcService = null;
-            if (this.fileWatcher) {
-                this.fileWatcher.stop();
-                this.fileWatcher = null;
+            // Resident watching belongs to the owner and survives backend replacement.
+            if (!this.execution && container.has(ORCHESTRATOR_TOKEN)) {
+                const orchestrator = await container.resolveAsync(ORCHESTRATOR_TOKEN);
+                await orchestrator.setWatchMode(false);
             }
             if (this.eventBroadcaster) {
                 this.eventBroadcaster.clear();