xw-devtool-cli 1.0.44 → 1.0.45

package/README_EN.md

@@ -30,7 +30,7 @@ Key features include: Base64 encoding/decoding, image format conversion, image <
   - **Timestamp**: Quickly get current millisecond timestamp.
   - **Calculation**: Calculate date differences or offsets (Add/Subtract).
   - **Console Clock**: Show real-time current time in terminal, press `Enter` or `Q` to go back.
-  - **Countdown Timer**: Enter countdown minutes to start timer; once it reaches zero, it keeps counting with a negative sign (such as `-00:00:05`).
+  - **Countdown Timer**: Select seconds/minutes/hours first, then enter the value to start; once it reaches zero, it keeps counting with a negative sign (such as `-00:00:05`).
   - **Stopwatch**: Start from `00:00:00` and count up every second in terminal.
 - **Dev Tools**:
   - **URL Encode/Decode**
@@ -234,7 +234,7 @@ s. Settings (Language)
 
 ### Countdown Timer
 - Select `Countdown Timer` in the menu.
-- Enter minutes to start the countdown.
+- Select unit first (Seconds / Minutes / Hours), then enter the value.
 - After reaching zero, the timer continues with a negative sign (for example `-00:00:01`).
 - Press `Enter` or `Q` to go back.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xw-devtool-cli",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "type": "module",
   "description": "基于node的开发者助手cli",
   "main": "index.js",

package/src/commands/clock.js

