langjie-m-play 0.0.6 → 0.0.7

package/.idea/m-play.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/m-play.iml" filepath="$PROJECT_DIR$/.idea/m-play.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

package/dist/domain/SubscribeDatagramResult.d.ts

@@ -0,0 +1,5 @@
+export interface SubscribeDatagramResult {
+    maxScaleList: Array<number>;
+    unitCodeList: Array<number>;
+    unitNameList: Array<string>;
+}

package/dist/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "langjie-m-play",
+  "version": "0.0.7",
+  "description": "",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "scripts": {
+    "build": "tsc"
+  },
+  "author": "",
+  "license": "ISC",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "dependencies": {
+    "socket.io-client": "^2.1.1"
+  }
+}

package/{service → dist/service}/GtcClient.d.ts

@@ -5,6 +5,7 @@ import { ReadDataDO } from "../domain/ReadDataDO";
 import { VinChnl } from "../domain/VinChnl";
 import { OutMsg } from "../domain/OutMsg";
 import { AtsLoadResponse } from "../domain/AtsLoadResponse";
+import { SubscribeDatagramResult } from "../domain/SubscribeDatagramResult";
 /**
  * 提供给前端接口调用
  */
@@ -88,7 +89,7 @@ export declare class GtcClient {
      * @param serviceType   服务类型
      * @param tags          通道列表 Time,Event,Disp,Load
      */
-    static subscribeForDatagram(slaveInstId: string | null, serviceType: ServiceTypeEnum, tags: string): Promise<string[]>;
+    static subscribeForDatagram(slaveInstId: string | null, serviceType: ServiceTypeEnum, tags: string): Promise<SubscribeDatagramResult>;
     /**
      * 取消订阅通道数据流
      *
@@ -246,7 +247,7 @@ export declare class GtcClient {
      * @param keys          参数keys
      * @param values        参数values
      */
-    static atsSetParam(slaveInstId: string | null, serviceType: ServiceTypeEnum, ctrlIndex: number, atsHandle: number, keys: string[], values: Array<string | number>): Promise<null>;
+    static atsSetParam<K extends string, V>(slaveInstId: string | null, serviceType: ServiceTypeEnum, ctrlIndex: number, atsHandle: number, keys: string[], values: Array<string | number>): Promise<Record<K, V>>;
     /**
      * 获取ats参数
      *

package/dist/service/IGtcService.js

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

package/{service → dist/service}/MPlay.d.ts

@@ -1,5 +1,6 @@
 import { ServiceTypeEnum } from "../domain/enums/ServiceTypeEnum";
 import { AtsLoadResponse } from "../domain/AtsLoadResponse";
+import { SubscribeDatagramResult } from "../domain/SubscribeDatagramResult";
 export declare class MPlay {
     private readonly instId;
     private readonly serviceType;
@@ -27,7 +28,7 @@ export declare class MPlay {
      * @param tags   The channel tags to subscribe.
      * @param fn     The callback function to handle the datagram.
      */
-    subscribeForDatagram(tags: string, fn: (data: Array<Array<string>>) => void): Promise<void>;
+    subscribeForDatagram(tags: string, fn: (data: Array<Array<string>>) => void): Promise<SubscribeDatagramResult>;
     /**
      * Unsubscribe datagram from the MPlay server.
      */
@@ -64,5 +65,5 @@ export declare class MPlay {
      * @param atsHandle     The handle of the ATS script.
      * @param param         The parameter to set.
      */
-    atsSetParam(atsHandle: number, param: Record<string, number>): Promise<void>;
+    atsSetParam(atsHandle: number, param: Record<string, number>): Promise<Record<string, number>>;
 }

package/{service → dist/service}/MPlay.js

@@ -73,7 +73,8 @@ class MPlay {
             }
             else if (msg.msgId >= 0x0700 && msg.msgId < 0x0800) {
                 // ats跳转到指定步骤
-                // PubSubUtil.publish(SubKeyEnum.ATS_JUMP_ACTION, { instId, ctrlIndex });
+                const hAts = msg.msgId & 0x00F0 >> 4;
+                PubSubUtil_1.PubSubUtil.publish(SubKeyEnum_1.SubKeyEnum.ATS_JUMP_ACTION, { instId, ctrlIndex, hAts, step: msg.msg });
             }
             else if (msg.msgId >= 0x0800 && msg.msgId < 0x0900) {
                 // ats异常停止
@@ -97,8 +98,8 @@ class MPlay {
      */
     subscribeForDatagram(tags, fn) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield GtcClient_1.GtcClient.subscribeForDatagram(this.instId, this.serviceType, tags);
             this.dataGramCallBack = fn;
+            return yield GtcClient_1.GtcClient.subscribeForDatagram(this.instId, this.serviceType, tags);
         });
     }
     /**
@@ -184,7 +185,7 @@ class MPlay {
             for (const key in param) {
                 values.push(param[key]);
             }
-            yield GtcClient_1.GtcClient.atsSetParam(this.instId, this.serviceType, this.ctrlIndex, atsHandle, keys, values);
+            return yield GtcClient_1.GtcClient.atsSetParam(this.instId, this.serviceType, this.ctrlIndex, atsHandle, keys, values);
         });
     }
 }

package/package.json

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

package/src/domain/AtsLoadResponse.ts

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

package/src/domain/DiDo.ts

@@ -0,0 +1,6 @@
+export interface DiDo {
+    LastVal: number;
+    ValArray: number[];
+    BindHandle: number;
+    Caption: string;
+}

package/src/domain/GtcCallBackMsg.ts

@@ -0,0 +1,11 @@
+import {MsgSourceEnum} from "./enums/MsgSourceEnum";
+import {RunStateEnum} from "./enums/RunStateEnum";
+
+export interface GtcCallBackMsg {
+    hSrc: number;
+    msgId: number;
+    ms: number;
+    msg: string;
+    source: MsgSourceEnum;
+    runState: RunStateEnum;
+}

package/src/domain/JsonRpcConstant.ts

@@ -0,0 +1,21 @@
+/**
+ * rpc通讯参数常量
+ */
+export class JsonRpcConstant {
+    public static readonly SLAVE_INST_ID = "slaveInstId";
+    public static readonly CTRL_INDEX = "ctrlIndex";
+    public static readonly SERVICE_TYPE = "serviceType";
+    public static readonly CHANNEL_HANDLE = "channelHandle";
+    public static readonly SPEED = "speed";
+    public static readonly LOW_LIMIT = "lowLimit";
+    public static readonly UP_LIMIT = "upLimit";
+    public static readonly VALUE = "value";
+    public static readonly SWITCH_CODE = "switchCode";
+    public static readonly OPEN_STATUS = "openStatus";
+    public static readonly ATS_SCRIPT = "atsScript";
+    public static readonly ATS_HANDLE = "atsHandle";
+    public static readonly ATS_BUTTON_CODE = "atsButtonCode";
+    public static readonly ATS_PARAM_KEYS = "atsParamKeys";
+    public static readonly ATS_PARAM_VALUES = "atsParamValues";
+    public static readonly VIN_TAGS = "vinTags";
+}

