skyeye-sdk-js 1.0.6 → 1.0.8

package/dist/src/SkyEyeClient.d.ts

@@ -67,5 +67,5 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     close(): boolean;
     getHost(): string;
     getPort(): string;
-    initAndRunExample(): string;
+    initSkyEyeAndRun(pathSkyEye: string, fileName: string, skyeyeDir: string, port: string): void;
 }

package/dist/src/SkyEyeClient.js

@@ -829,37 +829,27 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
     getPort() {
         return this.port;
     }
-    initAndRunExample() {
-        // const pathSkyEye = "D:/install/SkyEye/demo/c6713_demo";
-        const pathSkyEye = "D:/data/case/c6713_demo";
-        const fileName = "c6713_demo.skyeye";
+    initSkyEyeAndRun(pathSkyEye, fileName, skyeyeDir, port) {
         console.log('runExample');
-        // const output = vscode.window.createOutputChannel("SkyEye Output");
-        // output.show(true);
-        // 命令行，进实例，跑skyeye.exe
-        cp.exec("cd " + pathSkyEye + " / && skyeye.exe -q 50051\n", (err, stdout, stderr) => {
-            //   output.append(stdout);
-            //   output.append(stderr);
+        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:50051', grpc.credentials.createInsecure());
             console.log('client:' + client);
-            //chdir
             const Jr = new skyeye_rpc_pb_1.JSONRequest();
             Jr.setRequest("{\"request\": {\"name\": \"chdir\", \"args\": {\"path\":\"" + pathSkyEye + "\"}}}");
             client.callSkyEye(Jr, (error, response) => {
                 console.log("chdir res:" + response + error);
-                // client.run_script();
                 Jr.setRequest("{\"request\": {\"name\": \"run_script\", \"args\": {\"filename\":\"" + fileName + "\"}}}");
                 client.callSkyEye(Jr, (error, response) => {
                     console.log("run_script res:" + response + error);
+                    this.runCommand();
+                    return "1";
                 });
             });
         }, 2000);
-        return "1";
     }
 }
 exports.SkyEyeClient = SkyEyeClient;

package/dist/test.js

@@ -26,7 +26,11 @@ function test() {
         // const response = await client.getMemoryValueDefault(1, 16);
         // const response = await client.getMemoryValue("c7s",0,16);
         // console.log("结果response：", response)
-        yield client.initAndRunExample();
+        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, skyeyeDir, port);
         // GrpcUtil.initAndRunExample();
     });
 }

package/package.json

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

package/src/SkyEyeClient.ts

@@ -770,21 +770,15 @@ export class SkyEyeClient extends JSONTransmissionClient {
         return this.port;
     }
 
-    public initAndRunExample() {
-        const pathSkyEye = "D:/data/case/c6713_demo";
-        const fileName = "c6713_demo.skyeye";
+    public initSkyEyeAndRun(pathSkyEye:string,fileName:string,skyeyeDir:string,port:string) {
         console.log('runExample');
-        cp.exec("cd " + pathSkyEye + " / && skyeye.exe -q 50051\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());
             console.log('client:' + client);
-
-            //chdir
             const Jr = new JSONRequest();
             Jr.setRequest("{\"request\": {\"name\": \"chdir\", \"args\": {\"path\":\"" + pathSkyEye + "\"}}}");
             client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
@@ -793,12 +787,18 @@ 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);
-        return "1";
     }
 
 
+
+
+
+
 }

package/test.ts

@@ -22,7 +22,11 @@ async function test() {
     // const response = await client.getMemoryValue("c7s",0,16);
     // console.log("结果response：", response)
 
-    await client.initAndRunExample();
+    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,skyeyeDir,port);
 
     // GrpcUtil.initAndRunExample();
     

package/dist/requests/BaseRequest.d.ts

@@ -1,13 +0,0 @@
-export declare class BaseRequest {
-    request: {
-        name: string;
-        args: {
-            [key: string]: string;
-        };
-    };
-    constructor(name: string);
-    toJSONString(): string;
-    setArgs(args: {
-        [key: string]: string;
-    }): void;
-}

package/dist/requests/BaseRequest.js

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

package/dist/response/BaseResponse.d.ts

@@ -1,5 +0,0 @@
-import { JSONResponse } from "../proto/skyeye_rpc_pb";
-export declare class BaseResponse extends JSONResponse {
-    isSuccess: boolean;
-    callFuncName: string;
-}

