skyeye-sdk-js 1.1.2 → 1.1.4

package/dist/src/SkyEyeClient.js

@@ -76,7 +76,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                 return stream;
             }
             catch (error) {
-                console.error("Error during RunTestcase:", error);
+                console.error("Error during RunTestcas2e:", error);
                 throw error;
             }
         });
@@ -890,7 +890,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                 Jr.setRequest("{\"request\": {\"name\": \"run_script\", \"args\": {\"filename\":\"" + fileName + "\"}}}");
                 client.callSkyEye(Jr, (error, response) => {
                     console.log("run_script res:" + response + error);
-                    this.runCommand();
+                    // this.runCommand()
                     return "1";
                 });
             });

package/dist/test.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const GrpcUtil_1 = require("./src/GrpcUtil");
 const { SkyEyeClientFactory } = require('./src/SkyEyeClientFactory');
 const { SkyEyeClient } = require('./src/SkyEyeClient');
 function test() {
@@ -18,31 +19,21 @@ function test() {
         // await client.getDeviceList();
         // await client.getCurrentCpuMips();
         // await client.runCommand();
-        const response = yield client.getCurrentRunningState();
+        // const response = await client.getCurrentRunningState();
         // const response = await client.getGlobalVarValueDefault("a",GlobalVarType.DOUBLE);
         // const response = await client.getGlobalVarValue("cx53123","a",16,GlobalVarType.DOUBLE);
         // const response = await  client.getCpuRegistersDefault();
         // const response = await client.getCpuRegisters("c7xx");
         // const response = await client.getMemoryValueDefault(1, 16);
         // const response = await client.getMemoryValue("c7s",0,16);
-        console.log("结果response：", response);
-        // 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,port,skyeyeDir);
-        // GrpcUtil.initAndRunExample();
+        // console.log("结果response：", response)
+        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.initSkyEyeAndRun(pathSkyEye, fileName, port, skyeyeDir);
+        GrpcUtil_1.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"}}}]}';
-        // const stream = await client.RunTestcase(bean);
-        // stream.on('data', (response: JSONResponse) => {
-        //     console.log('Received response:', response.toObject());
-        // });
-        // stream.on('end', () => {
-        //     console.log('Stream ended');
-        // });
-        // stream.on('error', (error: Error) => {
-        //     console.error('Error occurred:', error.message);
-        // });
     });
 }
 test();

package/package.json

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

package/src/GrpcUtil.js

@@ -0,0 +1,91 @@
+"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;

package/src/SkyEyeClient.ts

@@ -50,7 +50,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
             const stream = super.runTestcase(request);
             return stream;
         } catch (error) {
-            console.error("Error during RunTestcase:", error);
+            console.error("Error during RunTestcas2e:", error);
             throw error;
         }
     }
@@ -827,7 +827,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
                 client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
                     console.log("run_script res:" + response + error);
 
-                    this.runCommand()
+                    // this.runCommand()
 
                     return "1";
                 });

package/src/requests/BaseRequest.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseRequest = void 0;
+var BaseRequest = /** @class */ (function () {
+    function BaseRequest(name) {
+        this.request = {
+            name: name,
+            args: null
+        };
+    }
+    BaseRequest.prototype.toJSONString = function () {
+        return JSON.stringify({ request: this.request });
+    };
+    BaseRequest.prototype.setArgs = function (args) {
+        this.request.args = args;
+    };
+    return BaseRequest;
+}());
+exports.BaseRequest = BaseRequest;

package/src/response/BaseResponse.js

@@ -0,0 +1,27 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseResponse = void 0;
+var skyeye_rpc_pb_1 = require("../proto/skyeye_rpc_pb");
+var BaseResponse = /** @class */ (function (_super) {
+    __extends(BaseResponse, _super);
+    function BaseResponse() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return BaseResponse;
+}(skyeye_rpc_pb_1.JSONResponse));
+exports.BaseResponse = BaseResponse;

package/test.ts

@@ -12,7 +12,7 @@ async function test() {
     // await client.getCurrentCpuMips();
     // await client.runCommand();
 
-    const response = await client.getCurrentRunningState();
+    // const response = await client.getCurrentRunningState();
 
     // const response = await client.getGlobalVarValueDefault("a",GlobalVarType.DOUBLE);
     // const response = await client.getGlobalVarValue("cx53123","a",16,GlobalVarType.DOUBLE);
@@ -22,26 +22,17 @@ async function test() {
 
     // const response = await client.getMemoryValueDefault(1, 16);
     // const response = await client.getMemoryValue("c7s",0,16);
-    console.log("结果response：", response)
+    // console.log("结果response：", response)
 
-    // 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,port,skyeyeDir);
+    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,port,skyeyeDir);
 
-    // GrpcUtil.initAndRunExample();
+    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"}}}]}';
-    // const stream = await client.RunTestcase(bean);
-    // stream.on('data', (response: JSONResponse) => {
-    //     console.log('Received response:', response.toObject());
-    // });
-    // stream.on('end', () => {
-    //     console.log('Stream ended');
-    // });
-    // stream.on('error', (error: Error) => {
-    //     console.error('Error occurred:', error.message);
-    // });
+  
 }
 test();