sportident.js 1.1.0 → 1.3.0
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/LICENSE +1 -1
- package/SiCard/BaseSiCard.js +8 -45
- package/SiCard/BaseSiCard.js.map +1 -1
- package/SiCard/BaseSiCard.test.js +64 -66
- package/SiCard/BaseSiCard.test.js.map +1 -1
- package/SiCard/IRaceResultData.js +1 -2
- package/SiCard/ISiCard.js +1 -2
- package/SiCard/ISiCardExamples.js +1 -2
- package/SiCard/index.js +2 -20
- package/SiCard/index.js.map +1 -1
- package/SiCard/raceResultTools.js +10 -52
- package/SiCard/raceResultTools.js.map +1 -1
- package/SiCard/raceResultTools.test.js +49 -51
- package/SiCard/raceResultTools.test.js.map +1 -1
- package/SiCard/types/FCard.js +4 -41
- package/SiCard/types/FCard.js.map +1 -1
- package/SiCard/types/FCard.test.js +11 -13
- package/SiCard/types/FCard.test.js.map +1 -1
- package/SiCard/types/ModernSiCard.js +25 -67
- package/SiCard/types/ModernSiCard.js.map +1 -1
- package/SiCard/types/ModernSiCard.test.js +69 -104
- package/SiCard/types/ModernSiCard.test.js.map +1 -1
- package/SiCard/types/PCard.js +4 -41
- package/SiCard/types/PCard.js.map +1 -1
- package/SiCard/types/PCard.test.js +11 -13
- package/SiCard/types/PCard.test.js.map +1 -1
- package/SiCard/types/SIAC.js +4 -8
- package/SiCard/types/SIAC.js.map +1 -1
- package/SiCard/types/SIAC.test.js +38 -73
- package/SiCard/types/SIAC.test.js.map +1 -1
- package/SiCard/types/SiCard10.js +4 -8
- package/SiCard/types/SiCard10.js.map +1 -1
- package/SiCard/types/SiCard10.test.js +41 -76
- package/SiCard/types/SiCard10.test.js.map +1 -1
- package/SiCard/types/SiCard11.js +4 -8
- package/SiCard/types/SiCard11.js.map +1 -1
- package/SiCard/types/SiCard11.test.js +38 -73
- package/SiCard/types/SiCard11.test.js.map +1 -1
- package/SiCard/types/SiCard5.js +16 -55
- package/SiCard/types/SiCard5.js.map +1 -1
- package/SiCard/types/SiCard5.test.js +81 -116
- package/SiCard/types/SiCard5.test.js.map +1 -1
- package/SiCard/types/SiCard6.js +17 -56
- package/SiCard/types/SiCard6.js.map +1 -1
- package/SiCard/types/SiCard6.test.js +79 -114
- package/SiCard/types/SiCard6.test.js.map +1 -1
- package/SiCard/types/SiCard8.js +16 -54
- package/SiCard/types/SiCard8.js.map +1 -1
- package/SiCard/types/SiCard8.test.js +69 -104
- package/SiCard/types/SiCard8.test.js.map +1 -1
- package/SiCard/types/SiCard9.js +15 -53
- package/SiCard/types/SiCard9.js.map +1 -1
- package/SiCard/types/SiCard9.test.js +65 -100
- package/SiCard/types/SiCard9.test.js.map +1 -1
- package/SiCard/types/TCard.js +4 -41
- package/SiCard/types/TCard.js.map +1 -1
- package/SiCard/types/TCard.test.js +11 -13
- package/SiCard/types/TCard.test.js.map +1 -1
- package/SiCard/types/index.js +15 -33
- package/SiCard/types/index.js.map +1 -1
- package/SiCard/types/index.test.js +13 -48
- package/SiCard/types/index.test.js.map +1 -1
- package/SiCard/types/modernSiCardExamples.js +21 -58
- package/SiCard/types/modernSiCardExamples.js.map +1 -1
- package/SiCard/types/siCard5Examples.js +6 -43
- package/SiCard/types/siCard5Examples.js.map +1 -1
- package/SiCard/types/siCard6Examples.js +10 -47
- package/SiCard/types/siCard6Examples.js.map +1 -1
- package/SiCard/types/siCard8Examples.js +8 -45
- package/SiCard/types/siCard8Examples.js.map +1 -1
- package/SiCard/types/siCard9Examples.js +8 -45
- package/SiCard/types/siCard9Examples.js.map +1 -1
- package/SiDevice/ISiDevice.js +6 -45
- package/SiDevice/ISiDevice.js.map +1 -1
- package/SiDevice/ISiDeviceDriver.js +3 -41
- package/SiDevice/ISiDeviceDriver.js.map +1 -1
- package/SiDevice/SiDevice.js +20 -57
- package/SiDevice/SiDevice.js.map +1 -1
- package/SiDevice/SiDevice.test.js +103 -138
- package/SiDevice/SiDevice.test.js.map +1 -1
- package/SiDevice/WebSerialSiDeviceDriver.d.ts +8 -7
- package/SiDevice/WebSerialSiDeviceDriver.d.ts.map +1 -1
- package/SiDevice/WebSerialSiDeviceDriver.js +117 -77
- package/SiDevice/WebSerialSiDeviceDriver.js.map +1 -1
- package/SiDevice/WebUsbSiDeviceDriver.d.ts +5 -6
- package/SiDevice/WebUsbSiDeviceDriver.d.ts.map +1 -1
- package/SiDevice/WebUsbSiDeviceDriver.js +36 -89
- package/SiDevice/WebUsbSiDeviceDriver.js.map +1 -1
- package/SiDevice/index.js +1 -5
- package/SiDevice/index.js.map +1 -1
- package/SiDevice/testUtils/index.js +2 -7
- package/SiDevice/testUtils/index.js.map +1 -1
- package/SiDevice/testUtils/testISiDeviceDriver.js +10 -47
- package/SiDevice/testUtils/testISiDeviceDriver.js.map +1 -1
- package/SiDevice/testUtils/testISiDeviceDriverWithAutodetection.js +15 -52
- package/SiDevice/testUtils/testISiDeviceDriverWithAutodetection.js.map +1 -1
- package/SiStation/BaseSiStation.js +18 -55
- package/SiStation/BaseSiStation.js.map +1 -1
- package/SiStation/BaseSiStation.test.js +60 -95
- package/SiStation/BaseSiStation.test.js.map +1 -1
- package/SiStation/CoupledSiStation.js +16 -53
- package/SiStation/CoupledSiStation.js.map +1 -1
- package/SiStation/CoupledSiStation.test.js +27 -62
- package/SiStation/CoupledSiStation.test.js.map +1 -1
- package/SiStation/ISiMainStation.js +4 -43
- package/SiStation/ISiMainStation.js.map +1 -1
- package/SiStation/ISiSendTask.js +2 -5
- package/SiStation/ISiSendTask.js.map +1 -1
- package/SiStation/ISiStation.js +5 -8
- package/SiStation/ISiStation.js.map +1 -1
- package/SiStation/ISiTargetMultiplexer.js +6 -45
- package/SiStation/ISiTargetMultiplexer.js.map +1 -1
- package/SiStation/SiMainStation.js +19 -56
- package/SiStation/SiMainStation.js.map +1 -1
- package/SiStation/SiMainStation.test.js +88 -123
- package/SiStation/SiMainStation.test.js.map +1 -1
- package/SiStation/SiSendTask.js +11 -48
- package/SiStation/SiSendTask.js.map +1 -1
- package/SiStation/SiTargetMultiplexer.js +46 -83
- package/SiStation/SiTargetMultiplexer.js.map +1 -1
- package/SiStation/SiTargetMultiplexer.targeting.test.js +42 -77
- package/SiStation/SiTargetMultiplexer.targeting.test.js.map +1 -1
- package/SiStation/SiTargetMultiplexer.test.js +201 -236
- package/SiStation/SiTargetMultiplexer.test.js.map +1 -1
- package/SiStation/index.js +5 -13
- package/SiStation/index.js.map +1 -1
- package/SiStation/siStationExamples.js +6 -43
- package/SiStation/siStationExamples.js.map +1 -1
- package/constants.js +4 -7
- package/constants.js.map +1 -1
- package/constants.test.js +12 -47
- package/constants.test.js.map +1 -1
- package/fakes/FakeSiCard/BaseFakeSiCard.js +1 -5
- package/fakes/FakeSiCard/BaseFakeSiCard.js.map +1 -1
- package/fakes/FakeSiCard/BaseFakeSiCard.test.js +6 -41
- package/fakes/FakeSiCard/BaseFakeSiCard.test.js.map +1 -1
- package/fakes/FakeSiCard/IFakeSiCard.js +1 -2
- package/fakes/FakeSiCard/index.js +2 -20
- package/fakes/FakeSiCard/index.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeModernSiCard.js +12 -49
- package/fakes/FakeSiCard/types/FakeModernSiCard.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeModernSiCard.test.js +25 -60
- package/fakes/FakeSiCard/types/FakeModernSiCard.test.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSIAC.js +8 -12
- package/fakes/FakeSiCard/types/FakeSIAC.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard10.js +8 -12
- package/fakes/FakeSiCard/types/FakeSiCard10.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard11.js +8 -12
- package/fakes/FakeSiCard/types/FakeSiCard11.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard5.js +12 -49
- package/fakes/FakeSiCard/types/FakeSiCard5.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard5.test.js +20 -55
- package/fakes/FakeSiCard/types/FakeSiCard5.test.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard6.js +12 -49
- package/fakes/FakeSiCard/types/FakeSiCard6.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard6.test.js +25 -60
- package/fakes/FakeSiCard/types/FakeSiCard6.test.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard8.js +7 -11
- package/fakes/FakeSiCard/types/FakeSiCard8.js.map +1 -1
- package/fakes/FakeSiCard/types/FakeSiCard9.js +7 -11
- package/fakes/FakeSiCard/types/FakeSiCard9.js.map +1 -1
- package/fakes/FakeSiCard/types/index.js +7 -17
- package/fakes/FakeSiCard/types/index.js.map +1 -1
- package/fakes/FakeSiDeviceDriver.js +10 -47
- package/fakes/FakeSiDeviceDriver.js.map +1 -1
- package/fakes/FakeSiMainStation.js +29 -66
- package/fakes/FakeSiMainStation.js.map +1 -1
- package/fakes/FakeSiMainStation.test.js +43 -78
- package/fakes/FakeSiMainStation.test.js.map +1 -1
- package/fakes/IFakeSiMainStation.js +2 -39
- package/fakes/IFakeSiMainStation.js.map +1 -1
- package/fakes/index.js +2 -20
- package/fakes/index.js.map +1 -1
- package/index.js +10 -46
- package/index.js.map +1 -1
- package/package.json +3 -2
- package/siProtocol.js +35 -82
- package/siProtocol.js.map +1 -1
- package/siProtocol.test.js +308 -345
- package/siProtocol.test.js.map +1 -1
- package/storage/SiArray.js +4 -8
- package/storage/SiArray.js.map +1 -1
- package/storage/SiArray.test.js +56 -58
- package/storage/SiArray.test.js.map +1 -1
- package/storage/SiBool.js +5 -9
- package/storage/SiBool.js.map +1 -1
- package/storage/SiBool.test.js +63 -65
- package/storage/SiBool.test.js.map +1 -1
- package/storage/SiDataType.js +9 -14
- package/storage/SiDataType.js.map +1 -1
- package/storage/SiDataType.test.js +23 -25
- package/storage/SiDataType.test.js.map +1 -1
- package/storage/SiDict.js +4 -8
- package/storage/SiDict.js.map +1 -1
- package/storage/SiDict.test.js +52 -54
- package/storage/SiDict.test.js.map +1 -1
- package/storage/SiEnum.js +7 -44
- package/storage/SiEnum.js.map +1 -1
- package/storage/SiEnum.test.js +59 -61
- package/storage/SiEnum.test.js.map +1 -1
- package/storage/SiFieldValue.js +4 -8
- package/storage/SiFieldValue.js.map +1 -1
- package/storage/SiFieldValue.test.js +25 -27
- package/storage/SiFieldValue.test.js.map +1 -1
- package/storage/SiInt.js +5 -9
- package/storage/SiInt.js.map +1 -1
- package/storage/SiInt.test.js +63 -65
- package/storage/SiInt.test.js.map +1 -1
- package/storage/SiModified.js +5 -9
- package/storage/SiModified.js.map +1 -1
- package/storage/SiModified.test.js +75 -77
- package/storage/SiModified.test.js.map +1 -1
- package/storage/SiStorage.js +4 -9
- package/storage/SiStorage.js.map +1 -1
- package/storage/SiStorage.test.js +32 -67
- package/storage/SiStorage.test.js.map +1 -1
- package/storage/index.js +11 -28
- package/storage/index.js.map +1 -1
- package/storage/index.test.js +93 -128
- package/storage/index.test.js.map +1 -1
- package/storage/interfaces.js +3 -41
- package/storage/interfaces.js.map +1 -1
- package/storage/siStringEncoding.js +1 -5
- package/storage/siStringEncoding.js.map +1 -1
- package/testUtils.js +16 -28
- package/testUtils.js.map +1 -1
- package/testUtils.test.js +65 -100
- package/testUtils.test.js.map +1 -1
- package/utils/NumberRange.js +2 -6
- package/utils/NumberRange.js.map +1 -1
- package/utils/NumberRange.test.js +54 -56
- package/utils/NumberRange.test.js.map +1 -1
- package/utils/NumberRangeRegistry.js +5 -42
- package/utils/NumberRangeRegistry.js.map +1 -1
- package/utils/NumberRangeRegistry.test.js +35 -37
- package/utils/NumberRangeRegistry.test.js.map +1 -1
- package/utils/bytes.js +11 -22
- package/utils/bytes.js.map +1 -1
- package/utils/bytes.test.js +98 -133
- package/utils/bytes.test.js.map +1 -1
- package/utils/errors.js +4 -11
- package/utils/errors.js.map +1 -1
- package/utils/errors.test.js +16 -51
- package/utils/errors.test.js.map +1 -1
- package/utils/events.js +3 -41
- package/utils/events.js.map +1 -1
- package/utils/events.test.js +21 -56
- package/utils/events.test.js.map +1 -1
- package/utils/general.js +4 -11
- package/utils/general.js.map +1 -1
- package/utils/general.test.js +77 -112
- package/utils/general.test.js.map +1 -1
- package/utils/index.js +8 -24
- package/utils/index.js.map +1 -1
- package/utils/mixins.js +1 -5
- package/utils/mixins.js.map +1 -1
- package/utils/mixins.test.js +13 -48
- package/utils/mixins.test.js.map +1 -1
- package/utils/typed.js +1 -4
- package/utils/typed.js.map +1 -1
- package/SiDevice/INavigatorWebSerial.d.ts +0 -62
- package/SiDevice/INavigatorWebSerial.d.ts.map +0 -1
- package/SiDevice/INavigatorWebSerial.js +0 -3
- package/SiDevice/INavigatorWebSerial.js.map +0 -1
- package/SiDevice/INavigatorWebUsb.d.ts +0 -55
- package/SiDevice/INavigatorWebUsb.d.ts.map +0 -1
- package/SiDevice/INavigatorWebUsb.js +0 -3
- package/SiDevice/INavigatorWebUsb.js.map +0 -1
|
@@ -1,37 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -41,26 +7,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
41
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
8
|
});
|
|
43
9
|
};
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
const ISiSendTask_1 = require("./ISiSendTask");
|
|
52
|
-
const SiSendTask_1 = require("./SiSendTask");
|
|
10
|
+
import { proto } from '../constants';
|
|
11
|
+
import * as utils from '../utils';
|
|
12
|
+
import * as siProtocol from '../siProtocol';
|
|
13
|
+
import { SiTargetMultiplexerDirectMessageEvent, SiTargetMultiplexerMessageEvent, SiTargetMultiplexerRemoteMessageEvent, SiTargetMultiplexerTarget } from './ISiTargetMultiplexer';
|
|
14
|
+
import { SiDeviceState } from '../SiDevice/ISiDevice';
|
|
15
|
+
import { SiSendTaskState } from './ISiSendTask';
|
|
16
|
+
import { SiSendTask } from './SiSendTask';
|
|
53
17
|
/** Commands that can only be sent from a direct station. */
|
|
54
|
-
|
|
55
|
-
[
|
|
56
|
-
[
|
|
57
|
-
[
|
|
58
|
-
[
|
|
59
|
-
[
|
|
18
|
+
export const DIRECT_DEVICE_INITIATED_COMMANDS = {
|
|
19
|
+
[proto.cmd.TRANS_REC]: true,
|
|
20
|
+
[proto.cmd.SI5_DET]: true,
|
|
21
|
+
[proto.cmd.SI6_DET]: true,
|
|
22
|
+
[proto.cmd.SI8_DET]: true,
|
|
23
|
+
[proto.cmd.SI_REM]: true
|
|
60
24
|
};
|
|
61
25
|
/** Commands that are sent from a station without prior request. */
|
|
62
|
-
const DEVICE_INITIATED_COMMANDS = Object.assign(Object.assign({},
|
|
63
|
-
class SiTargetMultiplexer {
|
|
26
|
+
const DEVICE_INITIATED_COMMANDS = Object.assign(Object.assign({}, DIRECT_DEVICE_INITIATED_COMMANDS), { [proto.cmd.SRR_PING]: true });
|
|
27
|
+
export class SiTargetMultiplexer {
|
|
64
28
|
static fromSiDevice(siDevice) {
|
|
65
29
|
if (siDevice.siTargetMultiplexer) {
|
|
66
30
|
return siDevice.siTargetMultiplexer;
|
|
@@ -81,9 +45,9 @@ class SiTargetMultiplexer {
|
|
|
81
45
|
) {
|
|
82
46
|
this.siDevice = siDevice;
|
|
83
47
|
this.stations = {};
|
|
84
|
-
this.target =
|
|
48
|
+
this.target = SiTargetMultiplexerTarget.Unknown;
|
|
85
49
|
// the target of the latest command scheduled
|
|
86
|
-
this.latestTarget =
|
|
50
|
+
this.latestTarget = SiTargetMultiplexerTarget.Unknown;
|
|
87
51
|
this.receiveBuffer = [];
|
|
88
52
|
this.sendQueue = [];
|
|
89
53
|
}
|
|
@@ -95,10 +59,10 @@ class SiTargetMultiplexer {
|
|
|
95
59
|
}
|
|
96
60
|
handleDeviceStateChange(newState) {
|
|
97
61
|
const actionByNewState = {
|
|
98
|
-
[
|
|
99
|
-
[
|
|
100
|
-
[
|
|
101
|
-
[
|
|
62
|
+
[SiDeviceState.Opening]: () => undefined,
|
|
63
|
+
[SiDeviceState.Opened]: () => this.startProcessingSendQueue(),
|
|
64
|
+
[SiDeviceState.Closing]: () => this.abortProcessingSendQueue(),
|
|
65
|
+
[SiDeviceState.Closed]: () => this.abortProcessingSendQueue()
|
|
102
66
|
};
|
|
103
67
|
const actionToPerform = actionByNewState[newState];
|
|
104
68
|
if (actionToPerform) {
|
|
@@ -119,35 +83,35 @@ class SiTargetMultiplexer {
|
|
|
119
83
|
this.receiveBuffer = remainder;
|
|
120
84
|
messages.forEach((message) => {
|
|
121
85
|
this.updateSendQueueWithReceivedMessage(message);
|
|
122
|
-
this.dispatchEvent('message', new
|
|
123
|
-
if (this.target ===
|
|
124
|
-
this.dispatchEvent('directMessage', new
|
|
86
|
+
this.dispatchEvent('message', new SiTargetMultiplexerMessageEvent(this, message));
|
|
87
|
+
if (this.target === SiTargetMultiplexerTarget.Direct) {
|
|
88
|
+
this.dispatchEvent('directMessage', new SiTargetMultiplexerDirectMessageEvent(this, message));
|
|
125
89
|
}
|
|
126
|
-
if (this.target ===
|
|
127
|
-
this.dispatchEvent('remoteMessage', new
|
|
90
|
+
if (this.target === SiTargetMultiplexerTarget.Remote) {
|
|
91
|
+
this.dispatchEvent('remoteMessage', new SiTargetMultiplexerRemoteMessageEvent(this, message));
|
|
128
92
|
}
|
|
129
93
|
});
|
|
130
94
|
}
|
|
131
95
|
updateSendQueueWithReceivedMessage(message) {
|
|
132
|
-
if (message.mode === undefined &&
|
|
96
|
+
if (message.mode === undefined && DIRECT_DEVICE_INITIATED_COMMANDS[message.command]) {
|
|
133
97
|
console.debug('Received direct device-initiated command. Assuming target Direct...');
|
|
134
|
-
this.target =
|
|
135
|
-
this.latestTarget =
|
|
98
|
+
this.target = SiTargetMultiplexerTarget.Direct;
|
|
99
|
+
this.latestTarget = SiTargetMultiplexerTarget.Direct;
|
|
136
100
|
}
|
|
137
101
|
if (this.sendQueue.length === 0) {
|
|
138
102
|
return;
|
|
139
103
|
}
|
|
140
104
|
const shouldAcceptResponseInState = {
|
|
141
|
-
[
|
|
142
|
-
[
|
|
143
|
-
[
|
|
144
|
-
[
|
|
145
|
-
[
|
|
105
|
+
[SiSendTaskState.Queued]: false,
|
|
106
|
+
[SiSendTaskState.Sending]: true, // This is mostly for testing purposes
|
|
107
|
+
[SiSendTaskState.Sent]: true,
|
|
108
|
+
[SiSendTaskState.Succeeded]: false,
|
|
109
|
+
[SiSendTaskState.Failed]: false
|
|
146
110
|
};
|
|
147
111
|
if (!shouldAcceptResponseInState[this.sendQueue[0].state]) {
|
|
148
112
|
return;
|
|
149
113
|
}
|
|
150
|
-
if (message.mode ===
|
|
114
|
+
if (message.mode === proto.NAK) {
|
|
151
115
|
this.sendQueue[0].fail();
|
|
152
116
|
return;
|
|
153
117
|
}
|
|
@@ -178,10 +142,10 @@ class SiTargetMultiplexer {
|
|
|
178
142
|
return Promise.resolve();
|
|
179
143
|
}
|
|
180
144
|
const setMsParameterByTarget = {
|
|
181
|
-
[
|
|
182
|
-
[
|
|
183
|
-
[
|
|
184
|
-
[
|
|
145
|
+
[SiTargetMultiplexerTarget.Direct]: proto.P_MS_DIRECT,
|
|
146
|
+
[SiTargetMultiplexerTarget.Remote]: proto.P_MS_REMOTE,
|
|
147
|
+
[SiTargetMultiplexerTarget.Unknown]: undefined,
|
|
148
|
+
[SiTargetMultiplexerTarget.Switching]: undefined
|
|
185
149
|
};
|
|
186
150
|
const setMsParameter = setMsParameterByTarget[target];
|
|
187
151
|
if (setMsParameter == undefined) {
|
|
@@ -189,7 +153,7 @@ class SiTargetMultiplexer {
|
|
|
189
153
|
}
|
|
190
154
|
this.latestTarget = target;
|
|
191
155
|
return this.sendMessageToLatestTarget({
|
|
192
|
-
command:
|
|
156
|
+
command: proto.cmd.SET_MS,
|
|
193
157
|
parameters: [setMsParameter]
|
|
194
158
|
}, 1)
|
|
195
159
|
.then((responses) => {
|
|
@@ -200,14 +164,14 @@ class SiTargetMultiplexer {
|
|
|
200
164
|
})
|
|
201
165
|
.catch((err) => {
|
|
202
166
|
this.abortProcessingSendQueue();
|
|
203
|
-
this.target =
|
|
167
|
+
this.target = SiTargetMultiplexerTarget.Unknown;
|
|
204
168
|
throw err;
|
|
205
169
|
});
|
|
206
170
|
});
|
|
207
171
|
}
|
|
208
172
|
sendMessageToLatestTarget(message, numResponses = 0, timeoutInMiliseconds = 10000) {
|
|
209
173
|
return new Promise((resolve, reject) => {
|
|
210
|
-
const sendTask = new
|
|
174
|
+
const sendTask = new SiSendTask(message, numResponses, timeoutInMiliseconds, (resolvedTask) => {
|
|
211
175
|
const shifted = this.sendQueue.shift();
|
|
212
176
|
if (resolvedTask !== shifted) {
|
|
213
177
|
throw new Error('Resolved unexecuting SendTask');
|
|
@@ -227,16 +191,16 @@ class SiTargetMultiplexer {
|
|
|
227
191
|
});
|
|
228
192
|
}
|
|
229
193
|
_processSendQueue() {
|
|
230
|
-
if (this.sendQueue.length === 0 || this.sendQueue[0].state ===
|
|
194
|
+
if (this.sendQueue.length === 0 || this.sendQueue[0].state === SiSendTaskState.Sending || this.sendQueue[0].state === SiSendTaskState.Sent || this.siDevice.state !== SiDeviceState.Opened) {
|
|
231
195
|
return;
|
|
232
196
|
}
|
|
233
197
|
const sendTask = this.sendQueue[0];
|
|
234
|
-
sendTask.state =
|
|
235
|
-
const uint8Data = [
|
|
198
|
+
sendTask.state = SiSendTaskState.Sending;
|
|
199
|
+
const uint8Data = [proto.WAKEUP, ...siProtocol.render(sendTask.message)];
|
|
236
200
|
this.siDevice
|
|
237
201
|
.send(uint8Data)
|
|
238
202
|
.then(() => {
|
|
239
|
-
sendTask.state =
|
|
203
|
+
sendTask.state = SiSendTaskState.Sent;
|
|
240
204
|
if (sendTask.numResponses <= 0) {
|
|
241
205
|
sendTask.succeed();
|
|
242
206
|
}
|
|
@@ -247,6 +211,5 @@ class SiTargetMultiplexer {
|
|
|
247
211
|
});
|
|
248
212
|
}
|
|
249
213
|
}
|
|
250
|
-
exports.SiTargetMultiplexer = SiTargetMultiplexer;
|
|
251
214
|
utils.applyMixins(SiTargetMultiplexer, [utils.EventTarget]);
|
|
252
215
|
//# sourceMappingURL=SiTargetMultiplexer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiTargetMultiplexer.js","sourceRoot":"","sources":["../../src/SiStation/SiTargetMultiplexer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SiTargetMultiplexer.js","sourceRoot":"","sources":["../../src/SiStation/SiTargetMultiplexer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,37 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -41,94 +7,93 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
41
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
8
|
});
|
|
43
9
|
};
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
const SiTargetMultiplexer_1 = require("./SiTargetMultiplexer");
|
|
10
|
+
import { describe, expect, test } from '@jest/globals';
|
|
11
|
+
import { proto } from '../constants';
|
|
12
|
+
import * as siProtocol from '../siProtocol';
|
|
13
|
+
import * as testUtils from '../testUtils';
|
|
14
|
+
import { SiDevice } from '../SiDevice/SiDevice';
|
|
15
|
+
import { SiDeviceState, SiDeviceReceiveEvent } from '../SiDevice/ISiDevice';
|
|
16
|
+
import { SiTargetMultiplexerTarget } from './ISiTargetMultiplexer';
|
|
17
|
+
import { SiTargetMultiplexer } from './SiTargetMultiplexer';
|
|
53
18
|
testUtils.useFakeTimers();
|
|
54
19
|
function mockDriver(driver) {
|
|
55
20
|
return driver;
|
|
56
21
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
const siDevice = new
|
|
22
|
+
describe('SiTargetMultiplexer', () => {
|
|
23
|
+
test('handles targeting', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
|
+
const siDevice = new SiDevice('handlesTargeting0', {
|
|
60
25
|
driver: mockDriver({
|
|
61
26
|
send: () => Promise.resolve()
|
|
62
27
|
})
|
|
63
28
|
});
|
|
64
|
-
siDevice.setState(
|
|
65
|
-
const muxer =
|
|
66
|
-
|
|
29
|
+
siDevice.setState(SiDeviceState.Opened);
|
|
30
|
+
const muxer = SiTargetMultiplexer.fromSiDevice(siDevice);
|
|
31
|
+
expect(muxer instanceof SiTargetMultiplexer).toBe(true);
|
|
67
32
|
const randomMessage = testUtils.getRandomMessage({});
|
|
68
33
|
const timeState = {
|
|
69
34
|
sendingFinished: false,
|
|
70
35
|
resendingFinished: false,
|
|
71
36
|
remoteSendingFinished: false
|
|
72
37
|
};
|
|
73
|
-
muxer.sendMessage(
|
|
74
|
-
|
|
75
|
-
|
|
38
|
+
muxer.sendMessage(SiTargetMultiplexerTarget.Direct, randomMessage, 0, 1).then((responses) => {
|
|
39
|
+
expect(responses.length).toBe(0);
|
|
40
|
+
expect(muxer._test.sendQueue.length).toBe(0);
|
|
76
41
|
timeState.sendingFinished = true;
|
|
77
42
|
});
|
|
78
43
|
setTimeout(() => {
|
|
79
|
-
siDevice.dispatchEvent('receive', new
|
|
80
|
-
command:
|
|
81
|
-
parameters: [0x00, 0x00,
|
|
44
|
+
siDevice.dispatchEvent('receive', new SiDeviceReceiveEvent(siDevice, siProtocol.render({
|
|
45
|
+
command: proto.cmd.SET_MS,
|
|
46
|
+
parameters: [0x00, 0x00, proto.P_MS_DIRECT]
|
|
82
47
|
})));
|
|
83
48
|
}, 1);
|
|
84
|
-
|
|
85
|
-
|
|
49
|
+
expect(muxer.target).toBe(SiTargetMultiplexerTarget.Unknown);
|
|
50
|
+
expect(muxer._test.latestTarget).toBe(SiTargetMultiplexerTarget.Direct);
|
|
86
51
|
yield testUtils.advanceTimersByTime(0); // resolve setTarget send promise
|
|
87
52
|
yield testUtils.advanceTimersByTime(1); // trigger setTarget receive
|
|
88
53
|
yield testUtils.nTimesAsync(10, () => testUtils.advanceTimersByTime(1));
|
|
89
|
-
|
|
90
|
-
|
|
54
|
+
expect(muxer.target).toBe(SiTargetMultiplexerTarget.Direct);
|
|
55
|
+
expect(muxer._test.latestTarget).toBe(SiTargetMultiplexerTarget.Direct);
|
|
91
56
|
yield testUtils.advanceTimersByTime(0);
|
|
92
57
|
yield testUtils.advanceTimersByTime(0);
|
|
93
|
-
|
|
58
|
+
expect(timeState).toEqual({
|
|
94
59
|
sendingFinished: true,
|
|
95
60
|
resendingFinished: false,
|
|
96
61
|
remoteSendingFinished: false
|
|
97
62
|
});
|
|
98
|
-
muxer.sendMessage(
|
|
99
|
-
|
|
100
|
-
|
|
63
|
+
muxer.sendMessage(SiTargetMultiplexerTarget.Direct, randomMessage, 0, 1).then((responses) => {
|
|
64
|
+
expect(responses.length).toBe(0);
|
|
65
|
+
expect(muxer._test.sendQueue.length).toBe(0);
|
|
101
66
|
timeState.resendingFinished = true;
|
|
102
67
|
});
|
|
103
68
|
yield testUtils.advanceTimersByTime(0);
|
|
104
69
|
yield testUtils.advanceTimersByTime(0);
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
70
|
+
expect(muxer.target).toBe(SiTargetMultiplexerTarget.Direct);
|
|
71
|
+
expect(muxer._test.latestTarget).toBe(SiTargetMultiplexerTarget.Direct);
|
|
72
|
+
expect(timeState).toEqual({
|
|
108
73
|
sendingFinished: true,
|
|
109
74
|
resendingFinished: true,
|
|
110
75
|
remoteSendingFinished: false
|
|
111
76
|
});
|
|
112
|
-
muxer.sendMessage(
|
|
113
|
-
|
|
114
|
-
|
|
77
|
+
muxer.sendMessage(SiTargetMultiplexerTarget.Remote, randomMessage, 0, 1).then((responses) => {
|
|
78
|
+
expect(responses.length).toBe(0);
|
|
79
|
+
expect(muxer._test.sendQueue.length).toBe(0);
|
|
115
80
|
timeState.remoteSendingFinished = true;
|
|
116
81
|
});
|
|
117
82
|
setTimeout(() => {
|
|
118
|
-
siDevice.dispatchEvent('receive', new
|
|
119
|
-
command:
|
|
120
|
-
parameters: [0x00, 0x00,
|
|
83
|
+
siDevice.dispatchEvent('receive', new SiDeviceReceiveEvent(siDevice, siProtocol.render({
|
|
84
|
+
command: proto.cmd.SET_MS,
|
|
85
|
+
parameters: [0x00, 0x00, proto.P_MS_REMOTE]
|
|
121
86
|
})));
|
|
122
87
|
}, 1);
|
|
123
|
-
|
|
124
|
-
|
|
88
|
+
expect(muxer.target).toBe(SiTargetMultiplexerTarget.Direct);
|
|
89
|
+
expect(muxer._test.latestTarget).toBe(SiTargetMultiplexerTarget.Remote);
|
|
125
90
|
yield testUtils.advanceTimersByTime(0); // resolve setTarget send promise
|
|
126
91
|
yield testUtils.advanceTimersByTime(1); // trigger setTarget receive
|
|
127
|
-
|
|
128
|
-
|
|
92
|
+
expect(muxer.target).toBe(SiTargetMultiplexerTarget.Remote);
|
|
93
|
+
expect(muxer._test.latestTarget).toBe(SiTargetMultiplexerTarget.Remote);
|
|
129
94
|
yield testUtils.advanceTimersByTime(0);
|
|
130
95
|
yield testUtils.advanceTimersByTime(0);
|
|
131
|
-
|
|
96
|
+
expect(timeState).toEqual({
|
|
132
97
|
sendingFinished: true,
|
|
133
98
|
resendingFinished: true,
|
|
134
99
|
remoteSendingFinished: true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiTargetMultiplexer.targeting.test.js","sourceRoot":"","sources":["../../src/SiStation/SiTargetMultiplexer.targeting.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SiTargetMultiplexer.targeting.test.js","sourceRoot":"","sources":["../../src/SiStation/SiTargetMultiplexer.targeting.test.ts"],"names":[],"mappings":"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"}
|