skyeye-sdk-js 1.4.5 → 1.4.7

package/dist/src/SkyEyeClient.js

@@ -146,6 +146,8 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                 // console.log("res:",res)
                 const ackObj = JSON.parse(response.toString()).ack;
                 // this.printResponseLog(ackObj)
+                if (ackObj.result === 'false')
+                    ackObj.result = false;
                 return ackObj;
             }
             catch (error) {
@@ -712,10 +714,11 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
     }
     setCpuRegisterValue(boardName, cpuName, registerName, value) {
         return __awaiter(this, void 0, void 0, function* () {
-            const deviceTree = yield this.getDeviceTree();
-            if (!deviceTree.boardMap.has(boardName)) {
-                throw new SkyEyeSDKException_1.SkyEyeSDKException("未能找到该板卡");
-            }
+            // 设置寄存器 无需板卡名称
+            // const deviceTree = await this.getDeviceTree();
+            // if (!deviceTree.boardMap.has(boardName)) {
+            //     throw new SkyEyeSDKException("未能找到该板卡");
+            // }
             // const board: Board = boardMap.get(boardName);
             // const deviceMap = board.deviceMap;
             // if (!deviceMap.has(cpuName) || !(deviceMap.get(cpuName) instanceof Cpu)) {
@@ -1095,10 +1098,22 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             try {
                 console.log('runExample');
                 this.childProcess = yield this.startSkyEye(port, skyeyeDir);
+                let response;
+                let ackObj;
                 yield this.checkState();
                 yield this.checkModule();
-                yield this.setWorkingDirectory(pathSkyEye, port);
-                yield this.runScript(fileName, port);
+                response = yield this.setWorkingDirectory(pathSkyEye, port);
+                ackObj = JSON.parse(response.toString()).ack;
+                if (ackObj.result === "false") {
+                    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) {
@@ -1209,7 +1224,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                 }
                 else {
                     console.log("chdir res:", response);
-                    resolve();
+                    resolve(response);
                 }
             });
         });
@@ -1226,7 +1241,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
                 }
                 else {
                     console.log("run_script res:", response);
-                    resolve();
+                    resolve(response);
                 }
             });
         });

package/package.json

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

package/src/SkyEyeClient.ts

@@ -111,6 +111,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
             // console.log("res:",res)
             const ackObj = JSON.parse(response.toString()).ack;
             // this.printResponseLog(ackObj)
+            if (ackObj.result === 'false') ackObj.result = false
             return ackObj;
         } catch (error) {
             // console.error("Error during gRPC request:", JSON.stringify(request));
@@ -632,10 +633,11 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
 
     public async setCpuRegisterValue(boardName: string, cpuName: string, registerName: string, value: string) {
-        const deviceTree = await this.getDeviceTree();
-        if (!deviceTree.boardMap.has(boardName)) {
-            throw new SkyEyeSDKException("未能找到该板卡");
-        }
+        // 设置寄存器 无需板卡名称
+        // const deviceTree = await this.getDeviceTree();
+        // if (!deviceTree.boardMap.has(boardName)) {
+        //     throw new SkyEyeSDKException("未能找到该板卡");
+        // }
         // const board: Board = boardMap.get(boardName);
         // const deviceMap = board.deviceMap;
         // if (!deviceMap.has(cpuName) || !(deviceMap.get(cpuName) instanceof Cpu)) {
@@ -1012,11 +1014,24 @@ export class SkyEyeClient extends JSONTransmissionClient {
     public async initSkyEyeAndRun2(pathSkyEye: string, fileName: string, port: string, skyeyeDir: string) {
         try {
             console.log('runExample');
+          
             this.childProcess = await this.startSkyEye(port, skyeyeDir);
+            let response
+            let ackObj 
             await this.checkState();
             await this.checkModule();
-            await this.setWorkingDirectory(pathSkyEye, port);
-            await this.runScript(fileName, port);
+            response =  await this.setWorkingDirectory(pathSkyEye, port);
+            ackObj = JSON.parse(response.toString()).ack;
+            if (ackObj.result === "false") {
+                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);
@@ -1126,7 +1141,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    private setWorkingDirectory(pathSkyEye: string, port: string): Promise<void> {
+    private setWorkingDirectory(pathSkyEye: string, port: string): Promise<JSONResponse> {
         const client = new JSONTransmissionClient(`127.0.0.1:${port}`, grpc.credentials.createInsecure());
         const Jr = new JSONRequest();
         Jr.setRequest(`{"request": {"name": "chdir", "args": {"path":"${pathSkyEye}"}}}`);
@@ -1138,25 +1153,25 @@ export class SkyEyeClient extends JSONTransmissionClient {
                     reject(error);
                 } else {
                     console.log("chdir res:", response);
-                    resolve();
+                    resolve(response);
                 }
             });
         });
     }
 
-    private runScript(fileName: string, port: string): Promise<void> {
+    private runScript(fileName: string, port: string): Promise<JSONResponse> {
         const client = new JSONTransmissionClient(`127.0.0.1:${port}`, grpc.credentials.createInsecure());
         const Jr = new JSONRequest();
         Jr.setRequest(`{"request": {"name": "run_script", "args": {"filename":"${fileName}"}}}`);
 
-        return new Promise((resolve, reject) => {
+        return new Promise<JSONResponse>((resolve, reject) => {
             client.callSkyEye(Jr, (error: ServiceError | null, response: JSONResponse) => {
                 if (error) {
                     console.log("run_script error res:", error);
                     reject(error);
                 } else {
                     console.log("run_script res:", response);
-                    resolve();
+                    resolve(response);
                 }
             });
         });