@volter/teams 0.1.39 → 0.1.40

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.
Files changed (2) hide show
  1. package/machine-core.mjs +29 -4
  2. package/package.json +1 -1
package/machine-core.mjs CHANGED
@@ -89,6 +89,19 @@ export class MachineCore extends EventEmitter {
89
89
  ensureSocketDirectory(this.socketPath);
90
90
  await clearStaleSocket(this.socketPath);
91
91
  await this.beforeListen();
92
+ try { await this.#listen(); } catch (error) {
93
+ // What beforeListen started (a product's children) goes with the start that failed, or it outlives this daemon.
94
+ await this.afterStop().catch(() => {});
95
+ throw error;
96
+ }
97
+ if (this.link) {
98
+ await this.refreshLinkConfiguration().catch((error) => this.emit('link', { event: 'configuration-failed', error: error.message }));
99
+ this.#connectLink();
100
+ }
101
+ return this.socketPath;
102
+ }
103
+
104
+ async #listen() {
92
105
  this.server = createServer((socket) => this.#accept(socket));
93
106
  // A Unix socket is bound under a name of this daemon's own and then renamed into place: Node unlinks the name it
94
107
  // bound when the server closes, and that name must never be the shared path, which a later daemon may serve from a
@@ -109,15 +122,25 @@ export class MachineCore extends EventEmitter {
109
122
  this.address = this.socketPath;
110
123
  writeJson(this.p.machine, { pid: process.pid, id: this.id, socket: this.socketPath, startedAt: Date.now(), version: MACHINE_VERSION, protocol: NODE_PROTOCOL, floor: this.floor, server: this.link?.server ?? null });
111
124
  this.emit('listening', this.socketPath);
112
- if (this.link) {
113
- await this.refreshLinkConfiguration().catch((error) => this.emit('link', { event: 'configuration-failed', error: error.message }));
114
- this.#connectLink();
125
+ // The socket check at start has a gap (a daemon restarting has no socket for a moment), so two daemons can each
126
+ // start; the later rename wins the path and the other serves nobody while its children (a mail watcher that types
127
+ // waiting turns among them) run on beside the winner's. A daemon whose path now names another daemon's socket
128
+ // says so once; a daemon run on its own stops on it.
129
+ if (!isNamedPipe(this.socketPath)) {
130
+ this.socketWatch = setInterval(() => {
131
+ let inode = null;
132
+ try { inode = statSync(this.socketPath).ino; } catch { return; }
133
+ if (inode === this.socketInode) return;
134
+ clearInterval(this.socketWatch); this.socketWatch = null;
135
+ this.emit('superseded', this.socketPath);
136
+ }, SOCKET_WATCH_MS);
137
+ this.socketWatch.unref?.();
115
138
  }
116
- return this.socketPath;
117
139
  }
118
140
 
119
141
  async stop() {
120
142
  this.stopping = true;
143
+ if (this.socketWatch) { clearInterval(this.socketWatch); this.socketWatch = null; }
121
144
  if (this.linkTimer) { clearTimeout(this.linkTimer); this.linkTimer = null; }
122
145
  // A close frame, so the server sees a machine that left rather than one that vanished.
123
146
  try { this.linkSocket?.close(1000, 'machine stopped'); } catch { this.linkSocket?.terminate(); }
@@ -408,6 +431,8 @@ export class MachineCore extends EventEmitter {
408
431
 
409
432
  }
410
433
 
434
+ const SOCKET_WATCH_MS = 5_000;
435
+
411
436
  async function clearStaleSocket(path) {
412
437
  // A named pipe has no file to leave behind: only a live daemon holds its name.
413
438
  if (!isNamedPipe(path) && !existsSync(path)) return;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@volter/teams",
3
- "version": "0.1.39",
3
+ "version": "0.1.40",
4
4
  "type": "module",
5
5
  "description": "Volter Teams, the neutral team plane: machine identity and daemon core, the local door and server link, admission from machine grants, product doors, and the Teams server's neutral routes (company RFC 0008).",
6
6
  "license": "MIT",