skyeye-sdk-js 1.2.7 → 1.2.9

package/dist/src/SkyEyeClient.d.ts

@@ -72,7 +72,9 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     getPort(): string;
     initSkyEyeAndRun(pathSkyEye: string, fileName: string, port: string, skyeyeDir: string): void;
     private childProcess;
-    initSkyEyeAndRun2(pathSkyEye: string, fileName: string, port: string, skyeyeDir: string): Promise<string>;
+    initSkyEyeAndRun2(pathSkyEye: string, fileName: string, port: string, skyeyeDir: string): Promise<boolean>;
+    private flag;
+    private checkState;
     private startSkyEye;
     private setWorkingDirectory;
     private runScript;

package/dist/src/SkyEyeClient.js

@@ -62,6 +62,7 @@ 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;
     }
@@ -73,7 +74,8 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const request = new skyeye_rpc_pb_1.JSONRequest();
-                request.setRequest(json);
+                // request.setRequest(json);
+                request.setRequest("{\"request\": {\"name\": \"chdir\"}");
                 const stream = _super.stopRunTest.call(this, request);
                 return stream;
             }
@@ -123,7 +125,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) {
@@ -137,7 +139,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) {
@@ -161,7 +163,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) {
@@ -925,11 +927,10 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             try {
                 console.log('runExample');
                 this.childProcess = yield this.startSkyEye(port, skyeyeDir);
-                setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                    yield this.setWorkingDirectory(pathSkyEye, port);
-                    yield this.runScript(fileName, port);
-                }), 2000);
-                return "1";
+                yield this.checkState();
+                yield this.setWorkingDirectory(pathSkyEye, port);
+                yield this.runScript(fileName, port);
+                return true;
             }
             catch (error) {
                 console.error("initSkyEyeAndRun error:", error);
@@ -941,6 +942,34 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             }
         });
     }
