skyeye-sdk-js 1.3.0 → 1.3.2

package/dist/src/SkyEyeClient.js

@@ -72,9 +72,14 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                //TODO 
+                const state = (yield this.getCurrentRunningState()).getState();
+                if (GetRunningStateResponse_1.StateState.UNLOADED === state || GetRunningStateResponse_1.StateState.QUITED === state) {
+                    throw new SkyEyeSDKException_1.SkyEyeSDKException("当前SkyEye未运行");
+                }
                 const request = new skyeye_rpc_pb_1.JSONRequest();
                 // request.setRequest(json);
-                request.setRequest("{\"request\": {\"name\": \"chdir\"}");
+                // request.setRequest("{\"request\": {\"name\": \"chdir\"}");
                 const stream = _super.stopRunTest.call(this, request);
                 return stream;
             }
@@ -671,13 +676,13 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                             break;
                     }
                 }
-                else {
-                    throw new SkyEyeSDKException_1.SkyEyeSDKException(String(call.error));
-                }
+                // else {
+                //     throw new SkyEyeSDKException(String(call.error));
+                // }
             }
             catch (error) {
                 console.error("Error during getCurrentRunningState:", error);
-                throw error;
+                // throw error;
             }
             return response;
         });
@@ -945,12 +950,12 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
         return new Promise((resolve, reject) => {
             let flag = true;
             const checkInterval = 500;
-            const timeout = 10000;
+            const timeout = 12000;
             const startTime = Date.now();
             const check = () => {
                 const elapsedTime = Date.now() - startTime;
                 if (elapsedTime >= timeout) {
-                    reject(new Error("Timeout: State check exceeded 20 seconds"));
+                    reject(new Error("Timeout: State check exceeded 12 seconds"));
                     return;
                 }
                 if (!flag) {

package/dist/test.js

@@ -32,6 +32,8 @@ function test() {
         const port = "50051";
         // await client.initSkyEyeAndRun(pathSkyEye,fileName,port,skyeyeDir);
         yield client.initSkyEyeAndRun2(pathSkyEye, fileName, port, skyeyeDir);
+        const res = yield client.getCurrentRunningState();
+        console.log("state:", res.state);
         // setTimeout(async ()=>{
         // const quitResponse = await client.quitCommand()
         // console.log("quitResponse",quitResponse)

package/package.json

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

package/src/SkyEyeClient.ts

@@ -46,9 +46,14 @@ export class SkyEyeClient extends JSONTransmissionClient {
     //终止所有grpc通信
     public async stopGrpcService(json: string) {
         try {
+            //TODO 
+            const state = (await this.getCurrentRunningState()).getState();
+            if (StateState.UNLOADED === state || StateState.QUITED === state) {
+                throw new SkyEyeSDKException("当前SkyEye未运行")
+            }
             const request = new JSONRequest();
             // request.setRequest(json);
-            request.setRequest("{\"request\": {\"name\": \"chdir\"}");
+            // request.setRequest("{\"request\": {\"name\": \"chdir\"}");
             const stream = super.stopRunTest(request);
             return stream;
         } catch (error) {
@@ -607,12 +612,13 @@ export class SkyEyeClient extends JSONTransmissionClient {
                         response.setState(StateState.STOPPED);
                         break;
                 }
-            } else {
-                throw new SkyEyeSDKException(String(call.error));
             }
+            // else {
+            //     throw new SkyEyeSDKException(String(call.error));
+            // }
         } catch (error) {
             console.error("Error during getCurrentRunningState:", error);
-            throw error;
+            // throw error;
         }
         return response;
     }
@@ -876,17 +882,17 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    
+
     private checkState() {
         return new Promise((resolve, reject) => {
             let flag = true;
             const checkInterval = 500;
-            const timeout = 10000;
+            const timeout = 12000;
             const startTime = Date.now();
             const check = () => {
                 const elapsedTime = Date.now() - startTime;
                 if (elapsedTime >= timeout) {
-                    reject(new Error("Timeout: State check exceeded 20 seconds"));
+                    reject(new Error("Timeout: State check exceeded 12 seconds"));
                     return;
                 }
 

package/test.ts

@@ -31,6 +31,9 @@ async function test() {
     // await client.initSkyEyeAndRun(pathSkyEye,fileName,port,skyeyeDir);
 
     await client.initSkyEyeAndRun2(pathSkyEye,fileName,port,skyeyeDir)
+    const res = await client.getCurrentRunningState()
+    console.log("state:",res.state)
+
     
     // setTimeout(async ()=>{
         // const quitResponse = await client.quitCommand()