package/dist/response/BaseResponse.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseResponse = void 0;
-const skyeye_rpc_pb_1 = require("../proto/skyeye_rpc_pb");
-class BaseResponse extends skyeye_rpc_pb_1.JSONResponse {
-}
-exports.BaseResponse = BaseResponse;

package/dist/response/GetAllDeviceInfoResponse.d.ts

@@ -1,5 +0,0 @@
-import { Board } from "../models/Board";
-import { BaseResponse } from "./BaseResponse";
-export declare class GetAllDeviceInfoResponse extends BaseResponse {
-    boardMap: Map<String, Board>;
-}

package/dist/response/GetAllDeviceInfoResponse.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetAllDeviceInfoResponse = void 0;
-const BaseResponse_1 = require("./BaseResponse");
-class GetAllDeviceInfoResponse extends BaseResponse_1.BaseResponse {
-    constructor() {
-        super(...arguments);
-        this.boardMap = new Map();
-    }
-}
-exports.GetAllDeviceInfoResponse = GetAllDeviceInfoResponse;

package/dist/response/GetCpuListResponse.d.ts

@@ -1,8 +0,0 @@
-import { Cpu } from "../models/Cpu";
-import { BaseResponse } from "./BaseResponse";
-export declare class GetCpuListResponse extends BaseResponse {
-    private cpuList;
-    constructor();
-    getCpuList(): Cpu[];
-    setCpuList(cpuList: Cpu[]): void;
-}

package/dist/response/GetCpuListResponse.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetCpuListResponse = void 0;
-const BaseResponse_1 = require("./BaseResponse");
-class GetCpuListResponse extends BaseResponse_1.BaseResponse {
-    constructor() {
-        super();
-        this.cpuList = [];
-        this.callFuncName = "cpu_list";
-    }
-    getCpuList() {
-        return this.cpuList;
-    }
-    setCpuList(cpuList) {
-        this.cpuList = cpuList;
-    }
-}
-exports.GetCpuListResponse = GetCpuListResponse;

package/dist/response/GetCpuRegisterInfoResponse.d.ts

@@ -1,6 +0,0 @@
-import { Register } from "../models/Register";
-import { BaseResponse } from "./BaseResponse";
-export declare class GetCpuRegisterInfoResponse extends BaseResponse {
-    registers: Register[];
-    constructor();
-}

package/dist/response/GetCpuRegisterInfoResponse.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetCpuRegisterInfoResponse = void 0;
-const BaseResponse_1 = require("./BaseResponse");
-class GetCpuRegisterInfoResponse extends BaseResponse_1.BaseResponse {
-    constructor() {
-        super();
-        this.registers = [];
-    }
-}
-exports.GetCpuRegisterInfoResponse = GetCpuRegisterInfoResponse;

package/dist/response/GetCurrentPCResponse.d.ts

@@ -1,4 +0,0 @@
-import { BaseResponse } from "./BaseResponse";
-export declare class GetCurrentPCResponse extends BaseResponse {
-    private pc;
-}

package/dist/response/GetCurrentPCResponse.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetCurrentPCResponse = void 0;
-const BaseResponse_1 = require("./BaseResponse");
-class GetCurrentPCResponse extends BaseResponse_1.BaseResponse {
-}
-exports.GetCurrentPCResponse = GetCurrentPCResponse;

package/dist/response/GetDeviceListResponse.d.ts

@@ -1,6 +0,0 @@
-import { Device } from '../models/Device';
-import { BaseResponse } from './BaseResponse';
-export declare class GetDeviceListResponse extends BaseResponse {
-    deviceList: Device[];
-    constructor();
-}

package/dist/response/GetDeviceListResponse.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetDeviceListResponse = void 0;
-const BaseResponse_1 = require("./BaseResponse");
-class GetDeviceListResponse extends BaseResponse_1.BaseResponse {
-    constructor() {
-        super();
-        this.deviceList = [];
-    }
-}
-exports.GetDeviceListResponse = GetDeviceListResponse;

package/dist/response/GetDeviceTreeResponse.d.ts

@@ -1,5 +0,0 @@
-import { BaseResponse } from "./BaseResponse";
-import { Board } from "../models/Board";
-export declare class GetDeviceTreeResponse extends BaseResponse {
-    boardMap: Map<string, Board>;
-}

