skyeye-sdk-js 1.4.13 → 1.4.14

package/.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}\\dist\\test.js",
+            "preLaunchTask": "tsc: build - tsconfig.json",
+            "outFiles": [
+                "${workspaceFolder}/dist/**/*.js"
+            ]
+        }
+    ]
+}

package/dist/src/RequestFactory.d.ts

@@ -41,8 +41,8 @@ export declare class RequestFactory {
     step(cpuName: string, stepNum: number): JSONRequest;
     singleStep(cpuName: string): JSONRequest;
     getcpuRegisterInfo(cpuName: string): JSONRequest;
-    startTimeMonitor(): JSONRequest;
-    stopTimeMonitor(): JSONRequest;
+    startTimeMonitor(id?: string): JSONRequest;
+    stopTimeMonitor(id?: string): JSONRequest;
     registerTimeMonitor(config: object): JSONRequest;
-    getTimeMonitorConfig(): JSONRequest;
+    getTimeMonitorConfig(id?: string): JSONRequest;
 }

package/dist/src/RequestFactory.js

@@ -348,14 +348,20 @@ class RequestFactory {
         request.setRequest(baseRequest.toJSONString());
         return request;
     }
-    startTimeMonitor() {
+    startTimeMonitor(id) {
         const baseRequest = new BaseRequest_1.BaseRequest("SE_start_time_monitor");
+        const args = {};
+        args.id = id;
+        baseRequest.setArgs(args);
         const request = new skyeye_rpc_pb_1.JSONRequest();
         request.setRequest(baseRequest.toJSONString());
         return request;
     }
-    stopTimeMonitor() {
+    stopTimeMonitor(id) {
         const baseRequest = new BaseRequest_1.BaseRequest("SE_stop_time_monitor");
+        const args = {};
+        args.id = id;
+        baseRequest.setArgs(args);
         const request = new skyeye_rpc_pb_1.JSONRequest();
         request.setRequest(baseRequest.toJSONString());
         return request;
@@ -369,8 +375,11 @@ class RequestFactory {
         request.setRequest(baseRequest.toJSONString());
         return request;
     }
-    getTimeMonitorConfig() {
+    getTimeMonitorConfig(id) {
         const baseRequest = new BaseRequest_1.BaseRequest("SE_get_time_monitor_config");
+        const args = {};
+        args.id = id;
+        baseRequest.setArgs(args);
         const request = new skyeye_rpc_pb_1.JSONRequest();
         request.setRequest(baseRequest.toJSONString());
         return request;

package/dist/src/SkyEyeClient.d.ts

@@ -25,7 +25,7 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     stopGrpcService(json: string): Promise<any>;
     RunTestcase(json: string): Promise<any>;
     Monitor(json: string): Promise<any>;
-    timeDataReceive(json: string): any;
+    timeDataReceive(id: string): any;
     call(request: JSONRequest): Promise<any>;
     callTimeout(request: JSONRequest, timeout: number): Promise<any>;
     private printRequestLog;
@@ -97,8 +97,8 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     private startSkyEye;
     private setWorkingDirectory;
     private runScript;
-    startTimeMonitor(): Promise<any>;
-    stopTimeMonitor(): Promise<any>;
+    startTimeMonitor(id?: string): Promise<any>;
+    stopTimeMonitor(id?: string): Promise<any>;
     registerTimeMonitor(config: object): Promise<any>;
-    getTimeMonitorConfig(): Promise<any>;
+    getTimeMonitorConfig(id?: string): Promise<any>;
 }

package/dist/src/SkyEyeClient.js

@@ -127,10 +127,10 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             }
         });
     }
-    timeDataReceive(json) {
+    timeDataReceive(id) {
         try {
             const request = new skyeye_rpc_pb_1.JSONRequest();
-            request.setRequest(json);
+            request.setRequest(JSON.stringify({ id: id }));
             const stream = super.timeDataReceive(request);
             return stream;
         }
@@ -1318,10 +1318,10 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             });
         });
     }
