sportident.js 1.4.0 → 1.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/SiCard/raceResultTools.js.map +1 -1
- package/SiCard/types/ModernSiCard.d.ts.map +1 -1
- package/SiCard/types/ModernSiCard.js +5 -2
- package/SiCard/types/ModernSiCard.js.map +1 -1
- package/SiCard/types/PCard.d.ts.map +1 -1
- package/SiCard/types/PCard.js +3 -1
- package/SiCard/types/PCard.js.map +1 -1
- package/SiCard/types/SiCard5.d.ts.map +1 -1
- package/SiCard/types/SiCard5.js +3 -1
- package/SiCard/types/SiCard5.js.map +1 -1
- package/SiCard/types/SiCard6.d.ts.map +1 -1
- package/SiCard/types/SiCard6.js +6 -2
- package/SiCard/types/SiCard6.js.map +1 -1
- package/SiCard/types/SiCard8.d.ts.map +1 -1
- package/SiCard/types/SiCard8.js +3 -1
- package/SiCard/types/SiCard8.js.map +1 -1
- package/SiCard/types/SiCard9.d.ts.map +1 -1
- package/SiCard/types/SiCard9.js +3 -1
- package/SiCard/types/SiCard9.js.map +1 -1
- package/SiDevice/SiDevice.d.ts +1 -0
- package/SiDevice/SiDevice.d.ts.map +1 -1
- package/SiDevice/SiDevice.js +10 -7
- package/SiDevice/SiDevice.js.map +1 -1
- package/SiDevice/WebSerialSiDeviceDriver.d.ts +1 -0
- package/SiDevice/WebSerialSiDeviceDriver.d.ts.map +1 -1
- package/SiDevice/WebSerialSiDeviceDriver.js +26 -25
- package/SiDevice/WebSerialSiDeviceDriver.js.map +1 -1
- package/SiDevice/WebUsbSiDeviceDriver.d.ts.map +1 -1
- package/SiDevice/WebUsbSiDeviceDriver.js +60 -56
- package/SiDevice/WebUsbSiDeviceDriver.js.map +1 -1
- package/SiStation/BaseSiStation.d.ts.map +1 -1
- package/SiStation/BaseSiStation.js +4 -2
- package/SiStation/BaseSiStation.js.map +1 -1
- package/SiStation/BaseSiStation.test.js +1 -1
- package/SiStation/BaseSiStation.test.js.map +1 -1
- package/SiStation/CoupledSiStation.d.ts.map +1 -1
- package/SiStation/CoupledSiStation.js +13 -11
- package/SiStation/CoupledSiStation.js.map +1 -1
- package/SiStation/SiMainStation.d.ts.map +1 -1
- package/SiStation/SiMainStation.js +5 -3
- package/SiStation/SiMainStation.js.map +1 -1
- package/SiStation/SiSendTask.d.ts.map +1 -1
- package/SiStation/SiSendTask.js +3 -1
- package/SiStation/SiSendTask.js.map +1 -1
- package/SiStation/SiTargetMultiplexer.d.ts.map +1 -1
- package/SiStation/SiTargetMultiplexer.js +10 -4
- package/SiStation/SiTargetMultiplexer.js.map +1 -1
- package/SiStation/SiTargetMultiplexer.targeting.test.js +37 -43
- package/SiStation/SiTargetMultiplexer.targeting.test.js.map +1 -1
- package/fakes/FakeSiDeviceDriver.d.ts.map +1 -1
- package/fakes/FakeSiDeviceDriver.js +1 -0
- package/fakes/FakeSiDeviceDriver.js.map +1 -1
- package/fakes/FakeSiMainStation.d.ts +1 -0
- package/fakes/FakeSiMainStation.d.ts.map +1 -1
- package/fakes/FakeSiMainStation.js +4 -1
- package/fakes/FakeSiMainStation.js.map +1 -1
- package/package.json +9 -4
- package/siProtocol.d.ts.map +1 -1
- package/siProtocol.js +7 -6
- package/siProtocol.js.map +1 -1
- package/siProtocol.test.d.ts.map +1 -1
- package/siProtocol.test.js +4 -2
- package/siProtocol.test.js.map +1 -1
- package/storage/SiDict.d.ts.map +1 -1
- package/storage/SiDict.js +0 -1
- package/storage/SiDict.js.map +1 -1
- package/storage/siStringEncoding.d.ts.map +1 -1
- package/storage/siStringEncoding.js +3 -1
- package/storage/siStringEncoding.js.map +1 -1
- package/testUtils.d.ts.map +1 -1
- package/testUtils.js +0 -1
- package/testUtils.js.map +1 -1
- package/utils/events.d.ts.map +1 -1
- package/utils/events.js +3 -2
- package/utils/events.js.map +1 -1
- package/utils/events.test.js +1 -0
- package/utils/events.test.js.map +1 -1
- package/utils/index.d.ts +1 -0
- package/utils/index.d.ts.map +1 -1
- package/utils/index.js +1 -0
- package/utils/index.js.map +1 -1
- package/utils/logging.d.ts +48 -0
- package/utils/logging.d.ts.map +1 -0
- package/utils/logging.js +99 -0
- package/utils/logging.js.map +1 -0
- package/utils/logging.test.d.ts +2 -0
- package/utils/logging.test.d.ts.map +1 -0
- package/utils/logging.test.js +197 -0
- package/utils/logging.test.js.map +1 -0
- package/utils/mixins.js +1 -1
- package/utils/mixins.js.map +1 -1
- package/utils/mixins.test.js +1 -0
- package/utils/mixins.test.js.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseSiStation.test.js","sourceRoot":"","sources":["../../src/SiStation/BaseSiStation.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAuD;AAEvD,wDAA0C;AAC1C,4CAAqC;AACrC,wCAAwC;AACxC,iEAA8F;AAC9F,mDAAgD;AAChD,2DAA2D;AAE3D,SAAS,CAAC,aAAa,EAAE,CAAC;AAE1B,IAAA,kBAAQ,EAAC,WAAW,EAAE,GAAG,EAAE;IAC1B,MAAM,WAAY,SAAQ,6BAA+C;KAAG;IAE5E,IAAA,cAAI,EAAC,gBAAgB,EAAE,GAAS,EAAE;QACjC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,EAAqC,EAAE,gDAAyB,CAAC,MAAM,CAAC,CAAC;QAO7G,MAAM,YAAY,GAAoB,EAAE,CAAC;QACzC,WAAW,CAAC,mBAAmB,GAAG;YACjC,WAAW,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE;gBAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;gBACzE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC/E,YAAY,CAAC,IAAI,CAAC;oBACjB,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,OAAO;oBAChB,UAAU,EAAE,UAAU;oBACtB,YAAY,EAAE,YAAY;iBAC1B,CAAC,CAAC;gBACH,IAAI,OAAO,KAAK,iBAAK,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;oBACvC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,GAAG,EAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACzF,CAAC;gBACD,IAAI,OAAO,KAAK,iBAAK,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;oBACvC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC9C,CAAC;gBACD,MAAM,IAAI,KAAK,EAAE,CAAC;YACnB,CAAC;SACuB,CAAC;QAC1B,MAAM,SAAS,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,sBAAsB,EAAE,KAAK,EAAE,CAAC;QAC5E,WAAW,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YAChC,SAAS,CAAC,eAAe,GAAG,IAAI,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,IAAA,gBAAM,EAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,GAAG,EAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7G,IAAA,gBAAM,EAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,oBAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtE,IAAA,gBAAM,EAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEpD,MAAM,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;QACvC,IAAA,gBAAM,EAAC,YAAY,CAAC,CAAC,OAAO,CAAC;YAC5B;gBACC,MAAM,EAAE,gDAAyB,CAAC,MAAM;gBACxC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,WAAW;gBAC9B,YAAY,EAAE,CAAC;gBACf,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC;aACpB;SACD,CAAC,CAAC;QACH,IAAA,gBAAM,EAAC,SAAS,CAAC,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,sBAAsB,EAAE,KAAK,EAAE,CAAC,CAAC;QACpF,IAAA,gBAAM,EAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,GAAG,EAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACxF,IAAA,gBAAM,EAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxD,IAAA,gBAAM,EAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvD,IAAA,gBAAM,EAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnD,WAAW,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACpC,SAAS,CAAC,sBAAsB,GAAG,IAAI,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,MAAM,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,IAAA,gBAAM,EAAC,YAAY,CAAC,CAAC,OAAO,CAAC;YAC5B;gBACC,MAAM,EAAE,gDAAyB,CAAC,MAAM;gBACxC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,WAAW;gBAC9B,YAAY,EAAE,CAAC;gBACf,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC;aACpB;YACD;gBACC,MAAM,EAAE,gDAAyB,CAAC,MAAM;gBACxC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,WAAW;gBAC9B,YAAY,EAAE,CAAC;gBACf,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC;aACpB;YACD;gBACC,MAAM,EAAE,gDAAyB,CAAC,MAAM;gBACxC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,WAAW;gBAC9B,YAAY,EAAE,CAAC;gBACf,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;aAC9B;SACD,CAAC,CAAC;QACH,IAAA,gBAAM,EAAC,SAAS,CAAC,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC;QACnF,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE;YAC3B,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,MAAM,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,IAAA,gBAAM,EAAC,YAAY,CAAC,CAAC,OAAO,CAAC;YAC5B;gBACC,MAAM,EAAE,gDAAyB,CAAC,MAAM;gBACxC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,WAAW;gBAC9B,YAAY,EAAE,CAAC;gBACf,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC;aACpB;YACD;gBACC,MAAM,EAAE,gDAAyB,CAAC,MAAM;gBACxC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,WAAW;gBAC9B,YAAY,EAAE,CAAC;gBACf,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC;aACpB;YACD;gBACC,MAAM,EAAE,gDAAyB,CAAC,MAAM;gBACxC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,WAAW;gBAC9B,YAAY,EAAE,CAAC;gBACf,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;aAC9B;YACD;gBACC,MAAM,EAAE,gDAAyB,CAAC,MAAM;gBACxC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,WAAW;gBAC9B,YAAY,EAAE,CAAC;gBACf,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC;aACpB;YACD;gBACC,MAAM,EAAE,gDAAyB,CAAC,MAAM;gBACxC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,WAAW;gBAC9B,YAAY,EAAE,CAAC;gBACf,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;aAC9B;SACD,CAAC,CAAC;QACH,IAAA,gBAAM,EAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrD,CAAC,CAAA,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,IAAA,wCAAoB,GAAE,CAAC;IACxC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QAC7C,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC3D,IAAA,cAAI,EAAC,cAAc,WAAW,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;YAClD,MAAM,WAAW,GAAG,IAAI,WAAW,CAClC;gBACC,WAAW,EAAE,CAAC,OAAkC,EAAE,OAA6B,EAAE,YAAoB,EAAE,EAAE;oBACxG,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;wBAChC,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;oBAC5B,CAAC;oBACD,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;oBACxC,IAAI,OAAO,KAAK,iBAAK,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;wBACvC,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAE,MAAc,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;wBAC9H,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;4BACxB,MAAM,IAAI,KAAK,CAAC,wBAAwB,YAAY,eAAe,CAAC,CAAC;wBACtE,CAAC;wBACD,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,UAAW,CAAC,CAAC,CAAE,EAAE,UAAW,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC;oBACtE,CAAC;oBACD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAC5B,CAAC;aACkC,EACpC,gDAAyB,CAAC,MAAM,CAChC,CAAC;YACF,WAAW,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;oBACnD,
|
|
1
|
+
{"version":3,"file":"BaseSiStation.test.js","sourceRoot":"","sources":["../../src/SiStation/BaseSiStation.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoupledSiStation.d.ts","sourceRoot":"","sources":["../../src/SiStation/CoupledSiStation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,KAAK,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"CoupledSiStation.d.ts","sourceRoot":"","sources":["../../src/SiStation/CoupledSiStation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,KAAK,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAQhD,qBAAa,gBAAiB,SAAQ,aAAa,CAAC,yBAAyB,CAAC,MAAM,CAAE,YAAW,UAAU,CAAC,yBAAyB,CAAC,MAAM,CAAC;IAC5I,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,GAAG,gBAAgB;IAKxF,MAAM,CAAC,uBAAuB,CAAC,WAAW,EAAE,oBAAoB,GAAG,gBAAgB;IAI7E,aAAa,CAAC,OAAO,GAAC,OAAY,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,GAAC,SAAS,CAAE;QAAC,IAAI,EAAE,IAAI,GAAG,SAAS,CAAA;KAAC,EAAE,CAAC;CA0H5H"}
|
|
@@ -48,6 +48,8 @@ const BaseSiStation_1 = require("./BaseSiStation");
|
|
|
48
48
|
const SiTargetMultiplexer_1 = require("./SiTargetMultiplexer");
|
|
49
49
|
const constants_1 = require("../constants");
|
|
50
50
|
const siProtocol = __importStar(require("../siProtocol"));
|
|
51
|
+
const utils = __importStar(require("../utils"));
|
|
52
|
+
const logger = utils.getLogger('CoupledSiStation');
|
|
51
53
|
class CoupledSiStation extends BaseSiStation_1.BaseSiStation {
|
|
52
54
|
static fromSiDevice(siDevice) {
|
|
53
55
|
const multiplexer = SiTargetMultiplexer_1.SiTargetMultiplexer.fromSiDevice(siDevice);
|
|
@@ -58,7 +60,7 @@ class CoupledSiStation extends BaseSiStation_1.BaseSiStation {
|
|
|
58
60
|
}
|
|
59
61
|
getBackupData() {
|
|
60
62
|
return __awaiter(this, arguments, void 0, function* (turnOff = true) {
|
|
61
|
-
|
|
63
|
+
const backupData = [];
|
|
62
64
|
let backupNextWritePointer = 0;
|
|
63
65
|
let hasMemoryOverflow = false;
|
|
64
66
|
// Get backup pointer
|
|
@@ -69,7 +71,7 @@ class CoupledSiStation extends BaseSiStation_1.BaseSiStation {
|
|
|
69
71
|
parameters: [0x1c, 0x07]
|
|
70
72
|
}, 1, 10000).then((d) => {
|
|
71
73
|
backupNextWritePointer = (d[0][3] << 24) | (d[0][4] << 16) | (d[0][8] << 8) | d[0][9];
|
|
72
|
-
}).catch((
|
|
74
|
+
}).catch((_e) => __awaiter(this, void 0, void 0, function* () {
|
|
73
75
|
yield this.sendMessage({
|
|
74
76
|
command: constants_1.proto.WAKEUP,
|
|
75
77
|
parameters: []
|
|
@@ -88,11 +90,11 @@ class CoupledSiStation extends BaseSiStation_1.BaseSiStation {
|
|
|
88
90
|
parameters: [0x3d, 0x01]
|
|
89
91
|
}, 1, 10000).then((d) => {
|
|
90
92
|
hasMemoryOverflow = d[0][0] != 0;
|
|
91
|
-
}).catch((
|
|
93
|
+
}).catch((_e) => __awaiter(this, void 0, void 0, function* () {
|
|
92
94
|
return Promise.reject(new Error("Unable to read if backup is overflowed or not!"));
|
|
93
95
|
}));
|
|
94
96
|
let backupReadLocation = hasMemoryOverflow ? backupNextWritePointer + 1 : 0x0100;
|
|
95
|
-
|
|
97
|
+
const backupMaxLocation = 0x200000;
|
|
96
98
|
let backupStorageSize = 128;
|
|
97
99
|
while (backupReadLocation < backupNextWritePointer && backupReadLocation < backupMaxLocation) {
|
|
98
100
|
try {
|
|
@@ -102,12 +104,12 @@ class CoupledSiStation extends BaseSiStation_1.BaseSiStation {
|
|
|
102
104
|
parameters: [(backupReadLocation >> 16) & 0xff, (backupReadLocation >> 8) & 0xff, backupReadLocation & 0xff, actualReadLength]
|
|
103
105
|
}, 1, 10000)
|
|
104
106
|
.then((d) => {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
+
const cn = (d[0][0] << 8) | d[0][1];
|
|
108
|
+
const addr = (d[0][2] << 16) | (d[0][3] << 8) | d[0][4];
|
|
107
109
|
let p = 5;
|
|
108
110
|
while (p < d[0].length) {
|
|
109
|
-
|
|
110
|
-
|
|
111
|
+
const sicard = siProtocol.arr2cardNumber([d[0][p + 2], d[0][p + 1], d[0][p + 0]]);
|
|
112
|
+
const datedata = [
|
|
111
113
|
d[0][p + 3] >> 2, // Year = bit 7-2
|
|
112
114
|
(((d[0][p + 3] & 0x3) << 2) | ((d[0][p + 4] >> 6) & 0x3)), // Month = bit 1-0 and 7-6
|
|
113
115
|
((d[0][p + 4] >> 1) & 0x1F), // day = bit 5-1
|
|
@@ -116,7 +118,7 @@ class CoupledSiStation extends BaseSiStation_1.BaseSiStation {
|
|
|
116
118
|
d[0][p + 6],
|
|
117
119
|
d[0][p + 7]
|
|
118
120
|
];
|
|
119
|
-
|
|
121
|
+
const date = siProtocol.arr2date(datedata);
|
|
120
122
|
if (addr + p <= backupNextWritePointer || hasMemoryOverflow) {
|
|
121
123
|
backupData.push({ code: cn, cardNumber: sicard, date: date });
|
|
122
124
|
}
|
|
@@ -136,7 +138,7 @@ class CoupledSiStation extends BaseSiStation_1.BaseSiStation {
|
|
|
136
138
|
catch (e) {
|
|
137
139
|
if (backupStorageSize >= 2 * constants_1.proto.REC_LEN) {
|
|
138
140
|
backupStorageSize /= 2;
|
|
139
|
-
|
|
141
|
+
logger.info('Reducing backup block size', { newSize: backupStorageSize });
|
|
140
142
|
}
|
|
141
143
|
else {
|
|
142
144
|
return Promise.reject("Unable to read backup data");
|
|
@@ -157,7 +159,7 @@ class CoupledSiStation extends BaseSiStation_1.BaseSiStation {
|
|
|
157
159
|
parameters: []
|
|
158
160
|
}, 1, 10000).then(() => {
|
|
159
161
|
hasTurnedOff = true;
|
|
160
|
-
}).catch(
|
|
162
|
+
}).catch(_e => {
|
|
161
163
|
hasTurnedOff = false;
|
|
162
164
|
});
|
|
163
165
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoupledSiStation.js","sourceRoot":"","sources":["../../src/SiStation/CoupledSiStation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,iEAA8F;AAC9F,mDAAgD;AAChD,+DAA4D;AAC5D,4CAAqC;AACrC,0DAA4C;
|
|
1
|
+
{"version":3,"file":"CoupledSiStation.js","sourceRoot":"","sources":["../../src/SiStation/CoupledSiStation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,iEAA8F;AAC9F,mDAAgD;AAChD,+DAA4D;AAC5D,4CAAqC;AACrC,0DAA4C;AAC5C,gDAAkC;AAElC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;AAEnD,MAAa,gBAAiB,SAAQ,6BAA+C;IACpF,MAAM,CAAC,YAAY,CAAC,QAAiD;QACpE,MAAM,WAAW,GAAG,yCAAmB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,uBAAuB,CAAC,WAAiC;QAC/D,OAAO,IAAI,CAAC,sCAAsC,CAAC,WAAW,EAAE,gDAAyB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,gDAAyB,CAAC,MAAM,CAAC,CAAqB,CAAC;IACtL,CAAC;IAEK,aAAa;6DAAC,UAAgB,IAAI;YACvC,MAAM,UAAU,GAA6E,EAAE,CAAA;YAC/F,IAAI,sBAAsB,GAAU,CAAC,CAAA;YACrC,IAAI,iBAAiB,GAAY,KAAK,CAAA;YAEtC,qBAAqB;YACrB,KAAI,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAC,EAAE,IAAI,CAAC,sBAAsB,IAAI,CAAC,IAAI,sBAAsB,IAAI,SAAS,CAAC,EAAE,KAAK,EAAE,EAAC,CAAC;gBAC7G,IAAG,CAAC;oBACH,MAAM,IAAI,CAAC,WAAW,CACrB;wBACC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,WAAW;wBAC9B,UAAU,EAAE,CAAC,IAAI,EAAC,IAAI,CAAC;qBACvB,EACD,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;wBACpB,sBAAsB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;oBAChF,CAAC,CAAC,CAAC,KAAK,CAAC,CAAO,EAAE,EAAE,EAAE;wBACrB,MAAM,IAAI,CAAC,WAAW,CACrB;4BACC,OAAO,EAAE,iBAAK,CAAC,MAAM;4BACrB,UAAU,EAAE,EAAE;yBACd,CAAC,CAAA;wBACH,MAAM,IAAI,OAAO,CAAE,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAE,CAAC;oBAC1D,CAAC,CAAA,CAAC,CAAA;gBACJ,CAAC;gBAAA,OAAO,CAAC,EAAC,CAAC,CAAC,oBAAoB;gBAChC,CAAC;YACF,CAAC;YACD,IAAG,sBAAsB,IAAI,CAAC,IAAI,sBAAsB,IAAI,SAAS,EAAC,CAAC;gBACtE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC,CAAA;YACzE,CAAC;YACD,MAAM,IAAI,CAAC,WAAW,CACrB;gBACC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,WAAW;gBAC9B,UAAU,EAAE,CAAC,IAAI,EAAC,IAAI,CAAC;aACvB,EACD,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,iBAAiB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;YACjC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAO,EAAE,EAAE,EAAE;gBACrB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC,CAAA;YACnF,CAAC,CAAA,CAAC,CAAA;YAEH,IAAI,kBAAkB,GAAG,iBAAiB,CAAA,CAAC,CAAA,sBAAsB,GAAC,CAAC,CAAA,CAAC,CAAA,MAAM,CAAA;YAC1E,MAAM,iBAAiB,GAAG,QAAQ,CAAA;YAClC,IAAI,iBAAiB,GAAG,GAAG,CAAA;YAC3B,OAAM,kBAAkB,GAAG,sBAAsB,IAAI,kBAAkB,GAAG,iBAAiB,EAAC,CAAC;gBAC5F,IAAG,CAAC;oBACH,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAC,sBAAsB,GAAC,kBAAkB,CAAC,CAAA;oBAC9F,MAAM,IAAI,CAAC,WAAW,CACrB;wBACC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,UAAU;wBAC7B,UAAU,EAAE,CAAC,CAAC,kBAAkB,IAAE,EAAE,CAAC,GAAC,IAAI,EAAC,CAAC,kBAAkB,IAAE,CAAC,CAAC,GAAC,IAAI,EAAC,kBAAkB,GAAC,IAAI,EAAC,gBAAgB,CAAC;qBACjH,EACD,CAAC,EAAE,KAAK,CAAC;yBACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;wBACX,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;wBAC/B,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAE,EAAE,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;wBAC/C,IAAI,CAAC,GAAG,CAAC,CAAA;wBACT,OAAO,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAC,CAAC;4BACrB,MAAM,MAAM,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC,CAAA;4BACzE,MAAM,QAAQ,GAAG;gCAChB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,IAAE,CAAC,EAAE,kBAAkB;gCAChC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,GAAC,GAAG,CAAC,IAAE,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAC,GAAG,CAAC,CAAC,EAAE,0BAA0B;gCACvE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAC,IAAI,CAAC,EAAE,gBAAgB;gCACvC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,GAAC,GAAG,CAAC,EAAE,wBAAwB;gCACzC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC;gCACT,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC;gCACT,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC;6BACT,CAAA;4BACD,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;4BAC1C,IAAG,IAAI,GAAC,CAAC,IAAE,sBAAsB,IAAE,iBAAiB,EAAC,CAAC;gCACrD,UAAU,CAAC,IAAI,CAAC,EAAC,IAAI,EAAC,EAAE,EAAC,UAAU,EAAC,MAAM,EAAC,IAAI,EAAC,IAAI,EAAC,CAAC,CAAA;4BACvD,CAAC;iCAAI,CAAC;gCACL,MAAK;4BACN,CAAC;4BACD,CAAC,IAAE,iBAAK,CAAC,OAAO,CAAA;wBACjB,CAAC;wBACD,kBAAkB,IAAI,gBAAgB,CAAA;wBAEtC,+BAA+B;wBAC/B,IAAG,iBAAiB,IAAI,kBAAkB,IAAE,iBAAiB,EAAC,CAAC;4BAC9D,iBAAiB,GAAG,KAAK,CAAA;4BACzB,kBAAkB,GAAC,MAAM,CAAA;wBAC1B,CAAC;oBAEF,CAAC,CAAC,CAAA;gBACJ,CAAC;gBAAA,OAAM,CAAC,EAAC,CAAC;oBACT,IAAG,iBAAiB,IAAI,CAAC,GAAC,iBAAK,CAAC,OAAO,EAAC,CAAC;wBACxC,iBAAiB,IAAE,CAAC,CAAA;wBACpB,MAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAC;oBAC3E,CAAC;yBAAI,CAAC;wBACL,OAAO,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAA;oBACpD,CAAC;gBACF,CAAC;YAEF,CAAC;YAED,+BAA+B;YAC/B,MAAM,IAAI,CAAC,WAAW,CACrB;gBACC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,MAAM;gBACzB,UAAU,EAAE,CAAC,GAAG,CAAC;aACjB,CACD,CAAA;YACD,4BAA4B;YAC5B,IAAG,OAAO,EAAC,CAAC;gBACX,MAAM,IAAI,OAAO,CAAE,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAE,CAAC;gBACzD,KAAI,IAAI,KAAK,GAAG,CAAC,EAAE,YAAY,GAAC,KAAK,EAAE,KAAK,GAAC,CAAC,IAAE,CAAC,YAAY,EAAE,KAAK,EAAE,EAAC,CAAC;oBACvE,MAAM,IAAI,CAAC,WAAW,CACrB;wBACC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,GAAG;wBACtB,UAAU,EAAE,EAAE;qBACd,EACA,CAAC,EAAC,KAAK,CACR,CAAC,IAAI,CAAC,GAAE,EAAE;wBACV,YAAY,GAAG,IAAI,CAAA;oBACpB,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAA,EAAE;wBACZ,YAAY,GAAG,KAAK,CAAA;oBACrB,CAAC,CAAC,CAAA;gBACH,CAAC;YACF,CAAC;YAED,OAAO,UAAU,CAAA;QAClB,CAAC;KAAA;CACD;AApID,4CAoIC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiMainStation.d.ts","sourceRoot":"","sources":["../../src/SiStation/SiMainStation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,UAAU,MAAM,eAAe,CAAC;AAG5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,KAAK,mBAAmB,EAAuG,MAAM,kBAAkB,CAAC;AACjK,OAAO,EAAE,KAAK,oBAAoB,EAAmC,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAC/H,OAAO,EAAE,aAAa,EAAE,KAAK,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"SiMainStation.d.ts","sourceRoot":"","sources":["../../src/SiStation/SiMainStation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,UAAU,MAAM,eAAe,CAAC;AAG5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,KAAK,mBAAmB,EAAuG,MAAM,kBAAkB,CAAC;AACjK,OAAO,EAAE,KAAK,oBAAoB,EAAmC,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAC/H,OAAO,EAAE,aAAa,EAAE,KAAK,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAK9E,KAAK,cAAc,GAAG;KACpB,GAAG,IAAI,MAAM,uBAAuB,CAAC,CAAC,EAAE,uBAAuB,CAAC,GAAG,CAAC;CACrE,CAAC;AAEF,KAAK,eAAe,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAG3C,qBAAa,aAAc,SAAQ,aAAa,CAAC,yBAAyB,CAAC,MAAM,CAAE,YAAW,UAAU,CAAC,yBAAyB,CAAC,MAAM,CAAC;IACzI,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,GAAG,aAAa;IAKrF,MAAM,CAAC,uBAAuB,CAAC,WAAW,EAAE,oBAAoB,GAAG,aAAa;IAIzE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAQ;gBAEzB,mBAAmB,EAAE,oBAAoB,EAAE,iBAAiB,GAAE,yBAAyB,CAAC,MAAyC;IAY7I,SAAS,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,EAAE,0BAA0B,GAAE,cAAmB,GAAG,OAAO,CAAC,eAAe,CAAC;IA6C7H,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,GAAG,IAAI;CA0ClD;AAED,MAAM,WAAW,aAAc,SAAQ,KAAK,CAAC,WAAW,CAAC,mBAAmB,CAAC;CAAG"}
|
|
@@ -42,6 +42,8 @@ const ISiMainStation_1 = require("./ISiMainStation");
|
|
|
42
42
|
const ISiTargetMultiplexer_1 = require("./ISiTargetMultiplexer");
|
|
43
43
|
const BaseSiStation_1 = require("./BaseSiStation");
|
|
44
44
|
const SiTargetMultiplexer_1 = require("./SiTargetMultiplexer");
|
|
45
|
+
const logger = utils.getLogger('SiMainStation');
|
|
46
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
|
|
45
47
|
class SiMainStation extends BaseSiStation_1.BaseSiStation {
|
|
46
48
|
static fromSiDevice(siDevice) {
|
|
47
49
|
const multiplexer = SiTargetMultiplexer_1.SiTargetMultiplexer.fromSiDevice(siDevice);
|
|
@@ -57,7 +59,7 @@ class SiMainStation extends BaseSiStation_1.BaseSiStation {
|
|
|
57
59
|
(e) => {
|
|
58
60
|
const message = e.message;
|
|
59
61
|
this.handleMessage(message);
|
|
60
|
-
|
|
62
|
+
logger.debug(`Received message`, { message: message.toString() });
|
|
61
63
|
});
|
|
62
64
|
}
|
|
63
65
|
readCards(onCardInserted, siStationSetupModification = {}) {
|
|
@@ -81,7 +83,7 @@ class SiMainStation extends BaseSiStation_1.BaseSiStation {
|
|
|
81
83
|
return this.atomically(() => {
|
|
82
84
|
siStationSetupKeys.forEach((infoName) => {
|
|
83
85
|
const oldFieldValue = this.getInfo(infoName);
|
|
84
|
-
// @ts-
|
|
86
|
+
// @ts-expect-error - Dynamic assignment to oldState requires bypassing type safety for heterogeneous field types
|
|
85
87
|
oldState[infoName] = oldFieldValue ? oldFieldValue.value : undefined;
|
|
86
88
|
const newValue = siStationSetup[infoName];
|
|
87
89
|
if (newValue !== undefined) {
|
|
@@ -111,7 +113,7 @@ class SiMainStation extends BaseSiStation_1.BaseSiStation {
|
|
|
111
113
|
this.dispatchEvent('siCardRemoved', new ISiMainStation_1.SiMainStationSiCardRemovedEvent(this, this.siCard));
|
|
112
114
|
}
|
|
113
115
|
else {
|
|
114
|
-
|
|
116
|
+
logger.warn(`Card removed without insertion`, { cardNumber: removedCardNumber });
|
|
115
117
|
}
|
|
116
118
|
this.siCard = null;
|
|
117
119
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiMainStation.js","sourceRoot":"","sources":["../../src/SiStation/SiMainStation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,0DAA4C;AAC5C,4CAAqC;AACrC,sCAAuC;AAIvC,qDAAiK;AACjK,iEAA+H;AAC/H,mDAA8E;AAC9E,+DAA4D;
|
|
1
|
+
{"version":3,"file":"SiMainStation.js","sourceRoot":"","sources":["../../src/SiStation/SiMainStation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiSendTask.d.ts","sourceRoot":"","sources":["../../src/SiStation/SiSendTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"SiSendTask.d.ts","sourceRoot":"","sources":["../../src/SiStation/SiSendTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAIhD,qBAAa,UAAU;IAMd,OAAO,EAAE,UAAU,CAAC,SAAS;IAC7B,YAAY,EAAE,MAAM;IACpB,oBAAoB,EAAE,MAAM;IAC5B,SAAS,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI;IACrC,QAAQ,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI;IATrC,KAAK,EAAE,eAAe,CAA0B;IAChD,SAAS,EAAE,MAAM,EAAE,EAAE,CAAM;IAClC,OAAO,CAAC,YAAY,CAAU;gBAGtB,OAAO,EAAE,UAAU,CAAC,SAAS,EAC7B,YAAY,EAAE,MAAM,EACpB,oBAAoB,EAAE,MAAM,EAC5B,SAAS,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,EACrC,QAAQ,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI;IAkB5C,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAOrC,OAAO,IAAI,IAAI;IAMf,IAAI,IAAI,IAAI;CAKZ"}
|
package/SiStation/SiSendTask.js
CHANGED
|
@@ -35,7 +35,9 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.SiSendTask = void 0;
|
|
37
37
|
const siProtocol = __importStar(require("../siProtocol"));
|
|
38
|
+
const utils = __importStar(require("../utils"));
|
|
38
39
|
const ISiSendTask_1 = require("./ISiSendTask");
|
|
40
|
+
const logger = utils.getLogger('SiSendTask');
|
|
39
41
|
class SiSendTask {
|
|
40
42
|
constructor(message, numResponses, timeoutInMiliseconds, onResolve, onReject) {
|
|
41
43
|
this.message = message;
|
|
@@ -56,7 +58,7 @@ class SiSendTask {
|
|
|
56
58
|
if (!shouldAbortInState[this.state]) {
|
|
57
59
|
return;
|
|
58
60
|
}
|
|
59
|
-
|
|
61
|
+
logger.debug('Send task timeout', { message: siProtocol.prettyMessage(this.message), expectedResponses: this.numResponses, actualResponses: this.responses });
|
|
60
62
|
this.fail();
|
|
61
63
|
}, timeoutInMiliseconds);
|
|
62
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiSendTask.js","sourceRoot":"","sources":["../../src/SiStation/SiSendTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,+CAAgD;AAEhD,MAAa,UAAU;IAKtB,YACQ,OAA6B,EAC7B,YAAoB,EACpB,oBAA4B,EAC5B,SAAqC,EACrC,QAAoC;QAJpC,YAAO,GAAP,OAAO,CAAsB;QAC7B,iBAAY,GAAZ,YAAY,CAAQ;QACpB,yBAAoB,GAApB,oBAAoB,CAAQ;QAC5B,cAAS,GAAT,SAAS,CAA4B;QACrC,aAAQ,GAAR,QAAQ,CAA4B;QATrC,UAAK,GAAoB,6BAAe,CAAC,MAAM,CAAC;QAChD,cAAS,GAAe,EAAE,CAAC;QAUjC,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;YACnC,MAAM,kBAAkB,GAA4C;gBACnE,CAAC,6BAAe,CAAC,MAAM,CAAC,EAAE,IAAI;gBAC9B,CAAC,6BAAe,CAAC,OAAO,CAAC,EAAE,IAAI;gBAC/B,CAAC,6BAAe,CAAC,IAAI,CAAC,EAAE,IAAI;gBAC5B,CAAC,6BAAe,CAAC,SAAS,CAAC,EAAE,KAAK;gBAClC,CAAC,6BAAe,CAAC,MAAM,CAAC,EAAE,KAAK;aAC/B,CAAC;YACF,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACrC,OAAO;YACR,CAAC;YACD,
|
|
1
|
+
{"version":3,"file":"SiSendTask.js","sourceRoot":"","sources":["../../src/SiStation/SiSendTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,gDAAkC;AAClC,+CAAgD;AAEhD,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AAE7C,MAAa,UAAU;IAKtB,YACQ,OAA6B,EAC7B,YAAoB,EACpB,oBAA4B,EAC5B,SAAqC,EACrC,QAAoC;QAJpC,YAAO,GAAP,OAAO,CAAsB;QAC7B,iBAAY,GAAZ,YAAY,CAAQ;QACpB,yBAAoB,GAApB,oBAAoB,CAAQ;QAC5B,cAAS,GAAT,SAAS,CAA4B;QACrC,aAAQ,GAAR,QAAQ,CAA4B;QATrC,UAAK,GAAoB,6BAAe,CAAC,MAAM,CAAC;QAChD,cAAS,GAAe,EAAE,CAAC;QAUjC,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;YACnC,MAAM,kBAAkB,GAA4C;gBACnE,CAAC,6BAAe,CAAC,MAAM,CAAC,EAAE,IAAI;gBAC9B,CAAC,6BAAe,CAAC,OAAO,CAAC,EAAE,IAAI;gBAC/B,CAAC,6BAAe,CAAC,IAAI,CAAC,EAAE,IAAI;gBAC5B,CAAC,6BAAe,CAAC,SAAS,CAAC,EAAE,KAAK;gBAClC,CAAC,6BAAe,CAAC,MAAM,CAAC,EAAE,KAAK;aAC/B,CAAC;YACF,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACrC,OAAO;YACR,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YAC9J,IAAI,CAAC,IAAI,EAAE,CAAC;QACb,CAAC,EAAE,oBAAoB,CAAC,CAAC;IAC1B,CAAC;IAED,WAAW,CAAC,QAAkB;QAC7B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YACjD,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC;IACF,CAAC;IAED,OAAO;QACN,IAAI,CAAC,KAAK,GAAG,6BAAe,CAAC,SAAS,CAAC;QACvC,YAAY,CAAC,IAAI,CAAC,YAAkD,CAAC,CAAC;QACtE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,IAAI;QACH,IAAI,CAAC,KAAK,GAAG,6BAAe,CAAC,MAAM,CAAC;QACpC,YAAY,CAAC,IAAI,CAAC,YAAkD,CAAC,CAAC;QACtE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;CACD;AA9CD,gCA8CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiTargetMultiplexer.d.ts","sourceRoot":"","sources":["../../src/SiStation/SiTargetMultiplexer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,UAAU,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EACN,KAAK,6BAA6B,EAClC,KAAK,oBAAoB,EAEzB,KAAK,yBAAyB,EAG9B,yBAAyB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"SiTargetMultiplexer.d.ts","sourceRoot":"","sources":["../../src/SiStation/SiTargetMultiplexer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,UAAU,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EACN,KAAK,6BAA6B,EAClC,KAAK,oBAAoB,EAEzB,KAAK,yBAAyB,EAG9B,yBAAyB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAMhG,4DAA4D;AAC5D,eAAO,MAAM,gCAAgC,EAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAA;CAM1E,CAAC;AASF,qBAAa,mBAAoB,YAAW,oBAAoB;IA0BvD,QAAQ,EAAE,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAzBzD,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,GAAG,oBAAoB;IAgBrF,QAAQ,EAAE;SAAG,MAAM,IAAI,yBAAyB,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC;KAAE,CAAM;IAC9E,MAAM,EAAE,yBAAyB,CAAqC;IAEtE,YAAY,EAAE,yBAAyB,CAAqC;IACnF,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,SAAS,CAAoB;gBAI7B,QAAQ,EAAE,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAGzD,IAAI,KAAK,IAAI,6BAA6B,CAKzC;IAED,uBAAuB,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAatD,wBAAwB,IAAI,IAAI;IAIhC,wBAAwB,IAAI,IAAI;IAMhC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;IAgBxC,kCAAkC,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,GAAG,IAAI;IAuCjE,WAAW,CAAC,MAAM,EAAE,yBAAyB,EAAE,OAAO,EAAE,UAAU,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAMxJ,SAAS,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCjE,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,EAAE,YAAY,SAAI,EAAE,oBAAoB,SAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IA4B7H,iBAAiB,IAAI,IAAI;CA0BzB;AAED,MAAM,WAAW,mBAAoB,SAAQ,KAAK,CAAC,WAAW,CAAC,yBAAyB,CAAC;CAAG"}
|
|
@@ -50,6 +50,7 @@ const ISiTargetMultiplexer_1 = require("./ISiTargetMultiplexer");
|
|
|
50
50
|
const ISiDevice_1 = require("../SiDevice/ISiDevice");
|
|
51
51
|
const ISiSendTask_1 = require("./ISiSendTask");
|
|
52
52
|
const SiSendTask_1 = require("./SiSendTask");
|
|
53
|
+
const logger = utils.getLogger('SiTargetMultiplexer');
|
|
53
54
|
/** Commands that can only be sent from a direct station. */
|
|
54
55
|
exports.DIRECT_DEVICE_INITIATED_COMMANDS = {
|
|
55
56
|
[constants_1.proto.cmd.TRANS_REC]: true,
|
|
@@ -60,6 +61,7 @@ exports.DIRECT_DEVICE_INITIATED_COMMANDS = {
|
|
|
60
61
|
};
|
|
61
62
|
/** Commands that are sent from a station without prior request. */
|
|
62
63
|
const DEVICE_INITIATED_COMMANDS = Object.assign(Object.assign({}, exports.DIRECT_DEVICE_INITIATED_COMMANDS), { [constants_1.proto.cmd.SRR_PING]: true });
|
|
64
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
|
|
63
65
|
class SiTargetMultiplexer {
|
|
64
66
|
static fromSiDevice(siDevice) {
|
|
65
67
|
if (siDevice.siTargetMultiplexer) {
|
|
@@ -130,7 +132,7 @@ class SiTargetMultiplexer {
|
|
|
130
132
|
}
|
|
131
133
|
updateSendQueueWithReceivedMessage(message) {
|
|
132
134
|
if (message.mode === undefined && exports.DIRECT_DEVICE_INITIATED_COMMANDS[message.command]) {
|
|
133
|
-
|
|
135
|
+
logger.debug('Direct device-initiated command received', { assumedTarget: 'Direct' });
|
|
134
136
|
this.target = ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Direct;
|
|
135
137
|
this.latestTarget = ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Direct;
|
|
136
138
|
}
|
|
@@ -160,7 +162,7 @@ class SiTargetMultiplexer {
|
|
|
160
162
|
}
|
|
161
163
|
if (message.command !== expectedMessage.command) {
|
|
162
164
|
if (DEVICE_INITIATED_COMMANDS[message.command] !== true) {
|
|
163
|
-
|
|
165
|
+
logger.warn('Unexpected response command', { expected: utils.prettyHex([expectedMessage.command]), actual: utils.prettyHex([message.command]) });
|
|
164
166
|
}
|
|
165
167
|
return;
|
|
166
168
|
}
|
|
@@ -226,10 +228,14 @@ class SiTargetMultiplexer {
|
|
|
226
228
|
});
|
|
227
229
|
}
|
|
228
230
|
_processSendQueue() {
|
|
229
|
-
if (this.sendQueue.length === 0 || this.
|
|
231
|
+
if (this.sendQueue.length === 0 || this.siDevice.state !== ISiDevice_1.SiDeviceState.Opened) {
|
|
230
232
|
return;
|
|
231
233
|
}
|
|
232
234
|
const sendTask = this.sendQueue[0];
|
|
235
|
+
// Atomic check-and-set: only proceed if task is in Queued state
|
|
236
|
+
if (sendTask.state !== ISiSendTask_1.SiSendTaskState.Queued) {
|
|
237
|
+
return;
|
|
238
|
+
}
|
|
233
239
|
sendTask.state = ISiSendTask_1.SiSendTaskState.Sending;
|
|
234
240
|
const uint8Data = [constants_1.proto.WAKEUP, ...siProtocol.render(sendTask.message)];
|
|
235
241
|
this.siDevice
|
|
@@ -241,7 +247,7 @@ class SiTargetMultiplexer {
|
|
|
241
247
|
}
|
|
242
248
|
})
|
|
243
249
|
.catch((err) => {
|
|
244
|
-
|
|
250
|
+
logger.warn('Send error', { error: String(err) });
|
|
245
251
|
sendTask.fail();
|
|
246
252
|
});
|
|
247
253
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiTargetMultiplexer.js","sourceRoot":"","sources":["../../src/SiStation/SiTargetMultiplexer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SiTargetMultiplexer.js","sourceRoot":"","sources":["../../src/SiStation/SiTargetMultiplexer.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,38 +70,32 @@ function mockDriver(driver) {
|
|
|
70
70
|
resendingFinished: false,
|
|
71
71
|
remoteSendingFinished: false
|
|
72
72
|
};
|
|
73
|
-
muxer.sendMessage(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Direct, randomMessage, 0,
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
parameters: [0x00, 0x00, constants_1.proto.P_MS_DIRECT]
|
|
82
|
-
})));
|
|
83
|
-
}, 1);
|
|
73
|
+
const firstSendPromise = muxer.sendMessage(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Direct, randomMessage, 0, 100);
|
|
74
|
+
// Allow the scheduled SET_MS command to be processed
|
|
75
|
+
yield testUtils.advanceTimersByTime(1);
|
|
76
|
+
// Now provide the SET_MS response
|
|
77
|
+
siDevice.dispatchEvent('receive', new ISiDevice_1.SiDeviceReceiveEvent(siDevice, siProtocol.render({
|
|
78
|
+
command: constants_1.proto.cmd.SET_MS,
|
|
79
|
+
parameters: [0x00, 0x00, constants_1.proto.P_MS_DIRECT]
|
|
80
|
+
})));
|
|
84
81
|
(0, globals_1.expect)(muxer.target).toBe(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Unknown);
|
|
85
82
|
(0, globals_1.expect)(muxer._test.latestTarget).toBe(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Direct);
|
|
86
|
-
|
|
87
|
-
yield testUtils.advanceTimersByTime(1);
|
|
88
|
-
yield testUtils.nTimesAsync(10, () => testUtils.advanceTimersByTime(1));
|
|
83
|
+
// Allow the SET_MS response to be processed and next queue item
|
|
84
|
+
yield testUtils.advanceTimersByTime(1);
|
|
89
85
|
(0, globals_1.expect)(muxer.target).toBe(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Direct);
|
|
90
86
|
(0, globals_1.expect)(muxer._test.latestTarget).toBe(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Direct);
|
|
91
|
-
|
|
92
|
-
yield
|
|
93
|
-
(0, globals_1.expect)(
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
yield testUtils.advanceTimersByTime(0);
|
|
104
|
-
yield testUtils.advanceTimersByTime(0);
|
|
87
|
+
// Wait for the first sendMessage to complete
|
|
88
|
+
const firstResponses = yield firstSendPromise;
|
|
89
|
+
(0, globals_1.expect)(firstResponses.length).toBe(0);
|
|
90
|
+
(0, globals_1.expect)(muxer._test.sendQueue.length).toBe(0);
|
|
91
|
+
timeState.sendingFinished = true;
|
|
92
|
+
const secondSendPromise = muxer.sendMessage(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Direct, randomMessage, 0, 100);
|
|
93
|
+
yield testUtils.advanceTimersByTime(1);
|
|
94
|
+
// Wait for the second sendMessage to complete
|
|
95
|
+
const secondResponses = yield secondSendPromise;
|
|
96
|
+
(0, globals_1.expect)(secondResponses.length).toBe(0);
|
|
97
|
+
(0, globals_1.expect)(muxer._test.sendQueue.length).toBe(0);
|
|
98
|
+
timeState.resendingFinished = true;
|
|
105
99
|
(0, globals_1.expect)(muxer.target).toBe(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Direct);
|
|
106
100
|
(0, globals_1.expect)(muxer._test.latestTarget).toBe(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Direct);
|
|
107
101
|
(0, globals_1.expect)(timeState).toEqual({
|
|
@@ -109,25 +103,25 @@ function mockDriver(driver) {
|
|
|
109
103
|
resendingFinished: true,
|
|
110
104
|
remoteSendingFinished: false
|
|
111
105
|
});
|
|
112
|
-
muxer.sendMessage(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Remote, randomMessage, 0,
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
parameters: [0x00, 0x00, constants_1.proto.P_MS_REMOTE]
|
|
121
|
-
})));
|
|
122
|
-
}, 1);
|
|
106
|
+
const thirdSendPromise = muxer.sendMessage(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Remote, randomMessage, 0, 100);
|
|
107
|
+
// Allow the scheduled SET_MS command for Remote target to be processed
|
|
108
|
+
yield testUtils.advanceTimersByTime(1);
|
|
109
|
+
// Now provide the SET_MS response for Remote
|
|
110
|
+
siDevice.dispatchEvent('receive', new ISiDevice_1.SiDeviceReceiveEvent(siDevice, siProtocol.render({
|
|
111
|
+
command: constants_1.proto.cmd.SET_MS,
|
|
112
|
+
parameters: [0x00, 0x00, constants_1.proto.P_MS_REMOTE]
|
|
113
|
+
})));
|
|
123
114
|
(0, globals_1.expect)(muxer.target).toBe(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Direct);
|
|
124
115
|
(0, globals_1.expect)(muxer._test.latestTarget).toBe(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Remote);
|
|
125
|
-
|
|
126
|
-
yield testUtils.advanceTimersByTime(1);
|
|
116
|
+
// Allow the SET_MS response to be processed and next queue item
|
|
117
|
+
yield testUtils.advanceTimersByTime(1);
|
|
127
118
|
(0, globals_1.expect)(muxer.target).toBe(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Remote);
|
|
128
119
|
(0, globals_1.expect)(muxer._test.latestTarget).toBe(ISiTargetMultiplexer_1.SiTargetMultiplexerTarget.Remote);
|
|
129
|
-
|
|
130
|
-
yield
|
|
120
|
+
// Wait for the third sendMessage to complete
|
|
121
|
+
const thirdResponses = yield thirdSendPromise;
|
|
122
|
+
(0, globals_1.expect)(thirdResponses.length).toBe(0);
|
|
123
|
+
(0, globals_1.expect)(muxer._test.sendQueue.length).toBe(0);
|
|
124
|
+
timeState.remoteSendingFinished = true;
|
|
131
125
|
(0, globals_1.expect)(timeState).toEqual({
|
|
132
126
|
sendingFinished: true,
|
|
133
127
|
resendingFinished: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiTargetMultiplexer.targeting.test.js","sourceRoot":"","sources":["../../src/SiStation/SiTargetMultiplexer.targeting.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAuD;AACvD,4CAAqC;AACrC,0DAA4C;AAC5C,wDAA0C;AAC1C,mDAAgD;AAChD,qDAAsG;AAEtG,iEAAmE;AACnE,+DAA4D;AAE5D,SAAS,CAAC,aAAa,EAAE,CAAC;AAE1B,SAAS,UAAU,CAAC,MAA8D;IACjF,OAAO,MAAkE,CAAC;AAC3E,CAAC;AAED,IAAA,kBAAQ,EAAC,qBAAqB,EAAE,GAAG,EAAE;IACpC,IAAA,cAAI,EAAC,mBAAmB,EAAE,GAAS,EAAE;QACpC,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,mBAAmB,EAAE;YAClD,MAAM,EAAE,UAAU,CAAC;gBAClB,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;aAC7B,CAAC;SACF,CAAC,CAAC;QACH,QAAQ,CAAC,QAAQ,CAAC,yBAAa,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,yCAAmB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAA,gBAAM,EAAC,KAAK,YAAY,yCAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExD,MAAM,aAAa,GAAG,SAAS,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG;YACjB,eAAe,EAAE,KAAK;YACtB,iBAAiB,EAAE,KAAK;YACxB,qBAAqB,EAAE,KAAK;SAC5B,CAAC;QACF,KAAK,CAAC,WAAW,CAAC,gDAAyB,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"SiTargetMultiplexer.targeting.test.js","sourceRoot":"","sources":["../../src/SiStation/SiTargetMultiplexer.targeting.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FakeSiDeviceDriver.d.ts","sourceRoot":"","sources":["../../src/fakes/FakeSiDeviceDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAElC,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5E,OAAO,KAAK,EAAE,eAAe,EAAE,gCAAgC,EAAE,4BAA4B,EAAE,qCAAqC,EAAE,MAAM,6BAA6B,CAAC;AAC1K,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,UAAU,UAAU;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;CAClB;AAID,MAAM,WAAW,sBAAuB,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IACtF,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EAAE,UAAU,CAAC;CACnB;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,CAAC,sBAAsB,CAAC,CAAC;AAC9D,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC,sBAAsB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"FakeSiDeviceDriver.d.ts","sourceRoot":"","sources":["../../src/fakes/FakeSiDeviceDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAElC,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5E,OAAO,KAAK,EAAE,eAAe,EAAE,gCAAgC,EAAE,4BAA4B,EAAE,qCAAqC,EAAE,MAAM,6BAA6B,CAAC;AAC1K,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,UAAU,UAAU;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;CAClB;AAID,MAAM,WAAW,sBAAuB,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IACtF,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EAAE,UAAU,CAAC;CACnB;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,CAAC,sBAAsB,CAAC,CAAC;AAC9D,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC,sBAAsB,CAAC,CAAC;AAG5D,cAAM,kBAAmB,YAAW,eAAe,CAAC,sBAAsB,CAAC,EAAE,4BAA4B,CAAC,sBAAsB,EAAE,EAAE,CAAC,EAAE,gCAAgC,CAAC,sBAAsB,CAAC;IACvL,IAAI,SAAU;IAErB,OAAO,CAAC,eAAe,CAAyC;IAEhE,OAAO,CAAC,qBAAqB,CAAyC;IAEtE,OAAO,CAAC,oBAAoB,CAAS;IAE9B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAQ;IACxC,sBAAsB,EAAE,MAAM,EAAE,CAAM;IAE7C,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC;IAU/B,WAAW,CAAC,UAAU,EAAE,UAAU,GAAG,YAAY;IAc3C,cAAc,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAUpD,sBAAsB,IAAI,OAAO;IAIxC,kBAAkB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAK9C,sBAAsB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAIjD,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAI9D,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IAUpD,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQnD,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnE,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKrC,IAAI,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1C,KAAK,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAK9C,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IASjD,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAGpE;AAED,UAAU,kBAAmB,SAAQ,KAAK,CAAC,WAAW,CAAC,qCAAqC,CAAC,sBAAsB,CAAC,CAAC;CAAG;AAGxH,eAAO,MAAM,qBAAqB,QAAO,kBAA8C,CAAC"}
|
|
@@ -48,6 +48,7 @@ const ISiDevice_1 = require("../SiDevice/ISiDevice");
|
|
|
48
48
|
const ISiDeviceDriver_1 = require("../SiDevice/ISiDeviceDriver");
|
|
49
49
|
const SiDevice_1 = require("../SiDevice/SiDevice");
|
|
50
50
|
const getIdent = (fakeDevice) => fakeDevice.ident;
|
|
51
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
|
|
51
52
|
class FakeSiDeviceDriver {
|
|
52
53
|
constructor() {
|
|
53
54
|
this.name = 'Fake';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FakeSiDeviceDriver.js","sourceRoot":"","sources":["../../src/fakes/FakeSiDeviceDriver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,qDAAyE;AAGzE,iEAAoF;AAEpF,mDAAgD;AAOhD,MAAM,QAAQ,GAAG,CAAC,UAAsB,EAAU,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC;AAUtE,MAAM,kBAAkB;IAAxB;QACQ,SAAI,GAAG,MAAM,CAAC;QAEb,oBAAe,GAAsC,EAAE,CAAC;QAExD,0BAAqB,GAAsC,EAAE,CAAC;QAE9D,yBAAoB,GAAG,KAAK,CAAC;QAE9B,sBAAiB,GAAkB,IAAI,CAAC;QACxC,2BAAsB,GAAa,EAAE,CAAC;IA6G9C,CAAC;IA3GA,MAAM;QACL,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC7B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAC;QACzE,CAAC;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;YAC9B,KAAK,EAAE,IAAI,CAAC,iBAAiB;YAC7B,QAAQ,EAAE,KAAK;SACf,CAAC,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,UAAsB;QACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;YAC/C,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,eAAe,GAA2B;YAC/C,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,UAAU;SAClB,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,mBAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QACzD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC;QAC1C,OAAO,WAAW,CAAC;IACpB,CAAC;IAEK,cAAc,CAAC,QAAsB;;YAC1C,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACnC,IAAI,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;gBACrD,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,qCAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACvE,CAAC;YACD,OAAO,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;KAAA;IAEM,sBAAsB;QAC5B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;IAED,kBAAkB;QACjB,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACjC,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC;IACtC,CAAC;IAED,sBAAsB;QACrB,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC9D,CAAC;IAED,mBAAmB,CAAC,MAAgB;QACnC,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAChG,CAAC;IAED,kBAAkB,CAAC,UAAsB;QACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;YACrD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;QAC7C,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAEY,qBAAqB,CAAC,KAAa;;YAC/C,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC9C,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YAC/E,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,kCAAgB,CAAC,YAAY,CAAC,CAAC,CAAC;QACrE,CAAC;KAAA;IAEY,wBAAwB,CAAC,KAAa;;YAClD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC9C,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAC7C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACnC,CAAC;YACD,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC;KAAA;IAED,iBAAiB;QAChB,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;QAClC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,CAAC,MAAqB;QACzB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;QACnC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,MAAqB;QAC1B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC;QACpC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAED,OAAO,CAAC,MAAqB;QAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QACtC,IAAI,UAAU,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAClC,MAAM,CAAC,QAAQ,CAAC,yBAAa,CAAC,MAAM,CAAC,CAAC;YACtC,MAAM,IAAI,6BAAiB,EAAE,CAAC;QAC/B,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,CAAC,OAAsB,EAAE,UAAoB;QAChD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;CACD;AAGD,KAAK,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;AAEpD,MAAM,qBAAqB,GAAG,GAAuB,EAAE,CAAC,IAAI,kBAAkB,EAAE,CAAC;AAA3E,QAAA,qBAAqB,yBAAsD"}
|
|
1
|
+
{"version":3,"file":"FakeSiDeviceDriver.js","sourceRoot":"","sources":["../../src/fakes/FakeSiDeviceDriver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,qDAAyE;AAGzE,iEAAoF;AAEpF,mDAAgD;AAOhD,MAAM,QAAQ,GAAG,CAAC,UAAsB,EAAU,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC;AAUtE,4EAA4E;AAC5E,MAAM,kBAAkB;IAAxB;QACQ,SAAI,GAAG,MAAM,CAAC;QAEb,oBAAe,GAAsC,EAAE,CAAC;QAExD,0BAAqB,GAAsC,EAAE,CAAC;QAE9D,yBAAoB,GAAG,KAAK,CAAC;QAE9B,sBAAiB,GAAkB,IAAI,CAAC;QACxC,2BAAsB,GAAa,EAAE,CAAC;IA6G9C,CAAC;IA3GA,MAAM;QACL,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC7B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAC;QACzE,CAAC;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;YAC9B,KAAK,EAAE,IAAI,CAAC,iBAAiB;YAC7B,QAAQ,EAAE,KAAK;SACf,CAAC,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,UAAsB;QACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;YAC/C,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,eAAe,GAA2B;YAC/C,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,UAAU;SAClB,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,mBAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QACzD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC;QAC1C,OAAO,WAAW,CAAC;IACpB,CAAC;IAEK,cAAc,CAAC,QAAsB;;YAC1C,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACnC,IAAI,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;gBACrD,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,qCAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACvE,CAAC;YACD,OAAO,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;KAAA;IAEM,sBAAsB;QAC5B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;IAED,kBAAkB;QACjB,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACjC,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC;IACtC,CAAC;IAED,sBAAsB;QACrB,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC9D,CAAC;IAED,mBAAmB,CAAC,MAAgB;QACnC,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAChG,CAAC;IAED,kBAAkB,CAAC,UAAsB;QACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;YACrD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;QAC7C,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAEY,qBAAqB,CAAC,KAAa;;YAC/C,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC9C,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YAC/E,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,kCAAgB,CAAC,YAAY,CAAC,CAAC,CAAC;QACrE,CAAC;KAAA;IAEY,wBAAwB,CAAC,KAAa;;YAClD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC9C,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAC7C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACnC,CAAC;YACD,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC;KAAA;IAED,iBAAiB;QAChB,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;QAClC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,CAAC,MAAqB;QACzB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;QACnC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,MAAqB;QAC1B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC;QACpC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IAED,OAAO,CAAC,MAAqB;QAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QACtC,IAAI,UAAU,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAClC,MAAM,CAAC,QAAQ,CAAC,yBAAa,CAAC,MAAM,CAAC,CAAC;YACtC,MAAM,IAAI,6BAAiB,EAAE,CAAC;QAC/B,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,CAAC,OAAsB,EAAE,UAAoB;QAChD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;CACD;AAGD,KAAK,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;AAEpD,MAAM,qBAAqB,GAAG,GAAuB,EAAE,CAAC,IAAI,kBAAkB,EAAE,CAAC;AAA3E,QAAA,qBAAqB,yBAAsD"}
|
|
@@ -9,6 +9,7 @@ export declare class FakeSiMainStation {
|
|
|
9
9
|
isMaster: boolean;
|
|
10
10
|
dateOffset: number;
|
|
11
11
|
fakeSiCard?: IFakeSiCard;
|
|
12
|
+
private logger;
|
|
12
13
|
constructor(storageArg: (number | undefined)[] | undefined);
|
|
13
14
|
dispatchCardMessage(cardMessage: siProtocol.SiMessage): void;
|
|
14
15
|
dispatchMessage(message: siProtocol.SiMessage): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FakeSiMainStation.d.ts","sourceRoot":"","sources":["../../src/fakes/FakeSiMainStation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"FakeSiMainStation.d.ts","sourceRoot":"","sources":["../../src/fakes/FakeSiMainStation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAElC,OAAO,KAAK,KAAK,OAAO,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,UAAU,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,KAAK,uBAAuB,EAA8B,MAAM,4BAA4B,CAAC;AACtG,OAAO,EAAE,KAAK,uBAAuB,EAAiC,MAAM,sBAAsB,CAAC;AACnG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAG5D,qBAAa,iBAAiB;IACtB,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;IACrD,QAAQ,UAAQ;IAChB,UAAU,SAAK;IACf,UAAU,CAAC,EAAE,WAAW,CAAC;IAChC,OAAO,CAAC,MAAM,CAAkC;gBAEpC,UAAU,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS;IAI1D,mBAAmB,CAAC,WAAW,EAAE,UAAU,CAAC,SAAS,GAAG,IAAI;IAW5D,eAAe,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,GAAG,IAAI;IAIpD,OAAO,IAAI,MAAM,EAAE;IAInB,WAAW,IAAI,IAAI;IAInB,UAAU,CAAC,UAAU,EAAE,WAAW,GAAG,IAAI;IAMzC,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,GAAG,IAAI;CAmEhD;AAED,MAAM,WAAW,iBAAkB,SAAQ,KAAK,CAAC,WAAW,CAAC,uBAAuB,CAAC;CAAG"}
|
|
@@ -36,13 +36,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
exports.FakeSiMainStation = void 0;
|
|
37
37
|
const constants_1 = require("../constants");
|
|
38
38
|
const utils = __importStar(require("../utils"));
|
|
39
|
+
const logging_1 = require("../utils/logging");
|
|
39
40
|
const siProtocol = __importStar(require("../siProtocol"));
|
|
40
41
|
const BaseSiStation_1 = require("../SiStation/BaseSiStation");
|
|
41
42
|
const IFakeSiMainStation_1 = require("./IFakeSiMainStation");
|
|
43
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
|
|
42
44
|
class FakeSiMainStation {
|
|
43
45
|
constructor(storageArg) {
|
|
44
46
|
this.isMaster = true;
|
|
45
47
|
this.dateOffset = 0;
|
|
48
|
+
this.logger = (0, logging_1.getLogger)('FakeSiMainStation');
|
|
46
49
|
this.storage = (0, BaseSiStation_1.siStationStorageDefinition)(storageArg);
|
|
47
50
|
}
|
|
48
51
|
dispatchCardMessage(cardMessage) {
|
|
@@ -101,7 +104,7 @@ class FakeSiMainStation {
|
|
|
101
104
|
}
|
|
102
105
|
else if (message.command === constants_1.proto.cmd.SET_TIME) {
|
|
103
106
|
const newTime = siProtocol.arr2date(message.parameters.slice(0, 7));
|
|
104
|
-
|
|
107
|
+
this.logger.debug('Setting time:', newTime); // TODO: Use new time to set dateOffset
|
|
105
108
|
this.dispatchMessage({
|
|
106
109
|
command: constants_1.proto.cmd.SET_TIME,
|
|
107
110
|
parameters: [...this.getCode(), ...siProtocol.date2arr(this.getDateTime())]
|