skyeye-sdk-js 1.0.6 → 1.0.7

package/dist/src/SkyEyeClient.d.ts

@@ -67,5 +67,5 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     close(): boolean;
     getHost(): string;
     getPort(): string;
-    initAndRunExample(): string;
+    initSkyEye(pathSkyEye: string, fileName: string, skyeyeDir: string, port: string): void;
 }

package/dist/src/SkyEyeClient.js

@@ -829,17 +829,9 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
     getPort() {
         return this.port;
     }
-    initAndRunExample() {
-        // const pathSkyEye = "D:/install/SkyEye/demo/c6713_demo";
-        const pathSkyEye = "D:/data/case/c6713_demo";
-        const fileName = "c6713_demo.skyeye";
+    initSkyEye(pathSkyEye, fileName, skyeyeDir, port) {
         console.log('runExample');
-        // const output = vscode.window.createOutputChannel("SkyEye Output");
-        // output.show(true);
-        // 命令行，进实例，跑skyeye.exe
-        cp.exec("cd " + pathSkyEye + " / && skyeye.exe -q 50051\n", (err, stdout, stderr) => {
-            //   output.append(stdout);
-            //   output.append(stderr);
+        cp.exec(skyeyeDir + " -q " + port + "\n", (err, stdout, stderr) => {
             console.log('stdout: ' + stdout);
             console.log('stderr: ' + stderr);
         });
@@ -852,14 +844,14 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             Jr.setRequest("{\"request\": {\"name\": \"chdir\", \"args\": {\"path\":\"" + pathSkyEye + "\"}}}");
             client.callSkyEye(Jr, (error, response) => {
                 console.log("chdir res:" + response + error);
-                // client.run_script();
                 Jr.setRequest("{\"request\": {\"name\": \"run_script\", \"args\": {\"filename\":\"" + fileName + "\"}}}");
                 client.callSkyEye(Jr, (error, response) => {
                     console.log("run_script res:" + response + error);
+                    this.runCommand();
+                    return "1";
                 });
             });
         }, 2000);
-        return "1";
     }
 }
 exports.SkyEyeClient = SkyEyeClient;

package/dist/test.js

@@ -26,7 +26,11 @@ function test() {
         // const response = await client.getMemoryValueDefault(1, 16);
         // const response = await client.getMemoryValue("c7s",0,16);
         // console.log("结果response：", response)
-        yield client.initAndRunExample();
+        const pathSkyEye = "D:/data/case/c6713_demo";
+        const fileName = "c6713_demo.skyeye";
+        const skyeyeDir = "D:/install/skyeye/opt/skyeye/bin/skyeye.exe";
+        const port = "50051";
+        yield client.initSkyEye(pathSkyEye, fileName, skyeyeDir, port);
         // GrpcUtil.initAndRunExample();
     });
 }

package/package.json

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

package/src/SkyEyeClient.ts

@@ -770,21 +770,15 @@ export class SkyEyeClient extends JSONTransmissionClient {
         return this.port;
     }
 
-    public initAndRunExample() {
-        const pathSkyEye = "D:/data/case/c6713_demo";
-        const fileName = "c6713_demo.skyeye";
+    public initSkyEyeAndRun(pathSkyEye:string,fileName:string,skyeyeDir:string,port:string) {
         console.log('runExample');
-        cp.exec("cd " + pathSkyEye + " / && skyeye.exe -q 50051\n", (err: any, stdout: any, stderr: any) => {
+        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:50051', grpc.credentials.createInsecure());
             console.log('client:' + client);
-
-            //chdir
             const Jr = new JSONRequest();
             Jr.setRequest("{\"request\": {\"name\": \"chdir\", \"args\": {\"path\":\"" + pathSkyEye + "\"}}}");
             client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
@@ -793,12 +787,18 @@ export class SkyEyeClient extends JSONTransmissionClient {
                 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);
-        return "1";
     }
 
 
+
+
+
+
 }

package/test.ts

@@ -22,7 +22,11 @@ async function test() {
     // const response = await client.getMemoryValue("c7s",0,16);
     // console.log("结果response：", response)
 
-    await client.initAndRunExample();
+    const pathSkyEye = "D:/data/case/c6713_demo";
+    const fileName = "c6713_demo.skyeye";
+    const skyeyeDir = "D:/install/skyeye/opt/skyeye/bin/skyeye.exe"
+    const port = "50051"
+    await client.initSkyEyeAndRun(pathSkyEye,fileName,skyeyeDir,port);
 
     // GrpcUtil.initAndRunExample();