zusbdll 0.0.4 → 0.0.5

package/index.js

@@ -15,23 +15,23 @@ const DEFAULT_SEARCH_PATHS = ["."];
 
 // 计算文件的MD5值
 function calculateMD5(filePath) {
-  return new Promise((resolve, reject) => {
-    const hash = crypto.createHash('md5');
-    const stream = fs.createReadStream(filePath);
-    
-    stream.on('data', (data) => {
-      hash.update(data);
-    });
-    
-    stream.on('end', () => {
-      const md5sum = hash.digest('hex');
-      resolve(md5sum);
-    });
-    
-    stream.on('error', (err) => {
-      reject(err);
+    return new Promise((resolve, reject) => {
+        const hash = crypto.createHash('md5');
+        const stream = fs.createReadStream(filePath);
+
+        stream.on('data', (data) => {
+            hash.update(data);
+        });
+
+        stream.on('end', () => {
+            const md5sum = hash.digest('hex');
+            resolve(md5sum);
+        });
+
+        stream.on('error', (err) => {
+            reject(err);
+        });
     });
-  });
 }
 
 function normaliseArgs(args) {
@@ -310,7 +310,7 @@ function runExecutable(args) {
 }
 
 
-async function executeZusbdll(control) { 
+async function executeZusbdll(control) {
     if (process.platform !== "win32") {
         throw new Error("zusbdll requires Windows to execute zdll.exe (win-x86 target).");
     }
@@ -342,7 +342,7 @@ async function executeZusbdll(control) {
         // console.log(`zdll.exe 执行完成，退出代码: ${result.code}`);
         // console.log(`stdout: ${result.stdout}`);
         // console.log(`stderr: ${result.stderr}`);
-        
+
         const parsed = parseOutput(result.stdout);
 
         const output = {
@@ -381,23 +381,17 @@ async function executeZusbdll(control) {
 }
 
 async function autoRun() {
-    let res={
-        code:1,
-        data:null,
-        msg:'error'
+    let res = {
+        code: 1,
+        data: null,
+        msg: 'error'
     }
 
     // 添加路径信息到返回结果
     const dllPath = path.join(__dirname, "lib", "SG.dll");
     const scenarioPath = path.join(__dirname, "lib", "scenario.json");
-    
-    res.paths = {
-        dllPath: dllPath,
-        scenarioPath: scenarioPath,
-        executableDir: EXECUTABLE_DIR,
-        executablePath: EXECUTABLE_PATH,
-        workingDir: __dirname
-    };
+
+
 
     try {
         // const scenarioPath = path.join(__dirname, "lib", "scenario.json");
@@ -407,21 +401,21 @@ async function autoRun() {
         let parsedResults;
         try {
             parsedResults = JSON.parse(result.stdout);
-            res.code=0;
-            res.data=parsedResults;
-            res.msg='success'
+            res.code = 0;
+            res.data = parsedResults;
+            res.msg = 'success'
         } catch (parseErr) {
             // console.log("解析结果失败:", parseErr.message);
-            res.data=parseErr;
-            res.msg=parseErr.message;
+            res.data = parseErr;
+            res.msg = parseErr.message;
             return res;
         }
     }
     catch (err) {
         // console.log("测试失败!", err.message);
-        // console.log("错误详情:", err);
-        res.data=err;
-        res.msg=err.message;
+        console.log("错误详情:", err);
+        res.data = err;
+        res.msg = err.message;
         // 添加操作系统信息
         res.system = {
             platform: process.platform,
@@ -432,27 +426,34 @@ async function autoRun() {
             hostname: os.hostname(),
             userInfo: os.userInfo ? os.userInfo() : undefined
         };
+        res.paths = {
+            dllPath: dllPath,
+            scenarioPath: scenarioPath,
+            executableDir: EXECUTABLE_DIR,
+            executablePath: EXECUTABLE_PATH,
+            workingDir: __dirname
+        };
     }
     return res
 }
 
 async function autoMD5() {
-     let res={
-        code:1,
-        data:null,
-        msg:'error'
+    let res = {
+        code: 1,
+        data: null,
+        msg: 'error'
     }
     try {
         const dllpath = path.join(__dirname, "lib", "SG.dll");
-        let md5v=await calculateMD5(dllpath)
-        res.code=0;
-        res.data=md5v;
-        res.msg='success';
+        let md5v = await calculateMD5(dllpath)
+        res.code = 0;
+        res.data = md5v;
+        res.msg = 'success';
     } catch (err) {
-        res.data=err;
-        res.msg=err.message;
+        res.data = err;
+        res.msg = err.message;
     }
-   return res
+    return res
 }
 
 module.exports = executeZusbdll;

package/lib/scenario.json

@@ -26,6 +26,16 @@
       ],
       "returns": "int"
     },
+    {
+      "type": "call",
+      "alias": "SG",
+      "function": "login",
+      "args": [
+        "int=2",
+        "stringbuilder[32]="
+      ],
+      "returns": "int"
+    },
     {
       "type": "call",
       "alias": "SG",
@@ -46,6 +56,16 @@
       ],
       "returns": "int"
     },
+    {
+      "type": "call",
+      "alias": "SG",
+      "function": "login",
+      "args": [
+        "int=5",
+        "stringbuilder[32]="
+      ],
+      "returns": "int"
+    },
     {
       "type": "unload",
       "alias": "SG"

package/lib/test.c

@@ -0,0 +1,74 @@
+#include "SG.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int main()
+{
+	BOOL ret = 0;
+	char error[32] = {0};
+
+	ret = login(0, error);
+	if (0 == ret)
+	{
+		printf("id(0)测试失败!error = %s.\n", error);
+	}
+	else
+	{
+		printf("id(0)测试成功!\n");
+	}
+
+	ret = login(1, error);
+	if (0 == ret)
+	{
+		printf("id(1)测试失败!error = %s.\n", error);
+	}
+	else
+	{
+		printf("id(1)测试成功!\n");
+	}
+
+	ret = login(2, error);
+	if (0 == ret)
+	{
+		printf("id(2)测试失败!error = %s.\n", error);
+	}
+	else
+	{
+		printf("id(2)测试成功!\n");
+	}
+
+	ret = login(3, error);
+	if (0 == ret)
+	{
+		printf("id(3)测试失败!error = %s.\n", error);
+	}
+	else
+	{
+		printf("id(3)测试成功!\n");
+	}
+
+	ret = login(4, error);
+	if (0 == ret)
+	{
+		printf("id(4)测试失败!error = %s.\n", error);
+	}
+	else
+	{
+		printf("id(4)测试成功!\n");
+	}
+
+	ret = login(5, error);
+	if (0 == ret)
+	{
+		printf("id(5)测试失败!error = %s.\n", error);
+	}
+	else
+	{
+		printf("id(5)测试成功!\n");
+	}
+
+
+	system("pause");
+	return 0;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zusbdll",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "node for zusb dll",
   "main": "index.js",
   "scripts": {

package/test.js

@@ -1,14 +1,14 @@
-const {executeZusbdll,autoRun,autoMD5} = require('./index');
+const { executeZusbdll, autoRun, autoMD5 } = require('./index');
 const path = require('path');
 
 async function runDemo() {
     console.log("开始测试 login 函数...");
-    
+
     try {
         // 使用之前验证过的工作正常的场景文件
         const scenarioPath = path.join(__dirname, "lib", "scenario.json");
         const result = await executeZusbdll(scenarioPath);
-        
+
         // 解析返回的 JSON 数据
         let parsedResults;
         try {
@@ -17,19 +17,19 @@ async function runDemo() {
             console.log("解析结果失败:", parseErr.message);
             return;
         }
-        
+
         // 遍历所有结果，找出 login 调用的结果
         for (let i = 0; i < parsedResults.length; i++) {
             const callResult = parsedResults[i];
             if (callResult.command === "login") {
                 // login 函数的返回值在 returnCode 字段中
                 const success = callResult.returnCode === 1;
-                
+
                 // 获取 id 值（从第一个参数中获取）
                 const id = callResult.outputs && callResult.outputs[0] ? callResult.outputs[0].value : i;
-                
+
                 console.log(success ? `id(${id})测试成功!` : `id(${id})测试失败!`);
-                
+
                 // 显示错误信息（如果有的话）
                 if (callResult.outputs && callResult.outputs.length > 1) {
                     const errorOutput = callResult.outputs[1];
@@ -43,7 +43,7 @@ async function runDemo() {
         console.log("测试失败!", err.message);
         console.log("错误详情:", err);
     }
-    
+
     console.log("测试完成!");
 }
 
@@ -51,13 +51,14 @@ async function runDemo() {
 if (require.main === module) {
     // runDemo().catch(console.error);
 }
-(async function(){
-try {
+(async function () {
+    resmd5 = await autoMD5();
+    console.log(resmd5)
+
+    try {
         console.log('start')
         res = await autoRun();
-        resmd5 = await autoMD5();
         console.log(res)
-        console.log(resmd5)
     } catch (error) {
         console.log("错误详情:", error);
     }