package/src/domain/JsonRpcError.ts

@@ -0,0 +1,7 @@
+import {JsonRpcResponseCodeEnum} from "./enums/JsonRpcResponseCodeEnum";
+
+export interface JsonRpcError<E> {
+    code: JsonRpcResponseCodeEnum;
+    message: string;
+    data: E;
+}

package/src/domain/JsonRpcRequest.ts

@@ -0,0 +1,14 @@
+import {JsonRpcMethodEnum} from "./enums/JsonRpcMethodEnum";
+import {JsonRpcEventEnum} from "./enums/JsonRpcEventEnum";
+
+/**
+ * 请求对象
+ */
+export interface JsonRpcRequest<T> {
+    id: string;
+    method: JsonRpcMethodEnum;
+    params: T;
+    timestamp: number;
+    event: JsonRpcEventEnum;
+    slaveInstId: string | null;
+}

package/src/domain/JsonRpcResponse.ts

@@ -0,0 +1,16 @@
+import {JsonRpcMethodEnum} from "./enums/JsonRpcMethodEnum";
+import {JsonRpcEventEnum} from "./enums/JsonRpcEventEnum";
+import {JsonRpcError} from "./JsonRpcError";
+
+/**
+ * 响应对象
+ */
+export interface JsonRpcResponse<T, E> {
+    id: string;
+    method: JsonRpcMethodEnum;
+    result: T;
+    error: JsonRpcError<E>,
+    timestamp: number;
+    event: JsonRpcEventEnum;
+    slaveInstId: string;
+}

