langjie-m-play 0.0.3 → 0.0.5

package/domain/enums/JsonRpcMethodEnum.d.ts

@@ -49,11 +49,13 @@ export declare enum JsonRpcMethodEnum {
     CALL_ATS_START = "R_CALL_PACK.atsStart",
     CALL_ATS_TERMINATE = "R_CALL_PACK.atsTerminate",
     CALL_ATS_SET_PARAM = "R_CALL_PACK.atsSetParam",
+    CALL_ATS_GET_PARAM = "R_CALL_PACK.atsGetParam",
     CALL_ATS_PUSH_BUTTON = "R_CALL_PACK.atsPushButton",
     REPLY_ATS_LOAD = "R_REPLY_PACK.atsLoad",
     REPLY_ATS_START = "R_REPLY_PACK.atsStart",
     REPLY_ATS_TERMINATE = "R_REPLY_PACK.atsTerminate",
     REPLY_ATS_SET_PARAM = "R_REPLY_PACK.atsSetParam",
+    REPLY_ATS_GET_PARAM = "R_REPLY_PACK.atsGetParam",
     REPLY_ATS_PUSH_BUTTON = "R_REPLY_PACK.atsPushButton",
     CALL_SUBSCRIBE_FOR_DATA_GRAM = "R_CALL_PACK.subscribeForDatagram",
     REPLY_SUBSCRIBE_FOR_DATA_GRAM = "R_REPLY_PACK.subscribeForDatagram",

package/domain/enums/JsonRpcMethodEnum.js

@@ -54,11 +54,13 @@ var JsonRpcMethodEnum;
     JsonRpcMethodEnum["CALL_ATS_START"] = "R_CALL_PACK.atsStart";
     JsonRpcMethodEnum["CALL_ATS_TERMINATE"] = "R_CALL_PACK.atsTerminate";
     JsonRpcMethodEnum["CALL_ATS_SET_PARAM"] = "R_CALL_PACK.atsSetParam";
+    JsonRpcMethodEnum["CALL_ATS_GET_PARAM"] = "R_CALL_PACK.atsGetParam";
     JsonRpcMethodEnum["CALL_ATS_PUSH_BUTTON"] = "R_CALL_PACK.atsPushButton";
     JsonRpcMethodEnum["REPLY_ATS_LOAD"] = "R_REPLY_PACK.atsLoad";
     JsonRpcMethodEnum["REPLY_ATS_START"] = "R_REPLY_PACK.atsStart";
     JsonRpcMethodEnum["REPLY_ATS_TERMINATE"] = "R_REPLY_PACK.atsTerminate";
     JsonRpcMethodEnum["REPLY_ATS_SET_PARAM"] = "R_REPLY_PACK.atsSetParam";
+    JsonRpcMethodEnum["REPLY_ATS_GET_PARAM"] = "R_REPLY_PACK.atsGetParam";
     JsonRpcMethodEnum["REPLY_ATS_PUSH_BUTTON"] = "R_REPLY_PACK.atsPushButton";
     JsonRpcMethodEnum["CALL_SUBSCRIBE_FOR_DATA_GRAM"] = "R_CALL_PACK.subscribeForDatagram";
     JsonRpcMethodEnum["REPLY_SUBSCRIBE_FOR_DATA_GRAM"] = "R_REPLY_PACK.subscribeForDatagram";

package/package.json

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

package/service/GtcClient.d.ts

@@ -246,4 +246,13 @@ export declare class GtcClient {
      * @param values        参数values
      */
     static atsSetParam(slaveInstId: string | null, serviceType: ServiceTypeEnum, ctrlIndex: number, atsHandle: number, keys: string[], values: Array<string | number>): Promise<null>;
+    /**
+     * 获取ats参数
+     *
+     * @param slaveInstId   从机id
+     * @param serviceType   服务类型
+     * @param ctrlIndex     卡索引
+     * @param atsHandle     ats句柄
+     */
+    static atsGetParam<K extends string, V>(slaveInstId: string | null, serviceType: ServiceTypeEnum, ctrlIndex: number, atsHandle: number): Promise<Record<K, V>>;
 }

package/service/GtcClient.js

@@ -469,5 +469,22 @@ class GtcClient {
             return GtcServiceFactory_1.default.getGtcService().call(request);
         });
     }
