blun-king-cli 9.1.9 → 9.1.11

package/bin/blun.js

@@ -13,6 +13,7 @@ const LEASE_PROTOCOL_VERSION = 'BLUN_UPDATE_LEASE_V3';
 const LEASE_PROBE_TIMEOUT_MS = 500;
 const MAX_POSIX_SOCKET_PATH_BYTES = 96;
 const PACKAGE_ROOT = path.resolve(__dirname, '..');
+const LEASE_CONNECTIONS = Symbol('blunLeaseConnections');
 
 function deriveLeaseEndpoint(role) {
   const realpath = fs.realpathSync.native || fs.realpathSync;
@@ -62,25 +63,28 @@ function ensurePrivateSocketDirectory(endpoint) {
 }
 
 function closeServer(server) {
-  return new Promise((resolve) => {
-    if (!server.listening) {
-      resolve();
-      return;
-    }
+  for (const socket of server[LEASE_CONNECTIONS] || []) {
     try {
-      server.close(() => resolve());
-    } catch {
-      resolve();
-    }
-  });
+      socket.destroy();
+    } catch {}
+  }
+  if (!server.listening) return Promise.resolve();
+  try {
+    server.close();
+    server.unref?.();
+  } catch {}
+  return Promise.resolve();
 }
 
 function listenForLease(endpoint) {
   return new Promise((resolve, reject) => {
     const server = net.createServer((socket) => {
+      server[LEASE_CONNECTIONS].add(socket);
+      socket.once('close', () => server[LEASE_CONNECTIONS].delete(socket));
       socket.on('error', () => {});
       socket.end(endpoint.magic);
     });
+    server[LEASE_CONNECTIONS] = new Set();
     const onError = (error) => {
       server.removeListener('error', onError);
       reject(error);
@@ -253,35 +257,127 @@ async function installLeaseIsClear() {
   }
 }
 
+function connectRuntimeBroker(endpoint) {
+  return new Promise((resolve) => {
+    let settled = false;
+    let received = '';
+    let socket;
+    const finish = (result) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      if (!result.acquired) socket?.destroy();
+      resolve(result);
+    };
+    const timer = setTimeout(
+      () => finish({ acquired: false, reason: 'unavailable' }),
+      LEASE_PROBE_TIMEOUT_MS,
+    );
+    timer.unref?.();
+    try {
+      socket = net.createConnection({ path: endpoint.path });
+      socket.setEncoding('utf8');
+      socket.once('connect', () => socket.write(endpoint.magic));
+      socket.on('data', (chunk) => {
+        received += String(chunk);
+        if (!received.includes('\n')) return;
+        if (received !== endpoint.magic) {
+          finish({ acquired: false, reason: 'unavailable' });
+          return;
+        }
+        let owned = true;
+        let released = false;
+        socket.once('close', () => { owned = false; });
+        socket.once('error', () => { owned = false; });
+        finish({
+          acquired: true,
+          lease: Object.freeze({
+            assertOwned() {
+              if (!owned || socket.destroyed) throw new Error('RUNTIME_LEASE_LOST');
+            },
+            async release() {
+              if (released) return;
+              released = true;
+              owned = false;
+              if (socket.destroyed) return;
+              socket.destroy();
+            },
+          }),
+        });
+      });
+      socket.once('error', () => finish({ acquired: false, reason: 'unavailable' }));
+      socket.once('close', () => finish({ acquired: false, reason: 'unavailable' }));
+    } catch {
+      finish({ acquired: false, reason: 'unavailable' });
+    }
+  });
+}
+
+async function connectExistingRuntimeLease() {
+  const endpoint = deriveLeaseEndpoint('runtime');
+  const deadline = Date.now() + 3_000;
+  while (Date.now() < deadline) {
+    const connected = await connectRuntimeBroker(endpoint);
+    if (connected.acquired) return connected;
+    await new Promise((resolve) => { setTimeout(resolve, 25); });
+  }
+  return { acquired: false, reason: 'unavailable' };
+}
+
 async function main() {
   const explicitUpdateRequest = process.argv.length === 3
     && /^(?:update|upgrade)$/iu.test(process.argv[2] || '');
-  const result = await acquireNoticeLease();
-  if (!result.acquired) {
-    process.stderr.write(explicitUpdateRequest
-      ? 'BLUN laeuft noch. Beende die laufende Konsole und starte das Update erneut.\n'
-      : 'BLUN laeuft bereits in einer anderen Konsole.\n');
+  let noticeResult = await acquireNoticeLease();
+  if (!noticeResult.acquired && explicitUpdateRequest) {
+    process.stderr.write('BLUN laeuft noch. Beende die laufenden Konsolen und starte das Update erneut.\n');
     process.exitCode = 1;
     return;
   }
+  let runtimeResult;
   try {
-    if (!await installLeaseIsClear()) {
-      process.stderr.write(explicitUpdateRequest
-        ? 'BLUN laeuft noch. Beende die laufende Konsole und starte das Update erneut.\n'
-        : 'BLUN laeuft bereits in einer anderen Konsole.\n');
-      process.exitCode = 1;
-      return;
+    if (explicitUpdateRequest) {
+      if (!await installLeaseIsClear()) {
+        process.stderr.write('BLUN laeuft noch. Beende die laufenden Konsolen und starte das Update erneut.\n');
+        process.exitCode = 1;
+        return;
+      }
+    } else {
+      const installClear = await installLeaseIsClear();
+      if (!installClear || !noticeResult.acquired) {
+        runtimeResult = await connectExistingRuntimeLease();
+        if (!runtimeResult.acquired && !installClear) {
+          if (!await installLeaseIsClear()) {
+            process.stderr.write('Der geschuetzte BLUN-Start ist gerade nicht verfuegbar.\n');
+            process.exitCode = 1;
+            return;
+          }
+          runtimeResult = undefined;
+        }
+        if (!runtimeResult?.acquired && !noticeResult.acquired) {
+          noticeResult = await acquireNoticeLease();
+          if (!noticeResult.acquired) {
+            process.stderr.write('Der geschuetzte BLUN-Start ist gerade nicht verfuegbar.\n');
+            process.exitCode = 1;
+            return;
+          }
+        }
+      }
     }
-    result.lease.assertOwned();
+    noticeResult.lease?.assertOwned();
+    runtimeResult?.lease?.assertOwned();
     const { runLauncher } = require('./launcher-runtime');
-    result.lease.assertOwned();
+    noticeResult.lease?.assertOwned();
+    runtimeResult?.lease?.assertOwned();
     const filename = path.basename(__filename).toLowerCase();
     await runLauncher({
       mode: filename.startsWith('king') ? 'king' : 'blun',
-      noticeLease: result.lease,
+      noticeLease: noticeResult.lease,
+      runtimeLease: runtimeResult?.lease,
+      skipUpdateNotice: runtimeResult?.acquired === true,
     });
   } finally {
-    await result.lease.release();
+    await runtimeResult?.lease?.release();
+    await noticeResult.lease?.release();
   }
 }
 

package/bin/core-bootstrap.js

@@ -4,15 +4,15 @@ const fs = require('node:fs');
 const path = require('node:path');
 const { pathToFileURL } = require('node:url');
 
-const { tryAcquireUpdateLease } = require('./update-lease');
+const { acquireSharedRuntimeLease } = require('./update-lease');
 
 const CORE_LOADED_MESSAGE = 'blun-core-bootstrap-loaded';
 
 async function runCoreBootstrap() {
   const packageRoot = path.resolve(__dirname, '..');
   const mainPath = path.join(packageRoot, 'blun.mjs');
-  const leaseResult = await tryAcquireUpdateLease({ packageRoot, role: 'install' });
-  if (!leaseResult.acquired) process.exit(75);
+  const leaseResult = await acquireSharedRuntimeLease({ packageRoot });
+  if (!leaseResult.acquired) throw new Error('RUNTIME_PROTECTION_UNAVAILABLE');
 
   try {
     leaseResult.lease.assertOwned();

package/bin/king.js

@@ -13,6 +13,7 @@ const LEASE_PROTOCOL_VERSION = 'BLUN_UPDATE_LEASE_V3';
 const LEASE_PROBE_TIMEOUT_MS = 500;
 const MAX_POSIX_SOCKET_PATH_BYTES = 96;
 const PACKAGE_ROOT = path.resolve(__dirname, '..');
+const LEASE_CONNECTIONS = Symbol('blunLeaseConnections');
 
 function deriveLeaseEndpoint(role) {
   const realpath = fs.realpathSync.native || fs.realpathSync;
@@ -62,25 +63,28 @@ function ensurePrivateSocketDirectory(endpoint) {
 }
 
 function closeServer(server) {
-  return new Promise((resolve) => {
-    if (!server.listening) {
-      resolve();
-      return;
-    }
+  for (const socket of server[LEASE_CONNECTIONS] || []) {
     try {
-      server.close(() => resolve());
-    } catch {
-      resolve();
-    }
-  });
+      socket.destroy();
+    } catch {}
+  }
+  if (!server.listening) return Promise.resolve();
+  try {
+    server.close();
+    server.unref?.();
+  } catch {}
+  return Promise.resolve();
 }
 
 function listenForLease(endpoint) {
   return new Promise((resolve, reject) => {
     const server = net.createServer((socket) => {
+      server[LEASE_CONNECTIONS].add(socket);
+      socket.once('close', () => server[LEASE_CONNECTIONS].delete(socket));
       socket.on('error', () => {});
       socket.end(endpoint.magic);
     });
+    server[LEASE_CONNECTIONS] = new Set();
     const onError = (error) => {
       server.removeListener('error', onError);
       reject(error);
@@ -253,35 +257,127 @@ async function installLeaseIsClear() {
   }
 }
 
+function connectRuntimeBroker(endpoint) {
+  return new Promise((resolve) => {
+    let settled = false;
+    let received = '';
+    let socket;
+    const finish = (result) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      if (!result.acquired) socket?.destroy();
+      resolve(result);
+    };
+    const timer = setTimeout(
+      () => finish({ acquired: false, reason: 'unavailable' }),
+      LEASE_PROBE_TIMEOUT_MS,
+    );
+    timer.unref?.();
+    try {
+      socket = net.createConnection({ path: endpoint.path });
+      socket.setEncoding('utf8');
+      socket.once('connect', () => socket.write(endpoint.magic));
+      socket.on('data', (chunk) => {
+        received += String(chunk);
+        if (!received.includes('\n')) return;
+        if (received !== endpoint.magic) {
+          finish({ acquired: false, reason: 'unavailable' });
+          return;
+        }
+        let owned = true;
+        let released = false;
+        socket.once('close', () => { owned = false; });
+        socket.once('error', () => { owned = false; });
+        finish({
+          acquired: true,
+          lease: Object.freeze({
+            assertOwned() {
+              if (!owned || socket.destroyed) throw new Error('RUNTIME_LEASE_LOST');
+            },
+            async release() {
+              if (released) return;
+              released = true;
+              owned = false;
+              if (socket.destroyed) return;
+              socket.destroy();
+            },
+          }),
+        });
+      });
+      socket.once('error', () => finish({ acquired: false, reason: 'unavailable' }));
+      socket.once('close', () => finish({ acquired: false, reason: 'unavailable' }));
+    } catch {
+      finish({ acquired: false, reason: 'unavailable' });
+    }
+  });
+}
+
+async function connectExistingRuntimeLease() {
+  const endpoint = deriveLeaseEndpoint('runtime');
+  const deadline = Date.now() + 3_000;
+  while (Date.now() < deadline) {
+    const connected = await connectRuntimeBroker(endpoint);
+    if (connected.acquired) return connected;
+    await new Promise((resolve) => { setTimeout(resolve, 25); });
+  }
+  return { acquired: false, reason: 'unavailable' };
+}
+
 async function main() {
   const explicitUpdateRequest = process.argv.length === 3
     && /^(?:update|upgrade)$/iu.test(process.argv[2] || '');
-  const result = await acquireNoticeLease();
-  if (!result.acquired) {
-    process.stderr.write(explicitUpdateRequest
-      ? 'BLUN laeuft noch. Beende die laufende Konsole und starte das Update erneut.\n'
-      : 'BLUN laeuft bereits in einer anderen Konsole.\n');
+  let noticeResult = await acquireNoticeLease();
+  if (!noticeResult.acquired && explicitUpdateRequest) {
+    process.stderr.write('BLUN laeuft noch. Beende die laufenden Konsolen und starte das Update erneut.\n');
     process.exitCode = 1;
     return;
   }
+  let runtimeResult;
   try {
-    if (!await installLeaseIsClear()) {
-      process.stderr.write(explicitUpdateRequest
-        ? 'BLUN laeuft noch. Beende die laufende Konsole und starte das Update erneut.\n'
-        : 'BLUN laeuft bereits in einer anderen Konsole.\n');
-      process.exitCode = 1;
-      return;
+    if (explicitUpdateRequest) {
+      if (!await installLeaseIsClear()) {
+        process.stderr.write('BLUN laeuft noch. Beende die laufenden Konsolen und starte das Update erneut.\n');
+        process.exitCode = 1;
+        return;
+      }
+    } else {
+      const installClear = await installLeaseIsClear();
+      if (!installClear || !noticeResult.acquired) {
+        runtimeResult = await connectExistingRuntimeLease();
+        if (!runtimeResult.acquired && !installClear) {
+          if (!await installLeaseIsClear()) {
+            process.stderr.write('Der geschuetzte BLUN-Start ist gerade nicht verfuegbar.\n');
+            process.exitCode = 1;
+            return;
+          }
+          runtimeResult = undefined;
+        }
+        if (!runtimeResult?.acquired && !noticeResult.acquired) {
+          noticeResult = await acquireNoticeLease();
+          if (!noticeResult.acquired) {
+            process.stderr.write('Der geschuetzte BLUN-Start ist gerade nicht verfuegbar.\n');
+            process.exitCode = 1;
+            return;
+          }
+        }
+      }
     }
-    result.lease.assertOwned();
+    noticeResult.lease?.assertOwned();
+    runtimeResult?.lease?.assertOwned();
     const { runLauncher } = require('./launcher-runtime');
-    result.lease.assertOwned();
+    noticeResult.lease?.assertOwned();
+    runtimeResult?.lease?.assertOwned();
     const filename = path.basename(__filename).toLowerCase();
     await runLauncher({
       mode: filename.startsWith('king') ? 'king' : 'blun',
-      noticeLease: result.lease,
+      noticeLease: noticeResult.lease,
+      runtimeLease: runtimeResult?.lease,
+      skipUpdateNotice: runtimeResult?.acquired === true,
     });
   } finally {
-    await result.lease.release();
+    await runtimeResult?.lease?.release();
+    await noticeResult.lease?.release();
   }
 }
 

package/bin/launcher-runtime.js

@@ -22,7 +22,7 @@ const {
   seedStandardTools,
 } = require('./standard-tools-bootstrap');
 const { CORE_LOADED_MESSAGE } = require('./core-bootstrap');
-const { tryAcquireUpdateLease } = require('./update-lease');
+const { acquireSharedRuntimeLease, tryAcquireUpdateLease } = require('./update-lease');
 const { runExplicitUpdate, runUpdateNotice } = require('./update-notice');
 const {
   ensurePrivateDirectory,
@@ -187,7 +187,9 @@ async function runLauncher(options = {}) {
   const mode = options.mode || launcherModeFromArgv(process.argv);
   const explicitUpdateRequest = isNpmPackageUpdateRequest(ARGS);
   const explicitToolsRequest = String(ARGS[0] || '').toLowerCase() === 'tools';
-  const noticeResult = options.noticeLease
+  const noticeResult = options.skipUpdateNotice === true
+    ? { acquired: true, lease: { assertOwned() {}, async release() {} } }
+    : options.noticeLease
     ? { acquired: true, lease: options.noticeLease }
     : await tryAcquireUpdateLease({ packageRoot: PKG, role: 'notice' });
   if (!noticeResult.acquired) {
@@ -198,23 +200,27 @@ async function runLauncher(options = {}) {
     return;
   }
   const noticeLease = noticeResult.lease;
+  let runtimeLease = options.runtimeLease;
   let noticeReleased = false;
   const releaseNotice = async () => {
     if (noticeReleased) return;
     noticeReleased = true;
     await noticeLease.release();
+    await runtimeLease?.release();
   };
 
   try {
-    const installProbe = await tryAcquireUpdateLease({ packageRoot: PKG, role: 'install' });
-    if (!installProbe.acquired) {
-      if (explicitUpdateRequest) {
-        process.stderr.write('Das Update konnte nicht verifiziert werden.\n');
+    if (!runtimeLease) {
+      const installProbe = await tryAcquireUpdateLease({ packageRoot: PKG, role: 'install' });
+      if (!installProbe.acquired) {
+        process.stderr.write(explicitUpdateRequest
+          ? 'Das Update konnte nicht verifiziert werden.\n'
+          : 'Der geschuetzte BLUN-Start ist gerade nicht verfuegbar.\n');
         process.exitCode = 1;
+        return;
       }
-      return;
+      await installProbe.lease.release();
     }
-    await installProbe.lease.release();
 
     if (explicitToolsRequest) {
       const action = String(ARGS[1] || '').toLowerCase();
@@ -287,19 +293,31 @@ async function runLauncher(options = {}) {
     ensurePrivateDirectory(blunDir);
 
     // --- 1. Oeffentlicher npm-Update-Dialog. -------------------------------
-    const updateResult = await runUpdateNotice({
-      currentVersion: readPackageVersion(),
-      argv: ARGS,
-      env: process.env,
-      stdin: process.stdin,
-      stdout: process.stdout,
-      stderr: process.stderr,
-      blunDir,
-      packageRoot: PKG,
-      noticeLease,
-    });
+    const updateResult = options.skipUpdateNotice === true
+      ? { kind: 'continue', reason: 'notice_busy' }
+      : await runUpdateNotice({
+        currentVersion: readPackageVersion(),
+        argv: ARGS,
+        env: process.env,
+        stdin: process.stdin,
+        stdout: process.stdout,
+        stderr: process.stderr,
+        blunDir,
+        packageRoot: PKG,
+        noticeLease,
+      });
     if (updateResult.kind === 'installed' || updateResult.kind === 'update_in_progress') return;
 
+    if (!runtimeLease) {
+      const runtimeResult = await acquireSharedRuntimeLease({ packageRoot: PKG });
+      if (!runtimeResult.acquired) {
+        process.stderr.write('Der geschuetzte BLUN-Start ist gerade nicht verfuegbar.\n');
+        process.exitCode = 1;
+        return;
+      }
+      runtimeLease = runtimeResult.lease;
+    }
+
   // --- 2. Bestehende Konfiguration absichern -------------------------------
   // Ein frischer Start bleibt absichtlich ohne statischen Anbieter. /login
   // provisioniert King ueber den BLUN-OAuth-Server.