@@ -62,17 +62,24 @@ function fitText(text, width) {
 
 function renderClockBlock() {
     const { timeText, dateText } = getNowDisplay(getLocale());
-    const innerWidth = 34;
+    const contentLines = [
+        i18next.t('clock.title'),
+        '',
+        `${i18next.t('clock.now')}${timeText}`,
+        dateText,
+        i18next.t('clock.exitTip')
+    ];
+    const innerWidth = Math.max(34, ...contentLines.map((text) => getDisplayWidth(text)));
     const top = `┌${'─'.repeat(innerWidth + 2)}┐`;
     const bottom = `└${'─'.repeat(innerWidth + 2)}┘`;
     const line = (text) => `│ ${fitText(text, innerWidth)} │`;
     return [
         top,
-        line(i18next.t('clock.title')),
+        line(contentLines[0]),
         line(''),
-        line(`${i18next.t('clock.now')}${timeText}`),
-        line(dateText),
-        line(i18next.t('clock.exitTip')),
+        line(contentLines[2]),
+        line(contentLines[3]),
+        line(contentLines[4]),
         bottom
     ];
 }

package/src/commands/countdown.js

@@ -1,6 +1,7 @@
 import inquirer from 'inquirer';
 import readline from 'readline';
 import i18next from '../i18n.js';
+import { selectFromMenu } from '../utils/menu.js';
 
 function getCharDisplayWidth(char) {
     if (/[\u0000-\u001f\u007f]/.test(char)) {
@@ -50,7 +51,7 @@ function formatSeconds(seconds) {
     return `${sign}${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:${String(secs).padStart(2, '0')}`;
 }
 
-function parseMinutes(input) {
+function parseAmount(input) {
     const value = Number(input);
     if (!Number.isFinite(value) || value < 0) {
         return null;
@@ -60,43 +61,78 @@ function parseMinutes(input) {
 
 function renderCountdownBlock(totalSeconds, elapsedSeconds) {
     const remainSeconds = totalSeconds - elapsedSeconds;
-    const innerWidth = 34;
+    const contentLines = [
+        i18next.t('countdown.title'),
+        '',
+        `${i18next.t('countdown.remaining')}${formatSeconds(remainSeconds)}`,
+        `${i18next.t('countdown.total')}${formatSeconds(totalSeconds)}`,
+        `${i18next.t('countdown.status')}${remainSeconds < 0 ? i18next.t('countdown.statusOvertime') : i18next.t('countdown.statusCounting')}`,
+        i18next.t('countdown.exitTip')
+    ];
+    const innerWidth = Math.max(34, ...contentLines.map((text) => getDisplayWidth(text)));
     const top = `┌${'─'.repeat(innerWidth + 2)}┐`;
     const bottom = `└${'─'.repeat(innerWidth + 2)}┘`;
     const line = (text) => `│ ${fitText(text, innerWidth)} │`;
-    const status = remainSeconds < 0 ? i18next.t('countdown.statusOvertime') : i18next.t('countdown.statusCounting');
 
     return [
         top,
-        line(i18next.t('countdown.title')),
+        line(contentLines[0]),
         line(''),
-        line(`${i18next.t('countdown.remaining')}${formatSeconds(remainSeconds)}`),
-        line(`${i18next.t('countdown.total')}${formatSeconds(totalSeconds)}`),
-        line(`${i18next.t('countdown.status')}${status}`),
-        line(i18next.t('countdown.exitTip')),
+        line(contentLines[2]),
+        line(contentLines[3]),
+        line(contentLines[4]),
+        line(contentLines[5]),
         bottom
     ];
 }
 
 export async function countdownHandler() {
-    const { minutesInput } = await inquirer.prompt([
+    const unitOptions = [
+        { name: i18next.t('countdown.unitSecond'), value: 'second' },
+        { name: i18next.t('countdown.unitMinute'), value: 'minute' },
+        { name: i18next.t('countdown.unitHour'), value: 'hour' }
+    ];
+
+    const unit = await selectFromMenu(
+        i18next.t('countdown.selectUnit'),
+        unitOptions,
+        true,
+        i18next.t('common.back')
+    );
+
+    if (unit === '__BACK__') {
+        return;
+    }
+
+    const unitNameMap = {
+        second: i18next.t('countdown.unitSecond'),
+        minute: i18next.t('countdown.unitMinute'),
+        hour: i18next.t('countdown.unitHour')
+    };
+
+    const { amountInput } = await inquirer.prompt([
         {
             type: 'input',
-            name: 'minutesInput',
-            message: i18next.t('countdown.inputPrompt'),
+            name: 'amountInput',
+            message: i18next.t('countdown.inputPrompt', { unit: unitNameMap[unit] }),
             default: '1',
             validate: (input) => {
-                const value = parseMinutes(input);
+                const value = parseAmount(input);
                 if (value === null) {
-                    return i18next.t('countdown.invalidMinutes');
+                    return i18next.t('countdown.invalidAmount');
                 }
                 return true;
             }
         }
     ]);
 
-    const minutes = parseMinutes(minutesInput);
-    const totalSeconds = Math.round(minutes * 60);
+    const amount = parseAmount(amountInput);
+    const multiplierMap = {
+        second: 1,
+        minute: 60,
+        hour: 3600
+    };
+    const totalSeconds = Math.round(amount * multiplierMap[unit]);
 
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
         console.log(i18next.t('countdown.nonTtyTip', { value: formatSeconds(totalSeconds) }));

package/src/commands/stopwatch.js

@@ -47,18 +47,25 @@ function formatSeconds(seconds) {
 }
 
 function renderStopwatchBlock(elapsedSeconds) {
-    const innerWidth = 34;
+    const contentLines = [
+        i18next.t('stopwatch.title'),
+        '',
+        `${i18next.t('stopwatch.elapsed')}${formatSeconds(elapsedSeconds)}`,
+        `${i18next.t('stopwatch.status')}${i18next.t('stopwatch.statusRunning')}`,
+        i18next.t('stopwatch.exitTip')
+    ];
+    const innerWidth = Math.max(34, ...contentLines.map((text) => getDisplayWidth(text)));
     const top = `┌${'─'.repeat(innerWidth + 2)}┐`;
     const bottom = `└${'─'.repeat(innerWidth + 2)}┘`;
     const line = (text) => `│ ${fitText(text, innerWidth)} │`;
 
     return [
         top,
-        line(i18next.t('stopwatch.title')),
+        line(contentLines[0]),
         line(''),
-        line(`${i18next.t('stopwatch.elapsed')}${formatSeconds(elapsedSeconds)}`),
-        line(`${i18next.t('stopwatch.status')}${i18next.t('stopwatch.statusRunning')}`),
-        line(i18next.t('stopwatch.exitTip')),
+        line(contentLines[2]),
+        line(contentLines[3]),
+        line(contentLines[4]),
         bottom
     ];
 }

package/src/locales/en.js

@@ -142,8 +142,12 @@ export default {
     },
     countdown: {
         title: 'Countdown Timer',
-        inputPrompt: 'Enter countdown minutes:',
-        invalidMinutes: 'Please enter a number greater than or equal to 0',
+        selectUnit: 'Select countdown unit',
+        unitSecond: 'Seconds',
+        unitMinute: 'Minutes',
+        unitHour: 'Hours',
+        inputPrompt: 'Enter countdown {{unit}} value:',
+        invalidAmount: 'Please enter a number greater than or equal to 0',
         remaining: 'Remaining: ',
         total: 'Total: ',
         status: 'Status: ',

package/src/locales/zh.js

@@ -142,8 +142,12 @@ export default {
     },
     countdown: {
         title: '倒计时工具',
-        inputPrompt: '请输入倒计时分钟数:',
-        invalidMinutes: '请输入大于等于 0 的数字分钟数',
+        selectUnit: '请选择倒计时单位',
+        unitSecond: '秒',
+        unitMinute: '分钟',
+        unitHour: '小时',
+        inputPrompt: '请输入倒计时{{unit}}数值:',
+        invalidAmount: '请输入大于等于 0 的数字',
         remaining: '剩余时间: ',
         total: '倒计总时: ',
         status: '当前状态: ',