blun-king-cli 9.1.22 → 9.1.24

package/bin/blun.js

@@ -313,9 +313,9 @@ function connectRuntimeBroker(endpoint) {
   });
 }
 
-async function connectExistingRuntimeLease() {
+async function connectExistingRuntimeLease(timeoutMs = 3_000) {
   const endpoint = deriveLeaseEndpoint('runtime');
-  const deadline = Date.now() + 3_000;
+  const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
     const connected = await connectRuntimeBroker(endpoint);
     if (connected.acquired) return connected;
@@ -328,18 +328,17 @@ async function main() {
   const explicitUpdateRequest = process.argv.length === 3
     && /^(?:update|upgrade)$/iu.test(process.argv[2] || '');
   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 (explicitUpdateRequest) {
-      if (!await installLeaseIsClear()) {
-        process.stderr.write('BLUN laeuft noch. Beende die laufenden Konsolen und starte das Update erneut.\n');
-        process.exitCode = 1;
-        return;
+      runtimeResult = await connectExistingRuntimeLease(750);
+      if (!runtimeResult.acquired) {
+        runtimeResult = undefined;
+        if (!noticeResult.acquired || !await installLeaseIsClear()) {
+          process.stderr.write('Der geschuetzte BLUN-Start ist gerade nicht verfuegbar.\n');
+          process.exitCode = 1;
+          return;
+        }
       }
     } else {
       const installClear = await installLeaseIsClear();
@@ -373,7 +372,7 @@ async function main() {
       mode: filename.startsWith('king') ? 'king' : 'blun',
       noticeLease: noticeResult.lease,
       runtimeLease: runtimeResult?.lease,
-      skipUpdateNotice: runtimeResult?.acquired === true,
+      skipUpdateNotice: runtimeResult?.acquired === true || !noticeResult.acquired,
     });
   } finally {
     await runtimeResult?.lease?.release();

package/bin/king.js

@@ -313,9 +313,9 @@ function connectRuntimeBroker(endpoint) {
   });
 }
 
-async function connectExistingRuntimeLease() {
+async function connectExistingRuntimeLease(timeoutMs = 3_000) {
   const endpoint = deriveLeaseEndpoint('runtime');
-  const deadline = Date.now() + 3_000;
+  const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
     const connected = await connectRuntimeBroker(endpoint);
     if (connected.acquired) return connected;
@@ -328,18 +328,17 @@ async function main() {
   const explicitUpdateRequest = process.argv.length === 3
     && /^(?:update|upgrade)$/iu.test(process.argv[2] || '');
   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 (explicitUpdateRequest) {
-      if (!await installLeaseIsClear()) {
-        process.stderr.write('BLUN laeuft noch. Beende die laufenden Konsolen und starte das Update erneut.\n');
-        process.exitCode = 1;
-        return;
+      runtimeResult = await connectExistingRuntimeLease(750);
+      if (!runtimeResult.acquired) {
+        runtimeResult = undefined;
+        if (!noticeResult.acquired || !await installLeaseIsClear()) {
+          process.stderr.write('Der geschuetzte BLUN-Start ist gerade nicht verfuegbar.\n');
+          process.exitCode = 1;
+          return;
+        }
       }
     } else {
       const installClear = await installLeaseIsClear();
@@ -373,7 +372,7 @@ async function main() {
       mode: filename.startsWith('king') ? 'king' : 'blun',
       noticeLease: noticeResult.lease,
       runtimeLease: runtimeResult?.lease,
-      skipUpdateNotice: runtimeResult?.acquired === true,
+      skipUpdateNotice: runtimeResult?.acquired === true || !noticeResult.acquired,
     });
   } finally {
     await runtimeResult?.lease?.release();

package/bin/launcher-runtime.js

@@ -210,7 +210,7 @@ async function runLauncher(options = {}) {
   };
 
   try {
-    if (!runtimeLease) {
+    if (!runtimeLease && !explicitUpdateRequest) {
       const installProbe = await tryAcquireUpdateLease({ packageRoot: PKG, role: 'install' });
       if (!installProbe.acquired) {
         process.stderr.write(explicitUpdateRequest

package/bin/update-notice.js

@@ -24,6 +24,7 @@ const SNOOZE_MS = 7 * 24 * 60 * 60 * 1000;
 const REQUEST_TIMEOUT_MS = 2_500;
 const STATE_FILE = 'update-notice.json';
 const UPDATE_SKIP_FILE = 'update-skip-version.json';
+const PENDING_UPDATE_FILE = 'update-pending.json';
 const UPDATE_DIRECTORY = 'updates';
 const UPDATE_KEY_ESCAPE_TIMEOUT_MS = 500;
 const UPDATE_SIGNAL_EXIT_CODES = Object.freeze({
@@ -441,6 +442,59 @@ function writeSkippedVersion(blunDir, skippedVersion) {
   }
 }
 
+function pendingUpdatePath(blunDir) {
+  return path.join(blunDir, PENDING_UPDATE_FILE);
+}
+
+function readPendingUpdate(blunDir) {
+  try {
+    const filePath = pendingUpdatePath(blunDir);
+    if (!fs.existsSync(filePath)) return undefined;
+    securePrivateFile(filePath);
+    const stat = fs.lstatSync(filePath);
+    if (!stat.isFile() || stat.isSymbolicLink() || stat.size > 1_024) return undefined;
+    const record = exactDataRecord(JSON.parse(fs.readFileSync(filePath, 'utf8')), [
+      'targetVersion',
+      'version',
+    ]);
+    if (!record || record.version !== 1 || !parseSemver(record.targetVersion)) return undefined;
+    return record.targetVersion;
+  } catch {
+    return undefined;
+  }
+}
+
+function writePendingUpdate(blunDir, targetVersion) {
+  if (!parseSemver(targetVersion)) throw new Error('INVALID_UPDATE_VERSION');
+  ensurePrivateDirectory(blunDir);
+  const filePath = pendingUpdatePath(blunDir);
+  const temporaryPath = path.join(
+    blunDir,
+    `.${PENDING_UPDATE_FILE}.${process.pid}.${randomUUID()}.tmp`,
+  );
+  try {
+    writePrivateFile(temporaryPath, `${JSON.stringify({
+      version: 1,
+      targetVersion,
+    })}\n`);
+    const handle = fs.openSync(temporaryPath, 'r+');
+    try {
+      fs.fsyncSync(handle);
+    } finally {
+      fs.closeSync(handle);
+    }
+    fs.renameSync(temporaryPath, filePath);
+    securePrivateFile(filePath);
+  } catch (error) {
+    fs.rmSync(temporaryPath, { force: true });
+    throw error;
+  }
+}
+
+function clearPendingUpdate(blunDir) {
+  fs.rmSync(pendingUpdatePath(blunDir), { force: true });
+}
+
 function isInteractiveUpdateStart({ argv, env, stdin, stdout }) {
   const isOrdinaryStartup = Array.isArray(argv)
     && (argv.length === 0
@@ -1145,6 +1199,19 @@ function explicitFailure(stderr, reason, exitCode) {
   };
 }
 
+function queueExplicitUpdate(blunDir, release, stdout, stderr) {
+  try {
+    ensurePrivateDirectory(blunDir);
+    writePendingUpdate(blunDir, release.version);
+  } catch {
+    return explicitFailure(stderr, 'private_home_unavailable');
+  }
+  stdout.write(
+    `Update ${release.version} vorgemerkt. Es wird beim ersten freien Start automatisch installiert.\n`,
+  );
+  return { kind: 'queued', version: release.version };
+}
+
 async function runUpdateFlow(options, explicitUpdate) {
   const {
     currentVersion,
@@ -1164,8 +1231,13 @@ async function runUpdateFlow(options, explicitUpdate) {
       : { kind: 'continue', reason: 'invalid_current_version' };
   }
 
+  let pendingVersion = readPendingUpdate(blunDir);
+  if (pendingVersion !== undefined && compareSemver(currentVersion, pendingVersion) >= 0) {
+    clearPendingUpdate(blunDir);
+    pendingVersion = undefined;
+  }
   const now = (options.now || Date.now)();
-  if (!explicitUpdate && readSnoozeState(blunDir, now)) {
+  if (!explicitUpdate && pendingVersion === undefined && readSnoozeState(blunDir, now)) {
     return { kind: 'continue', reason: 'snoozed' };
   }
 
@@ -1198,20 +1270,11 @@ async function runUpdateFlow(options, explicitUpdate) {
   let installerSession;
 
   try {
-    if (!explicitUpdate && readSnoozeState(blunDir, (options.now || Date.now)())) {
+    if (!explicitUpdate
+      && pendingVersion === undefined
+      && readSnoozeState(blunDir, (options.now || Date.now)())) {
       return { kind: 'continue', reason: 'snoozed' };
     }
-    const initialInstallLease = await probeInstallLease(options, packageRoot);
-    if (initialInstallLease === 'busy') {
-      return explicitUpdate
-        ? explicitFailure(stderr, 'update_in_progress')
-        : { kind: 'update_in_progress' };
-    }
-    if (initialInstallLease !== 'clear') {
-      return explicitUpdate
-        ? explicitFailure(stderr, 'lease_unavailable')
-        : { kind: 'continue', reason: 'lease_unavailable' };
-    }
     let sources;
     try {
       sources = await (options.loadReleaseSources || loadReleaseSources)();
@@ -1229,10 +1292,22 @@ async function runUpdateFlow(options, explicitUpdate) {
         ? explicitNoTarget(stdout, reason)
         : { kind: 'continue', reason };
     }
-    if (!explicitUpdate && readSkippedVersion(blunDir) === release.version) {
+    const queuedForRelease = pendingVersion === release.version;
+    const initialInstallLease = await probeInstallLease(options, packageRoot);
+    if (initialInstallLease === 'busy') {
+      return explicitUpdate
+        ? queueExplicitUpdate(blunDir, release, stdout, stderr)
+        : { kind: 'update_in_progress' };
+    }
+    if (initialInstallLease !== 'clear') {
+      return explicitUpdate
+        ? explicitFailure(stderr, 'lease_unavailable')
+        : { kind: 'continue', reason: 'lease_unavailable' };
+    }
+    if (!explicitUpdate && !queuedForRelease && readSkippedVersion(blunDir) === release.version) {
       return { kind: 'continue', reason: 'skipped_version' };
     }
-    if (explicitUpdate) {
+    if (explicitUpdate || queuedForRelease) {
       try {
         ensurePrivateDirectory(blunDir);
       } catch {
@@ -1249,7 +1324,7 @@ async function runUpdateFlow(options, explicitUpdate) {
     const prePromptInstallLease = await probeInstallLease(options, packageRoot);
     if (prePromptInstallLease === 'busy') {
       return explicitUpdate
-        ? explicitFailure(stderr, 'update_in_progress')
+        ? queueExplicitUpdate(blunDir, release, stdout, stderr)
         : { kind: 'update_in_progress' };
     }
     if (prePromptInstallLease !== 'clear') {
@@ -1272,7 +1347,7 @@ async function runUpdateFlow(options, explicitUpdate) {
       }
     }
     let action;
-    if (explicitUpdate) {
+    if (explicitUpdate || queuedForRelease) {
       action = 'install';
     } else {
       try {
@@ -1337,6 +1412,7 @@ async function runUpdateFlow(options, explicitUpdate) {
     }
     if (installResult?.code === 0 && installResult?.verified === true) {
       updateProgress(4, 'Installation geprüft');
+      clearPendingUpdate(blunDir);
       stdout.write('Update erfolgreich installiert. Starte BLUN Code neu, um die neue Version zu verwenden.\n');
       return { kind: 'installed', version: release.version };
     }