package/src/domain/NodeInfo.ts

@@ -0,0 +1,14 @@
+import {ConnectStatusEnum} from "./enums/ConnectStatusEnum";
+
+export interface NodeInfo {
+
+    /**
+     * 节点状态
+     */
+    nodeStatus: ConnectStatusEnum;
+
+    /**
+     * 节点id
+     */
+    instId: string | null;
+}

package/src/domain/OutMsg.ts

@@ -0,0 +1,11 @@
+import {MsgEventTypeEnum} from "./enums/MsgEventTypeEnum";
+import {ServiceTypeEnum} from "./enums/ServiceTypeEnum";
+
+export interface OutMsg<T> {
+    serviceType: ServiceTypeEnum;
+    ctrlIndex: number;
+    // 用于多轴对齐
+    batchId: string;
+    msgEventType: MsgEventTypeEnum;
+    data: T;
+}

package/src/domain/ProductInfo.ts

@@ -0,0 +1,4 @@
+export interface ProductInfo {
+    dSn: number;
+    device: string;
+}

package/src/domain/ReadDataDO.ts

@@ -0,0 +1,10 @@
+import {VinChnl} from "./VinChnl";
+import {DiDo} from "./DiDo";
+
+export interface ReadDataDO {
+    ChannelList: Array<VinChnl>;
+    DiList: Array<DiDo>;
+    DoList: Array<DiDo>;
+    TimeArr: number[];
+    DataGramList: Array<string[]>;
+}

package/src/domain/SubscribeDatagramResult.ts

@@ -0,0 +1,5 @@
+export interface SubscribeDatagramResult {
+    maxScaleList: Array<number>;
+    unitCodeList: Array<number>;
+    unitNameList: Array<string>;
+}

package/src/domain/VinChnl.ts

@@ -0,0 +1,12 @@
+export interface VinChnl {
+    LastVal: number;
+    SnapshotValArray: number[];
+    SnapshotNum: number;
+    Caption: string;
+    Dot: number;
+    BindHandle: number;
+    WavePeak: number[];
+    WaveValley: number[];
+    WaveEndIndexArr: number[];
+    GtWaveCount: number;
+}

package/src/domain/enums/ConnectStatusEnum.ts

@@ -0,0 +1,7 @@
+/**
+ * 服务器联机状态
+ */
+export enum ConnectStatusEnum {
+    DISCONNECT = 0,
+    CONNECTED = 1,
+}

package/src/domain/enums/JsonRpcEventEnum.ts

@@ -0,0 +1,10 @@
+/**
+ * 事件类型
+ */
+export enum JsonRpcEventEnum {
+    CALL = "R_CALL_PACK",
+    REPLY = "R_REPLY_PACK",
+    EVENT = "R_EVENT_PACK",
+    DATAGRAM = "R_GRAM_LIST",
+    ANALYZE_GRAM = "R_ANALYZE_GRAM",
+}

package/src/domain/enums/JsonRpcMethodEnum.ts