-    startTimeMonitor() {
+    startTimeMonitor(id) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.call(RequestFactory_1.RequestFactory.getInstance().startTimeMonitor());
+                return yield this.call(RequestFactory_1.RequestFactory.getInstance().startTimeMonitor(id));
             }
             catch (error) {
                 console.error("Error during stopCommand:", error);
@@ -1329,10 +1329,10 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             }
         });
     }
-    stopTimeMonitor() {
+    stopTimeMonitor(id) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.call(RequestFactory_1.RequestFactory.getInstance().stopTimeMonitor());
+                return yield this.call(RequestFactory_1.RequestFactory.getInstance().stopTimeMonitor(id));
             }
             catch (error) {
                 console.error("Error during stopCommand:", error);
@@ -1351,10 +1351,10 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             }
         });
     }
-    getTimeMonitorConfig() {
+    getTimeMonitorConfig(id) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.call(RequestFactory_1.RequestFactory.getInstance().getTimeMonitorConfig());
+                return yield this.call(RequestFactory_1.RequestFactory.getInstance().getTimeMonitorConfig(id));
             }
             catch (error) {
                 console.error("Error during stopCommand:", error);

package/dist/test.js

@@ -17,6 +17,7 @@ var RegisterType;
     RegisterType[RegisterType["CPU"] = 0] = "CPU";
     RegisterType[RegisterType["Device"] = 1] = "Device";
 })(RegisterType || (RegisterType = {}));
