skyeye-sdk-js 1.4.3 → 1.4.5

package/dist/src/RequestFactory.d.ts

@@ -12,7 +12,7 @@ export declare class RequestFactory {
     stopCommand(): JSONRequest;
     quitCommand(): JSONRequest;
     getCpuList(): JSONRequest;
-    getMemoryValue(cpuName: string, baseAddr: string, length: string): JSONRequest;
+    getMemoryValue(cpuName: string, baseAddr: string, length: string, addressWidth?: number): JSONRequest;
     setMemoryValue(cpuName: string, baseAddr: string, value: string, length: string): JSONRequest;
     enableDeviceWork(deviceName: string): JSONRequest;
     disableDeviceWork(deviceName: string): JSONRequest;

package/dist/src/RequestFactory.js

@@ -66,12 +66,13 @@ class RequestFactory {
         request.setRequest(baseRequest.toJSONString());
         return request;
     }
-    getMemoryValue(cpuName, baseAddr, length) {
+    getMemoryValue(cpuName, baseAddr, length, addressWidth) {
         const baseRequest = new BaseRequest_1.BaseRequest("SE_get_memory_value");
         const args = {};
         args.cpuname = cpuName;
         args.baseaddr = "0x" + baseAddr;
         args.length = length;
+        args.address_width = addressWidth;
         baseRequest.setArgs(args);
         const request = new skyeye_rpc_pb_1.JSONRequest();
         request.setRequest(baseRequest.toJSONString());

package/dist/src/SkyEyeClient.d.ts

@@ -24,6 +24,7 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     RunTestcase(json: string): Promise<any>;
     Monitor(json: string): Promise<any>;
     call(request: JSONRequest): Promise<any>;
+    callTimeout(request: JSONRequest, timeout: number): Promise<any>;
     private printRequestLog;
     private printResponseLog;
     runScriptRequest(filename: string): Promise<any>;
@@ -49,8 +50,8 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     getGlobalVarValueDefault(varName: string, valueType: GlobalVarType): Promise<any>;
     setGlobalVarValue(cpuName: string, varName: string, bytesNum: number, valueType: GlobalVarType, value: string): Promise<any>;
     setGlobalVarValueDefault(varName: string, valueType: GlobalVarType, value: string): Promise<any>;
-    getAddressingSpace(cpuName: string, baseAddr: string, length: string): Promise<any>;
-    getMemoryValue(cpuName: string, baseAddr: string, length: string): Promise<any>;
+    getAddressingSpace(cpuName: string, baseAddr: string, length: string, addressWidth?: number): Promise<any>;
+    getMemoryValue(cpuName: string, baseAddr: string, length: string, addressWidth?: number): Promise<any>;
     getMemoryValueDefault(baseAddr: string, length: string): Promise<any>;
     getAddressingSpaceDefault(baseAddr: string, length: string): Promise<any>;
     setMemoryValue(cpuName: string, baseAddr: string, value: string, length: string): Promise<any>;

package/dist/src/SkyEyeClient.js

@@ -155,6 +155,37 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             }
         });
     }
+    callTimeout(request, timeout) {
+        const _super = Object.create(null, {
+            callSkyEye: { get: () => super.callSkyEye }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // this.printRequestLog(request)
+                const deadline = new Date(Date.now() + timeout * 1000); // 设置5秒超时
+                const response = yield new Promise((resolve, reject) => {
+                    _super.callSkyEye.call(this, request, (error, response) => {
+                        if (error) {
+                            reject(error);
+                        }
+                        else {
+                            resolve(response);
+                        }
+                    }, { deadline });
+                });
+                // const res = JSON.parse(response.toString());
+                // console.log("res:",res)
+                const ackObj = JSON.parse(response.toString()).ack;
+                // this.printResponseLog(ackObj)
+                return ackObj;
+            }
+            catch (error) {
+                // console.error("Error during gRPC request:", JSON.stringify(request));
+                // console.error("Error during gRPC call:", error);
+                throw error;
+            }
+        });
+    }
     printRequestLog(request) {
         if (request.getRequest() != null) {
             const base = JSON.parse(request.getRequest());
@@ -209,9 +240,14 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
     quitCommand() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.call(RequestFactory_1.RequestFactory.getInstance().quitCommand());
+                return yield this.callTimeout(RequestFactory_1.RequestFactory.getInstance().quitCommand(), 2);
             }
             catch (error) {
+                // 无法连接，杀死进程
+                if (this.childProcess) {
+                    console.log('Terminating SkyEye child process...');
+                    this.childProcess.kill();
+                }
                 console.error("Error during quitCommand:", error);
                 throw error;
             }
@@ -513,10 +549,10 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             }
         });
     }
-    getAddressingSpace(cpuName, baseAddr, length) {
+    getAddressingSpace(cpuName, baseAddr, length, addressWidth) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.call(RequestFactory_1.RequestFactory.getInstance().getMemoryValue(cpuName, baseAddr, length));
+                return yield this.call(RequestFactory_1.RequestFactory.getInstance().getMemoryValue(cpuName, baseAddr, length, addressWidth));
             }
             catch (error) {
                 console.error("Error during getAddressingSpace:", error);
@@ -524,10 +560,10 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             }
         });
     }