+    /**
+     * 获取ats参数
+     *
+     * @param slaveInstId   从机id
+     * @param serviceType   服务类型
+     * @param ctrlIndex     卡索引
+     * @param atsHandle     ats句柄
+     */
+    static atsGetParam(slaveInstId, serviceType, ctrlIndex, atsHandle) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const request = GtcClient.generateRequest(JsonRpcMethodEnum_1.JsonRpcMethodEnum.CALL_ATS_GET_PARAM, slaveInstId);
+            request.params[JsonRpcConstant_1.JsonRpcConstant.SERVICE_TYPE] = serviceType;
+            request.params[JsonRpcConstant_1.JsonRpcConstant.CTRL_INDEX] = ctrlIndex;
+            request.params[JsonRpcConstant_1.JsonRpcConstant.ATS_HANDLE] = atsHandle;
+            return GtcServiceFactory_1.default.getGtcService().call(request);
+        });
+    }
 }
 exports.GtcClient = GtcClient;

package/service/MPlay.d.ts

@@ -5,6 +5,7 @@ export declare class MPlay {
     private readonly ctrlIndex;
     private dataGramCallBack;
     private atsHandleNameMap;
+    private atsStartedMark;
     /**
      * Connect to the MPlay server.
      *
@@ -50,4 +51,17 @@ export declare class MPlay {
      * @param buttonName    The name of the button to trigger.
      */
     pushButton(atsHandle: number, buttonName: string): Promise<void>;
+    /**
+     * Get the parameter of the ATS script by ATS handle.
+     *
+     * @param atsHandle     The handle of the ATS script.
+     */
+    atsGetParam(atsHandle: number): Promise<Record<string, number>>;
+    /**
+     * Set the parameter of the ATS script by ATS handle.
+     *
+     * @param atsHandle     The handle of the ATS script.
+     * @param param         The parameter to set.
+     */
+    atsSetParam(atsHandle: number, param: Record<string, number>): Promise<void>;
 }

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;
         }
@@ -120,6 +121,7 @@ class MPlay {
             if (atsHandle === 0) {
                 throw new Error("Failed to load ATS script");
             }
+            this.atsStartedMark[atsHandle] = false;
             this.atsHandleNameMap[atsHandle] = atsScriptName;
             return atsHandle;
         });
@@ -137,6 +139,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;
         });
     }
     /**
@@ -148,10 +151,39 @@ class MPlay {
     pushButton(atsHandle, buttonName) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.atsHandleNameMap[atsHandle]) {
-                throw new Error("Please reload ATS script");
+                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);
         });
     }
+    /**
+     * Get the parameter of the ATS script by ATS handle.
+     *
+     * @param atsHandle     The handle of the ATS script.
+     */
+    atsGetParam(atsHandle) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield GtcClient_1.GtcClient.atsGetParam(this.instId, this.serviceType, this.ctrlIndex, atsHandle);
+        });
+    }
+    /**
+     * Set the parameter of the ATS script by ATS handle.
+     *
+     * @param atsHandle     The handle of the ATS script.
+     * @param param         The parameter to set.
+     */
+    atsSetParam(atsHandle, param) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const keys = Object.keys(param);
+            const values = [];
+            for (const key in param) {
+                values.push(param[key]);
+            }
+            yield GtcClient_1.GtcClient.atsSetParam(this.instId, this.serviceType, this.ctrlIndex, atsHandle, keys, values);
+        });
+    }
 }
 exports.MPlay = MPlay;