sportident.js 1.3.4 → 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 +14 -4
- package/SiCard/types/ModernSiCard.js.map +1 -1
- package/SiCard/types/PCard.d.ts +17 -4
- package/SiCard/types/PCard.d.ts.map +1 -1
- package/SiCard/types/PCard.js +99 -5
- package/SiCard/types/PCard.js.map +1 -1
- package/SiCard/types/PCard.test.js +141 -3
- package/SiCard/types/PCard.test.js.map +1 -1
- package/SiCard/types/SiCard5.d.ts.map +1 -1
- package/SiCard/types/SiCard5.js +14 -1
- package/SiCard/types/SiCard5.js.map +1 -1
- package/SiCard/types/SiCard5.test.js +4 -4
- package/SiCard/types/SiCard5.test.js.map +1 -1
- package/SiCard/types/SiCard6.d.ts.map +1 -1
- package/SiCard/types/SiCard6.js +15 -4
- package/SiCard/types/SiCard6.js.map +1 -1
- package/SiCard/types/SiCard8.d.ts.map +1 -1
- package/SiCard/types/SiCard8.js +12 -3
- package/SiCard/types/SiCard8.js.map +1 -1
- package/SiCard/types/SiCard9.d.ts.map +1 -1
- package/SiCard/types/SiCard9.js +12 -3
- package/SiCard/types/SiCard9.js.map +1 -1
- package/SiCard/types/pCardExamples.d.ts +98 -0
- package/SiCard/types/pCardExamples.d.ts.map +1 -0
- package/SiCard/types/pCardExamples.js +178 -0
- package/SiCard/types/pCardExamples.js.map +1 -0
- 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 +11 -6
- 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/SiStation/SiTargetMultiplexer.test.js +3 -3
- package/SiStation/SiTargetMultiplexer.test.js.map +1 -1
- package/fakes/FakeSiCard/types/FakePCard.d.ts +12 -0
- package/fakes/FakeSiCard/types/FakePCard.d.ts.map +1 -0
- package/fakes/FakeSiCard/types/FakePCard.js +16 -0
- package/fakes/FakeSiCard/types/FakePCard.js.map +1 -0
- 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 +48 -5
- 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":"raceResultTools.js","sourceRoot":"","sources":["../../src/SiCard/raceResultTools.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"raceResultTools.js","sourceRoot":"","sources":["../../src/SiCard/raceResultTools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModernSiCard.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/ModernSiCard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AAEzC,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ModernSiCard.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/ModernSiCard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AAEzC,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAUjD,eAAO,MAAM,kBAAkB;;;;;;CAU9B,CAAC;AAEF,MAAM,WAAW,0BAA0B;IAC1C,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,IAAI,EAAE,UAAU,CAAC,WAAW,GAAG,SAAS,CAAC;CACzC;AAED,eAAO,MAAM,cAAc,MAAO,MAAM,KAAG,MAAkC,CAAC;AAE9E,eAAO,MAAM,WAAW,eAAgB,CAAC,0BAA0B,GAAG,SAAS,CAAC,EAAE,KAAG,MAAM,EAK1F,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAAe,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,KAAG,MAKpE,CAAC;AAEF,eAAO,MAAM,qBAAqB,6BAA8B,MAAM,KAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;CAgBrG,CAAC;AAEF,eAAO,MAAM,eAAe,mBAAoB,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,KAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;CAGrG,CAAC;AAEF,MAAM,WAAW,0BAA2B,SAAQ,wBAAwB;IAC3E,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,OAAO,kBAAkB,CAAC;CAC5C;AAED,eAAO,MAAM,4BAA4B,EAAE,OAAO,CAAC,mBAAmB,CAAC,0BAA0B,CAkChG,CAAC;AACF,eAAO,MAAM,6BAA6B,qFAA6D,CAAC;AAExG,qBAAa,YAAa,SAAQ,UAAU;IAC3C,MAAM,CAAC,aAAa,SAAmB;IAEvC,MAAM,CAAC,iCAAiC,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,GAAG;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,OAAO,kBAAkB,CAAA;KAAE,GAAG,SAAS;IAuBjJ,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC;IAExD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,OAAO,kBAAkB,CAAC;gBAExC,UAAU,EAAE,MAAM;IAK9B,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAoB1D,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBjC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtC,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAU3C,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;CAqCxC"}
|
|
@@ -39,6 +39,7 @@ const storage = __importStar(require("../../storage"));
|
|
|
39
39
|
const utils = __importStar(require("../../utils"));
|
|
40
40
|
const siProtocol = __importStar(require("../../siProtocol"));
|
|
41
41
|
const BaseSiCard_1 = require("../BaseSiCard");
|
|
42
|
+
const logger = utils.getLogger('ModernSiCard');
|
|
42
43
|
class ReadFinishedException {
|
|
43
44
|
}
|
|
44
45
|
const punchesPerPage = 32;
|
|
@@ -108,8 +109,15 @@ exports.modernSiCardStorageLocations = {
|
|
|
108
109
|
checkTime: new siProtocol.SiTime([[0x0b], [0x0a], [0x08]]),
|
|
109
110
|
punchCount: new storage.SiInt([[0x16]]),
|
|
110
111
|
punches: new storage.SiModified(new storage.SiArray(MAX_NUM_PUNCHES, (i) => new storage.SiDict({
|
|
111
|
-
code: new storage.SiInt([
|
|
112
|
-
|
|
112
|
+
code: new storage.SiInt([
|
|
113
|
+
[((0, exports.getPunchOffset)(i) + 1)],
|
|
114
|
+
[(0, exports.getPunchOffset)(i) + 0, 7, 8],
|
|
115
|
+
]),
|
|
116
|
+
time: new siProtocol.SiTime([
|
|
117
|
+
[(0, exports.getPunchOffset)(i) + 3],
|
|
118
|
+
[(0, exports.getPunchOffset)(i) + 2],
|
|
119
|
+
[(0, exports.getPunchOffset)(i) + 0],
|
|
120
|
+
])
|
|
113
121
|
})), (allPunches) => (0, exports.cropPunches)(allPunches)),
|
|
114
122
|
cardHolder: new storage.SiModified(new storage.SiArray(0x80, (i) => new storage.SiInt([[0x20 + i]])), (charCodes) => (0, exports.parseCardHolder)(charCodes))
|
|
115
123
|
};
|
|
@@ -151,7 +159,9 @@ class ModernSiCard extends BaseSiCard_1.BaseSiCard {
|
|
|
151
159
|
parameters: [pageNumber]
|
|
152
160
|
}, 1)
|
|
153
161
|
.then((data) => {
|
|
154
|
-
|
|
162
|
+
if (data[0][2] !== pageNumber) {
|
|
163
|
+
logger.warn(`Page number assertion failed: ${data[0][2]} retrieved (expected ${pageNumber})`);
|
|
164
|
+
}
|
|
155
165
|
return data[0].slice(3);
|
|
156
166
|
});
|
|
157
167
|
}
|
|
@@ -182,7 +192,7 @@ class ModernSiCard extends BaseSiCard_1.BaseSiCard {
|
|
|
182
192
|
this.storage.splice(bytesPerPage * 0, bytesPerPage, ...page0);
|
|
183
193
|
const readCardNumber = this.storage.get('cardNumber').value;
|
|
184
194
|
if (this.cardNumber !== readCardNumber) {
|
|
185
|
-
|
|
195
|
+
logger.warn('Card number mismatch', { expected: this.cardNumber, actual: readCardNumber });
|
|
186
196
|
}
|
|
187
197
|
});
|
|
188
198
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModernSiCard.js","sourceRoot":"","sources":["../../../src/SiCard/types/ModernSiCard.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ModernSiCard.js","sourceRoot":"","sources":["../../../src/SiCard/types/ModernSiCard.ts"],"names":[],"mappings":"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"}
|
package/SiCard/types/PCard.d.ts
CHANGED
|
@@ -1,7 +1,20 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import * as storage from '../../storage';
|
|
2
|
+
import * as siProtocol from '../../siProtocol';
|
|
3
|
+
import { ModernSiCard, ModernSiCardSeries } from './ModernSiCard';
|
|
4
|
+
import { IBaseSiCardStorageFields } from '../ISiCard';
|
|
5
|
+
export declare const getPunchOffset: (i: number) => number;
|
|
6
|
+
export interface IPCardStorageFields extends IBaseSiCardStorageFields {
|
|
7
|
+
uid: number;
|
|
8
|
+
cardSeries: keyof typeof ModernSiCardSeries;
|
|
9
|
+
}
|
|
10
|
+
export declare const pCardStorageLocations: storage.ISiStorageLocations<IPCardStorageFields>;
|
|
11
|
+
export declare const pCardStorageDefinition: import("../../storage/interfaces").ISiStorageDefinition<IPCardStorageFields>;
|
|
12
|
+
export declare class PCard extends ModernSiCard {
|
|
13
|
+
static maxNumPunches: number;
|
|
14
|
+
static typeSpecificInstanceFromMessage(message: siProtocol.SiMessage): PCard | undefined;
|
|
15
|
+
storage: storage.ISiStorage<IPCardStorageFields>;
|
|
16
|
+
uid?: number;
|
|
17
|
+
constructor(cardNumber: number);
|
|
5
18
|
typeSpecificRead(): Promise<void>;
|
|
6
19
|
}
|
|
7
20
|
//# sourceMappingURL=PCard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PCard.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/PCard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,UAAU,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"PCard.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/PCard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAgC,YAAY,EAAE,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAC/F,OAAO,EAAC,wBAAwB,EAAC,MAAM,YAAY,CAAC;AAUpD,eAAO,MAAM,cAAc,MAAO,MAAM,KAAG,MAE1C,CAAC;AAkBF,MAAM,WAAW,mBAAoB,SAAQ,wBAAwB;IACjE,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,OAAO,kBAAkB,CAAC;CAC/C;AAED,eAAO,MAAM,qBAAqB,EAAE,OAAO,CAAC,mBAAmB,CAAC,mBAAmB,CA0ClF,CAAC;AACF,eAAO,MAAM,sBAAsB,8EAGlC,CAAC;AAEF,qBAAa,KAAM,SAAQ,YAAY;IACnC,MAAM,CAAC,aAAa,SAAmB;IAEvC,MAAM,CAAC,+BAA+B,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS;IAW7D,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;IAEjD,GAAG,CAAC,EAAE,MAAM,CAAC;gBAER,UAAU,EAAE,MAAM;IAKjC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAwCjC"}
|
package/SiCard/types/PCard.js
CHANGED
|
@@ -33,17 +33,111 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.PCard = void 0;
|
|
36
|
+
exports.PCard = exports.pCardStorageDefinition = exports.pCardStorageLocations = exports.getPunchOffset = void 0;
|
|
37
|
+
const storage = __importStar(require("../../storage"));
|
|
38
|
+
const siProtocol = __importStar(require("../../siProtocol"));
|
|
37
39
|
const utils = __importStar(require("../../utils"));
|
|
40
|
+
const ModernSiCard_1 = require("./ModernSiCard");
|
|
38
41
|
const BaseSiCard_1 = require("../BaseSiCard");
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
+
const logger = utils.getLogger('PCard');
|
|
43
|
+
class ReadFinishedException {
|
|
44
|
+
}
|
|
45
|
+
const punchesPerPage = 32;
|
|
46
|
+
const bytesPerPage = 128;
|
|
47
|
+
const MAX_NUM_PUNCHES = 20;
|
|
48
|
+
const getPunchOffset = (i) => (0xB0 + i * 4);
|
|
49
|
+
exports.getPunchOffset = getPunchOffset;
|
|
50
|
+
const parseCardHolderString = (semicolonSeparatedString) => {
|
|
51
|
+
const informationComponents = semicolonSeparatedString.split(';');
|
|
52
|
+
return {
|
|
53
|
+
firstName: informationComponents.length > 1 ? informationComponents[0] : undefined,
|
|
54
|
+
lastName: informationComponents.length > 2 ? informationComponents[1] : undefined,
|
|
55
|
+
isComplete: informationComponents.length > 2,
|
|
56
|
+
};
|
|
57
|
+
};
|
|
58
|
+
const parseCardHolder = (maybeCharCodes) => {
|
|
59
|
+
const semicolonSeparatedString = (0, ModernSiCard_1.getCroppedString)(maybeCharCodes);
|
|
60
|
+
return parseCardHolderString(semicolonSeparatedString || '');
|
|
61
|
+
};
|
|
62
|
+
exports.pCardStorageLocations = {
|
|
63
|
+
uid: new storage.SiInt([[0x03], [0x02], [0x01], [0x00]]),
|
|
64
|
+
cardSeries: new storage.SiEnum([[0x18]], ModernSiCard_1.ModernSiCardSeries),
|
|
65
|
+
cardNumber: new storage.SiModified(new storage.SiArray(3, (i) => new storage.SiInt([[0x19 + (2 - i)]])), (extractedValue) => siProtocol.arr2cardNumber(extractedValue)),
|
|
66
|
+
startTime: new siProtocol.SiTime([[0x0F], [0x0E], [0x0C]]),
|
|
67
|
+
finishTime: new siProtocol.SiTime([[0x13], [0x12], [0x10]]),
|
|
68
|
+
checkTime: new siProtocol.SiTime([[0x0B], [0x0A], [0x08]]),
|
|
69
|
+
punchCount: new storage.SiInt([[0x16]]),
|
|
70
|
+
punches: new storage.SiModified(new storage.SiArray(MAX_NUM_PUNCHES, (i) => new storage.SiDict({
|
|
71
|
+
code: new storage.SiInt([
|
|
72
|
+
[(0, exports.getPunchOffset)(i) + 1],
|
|
73
|
+
[(0, exports.getPunchOffset)(i) + 0, 7, 8],
|
|
74
|
+
]),
|
|
75
|
+
time: new siProtocol.SiTime([
|
|
76
|
+
[(0, exports.getPunchOffset)(i) + 3],
|
|
77
|
+
[(0, exports.getPunchOffset)(i) + 2],
|
|
78
|
+
[(0, exports.getPunchOffset)(i) + 0],
|
|
79
|
+
]),
|
|
80
|
+
})), (allPunches) => (0, ModernSiCard_1.cropPunches)(allPunches)),
|
|
81
|
+
cardHolder: new storage.SiModified(new storage.SiArray(0x18, (i) => new storage.SiInt([[0x20 + i]])), (charCodes) => parseCardHolder(charCodes)),
|
|
82
|
+
};
|
|
83
|
+
exports.pCardStorageDefinition = storage.defineStorage(0x100, exports.pCardStorageLocations);
|
|
84
|
+
class PCard extends ModernSiCard_1.ModernSiCard {
|
|
85
|
+
static typeSpecificInstanceFromMessage(message) {
|
|
86
|
+
const info = this.parseModernSiCardDetectionMessage(message);
|
|
87
|
+
if (info === undefined) {
|
|
88
|
+
return undefined;
|
|
89
|
+
}
|
|
90
|
+
if (info.cardSeries !== "PCard") {
|
|
91
|
+
return undefined;
|
|
92
|
+
}
|
|
93
|
+
return new this(info.cardNumber);
|
|
94
|
+
}
|
|
95
|
+
constructor(cardNumber) {
|
|
96
|
+
super(cardNumber);
|
|
97
|
+
this.storage = (0, exports.pCardStorageDefinition)();
|
|
42
98
|
}
|
|
43
99
|
typeSpecificRead() {
|
|
44
|
-
return Promise
|
|
100
|
+
return new Promise((resolve, reject) => {
|
|
101
|
+
this.typeSpecificGetPage(0)
|
|
102
|
+
.then((page0) => {
|
|
103
|
+
this.storage.splice(bytesPerPage * 0, bytesPerPage, ...page0);
|
|
104
|
+
const readCardNumber = this.storage.get('cardNumber').value;
|
|
105
|
+
if (this.cardNumber !== readCardNumber) {
|
|
106
|
+
logger.warn('Card number mismatch', { expected: this.cardNumber, actual: readCardNumber });
|
|
107
|
+
}
|
|
108
|
+
if (this.storage.get('punchCount').value <= punchesPerPage * 0) {
|
|
109
|
+
throw new ReadFinishedException();
|
|
110
|
+
}
|
|
111
|
+
return this.typeSpecificGetPage(1);
|
|
112
|
+
})
|
|
113
|
+
.then((page1) => {
|
|
114
|
+
this.storage.splice(bytesPerPage * 1, bytesPerPage, ...page1);
|
|
115
|
+
throw new ReadFinishedException();
|
|
116
|
+
})
|
|
117
|
+
.catch((exc) => {
|
|
118
|
+
var _a, _b, _c;
|
|
119
|
+
if (exc instanceof ReadFinishedException) {
|
|
120
|
+
this.raceResult = {
|
|
121
|
+
cardNumber: this.storage.get('cardNumber').value,
|
|
122
|
+
startTime: (_a = this.storage.get('startTime')) === null || _a === void 0 ? void 0 : _a.value,
|
|
123
|
+
finishTime: (_b = this.storage.get('finishTime')) === null || _b === void 0 ? void 0 : _b.value,
|
|
124
|
+
checkTime: (_c = this.storage.get('checkTime')) === null || _c === void 0 ? void 0 : _c.value,
|
|
125
|
+
punches: this.storage.get('punches').value,
|
|
126
|
+
cardHolder: this.storage.get('cardHolder').value,
|
|
127
|
+
};
|
|
128
|
+
this.punchCount = this.storage.get('punchCount').value;
|
|
129
|
+
this.cardSeries = this.storage.get('cardSeries').value;
|
|
130
|
+
this.uid = this.storage.get('uid').value;
|
|
131
|
+
resolve();
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
reject(exc);
|
|
135
|
+
}
|
|
136
|
+
});
|
|
137
|
+
});
|
|
45
138
|
}
|
|
46
139
|
}
|
|
47
140
|
exports.PCard = PCard;
|
|
141
|
+
PCard.maxNumPunches = MAX_NUM_PUNCHES;
|
|
48
142
|
BaseSiCard_1.BaseSiCard.registerNumberRange(4000000, 5000000, PCard);
|
|
49
143
|
//# sourceMappingURL=PCard.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PCard.js","sourceRoot":"","sources":["../../../src/SiCard/types/PCard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"PCard.js","sourceRoot":"","sources":["../../../src/SiCard/types/PCard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,46 @@
|
|
|
1
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
|
+
})();
|
|
2
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
36
|
const globals_1 = require("@jest/globals");
|
|
4
37
|
const BaseSiCard_1 = require("../BaseSiCard");
|
|
5
38
|
const PCard_1 = require("./PCard");
|
|
39
|
+
const constants_1 = require("../../constants");
|
|
40
|
+
const testUtils = __importStar(require("../../testUtils"));
|
|
41
|
+
const ModernSiCard_1 = require("./ModernSiCard");
|
|
42
|
+
const pCardExamples_1 = require("./pCardExamples");
|
|
43
|
+
const FakePCard_1 = require("../../fakes/FakeSiCard/types/FakePCard");
|
|
6
44
|
(0, globals_1.describe)('PCard', () => {
|
|
7
45
|
(0, globals_1.test)('is registered', () => {
|
|
8
46
|
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(3999999)).not.toEqual(PCard_1.PCard);
|
|
@@ -10,9 +48,109 @@ const PCard_1 = require("./PCard");
|
|
|
10
48
|
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(4999999)).toEqual(PCard_1.PCard);
|
|
11
49
|
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(5000000)).not.toEqual(PCard_1.PCard);
|
|
12
50
|
});
|
|
13
|
-
(0, globals_1.
|
|
14
|
-
|
|
15
|
-
|
|
51
|
+
(0, globals_1.describe)('typeSpecificInstanceFromMessage', () => {
|
|
52
|
+
(0, globals_1.test)('works for valid message', () => {
|
|
53
|
+
const instance = PCard_1.PCard.typeSpecificInstanceFromMessage({
|
|
54
|
+
command: constants_1.proto.cmd.SI8_DET,
|
|
55
|
+
parameters: [0x00, 0x00, ModernSiCard_1.ModernSiCardSeries.PCard, 0x11, 0x11, 0x11],
|
|
56
|
+
});
|
|
57
|
+
if (instance === undefined) {
|
|
58
|
+
throw new Error('expect instance');
|
|
59
|
+
}
|
|
60
|
+
(0, globals_1.expect)(instance instanceof PCard_1.PCard).toBe(true);
|
|
61
|
+
(0, globals_1.expect)(instance.cardNumber).toBe(1118481);
|
|
62
|
+
});
|
|
63
|
+
(0, globals_1.test)('returns undefined when message has mode', () => {
|
|
64
|
+
(0, globals_1.expect)(PCard_1.PCard.typeSpecificInstanceFromMessage({
|
|
65
|
+
mode: constants_1.proto.NAK,
|
|
66
|
+
})).toBe(undefined);
|
|
67
|
+
});
|
|
68
|
+
(0, globals_1.test)('returns undefined when message has wrong command', () => {
|
|
69
|
+
(0, globals_1.expect)(PCard_1.PCard.typeSpecificInstanceFromMessage({
|
|
70
|
+
command: testUtils.getRandomByteExcept([constants_1.proto.cmd.SI8_DET]),
|
|
71
|
+
parameters: [],
|
|
72
|
+
})).toBe(undefined);
|
|
73
|
+
});
|
|
74
|
+
(0, globals_1.test)('returns undefined when there are too few parameters', () => {
|
|
75
|
+
(0, globals_1.expect)(PCard_1.PCard.typeSpecificInstanceFromMessage({
|
|
76
|
+
command: constants_1.proto.cmd.SI8_DET,
|
|
77
|
+
parameters: [],
|
|
78
|
+
})).toBe(undefined);
|
|
79
|
+
});
|
|
80
|
+
(0, globals_1.test)('returns undefined when the series does not match', () => {
|
|
81
|
+
(0, globals_1.expect)(PCard_1.PCard.typeSpecificInstanceFromMessage({
|
|
82
|
+
command: constants_1.proto.cmd.SI8_DET,
|
|
83
|
+
parameters: [0x00, 0x00, testUtils.getRandomByteExcept([ModernSiCard_1.ModernSiCardSeries.PCard]), 0x22, 0x22, 0x22],
|
|
84
|
+
})).toBe(undefined);
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
(0, globals_1.test)('getPunchOffset', () => {
|
|
88
|
+
(0, globals_1.expect)((0, PCard_1.getPunchOffset)(0)).toEqual(0xB0);
|
|
89
|
+
(0, globals_1.expect)((0, PCard_1.getPunchOffset)(1)).toEqual(0xB4);
|
|
90
|
+
(0, globals_1.expect)((0, PCard_1.getPunchOffset)(19)).toEqual(0xFC);
|
|
91
|
+
});
|
|
92
|
+
const examples = (0, pCardExamples_1.getPCardExamples)();
|
|
93
|
+
Object.keys(examples).forEach((exampleName) => {
|
|
94
|
+
const { storageData, cardData } = examples[exampleName];
|
|
95
|
+
const myFakePCard = new FakePCard_1.FakePCard(storageData);
|
|
96
|
+
const mainStationSimulation = {
|
|
97
|
+
sendMessage: (message, numResponses) => {
|
|
98
|
+
const responses = myFakePCard.handleRequest(message);
|
|
99
|
+
if (responses.length !== numResponses) {
|
|
100
|
+
throw new Error('Invalid numResponses');
|
|
101
|
+
}
|
|
102
|
+
return Promise.resolve(responses.map((response) => (response.mode === undefined ? [0x00, 0x00, ...response.parameters] : [])));
|
|
103
|
+
},
|
|
104
|
+
};
|
|
105
|
+
(0, globals_1.test)(`typeSpecificRead works with ${exampleName} example`, (done) => {
|
|
106
|
+
const myPCard = new PCard_1.PCard(cardData.cardNumber);
|
|
107
|
+
myPCard.mainStation = mainStationSimulation;
|
|
108
|
+
myPCard.typeSpecificRead().then(() => {
|
|
109
|
+
(0, globals_1.expect)(myPCard.raceResult.cardNumber).toEqual(cardData.cardNumber);
|
|
110
|
+
(0, globals_1.expect)(myPCard.raceResult.startTime).toEqual(cardData.startTime);
|
|
111
|
+
(0, globals_1.expect)(myPCard.raceResult.finishTime).toEqual(cardData.finishTime);
|
|
112
|
+
(0, globals_1.expect)(myPCard.raceResult.checkTime).toEqual(cardData.checkTime);
|
|
113
|
+
(0, globals_1.expect)(myPCard.raceResult.punches).toEqual(cardData.punches);
|
|
114
|
+
(0, globals_1.expect)(myPCard.raceResult.cardHolder).toEqual(cardData.cardHolder);
|
|
115
|
+
(0, globals_1.expect)(myPCard.punchCount).toEqual(cardData.punchCount);
|
|
116
|
+
(0, globals_1.expect)(myPCard.uid).toEqual(cardData.uid);
|
|
117
|
+
const cardSeriesString = myPCard.storage.get('cardSeries').toString();
|
|
118
|
+
(0, globals_1.expect)(cardSeriesString in ModernSiCard_1.ModernSiCardSeries).toBe(true);
|
|
119
|
+
done();
|
|
120
|
+
});
|
|
121
|
+
});
|
|
122
|
+
(0, globals_1.test)(`typeSpecificRead works with wrong card number in ${exampleName} example`, (done) => {
|
|
123
|
+
const myPCard = new PCard_1.PCard(cardData.cardNumber + 1);
|
|
124
|
+
myPCard.mainStation = mainStationSimulation;
|
|
125
|
+
myPCard.typeSpecificRead().then(() => {
|
|
126
|
+
(0, globals_1.expect)(myPCard.raceResult.cardNumber).toEqual(cardData.cardNumber);
|
|
127
|
+
(0, globals_1.expect)(myPCard.raceResult.startTime).toEqual(cardData.startTime);
|
|
128
|
+
(0, globals_1.expect)(myPCard.raceResult.finishTime).toEqual(cardData.finishTime);
|
|
129
|
+
(0, globals_1.expect)(myPCard.raceResult.checkTime).toEqual(cardData.checkTime);
|
|
130
|
+
(0, globals_1.expect)(myPCard.raceResult.punches).toEqual(cardData.punches);
|
|
131
|
+
(0, globals_1.expect)(myPCard.raceResult.cardHolder).toEqual(cardData.cardHolder);
|
|
132
|
+
(0, globals_1.expect)(myPCard.punchCount).toEqual(cardData.punchCount);
|
|
133
|
+
(0, globals_1.expect)(myPCard.uid).toEqual(cardData.uid);
|
|
134
|
+
done();
|
|
135
|
+
});
|
|
136
|
+
});
|
|
137
|
+
});
|
|
138
|
+
(0, globals_1.test)('typeSpecificRead if typeSpecificGetPage fails', (done) => {
|
|
139
|
+
const testError = new Error('test');
|
|
140
|
+
let attemptedToGetPage = false;
|
|
141
|
+
class ModernSiCardWithoutCardHolder extends PCard_1.PCard {
|
|
142
|
+
typeSpecificGetPage() {
|
|
143
|
+
attemptedToGetPage = true;
|
|
144
|
+
return Promise.reject(testError);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
const myModernSiCard = new ModernSiCardWithoutCardHolder(7123456);
|
|
148
|
+
myModernSiCard.typeSpecificRead()
|
|
149
|
+
.catch((err) => {
|
|
150
|
+
(0, globals_1.expect)(attemptedToGetPage).toBe(true);
|
|
151
|
+
(0, globals_1.expect)(err).toBe(testError);
|
|
152
|
+
done();
|
|
153
|
+
});
|
|
16
154
|
});
|
|
17
155
|
});
|
|
18
156
|
//# sourceMappingURL=PCard.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PCard.test.js","sourceRoot":"","sources":["../../../src/SiCard/types/PCard.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PCard.test.js","sourceRoot":"","sources":["../../../src/SiCard/types/PCard.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiCard5.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard5.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAE/C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"SiCard5.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard5.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAE/C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAQjD,UAAU,qBAAqB;IAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,IAAI,EAAE,UAAU,CAAC,WAAW,GAAG,SAAS,CAAC;CACzC;AAED,eAAO,MAAM,cAAc,MAAO,MAAM,KAAG,MAAiF,CAAC;AAE7H,eAAO,MAAM,WAAW,eAAgB,CAAC,qBAAqB,GAAG,SAAS,CAAC,EAAE,KAAG,MAAM,EAKrF,CAAC;AAEF,MAAM,WAAW,qBAAsB,SAAQ,wBAAwB;IACtE,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE;QACX,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;QAChC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;KAC7B,CAAC;CACF;AAED,eAAO,MAAM,uBAAuB,EAAE,OAAO,CAAC,mBAAmB,CAAC,qBAAqB,CA6BtF,CAAC;AACF,eAAO,MAAM,wBAAwB,gFAAuD,CAAC;AAE7F,qBAAa,OAAQ,SAAQ,UAAU;IACtC,MAAM,CAAC,aAAa,SAAmB;IAEvC,MAAM,CAAC,+BAA+B,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS;IAkBnF,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;IAEnD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;gBAEpB,UAAU,EAAE,MAAM;IAK9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CA+BjC"}
|
package/SiCard/types/SiCard5.js
CHANGED
|
@@ -38,6 +38,8 @@ const storage = __importStar(require("../../storage"));
|
|
|
38
38
|
const siProtocol = __importStar(require("../../siProtocol"));
|
|
39
39
|
const constants_1 = require("../../constants");
|
|
40
40
|
const BaseSiCard_1 = require("../BaseSiCard");
|
|
41
|
+
const utils = __importStar(require("../../utils"));
|
|
42
|
+
const logger = utils.getLogger('SiCard5');
|
|
41
43
|
const bytesPerPage = 128;
|
|
42
44
|
const MAX_NUM_PUNCHES = 36;
|
|
43
45
|
const getPunchOffset = (i) => (i >= 30 ? 0x20 + (i - 30) * 16 : 0x20 + Math.floor(i / 5) + 1 + i * 3);
|
|
@@ -107,7 +109,7 @@ class SiCard5 extends BaseSiCard_1.BaseSiCard {
|
|
|
107
109
|
this.storage.splice(bytesPerPage * 0, bytesPerPage, ...data[0].slice(2));
|
|
108
110
|
const readCardNumber = this.storage.get('cardNumber').value;
|
|
109
111
|
if (this.cardNumber !== readCardNumber) {
|
|
110
|
-
|
|
112
|
+
logger.warn(`Card number mismatch`, { expected: this.cardNumber, actual: readCardNumber });
|
|
111
113
|
}
|
|
112
114
|
this.raceResult = {
|
|
113
115
|
cardNumber: this.storage.get('cardNumber').value,
|
|
@@ -124,5 +126,16 @@ class SiCard5 extends BaseSiCard_1.BaseSiCard {
|
|
|
124
126
|
}
|
|
125
127
|
exports.SiCard5 = SiCard5;
|
|
126
128
|
SiCard5.maxNumPunches = MAX_NUM_PUNCHES;
|
|
129
|
+
// According to SI docs, the following ranges are possible 1 - 65000, 200001 - 265000, 300001-365000, 400001-465000
|
|
130
|
+
// Cardnr | SI 2 | SI1| SI0|
|
|
131
|
+
// --------|--------|----|----|
|
|
132
|
+
// 1 | 0 or 1 | 00 | 01 |
|
|
133
|
+
// 65000 | 0 or 1 | FD | E8 |
|
|
134
|
+
// 200001 | 2 | 00 | 01 |
|
|
135
|
+
// 265000 | 2 | FD | E8 |
|
|
136
|
+
// 300001 | 3 | 00 | 01 |
|
|
137
|
+
// 365000 | 3 | FD | E8 |
|
|
138
|
+
// 400001 | 4 | 00 | 01 |
|
|
139
|
+
// 465000 | 4 | FD | E8 |
|
|
127
140
|
BaseSiCard_1.BaseSiCard.registerNumberRange(1000, 500000, SiCard5);
|
|
128
141
|
//# sourceMappingURL=SiCard5.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiCard5.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard5.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,6DAA+C;AAC/C,+CAAwC;AAExC,8CAA2C;
|
|
1
|
+
{"version":3,"file":"SiCard5.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard5.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,9 +46,9 @@ const FakeSiCard5_1 = require("../../fakes/FakeSiCard/types/FakeSiCard5");
|
|
|
46
46
|
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(1000)).toEqual(SiCard5_1.SiCard5);
|
|
47
47
|
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(9999)).toEqual(SiCard5_1.SiCard5);
|
|
48
48
|
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(10000)).toEqual(SiCard5_1.SiCard5);
|
|
49
|
-
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(
|
|
50
|
-
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(
|
|
51
|
-
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(
|
|
49
|
+
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(65000)).toEqual(SiCard5_1.SiCard5);
|
|
50
|
+
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(200000)).toEqual(SiCard5_1.SiCard5);
|
|
51
|
+
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(465000)).toEqual(SiCard5_1.SiCard5);
|
|
52
52
|
(0, globals_1.expect)(BaseSiCard_1.BaseSiCard.getTypeByCardNumber(500000)).not.toEqual(SiCard5_1.SiCard5);
|
|
53
53
|
});
|
|
54
54
|
(0, globals_1.describe)('typeSpecificInstanceFromMessage', () => {
|
|
@@ -61,7 +61,7 @@ const FakeSiCard5_1 = require("../../fakes/FakeSiCard/types/FakeSiCard5");
|
|
|
61
61
|
throw new Error('expect instance');
|
|
62
62
|
}
|
|
63
63
|
(0, globals_1.expect)(instance instanceof SiCard5_1.SiCard5).toBe(true);
|
|
64
|
-
(0, globals_1.expect)(instance.cardNumber).toBe(
|
|
64
|
+
(0, globals_1.expect)(instance.cardNumber).toBe(9029);
|
|
65
65
|
});
|
|
66
66
|
(0, globals_1.test)('returns undefined when message has mode', () => {
|
|
67
67
|
(0, globals_1.expect)(SiCard5_1.SiCard5.typeSpecificInstanceFromMessage({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiCard5.test.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard5.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAuD;AACvD,+CAAwC;AAExC,2DAA6C;AAC7C,8CAA2C;AAC3C,uCAAiE;AACjE,uDAAuD;AACvD,0EAAuE;AAEvE,IAAA,kBAAQ,EAAC,SAAS,EAAE,GAAG,EAAE;IACxB,IAAA,cAAI,EAAC,eAAe,EAAE,GAAG,EAAE;QAC1B,IAAA,gBAAM,EAAC,uBAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAO,CAAC,CAAC;QACjE,IAAA,gBAAM,EAAC,uBAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAO,CAAC,CAAC;QAC9D,IAAA,gBAAM,EAAC,uBAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAO,CAAC,CAAC;QAC9D,IAAA,gBAAM,EAAC,uBAAU,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAO,CAAC,CAAC;QAC/D,IAAA,gBAAM,EAAC,uBAAU,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAO,CAAC,CAAC;QAC/D,IAAA,gBAAM,EAAC,uBAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAO,CAAC,CAAC;QAChE,IAAA,gBAAM,EAAC,uBAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAO,CAAC,CAAC;QAChE,IAAA,gBAAM,EAAC,uBAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAO,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IACH,IAAA,kBAAQ,EAAC,iCAAiC,EAAE,GAAG,EAAE;QAChD,IAAA,cAAI,EAAC,yBAAyB,EAAE,GAAG,EAAE;YACpC,MAAM,QAAQ,GAAG,iBAAO,CAAC,+BAA+B,CAAC;gBACxD,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,OAAO;gBAC1B,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;aAChD,CAAC,CAAC;YACH,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACpC,CAAC;YACD,IAAA,gBAAM,EAAC,QAAQ,YAAY,iBAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAA,gBAAM,EAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"SiCard5.test.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard5.test.ts"],"names":[],"mappings":"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"}
|