skyeye-sdk-js 1.2.0 → 1.2.2

package/dist/src/SkyEyeClient.d.ts

@@ -70,4 +70,9 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     getHost(): string;
     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>;
+    private startSkyEye;
+    private setWorkingDirectory;
+    private runScript;
 }

package/dist/src/SkyEyeClient.js

@@ -61,6 +61,7 @@ const boardMap = new Map();
 class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
     constructor(host, port) {
         super(host + ":" + port, grpc.credentials.createInsecure(), null);
+        this.childProcess = null;
         this.host = host;
         this.port = port;
     }
@@ -877,12 +878,17 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
     initSkyEyeAndRun(pathSkyEye, fileName, port, skyeyeDir) {
         console.log('runExample');
         cp.exec(skyeyeDir + " -q " + port + "\n", (err, stdout, stderr) => {
-            // console.log('stdout: ' + stdout);
-            // console.log('stderr: ' + stderr);
+            if (err) {
+                console.log("initSkyEyeAndRun error:", err);
+                return;
+            }
+            console.log('initSkyEyeAndRun stdout: ', stdout);
+            console.log('initSkyEyeAndRun stderr: ', stderr);
         });
+        console.log('wait');
         setTimeout(() => {
             client = new skyeye_rpc_grpc_pb_1.JSONTransmissionClient('127.0.0.1:' + port, grpc.credentials.createInsecure());
-            // console.log('client:' + client);
+            console.log('client:' + client);
             const Jr = new skyeye_rpc_pb_1.JSONRequest();
             Jr.setRequest("{\"request\": {\"name\": \"chdir\", \"args\": {\"path\":\"" + pathSkyEye + "\"}}}");
             client.callSkyEye(Jr, (error, response) => {
@@ -896,5 +902,79 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             });
         }, 2000);
     }
+    initSkyEyeAndRun2(pathSkyEye, fileName, port, skyeyeDir) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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);
+                }), 1000);
+                return "1";
+            }
+            catch (error) {
+                console.error("initSkyEyeAndRun error:", error);
+                if (this.childProcess) {
+                    console.log('Terminating SkyEye child process...');
+                    this.childProcess.kill();
+                }
+                throw error;
+            }
+        });
+    }
+    startSkyEye(port, skyeyeDir) {
+        console.log('startSkyEye');
+        return new Promise((resolve, reject) => {
+            const childProcess = cp.exec(`${skyeyeDir} -q ${port}`, (err, stdout, stderr) => {
+                if (err) {
+                    console.log('startSkyEye', err);
+                    reject(err);
+                }
+                else {
+                    console.log('initSkyEyeAndRun stdout: ', stdout);
+                    console.log('initSkyEyeAndRun stderr: ', stderr);
+                }
+            });
+            childProcess.on('exit', (code, signal) => {
+                console.log('SkyEye child process exited with code', code, 'and signal', signal);
+            });
+            resolve(childProcess);
+        });
+    }
+    setWorkingDirectory(pathSkyEye, port) {
+        const client = new skyeye_rpc_grpc_pb_1.JSONTransmissionClient(`127.0.0.1:${port}`, grpc.credentials.createInsecure());
+        const Jr = new skyeye_rpc_pb_1.JSONRequest();
+        Jr.setRequest(`{"request": {"name": "chdir", "args": {"path":"${pathSkyEye}"}}}`);
+        return new Promise((resolve, reject) => {
+            client.callSkyEye(Jr, (error, response) => {
+                if (error) {
+                    console.log("chdir res error :", error);
+                    reject(error);
+                }
+                else {
+                    console.log("chdir res:", response);
+                    resolve();
+                }
+            });
+        });
+    }
+    runScript(fileName, port) {
+        const client = new skyeye_rpc_grpc_pb_1.JSONTransmissionClient(`127.0.0.1:${port}`, grpc.credentials.createInsecure());
+        const Jr = new skyeye_rpc_pb_1.JSONRequest();
+        Jr.setRequest(`{"request": {"name": "run_script", "args": {"filename":"${fileName}"}}}`);
+        return new Promise((resolve, reject) => {
+            client.callSkyEye(Jr, (error, response) => {
+                if (error) {
+                    console.log("run_script error res:", error);
+                    reject(error);
+                }
+                else {
+                    console.log("run_script res:", response);
+                    resolve();
+                }
+            });
+        });
+    }
 }
 exports.SkyEyeClient = SkyEyeClient;

package/dist/test.js

