@adelie/server 0.6.6 → 0.6.7

package/dist/index.js

@@ -3828,7 +3828,7 @@ import { DEFAULT_PROJECT_ID as DEFAULT_PROJECT_ID3, DEFAULT_PROJECT_NAME as DEFA
 
 // src/ifaces.json
 var ifaces_default = {
-  hash: "24e6dab61d3570cd29ae2b879e85ab58aec3a69473bce064ed4291e6e924c3ce",
+  hash: "bd8f0cb27b4ce1db502e9b13e9818933c2b572478fcb7917370d8e7ac36afbfe",
   ifaces: {
     "@adelie/server#Access": {
       name: "Access",
@@ -28687,6 +28687,10 @@ var ifaces_default = {
         access: {
           iface: "@adelie/server#Access",
           from: "ProjectsModule"
+        },
+        errors: {
+          iface: "@adelie/server#Errors",
+          from: "ObservabilityModule"
         }
       },
       provides: {
@@ -64462,6 +64466,9 @@ function currentRemoteLayout(env = process.env) {
 var KEEP_HELD_MS = 6e4;
 var REHOLD_BACKOFF_MIN_MS = 6e4;
 var REHOLD_BACKOFF_MAX_MS = 15 * 6e4;
+function machinesErrorRecord(err, code2, projectId) {
+  return { source: "process", err, code: code2, ctx: projectId === void 0 ? void 0 : { projectId } };
+}
 var LOCAL_MACHINE_ID = "local";
 var CONCURRENCY = 5;
 var SESSION_REUSE_MS = 50 * 6e4;
@@ -64490,6 +64497,8 @@ var MachinesService = class {
       upgrade: upgradeRemote,
       loadConfig: (projectId) => loadProjectConfig(dataRoot, projectId),
       now: () => /* @__PURE__ */ new Date(),
+      recordError: () => {
+      },
       ...effects
     };
   }
@@ -64534,6 +64543,13 @@ var MachinesService = class {
   #jobs = /* @__PURE__ */ new Map();
   /** The standing intent: while this App lives, machines recorded as held are re-held when found dropped. */
   #keepHeld = null;
+  /**
+   * Whether this generation has been retired. start() reaches out over the network before it
+   * settles, so a hot push's stop() can land while it is still awaiting: the generation must
+   * then install nothing — a timer on a retired generation would read a database that is
+   * already closed, once a minute, until the process ends.
+   */
+  #stopped = false;
   /** Per machine, when the next re-hold may be tried (epoch ms) and how many tries have failed in a row. */
   #reholdNotBefore = /* @__PURE__ */ new Map();
   #reholdFailures = /* @__PURE__ */ new Map();
@@ -65201,19 +65217,43 @@ var MachinesService = class {
    * slow to answer must not hold up the App that serves everything else.
    */
   async start() {
+    if (this.#stopped) return;
     await this.syncOutOfDate();
+    if (this.#stopped) return;
     await this.autoConnect();
-    if (this.#keepHeld === null) {
-      this.#keepHeld = setInterval(() => void this.autoConnect(), KEEP_HELD_MS);
+    if (!this.#stopped && this.#keepHeld === null) {
+      this.#keepHeld = setInterval(() => void this.#keepHeldTick(), KEEP_HELD_MS);
       this.#keepHeld.unref?.();
     }
   }
+  /**
+   * One attempt of the standing intent, from the timer.
+   *
+   * The boot path in platform.ts is fire-and-forget too, but it has somewhere to put a
+   * rejection (its own `.catch`); a timer callback has nobody to throw to, so a rejection here
+   * would escape to the process as an unhandled rejection — which is what used to happen once a
+   * minute whenever a sweep failed. It is recorded instead, under the same source and code as
+   * that boot path: one machine failing to come back is one class in the error centre, and one
+   * rule there silences both occasions.
+   *
+   * The guard first: a stop() landing between the tick and this call retires the generation,
+   * and reading a closed database to tell its error table about it helps nobody.
+   */
+  async #keepHeldTick() {
+    if (this.#stopped) return;
+    try {
+      await this.autoConnect();
+    } catch (err) {
+      if (!this.#stopped) this.#effects.recordError(err, "machines_reconnect_failed");
+    }
+  }
   /**
    * Closes every connection THIS generation opened — the platform's dispose effect on a hot
    * push. The record of which were held stays, so the successor's start() brings each back.
    * Nothing here closes by a remembered pid: the child handles are this generation's own.
    */
   stop() {
+    this.#stopped = true;
     if (this.#keepHeld !== null) clearInterval(this.#keepHeld);
     this.#keepHeld = null;
     closeAllConnections();
@@ -65508,27 +65548,31 @@ var MachinesService = class {
    * interface member is a contract change a pushed platform pays for.
    */
   async syncModelsEverywhere(projectId) {
-    const connected = this.list(projectId).filter(
-      (m) => !m.local && m.installed !== null && m.connection !== null
-    );
-    await Promise.all(
-      connected.map(async (machine) => {
-        const address = machine.id;
-        const port = this.#liveSession(address) === null ? null : this.repo.get(address)?.remotePort ?? null;
-        if (port === null) return;
-        try {
-          await this.#syncCoalesced(address, this.#targetOf(machine.alias), port, () => [
-            projectId
-          ]);
-        } catch {
-        }
-      })
-    );
+    try {
+      const connected = this.list(projectId).filter(
+        (m) => !m.local && m.installed !== null && m.connection !== null
+      );
+      await Promise.all(
+        connected.map(async (machine) => {
+          const address = machine.id;
+          const port = this.#liveSession(address) === null ? null : this.repo.get(address)?.remotePort ?? null;
+          if (port === null) return;
+          try {
+            await this.#syncCoalesced(address, this.#targetOf(machine.alias), port, () => [
+              projectId
+            ]);
+          } catch {
+          }
+        })
+      );
+    } catch (err) {
+      this.#effects.recordError(err, "fleet_sync_failed", projectId);
+    }
   }
 };
 var Machines = class extends Interface23() {
 };
-var _serverProxyRoutes_dec, _routes_dec6, _machines_dec2, _access_dec7, _hmr_dec3, _db_dec16, _paths_dec16, _MachinesModule_decorators, _init116;
+var _serverProxyRoutes_dec, _routes_dec6, _machines_dec2, _errors_dec7, _access_dec7, _hmr_dec3, _db_dec16, _paths_dec16, _MachinesModule_decorators, _init116;
 _MachinesModule_decorators = [Module16({
   contributes: {
     "HttpModule.routes": [
@@ -65548,16 +65592,17 @@ _MachinesModule_decorators = [Module16({
       }
     ]
   }
-})], _paths_dec16 = [Use56()], _db_dec16 = [Use56()], _hmr_dec3 = [Use56()], _access_dec7 = [Use56()], _machines_dec2 = [Provide16()], _routes_dec6 = [Bind16("MachinesModule.routes")], _serverProxyRoutes_dec = [Bind16("MachinesModule.server-proxy")];
+})], _paths_dec16 = [Use56()], _db_dec16 = [Use56()], _hmr_dec3 = [Use56()], _access_dec7 = [Use56()], _errors_dec7 = [Use56()], _machines_dec2 = [Provide16()], _routes_dec6 = [Bind16("MachinesModule.routes")], _serverProxyRoutes_dec = [Bind16("MachinesModule.server-proxy")];
 var MachinesModule = class {
   constructor() {
     __publicField(this, "paths", __runInitializers(_init116, 8, this)), __runInitializers(_init116, 11, this);
     __publicField(this, "db", __runInitializers(_init116, 12, this)), __runInitializers(_init116, 15, this);
     __publicField(this, "hmr", __runInitializers(_init116, 16, this)), __runInitializers(_init116, 19, this);
     __publicField(this, "access", __runInitializers(_init116, 20, this)), __runInitializers(_init116, 23, this);
-    __publicField(this, "machines", __runInitializers(_init116, 24, this)), __runInitializers(_init116, 27, this);
-    __publicField(this, "routes", __runInitializers(_init116, 28, this)), __runInitializers(_init116, 31, this);
-    __publicField(this, "serverProxyRoutes", __runInitializers(_init116, 32, this)), __runInitializers(_init116, 35, this);
+    __publicField(this, "errors", __runInitializers(_init116, 24, this)), __runInitializers(_init116, 27, this);
+    __publicField(this, "machines", __runInitializers(_init116, 28, this)), __runInitializers(_init116, 31, this);
+    __publicField(this, "routes", __runInitializers(_init116, 32, this)), __runInitializers(_init116, 35, this);
+    __publicField(this, "serverProxyRoutes", __runInitializers(_init116, 36, this)), __runInitializers(_init116, 39, this);
   }
   setup({ effect }) {
     const repo = new MachinesRepo(this.db);
@@ -65565,7 +65610,13 @@ var MachinesModule = class {
       this.paths.root,
       repo.ownId(),
       repo,
-      {},
+      {
+        // The standing-intent timer's failures have no caller to throw to; they go to the error
+        // centre under the same source and code the boot path uses for the same failure
+        // (platform.ts), so one machine that will not come back is one silenceable class. The
+        // code is the port's, not this wiring's: the fleet push files its own class the same way.
+        recordError: (err, code2, projectId) => this.errors.record(machinesErrorRecord(err, code2, projectId))
+      },
       () => this.hmr.assetsDir()
     );
     this.machines = machines;
@@ -65579,6 +65630,7 @@ __decorateElement(_init116, 5, "paths", _paths_dec16, MachinesModule);
 __decorateElement(_init116, 5, "db", _db_dec16, MachinesModule);
 __decorateElement(_init116, 5, "hmr", _hmr_dec3, MachinesModule);
 __decorateElement(_init116, 5, "access", _access_dec7, MachinesModule);
+__decorateElement(_init116, 5, "errors", _errors_dec7, MachinesModule);
 __decorateElement(_init116, 5, "machines", _machines_dec2, MachinesModule);
 __decorateElement(_init116, 5, "routes", _routes_dec6, MachinesModule);
 __decorateElement(_init116, 5, "serverProxyRoutes", _serverProxyRoutes_dec, MachinesModule);
@@ -70801,8 +70853,8 @@ var OrgService = class extends Interface25() {
 };
 var OrgScheduler = class extends Interface25() {
 };
-var _orgScheduler_dec, _orgService_dec, _messagingRepo_dec3, _settings_dec6, _errors_dec7, _usage_dec6, _projectConfig_dec13, _agentsRepo_dec, _agentConfig_dec6, _agentService_dec, _sessionCreator_dec2, _runner_dec3, _sessionsRepo_dec4, _members_dec4, _projects_dec7, _cache_dec, _log_dec4, _clock_dec12, _channels_dec9, _config_dec11, _OrganizationModule_decorators, _init117;
-_OrganizationModule_decorators = [Module17()], _config_dec11 = [Use57()], _channels_dec9 = [Use57()], _clock_dec12 = [Use57()], _log_dec4 = [Use57()], _cache_dec = [Use57()], _projects_dec7 = [Use57()], _members_dec4 = [Use57()], _sessionsRepo_dec4 = [Use57()], _runner_dec3 = [Use57()], _sessionCreator_dec2 = [Use57()], _agentService_dec = [Use57()], _agentConfig_dec6 = [Use57()], _agentsRepo_dec = [Use57()], _projectConfig_dec13 = [Use57()], _usage_dec6 = [Use57()], _errors_dec7 = [Use57()], _settings_dec6 = [Use57()], _messagingRepo_dec3 = [Use57()], _orgService_dec = [Provide17()], _orgScheduler_dec = [Provide17()];
+var _orgScheduler_dec, _orgService_dec, _messagingRepo_dec3, _settings_dec6, _errors_dec8, _usage_dec6, _projectConfig_dec13, _agentsRepo_dec, _agentConfig_dec6, _agentService_dec, _sessionCreator_dec2, _runner_dec3, _sessionsRepo_dec4, _members_dec4, _projects_dec7, _cache_dec, _log_dec4, _clock_dec12, _channels_dec9, _config_dec11, _OrganizationModule_decorators, _init117;
+_OrganizationModule_decorators = [Module17()], _config_dec11 = [Use57()], _channels_dec9 = [Use57()], _clock_dec12 = [Use57()], _log_dec4 = [Use57()], _cache_dec = [Use57()], _projects_dec7 = [Use57()], _members_dec4 = [Use57()], _sessionsRepo_dec4 = [Use57()], _runner_dec3 = [Use57()], _sessionCreator_dec2 = [Use57()], _agentService_dec = [Use57()], _agentConfig_dec6 = [Use57()], _agentsRepo_dec = [Use57()], _projectConfig_dec13 = [Use57()], _usage_dec6 = [Use57()], _errors_dec8 = [Use57()], _settings_dec6 = [Use57()], _messagingRepo_dec3 = [Use57()], _orgService_dec = [Provide17()], _orgScheduler_dec = [Provide17()];
 var OrganizationModule = class {
   constructor() {
     __publicField(this, "config", __runInitializers(_init117, 8, this)), __runInitializers(_init117, 11, this);
@@ -70909,7 +70961,7 @@ __decorateElement(_init117, 5, "agentConfig", _agentConfig_dec6, OrganizationMod
 __decorateElement(_init117, 5, "agentsRepo", _agentsRepo_dec, OrganizationModule);
 __decorateElement(_init117, 5, "projectConfig", _projectConfig_dec13, OrganizationModule);
 __decorateElement(_init117, 5, "usage", _usage_dec6, OrganizationModule);
-__decorateElement(_init117, 5, "errors", _errors_dec7, OrganizationModule);
+__decorateElement(_init117, 5, "errors", _errors_dec8, OrganizationModule);
 __decorateElement(_init117, 5, "settings", _settings_dec6, OrganizationModule);
 __decorateElement(_init117, 5, "messagingRepo", _messagingRepo_dec3, OrganizationModule);
 __decorateElement(_init117, 5, "orgService", _orgService_dec, OrganizationModule);
@@ -76182,7 +76234,7 @@ function suggestIdRoutes(deps) {
   });
   return app;
 }
-var _routes_dec24, _log_dec5, _errors_dec8, _settings_dec11, _orgService_dec3, _benchmarks_dec2, _agents_dec4, _projectConfig_dec15, _projects_dec8, _access_dec10, _SuggestIdRoutes_decorators, _init140;
+var _routes_dec24, _log_dec5, _errors_dec9, _settings_dec11, _orgService_dec3, _benchmarks_dec2, _agents_dec4, _projectConfig_dec15, _projects_dec8, _access_dec10, _SuggestIdRoutes_decorators, _init140;
 _SuggestIdRoutes_decorators = [Component70({
   contributes: {
     "HttpModule.routes": [
@@ -76194,7 +76246,7 @@ _SuggestIdRoutes_decorators = [Component70({
       }
     ]
   }
-})], _access_dec10 = [Use72()], _projects_dec8 = [Use72()], _projectConfig_dec15 = [Use72()], _agents_dec4 = [Use72()], _benchmarks_dec2 = [Use72()], _orgService_dec3 = [Use72()], _settings_dec11 = [Use72()], _errors_dec8 = [Use72()], _log_dec5 = [Use72()], _routes_dec24 = [Bind30("SuggestIdRoutes.routes")];
+})], _access_dec10 = [Use72()], _projects_dec8 = [Use72()], _projectConfig_dec15 = [Use72()], _agents_dec4 = [Use72()], _benchmarks_dec2 = [Use72()], _orgService_dec3 = [Use72()], _settings_dec11 = [Use72()], _errors_dec9 = [Use72()], _log_dec5 = [Use72()], _routes_dec24 = [Bind30("SuggestIdRoutes.routes")];
 var SuggestIdRoutes = class {
   constructor() {
     __publicField(this, "access", __runInitializers(_init140, 8, this)), __runInitializers(_init140, 11, this);
@@ -76238,7 +76290,7 @@ __decorateElement(_init140, 5, "agents", _agents_dec4, SuggestIdRoutes);
 __decorateElement(_init140, 5, "benchmarks", _benchmarks_dec2, SuggestIdRoutes);
 __decorateElement(_init140, 5, "orgService", _orgService_dec3, SuggestIdRoutes);
 __decorateElement(_init140, 5, "settings", _settings_dec11, SuggestIdRoutes);
-__decorateElement(_init140, 5, "errors", _errors_dec8, SuggestIdRoutes);
+__decorateElement(_init140, 5, "errors", _errors_dec9, SuggestIdRoutes);
 __decorateElement(_init140, 5, "log", _log_dec5, SuggestIdRoutes);
 __decorateElement(_init140, 5, "routes", _routes_dec24, SuggestIdRoutes);
 SuggestIdRoutes = __decorateElement(_init140, 0, "SuggestIdRoutes", _SuggestIdRoutes_decorators, SuggestIdRoutes);
@@ -77906,8 +77958,8 @@ var Http = class {
 _init184 = __decoratorStart(null);
 Http = __decorateElement(_init184, 0, "Http", _Http_decorators, Http);
 __runInitializers(_init184, 1, Http);
-var _http_dec3, _access_dec12, _settings_dec12, _errors_dec9, _auth_dec10, _log_dec7, _config_dec21, _HttpModule_decorators, _init185;
-_HttpModule_decorators = [Module19()], _config_dec21 = [Use76()], _log_dec7 = [Use76()], _auth_dec10 = [Use76()], _errors_dec9 = [Use76()], _settings_dec12 = [Use76()], _access_dec12 = [Use76()], _http_dec3 = [Provide19()];
+var _http_dec3, _access_dec12, _settings_dec12, _errors_dec10, _auth_dec10, _log_dec7, _config_dec21, _HttpModule_decorators, _init185;
+_HttpModule_decorators = [Module19()], _config_dec21 = [Use76()], _log_dec7 = [Use76()], _auth_dec10 = [Use76()], _errors_dec10 = [Use76()], _settings_dec12 = [Use76()], _access_dec12 = [Use76()], _http_dec3 = [Provide19()];
 var HttpModule = class {
   constructor() {
     __publicField(this, "config", __runInitializers(_init185, 8, this)), __runInitializers(_init185, 11, this);
@@ -77982,7 +78034,7 @@ _init185 = __decoratorStart(null);
 __decorateElement(_init185, 5, "config", _config_dec21, HttpModule);
 __decorateElement(_init185, 5, "log", _log_dec7, HttpModule);
 __decorateElement(_init185, 5, "auth", _auth_dec10, HttpModule);
-__decorateElement(_init185, 5, "errors", _errors_dec9, HttpModule);
+__decorateElement(_init185, 5, "errors", _errors_dec10, HttpModule);
 __decorateElement(_init185, 5, "settings", _settings_dec12, HttpModule);
 __decorateElement(_init185, 5, "access", _access_dec12, HttpModule);
 __decorateElement(_init185, 5, "http", _http_dec3, HttpModule);
@@ -83389,7 +83441,7 @@ function agentApiTryRoutes(deps) {
 }
 
 // src/amsp/module.ts
-var _tryRoutes_dec, _routes_dec27, _access_dec13, _clock_dec14, _errors_dec10, _log_dec9, _agentConfig_dec8, _channels_dec13, _sessionService_dec3, _manager_dec5, _sessions_dec7, _agentApi_dec4, _settings_dec13, _AmspRoutes_decorators, _init194;
+var _tryRoutes_dec, _routes_dec27, _access_dec13, _clock_dec14, _errors_dec11, _log_dec9, _agentConfig_dec8, _channels_dec13, _sessionService_dec3, _manager_dec5, _sessions_dec7, _agentApi_dec4, _settings_dec13, _AmspRoutes_decorators, _init194;
 _AmspRoutes_decorators = [Component75({
   contributes: {
     "HttpModule.routes": [
@@ -83402,7 +83454,7 @@ _AmspRoutes_decorators = [Component75({
       }
     ]
   }
-})], _settings_dec13 = [Use79()], _agentApi_dec4 = [Use79()], _sessions_dec7 = [Use79()], _manager_dec5 = [Use79()], _sessionService_dec3 = [Use79()], _channels_dec13 = [Use79()], _agentConfig_dec8 = [Use79()], _log_dec9 = [Use79()], _errors_dec10 = [Use79()], _clock_dec14 = [Use79()], _access_dec13 = [Use79()], _routes_dec27 = [Bind35("AmspRoutes.routes")], _tryRoutes_dec = [Bind35("AmspRoutes.try")];
+})], _settings_dec13 = [Use79()], _agentApi_dec4 = [Use79()], _sessions_dec7 = [Use79()], _manager_dec5 = [Use79()], _sessionService_dec3 = [Use79()], _channels_dec13 = [Use79()], _agentConfig_dec8 = [Use79()], _log_dec9 = [Use79()], _errors_dec11 = [Use79()], _clock_dec14 = [Use79()], _access_dec13 = [Use79()], _routes_dec27 = [Bind35("AmspRoutes.routes")], _tryRoutes_dec = [Bind35("AmspRoutes.try")];
 var AmspRoutes = class {
   constructor() {
     __publicField(this, "settings", __runInitializers(_init194, 8, this)), __runInitializers(_init194, 11, this);
@@ -83446,7 +83498,7 @@ __decorateElement(_init194, 5, "sessionService", _sessionService_dec3, AmspRoute
 __decorateElement(_init194, 5, "channels", _channels_dec13, AmspRoutes);
 __decorateElement(_init194, 5, "agentConfig", _agentConfig_dec8, AmspRoutes);
 __decorateElement(_init194, 5, "log", _log_dec9, AmspRoutes);
-__decorateElement(_init194, 5, "errors", _errors_dec10, AmspRoutes);
+__decorateElement(_init194, 5, "errors", _errors_dec11, AmspRoutes);
 __decorateElement(_init194, 5, "clock", _clock_dec14, AmspRoutes);
 __decorateElement(_init194, 5, "access", _access_dec13, AmspRoutes);
 __decorateElement(_init194, 5, "routes", _routes_dec27, AmspRoutes);
@@ -83465,8 +83517,8 @@ AgentApiModule = __decorateElement(_init195, 0, "AgentApiModule", _AgentApiModul
 __runInitializers(_init195, 1, AgentApiModule);
 
 // src/platform.ts
-var _agents_dec6, _usage_dec7, _projectConfig_dec16, _errors_dec11, _machines_dec5, _sessionService_dec4, _orgScheduler_dec2, _scheduler_dec2, _Startup_decorators, _init196;
-_Startup_decorators = [Component76()], _scheduler_dec2 = [Use80()], _orgScheduler_dec2 = [Use80()], _sessionService_dec4 = [Use80()], _machines_dec5 = [Use80()], _errors_dec11 = [Use80()], _projectConfig_dec16 = [Use80()], _usage_dec7 = [Use80()], _agents_dec6 = [Use80()];
+var _agents_dec6, _usage_dec7, _projectConfig_dec16, _errors_dec12, _machines_dec5, _sessionService_dec4, _orgScheduler_dec2, _scheduler_dec2, _Startup_decorators, _init196;
+_Startup_decorators = [Component76()], _scheduler_dec2 = [Use80()], _orgScheduler_dec2 = [Use80()], _sessionService_dec4 = [Use80()], _machines_dec5 = [Use80()], _errors_dec12 = [Use80()], _projectConfig_dec16 = [Use80()], _usage_dec7 = [Use80()], _agents_dec6 = [Use80()];
 var Startup = class {
   constructor() {
     __publicField(this, "scheduler", __runInitializers(_init196, 8, this)), __runInitializers(_init196, 11, this);
@@ -83503,7 +83555,7 @@ __decorateElement(_init196, 5, "scheduler", _scheduler_dec2, Startup);
 __decorateElement(_init196, 5, "orgScheduler", _orgScheduler_dec2, Startup);
 __decorateElement(_init196, 5, "sessionService", _sessionService_dec4, Startup);
 __decorateElement(_init196, 5, "machines", _machines_dec5, Startup);
-__decorateElement(_init196, 5, "errors", _errors_dec11, Startup);
+__decorateElement(_init196, 5, "errors", _errors_dec12, Startup);
 __decorateElement(_init196, 5, "projectConfig", _projectConfig_dec16, Startup);
 __decorateElement(_init196, 5, "usage", _usage_dec7, Startup);
 __decorateElement(_init196, 5, "agents", _agents_dec6, Startup);