@@ -0,0 +1,67 @@
+import {JsonRpcEventEnum} from "./JsonRpcEventEnum";
+
+/**
+ * 远程调用方法
+ */
+export enum JsonRpcMethodEnum {
+    CALL_GET_NODE_INFO = JsonRpcEventEnum.CALL + ".getNodeInfo",
+    REPLY_GET_NODE_INFO = JsonRpcEventEnum.REPLY + ".getNodeInfo",
+    CALL_GET_CONFIG = JsonRpcEventEnum.CALL + ".getConfig",
+    REPLY_GET_CONFIG = JsonRpcEventEnum.REPLY + ".getConfig",
+    CALL_SAVE_CONFIG = JsonRpcEventEnum.CALL + ".saveConfig",
+    REPLY_SAVE_CONFIG = JsonRpcEventEnum.REPLY + ".saveConfig",
+    CALL_START_TESTING = JsonRpcEventEnum.CALL + ".startTesting",
+    REPLY_START_TESTING = JsonRpcEventEnum.REPLY + ".startTesting",
+
+    EVENT_LOG = JsonRpcEventEnum.EVENT + ".log",
+    DATAGRAM_LIVE_DATA = JsonRpcEventEnum.DATAGRAM + ".liveData",
+    DATAGRAM_ANALYZE_DATA = JsonRpcEventEnum.DATAGRAM + ".analyzeData",
+    CALL_GET_DLL_VER = JsonRpcEventEnum.CALL + ".getDllVer",
+    REPLY_GET_DLL_VER = JsonRpcEventEnum.REPLY + ".getDllVer",
+    CALL_GET_CARD_NUMBER = JsonRpcEventEnum.CALL + ".getCardNumber",
+    REPLY_GET_CARD_NUMBER = JsonRpcEventEnum.REPLY + ".getCardNumber",
+    CALL_LAUNCH = JsonRpcEventEnum.CALL + ".launch",
+    REPLY_LAUNCH = JsonRpcEventEnum.REPLY + ".launch",
+    CALL_GET_DIGITAL_LIST = JsonRpcEventEnum.CALL + ".getDigitalList",
+    CALL_GET_SWITCH_LIST = JsonRpcEventEnum.CALL + ".getSwitchList",
+    REPLY_GET_DIGITAL_LIST = JsonRpcEventEnum.REPLY + ".getDigitalList",
+    REPLY_GET_SWITCH_LIST = JsonRpcEventEnum.REPLY + ".getSwitchList",
+    CALL_GET_VIN_CHNLS = JsonRpcEventEnum.CALL + ".getVinChnls",
+    REPLY_GET_VIN_CHNLS = JsonRpcEventEnum.REPLY + ".getVinChnls",
+    CALL_SET_REF_GEN_SLOPE= JsonRpcEventEnum.CALL + ".setRefGenSlope",
+    REPLY_SET_REF_GEN_SLOPE = JsonRpcEventEnum.REPLY + ".setRefGenSlope",
+    CALL_OPEN_LOOP_STOP = JsonRpcEventEnum.CALL + ".openLoopStop",
+    CALL_CLOSE_LOOP_STOP = JsonRpcEventEnum.CALL + ".closeLoopStop",
+    CALL_RESET_WAVE_COUNT = JsonRpcEventEnum.CALL + ".resetWaveCount",
+    REPLY_OPEN_LOOP_STOP = JsonRpcEventEnum.REPLY + ".openLoopStop",
+    REPLY_CLOSE_LOOP_STOP = JsonRpcEventEnum.REPLY + ".closeLoopStop",
+    REPLY_RESET_WAVE_COUNT = JsonRpcEventEnum.REPLY + ".resetWaveCount",
+    CALL_GET_MAX_SCALE = JsonRpcEventEnum.CALL + ".getMaxScale",
+    REPLY_GET_MAX_SCALE = JsonRpcEventEnum.REPLY + ".getMaxScale",
+    CALL_SET_PROTECTED_LIMIT = JsonRpcEventEnum.CALL + ".setProtectLimit",
+    REPLY_SET_PROTECTED_LIMIT = JsonRpcEventEnum.REPLY + ".setProtectLimit",
+    CALL_CLEAR_TO_ZERO = JsonRpcEventEnum.CALL + ".clearToZero",
+    REPLY_CLEAR_TO_ZERO = JsonRpcEventEnum.REPLY + ".clearToZero",
+    CALL_SWITCH_DIGITAL_OUT = JsonRpcEventEnum.CALL + ".switchDigitalOut",
+    REPLY_SWITCH_DIGITAL_OUT = JsonRpcEventEnum.REPLY + ".switchDigitalOut",
+    CALL_CLOSE = JsonRpcEventEnum.CALL + ".close",
+    REPLY_CLOSE = JsonRpcEventEnum.REPLY + ".close",
+    CALL_GET_PRODUCT_INFO = JsonRpcEventEnum.CALL + ".getProductInfo",
+    REPLY_GET_PRODUCT_INFO = JsonRpcEventEnum.REPLY + ".getProductInfo",
+    CALL_ATS_LOAD = JsonRpcEventEnum.CALL + ".atsLoad",
+    CALL_ATS_START = JsonRpcEventEnum.CALL + ".atsStart",
+    CALL_ATS_TERMINATE = JsonRpcEventEnum.CALL + ".atsTerminate",
+    CALL_ATS_SET_PARAM = JsonRpcEventEnum.CALL + ".atsSetParam",
+    CALL_ATS_GET_PARAM = JsonRpcEventEnum.CALL + ".atsGetParam",
+    CALL_ATS_PUSH_BUTTON = JsonRpcEventEnum.CALL + ".atsPushButton",
+    REPLY_ATS_LOAD = JsonRpcEventEnum.REPLY + ".atsLoad",
+    REPLY_ATS_START = JsonRpcEventEnum.REPLY + ".atsStart",
+    REPLY_ATS_TERMINATE = JsonRpcEventEnum.REPLY + ".atsTerminate",
+    REPLY_ATS_SET_PARAM = JsonRpcEventEnum.REPLY + ".atsSetParam",
+    REPLY_ATS_GET_PARAM = JsonRpcEventEnum.REPLY + ".atsGetParam",
+    REPLY_ATS_PUSH_BUTTON = JsonRpcEventEnum.REPLY + ".atsPushButton",
+    CALL_SUBSCRIBE_FOR_DATA_GRAM  = JsonRpcEventEnum.CALL + ".subscribeForDatagram",
+    REPLY_SUBSCRIBE_FOR_DATA_GRAM = JsonRpcEventEnum.REPLY + ".subscribeForDatagram",
+    CALL_UNSUBSCRIBE_FOR_DATA_GRAM = JsonRpcEventEnum.CALL + ".unsubscribeForDatagram",
+    REPLY_UNSUBSCRIBE_FOR_DATA_GRAM = JsonRpcEventEnum.REPLY + ".unsubscribeForDatagram",
+}

