skyeye-sdk-js 1.4.0 → 1.4.1

package/dist/src/RequestFactory.d.ts

@@ -4,6 +4,7 @@ export declare class RequestFactory {
     private static _instance;
     private constructor();
     static getInstance(): RequestFactory;
+    getModuleStatus(): JSONRequest;
     getRunningStatus(): JSONRequest;
     runScriptRequest(filename: string): JSONRequest;
     runCommand(): JSONRequest;

package/dist/src/RequestFactory.js

@@ -11,6 +11,13 @@ class RequestFactory {
         }
         return this._instance;
     }
+    //判断模块是否完全加载成功
+    getModuleStatus() {
+        const baseRequest = new BaseRequest_1.BaseRequest("SE_get_modules_loaded_status");
+        const request = new skyeye_rpc_pb_1.JSONRequest();
+        request.setRequest(baseRequest.toJSONString());
+        return request;
+    }
     getRunningStatus() {
         const baseRequest = new BaseRequest_1.BaseRequest("SE_get_running_status");
         const request = new skyeye_rpc_pb_1.JSONRequest();

package/dist/src/SkyEyeClient.d.ts

@@ -14,6 +14,7 @@ import { FaultInjectItem } from './models/FaultInjectItem';
 import { GetFaultInjectListResponse } from './response/GetFaultInjectListResponse';
 import { GetDisassembleInfoResponse } from './response/GetDisassembleInfoResponse';
 import { GetCpuRegisterInfoResponse } from './response/GetCpuRegisterInfoResponse';
+import { BaseResponse } from './response/BaseResponse';
 export declare class SkyEyeClient extends JSONTransmissionClient {
     private host;
     private port;
@@ -58,6 +59,7 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     setCpuRegisterValue(boardName: string, cpuName: string, registerName: string, value: string): Promise<any>;
     setDeviceRegisterValue(machName: string, deviceName: string, registerName: string, value: string): Promise<any>;
     getDeviceTree(): Promise<GetDeviceTreeResponse>;
+    getModuleStatus(): Promise<BaseResponse>;
     getCurrentRunningState(): Promise<GetRunningStateResponse>;
     getAllDeviceInfo(): Promise<GetAllDeviceInfoResponse>;
     getRamAddrInfo(machName: string, addr: string): Promise<GetRamAddrInfoResponse>;
@@ -78,6 +80,7 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     initSkyEyeAndRun(pathSkyEye: string, fileName: string, port: string, skyeyeDir: string): void;
     private childProcess;
     initSkyEyeAndRun2(pathSkyEye: string, fileName: string, port: string, skyeyeDir: string): Promise<boolean>;
+    private checkModule;
     private checkState;
     private startSkyEye;
     private setWorkingDirectory;

package/dist/src/SkyEyeClient.js

@@ -55,6 +55,7 @@ const InstructionItem_1 = require("./models/InstructionItem");
 const GetCpuRegisterInfoResponse_1 = require("./response/GetCpuRegisterInfoResponse");
 const SkyEyeSDKException_1 = require("./exception/SkyEyeSDKException");
 const cp = __importStar(require("child_process"));
+const BaseResponse_1 = require("./response/BaseResponse");
 let client = null;
 // ----------------------------当前运行程序的设备树----------------------------------------//
 const boardMap = new Map();
@@ -729,6 +730,21 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             return response;
         });
     }
