skyeye-sdk-js 1.1.6 → 1.1.8

package/dist/src/SkyEyeClient.js

@@ -83,13 +83,13 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
     }
     Monitor(json) {
         const _super = Object.create(null, {
-            Monitor: { get: () => super.Monitor }
+            monitor: { get: () => super.monitor }
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const request = new skyeye_rpc_pb_1.JSONRequest();
                 request.setRequest(json);
-                const stream = _super.Monitor.call(this, request);
+                const stream = _super.monitor.call(this, request);
                 return stream;
             }
             catch (error) {
@@ -879,8 +879,6 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
         cp.exec(skyeyeDir + " -q " + port + "\n", (err, stdout, stderr) => {
             console.log('stdout: ' + stdout);
             console.log('stderr: ' + stderr);
-        });
-        setTimeout(() => {
             client = new skyeye_rpc_grpc_pb_1.JSONTransmissionClient('127.0.0.1:' + port, grpc.credentials.createInsecure());
             console.log('client:' + client);
             const Jr = new skyeye_rpc_pb_1.JSONRequest();
@@ -894,7 +892,9 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                     return "1";
                 });
             });
-        }, 2000);
+        });
+        // setTimeout(() => {
+        // }, 2000);
     }
 }
 exports.SkyEyeClient = SkyEyeClient;

package/package.json

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

package/src/SkyEyeClient.ts

@@ -60,7 +60,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
         try {
             const request = new JSONRequest();
             request.setRequest(json);
-            const stream = super.Monitor(request);
+            const stream = super.monitor(request);
             return stream;
         } catch (error) {
             console.error("Error during Monitor:", error);
@@ -812,12 +812,11 @@ 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) => {
-            console.log('stdout: ' + stdout);
-            console.log('stderr: ' + stderr);
-        });
-        setTimeout(() => {
+            // console.log('stdout: ' + stdout);
+            // console.log('stderr: ' + stderr);
+
             client = new JSONTransmissionClient('127.0.0.1:' + port, grpc.credentials.createInsecure());
-            console.log('client:' + client);
+            // console.log('client:' + client);
             const Jr = new JSONRequest();
             Jr.setRequest("{\"request\": {\"name\": \"chdir\", \"args\": {\"path\":\"" + pathSkyEye + "\"}}}");
             client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
@@ -826,13 +825,15 @@ 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);
+
+        });
+        // setTimeout(() => {
+           
+        // }, 2000);
     }
 
 

package/src/GrpcUtil.js

@@ -1,91 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GrpcUtil = void 0;
-var grpc = require("@grpc/grpc-js");
-var skyeye_rpc_pb_1 = require("./proto/skyeye_rpc_pb");
-var skyeye_rpc_grpc_pb_1 = require("./proto/skyeye_rpc_grpc_pb");
-var SkyEyeClient_1 = require("./SkyEyeClient");
-var client = null;
-var cp = require("child_process");
-var GrpcUtil = /** @class */ (function () {
-    function GrpcUtil(host, port) {
-        this.Jr = new skyeye_rpc_pb_1.JSONRequest();
-        client = new SkyEyeClient_1.SkyEyeClient(host, port);
-    }
-    GrpcUtil.initAndRunExample = function () {
-        // const pathSkyEye = "D:/install/SkyEye/demo/c6713_demo";
-        var pathSkyEye = "D:/data/case/c6713_demo";
-        var fileName = "c6713_demo.skyeye";
-        console.log('runExample');
-        // const output = vscode.window.createOutputChannel("SkyEye Output");
-        // output.show(true);
-        // 命令行，进实例，跑skyeye.exe
-        cp.exec("cd " + pathSkyEye + " / && skyeye.exe -q 50051\n", function (err, stdout, stderr) {
-            //   output.append(stdout);
-            //   output.append(stderr);
-            console.log('stdout: ' + stdout);
-            console.log('stderr: ' + stderr);
-        });
-        setTimeout(function () {
-            //客户端
-            client = new skyeye_rpc_grpc_pb_1.JSONTransmissionClient('127.0.0.1:50051', grpc.credentials.createInsecure());
-            console.log('client:' + client);
-            //chdir
-            var Jr = new skyeye_rpc_pb_1.JSONRequest();
-            Jr.setRequest("{\"request\": {\"name\": \"chdir\", \"args\": {\"path\":\"" + pathSkyEye + "\"}}}");
-            client.callSkyEye(Jr, function (error, response) {
-                console.log("chdir res:" + response + error);
-                // client.run_script();
-                Jr.setRequest("{\"request\": {\"name\": \"run_script\", \"args\": {\"filename\":\"" + fileName + "\"}}}");
-                client.callSkyEye(Jr, function (error, response) {
-                    console.log("run_script res:" + response + error);
-                });
-            });
-        }, 2000);
-        return "1";
-    };
-    //status
-    GrpcUtil.prototype.getRunningStatus = function () {
-        this.Jr.setRequest("{\"request\": {\"name\": \"SE_get_running_status\", \"args\": {}}}");
-        client.callSkyEye(this.Jr, function (error, response) {
-            var obj = eval("(" + response.toString() + ")");
-            var ackObj = JSON.parse(JSON.stringify(obj.ack));
-            console.log("ackObj.result:" + ackObj.result);
-            return ackObj;
-        });
-    };
-    //run
-    GrpcUtil.prototype.runCommand = function () {
-        this.Jr.setRequest("{\"request\": {\"name\": \"run\", \"args\": {}}}");
-        client.callSkyEye(this.Jr, function (error, response) {
-            console.log("res" + response + error);
-            var obj = eval("(" + response.toString() + ")");
-            var ackObj = JSON.parse(JSON.stringify(obj.ack));
-            console.log("ackObj.result" + ackObj.result);
-        });
-    };
-    //stop
-    GrpcUtil.prototype.stopCommand = function () {
-        this.Jr.setRequest("{\"request\": {\"name\": \"stop\", \"args\": {}}}");
-        client.callSkyEye(this.Jr, function (error, response) {
-            console.log("res" + response + error);
-        });
-    };
-    //quit
-    GrpcUtil.prototype.quitCommand = function () {
-        this.Jr.setRequest("{\"request\": {\"name\": \"quit\", \"args\": {}}}");
-        client.callSkyEye(this.Jr, function (error, response) {
-            console.log("res" + response + error);
-        });
-    };
-    //SE_get_device_register_info 设备寄存器信息（表格内容）
-    GrpcUtil.prototype.getDeviceRegisterInfo = function (machname, devname, _callback) {
-        console.log('SE_get_device_register_info:machname:' + machname + ' devname' + devname);
-        this.Jr.setRequest("{\"request\": {\"name\": \"SE_get_device_register_info\",\"args\":{\"machname\": \"" + machname + "\",\"devname\": \"" + devname + "\"}}}");
-        client.callSkyEye(this.Jr, function (error, response) {
-            console.log("res" + response + error);
-        });
-    };
-    return GrpcUtil;
-}());
-exports.GrpcUtil = GrpcUtil;