skyeye-sdk-js 1.2.5 → 1.2.7

package/dist/src/SkyEyeClient.d.ts

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

package/dist/src/SkyEyeClient.js

@@ -66,13 +66,15 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
         this.port = port;
     }
     //终止所有grpc通信
-    stopGrpcService() {
+    stopGrpcService(json) {
         const _super = Object.create(null, {
             stopRunTest: { get: () => super.stopRunTest }
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const stream = _super.stopRunTest.call(this);
+                const request = new skyeye_rpc_pb_1.JSONRequest();
+                request.setRequest(json);
+                const stream = _super.stopRunTest.call(this, request);
                 return stream;
             }
             catch (error) {

package/dist/src/proto/protoc.sh

@@ -7,7 +7,7 @@ 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
+for f in ./src/proto/*; do
 
   # skip the non proto files
   if [ "$(basename "$f")" == "index.ts" ]; then

package/dist/src/proto/skyeye_rpc.proto

@@ -5,6 +5,7 @@ service JSONTransmission {
     rpc SkyEyeLogReport (JSONRequest) returns (stream JSONResponse){};
 	rpc RunTestcase (JSONRequest) returns (stream JSONResponse){};
 	rpc Monitor (JSONRequest) returns (stream JSONResponse){};
+    rpc stopRunTest (JSONRequest) returns (stream JSONResponse){};
 }
 message JSONRequest {
     string request = 1;

package/dist/src/proto/skyeye_rpc_grpc_pb.js

@@ -72,6 +72,17 @@ var JSONTransmissionService = exports.JSONTransmissionService = {
     responseSerialize: serialize_JSONResponse,
     responseDeserialize: deserialize_JSONResponse,
   },
+  stopRunTest: {
+    path: '/JSONTransmission/stopRunTest',
+    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);

package/package.json

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

package/src/SkyEyeClient.ts

@@ -44,9 +44,11 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
 
     //终止所有grpc通信
-    public async stopGrpcService(){
+    public async stopGrpcService(json: string){
         try {
-            const stream = super.stopRunTest();
+            const request = new JSONRequest();
+            request.setRequest(json);
+            const stream = super.stopRunTest(request);
             return stream;
         } catch (error) {
             console.error("Error during stopGrpcService:", error);

package/test.ts

@@ -31,6 +31,7 @@ async function test() {
     // await client.initSkyEyeAndRun(pathSkyEye,fileName,port,skyeyeDir);
 
     await client.initSkyEyeAndRun2(pathSkyEye,fileName,port,skyeyeDir)
+    
 
     // GrpcUtil.initAndRunExample();
 

package/dist/src/proto/dir.bat

@@ -1,37 +0,0 @@
-@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%