@quangnv13/nonstop 1.0.4 → 1.0.5

package/dist/ui.js

@@ -67,12 +67,22 @@ function infoRow(label, value, valueColor = (s) => s) {
 function separator() {
     return chalk_1.default.gray('  ' + '─'.repeat(44));
 }
-async function pause(rl) {
-    await rl.question(`\n${chalk_1.default.gray('Nhấn Enter để tiếp tục...')}`);
+async function askQuestion(query) {
+    const rl = (0, promises_1.createInterface)({ input: node_process_1.stdin, output: node_process_1.stdout });
+    try {
+        return await rl.question(query);
+    }
+    finally {
+        rl.close();
+        process.stdin.resume();
+    }
+}
+async function pause() {
+    await askQuestion(`\n${chalk_1.default.gray('Nhấn Enter để tiếp tục...')}`);
 }
-async function askWithDefault(rl, label, currentValue) {
+async function askWithDefault(label, currentValue) {
     const prompt = `${chalk_1.default.bold(label)}${currentValue ? chalk_1.default.gray(` [${currentValue}]`) : ''}: `;
-    const answer = await rl.question(prompt);
+    const answer = await askQuestion(prompt);
     return answer.trim() || currentValue;
 }
 async function runSelectionMenu(headerRenderer, options, initialIndex = 0) {
@@ -172,15 +182,9 @@ async function launchControlCenter() {
     let config = (0, config_js_1.loadConfigFromDisk)();
     const isTTY = process.stdin.isTTY;
     const wasRaw = process.stdin.isRaw;
-    let rl;
     try {
         if ((0, config_js_1.getMissingConfigFields)(config).length > 0) {
-            const result = await runSetupWizard(config);
-            config = result.config;
-            rl = result.rl;
-        }
-        else {
-            rl = (0, promises_1.createInterface)({ input: node_process_1.stdin, output: node_process_1.stdout });
+            config = await runSetupWizard(config);
         }
         let lastSelection = 0;
         while (true) {
@@ -200,47 +204,39 @@ async function launchControlCenter() {
                 { label: t('menu.logs'), value: 'logs' },
                 { label: t('menu.exit'), value: 'exit' }
             ];
-            rl.pause();
             const choice = await runSelectionMenu(() => renderDashboardHeader(config, (0, runtime_manager_js_1.getRuntimeStatus)().snapshot), options, lastSelection);
-            rl.resume();
             lastSelection = options.findIndex(opt => opt.value === choice);
             if (lastSelection < 0)
                 lastSelection = 0;
             if (choice === 'exit')
                 break;
             if (choice === 'toggle') {
-                await handleToggleRuntime(config, rl);
+                await handleToggleRuntime(config);
                 continue;
             }
             if (choice === 'settings') {
-                config = await editConfig(config, rl);
+                config = await editConfig(config);
                 continue;
             }
             if (choice === 'workspaces') {
-                await manageWorkspaces(rl, config.language);
+                await manageWorkspaces(config.language);
                 continue;
             }
             if (choice === 'startup') {
-                config = await configureStartup(config, rl);
+                config = await configureStartup(config);
                 continue;
             }
             if (choice === 'language') {
-                config = await switchLanguage(config, rl);
+                config = await switchLanguage(config);
                 continue;
             }
             if (choice === 'logs') {
-                await showRecentLogs(rl);
+                await showRecentLogs();
                 continue;
             }
         }
     }
     finally {
-        if (rl) {
-            try {
-                rl.close();
-            }
-            catch { /* ignore */ }
-        }
         process.stdout.write('\u001b[?25h');
         if (isTTY) {
             try {
@@ -261,49 +257,37 @@ async function runSetupWizard(currentConfig) {
         { label: 'English (en)', value: 'en' }
     ], currentConfig.language === 'en' ? 1 : 0);
     const t = (0, i18n_js_1.createTranslator)(language);
-    const rl = (0, promises_1.createInterface)({ input: node_process_1.stdin, output: node_process_1.stdout });
-    try {
-        clearScreen();
-        console.log(titleBox(t('wizard.title')));
-        console.log('');
-        const telegramBotToken = await askWithDefault(rl, t('wizard.token'), currentConfig.telegramBotToken);
-        const adminUsername = await askWithDefault(rl, t('wizard.admin'), currentConfig.adminUsername);
-        const clientName = await askWithDefault(rl, t('wizard.clientName'), currentConfig.clientName);
-        rl.pause();
-        const startupMode = await runSelectionMenu(() => {
-            console.log(titleBox(t('wizard.title')));
-            console.log(chalk_1.default.gray(`  ${t('wizard.startupMode')}:`));
-        }, [
-            { label: `Tắt (disabled)`, value: 'disabled' },
-            { label: `Chạy nền (background)`, value: 'background' },
-            { label: `Mở giao diện (open-ui)`, value: 'open-ui' }
-        ], 0);
-        rl.resume();
-        const nextConfig = {
-            ...currentConfig,
-            language,
-            telegramBotToken,
-            adminUsername,
-            telegramUsername: adminUsername,
-            clientName,
-            startupMode
-        };
-        (0, config_js_1.saveConfigToDisk)(nextConfig);
-        clearScreen();
+    clearScreen();
+    console.log(titleBox(t('wizard.title')));
+    console.log('');
+    const telegramBotToken = await askWithDefault(t('wizard.token'), currentConfig.telegramBotToken);
+    const adminUsername = await askWithDefault(t('wizard.admin'), currentConfig.adminUsername);
+    const clientName = await askWithDefault(t('wizard.clientName'), currentConfig.clientName);
+    const startupMode = await runSelectionMenu(() => {
         console.log(titleBox(t('wizard.title')));
-        console.log(`\n${chalk_1.default.green(t('wizard.complete'))}`);
-        await pause(rl);
-        return { config: nextConfig, rl };
-    }
-    catch (error) {
-        try {
-            rl.close();
-        }
-        catch { /* ignore */ }
-        throw error;
-    }
+        console.log(chalk_1.default.gray(`  ${t('wizard.startupMode')}:`));
+    }, [
+        { label: `Tắt (disabled)`, value: 'disabled' },
+        { label: `Chạy nền (background)`, value: 'background' },
+        { label: `Mở giao diện (open-ui)`, value: 'open-ui' }
+    ], 0);
+    const nextConfig = {
+        ...currentConfig,
+        language,
+        telegramBotToken,
+        adminUsername,
+        telegramUsername: adminUsername,
+        clientName,
+        startupMode
+    };
+    (0, config_js_1.saveConfigToDisk)(nextConfig);
+    clearScreen();
+    console.log(titleBox(t('wizard.title')));
+    console.log(`\n${chalk_1.default.green(t('wizard.complete'))}`);
+    await pause();
+    return nextConfig;
 }
-async function handleToggleRuntime(config, rl) {
+async function handleToggleRuntime(config) {
     const status = (0, runtime_manager_js_1.getRuntimeStatus)();
     const targetState = !status.running;
     clearScreen();
@@ -326,31 +310,30 @@ async function handleToggleRuntime(config, rl) {
     }
     catch (error) {
         console.log(`\n${chalk_1.default.red(error instanceof Error ? error.message : String(error))}`);
-        await pause(rl);
+        await pause();
         return;
     }
-    // Không pause — quay lại menu ngay để trạng thái cập nhật tức thì
 }
-async function editConfig(config, rl) {
+async function editConfig(config) {
     clearScreen();
     console.log(titleBox('Sửa cấu hình'));
     console.log('');
     const nextConfig = {
         ...config,
-        telegramBotToken: await askWithDefault(rl, 'TELEGRAM_BOT_TOKEN', config.telegramBotToken),
-        adminUsername: await askWithDefault(rl, 'ADMIN_USERNAME', config.adminUsername),
-        clientName: await askWithDefault(rl, 'CLIENT_NAME', config.clientName),
-        telegramUsername: await askWithDefault(rl, 'TELEGRAM_USERNAME', config.telegramUsername),
-        codexCmd: await askWithDefault(rl, 'CODEX_CMD', config.codexCmd),
-        antigravityCmd: await askWithDefault(rl, 'ANTIGRAVITY_CMD', config.antigravityCmd)
+        telegramBotToken: await askWithDefault('TELEGRAM_BOT_TOKEN', config.telegramBotToken),
+        adminUsername: await askWithDefault('ADMIN_USERNAME', config.adminUsername),
+        clientName: await askWithDefault('CLIENT_NAME', config.clientName),
+        telegramUsername: await askWithDefault('TELEGRAM_USERNAME', config.telegramUsername),
+        codexCmd: await askWithDefault('CODEX_CMD', config.codexCmd),
+        antigravityCmd: await askWithDefault('ANTIGRAVITY_CMD', config.antigravityCmd)
     };
     (0, config_js_1.saveConfigToDisk)(nextConfig);
     console.log(`\n${chalk_1.default.green('✓ Đã lưu cấu hình.')}`);
     console.log(chalk_1.default.gray('Khởi động lại runtime nền nếu đang chạy để áp dụng thay đổi.'));
-    await pause(rl);
+    await pause();
     return nextConfig;
 }
-async function manageWorkspaces(rl, language) {
+async function manageWorkspaces(language) {
     const isVi = language === 'vi';
     while (true) {
         const workspaces = (0, store_js_1.loadWorkspaces)();
@@ -362,23 +345,21 @@ async function manageWorkspaces(rl, language) {
             })),
             { label: isVi ? '← Quay lại menu chính' : '← Back', value: { type: 'back' } }
         ];
-        rl.pause();
         const selection = await runSelectionMenu(() => {
             console.log(titleBox(isVi ? 'Quản lý Workspace' : 'Manage Workspaces'));
             console.log(chalk_1.default.gray(`  ${isVi ? 'Chọn workspace hoặc thêm mới:' : 'Select workspace or add new:'}`));
         }, options);
-        rl.resume();
         if (selection.type === 'back')
             return;
         if (selection.type === 'add') {
             clearScreen();
             console.log(titleBox(isVi ? 'Thêm workspace mới' : 'Add workspace'));
             console.log('');
-            const name = (await rl.question(chalk_1.default.bold(isVi ? 'Tên workspace: ' : 'Workspace name: '))).trim();
-            const rawPath = (await rl.question(chalk_1.default.bold(isVi ? 'Đường dẫn: ' : 'Path: '))).trim();
+            const name = (await askQuestion(chalk_1.default.bold(isVi ? 'Tên workspace: ' : 'Workspace name: '))).trim();
+            const rawPath = (await askQuestion(chalk_1.default.bold(isVi ? 'Đường dẫn: ' : 'Path: '))).trim();
             if (!rawPath) {
                 console.log(chalk_1.default.red(isVi ? '  Đường dẫn không được để trống.' : '  Path cannot be empty.'));
-                await pause(rl);
+                await pause();
                 continue;
             }
             const resolvedPath = path.resolve(rawPath);
@@ -388,7 +369,7 @@ async function manageWorkspaces(rl, language) {
             workspaces.push({ id: (0, store_js_1.createWorkspaceId)(), name: name || 'Workspace', path: resolvedPath });
             (0, store_js_1.saveWorkspaces)(workspaces);
             console.log(chalk_1.default.green(`\n  ✓ ${isVi ? 'Đã thêm workspace.' : 'Workspace added.'}`));
-            await pause(rl);
+            await pause();
             continue;
         }
         if (selection.type === 'workspace' && typeof selection.index === 'number') {
@@ -410,15 +391,15 @@ async function manageWorkspaces(rl, language) {
                 (0, store_js_1.saveWorkspaces)(workspaces);
                 clearScreen();
                 console.log(chalk_1.default.green(`\n  ✓ ${isVi ? 'Đã xóa workspace.' : 'Workspace deleted.'}`));
-                await pause(rl);
+                await pause();
                 continue;
             }
             if (action === 'edit') {
                 clearScreen();
                 console.log(titleBox(isVi ? 'Sửa workspace' : 'Edit workspace'));
                 console.log('');
-                const newName = await askWithDefault(rl, isVi ? 'Tên mới' : 'New name', ws.name);
-                const newPath = await askWithDefault(rl, isVi ? 'Đường dẫn mới' : 'New path', ws.path);
+                const newName = await askWithDefault(isVi ? 'Tên mới' : 'New name', ws.name);
+                const newPath = await askWithDefault(isVi ? 'Đường dẫn mới' : 'New path', ws.path);
                 const resolvedPath = path.resolve(newPath.trim());
                 if (!fs.existsSync(resolvedPath)) {
                     console.log(chalk_1.default.yellow(`  ⚠ ${isVi ? 'Đường dẫn không tồn tại.' : 'Path does not exist.'}`));
@@ -426,15 +407,14 @@ async function manageWorkspaces(rl, language) {
                 workspaces[idx] = { ...ws, name: newName.trim() || ws.name, path: resolvedPath };
                 (0, store_js_1.saveWorkspaces)(workspaces);
                 console.log(chalk_1.default.green(`\n  ✓ ${isVi ? 'Đã cập nhật workspace.' : 'Workspace updated.'}`));
-                await pause(rl);
+                await pause();
                 continue;
             }
         }
     }
 }
-async function configureStartup(config, rl) {
+async function configureStartup(config) {
     const isVi = config.language === 'vi';
-    rl.pause();
     const nextMode = await runSelectionMenu(() => {
         console.log(titleBox(isVi ? 'Cấu hình khởi động' : 'Configure startup'));
         console.log(chalk_1.default.gray(`  ${isVi ? 'Chế độ hiện tại:' : 'Current mode:'} ${config.startupMode}`));
@@ -443,7 +423,6 @@ async function configureStartup(config, rl) {
         { label: isVi ? 'Chạy nền (background)' : 'Background', value: 'background' },
         { label: isVi ? 'Mở giao diện (open-ui)' : 'Open UI', value: 'open-ui' }
     ], ['disabled', 'background', 'open-ui'].indexOf(config.startupMode));
-    rl.resume();
     const entryScriptPath = path.join(process.cwd(), 'dist', 'index.js');
     const result = (0, startup_js_1.applyStartupMode)(nextMode, entryScriptPath, process.cwd());
     const nextConfig = { ...config, startupMode: nextMode };
@@ -451,11 +430,10 @@ async function configureStartup(config, rl) {
     clearScreen();
     console.log(titleBox(isVi ? 'Cấu hình khởi động' : 'Configure startup'));
     console.log(`\n${chalk_1.default.green(result)}`);
-    await pause(rl);
+    await pause();
     return nextConfig;
 }
-async function switchLanguage(config, rl) {
-    rl.pause();
+async function switchLanguage(config) {
     const language = await runSelectionMenu(() => {
         console.log(titleBox('Đổi ngôn ngữ / Switch language'));
         console.log(chalk_1.default.gray(`  Hiện tại: ${config.language}`));
@@ -463,21 +441,20 @@ async function switchLanguage(config, rl) {
         { label: 'Tiếng Việt (vi)', value: 'vi' },
         { label: 'English (en)', value: 'en' }
     ], config.language === 'en' ? 1 : 0);
-    rl.resume();
     const nextConfig = { ...config, language };
     (0, config_js_1.saveConfigToDisk)(nextConfig);
     return nextConfig;
 }
-async function showRecentLogs(rl) {
+async function showRecentLogs() {
     clearScreen();
     console.log(titleBox('Nhật ký gần đây'));
     const logPath = path.join(process.cwd(), 'data', 'nonstop.log');
     if (!fs.existsSync(logPath)) {
         console.log(chalk_1.default.gray('\n  Chưa có nhật ký.'));
-        await pause(rl);
+        await pause();
         return;
     }
     const lines = fs.readFileSync(logPath, 'utf8').split(/\r?\n/).filter(Boolean).slice(-25);
     console.log('\n' + lines.map(l => chalk_1.default.gray('  ') + l).join('\n'));
-    await pause(rl);
+    await pause();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quangnv13/nonstop",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "preferGlobal": true,
   "publishConfig": {
     "access": "public"