skyeye-sdk-js 1.4.4 → 1.4.6

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>;

package/dist/src/SkyEyeClient.js

@@ -146,6 +146,39 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                 // console.log("res:",res)
                 const ackObj = JSON.parse(response.toString()).ack;
                 // this.printResponseLog(ackObj)
+                if (ackObj.result === 'false')
+                    ackObj.result = false;
+                return ackObj;
+            }
+            catch (error) {
+                // console.error("Error during gRPC request:", JSON.stringify(request));
+                // console.error("Error during gRPC call:", error);
+                throw error;
+            }
+        });
+    }
+    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) {
@@ -209,9 +242,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;
             }
@@ -1059,10 +1097,22 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             try {
                 console.log('runExample');
                 this.childProcess = yield this.startSkyEye(port, skyeyeDir);
+                let response;
+                let ackObj;
                 yield this.checkState();
                 yield this.checkModule();
-                yield this.setWorkingDirectory(pathSkyEye, port);
-                yield this.runScript(fileName, port);
+                response = yield this.setWorkingDirectory(pathSkyEye, port);
+                ackObj = JSON.parse(response.toString()).ack;
+                if (ackObj.result === "false") {
+                    ackObj.result = false;
+                    throw new Error(ackObj.error);
+                }
+                response = yield this.runScript(fileName, port);
+                ackObj = JSON.parse(response.toString()).ack;
+                if (ackObj.result === "false") {
+                    ackObj.result = false;
+                    throw new Error(ackObj.error);
+                }
                 return true;
             }
             catch (error) {
@@ -1078,13 +1128,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 +1161,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) {
@@ -1173,7 +1223,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                 }
                 else {
                     console.log("chdir res:", response);
-                    resolve();
+                    resolve(response);
                 }
             });
         });
@@ -1190,7 +1240,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                 }
                 else {
                     console.log("run_script res:", response);
-                    resolve();
+                    resolve(response);
                 }
             });
         });

package/package.json

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

package/src/SkyEyeClient.ts

@@ -111,6 +111,32 @@ export class SkyEyeClient extends JSONTransmissionClient {
             // console.log("res:",res)
             const ackObj = JSON.parse(response.toString()).ack;
             // this.printResponseLog(ackObj)
+            if (ackObj.result === 'false') ackObj.result = false
+            return ackObj;
+        } catch (error) {
+            // console.error("Error during gRPC request:", JSON.stringify(request));
+            // console.error("Error during gRPC call:", error);
+            throw error;
+        }
+    }
+
+    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));
@@ -169,8 +195,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;
         }
@@ -982,11 +1013,24 @@ export class SkyEyeClient extends JSONTransmissionClient {
     public async initSkyEyeAndRun2(pathSkyEye: string, fileName: string, port: string, skyeyeDir: string) {
         try {
             console.log('runExample');
+          
             this.childProcess = await this.startSkyEye(port, skyeyeDir);
+            let response
+            let ackObj 
             await this.checkState();
             await this.checkModule();
-            await this.setWorkingDirectory(pathSkyEye, port);
-            await this.runScript(fileName, port);
+            response =  await this.setWorkingDirectory(pathSkyEye, port);
+            ackObj = JSON.parse(response.toString()).ack;
+            if (ackObj.result === "false") {
+                ackObj.result = false
+                throw new Error(ackObj.error)
+            }
+            response = await this.runScript(fileName, port);
+            ackObj = JSON.parse(response.toString()).ack;
+            if (ackObj.result === "false") {
+                ackObj.result = false
+                throw new Error(ackObj.error)
+            }
             return true;
         } catch (error) {
             console.error("initSkyEyeAndRun error:", error);
@@ -1001,15 +1045,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 +1083,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;
                 }
 
@@ -1096,7 +1140,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    private setWorkingDirectory(pathSkyEye: string, port: string): Promise<void> {
+    private setWorkingDirectory(pathSkyEye: string, port: string): Promise<JSONResponse> {
         const client = new JSONTransmissionClient(`127.0.0.1:${port}`, grpc.credentials.createInsecure());
         const Jr = new JSONRequest();
         Jr.setRequest(`{"request": {"name": "chdir", "args": {"path":"${pathSkyEye}"}}}`);
@@ -1108,25 +1152,25 @@ export class SkyEyeClient extends JSONTransmissionClient {
                     reject(error);
                 } else {
                     console.log("chdir res:", response);
-                    resolve();
+                    resolve(response);
                 }
             });
         });
     }
 
-    private runScript(fileName: string, port: string): Promise<void> {
+    private runScript(fileName: string, port: string): Promise<JSONResponse> {
         const client = new JSONTransmissionClient(`127.0.0.1:${port}`, grpc.credentials.createInsecure());
         const Jr = new JSONRequest();
         Jr.setRequest(`{"request": {"name": "run_script", "args": {"filename":"${fileName}"}}}`);
 
-        return new Promise((resolve, reject) => {
+        return new Promise<JSONResponse>((resolve, reject) => {
             client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
                 if (error) {
                     console.log("run_script error res:", error);
                     reject(error);
                 } else {
                     console.log("run_script res:", response);
-                    resolve();
+                    resolve(response);
                 }
             });
         });