xw-devtool-cli 1.0.20 → 1.0.22

package/README.md

@@ -10,8 +10,9 @@
 
 - **Base64 工具**：支持字符串与 Base64 互转，支持从剪贴板、文件或手动输入读取。
 - **图片工具**：
-  - **图片格式转换**：支持 PNG、JPG、WebP 格式互转，可调整压缩质量。
+  - **图片格式转换**：支持 PNG、JPG、WebP、ICO 格式互转，可调整压缩质量。生成 ICO 时支持自定义尺寸（逗号分隔），留空则默认生成 `256` 尺寸。输出文件名默认带时间戳，避免覆盖。
   - **图片 ↔ Base64**：支持图片转 Base64 字符串，以及 Base64 还原为图片文件。
+  - **图片主色识别**：提取图片主色调（Hex/RGB/HSL/HSV），默认复制 Hex 到剪贴板，支持保存详细信息到文件。
   - **占位图生成**：快速生成指定尺寸、颜色、文字的占位图片 (Placeholder Image)。
 - **Mock 数据生成**：
   - 支持生成：英文段落 (Lorem Ipsum)、中文字符、中国居民身份证号、电子邮箱、URL、订单号、手机号、座机号。
@@ -79,7 +80,8 @@ xw-devtool --en  # 英文启动 (Start in English)
 1. 图片 ↔ Base64
 2. 图片格式转换
 3. 占位图生成
-4. 二维码生成
+4. 图片主色识别
+5. 二维码生成
 5. URL 编解码
 6. 字符串 Base64 转换
 7. Unicode 编解码
@@ -116,9 +118,10 @@ s. 设置 (语言)
 ### 2. 图片格式转换
 - 选择 `2` 进入。
 - 选择源图片文件。
-- 选择目标格式 (PNG / JPG / WebP)。
+- 选择目标格式 (PNG / JPG / WebP / ICO)。
 - 设置压缩参数（如 JPG 质量 1-100，PNG 压缩等级 0-9）。
 - 生成的新图片将保存在源文件同级目录。
+- 生成 ICO 时可自定义尺寸，留空默认生成 `256` 尺寸；输出文件名包含时间戳。
 
 ### 3. 占位图生成 (Placeholder Image)
 - 选择 `3` 进入。
@@ -287,8 +290,9 @@ Key features include: Base64 encoding/decoding, image format conversion, image <
 
 - **Base64 Tools**: Convert strings to/from Base64, supports reading from clipboard, file, or manual input.
 - **Image Tools**:
-  - **Format Conversion**: Convert between PNG, JPG, WebP, with adjustable compression quality.
+  - **Format Conversion**: Convert between PNG, JPG, WebP, ICO, with adjustable compression quality. For ICO, you can specify sizes (comma-separated); leave empty to generate `256` size by default. Output filenames include timestamps to avoid overwriting.
   - **Image ↔ Base64**: Convert images to Base64 strings and vice versa.
+  - **Image Dominant Color**: Extract dominant color (Hex/RGB/HSL/HSV), copy Hex to clipboard by default, or save details to file.
   - **Placeholder Image**: Quickly generate placeholder images with custom size, color, and text.
 - **Mock Data**:
   - Generate: Lorem Ipsum, Chinese characters, ID cards, Emails, URLs, Order IDs, Phone numbers.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xw-devtool-cli",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "type": "module",
   "description": "基于node的开发者助手cli",
   "main": "index.js",
@@ -75,6 +75,7 @@
     "qrcode": "^1.5.4",
     "sharp": "^0.33.5",
     "tinycolor2": "^1.6.0",
-    "uuid": "^13.0.0"
+    "uuid": "^13.0.0",
+    "to-ico": "^1.1.5"
   }
 }

package/src/commands/dominantColor.js

