skyeye-sdk-js 1.1.9 → 1.2.0

package/package.json

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

package/src/SkyEyeClient.ts

@@ -809,37 +809,105 @@ 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) => {
-            // console.log('stdout: ' + stdout);
-            // console.log('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);
+    //     });
+    //     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) {
+        try {
+            console.log('runExample');
+            this.childProcess = await this.startSkyEye(port, skyeyeDir);
+            await this.setWorkingDirectory(pathSkyEye, port);
+            await this.runScript(fileName, port);
+            return "1";
+        } catch (error) {
+            console.error("initSkyEyeAndRun error:", error);
+            if (this.childProcess) {
+                console.log('Terminating SkyEye child process...');
+                this.childProcess.kill(); // 手动终止子进程
+            }
+            throw error;
+        }
     }
 
+    private startSkyEye(port: string, skyeyeDir: string): Promise<cp.ChildProcess> {
+        return new Promise((resolve, reject) => {
+            const childProcess = cp.exec(`${skyeyeDir} -q ${port}`, (err: any, stdout: any, stderr: any) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    console.log('initSkyEyeAndRun stdout: ', stdout);
+                    console.log('initSkyEyeAndRun stderr: ', stderr);
+                }
+            });
 
-    //与skyeye长连接
-
-
-
-
-
-}
+            childProcess.on('exit', (code, signal) => {
+                console.log('SkyEye child process exited with code', code, 'and signal', signal);
+            });
 
+            resolve(childProcess);
+        });
+    }
 
+    
+    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) {
+                    reject(error);
+                } else {
+                    console.log("chdir res:", response);
+                    resolve();
+                }
+            });
+        });
+    }
+    
+    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) {
+                    reject(error);
+                } else {
+                    console.log("run_script res:", response);
+                    resolve();
+                }
+            });
+        });
+    }
+}