xw-devtool-cli 1.0.36 → 1.0.37

package/package.json

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

package/src/commands/colorPick.js

@@ -145,45 +145,35 @@ export async function colorPickHandler() {
             console.log(i18next.t('colorPick.notSupported'));
             return;
         }
-        let overlay = null;
-        let sampler = null;
-        const readOneLine = (timeoutMs = 800) => new Promise((resolve) => {
-            let settled = false;
-            const onData = (buf) => {
-                if (settled) return;
-                settled = true;
-                resolve(buf.toString('utf8').trim());
-            };
-            sampler.stdout.once('data', onData);
-            if (timeoutMs > 0) {
-                setTimeout(() => {
-                    if (settled) return;
-                    settled = true;
-                    try { sampler.stdout.removeListener('data', onData); } catch {}
-                    resolve(null);
-                }, timeoutMs);
-            }
-        });
-        try {
-            const overlayScript = `
+        const overlayScript = `
 Add-Type -AssemblyName System.Windows.Forms; Add-Type -AssemblyName System.Drawing;
 Add-Type -TypeDefinition @'
 using System;
 using System.Drawing;
-using System.Windows.Forms;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;
 public class OverlayForm : Form {
  const int WS_EX_TRANSPARENT=0x20;
  const int WS_EX_LAYERED=0x80000;
  const int GWL_EXSTYLE=-20;
  [DllImport("user32.dll")] static extern int GetWindowLong(IntPtr hWnd, int nIndex);
  [DllImport("user32.dll")] static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+ [DllImport("user32.dll")] static extern IntPtr GetDC(IntPtr hWnd);
+ [DllImport("user32.dll")] static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
+ [DllImport("gdi32.dll")] static extern int GetPixel(IntPtr hdc, int x, int y);
  Timer t;
+ DateTime copyUntil = DateTime.MinValue;
+ string lastHex = "#000000";
+ string lastRgb = "RGB(0,0,0)";
  public OverlayForm(){
   this.FormBorderStyle=FormBorderStyle.None;
   this.TopMost=true;
   this.ShowInTaskbar=false;
-  this.WindowState=FormWindowState.Maximized;
+  this.KeyPreview = true;
+  Rectangle totalBounds = Rectangle.Empty;
+  foreach(Screen s in Screen.AllScreens){ totalBounds = Rectangle.Union(totalBounds, s.Bounds); }
+  this.StartPosition = FormStartPosition.Manual;
+  this.Bounds = totalBounds;
   this.BackColor=Color.Fuchsia;
   this.TransparencyKey=this.BackColor;
   this.DoubleBuffered=true;
@@ -192,20 +182,55 @@ public class OverlayForm : Form {
   base.OnShown(e);
   int ex=GetWindowLong(this.Handle,GWL_EXSTYLE);
   SetWindowLong(this.Handle,GWL_EXSTYLE,ex|WS_EX_LAYERED|WS_EX_TRANSPARENT);
+  this.Focus();
+  this.Activate();
   t=new Timer();
   t.Interval=33;
   t.Tick+=(s,ev)=>{ this.Invalidate(); };
   t.Start();
  }
+ protected override void OnKeyDown(KeyEventArgs e){
+  if(e.KeyCode==Keys.Escape){ Application.Exit(); }
+  if(e.KeyCode==Keys.Enter){ Clipboard.SetText(lastHex); copyUntil = DateTime.Now.AddSeconds(2); }
+ }
  protected override void OnPaint(PaintEventArgs e){
-  var p=Cursor.Position;
   var g=e.Graphics;
+  var p=this.PointToClient(Cursor.Position);
   int gap=16;
   using(var pen=new Pen(Color.Red,1)){
    g.DrawLine(pen,0,p.Y,Math.Max(0,p.X-gap),p.Y);
-   g.DrawLine(pen,Math.Min(this.Width,p.X+gap),p.Y,this.Width,p.Y);
+   g.DrawLine(pen,Math.Min(this.ClientSize.Width,p.X+gap),p.Y,this.ClientSize.Width,p.Y);
    g.DrawLine(pen,p.X,0,p.X,Math.Max(0,p.Y-gap));
-   g.DrawLine(pen,p.X,Math.Min(this.Height,p.Y+gap),p.X,this.Height);
+   g.DrawLine(pen,p.X,Math.Min(this.ClientSize.Height,p.Y+gap),p.X,this.ClientSize.Height);
+  }
+  IntPtr hdc = GetDC(IntPtr.Zero);
+  int color = GetPixel(hdc, Cursor.Position.X, Cursor.Position.Y);
+  ReleaseDC(IntPtr.Zero, hdc);
+  if(color!=-1){
+   int r = color & 0xFF;
+   int gC = (color >> 8) & 0xFF;
+   int b = (color >> 16) & 0xFF;
+   lastHex = String.Format("#{0:X2}{1:X2}{2:X2}", r, gC, b);
+   lastRgb = String.Format("RGB({0},{1},{2})", r, gC, b);
+   SizeF szHex = g.MeasureString(lastHex, new Font("Segoe UI", 12, FontStyle.Bold));
+   SizeF szRgb = g.MeasureString(lastRgb, new Font("Segoe UI", 10, FontStyle.Regular));
+   float pad = 12;
+   float boxW = Math.Max(szHex.Width, szRgb.Width) + pad*2 + 40;
+   float boxH = szHex.Height + szRgb.Height + pad*3;
+   float x = this.ClientSize.Width - boxW - 16;
+   float y = this.ClientSize.Height - boxH - 16;
+   using(var bg = new SolidBrush(Color.FromArgb(180,0,0,0))){ g.FillRectangle(bg, x, y, boxW, boxH); }
+   using(var preview = new SolidBrush(Color.FromArgb(r,gC,b))){ g.FillRectangle(preview, x+pad, y+pad, 36, boxH - pad*2); }
+   g.DrawString(lastHex, new Font("Segoe UI", 12, FontStyle.Bold), Brushes.White, x+pad+40, y+pad);
+   g.DrawString(lastRgb, new Font("Segoe UI", 10), Brushes.White, x+pad+40, y+pad+szHex.Height+6);
+   if(DateTime.Now < copyUntil){
+     string copied = "Copied: " + lastHex;
+     SizeF szC = g.MeasureString(copied, new Font("Segoe UI", 10));
+     float cx = x + pad + 40;
+     float cy = y + boxH - szC.Height - pad;
+     using(var bg2 = new SolidBrush(Color.FromArgb(160,0,128,0))){ g.FillRectangle(bg2, cx-6, cy-4, szC.Width+12, szC.Height+8); }
+     g.DrawString(copied, new Font("Segoe UI", 10), Brushes.White, cx, cy);
+   }
   }
  }
 }
@@ -215,75 +240,17 @@ public static class Entry {
 '@ -ReferencedAssemblies System.Windows.Forms,System.Drawing;
 [Entry]::Main()
 `;
-            overlay = spawn('powershell', ['-NoProfile', '-Command', overlayScript], { windowsHide: true });
-            const samplerScript = `
-Add-Type -TypeDefinition @'
-using System;
-using System.Runtime.InteropServices;
-public static class ColorSampler {
-    [StructLayout(LayoutKind.Sequential)]
-    public struct POINT { public int X; public int Y; }
-    [DllImport("user32.dll")] static extern bool GetCursorPos(out POINT lpPoint);
-    [DllImport("user32.dll")] static extern IntPtr GetDC(IntPtr hWnd);
-    [DllImport("user32.dll")] static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
-    [DllImport("gdi32.dll")] static extern int GetPixel(IntPtr hdc, int x, int y);
-    public static string Sample() {
-        POINT p;
-        if(!GetCursorPos(out p)) return "";
-        IntPtr hdc = GetDC(IntPtr.Zero);
-        if (hdc == IntPtr.Zero) return "";
-        int color = GetPixel(hdc, p.X, p.Y);
-        ReleaseDC(IntPtr.Zero, hdc);
-        if (color == -1) return "";
-        int r = color & 0xFF;
-        int g = (color >> 8) & 0xFF;
-        int b = (color >> 16) & 0xFF;
-        return $"{r},{g},{b},255";
-    }
-}
-'@
-function Sample {
- $s=[ColorSampler]::Sample();
- if([string]::IsNullOrEmpty($s)){ [Console]::Out.WriteLine(""); } else { [Console]::Out.WriteLine($s) }
-}
-while($true){
- $line = [Console]::In.ReadLine();
- if($line -eq $null){ break }
- if($line -eq 'SAMPLE'){ Sample }
- elseif($line -eq 'EXIT'){ break }
-}
-`;
-            sampler = spawn('powershell', ['-NoProfile', '-Command', samplerScript], { windowsHide: true, stdio: ['pipe', 'pipe', 'ignore'] });
-            try { sampler.stdout.setEncoding('utf8'); } catch {}
-        } catch {}
-        console.log(i18next.t('colorPick.moveMousePrompt'));
-        let last = null;
-        const sampleOnce = async () => {
+        const overlay = spawn('powershell', ['-NoProfile', '-Command', overlayScript], { windowsHide: true });
+        const sampleCmd = `powershell -NoProfile -Command "Add-Type -AssemblyName System.Windows.Forms; Add-Type -AssemblyName System.Drawing; $p=[System.Windows.Forms.Cursor]::Position; $bmp=New-Object System.Drawing.Bitmap 1,1; $g=[System.Drawing.Graphics]::FromImage($bmp); $g.CopyFromScreen($p.X,$p.Y,0,0,[System.Drawing.Size]::new(1,1)); $c=$bmp.GetPixel(0,0); Write-Output (\\"$($c.R),$($c.G),$($c.B),255\\"); $g.Dispose(); $bmp.Dispose();"`;
+        const sampleNow = () => {
             try {
-                let out = null;
-                if (sampler && sampler.stdin && !sampler.killed) {
-                    sampler.stdin.write('SAMPLE\n');
-                    out = await readOneLine(800);
-                }
-                if (!out) {
-                    const cmd = `powershell -NoProfile -Command "Add-Type -AssemblyName System.Windows.Forms; Add-Type -AssemblyName System.Drawing; $p=[System.Windows.Forms.Cursor]::Position; $bmp=New-Object System.Drawing.Bitmap 1,1; $g=[System.Drawing.Graphics]::FromImage($bmp); $g.CopyFromScreen($p.X,$p.Y,0,0,[System.Drawing.Size]::new(1,1)); $c=$bmp.GetPixel(0,0); Write-Output (\\"$($c.R),$($c.G),$($c.B),255\\"); $g.Dispose(); $bmp.Dispose();"`;
-                    out = execSync(cmd, { stdio: ['pipe', 'pipe', 'ignore'] }).toString('utf8').trim();
-                }
+                const out = execSync(sampleCmd, { stdio: ['pipe', 'pipe', 'ignore'] }).toString('utf8').trim();
                 const parts = out.split(',').map(n => parseInt(n, 10));
                 const r = parts[0], g = parts[1], b = parts[2];
-                last = { r, g, b, a: 1 };
-                const tc = tinycolor({ r: last.r, g: last.g, b: last.b, a: last.a });
-                const hex = last.a < 1 ? tc.toHex8String().toUpperCase() : tc.toHexString().toUpperCase();
-                const rgb = tc.toRgbString();
-                const hsl = tc.toHslString();
-                console.log('\n=== ' + i18next.t('colorPick.result') + ' ===');
-                console.log(`Hex: ${hex}`);
-                console.log(`RGB: ${rgb}`);
-                console.log(`HSL: ${hsl}`);
-                console.log('==========================\n');
-                const label = `${i18next.t('colorPreview.preview')} ${hex} ${rgb} ${hsl}`;
-                printColorBar({ r: last.r, g: last.g, b: last.b }, 50, 2, label, last.a);
+                const tc = tinycolor({ r, g, b, a: 1 });
+                const hex = tc.toHexString().toUpperCase();
                 copy(hex);
+                console.log(i18next.t('colorPreview.copied', { value: hex }));
             } catch {}
         };
         await new Promise((resolve) => {
@@ -292,24 +259,25 @@ while($true){
             stdin.resume();
             const onData = (data) => {
                 const s = data.toString('utf8');
-                if (s === ' ') {
-                    sampleOnce();
-                } else if (s === '\r' || s === '\n') {
+                if (s === '\x1b') {
                     stdin.removeListener('data', onData);
                     try { stdin.setRawMode(false); } catch {}
                     stdin.pause();
+                    try { overlay.kill(); } catch {}
                     resolve();
+                } else if (s === '\r' || s === '\n') {
+                    sampleNow();
                 }
             };
             stdin.on('data', onData);
+            overlay.on('close', () => {
+                stdin.removeListener('data', onData);
+                try { stdin.setRawMode(false); } catch {}
+                stdin.pause();
+                resolve();
+            });
         });
-        try { if (sampler) { sampler.stdin.write('EXIT\n'); sampler.kill(); } } catch {}
-        try { if (overlay) { overlay.kill(); } } catch {}
-        if (!last) {
-            console.log(i18next.t('colorPick.pickFail'));
-            return;
-        }
-        picked = { r: last.r, g: last.g, b: last.b, a: last.a, region: null };
+        return;
     } else {
         const inputPath = await pickInputFile();
         if (inputPath === '__BACK__') {