-    getMemoryValue(cpuName, baseAddr, length) {
+    getMemoryValue(cpuName, baseAddr, length, addressWidth) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return this.getAddressingSpace(cpuName, baseAddr, length);
+                return this.getAddressingSpace(cpuName, baseAddr, length, addressWidth);
             }
             catch (error) {
                 console.error("Error during getMemoryValue:", error);
@@ -1078,13 +1114,13 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
     checkModule() {
         return new Promise((resolve, reject) => {
             let flag = true;
-            const checkInterval = 500;
-            const timeout = 30000;
+            const checkInterval = 100;
+            const timeout = 300000;
             const startTime = Date.now();
             const check = () => {
                 const elapsedTime = Date.now() - startTime;
                 if (elapsedTime >= timeout) {
-                    reject(new Error("Timeout: State check exceeded 30 seconds"));
+                    reject(new Error("Timeout: State check exceeded 300 seconds"));
                     return;
                 }
                 if (!flag) {
@@ -1111,13 +1147,13 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
     checkState() {
         return new Promise((resolve, reject) => {
             let flag = true;
-            const checkInterval = 500;
-            const timeout = 30000;
+            const checkInterval = 100;
+            const timeout = 300000;
             const startTime = Date.now();
             const check = () => {
                 const elapsedTime = Date.now() - startTime;
                 if (elapsedTime >= timeout) {
-                    reject(new Error("Timeout: State check exceeded 30 seconds"));
+                    reject(new Error("Timeout: State check exceeded 300 seconds"));
                     return;
                 }
                 if (!flag) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skyeye-sdk-js",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "gRPC to SkyEye",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/RequestFactory.ts

@@ -81,12 +81,13 @@ export class RequestFactory {
     }
 
 
-    public getMemoryValue(cpuName: string, baseAddr: string, length: string) {
+    public getMemoryValue(cpuName: string, baseAddr: string, length: string, addressWidth?: number) {
         const baseRequest = new BaseRequest("SE_get_memory_value");
-        const args: { [key: string]: string } = {};
+        const args: { [key: string]: any } = {};
         args.cpuname = cpuName;
         args.baseaddr = "0x" + baseAddr;
         args.length = length;
+        args.address_width = addressWidth;
         baseRequest.setArgs(args)
         const request = new JSONRequest()
         request.setRequest(baseRequest.toJSONString());

package/src/SkyEyeClient.ts

@@ -119,6 +119,31 @@ export class SkyEyeClient extends JSONTransmissionClient {
         }
     }
 
+    public async callTimeout(request: JSONRequest, timeout:number) {
+        try {
+            // this.printRequestLog(request)
+            const deadline = new Date(Date.now() + timeout * 1000); // 设置5秒超时
+            const response = await new Promise<JSONResponse>((resolve, reject) => {
+                super.callSkyEye(request, (error: grpc.ServiceError | null, response: JSONResponse) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        resolve(response);
+                    }
+                },{deadline});
+            });
+            // const res = JSON.parse(response.toString());
+            // console.log("res:",res)
+            const ackObj = JSON.parse(response.toString()).ack;
+            // this.printResponseLog(ackObj)
+            return ackObj;
+        } catch (error) {
+            // console.error("Error during gRPC request:", JSON.stringify(request));
+            // console.error("Error during gRPC call:", error);
+            throw error;
+        }
+    }
+
     private printRequestLog(request: JSONRequest): void {
         if (request.getRequest() != null) {
             const base = JSON.parse(request.getRequest());
@@ -169,8 +194,13 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
     public async quitCommand() {
         try {
-            return await this.call(RequestFactory.getInstance().quitCommand());
+            return await this.callTimeout(RequestFactory.getInstance().quitCommand(),2);
         } catch (error) {
+            // 无法连接，杀死进程
+            if (this.childProcess) {
+                console.log('Terminating SkyEye child process...');
+                this.childProcess.kill();
+            }
             console.error("Error during quitCommand:", error);
             throw error;
         }
@@ -461,17 +491,17 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
 
 
-    public async getAddressingSpace(cpuName: string, baseAddr: string, length: string) {
+    public async getAddressingSpace(cpuName: string, baseAddr: string, length: string, addressWidth?: number) {
         try {
-            return await this.call(RequestFactory.getInstance().getMemoryValue(cpuName, baseAddr, length));
+            return await this.call(RequestFactory.getInstance().getMemoryValue(cpuName, baseAddr, length, addressWidth));
         } catch (error) {
             console.error("Error during getAddressingSpace:", error);
             throw error;
         }
     }
-    public async getMemoryValue(cpuName: string, baseAddr: string, length: string) {
+    public async getMemoryValue(cpuName: string, baseAddr: string, length: string, addressWidth?: number) {
         try {
-            return this.getAddressingSpace(cpuName, baseAddr, length);
+            return this.getAddressingSpace(cpuName, baseAddr, length, addressWidth);
         } catch (error) {
             console.error("Error during getMemoryValue:", error);
             throw error;
@@ -1001,15 +1031,15 @@ export class SkyEyeClient extends JSONTransmissionClient {
     private checkModule() {
         return new Promise((resolve, reject) => {
             let flag = true;
-            const checkInterval = 500;
-            const timeout = 30000;
+            const checkInterval = 100;
+            const timeout = 300000;
             const startTime = Date.now();
             
             
             const check = () => {
                 const elapsedTime = Date.now() - startTime;
                 if (elapsedTime >= timeout) {
-                    reject(new Error("Timeout: State check exceeded 30 seconds"));
+                    reject(new Error("Timeout: State check exceeded 300 seconds"));
                     return;
                 }
 
@@ -1039,15 +1069,15 @@ export class SkyEyeClient extends JSONTransmissionClient {
     private checkState() {
         return new Promise((resolve, reject) => {
             let flag = true;
-            const checkInterval = 500;
-            const timeout = 30000;
+            const checkInterval = 100;
+            const timeout = 300000;
             const startTime = Date.now();
             
             
             const check = () => {
                 const elapsedTime = Date.now() - startTime;
                 if (elapsedTime >= timeout) {
-                    reject(new Error("Timeout: State check exceeded 30 seconds"));
+                    reject(new Error("Timeout: State check exceeded 300 seconds"));
                     return;
                 }