+    getModuleStatus() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = new BaseResponse_1.BaseResponse();
+            try {
+                const call = yield this.call(RequestFactory_1.RequestFactory.getInstance().getModuleStatus());
+                // { result: 2, error: null, name: 'SE_get_running_status' }
+                if (call != null) {
+                    response.isSuccess = call.result;
+                }
+            }
+            catch (error) {
+            }
+            return response;
+        });
+    }
     getCurrentRunningState() {
         return __awaiter(this, void 0, void 0, function* () {
             const response = new GetRunningStateResponse_1.GetRunningStateResponse();
@@ -1005,6 +1021,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                 console.log('runExample');
                 this.childProcess = yield this.startSkyEye(port, skyeyeDir);
                 yield this.checkState();
+                yield this.checkModule();
                 yield this.setWorkingDirectory(pathSkyEye, port);
                 yield this.runScript(fileName, port);
                 return true;
@@ -1019,16 +1036,49 @@ 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 startTime = Date.now();
+            const check = () => {
+                const elapsedTime = Date.now() - startTime;
+                if (elapsedTime >= timeout) {
+                    reject(new Error("Timeout: State check exceeded 30 seconds"));
+                    return;
+                }
+                if (!flag) {
+                    resolve("");
+                    return;
+                }
+                this.getModuleStatus()
+                    .then((result) => {
+                    if (result.isSuccess) {
+                        flag = false;
+                        resolve("");
+                    }
+                    else {
+                        setTimeout(check, checkInterval);
+                    }
+                })
+                    .catch(() => {
+                    setTimeout(check, checkInterval);
+                });
+            };
+            check();
+        });
+    }
     checkState() {
         return new Promise((resolve, reject) => {
             let flag = true;
             const checkInterval = 500;
-            const timeout = 12000;
+            const timeout = 30000;
             const startTime = Date.now();
             const check = () => {
                 const elapsedTime = Date.now() - startTime;
                 if (elapsedTime >= timeout) {
-                    reject(new Error("Timeout: State check exceeded 12 seconds"));
+                    reject(new Error("Timeout: State check exceeded 30 seconds"));
                     return;
                 }
                 if (!flag) {

package/package.json

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

package/src/RequestFactory.ts

@@ -16,6 +16,14 @@ export class RequestFactory {
         return this._instance;
     }
 
+    //判断模块是否完全加载成功
+    public getModuleStatus() {
+        const baseRequest = new BaseRequest("SE_get_modules_loaded_status");
+        const request = new JSONRequest()
+        request.setRequest(baseRequest.toJSONString());
+        return request;
+    }
+
 
     public getRunningStatus() {
         const baseRequest = new BaseRequest("SE_get_running_status");

package/src/SkyEyeClient.ts

@@ -24,6 +24,7 @@ import { SkyEyeSDKException } from './exception/SkyEyeSDKException';
 import { ServiceError } from '@grpc/grpc-js';
 import * as cp from 'child_process';
 import { Board } from './models/Board';
+import { BaseResponse } from './response/BaseResponse';
 let client: JSONTransmissionClient | any = null;
 
 
@@ -661,6 +662,21 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
+    public async getModuleStatus() {
+        const response = new BaseResponse();
+        
+        try {
+             const call = await this.call(RequestFactory.getInstance().getModuleStatus())
+            // { result: 2, error: null, name: 'SE_get_running_status' }
+            if (call != null) {
+                response.isSuccess = call.result;
+            }
+        } catch (error) {
+        }
+        return response;
+    }
+
+
 
     public async getCurrentRunningState() {
         const response = new GetRunningStateResponse();
@@ -934,6 +950,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
             console.log('runExample');
             this.childProcess = await this.startSkyEye(port, skyeyeDir);
             await this.checkState();
+            await this.checkModule();
             await this.setWorkingDirectory(pathSkyEye, port);
             await this.runScript(fileName, port);
             return true;
@@ -947,18 +964,56 @@ export class SkyEyeClient extends JSONTransmissionClient {
         }
     }
 
+    private checkModule() {
+        return new Promise((resolve, reject) => {
+            let flag = true;
+            const checkInterval = 500;
+            const timeout = 30000;
+            const startTime = Date.now();
+            
+            
+            const check = () => {
+                const elapsedTime = Date.now() - startTime;
+                if (elapsedTime >= timeout) {
+                    reject(new Error("Timeout: State check exceeded 30 seconds"));
+                    return;
+                }
+
+                if (!flag) {
+                    resolve("");
+                    return;
+                }
+                this.getModuleStatus()
+                    .then((result) => {
+                        if (result.isSuccess) {
+                            flag = false;
+                            resolve("");
+                        } else {
+                            setTimeout(check, checkInterval);
+                        }
+                    })
+                    .catch(() => {
+                        setTimeout(check, checkInterval);
+                    });
+            };
+            check();
+        });
+    }
+
 
 
     private checkState() {
         return new Promise((resolve, reject) => {
             let flag = true;
             const checkInterval = 500;
-            const timeout = 12000;
+            const timeout = 30000;
             const startTime = Date.now();
+            
+            
             const check = () => {
                 const elapsedTime = Date.now() - startTime;
                 if (elapsedTime >= timeout) {
-                    reject(new Error("Timeout: State check exceeded 12 seconds"));
+                    reject(new Error("Timeout: State check exceeded 30 seconds"));
                     return;
                 }