package/dist/response/GetDeviceTreeResponse.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetDeviceTreeResponse = void 0;
-const BaseResponse_1 = require("./BaseResponse");
-class GetDeviceTreeResponse extends BaseResponse_1.BaseResponse {
-    constructor() {
-        super(...arguments);
-        this.boardMap = new Map();
-    }
-}
-exports.GetDeviceTreeResponse = GetDeviceTreeResponse;

package/dist/response/GetDisassembleInfoResponse.d.ts

@@ -1,5 +0,0 @@
-import { InstructionItem } from "../models/InstructionItem";
-import { BaseResponse } from "./BaseResponse";
-export declare class GetDisassembleInfoResponse extends BaseResponse {
-    instructions: Array<InstructionItem>;
-}

package/dist/response/GetDisassembleInfoResponse.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetDisassembleInfoResponse = void 0;
-const BaseResponse_1 = require("./BaseResponse");
-class GetDisassembleInfoResponse extends BaseResponse_1.BaseResponse {
-}
-exports.GetDisassembleInfoResponse = GetDisassembleInfoResponse;

package/dist/response/GetFaultInjectListResponse.d.ts

@@ -1,8 +0,0 @@
-import { FaultInjectItem } from "../models/FaultInjectItem";
-import { BaseResponse } from "./BaseResponse";
-export declare class GetFaultInjectListResponse extends BaseResponse {
-    private _faultInjectItems;
-    constructor();
-    get faultInjectItems(): FaultInjectItem[];
-    set faultInjectItems(value: FaultInjectItem[]);
-}

package/dist/response/GetFaultInjectListResponse.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetFaultInjectListResponse = void 0;
-const BaseResponse_1 = require("./BaseResponse");
-class GetFaultInjectListResponse extends BaseResponse_1.BaseResponse {
-    constructor() {
-        super();
-        this.callFuncName = "SE_get_fault_inject_list";
-        this._faultInjectItems = [];
-    }
-    get faultInjectItems() {
-        return this._faultInjectItems;
-    }
-    set faultInjectItems(value) {
-        this._faultInjectItems = value;
-    }
-}
-exports.GetFaultInjectListResponse = GetFaultInjectListResponse;

package/dist/response/GetRamAddrInfoResponse.d.ts

@@ -1,5 +0,0 @@
-import { BaseResponse } from "./BaseResponse";
-export declare class GetRamAddrInfoResponse extends BaseResponse {
-    bits: number;
-    value: number;
-}

package/dist/response/GetRamAddrInfoResponse.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetRamAddrInfoResponse = void 0;
-const BaseResponse_1 = require("./BaseResponse");
-class GetRamAddrInfoResponse extends BaseResponse_1.BaseResponse {
-}
-exports.GetRamAddrInfoResponse = GetRamAddrInfoResponse;

package/dist/response/GetRunningStateResponse.d.ts

@@ -1,14 +0,0 @@
-import { BaseResponse } from "./BaseResponse";
-export declare enum StateState {
-    QUITED = "QUITED",
-    UNLOADED = "UNLOADED",
-    RUNNING = "RUNNING",
-    STOPPED = "STOPPED"
-}
-export declare class GetRunningStateResponse extends BaseResponse {
-    state: StateState;
-    callFuncName: string;
-    constructor();
-    getState(): StateState;
-    setState(state: StateState): void;
-}

package/dist/response/GetRunningStateResponse.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetRunningStateResponse = exports.StateState = void 0;
-const BaseResponse_1 = require("./BaseResponse");
-var StateState;
-(function (StateState) {
-    StateState["QUITED"] = "QUITED";
-    StateState["UNLOADED"] = "UNLOADED";
-    StateState["RUNNING"] = "RUNNING";
-    StateState["STOPPED"] = "STOPPED";
-})(StateState || (exports.StateState = StateState = {}));
-class GetRunningStateResponse extends BaseResponse_1.BaseResponse {
-    constructor() {
-        super();
-        this.state = StateState.QUITED;
-        this.callFuncName = "SE_get_running_status";
-    }
-    getState() {
-        return this.state;
-    }
-    setState(state) {
-        this.state = state;
-    }
-}
-exports.GetRunningStateResponse = GetRunningStateResponse;

package/src/response/BaseResponse.js

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