skyeye-sdk-js 1.0.9 → 1.1.1

package/dist/src/SkyEyeClient.d.ts

@@ -18,8 +18,8 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     private host;
     private port;
     constructor(host: string, port: string);
-    RunTestcase(bean: any): Promise<any>;
-    Monitor(request: JSONRequest): Promise<void>;
+    RunTestcase(json: string): Promise<any>;
+    Monitor(json: string): Promise<any>;
     call(request: JSONRequest): Promise<any>;
     private printRequestLog;
     private printResponseLog;

package/dist/src/SkyEyeClient.js

@@ -64,14 +64,14 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
         this.host = host;
         this.port = port;
     }
-    RunTestcase(bean) {
+    RunTestcase(json) {
         const _super = Object.create(null, {
             runTestcase: { get: () => super.runTestcase }
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const request = new skyeye_rpc_pb_1.JSONRequest();
-                request.setRequest(JSON.stringify(bean));
+                request.setRequest(json);
                 const stream = _super.runTestcase.call(this, request);
                 return stream;
             }
@@ -81,21 +81,21 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             }
         });
     }
-    Monitor(request) {
+    Monitor(json) {
         const _super = Object.create(null, {
             Monitor: { get: () => super.Monitor }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield new Promise((resolve, reject) => {
-                _super.Monitor.call(this, request, (error, response) => {
-                    if (error) {
-                        reject(error);
-                    }
-                    else {
-                        resolve(response);
-                    }
-                });
-            });
+            try {
+                const request = new skyeye_rpc_pb_1.JSONRequest();
+                request.setRequest(json);
+                const stream = _super.Monitor.call(this, request);
+                return stream;
+            }
+            catch (error) {
+                console.error("Error during RunTestcase:", error);
+                throw error;
+            }
         });
     }
     call(request) {

package/dist/test.js

@@ -32,7 +32,7 @@ function test() {
         // const port = "50051"
         // await client.initSkyEyeAndRun(pathSkyEye,fileName,port,skyeyeDir);
         // GrpcUtil.initAndRunExample();
-        // const bean = "";
+        // 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());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skyeye-sdk-js",
-  "version": "1.0.9",
+  "version": "1.1.1",
   "description": "gRPC to SkyEye",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,20 +14,15 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@types/dotenv": "^8.2.0",
-    "@types/google-protobuf": "^3.15.12",
     "@types/node": "^20.11.22",
     "chokidar": "^3.5.3",
     "grpc_tools_node_protoc_ts": "^5.3.3",
-    "grpc-tools": "^1.12.4",
     "gulp-mocha": "^10.0.0",
     "typescript": "^5.3.3"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.10.1",
-    "@grpc/grpc-js-xds": "^1.8.0",
-    "@grpc/proto-loader": "^0.6.0",
-    "@grpc/reflection": "^1.0.0",
+
     "async": "^1.5.2",
     "google-protobuf": "^3.21.2",
     "lodash": "^4.6.1",

package/src/proto/skyeye_rpc_grpc_pb.js

@@ -1,7 +1,7 @@
 // GENERATED CODE -- DO NOT EDIT!
 
 'use strict';
-var grpc = require('grpc');
+var grpc = require('@grpc/grpc-js');
 var skyeye_rpc_pb = require('./skyeye_rpc_pb.js');
 
 function serialize_JSONRequest(arg) {

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,7 +22,7 @@ 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";
@@ -40,12 +40,8 @@ async function test() {
     stream.on('end', () => {
         console.log('Stream ended');
     });
-    stream.on('error', (error: ServiceError) => {
+    stream.on('error', (error: Error) => {
         console.error('Error occurred:', error.message);
     });
-
-
-
-
 }
 test();