blun-king-cli 9.1.20 → 9.1.21

package/bin/update-notice.js

@@ -449,48 +449,65 @@ function installCommandText(version) {
 function createUpdateProgress(output) {
   const enabled = output?.isTTY === true;
   const phaseCount = 4;
-  const width = 20;
-  return (phase, label) => {
+  const width = 24;
+  const cyan = '\u001B[36m';
+  const dim = '\u001B[2m';
+  const reset = '\u001B[0m';
+  let active = false;
+  const update = (phase, label) => {
     if (!enabled) return;
     const completed = Math.max(0, Math.min(phaseCount, phase));
     const filled = Math.round((completed / phaseCount) * width);
-    const bar = `${'#'.repeat(filled)}${'-'.repeat(width - filled)}`;
-    output.write(`Update [${bar}] ${completed}/${phaseCount} ${label}\n`);
+    const bar = `${'━'.repeat(filled)}${'─'.repeat(width - filled)}`;
+    output.write(`\r\u001B[2K${cyan}${bar}${reset} ${dim}${completed}/${phaseCount}${reset} ${label}`);
+    active = completed < phaseCount;
+    if (!active) output.write('\n');
   };
+  update.finish = () => {
+    if (!enabled || !active) return;
+    active = false;
+    output.write('\n');
+  };
+  return update;
 }
 
 function promptUpdateAction({ currentVersion, release, input, output, processRef = process }) {
   return new Promise((resolve, reject) => {
-    let selected = 1;
+    let selected = 0;
     let settled = false;
     let cursorHidden = false;
     let escapeTimer;
     let pendingInput = '';
     const decoder = new StringDecoder('utf8');
     const wasRaw = input.isRaw === true;
+    const cyan = '\u001B[36m';
+    const dim = '\u001B[2m';
+    const underline = '\u001B[4m';
+    const reset = '\u001B[0m';
     const actions = [
       {
         choice: 'install',
         label: `Jetzt aktualisieren (führt \`${installCommandText(release.version)}\` aus)`,
       },
-      { choice: 'postpone', label: 'In sieben Tagen erneut fragen' },
-      { choice: 'skip-version', label: 'Diese Version überspringen' },
+      { choice: 'skip-once', label: 'Überspringen' },
+      { choice: 'skip-version', label: 'Auf den nächsten Release warten' },
     ];
     const signalHandlers = new Map();
 
     const renderActions = (refresh) => {
       if (refresh) output.write(`\u001B[${actions.length + 1}F`);
       for (let index = 0; index < actions.length; index += 1) {
-        output.write(`\r\u001B[2K  ${selected === index ? '>' : ' '} ${index + 1}. ${actions[index].label}\n`);
+        const line = `${selected === index ? '›' : ' '} ${index + 1}. ${actions[index].label}`;
+        output.write(`\r\u001B[2K${selected === index ? cyan : ''}${line}${selected === index ? reset : ''}\n`);
       }
-      output.write('\r\u001B[2KEnter drücken, um fortzufahren\n');
+      output.write(`\r\u001B[2K${dim}Enter drücken, um fortzufahren${reset}\n`);
     };
     const cleanup = () => {
       if (escapeTimer !== undefined) clearTimeout(escapeTimer);
       input.removeListener('data', onData);
-      input.removeListener('end', postpone);
-      input.removeListener('close', postpone);
-      input.removeListener('error', postpone);
+      input.removeListener('end', skipOnce);
+      input.removeListener('close', skipOnce);
+      input.removeListener('error', skipOnce);
       for (const [signal, handler] of signalHandlers) {
         processRef.removeListener(signal, handler);
       }
@@ -537,14 +554,14 @@ function promptUpdateAction({ currentVersion, release, input, output, processRef
       if (typeof processRef.exit === 'function') processRef.exit(exitCode);
       reject(error);
     };
-    function postpone() {
-      finish('postpone');
+    function skipOnce() {
+      finish('skip-once');
     }
     const waitForEscapeSuffix = () => {
       if (escapeTimer !== undefined) return;
       escapeTimer = setTimeout(() => {
         escapeTimer = undefined;
-        postpone();
+        skipOnce();
       }, UPDATE_KEY_ESCAPE_TIMEOUT_MS);
     };
     const clearEscapeTimer = () => {
@@ -573,7 +590,7 @@ function promptUpdateAction({ currentVersion, release, input, output, processRef
       while (pendingInput.length > 0) {
         const first = pendingInput[0];
         if (first === '\u0003') {
-          postpone();
+          skipOnce();
           return;
         }
         if (first === '\r' || first === '\n') {
@@ -596,7 +613,7 @@ function promptUpdateAction({ currentVersion, release, input, output, processRef
           && (pendingInput[1] === '\r'
             || pendingInput[1] === '\n'
             || pendingInput[1] === '\u0003')) {
-          postpone();
+          skipOnce();
           return;
         }
         const sequence = readEscapeSequence();
@@ -638,16 +655,18 @@ function promptUpdateAction({ currentVersion, release, input, output, processRef
         signalHandlers.set(signal, handler);
         processRef.once(signal, handler);
       }
-      output.write(`\nNeues Update verfügbar (${currentVersion} -> ${release.version})\n`);
-      if (release.notesUrl) output.write(`Versionshinweise: ${release.notesUrl}\n`);
+      output.write(`\nBLUN Code-Update verfügbar: ${currentVersion} -> ${release.version}\n`);
+      if (release.notesUrl) {
+        output.write(`${dim}Versionshinweise:${reset} ${underline}${release.notesUrl}${reset}\n`);
+      }
       output.write('\n');
       cursorHidden = true;
       output.write('\u001B[?25l');
       renderActions(false);
       input.on('data', onData);
-      input.once('end', postpone);
-      input.once('close', postpone);
-      input.once('error', postpone);
+      input.once('end', skipOnce);
+      input.once('close', skipOnce);
+      input.once('error', skipOnce);
       if (typeof input.setRawMode === 'function') input.setRawMode(true);
       if (typeof input.resume === 'function') input.resume();
     } catch (error) {
@@ -1260,6 +1279,9 @@ async function runUpdateFlow(options, explicitUpdate) {
     }
     if (action !== 'install') {
       if (installerSession?.ready) await installerSession.cancel();
+      if (action === 'skip-once') {
+        return { kind: 'continue', reason: 'skipped_once' };
+      }
       if (action === 'skip-version') {
         try {
           writeSkippedVersion(blunDir, release.version);
@@ -1299,6 +1321,7 @@ async function runUpdateFlow(options, explicitUpdate) {
     if (installResult?.leaseBusy === true
       || installResult?.leaseUnavailable === true
       || installResult?.unknownState === true) {
+      updateProgress.finish();
       return explicitUpdate
         ? explicitFailure(stderr, 'update_in_progress')
         : { kind: 'update_in_progress' };
@@ -1310,12 +1333,14 @@ async function runUpdateFlow(options, explicitUpdate) {
     }
 
     if (Number.isInteger(installResult?.code) && installResult.code !== 0) {
+      updateProgress.finish();
       if (explicitUpdate) {
         return explicitFailure(stderr, 'install_failed', installResult.code);
       }
       stderr.write(`Update fehlgeschlagen (Code ${installResult.code}). Die vorhandene Version wird gestartet.\n`);
       return { kind: 'continue', reason: 'install_failed', exitCode: installResult.code };
     }
+    updateProgress.finish();
     if (explicitUpdate) return explicitFailure(stderr, 'verification_failed');
     stderr.write('Update konnte nicht verifiziert werden. Starte BLUN Code neu.\n');
     return { kind: 'update_in_progress' };