+let call;
 function test() {
     return __awaiter(this, void 0, void 0, function* () {
         // console.log("Connected to SkyEye server");
@@ -45,39 +46,49 @@ function test() {
         // console.log("response:", response)
         // console.log("response:", response.boardMap)
         // console.log("response:", response.boardMap.keys[0])
-        // await client.initSkyEyeAndRun(pathSkyEye,fileName,port,skyeyeDir);
         // const pathSkyEye = "D:/data/case/FMQL45T900_SylixOS";
         // const fileName = "FMQL45T900_SylixOS.skyeye";
         // const skyeyeDir = "D:/install/SkyEye/opt/skyeye/bin/skyeye.exe"
         // const port = "50066"
-        // const pathSkyEye = "G:/SkyEye/demo/c6713_demo";
-        // const fileName = "G:/SkyEye/demo/c6713_demo/c6713_demo.skyeye";
-        // const skyeyeDir = "G:/SkyEye/opt/skyeye/bin/skyeye.exe"
+        const pathSkyEye = "C:/Users/lingt/Downloads/SkyTest_Double";
+        const fileName = "C:/Users/lingt/Downloads/SkyTest_Double/SkyTest_Double.skyeye";
+        const skyeyeDir = "G:/SkyEye/opt/skyeye/bin/skyeye.exe";
         const port = "50051";
-        const client = yield SkyEyeClientFactory.instance.createConnectedClient('127.0.0.1', port);
-        yield client.registerTimeMonitor({
-            time: 10,
-            cpu_name: 'c67x_core_0',
-            items: [
-                {
-                    id: '1',
-                    cpu_name: 'c67x_core_0',
-                    var_name: 'int1',
-                    var_type: 'int',
-                    var_bytes: 4,
-                    type: 'global'
-                }
-            ]
-        });
-        yield client.startTimeMonitor();
-        const response = yield client.getTimeMonitorConfig();
+        // const client = await SkyEyeClientFactory.instance.createConnectedClient('127.0.0.1', port);
+        const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', port);
+        const t = yield client.initSkyEyeAndRun2(pathSkyEye, fileName, port, skyeyeDir);
+        //   await client.runCommand();
+        const response = yield client.getDeviceTree();
         console.log(response);
-        yield client.stopTimeMonitor();
+        // await client.registerTimeMonitor({
+        // "id": "1",
+        // "time": 50,
+        // "cpu_name": "c67x_core_0",
+        // "direction":"recv",
+        // "cycle":-1,
+        // "items": [
+        //     {
+        //         "id": "cc5f450b-6fbb-7bb3-4544-e761a907b46d",
+        //         "cpu_name": "c67x_core_0",
+        //         "var_name": "int1",
+        //         "var_type": "int",
+        //         "var_bytes": 4,
+        //         "type": "global",
+        //         "value": "111"
+        //     }
+        // ],
+        // })
+        // await client.startTimeMonitor("1")
+        // // await client.getTimeMonitorConfig()
+        // console.log('bbbbbbbbbbbb')
+        // call = client.timeDataReceive("1")
+        // call.on('data',(response)=> {
+        //     const ackObj = response.getResponse();
+        //     console.log(ackObj)
+        // })
+        // console.log('gggggggggggggg')
+        // console.log(call)
         // await client.stopTimeMonitor()
-        const call = client.timeDataReceive('');
-        call.on('data', (response) => {
-            console.log(response);
-        });
         // response = client.setBitValue('c67x_core_0', '0x1000','1',  8)
         // console.log("response:", response)
         // const responseCpuList = await client.getCpuList()

package/package.json

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

package/src/RequestFactory.ts

@@ -421,15 +421,21 @@ export class RequestFactory {
         return request;
     }
 
-    public startTimeMonitor() {
+    public startTimeMonitor(id?: string) {
         const baseRequest = new BaseRequest("SE_start_time_monitor");
+        const args: { [key: string]: string } = {};
+        args.id = id;
+        baseRequest.setArgs(args)
         const request = new JSONRequest()
         request.setRequest(baseRequest.toJSONString());
         return request;
     }
 
-    public stopTimeMonitor() {
+    public stopTimeMonitor(id?: string) {
         const baseRequest = new BaseRequest("SE_stop_time_monitor");
+        const args: { [key: string]: string } = {};
+        args.id = id;
+        baseRequest.setArgs(args)
         const request = new JSONRequest()
         request.setRequest(baseRequest.toJSONString());
         return request;
@@ -445,8 +451,11 @@ export class RequestFactory {
         return request;
     }
 
-    public getTimeMonitorConfig() {
+    public getTimeMonitorConfig(id?: string) {
         const baseRequest = new BaseRequest("SE_get_time_monitor_config");
+        const args: { [key: string]: string } = {};
+        args.id = id;
+        baseRequest.setArgs(args)
         const request = new JSONRequest()
         request.setRequest(baseRequest.toJSONString());
         return request;

package/src/SkyEyeClient.ts

@@ -95,10 +95,11 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public  timeDataReceive(json: string) {
+    public  timeDataReceive(id: string) {
         try {
             const request = new JSONRequest();
-            request.setRequest(json);
+
+            request.setRequest(JSON.stringify({id: id}));
             const stream = super.timeDataReceive(request);
             return stream;
         } catch (error) {
@@ -1239,18 +1240,18 @@ export class SkyEyeClient extends JSONTransmissionClient {
         });
     }
 
-    public async startTimeMonitor() {
+    public async startTimeMonitor(id?:string) {
         try {
-            return await this.call(RequestFactory.getInstance().startTimeMonitor());
+            return await this.call(RequestFactory.getInstance().startTimeMonitor(id));
         } catch (error) {
             console.error("Error during stopCommand:", error);
             throw error;
         }
     }
 
-    public async stopTimeMonitor() {
+    public async stopTimeMonitor(id?:string) {
         try {
-            return await this.call(RequestFactory.getInstance().stopTimeMonitor());
+            return await this.call(RequestFactory.getInstance().stopTimeMonitor(id));
         } catch (error) {
             console.error("Error during stopCommand:", error);
             throw error;
@@ -1266,9 +1267,9 @@ export class SkyEyeClient extends JSONTransmissionClient {
         }
     }
 
-    public async getTimeMonitorConfig() {
+    public async getTimeMonitorConfig(id?:string) {
         try {
-            return await this.call(RequestFactory.getInstance().getTimeMonitorConfig());
+            return await this.call(RequestFactory.getInstance().getTimeMonitorConfig(id));
         } catch (error) {
             console.error("Error during stopCommand:", error);
             throw error;

package/test.ts

@@ -12,7 +12,7 @@ enum RegisterType {
     CPU,
     Device
 }
-
+let call
 async function test() {
     // console.log("Connected to SkyEye server");
     // await client.getDeviceList();
@@ -50,41 +50,57 @@ async function test() {
     // console.log("response:", response.boardMap)
     // console.log("response:", response.boardMap.keys[0])
     
-    // await client.initSkyEyeAndRun(pathSkyEye,fileName,port,skyeyeDir);
+   
 
     // const pathSkyEye = "D:/data/case/FMQL45T900_SylixOS";
     // const fileName = "FMQL45T900_SylixOS.skyeye";
     // const skyeyeDir = "D:/install/SkyEye/opt/skyeye/bin/skyeye.exe"
     // const port = "50066"
 
-    // const pathSkyEye = "G:/SkyEye/demo/c6713_demo";
-    // const fileName = "G:/SkyEye/demo/c6713_demo/c6713_demo.skyeye";
-    // const skyeyeDir = "G:/SkyEye/opt/skyeye/bin/skyeye.exe"
+    const pathSkyEye = "C:/Users/lingt/Downloads/SkyTest_Double";
+    const fileName = "C:/Users/lingt/Downloads/SkyTest_Double/SkyTest_Double.skyeye";
+    const skyeyeDir = "G:/SkyEye/opt/skyeye/bin/skyeye.exe"
     const port = "50051"
-    const client = await SkyEyeClientFactory.instance.createConnectedClient('127.0.0.1', port);
-    await client.registerTimeMonitor({
-        time: 10,
-        cpu_name: 'c67x_core_0',
-        items: [
-            {
-                id: '1',
-                cpu_name: 'c67x_core_0',
-                var_name: 'int1',
-                var_type: 'int',
-                var_bytes: 4,
-                type: 'global'
-            }
-        ]
-    })
-    await client.startTimeMonitor()
-    const response = await client.getTimeMonitorConfig()
+    // const client = await SkyEyeClientFactory.instance.createConnectedClient('127.0.0.1', port);
+    const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', port);
+    const t = await client.initSkyEyeAndRun2(pathSkyEye, fileName, port, skyeyeDir)
+    //   await client.runCommand();
+    const response = await client.getDeviceTree()
     console.log(response)
-    await client.stopTimeMonitor()
+    // await client.registerTimeMonitor({
+    // "id": "1",
+    // "time": 50,
+    // "cpu_name": "c67x_core_0",
+    // "direction":"recv",
+    // "cycle":-1,
+    // "items": [
+        
+    //     {
+    //         "id": "cc5f450b-6fbb-7bb3-4544-e761a907b46d",
+    //         "cpu_name": "c67x_core_0",
+    //         "var_name": "int1",
+    //         "var_type": "int",
+    //         "var_bytes": 4,
+    //         "type": "global",
+    //         "value": "111"
+    //     }
+    // ],
+    // })
+ 
+    // await client.startTimeMonitor("1")
+    // // await client.getTimeMonitorConfig()
+    // console.log('bbbbbbbbbbbb')
+     
+    // call = client.timeDataReceive("1")
+    // call.on('data',(response)=> {
+    //     const ackObj = response.getResponse();
+    //     console.log(ackObj)
+    // })
+    // console.log('gggggggggggggg')
+   
+    // console.log(call)
     // await client.stopTimeMonitor()
-    const call = client.timeDataReceive('')
-    call.on('data',(response)=> {
-        console.log(response)
-    })
+  
 
     // response = client.setBitValue('c67x_core_0', '0x1000','1',  8)
     // console.log("response:", response)