@@ -0,0 +1,109 @@
+import inquirer from 'inquirer';
+import sharp from 'sharp';
+import tinycolor from 'tinycolor2';
+import { selectFromMenu } from '../utils/menu.js';
+import { selectFile, saveFile } from '../utils/fileDialog.js';
+import { outputText, defaultFileName } from '../utils/output.js';
+
+export async function dominantColorHandler() {
+    const method = await selectFromMenu('Image input method', [
+        { name: 'Select file (dialog)', value: 'dialog' },
+        { name: 'Enter file path manually', value: 'manual' }
+    ]);
+
+    let filePath = '';
+    if (method === 'dialog') {
+        filePath = selectFile('Image Files|*.png;*.jpg;*.jpeg;*.webp;*.gif|All Files|*.*') || '';
+    }
+    if (!filePath) {
+        const ans = await inquirer.prompt([
+            { type: 'input', name: 'filePath', message: 'Enter image file path:' }
+        ]);
+        filePath = ans.filePath;
+    }
+
+    try {
+        const image = sharp(filePath);
+        // Resize to 100x100 to speed up processing while maintaining color distribution
+        const { data, info } = await image
+            .resize(100, 100, { fit: 'inside' })
+            .ensureAlpha()
+            .raw()
+            .toBuffer({ resolveWithObject: true });
+
+        const pixelCount = info.width * info.height;
+        const colorMap = new Map();
+
+        // Quantize colors to group similar ones (4 bits per channel = 16 values per channel)
+        for (let i = 0; i < pixelCount; i++) {
+            const offset = i * 4;
+            const r = data[offset];
+            const g = data[offset + 1];
+            const b = data[offset + 2];
+            const a = data[offset + 3];
+
+            if (a < 128) continue; // Ignore transparent pixels
+
+            // Quantize: divide by 16 (right shift 4)
+            const key = `${r >> 4}-${g >> 4}-${b >> 4}`;
+            
+            if (!colorMap.has(key)) {
+                colorMap.set(key, { count: 0, r: 0, g: 0, b: 0 });
+            }
+            
+            const bucket = colorMap.get(key);
+            bucket.count++;
+            bucket.r += r;
+            bucket.g += g;
+            bucket.b += b;
+        }
+
+        let maxCount = 0;
+        let dominant = { r: 0, g: 0, b: 0 };
+
+        for (const bucket of colorMap.values()) {
+            if (bucket.count > maxCount) {
+                maxCount = bucket.count;
+                dominant = {
+                    r: Math.round(bucket.r / bucket.count),
+                    g: Math.round(bucket.g / bucket.count),
+                    b: Math.round(bucket.b / bucket.count)
+                };
+            }
+        }
+
+        const { r, g, b } = dominant;
+        const hex = tinycolor({ r, g, b }).toHexString().toUpperCase();
+        const rgb = `rgb(${r}, ${g}, ${b})`;
+        const hsl = tinycolor({ r, g, b }).toHslString();
+        const hsv = tinycolor({ r, g, b }).toHsvString();
+
+        const text = [
+            '=== Dominant Color ===',
+            `Hex: ${hex}`,
+            `RGB: ${rgb}`,
+            `HSL: ${hsl}`,
+            `HSV: ${hsv}`,
+            '======================'
+        ].join('\n');
+
+        const outputMethod = await selectFromMenu('Output', [
+            { name: 'Copy Hex to clipboard', value: 'copy' },
+            { name: 'Save details to file', value: 'file' },
+            { name: 'Preview + copy Hex', value: 'preview' }
+        ]);
+
+        if (outputMethod === 'file') {
+            const def = defaultFileName('dominant-color', 'txt');
+            const out = saveFile(def, 'Text Files|*.txt|All Files|*.*') || def;
+            await outputText(text, { showPreview: false, savePath: out });
+        } else if (outputMethod === 'preview') {
+            await outputText(text, { showPreview: true });
+            await outputText(hex, { showPreview: false });
+        } else {
+            await outputText(hex, { showPreview: false });
+        }
+    } catch (e) {
+        console.error('Failed to analyze image:', e.message);
+    }
+}

package/src/commands/imgConvert.js

@@ -2,6 +2,7 @@ import inquirer from 'inquirer';
 import fs from 'fs';
 import path from 'path';
 import sharp from 'sharp';
+import toIco from 'to-ico';
 import { selectFromMenu } from '../utils/menu.js';
 import { selectFile, saveFile } from '../utils/fileDialog.js';
 import { defaultFileName } from '../utils/output.js';
@@ -15,7 +16,8 @@ function getExt(p) {
 function suggestOutputPath(inputPath, targetExt) {
     const dir = path.dirname(inputPath);
     const base = path.basename(inputPath, path.extname(inputPath));
-    return path.join(dir, `${base}.${targetExt}`);
+    const ts = Date.now();
+    return path.join(dir, `${base}-${ts}.${targetExt}`);
 }
 
 async function pickInputFile() {
@@ -48,7 +50,8 @@ async function pickTargetFormat(currentExt) {
     const options = [
         { name: 'png', value: 'png' },
         { name: 'jpg', value: 'jpg' },
-        { name: 'webp', value: 'webp' }
+        { name: 'webp', value: 'webp' },
+        { name: 'ico', value: 'ico' }
     ].filter(o => o.value !== currentExt);
     return await selectFromMenu('Target format', options);
 }
@@ -69,6 +72,18 @@ async function pickQuality(targetExt) {
             { type: 'number', name: 'quality', message: 'WebP quality (1-100):', default: 80, validate: n => (n >= 1 && n <= 100) ? true : '1-100' }
         ]);
         return { webpQuality: quality };
+    } else if (targetExt === 'ico') {
+        const { sizesStr } = await inquirer.prompt([
+            { type: 'input', name: 'sizesStr', message: 'Enter ICO sizes (comma-separated). Leave empty for default 256:', default: '' }
+        ]);
+        const defaultSizes = [256];
+        const allowed = new Set([16, 24, 32, 48, 64, 128, 256]);
+        const parsed = (sizesStr || '')
+            .split(',')
+            .map(s => parseInt(s.trim()))
+            .filter(n => Number.isFinite(n) && allowed.has(n));
+        const uniq = Array.from(new Set(parsed));
+        return { icoSizes: uniq.length ? uniq : defaultSizes };
     }
     return {};
 }
