langjie-m-play 0.0.4 → 0.0.6

package/domain/AtsLoadResponse.d.ts

@@ -0,0 +1,4 @@
+export interface AtsLoadResponse<K extends string, V> {
+    atsHandle: number;
+    atsParam: Record<K, V>;
+}

package/domain/AtsLoadResponse.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "langjie-m-play",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",

package/service/GtcClient.d.ts

@@ -4,6 +4,7 @@ import { GtcCallBackMsg } from "../domain/GtcCallBackMsg";
 import { ReadDataDO } from "../domain/ReadDataDO";
 import { VinChnl } from "../domain/VinChnl";
 import { OutMsg } from "../domain/OutMsg";
+import { AtsLoadResponse } from "../domain/AtsLoadResponse";
 /**
  * 提供给前端接口调用
  */
@@ -205,7 +206,7 @@ export declare class GtcClient {
      * @param script        ats脚本
      * @return ats句柄
      */
-    static atsLoad(slaveInstId: string | null, serviceType: ServiceTypeEnum, ctrlIndex: number, script: string): Promise<number>;
+    static atsLoad<K extends string, V>(slaveInstId: string | null, serviceType: ServiceTypeEnum, ctrlIndex: number, script: string): Promise<AtsLoadResponse<K, V>>;
     /**
      * 启动ats
      *

package/service/MPlay.d.ts

@@ -1,10 +1,12 @@
 import { ServiceTypeEnum } from "../domain/enums/ServiceTypeEnum";
+import { AtsLoadResponse } from "../domain/AtsLoadResponse";
 export declare class MPlay {
     private readonly instId;
     private readonly serviceType;
     private readonly ctrlIndex;
     private dataGramCallBack;
     private atsHandleNameMap;
+    private atsStartedMark;
     /**
      * Connect to the MPlay server.
      *
@@ -34,9 +36,9 @@ export declare class MPlay {
      * Load ATS script to the MPlay server.
      *
      * @param atsScriptName  The name of the ATS script to load.
-     * @return atsHandle     The handle of the ATS script.
+     * @return atsLoadResponse The response of the ATS load request.
      */
-    load(atsScriptName: string): Promise<number>;
+    load<K extends string, V>(atsScriptName: string): Promise<AtsLoadResponse<K, V>>;
     /**
      * Start ATS script to the MPlay server by ATS handle.
      *

package/service/MPlay.js

@@ -36,6 +36,7 @@ class MPlay {
     constructor(instId, serviceType, ctrlIndex) {
         this.ctrlIndex = 0;
         this.atsHandleNameMap = {};
+        this.atsStartedMark = {};
         if (instId) {
             this.instId = instId;
         }
@@ -112,16 +113,19 @@ class MPlay {
      * Load ATS script to the MPlay server.
      *
      * @param atsScriptName  The name of the ATS script to load.
-     * @return atsHandle     The handle of the ATS script.
+     * @return atsLoadResponse The response of the ATS load request.
      */
     load(atsScriptName) {
         return __awaiter(this, void 0, void 0, function* () {
-            const atsHandle = yield GtcClient_1.GtcClient.atsLoad(this.instId, this.serviceType, this.ctrlIndex, atsScriptName);
+            const atsLoadResponse = yield GtcClient_1.GtcClient.atsLoad(this.instId, this.serviceType, this.ctrlIndex, atsScriptName);
+            const atsHandle = atsLoadResponse.atsHandle;
             if (atsHandle === 0) {
                 throw new Error("Failed to load ATS script");
             }
+            this.atsStartedMark[atsHandle] = false;
             this.atsHandleNameMap[atsHandle] = atsScriptName;
-            return atsHandle;
+            // @ts-ignore
+            return atsLoadResponse;
         });
     }
     /**
@@ -137,6 +141,7 @@ class MPlay {
             yield GtcClient_1.GtcClient.atsStart(this.instId, this.serviceType, this.ctrlIndex, atsHandle, this.atsHandleNameMap[atsHandle]);
             yield atsStartSynchronizer.waitAll();
             PubSubUtil_1.PubSubUtil.unsubscribe(SubKeyEnum_1.SubKeyEnum.ATS_START_OK, atsHandle.toString());
+            this.atsStartedMark[atsHandle] = true;
         });
     }
     /**
@@ -150,6 +155,9 @@ class MPlay {
             if (!this.atsHandleNameMap[atsHandle]) {
                 throw new Error("Please load ATS script first");
             }
+            if (!this.atsStartedMark[atsHandle]) {
+                yield this.start(atsHandle);
+            }
             yield GtcClient_1.GtcClient.atsPushButton(this.instId, this.serviceType, this.ctrlIndex, atsHandle, buttonName);
         });
     }