skyeye-sdk-js 1.0.8 → 1.1.0

package/src/SkyEyeClient.ts

@@ -37,32 +37,40 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
 
     constructor(host: string, port: string) {
-        super(host + ":" + port, grpc.credentials.createInsecure(),null);
+        super(host + ":" + port, grpc.credentials.createInsecure(), null);
         this.host = host;
         this.port = port;
     }
 
-    private printRequestLog(request: JSONRequest): void {
-        if (request.getRequest() != null) {
-            const base = JSON.parse(request.getRequest());
-            if (base.request.name === "SE_get_running_status" || base.request.name === "SE_get_all_class_info") {
-                return;
-            }
-            console.log("客户端请求-- ", JSON.stringify(base))
+
+    public async RunTestcase(json:string) {
+        try {
+            const request = new JSONRequest();
+            request.setRequest(json);
+            const stream = super.runTestcase(request);
+            return stream;
+        } catch (error) {
+            console.error("Error during RunTestcase:", error);
+            throw error;
         }
     }
 
-    private printResponseLog(ackObj: any): void {
-        if (ackObj != null) {
-            const name = ackObj.name;
-            if (name === "SE_get_running_status" || name === "SE_get_all_class_info") {
-                return;
-            }
-            console.log(`客户端响应-- `, ackObj);
+
+    public async Monitor(json:string) {
+        try {
+            const request = new JSONRequest();
+            request.setRequest(json);
+            const stream = super.Monitor(request);
+            return stream;
+        } catch (error) {
+            console.error("Error during RunTestcase:", error);
+            throw error;
         }
     }
 
 
+
+
     public async call(request: JSONRequest) {
         try {
             this.printRequestLog(request)
@@ -86,6 +94,26 @@ export class SkyEyeClient extends JSONTransmissionClient {
         }
     }
 
+    private printRequestLog(request: JSONRequest): void {
+        if (request.getRequest() != null) {
+            const base = JSON.parse(request.getRequest());
+            if (base.request.name === "SE_get_running_status" || base.request.name === "SE_get_all_class_info") {
+                return;
+            }
+            console.log("客户端请求-- ", JSON.stringify(base))
+        }
+    }
+
+    private printResponseLog(ackObj: any): void {
+        if (ackObj != null) {
+            const name = ackObj.name;
+            if (name === "SE_get_running_status" || name === "SE_get_all_class_info") {
+                return;
+            }
+            console.log(`客户端响应-- `, ackObj);
+        }
+    }
+
 
     public async runScriptRequest(filename: string) {
         try {
@@ -770,20 +798,20 @@ export class SkyEyeClient extends JSONTransmissionClient {
         return this.port;
     }
 
-    public initSkyEyeAndRun(pathSkyEye:string,fileName:string,skyeyeDir:string,port:string) {
+    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) => {
+        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());
+            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);
@@ -797,8 +825,12 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
+    //与skyeye长连接
+
+
+
 
 
+}
 
 
-}

package/src/proto/protoc.bat

@@ -0,0 +1,37 @@
+@echo off
+
+rem set
+rem cd /d D:\UpperComputer\develop\skyeye-sdk-js\src\proto2\protoc.bat
+
+rem current dir
+echo current dir %CD%
+
+set PROTO_FILE=skyeye_rpc.proto
+
+
+set PROTOC_GEN_TS_PATH=D:\UpperComputer\develop\skyeye-sdk-js\node_modules\.bin\protoc-gen-ts.cmd
+set GRPC_TOOLS_NODE_PROTOC_PLUGIN=D:\UpperComputer\develop\skyeye-sdk-js\node_modules\.bin\grpc_tools_node_protoc_plugin.cmd
+set GRPC_TOOLS_NODE_PROTOC=D:\UpperComputer\develop\skyeye-sdk-js\node_modules\.bin\grpc_tools_node_protoc.cmd
+
+
+
+rem display path variables
+echo PROTOC_GEN_TS_PATH: %PROTOC_GEN_TS_PATH%
+echo GRPC_TOOLS_NODE_PROTOC_PLUGIN: %GRPC_TOOLS_NODE_PROTOC_PLUGIN%
+echo GRPC_TOOLS_NODE_PROTOC: %GRPC_TOOLS_NODE_PROTOC%
+
+
+rem 生成 JavaScript 文件
+%GRPC_TOOLS_NODE_PROTOC% ^
+  --js_out=import_style=commonjs,binary:. ^
+  --grpc_out=. ^
+  --plugin=protoc-gen-grpc=%GRPC_TOOLS_NODE_PROTOC_PLUGIN% ^
+  -I . ^
+  %PROTO_FILE%
+
+rem 生成 TypeScript 文件
+%GRPC_TOOLS_NODE_PROTOC% ^
+  --plugin=protoc-gen-ts=%PROTOC_GEN_TS_PATH% ^
+  --ts_out=. ^
+  -I . ^
+  %PROTO_FILE%

package/src/proto/protoc.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+cd "${BASEDIR}"/../
+
+PROTOC_GEN_TS_PATH="./node_modules/.bin/protoc-gen-ts"
+GRPC_TOOLS_NODE_PROTOC_PLUGIN="./node_modules/.bin/grpc_tools_node_protoc_plugin"
+GRPC_TOOLS_NODE_PROTOC="./node_modules/.bin/grpc_tools_node_protoc"
+
+for f in ./src/proto2/*; do
+
+  # skip the non proto files
+  if [ "$(basename "$f")" == "index.ts" ]; then
+      continue
+  fi
+
+  # loop over all the available proto files and compile them into respective dir
+  # JavaScript code generating
+  ${GRPC_TOOLS_NODE_PROTOC} \
+      --js_out=import_style=commonjs,binary:"${f}" \
+      --grpc_out="${f}" \
+      --plugin=protoc-gen-grpc="${GRPC_TOOLS_NODE_PROTOC_PLUGIN}" \
+      -I "${f}" \
+      "${f}"/*.proto
+
+  ${GRPC_TOOLS_NODE_PROTOC} \
+      --plugin=protoc-gen-ts="${PROTOC_GEN_TS_PATH}" \
+      --ts_out="${f}" \
+      -I "${f}" \
+      "${f}"/*.proto
+
+done

package/src/proto/skyeye_rpc.proto

@@ -2,6 +2,9 @@ syntax = "proto3";
 
 service JSONTransmission {
     rpc CallSkyEye (JSONRequest) returns (JSONResponse){}
+    rpc SkyEyeLogReport (JSONRequest) returns (stream JSONResponse){};
+	rpc RunTestcase (JSONRequest) returns (stream JSONResponse){};
+	rpc Monitor (JSONRequest) returns (stream JSONResponse){};
 }
 message JSONRequest {
     string request = 1;

package/src/proto/skyeye_rpc_grpc_pb.js

@@ -1,44 +1,77 @@
-// GENERATED CODE -- DO NOT EDIT!
-
-'use strict';
-var grpc = require('@grpc/grpc-js');
-var src_proto_skyeye_rpc_pb = require('../../src/proto/skyeye_rpc_pb.js');
-
-function serialize_JSONRequest(arg) {
-    if (!(arg instanceof src_proto_skyeye_rpc_pb.JSONRequest)) {
-        throw new Error('Expected argument of type JSONRequest');
-    }
-    return Buffer.from(arg.serializeBinary());
-}
-
-function deserialize_JSONRequest(buffer_arg) {
-    return src_proto_skyeye_rpc_pb.JSONRequest.deserializeBinary(new Uint8Array(buffer_arg));
-}
-
-function serialize_JSONResponse(arg) {
-    if (!(arg instanceof src_proto_skyeye_rpc_pb.JSONResponse)) {
-        throw new Error('Expected argument of type JSONResponse');
-    }
-    return Buffer.from(arg.serializeBinary());
-}
-
-function deserialize_JSONResponse(buffer_arg) {
-    return src_proto_skyeye_rpc_pb.JSONResponse.deserializeBinary(new Uint8Array(buffer_arg));
-}
-
-
-var JSONTransmissionService = exports.JSONTransmissionService = {
-    callSkyEye: {
-        path: '/JSONTransmission/CallSkyEye',
-        requestStream: false,
-        responseStream: false,
-        requestType: src_proto_skyeye_rpc_pb.JSONRequest,
-        responseType: src_proto_skyeye_rpc_pb.JSONResponse,
-        requestSerialize: serialize_JSONRequest,
-        requestDeserialize: deserialize_JSONRequest,
-        responseSerialize: serialize_JSONResponse,
-        responseDeserialize: deserialize_JSONResponse,
-    },
-};
-
-exports.JSONTransmissionClient = grpc.makeGenericClientConstructor(JSONTransmissionService);
+// GENERATED CODE -- DO NOT EDIT!
+
+'use strict';
+var grpc = require('@grpc/grpc-js');
+var skyeye_rpc_pb = require('./skyeye_rpc_pb.js');
+
+function serialize_JSONRequest(arg) {
+  if (!(arg instanceof skyeye_rpc_pb.JSONRequest)) {
+    throw new Error('Expected argument of type JSONRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_JSONRequest(buffer_arg) {
+  return skyeye_rpc_pb.JSONRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
+function serialize_JSONResponse(arg) {
+  if (!(arg instanceof skyeye_rpc_pb.JSONResponse)) {
+    throw new Error('Expected argument of type JSONResponse');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_JSONResponse(buffer_arg) {
+  return skyeye_rpc_pb.JSONResponse.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
+
+var JSONTransmissionService = exports.JSONTransmissionService = {
+  callSkyEye: {
+    path: '/JSONTransmission/CallSkyEye',
+    requestStream: false,
+    responseStream: false,
+    requestType: skyeye_rpc_pb.JSONRequest,
+    responseType: skyeye_rpc_pb.JSONResponse,
+    requestSerialize: serialize_JSONRequest,
+    requestDeserialize: deserialize_JSONRequest,
+    responseSerialize: serialize_JSONResponse,
+    responseDeserialize: deserialize_JSONResponse,
+  },
+  skyEyeLogReport: {
+    path: '/JSONTransmission/SkyEyeLogReport',
+    requestStream: false,
+    responseStream: true,
+    requestType: skyeye_rpc_pb.JSONRequest,
+    responseType: skyeye_rpc_pb.JSONResponse,
+    requestSerialize: serialize_JSONRequest,
+    requestDeserialize: deserialize_JSONRequest,
+    responseSerialize: serialize_JSONResponse,
+    responseDeserialize: deserialize_JSONResponse,
+  },
+  runTestcase: {
+    path: '/JSONTransmission/RunTestcase',
+    requestStream: false,
+    responseStream: true,
+    requestType: skyeye_rpc_pb.JSONRequest,
+    responseType: skyeye_rpc_pb.JSONResponse,
+    requestSerialize: serialize_JSONRequest,
+    requestDeserialize: deserialize_JSONRequest,
+    responseSerialize: serialize_JSONResponse,
+    responseDeserialize: deserialize_JSONResponse,
+  },
+  monitor: {
+    path: '/JSONTransmission/Monitor',
+    requestStream: false,
+    responseStream: true,
+    requestType: skyeye_rpc_pb.JSONRequest,
+    responseType: skyeye_rpc_pb.JSONResponse,
+    requestSerialize: serialize_JSONRequest,
+    requestDeserialize: deserialize_JSONRequest,
+    responseSerialize: serialize_JSONResponse,
+    responseDeserialize: deserialize_JSONResponse,
+  },
+};
+
+exports.JSONTransmissionClient = grpc.makeGenericClientConstructor(JSONTransmissionService);