@afffun/codexbot 1.0.74 → 1.0.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afffun/codexbot",
-  "version": "1.0.74",
+  "version": "1.0.76",
   "description": "Thin npm bootstrap CLI for installing and operating Codexbot nodes",
   "type": "module",
   "author": "john88188 <john88188@outlook.com>",

package/src/activation_service.mjs

@@ -3,36 +3,11 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
-import readline from 'node:readline/promises';
 
 import { buildInstallLicenseClaimUrl, getDefaultDistributionConfig } from './config_service.mjs';
+import { createPrompter, promptUntilValid, trim } from './input_contract_service.mjs';
 import { resolveInstalledControlLayout } from './installed_layout_service.mjs';
 
-function trim(value, fallback = '') {
-  const text = String(value ?? '').trim();
-  return text || String(fallback ?? '').trim();
-}
-
-function createPrompter({ stdin, stdout } = {}) {
-  const input = stdin || process.stdin;
-  const output = stdout || process.stdout;
-  if (!input?.isTTY || !output?.isTTY) {
-    return {
-      interactive: false,
-      ask: async () => '',
-      close: async () => {},
-    };
-  }
-  const rl = readline.createInterface({ input, output });
-  return {
-    interactive: true,
-    ask: async (prompt) => trim(await rl.question(prompt)),
-    close: async () => {
-      rl.close();
-    },
-  };
-}
-
 function runChildCapture(spawnFn, command, args, options = {}) {
   return new Promise((resolve, reject) => {
     const child = spawnFn(command, args, {
@@ -128,9 +103,13 @@ export function createNpmDistributionActivationService(deps = {}) {
       if (Boolean(options.nonInteractive) || !prompter.interactive) {
         throw new Error('license key is required');
       }
-      const entered = trim(await prompter.ask('License key: '));
-      if (!entered) throw new Error('license key is required');
-      return entered;
+      return promptUntilValid(prompter, {
+        logger,
+        prompt: 'License key: ',
+        normalize: trim,
+        validate: (value) => Boolean(value),
+        invalidMessage: 'License key is required.',
+      });
     } finally {
       await prompter.close().catch(() => {});
     }

package/src/args_service.mjs

@@ -1,6 +1,4 @@
-function trim(value) {
-  return String(value ?? '').trim();
-}
+import { normalizeConnectorChoice, trim } from './input_contract_service.mjs';
 
 function readOptionValue(argv, index, name) {
   if (index + 1 >= argv.length) {
@@ -94,7 +92,10 @@ function parseBootstrapOptions(argv = []) {
       continue;
     }
     if (token === '--connector') {
-      options.connector = readOptionValue(argv, i, token);
+      options.connector = normalizeConnectorChoice(readOptionValue(argv, i, token));
+      if (!options.connector) {
+        throw new Error('invalid value for --connector (expected telegram, wecom, or skip)');
+      }
       i += 1;
       continue;
     }

package/src/input_contract_service.mjs

@@ -0,0 +1,68 @@
+import readline from 'node:readline/promises';
+
+export function trim(value, fallback = '') {
+  const text = String(value ?? '').trim();
+  return text || String(fallback ?? '').trim();
+}
+
+export function normalizeConnectorChoice(value) {
+  const raw = trim(value).toLowerCase();
+  if (raw === '1') return 'telegram';
+  if (raw === '2') return 'wecom';
+  if (raw === '3') return 'skip';
+  if (raw === 'telegram') return 'telegram';
+  if (raw === 'wecom') return 'wecom';
+  if (raw === 'skip' || raw === 'none') return 'skip';
+  return '';
+}
+
+export function normalizeList(input) {
+  return Array.from(new Set(
+    String(input || '')
+      .split(/[,\n]/)
+      .map((item) => trim(item))
+      .filter(Boolean),
+  ));
+}
+
+export function normalizeYesNo(input, fallback = false) {
+  const raw = trim(input).toLowerCase();
+  if (!raw) return Boolean(fallback);
+  if (['y', 'yes', '1', 'true'].includes(raw)) return true;
+  if (['n', 'no', '0', 'false'].includes(raw)) return false;
+  return Boolean(fallback);
+}
+
+export function createPrompter({ stdin, stdout } = {}) {
+  const input = stdin || process.stdin;
+  const output = stdout || process.stdout;
+  if (!input?.isTTY || !output?.isTTY) {
+    return {
+      interactive: false,
+      ask: async () => '',
+      close: async () => {},
+    };
+  }
+  const rl = readline.createInterface({ input, output });
+  return {
+    interactive: true,
+    ask: async (prompt) => trim(await rl.question(prompt)),
+    close: async () => {
+      rl.close();
+    },
+  };
+}
+
+export async function promptUntilValid(prompter, {
+  logger = console,
+  prompt,
+  normalize = trim,
+  validate = (value) => Boolean(value),
+  invalidMessage = 'Invalid input. Please try again.',
+} = {}) {
+  while (true) {
+    const value = normalize(await prompter.ask(prompt));
+    if (validate(value)) return value;
+    logger?.log?.(invalidMessage);
+  }
+}

package/src/install_seed_service.mjs

@@ -1,36 +1,23 @@
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
-import readline from 'node:readline/promises';
+import {
+  createPrompter,
+  normalizeConnectorChoice,
+  normalizeList,
+  normalizeYesNo,
+  promptUntilValid,
+  trim,
+} from './input_contract_service.mjs';
 
-function trim(value, fallback = '') {
-  const text = String(value ?? '').trim();
-  return text || String(fallback ?? '').trim();
-}
-
-function normalizeConnectorChoice(value) {
-  const raw = trim(value).toLowerCase();
-  if (raw === 'telegram') return 'telegram';
-  if (raw === 'wecom') return 'wecom';
-  if (raw === 'skip' || raw === 'none') return 'skip';
-  return '';
-}
-
-function normalizeList(input) {
-  return Array.from(new Set(
-    String(input || '')
-      .split(/[,\n]/)
-      .map((item) => trim(item))
-      .filter(Boolean),
-  ));
-}
-
-function normalizeYesNo(input, fallback = false) {
-  const raw = trim(input).toLowerCase();
-  if (!raw) return Boolean(fallback);
-  if (['y', 'yes', '1', 'true'].includes(raw)) return true;
-  if (['n', 'no', '0', 'false'].includes(raw)) return false;
-  return Boolean(fallback);
+async function promptForConnectorChoice(prompter, logger) {
+  return promptUntilValid(prompter, {
+    logger,
+    prompt: 'Choose connector [1=telegram, 2=wecom, 3=skip] (default: 3): ',
+    normalize: normalizeConnectorChoice,
+    validate: (value) => Boolean(value),
+    invalidMessage: 'Invalid connector selection. Enter 1, 2, 3, telegram, wecom, or skip.',
+  });
 }
 
 function buildConnectorCapabilities(type) {
@@ -211,26 +198,6 @@ function buildWecomSeed(nowIso, {
   };
 }
 
-function createPrompter({ stdin, stdout } = {}) {
-  const input = stdin || process.stdin;
-  const output = stdout || process.stdout;
-  if (!input?.isTTY || !output?.isTTY) {
-    return {
-      interactive: false,
-      ask: async () => '',
-      close: async () => {},
-    };
-  }
-  const rl = readline.createInterface({ input, output });
-  return {
-    interactive: true,
-    ask: async (prompt) => trim(await rl.question(prompt)),
-    close: async () => {
-      rl.close();
-    },
-  };
-}
-
 async function ensureReadableFile(fsPromises, filePath, label) {
   const target = trim(filePath);
   if (!target) return '';
@@ -325,7 +292,7 @@ export function createNpmDistributionInstallSeedService(deps = {}) {
       }
       if (!connector && !nonInteractive) {
         logger.log('==> Remote control channel setup');
-        connector = normalizeConnectorChoice(await prompter.ask('Choose connector [telegram/wecom/skip] (default: skip): ')) || 'skip';
+        connector = await promptForConnectorChoice(prompter, logger);
       }
       if (!connector) connector = 'skip';
 
@@ -338,8 +305,28 @@ export function createNpmDistributionInstallSeedService(deps = {}) {
       }
 
       if (connector === 'telegram') {
-        const telegramBotToken = trim(options.telegramBotToken || (!nonInteractive ? await prompter.ask('Telegram bot token: ') : ''));
-        const telegramChatIds = normalizeList(options.telegramChatIds || (!nonInteractive ? await prompter.ask('Telegram allowed chat IDs (comma-separated): ') : ''));
+        const telegramBotToken = trim(options.telegramBotToken || (
+          !nonInteractive
+            ? await promptUntilValid(prompter, {
+              logger,
+              prompt: 'Telegram bot token: ',
+              normalize: trim,
+              validate: (value) => Boolean(value),
+              invalidMessage: 'Telegram bot token is required.',
+            })
+            : ''
+        ));
+        const telegramChatIds = normalizeList(options.telegramChatIds || (
+          !nonInteractive
+            ? await promptUntilValid(prompter, {
+              logger,
+              prompt: 'Telegram allowed chat IDs (comma-separated): ',
+              normalize: normalizeList,
+              validate: (value) => Array.isArray(value) && value.length > 0,
+              invalidMessage: 'Provide at least one Telegram chat ID.',
+            })
+            : ''
+        ));
         if (!telegramBotToken || telegramChatIds.length === 0) {
           throw new Error('Telegram connector requires bot token and at least one allowed chat ID');
         }
@@ -356,8 +343,28 @@ export function createNpmDistributionInstallSeedService(deps = {}) {
         result.summary.connector = 'telegram';
         result.summary.connectorSeeded = true;
       } else if (connector === 'wecom') {
-        const wecomBotId = trim(options.wecomBotId || (!nonInteractive ? await prompter.ask('WeCom bot ID: ') : ''));
-        const wecomSecret = trim(options.wecomSecret || (!nonInteractive ? await prompter.ask('WeCom bot secret: ') : ''));
+        const wecomBotId = trim(options.wecomBotId || (
+          !nonInteractive
+            ? await promptUntilValid(prompter, {
+              logger,
+              prompt: 'WeCom bot ID: ',
+              normalize: trim,
+              validate: (value) => Boolean(value),
+              invalidMessage: 'WeCom bot ID is required.',
+            })
+            : ''
+        ));
+        const wecomSecret = trim(options.wecomSecret || (
+          !nonInteractive
+            ? await promptUntilValid(prompter, {
+              logger,
+              prompt: 'WeCom bot secret: ',
+              normalize: trim,
+              validate: (value) => Boolean(value),
+              invalidMessage: 'WeCom bot secret is required.',
+            })
+            : ''
+        ));
         const wecomTencentDocsApiKey = trim(options.wecomTencentDocsApiKey || (!nonInteractive ? await prompter.ask('Tencent Docs API key (optional, blank to skip): ') : ''));
         if (!wecomBotId || !wecomSecret) {
           throw new Error('WeCom connector requires bot ID and secret');