skyeye-sdk-js 1.1.1 → 1.1.3

package/src/SkyEyeClient.ts

@@ -43,20 +43,20 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async RunTestcase(json:string) {
+    public async RunTestcase(json: string) {
         try {
             const request = new JSONRequest();
             request.setRequest(json);
             const stream = super.runTestcase(request);
             return stream;
         } catch (error) {
-            console.error("Error during RunTestcase:", error);
+            console.error("Error during RunTestcas2e:", error);
             throw error;
         }
     }
 
 
-    public async Monitor(json:string) {
+    public async Monitor(json: string) {
         try {
             const request = new JSONRequest();
             request.setRequest(json);
@@ -350,7 +350,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async getGlobalVarValue(cpuName: string, varName: string, bytesNum: number, valueType: GlobalVarType) {
+    public async getGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType) {
         try {
             return await this.call(RequestFactory.getInstance().getGlobalVarValue(cpuName, varName, bytesNum, valueType))
         } catch (error) {
@@ -366,7 +366,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
         const cpuList = (await this.getCpuList()).getCpuList();
         if (cpuList != null && cpuList.length > 0) {
             try {
-                return await this.call(RequestFactory.getInstance().getGlobalVarValue(cpuList[0].getName(), varName, 4, valueType));
+                return await this.call(RequestFactory.getInstance().getGlobalVarValue(cpuList[0].getName(), varName, "4", valueType));
             } catch (error) {
                 console.error("Error during getGlobalVarValueDefault:", error);
                 throw error;
@@ -381,7 +381,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
 
 
-    public async setGlobalVarValue(cpuName: string, varName: string, bytesNum: number, valueType: GlobalVarType, value: string) {
+    public async setGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType, value: string) {
         try {
             return await this.call(RequestFactory.getInstance().setGlobalVarValue(cpuName, varName, bytesNum, valueType, value))
         } catch (error) {
@@ -394,7 +394,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
         const cpuList = (await this.getCpuList()).getCpuList();
         if (cpuList != null && cpuList.length > 0) {
             try {
-                return await this.call(RequestFactory.getInstance().setGlobalVarValue(cpuList[0].getName(), varName, 4, valueType, value));
+                return await this.call(RequestFactory.getInstance().setGlobalVarValue(cpuList[0].getName(), varName, "4", valueType, value));
             } catch (error) {
                 console.error("Error during setGlobalVarValueDefault:", error);
                 throw error;
@@ -406,7 +406,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async getMemoryValue(cpuName: string, baseAddr: number, length: number) {
+    public async getMemoryValue(cpuName: string, baseAddr: string, length: string) {
         try {
             return this.getAddressingSpace(cpuName, baseAddr, length);
         } catch (error) {
@@ -416,7 +416,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async getAddressingSpace(cpuName: string, baseAddr: number, length: number) {
+    public async getAddressingSpace(cpuName: string, baseAddr: string, length: string) {
         try {
             return await this.call(RequestFactory.getInstance().getMemoryValue(cpuName, baseAddr, length));
         } catch (error) {
@@ -427,7 +427,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
 
 
-    public async getMemoryValueDefault(baseAddr: number, length: number) {
+    public async getMemoryValueDefault(baseAddr: string, length: string) {
         try {
             return this.getAddressingSpaceDefault(baseAddr, length);
         } catch (error) {
@@ -437,7 +437,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async getAddressingSpaceDefault(baseAddr: number, length: number) {
+    public async getAddressingSpaceDefault(baseAddr: string, length: string) {
         const cpuList = (await this.getCpuList()).getCpuList();
         if (cpuList != null && cpuList.length > 0) {
             try {
@@ -478,7 +478,18 @@ export class SkyEyeClient extends JSONTransmissionClient {
                         if (r1.offset === r2.offset) {
                             return 0;
                         }
-                        return r1.offset! - r2.offset! > 0 ? 1 : -1;
+
+                        let numOffset1: number = parseInt(r1.offset);
+                        let numOffset2: number = parseInt(r2.offset);
+                        let result: number = 0;
+                        if (!isNaN(numOffset1) && !isNaN(numOffset2)) {
+                             result = numOffset1 - numOffset2;
+                            console.log("Result:", result);
+                        } else {
+                            console.log("Invalid offset values.");
+                        }
+                        return result > 0 ? 1 : -1;
+                        // return r1.offset! - r2.offset! > 0 ? 1 : -1;
                     });
                 });
             } else {
@@ -508,7 +519,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async setCpuRegisterValueDefault(register: Register, value: number) {
+    public async setCpuRegisterValueDefault(register: Register, value: string) {
         try {
             return await this.setCpuRegisterValue(register.getParent().getParent().getName(), register.getParent().getName(), register.getName(), value);
         } catch (error) {
@@ -518,7 +529,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async setCpuRegisterValue(boardName: string, cpuName: string, registerName: string, value: number) {
+    public async setCpuRegisterValue(boardName: string, cpuName: string, registerName: string, value: string) {
         const deviceTree = await this.getDeviceTree();
         if (!deviceTree.boardMap.has(boardName)) {
             throw new SkyEyeSDKException("未能找到该板卡");
@@ -612,7 +623,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async getRamAddrInfo(machName: string, addr: number) {
+    public async getRamAddrInfo(machName: string, addr: string) {
         const response = new GetRamAddrInfoResponse();
         try {
             const call = await this.call(RequestFactory.getInstance().getRamAddrInfo(machName, addr))
@@ -631,7 +642,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async setRamFaultInjectDefault(device: Device, addr: number, bit: number, mode: FaultInjectType) {
+    public async setRamFaultInjectDefault(device: Device, addr: string, bit: string, mode: FaultInjectType) {
         try {
             return await this.setRamFaultInject(device.getParent().getName(), device.getName(), addr, bit, mode);
         } catch (error) {
@@ -641,7 +652,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
 
 
-    public async setRamFaultInject(boardName: string, deviceName: string, addr: number, bit: number, mode: FaultInjectType) {
+    public async setRamFaultInject(boardName: string, deviceName: string, addr: string, bit: string, mode: FaultInjectType) {
         try {
             return await this.call(RequestFactory.getInstance().setFaultInject(boardName, deviceName, String(addr), String(bit), mode))
         } catch (error) {
@@ -651,7 +662,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
 
 
-    public async setRegisterFaultInjectDefault(register: Register, bit: number, mode: FaultInjectType) {
+    public async setRegisterFaultInjectDefault(register: Register, bit: string, mode: FaultInjectType) {
         try {
             return await this.setRegisterFaultInject(register.getParent().getParent().getName(), register.getParent().getName(), register.baseAddr, bit, mode)
         } catch (error) {
@@ -660,7 +671,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async setRegisterFaultInject(boardName: string, deviceName: string, addr: number, bit: number, mode: FaultInjectType) {
+    public async setRegisterFaultInject(boardName: string, deviceName: string, addr: string, bit: string, mode: FaultInjectType) {
         try {
             return await this.call(RequestFactory.getInstance().setFaultInject(boardName, deviceName, "0x" + String(addr), String(bit), mode))
         } catch (error) {
@@ -680,7 +691,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async deleteFaultInject(boardName: string, deviceName: string, addr: number, bit: string, mode: FaultInjectType) {
+    public async deleteFaultInject(boardName: string, deviceName: string, addr: string, bit: string, mode: FaultInjectType) {
         try {
             return await this.call(RequestFactory.getInstance().deleteFaultInject(boardName, deviceName, "0x" + String(addr), String(bit), mode))
         } catch (error) {
@@ -726,7 +737,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async getDisassembleInfo(cpuName: string, startAddr: number, nums: number) {
+    public async getDisassembleInfo(cpuName: string, startAddr: string, nums: string) {
         const response = new GetDisassembleInfoResponse();
         try {
             const call = await this.call(RequestFactory.getInstance().getDisassembleInfo(cpuName, startAddr, nums))
@@ -751,7 +762,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async getDisassembleInfoDefault(startAddr: number, nums: number) {
+    public async getDisassembleInfoDefault(startAddr: string, nums: string) {
         const cpuList = (await this.getCpuList()).getCpuList;
         if (cpuList != null && cpuList.length > 0) {
             return this.getDisassembleInfo(cpuList[0].name, startAddr, nums);
@@ -816,7 +827,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
                 client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
                     console.log("run_script res:" + response + error);
 
-                    this.runCommand()
+                    // this.runCommand()
 
                     return "1";
                 });

package/src/models/FaultInjectItem.ts

@@ -9,9 +9,9 @@ export class FaultInjectItem {
     // 故障注入的寄存器名
     registerName: string;
     // 故障注入的地址
-    addr: number;
+    addr: string;
     // 故障注入的位
-    bit: number;
+    bit: string;
     // 故障注入的类型
     type: FaultInjectType;
 

package/src/models/FaultInjectItemInterface.ts

@@ -4,7 +4,7 @@ export interface FaultInjectItemInterface{
     boardName: string,
     deviceName: string,
     registerName: string,
-    addr: number,
-    bit: number,
+    addr: string,
+    bit: string,
     type: FaultInjectType
 }

package/src/models/Register.ts

@@ -15,22 +15,22 @@ export class Register implements Node {
     /**
      * 寄存器的基地址
      */
-    public baseAddr: number | null;
+    public baseAddr: string | null;
 
     /**
      * 寄存器位数
      */
-    public bits: number | null;
+    public bits: string | null;
 
     /**
      * 寄存器值
      */
-    public value: number | null;
+    public value: string | null;
 
     /**
      * 寄存器偏移值
      */
-    public offset: number | null;
+    public offset: string | null;
 
     /**
      * 寄存器描述

package/src/models/RegisterInterface.ts

@@ -6,9 +6,9 @@ import { DeviceInterface } from './DeviceInterface';
 export interface RegisterInterface{
     name: string,
     parent: Node | null,
-    baseAddr: number | null,
-    bits: number | null,
-    value: number | null,
-    offset: number | null,
+    baseAddr: string | null,
+    bits: string | null,
+    value: string | null,
+    offset: string | null,
     description: string
 }

package/src/requests/BaseRequest.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseRequest = void 0;
+var BaseRequest = /** @class */ (function () {
+    function BaseRequest(name) {
+        this.request = {
+            name: name,
+            args: null
+        };
+    }
+    BaseRequest.prototype.toJSONString = function () {
+        return JSON.stringify({ request: this.request });
+    };
+    BaseRequest.prototype.setArgs = function (args) {
+        this.request.args = args;
+    };
+    return BaseRequest;
+}());
+exports.BaseRequest = BaseRequest;

package/src/response/BaseResponse.js

@@ -0,0 +1,27 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseResponse = void 0;
+var skyeye_rpc_pb_1 = require("../proto/skyeye_rpc_pb");
+var BaseResponse = /** @class */ (function (_super) {
+    __extends(BaseResponse, _super);
+    function BaseResponse() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return BaseResponse;
+}(skyeye_rpc_pb_1.JSONResponse));
+exports.BaseResponse = BaseResponse;

package/test.ts

@@ -7,12 +7,12 @@ const { SkyEyeClient } = require('./src/SkyEyeClient')
 
 async function test() {
     const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', '50051');
-    console.log("Connected to SkyEye server");
+    // console.log("Connected to SkyEye server");
     // await client.getDeviceList();
     // await client.getCurrentCpuMips();
     // await client.runCommand();
 
-    const response = await client.getCurrentRunningState();
+    // const response = await client.getCurrentRunningState();
 
     // const response = await client.getGlobalVarValueDefault("a",GlobalVarType.DOUBLE);
     // const response = await client.getGlobalVarValue("cx53123","a",16,GlobalVarType.DOUBLE);
@@ -22,7 +22,7 @@ async function test() {
 
     // const response = await client.getMemoryValueDefault(1, 16);
     // const response = await client.getMemoryValue("c7s",0,16);
-    console.log("结果response：", response)
+    // console.log("结果response：", response)
 
     // const pathSkyEye = "D:/data/case/c6713_demo";
     // const fileName = "c6713_demo.skyeye";
@@ -32,10 +32,28 @@ async function test() {
 
     // GrpcUtil.initAndRunExample();
 
-    const bean:string = '{"id":"33d209da-2459-4e49-97c3-5b1509bc638c","steps":[{"condition":{"type":10,"value":"123"},"send":{"target":{"type":2,"addr":"1222"},"data":"0101011101"}},{"condition":{"type":0,"value":"0xff"},"send":{"target":{"type":2,"addr":"1222"},"data":"0101011101"}}],"expects":[{"condition":{"type":0,"value":"0xff"},"send":{"target":{"type":3,"addr":"2221"}}}]}';
-    const stream = await client.RunTestcase(bean);
+    // const bean:string = '{"id":"33d209da-2459-4e49-97c3-5b1509bc638c","steps":[{"condition":{"type":10,"value":"123"},"send":{"target":{"type":2,"addr":"1222"},"data":"0101011101"}},{"condition":{"type":0,"value":"0xff"},"send":{"target":{"type":2,"addr":"1222"},"data":"0101011101"}}],"expects":[{"condition":{"type":0,"value":"0xff"},"send":{"target":{"type":3,"addr":"2221"}}}]}';
+    const json = {
+        id: "memory_test",
+        steps: [
+            {
+                condition: { type: 5, addr: "0x1800000", length: 8 },
+                send: { target: { type: 3, addr: "0x4", length: 4 }, data: 50 }
+            },
+            {
+                condition: { type: 3, addr: "0x1900000", length: 8 },
+                send: { target: { type: 3, addr: "0x4", length: 4 }, data: 50 }
+            }
+        ],
+        expects: [
+            { condition: { type: 0 }, expect: { target: { type: 3, addr: "0x8", length: 4 } } }
+        ]
+    };
+
+    const jsonString = JSON.stringify(json);
+    const stream = await client.RunTestcase(jsonString);
     stream.on('data', (response: JSONResponse) => {
-        console.log('Received response:', response.toObject());
+        console.log('Received response:',response);
     });
     stream.on('end', () => {
         console.log('Stream ended');