@@ -82,7 +97,7 @@ export async function imgConvertHandler() {
     console.log(`Target format: ${targetExt}`);
     const opts = await pickQuality(targetExt);
 
-    let outPath = saveFile(suggestOutputPath(inputPath, targetExt), 'Image Files|*.png;*.jpg;*.jpeg;*.webp|All Files|*.*');
+    let outPath = saveFile(suggestOutputPath(inputPath, targetExt), 'Image Files|*.png;*.jpg;*.jpeg;*.webp;*.ico|All Files|*.*');
     if (!outPath) {
         const def = suggestOutputPath(inputPath, targetExt);
         const ans = await inquirer.prompt([
@@ -93,19 +108,27 @@ export async function imgConvertHandler() {
 
     try {
         fs.mkdirSync(path.dirname(outPath), { recursive: true });
-        let pipeline = sharp(inputPath);
-        if (targetExt === 'png') {
-            pipeline = pipeline.png({ compressionLevel: opts.pngCompressionLevel ?? 6 });
-        } else if (targetExt === 'jpg') {
-            pipeline = pipeline.jpeg({ quality: opts.jpegQuality ?? 80 });
-            if (inputExt !== 'jpg') {
-                pipeline = pipeline.flatten({ background: { r: 255, g: 255, b: 255 } });
+        if (targetExt === 'ico') {
+            const basePng = await sharp(inputPath).ensureAlpha().png().toBuffer();
+            const sizes = opts.icoSizes ?? [16, 24, 32, 48, 64, 128, 256];
+            const icoBuffer = await toIco([basePng], { resize: true, sizes });
+            fs.writeFileSync(outPath, icoBuffer);
+            console.log(`Converted to ICO: ${inputPath} -> ${outPath}`);
+        } else {
+            let pipeline = sharp(inputPath);
+            if (targetExt === 'png') {
+                pipeline = pipeline.png({ compressionLevel: opts.pngCompressionLevel ?? 6 });
+            } else if (targetExt === 'jpg') {
+                pipeline = pipeline.jpeg({ quality: opts.jpegQuality ?? 80 });
+                if (inputExt !== 'jpg') {
+                    pipeline = pipeline.flatten({ background: { r: 255, g: 255, b: 255 } });
+                }
+            } else if (targetExt === 'webp') {
+                pipeline = pipeline.webp({ quality: opts.webpQuality ?? 80 });
             }
-        } else if (targetExt === 'webp') {
-            pipeline = pipeline.webp({ quality: opts.webpQuality ?? 80 });
+            await pipeline.toFile(outPath);
+            console.log(`Converted: ${inputPath} -> ${outPath}`);
         }
-        await pipeline.toFile(outPath);
-        console.log(`Converted: ${inputPath} -> ${outPath}`);
     } catch (e) {
         console.error('Conversion error:', e.message);
     }

package/src/index.js

@@ -24,6 +24,7 @@ import { htmlEntitiesHandler } from './commands/htmlEntities.js';
 import { placeholderImgHandler } from './commands/placeholderImg.js';
 import { markdownHandler } from './commands/markdown.js';
 import { vscodeSnippetHandler } from './commands/vscodeSnippet.js';
+import { dominantColorHandler } from './commands/dominantColor.js';
 
 process.on('SIGINT', () => {
     console.log(`\n${i18next.t('menu.bye')}`);
@@ -45,6 +46,7 @@ function getFeatures() {
         // Image Tools
         { name: i18next.t('menu.features.imgBase64'), value: 'imgBase64' },
         { name: i18next.t('menu.features.imgConvert'), value: 'imgConvert' },
+        { name: i18next.t('menu.features.dominantColor'), value: 'dominantColor' },
         { name: i18next.t('menu.features.placeholderImg'), value: 'placeholderImg' },
         { name: i18next.t('menu.features.qrcode'), value: 'qrcode' },
         
@@ -171,6 +173,9 @@ async function handleAction(action) {
         case 'imgConvert':
             await imgConvertHandler();
             break;
+        case 'dominantColor':
+            await dominantColorHandler();
+            break;
         case 'timeFormat':
             await timeFormatHandler();
             break;

package/src/locales/en.js

@@ -8,6 +8,7 @@ export default {
         features: {
             imgBase64: 'Image <-> Base64',
             imgConvert: 'Image Format Convert',
+            dominantColor: 'Image Dominant Color',
             placeholderImg: 'Placeholder Image Generator',
             qrcode: 'QR Code Generator',
             url: 'URL Encode/Decode',

package/src/locales/zh.js

@@ -8,6 +8,7 @@ export default {
         features: {
             imgBase64: '图片 <-> Base64',
             imgConvert: '图片格式转换',
+            dominantColor: '图片主色识别',
             placeholderImg: '占位图生成器',
             qrcode: '二维码生成器',
             url: 'URL 编码/解码',