@@ -30,7 +30,8 @@ function test() {
         const fileName = "c6713_demo.skyeye";
         const skyeyeDir = "D:/install/skyeye/opt/skyeye/bin/skyeye.exe";
         const port = "50051";
-        yield client.initSkyEyeAndRun(pathSkyEye, fileName, port, skyeyeDir);
+        // await client.initSkyEyeAndRun(pathSkyEye,fileName,port,skyeyeDir);
+        yield client.initSkyEyeAndRun2(pathSkyEye, fileName, port, skyeyeDir);
         // 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.0",
+  "version": "1.2.2",
   "description": "gRPC to SkyEye",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/SkyEyeClient.ts

@@ -809,58 +809,64 @@ export class SkyEyeClient extends JSONTransmissionClient {
         return this.port;
     }
 
-    // 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)
-    //             return
-    //         }
-    //         console.log('initSkyEyeAndRun stdout: ' ,stdout);
-    //         console.log('initSkyEyeAndRun stderr: ' , stderr);
-    //     });
-    //     setTimeout(() => {
-    //         client = new JSONTransmissionClient('127.0.0.1:' + port, grpc.credentials.createInsecure());
-    //         // console.log('client:' + client);
-    //         const Jr = new JSONRequest();
-    //         Jr.setRequest("{\"request\": {\"name\": \"chdir\", \"args\": {\"path\":\"" + pathSkyEye + "\"}}}");
-    //         client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
-    //             console.log("chdir res:" + response + error);
-
-    //             Jr.setRequest("{\"request\": {\"name\": \"run_script\", \"args\": {\"filename\":\"" + fileName + "\"}}}");
-    //             client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
-    //                 console.log("run_script res:" + response + error);
-    //                 // this.runCommand()
-    //                 return "1";
-    //             });
-    //         });
-    //     }, 2000);
-    // }
+    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)
+                return
+            }
+            console.log('initSkyEyeAndRun stdout: ' ,stdout);
+            console.log('initSkyEyeAndRun stderr: ' , stderr);
+        });
+        console.log('wait');
+        setTimeout(() => {
+            client = new JSONTransmissionClient('127.0.0.1:' + port, grpc.credentials.createInsecure());
+            console.log('client:' + client);
+            const Jr = new JSONRequest();
+            Jr.setRequest("{\"request\": {\"name\": \"chdir\", \"args\": {\"path\":\"" + pathSkyEye + "\"}}}");
+            client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
+                console.log("chdir res:" + response + error);
+
+                Jr.setRequest("{\"request\": {\"name\": \"run_script\", \"args\": {\"filename\":\"" + fileName + "\"}}}");
+                client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
+                    console.log("run_script res:" + response + error);
+                    // this.runCommand()
+                    return "1";
+                });
+            });
+        }, 2000);
+    }
 
 
     private childProcess: cp.ChildProcess | null = null;
 
-    public async initSkyEyeAndRun(pathSkyEye: string, fileName: string, port: string, skyeyeDir: string) {
+    public async initSkyEyeAndRun2(pathSkyEye: string, fileName: string, port: string, skyeyeDir: string) {
         try {
             console.log('runExample');
             this.childProcess = await this.startSkyEye(port, skyeyeDir);
-            await this.setWorkingDirectory(pathSkyEye, port);
-            await this.runScript(fileName, port);
+            setTimeout(async () => {
+                await this.setWorkingDirectory(pathSkyEye, port);
+                await this.runScript(fileName, port);
+            }, 1000);
+          
             return "1";
         } catch (error) {
             console.error("initSkyEyeAndRun error:", error);
             if (this.childProcess) {
                 console.log('Terminating SkyEye child process...');
-                this.childProcess.kill(); // 手动终止子进程
+                this.childProcess.kill();
             }
             throw error;
         }
     }
 
     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',err);
                     reject(err);
                 } else {
                     console.log('initSkyEyeAndRun stdout: ', stdout);
@@ -885,6 +891,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
         return new Promise((resolve, reject) => {
             client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
                 if (error) {
+                    console.log("chdir res error :", error);
                     reject(error);
                 } else {
                     console.log("chdir res:", response);
@@ -902,6 +909,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
         return new Promise((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);

package/test.ts

@@ -28,7 +28,9 @@ async function test() {
     const fileName = "c6713_demo.skyeye";
     const skyeyeDir = "D:/install/skyeye/opt/skyeye/bin/skyeye.exe"
     const port = "50051"
-    await client.initSkyEyeAndRun(pathSkyEye,fileName,port,skyeyeDir);
+    // await client.initSkyEyeAndRun(pathSkyEye,fileName,port,skyeyeDir);
+
+    await client.initSkyEyeAndRun2(pathSkyEye,fileName,port,skyeyeDir)
 
     // GrpcUtil.initAndRunExample();