+    checkState() {
+        return new Promise((resolve, reject) => {
+            const checkInterval = 500;
+            const check = () => {
+                if (!this.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;
+                        resolve("");
+                    }
+                    else {
+                        setTimeout(check, checkInterval);
+                    }
+                })
+                    .catch(() => {
+                    setTimeout(check, checkInterval);
+                });
+            };
+            check();
+        });
+    }
     startSkyEye(port, skyeyeDir) {
         console.log('startSkyEye');
         return new Promise((resolve, reject) => {

package/dist/test.js

@@ -32,6 +32,12 @@ function test() {
         const port = "50051";
         // await client.initSkyEyeAndRun(pathSkyEye,fileName,port,skyeyeDir);
         yield client.initSkyEyeAndRun2(pathSkyEye, fileName, port, skyeyeDir);
+        // setTimeout(async ()=>{
+        // const quitResponse = await client.quitCommand()
+        // console.log("quitResponse",quitResponse)
+        // const response = await client.stopGrpcService("")
+        // console.log("stopGrpcService",response)
+        // },6000)
         // GrpcUtil.initAndRunExample();
         // const bean:string = '{"id":"33d209da-2459-4e49-97c3-5b1509bc638c","steps":[{"condition":{"type":10,"value":"123"},"send":{"target":{"type":2,"addr":"1222"},"data":"0101011101"}},{"condition":{"type":0,"value":"0xff"},"send":{"target":{"type":2,"addr":"1222"},"data":"0101011101"}}],"expects":[{"condition":{"type":0,"value":"0xff"},"send":{"target":{"type":3,"addr":"2221"}}}]}';
     });

package/package.json

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

package/src/SkyEyeClient.ts

@@ -44,10 +44,11 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
 
     //终止所有grpc通信
-    public async stopGrpcService(json: string){
+    public async stopGrpcService(json: string) {
         try {
             const request = new JSONRequest();
-            request.setRequest(json);
+            // request.setRequest(json);
+            request.setRequest("{\"request\": {\"name\": \"chdir\"}");
             const stream = super.stopRunTest(request);
             return stream;
         } catch (error) {
@@ -87,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) {
@@ -100,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);
@@ -124,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);
         }
     }
 
@@ -497,7 +498,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
                         let numOffset2: number = parseInt(r2.offset);
                         let result: number = 0;
                         if (!isNaN(numOffset1) && !isNaN(numOffset2)) {
-                             result = numOffset1 - numOffset2;
+                            result = numOffset1 - numOffset2;
                             console.log("Result:", result);
                         } else {
                             console.log("Invalid offset values.");
@@ -826,12 +827,12 @@ export class SkyEyeClient extends JSONTransmissionClient {
     public initSkyEyeAndRun(pathSkyEye: string, fileName: string, port: string, skyeyeDir: string) {
         console.log('runExample');
         cp.exec(skyeyeDir + " -q " + port + "\n", (err: any, stdout: any, stderr: any) => {
-            if(err){
-                console.log("initSkyEyeAndRun error:",err)
+            if (err) {
+                console.log("initSkyEyeAndRun error:", err)
                 return
             }
-            console.log('initSkyEyeAndRun stdout: ' ,stdout);
-            console.log('initSkyEyeAndRun stderr: ' , stderr);
+            console.log('initSkyEyeAndRun stdout: ', stdout);
+            console.log('initSkyEyeAndRun stderr: ', stderr);
         });
         console.log('wait');
         setTimeout(() => {
@@ -855,16 +856,15 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
     private childProcess: cp.ChildProcess | null = null;
 
+
     public async initSkyEyeAndRun2(pathSkyEye: string, fileName: string, port: string, skyeyeDir: string) {
         try {
             console.log('runExample');
             this.childProcess = await this.startSkyEye(port, skyeyeDir);
-            setTimeout(async () => {
-                await this.setWorkingDirectory(pathSkyEye, port);
-                await this.runScript(fileName, port);
-            }, 2000);
-          
-            return "1";
+            await this.checkState();
+            await this.setWorkingDirectory(pathSkyEye, port);
+            await this.runScript(fileName, port);
+            return true;
         } catch (error) {
             console.error("initSkyEyeAndRun error:", error);
             if (this.childProcess) {
@@ -875,12 +875,46 @@ export class SkyEyeClient extends JSONTransmissionClient {
         }
     }
 
+
+
+
+
+    private flag = true;
+    private checkState() {
+        return new Promise((resolve, reject) => {
+            const checkInterval = 500; 
+            const check = () => {
+                if (!this.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(""); 
+                        } else {
+                            setTimeout(check, checkInterval); 
+                        }
+                    })
+                    .catch(() => {
+                        setTimeout(check, checkInterval); 
+                    });
+            };
+            check(); 
+        });
+    }
+
+
     private startSkyEye(port: string, skyeyeDir: string): Promise<cp.ChildProcess> {
         console.log('startSkyEye');
         return new Promise((resolve, reject) => {
             const childProcess = cp.exec(`${skyeyeDir} -q ${port}`, (err: any, stdout: any, stderr: any) => {
                 if (err) {
-                    console.log('startSkyEye error',err);
+                    console.log('startSkyEye error', err);
                     reject(err);
                 } else {
                     console.log('startSkyEye stdout: ', stdout);
@@ -896,12 +930,12 @@ export class SkyEyeClient extends JSONTransmissionClient {
         });
     }
 
-    
+
     private setWorkingDirectory(pathSkyEye: string, port: string): Promise<void> {
         const client = new JSONTransmissionClient(`127.0.0.1:${port}`, grpc.credentials.createInsecure());
         const Jr = new JSONRequest();
         Jr.setRequest(`{"request": {"name": "chdir", "args": {"path":"${pathSkyEye}"}}}`);
-    
+
         return new Promise((resolve, reject) => {
             client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
                 if (error) {
@@ -914,12 +948,12 @@ export class SkyEyeClient extends JSONTransmissionClient {
             });
         });
     }
-    
+
     private runScript(fileName: string, port: string): Promise<void> {
         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) => {
             client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
                 if (error) {

package/test.ts

@@ -32,6 +32,12 @@ async function test() {
 
     await client.initSkyEyeAndRun2(pathSkyEye,fileName,port,skyeyeDir)
     
+    // setTimeout(async ()=>{
+        // const quitResponse = await client.quitCommand()
+        // console.log("quitResponse",quitResponse)
+        // const response = await client.stopGrpcService("")
+        // console.log("stopGrpcService",response)
+    // },6000)
 
     // GrpcUtil.initAndRunExample();