package/src/domain/enums/JsonRpcResponseCodeEnum.ts

@@ -0,0 +1,22 @@
+/**
+ * 错误码
+ */
+export enum JsonRpcResponseCodeEnum {
+    CALL_OK = 0,
+    CALL_CANCELLED = 1,
+    CALL_UNKNOWN = 2,
+    CALL_INVALID_ARGUMENT = 3,
+    CALL_DEADLINE_EXCEEDED = 4,
+    CALL_NOT_FOUND = 5,
+    CALL_ALREADY_EXISTS = 6,
+    CALL_PERMISSION_DENIED = 7,
+    CALL_RESOURCE_EXHAUSTED = 8,
+    CALL_FAILED_PRECONDITION = 9,
+    CALL_ABORTED = 10,
+    CALL_OUT_OF_RANGE = 11,
+    CALL_UNIMPLEMENTED = 12,
+    CALL_INTERNAL = 13,
+    CALL_UNAVAILABLE = 14,
+    CALL_DATA_LOSS = 15,
+    CALL_UNAUTHENTICATED = 16,
+}

package/src/domain/enums/MsgEventTypeEnum.ts

@@ -0,0 +1,7 @@
+export enum MsgEventTypeEnum {
+    ReadData = 1,   // 读数据
+    NotifyMsg = 2,  // 其他通知消息
+    GtMsg = 3,      // mgt驱动发出的消息
+    StateChanged = 4,
+    FreshWatchParam = 5 //可以刷新WatchParam
+}

package/src/domain/enums/MsgSourceEnum.ts

@@ -0,0 +1,4 @@
+export enum MsgSourceEnum {
+    CallBack,
+    RecvMsg
+}

package/src/domain/enums/RunStateEnum.ts

@@ -0,0 +1,9 @@
+export enum RunStateEnum {
+    INIT = 1,
+    RUN_GT = 2,
+    WAIT_OK = 3,
+    BIND_GT = 4,
+    WORKING = 5,
+    WAIT_GT_CLOSE = 6,
+    CLOSED = 7
+}

package/src/domain/enums/ServiceTypeEnum.ts

@@ -0,0 +1,7 @@
+/**
+ * 服务类型
+ */
+export enum ServiceTypeEnum {
+    MGT = 1,
+    VTC = 2,
+}

package/src/index.ts

@@ -0,0 +1,15 @@
+export { SubKeyEnum } from './utils/enums/SubKeyEnum';
+export { PubSubUtil } from './utils/PubSubUtil';
+
+export { VinChnl } from './domain/VinChnl';
+export { ReadDataDO } from './domain/ReadDataDO';
+export { ProductInfo } from './domain/ProductInfo';
+export { OutMsg } from './domain/OutMsg';
+export { NodeInfo } from './domain/NodeInfo';
+export { DiDo } from './domain/DiDo';
+export { ConnectStatusEnum } from './domain/enums/ConnectStatusEnum';
+export { ServiceTypeEnum } from './domain/enums/ServiceTypeEnum';
+
+export { GtcClient } from './service/GtcClient';
+
+export { MPlay } from './service/MPlay';