privacy-brush 1.1.0 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "privacy-brush",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Automatically  mask sensitive information in terminal outputs and logs. Keep your data safe when sharing.",
   "main": "src/index.mjs",
   "module": "src/index.mjs",

package/src/index.mjs

@@ -2,6 +2,7 @@
 
 import { createRequire } from "node:module"
 import { defaultConfig } from "./lib/config.mjs"
+import { tryDecode } from "./lib/iconv-lite.mjs"
 import { verbose } from "./lib/parse-args.mjs"
 
 export class PrivacyBrush {
@@ -299,14 +300,12 @@ export class PrivacyBrush {
   // 实时流处理
   async createMaskStream() {
     const { Transform } = await import("node:stream")
-    // let count = 0
 
     return new Transform({
-      transform: (chunk, encoding, callback) => {
-        const text = chunk.toString("utf8")
-        // console.log(`chunk${++count}:`, { chunk, text })
-
+      transform: (/** @type {Buffer} */ chunk, encoding, callback) => {
+        const text = tryDecode(chunk)
         const masked = this.maskText(text)
+
         callback(null, masked)
       },
     })

package/src/index.test.mjs

@@ -7,10 +7,8 @@ const GOOGLE_BROWSER_VERSION_SAMPLE = "144.0.1234.56"
 const EDGE_BROWSER_VERSION_SAMPLE = "144.0.3421.12"
 
 test("default configurations", () => {
-  // 使用示例
   const masker = new PrivacyBrush()
 
-  // 处理终端输出
   const terminalOutput = `❯ flutter devices
 Flutter assets will be downloaded from https://storage.flutter-io.cn. Make sure you trust this source!
 Found 4 connected devices:
@@ -49,13 +47,11 @@ troubleshooting tips.
 })
 
 test("use custom maskChar and not preserveFirstPart", () => {
-  // 使用示例
   const masker = new PrivacyBrush({
     maskChar: "░",
     preserveFirstPart: false,
   })
 
-  // 处理终端输出
   const terminalOutput = `❯ flutter devices
 Flutter assets will be downloaded from https://storage.flutter-io.cn. Make sure you trust this source!
 Found 4 connected devices:
@@ -94,12 +90,10 @@ troubleshooting tips.
 })
 
 test("only mask browser_version", () => {
-  // 使用示例
   const masker = new PrivacyBrush({
     maskPatternNames: ["browser_version"],
   })
 
-  // 处理终端输出
   const terminalOutput = `❯ flutter devices
 Flutter assets will be downloaded from https://storage.flutter-io.cn. Make sure you trust this source!
 Found 4 connected devices:
@@ -138,26 +132,18 @@ troubleshooting tips.
 })
 
 test("mask username in path", () => {
-  // 使用示例
   const masker = new PrivacyBrush()
 
-  // 处理终端输出
   const input = `/c/Users/legend80s/AppData/  /Users/test/code/`
-
   const safeOutput = masker.maskText(input)
-
-  // console.log("safeOutput3:", safeOutput)
-
   const expectedOutput = `/c/Users/█████████/AppData/  /Users/████/code/`
 
   assert.strictEqual(safeOutput, expectedOutput)
 })
 
 test("mask IP", () => {
-  // 使用示例
   const masker = new PrivacyBrush()
 
-  // 处理终端输出
   const terminalOutput = `Windows [Version 10.0.12345.1234]
 Chrome 144.0.1234.12
 User IP: 10.12.123.12`
@@ -174,10 +160,8 @@ User IP: 10.██.███.██`
 })
 
 test("mask uuid", () => {
-  // 使用示例
   const masker = new PrivacyBrush()
 
-  // 处理终端输出
   const terminalOutput = `
 UUID v1: 11111111-1111-1111-8111-111111111111
 UUID v2: 22222222-2222-2222-8222-222222222222
@@ -202,10 +186,8 @@ UUID v5: ████████-████-5███-████-███
 })
 
 test("mask mac address", () => {
-  // 使用示例
   const masker = new PrivacyBrush()
 
-  // 处理终端输出
   const input = `
 CA:FE:BA:BE:12:34  # "Cafe Babe"
 DE:AD:BE:EF:CA:FE  # "Dead Beef Cafe"

package/src/lib/iconv-lite.mjs

@@ -0,0 +1,55 @@
+// @ts-check
+import { verbose } from "./parse-args.mjs"
+
+/**
+ *
+ * @param {Buffer} chunk
+ * @returns {string}
+ * @example
+ * ❯ getmac -v | node src/cli.mjs # should decode gbk
+ * ❯ ipconfig -all | node src/cli.mjs # should decode gbk
+ */
+export function tryDecode(chunk) {
+  const utf8 = chunk.toString("utf8")
+
+  if (!isLikelyGibberish(utf8)) {
+    return utf8
+  }
+
+  const decoder = new TextDecoder("gbk")
+
+  verbose &&
+    console.log("[transform] isLikelyGibberish try decoding with `gbk`")
+
+  const result = decoder.decode(chunk)
+
+  if (!isLikelyGibberish(result)) {
+    return result
+  }
+
+  verbose && console.log("[transform] still gibberish, using utf8")
+
+  return utf8
+}
+
+/**
+ * 检查是否是乱码
+ * @param {string} text
+ * @returns {boolean}
+ */
+function isLikelyGibberish(text) {
+  // Windows 命令行常见乱码模式
+  const patterns = [
+    /�/g, // Unicode 替换字符
+    // /涓/g, // 常见 UTF-8 转 GBK 乱码
+    // /嶏/g, // 常见乱码字符
+    // /[À-Å]/g, // 带重音的大写字母
+    // /[È-Ë]/g, // 更多重音字母
+    // /[Ì-Ï]/g,
+    // /å/g,
+    // /ä/g,
+    // /ö/g, // 北欧字符
+  ]
+
+  return patterns.some(pattern => pattern.test(text))
+}

package/temp.txt

@@ -0,0 +1,30 @@
+
+Windows IP ����
+
+   ������  . . . . . . . . . . . . . : PC-LIUCHUANZONG
+   �� DNS ��׺ . . . . . . . . . . . : CETHIK.COM
+   �ڵ�����  . . . . . . . . . . . . : ���
+   IP ·�������� . . . . . . . . . . : ��
+   WINS ���������� . . . . . . . . . : ��
+   DNS ��׺�����б�  . . . . . . . . : CETHIK.COM
+                                       NHY_INTERNET
+
+��̫�������� ��̫��:
+
+   �����ض��� DNS ��׺ . . . . . . . : NHY_INTERNET
+   ����. . . . . . . . . . . . . . . : Realtek PCIe GbE Family Controller
+   ������ַ. . . . . . . . . . . . . : F4-6B-8C-8F-CF-52
+   DHCP ������ . . . . . . . . . . . : ��
+   �Զ�����������. . . . . . . . . . : ��
+   �������� IPv6 ��ַ. . . . . . . . : fe80::b051:a4c7:c108:5ef0%14(��ѡ) 
+   IPv4 ��ַ . . . . . . . . . . . . : 10.88.103.87(��ѡ) 
+   ��������  . . . . . . . . . . . . : 255.255.255.0
+   �����Լ��ʱ��  . . . . . . . . . : 2026��1��28�� 8:31:05
+   ��Լ���ڵ�ʱ��  . . . . . . . . . : 2162��3��6�� 17:56:12
+   Ĭ������. . . . . . . . . . . . . : 10.88.103.254
+   DHCP ������ . . . . . . . . . . . : 10.88.103.254
+   DHCPv6 IAID . . . . . . . . . . . : 250899340
+   DHCPv6 �ͻ��� DUID  . . . . . . . : 00-01-00-01-2B-6D-1A-B3-F4-6B-8C-8F-CF-52
+   DNS ������  . . . . . . . . . . . : 10.88.250.2
+                                       114.114.114.114
+   TCPIP �ϵ� NetBIOS  . . . . . . . : ������