skyeye-sdk-js 1.2.8 → 1.3.0

package/dist/src/SkyEyeClient.d.ts

@@ -73,7 +73,6 @@ 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 flag;
     private checkState;
     private startSkyEye;
     private setWorkingDirectory;

package/dist/src/SkyEyeClient.js

@@ -62,7 +62,6 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
     constructor(host, port) {
         super(host + ":" + port, grpc.credentials.createInsecure(), null);
         this.childProcess = null;
-        this.flag = true;
         this.host = host;
         this.port = port;
     }
@@ -125,7 +124,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                this.printRequestLog(request);
+                // this.printRequestLog(request)
                 const response = yield new Promise((resolve, reject) => {
                     _super.callSkyEye.call(this, request, (error, response) => {
                         if (error) {
@@ -139,7 +138,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                 // const res = JSON.parse(response.toString());
                 // console.log("res:",res)
                 const ackObj = JSON.parse(response.toString()).ack;
-                this.printResponseLog(ackObj);
+                // this.printResponseLog(ackObj)
                 return ackObj;
             }
             catch (error) {
@@ -163,7 +162,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             if (name === "SE_get_running_status" || name === "SE_get_all_class_info") {
                 return;
             }
-            console.log(`客户端响应-- `, ackObj);
+            console.log(`client response-- `, ackObj);
         }
     }
     runScriptRequest(filename) {
@@ -944,19 +943,25 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
     }
     checkState() {
         return new Promise((resolve, reject) => {
+            let flag = true;
             const checkInterval = 500;
+            const timeout = 10000;
+            const startTime = Date.now();
             const check = () => {
-                if (!this.flag) {
+                const elapsedTime = Date.now() - startTime;
+                if (elapsedTime >= timeout) {
+                    reject(new Error("Timeout: State check exceeded 20 seconds"));
+                    return;
+                }
+                if (!flag) {
                     resolve("");
                     return;
                 }
-                console.log("test4");
                 this.getCurrentRunningState()
                     .then((result) => {
                     const state = result.getState();
-                    console.log("initSkyEyeAndRun2:", state);
                     if (state === GetRunningStateResponse_1.StateState.UNLOADED) {
-                        this.flag = false;
+                        flag = false;
                         resolve("");
                     }
                     else {

package/package.json

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

package/src/SkyEyeClient.ts

@@ -88,7 +88,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
     public async call(request: JSONRequest) {
         try {
-            this.printRequestLog(request)
+            // this.printRequestLog(request)
             const response = await new Promise<JSONResponse>((resolve, reject) => {
                 super.callSkyEye(request, (error: grpc.ServiceError | null, response: JSONResponse) => {
                     if (error) {
@@ -101,7 +101,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
             // const res = JSON.parse(response.toString());
             // console.log("res:",res)
             const ackObj = JSON.parse(response.toString()).ack;
-            this.printResponseLog(ackObj)
+            // this.printResponseLog(ackObj)
             return ackObj;
         } catch (error) {
             console.error("Error during gRPC call:", error);
@@ -125,7 +125,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
             if (name === "SE_get_running_status" || name === "SE_get_all_class_info") {
                 return;
             }
-            console.log(`客户端响应-- `, ackObj);
+            console.log(`client response-- `, ackObj);
         }
     }
 
@@ -876,35 +876,39 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-
-
-
-    private flag = true;
+    
     private checkState() {
         return new Promise((resolve, reject) => {
-            const checkInterval = 500; 
+            let flag = true;
+            const checkInterval = 500;
+            const timeout = 10000;
+            const startTime = Date.now();
             const check = () => {
-                if (!this.flag) {
-                    resolve(""); 
+                const elapsedTime = Date.now() - startTime;
+                if (elapsedTime >= timeout) {
+                    reject(new Error("Timeout: State check exceeded 20 seconds"));
+                    return;
+                }
+
+                if (!flag) {
+                    resolve("");
                     return;
                 }
-                console.log("test4")
                 this.getCurrentRunningState()
                     .then((result) => {
                         const state = result.getState();
-                        console.log("initSkyEyeAndRun2:", state);
                         if (state === StateState.UNLOADED) {
-                            this.flag = false;
-                            resolve(""); 
+                            flag = false;
+                            resolve("");
                         } else {
-                            setTimeout(check, checkInterval); 
+                            setTimeout(check, checkInterval);
                         }
                     })
                     .catch(() => {
-                        setTimeout(check, checkInterval); 
+                        setTimeout(check, checkInterval);
                     });
             };
-            check(); 
+            check();
         });
     }