skyeye-sdk-js 1.4.19 → 1.4.20

package/dist/src/SkyEyeClient.js

@@ -1186,6 +1186,12 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                     ackObj.result = false;
                     throw new Error(ackObj.error);
                 }
+                response = yield this.runScript(fileName, port);
+                ackObj = JSON.parse(response.toString()).ack;
+                if (ackObj.result === "false") {
+                    ackObj.result = false;
+                    throw new Error(ackObj.error);
+                }
                 return true;
             }
             catch (error) {

package/dist/test.js

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const { SkyEyeClientFactory } = require('./src/SkyEyeClientFactory');
+const SkyEyeClientFactory_1 = require("./src/SkyEyeClientFactory");
+// const { SkyEyeClientFactory } = require('./src/SkyEyeClientFactory')
 const { SkyEyeClient } = require('./src/SkyEyeClient');
 const { Cpu } = require('./src/models/Cpu');
 var RegisterType;
@@ -50,15 +51,134 @@ function test() {
         // const fileName = "FMQL45T900_SylixOS.skyeye";
         // const skyeyeDir = "D:/install/SkyEye/opt/skyeye/bin/skyeye.exe"
         // const port = "50066"
-        const pathSkyEye = "D:/data/case/c6713_timer_test";
-        const fileName = "c6k.skyeye";
-        const skyeyeDir = "D:/install/SkyEye/opt/skyeye/bin/skyeye.exe";
-        const port = "50053";
-        const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', port);
+        const pathSkyEye = "C:/Users/SkyEye/Desktop/skytest-project/SkyTest_Double";
+        const fileName = "SkyTest_Double.skyeye";
+        const skyeyeDir = "C:/SkyEye/opt/skyeye/bin/skyeye.exe";
+        const port = '50019';
+        const client = SkyEyeClientFactory_1.SkyEyeClientFactory.instance.createClient('127.0.0.1', port);
         const t = yield client.initSkyEyeAndRun2(pathSkyEye, fileName, port, skyeyeDir);
+        console.log(t);
+        let count = 1;
+        while (count === 1) {
+            const res = (yield client.getCurrentRunningState()).getState();
+            console.log(res);
+            if (res === "STOPPED") {
+                count++;
+            }
+            yield new Promise((resolve, rej) => {
+                setTimeout(() => {
+                    resolve(true);
+                }, 1000);
+            });
+        }
         client.runCommand();
-        const response = yield client.runToTime("c67x_core_0", "1");
-        console.log("response:", response);
+        // const response = await client.runToTime("c67x_core_0","1");
+        client.getSimulationTime("c67x_core_0").then(res => {
+            console.log(res);
+        });
+        yield client.registerTimeMonitor({
+            id: "a1",
+            time: 500,
+            cpu_name: "c67x_core_0",
+            items: [],
+            direction: 'send',
+            cycle: 5
+        });
+        yield client.startTimeMonitor("a1");
+        const dataStream = client.timeDataReceive("a1");
+        dataStream.on('data', (data) => {
+            try {
+                console.log('1');
+            }
+            catch (e) {
+                console.log('stream parse error:' + e);
+            }
+        });
+        // await new Promise(resolve => setTimeout(resolve, 100))
+        // await client.stopTimeMonitor("1")
+        yield client.registerTimeMonitor({
+            id: "2",
+            time: 400,
+            cpu_name: "c67x_core_0",
+            items: [],
+            direction: 'send',
+            cycle: 5
+        });
+        yield client.startTimeMonitor("2");
+        const dataStream2 = client.timeDataReceive("2");
+        dataStream2.on('data', (data) => {
+            try {
+                console.log('2');
+            }
+            catch (e) {
+                console.log('stream parse error:' + e);
+            }
+        });
+        // await new Promise(resolve => setTimeout(resolve, 100))
+        // await client.stopTimeMonitor("1")
+        yield client.registerTimeMonitor({
+            id: "3",
+            time: 300,
+            cpu_name: "c67x_core_0",
+            items: [],
+            direction: 'send',
+            cycle: 5
+        });
+        yield client.startTimeMonitor("3");
+        const dataStream3 = client.timeDataReceive("3");
+        dataStream3.on('data', (data) => {
+            try {
+                console.log('3');
+            }
+            catch (e) {
+                console.log('stream parse error:' + e);
+            }
+        });
+        // await new Promise(resolve => setTimeout(resolve, 1000))
+        // const rr = await client.getSimulationTime("c67x_core_0")
+        // console.log(rr)
+        // await client.stopTimeMonitor("1")
+        yield client.registerTimeMonitor({
+            id: "4",
+            time: 200,
+            cpu_name: "c67x_core_0",
+            items: [],
+            direction: 'send',
+            cycle: 5
+        });
+        yield client.startTimeMonitor("4");
+        const dataStream4 = client.timeDataReceive("4");
+        dataStream4.on('data', (data) => {
+            try {
+                console.log('4');
+            }
+            catch (e) {
+                console.log('stream parse error:' + e);
+            }
+        });
+        // await new Promise(resolve => setTimeout(resolve, 100))
+        // await client.stopTimeMonitor("1")
+        yield client.registerTimeMonitor({
+            id: "5",
+            time: 100,
+            cpu_name: "c67x_core_0",
+            items: [],
+            direction: 'send',
+            cycle: 5
+        });
+        yield client.startTimeMonitor("5");
+        const dataStream5 = client.timeDataReceive("5");
+        dataStream5.on('data', (data) => {
+            try {
+                console.log('5');
+            }
+            catch (e) {
+                console.log('stream parse error:' + e);
+            }
+        });
+        yield new Promise(resolve => setTimeout(resolve, 300000));
+        // await client.stopTimeMonitor("1")
+        console.log("response:", 123);
         // const responseCpuList = await client.getCpuList()
         // console.log("responseCpuList:", responseCpuList)
         // const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', 50056);

package/package.json

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

package/src/SkyEyeClient.ts

@@ -1095,6 +1095,12 @@ export class SkyEyeClient extends JSONTransmissionClient {
                 ackObj.result = false
                 throw new Error(ackObj.error)
             }
+			response = await this.runScript(fileName, port);
+			ackObj = JSON.parse(response.toString()).ack;
+			if (ackObj.result === "false") {
+				ackObj.result = false
+				throw new Error(ackObj.error)
+			}
             return true;
         } catch (error) {
             console.error("initSkyEyeAndRun error:", error);

package/test.ts

@@ -2,8 +2,8 @@ import { JSONResponse } from "./src/proto/skyeye_rpc_pb";
 import { GrpcUtil } from "./src/GrpcUtil";
 import { ServiceError } from "@grpc/grpc-js";
 import { Enum } from "protobufjs";
-
-const { SkyEyeClientFactory } = require('./src/SkyEyeClientFactory')
+import { SkyEyeClientFactory } from './src/SkyEyeClientFactory'
+// const { SkyEyeClientFactory } = require('./src/SkyEyeClientFactory')
 const { SkyEyeClient } = require('./src/SkyEyeClient')
 
 const { Cpu } = require('./src/models/Cpu')
@@ -57,15 +57,137 @@ async function test() {
     // const skyeyeDir = "D:/install/SkyEye/opt/skyeye/bin/skyeye.exe"
     // const port = "50066"
 
-    const pathSkyEye = "D:/data/case/c6713_timer_test";
-    const fileName = "c6k.skyeye";
-    const skyeyeDir = "D:/install/SkyEye/opt/skyeye/bin/skyeye.exe"
-    const port = "50053"
+    const pathSkyEye = "C:/Users/SkyEye/Desktop/skytest-project/SkyTest_Double";
+    const fileName = "SkyTest_Double.skyeye";
+    const skyeyeDir = "C:/SkyEye/opt/skyeye/bin/skyeye.exe"
+    const port = '50019'
     const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', port);
     const t = await client.initSkyEyeAndRun2(pathSkyEye, fileName, port, skyeyeDir)
+    console.log(t)
+    let count = 1
+    while (count === 1) {
+        const res = (await client.getCurrentRunningState()).getState()
+        console.log(res)
+        if (res === "STOPPED" ) {
+            count++
+        }
+        await new Promise((resolve, rej) => {
+            setTimeout(()=>{
+                resolve(true)
+            }, 1000)
+        })
+    }
     client.runCommand();
-    const response = await client.runToTime("c67x_core_0","1");
-    console.log("response:", response)
+    // const response = await client.runToTime("c67x_core_0","1");
+    client.getSimulationTime("c67x_core_0").then(res => {
+        console.log(res)
+    })
+    
+    await client.registerTimeMonitor({
+        id: "a1",
+        time: 500,
+        cpu_name: "c67x_core_0",
+        items: [],
+        direction: 'send',
+        cycle: 5
+    })
+    await client.startTimeMonitor("a1")
+    const dataStream = client.timeDataReceive("a1")
+    dataStream.on('data', (data: any) => {
+        try {
+            console.log('1')
+        } catch (e) {
+            console.log('stream parse error:' + e)
+        }
+    })
+    // await new Promise(resolve => setTimeout(resolve, 100))
+    // await client.stopTimeMonitor("1")
+
+    await client.registerTimeMonitor({
+        id: "2",
+        time: 400,
+        cpu_name: "c67x_core_0",
+        items: [],
+        direction: 'send',
+        cycle: 5
+    })
+    await client.startTimeMonitor("2")
+    const dataStream2 = client.timeDataReceive("2")
+    dataStream2.on('data', (data: any) => {
+        try {
+            console.log('2')
+        } catch (e) {
+            console.log('stream parse error:' + e)
+        }
+    })
+    // await new Promise(resolve => setTimeout(resolve, 100))
+    // await client.stopTimeMonitor("1")
+
+
+    await client.registerTimeMonitor({
+        id: "3",
+        time: 300,
+        cpu_name: "c67x_core_0",
+        items: [],
+        direction: 'send',
+        cycle: 5
+    })
+    await client.startTimeMonitor("3")
+    const dataStream3 = client.timeDataReceive("3")
+    dataStream3.on('data', (data: any) => {
+        try {
+            console.log('3')
+        } catch (e) {
+            console.log('stream parse error:' + e)
+        }
+    })
+    // await new Promise(resolve => setTimeout(resolve, 1000))
+    // const rr = await client.getSimulationTime("c67x_core_0")
+    // console.log(rr)
+    // await client.stopTimeMonitor("1")
+
+    await client.registerTimeMonitor({
+        id: "4",
+        time: 200,
+        cpu_name: "c67x_core_0",
+        items: [],
+        direction: 'send',
+        cycle: 5
+    })
+    await client.startTimeMonitor("4")
+    const dataStream4 = client.timeDataReceive("4")
+    dataStream4.on('data', (data: any) => {
+        try {
+            console.log('4')
+        } catch (e) {
+            console.log('stream parse error:' + e)
+        }
+    })
+    // await new Promise(resolve => setTimeout(resolve, 100))
+    // await client.stopTimeMonitor("1")
+
+
+    await client.registerTimeMonitor({
+        id: "5",
+        time: 100,
+        cpu_name: "c67x_core_0",
+        items: [],
+        direction: 'send',
+        cycle: 5
+    })
+    await client.startTimeMonitor("5")
+    const dataStream5 = client.timeDataReceive("5")
+    dataStream5.on('data', (data: any) => {
+        try {
+            console.log('5')
+        } catch (e) {
+            console.log('stream parse error:' + e)
+        }
+    })
+    await new Promise(resolve => setTimeout(resolve, 300000))
+    // await client.stopTimeMonitor("1")
+
+    console.log("response:", 123)
 
     // const responseCpuList = await client.getCpuList()
     // console.log("responseCpuList:", responseCpuList)