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.
Files changed (108) hide show
  1. package/SiCard/raceResultTools.js.map +1 -1
  2. package/SiCard/types/ModernSiCard.d.ts.map +1 -1
  3. package/SiCard/types/ModernSiCard.js +14 -4
  4. package/SiCard/types/ModernSiCard.js.map +1 -1
  5. package/SiCard/types/PCard.d.ts +17 -4
  6. package/SiCard/types/PCard.d.ts.map +1 -1
  7. package/SiCard/types/PCard.js +99 -5
  8. package/SiCard/types/PCard.js.map +1 -1
  9. package/SiCard/types/PCard.test.js +141 -3
  10. package/SiCard/types/PCard.test.js.map +1 -1
  11. package/SiCard/types/SiCard5.d.ts.map +1 -1
  12. package/SiCard/types/SiCard5.js +14 -1
  13. package/SiCard/types/SiCard5.js.map +1 -1
  14. package/SiCard/types/SiCard5.test.js +4 -4
  15. package/SiCard/types/SiCard5.test.js.map +1 -1
  16. package/SiCard/types/SiCard6.d.ts.map +1 -1
  17. package/SiCard/types/SiCard6.js +15 -4
  18. package/SiCard/types/SiCard6.js.map +1 -1
  19. package/SiCard/types/SiCard8.d.ts.map +1 -1
  20. package/SiCard/types/SiCard8.js +12 -3
  21. package/SiCard/types/SiCard8.js.map +1 -1
  22. package/SiCard/types/SiCard9.d.ts.map +1 -1
  23. package/SiCard/types/SiCard9.js +12 -3
  24. package/SiCard/types/SiCard9.js.map +1 -1
  25. package/SiCard/types/pCardExamples.d.ts +98 -0
  26. package/SiCard/types/pCardExamples.d.ts.map +1 -0
  27. package/SiCard/types/pCardExamples.js +178 -0
  28. package/SiCard/types/pCardExamples.js.map +1 -0
  29. package/SiDevice/SiDevice.d.ts +1 -0
  30. package/SiDevice/SiDevice.d.ts.map +1 -1
  31. package/SiDevice/SiDevice.js +10 -7
  32. package/SiDevice/SiDevice.js.map +1 -1
  33. package/SiDevice/WebSerialSiDeviceDriver.d.ts +1 -0
  34. package/SiDevice/WebSerialSiDeviceDriver.d.ts.map +1 -1
  35. package/SiDevice/WebSerialSiDeviceDriver.js +26 -25
  36. package/SiDevice/WebSerialSiDeviceDriver.js.map +1 -1
  37. package/SiDevice/WebUsbSiDeviceDriver.d.ts.map +1 -1
  38. package/SiDevice/WebUsbSiDeviceDriver.js +60 -56
  39. package/SiDevice/WebUsbSiDeviceDriver.js.map +1 -1
  40. package/SiStation/BaseSiStation.d.ts.map +1 -1
  41. package/SiStation/BaseSiStation.js +4 -2
  42. package/SiStation/BaseSiStation.js.map +1 -1
  43. package/SiStation/BaseSiStation.test.js +1 -1
  44. package/SiStation/BaseSiStation.test.js.map +1 -1
  45. package/SiStation/CoupledSiStation.d.ts.map +1 -1
  46. package/SiStation/CoupledSiStation.js +13 -11
  47. package/SiStation/CoupledSiStation.js.map +1 -1
  48. package/SiStation/SiMainStation.d.ts.map +1 -1
  49. package/SiStation/SiMainStation.js +5 -3
  50. package/SiStation/SiMainStation.js.map +1 -1
  51. package/SiStation/SiSendTask.d.ts.map +1 -1
  52. package/SiStation/SiSendTask.js +3 -1
  53. package/SiStation/SiSendTask.js.map +1 -1
  54. package/SiStation/SiTargetMultiplexer.d.ts.map +1 -1
  55. package/SiStation/SiTargetMultiplexer.js +11 -6
  56. package/SiStation/SiTargetMultiplexer.js.map +1 -1
  57. package/SiStation/SiTargetMultiplexer.targeting.test.js +37 -43
  58. package/SiStation/SiTargetMultiplexer.targeting.test.js.map +1 -1
  59. package/SiStation/SiTargetMultiplexer.test.js +3 -3
  60. package/SiStation/SiTargetMultiplexer.test.js.map +1 -1
  61. package/fakes/FakeSiCard/types/FakePCard.d.ts +12 -0
  62. package/fakes/FakeSiCard/types/FakePCard.d.ts.map +1 -0
  63. package/fakes/FakeSiCard/types/FakePCard.js +16 -0
  64. package/fakes/FakeSiCard/types/FakePCard.js.map +1 -0
  65. package/fakes/FakeSiDeviceDriver.d.ts.map +1 -1
  66. package/fakes/FakeSiDeviceDriver.js +1 -0
  67. package/fakes/FakeSiDeviceDriver.js.map +1 -1
  68. package/fakes/FakeSiMainStation.d.ts +1 -0
  69. package/fakes/FakeSiMainStation.d.ts.map +1 -1
  70. package/fakes/FakeSiMainStation.js +4 -1
  71. package/fakes/FakeSiMainStation.js.map +1 -1
  72. package/package.json +9 -4
  73. package/siProtocol.d.ts.map +1 -1
  74. package/siProtocol.js +7 -6
  75. package/siProtocol.js.map +1 -1
  76. package/siProtocol.test.d.ts.map +1 -1
  77. package/siProtocol.test.js +48 -5
  78. package/siProtocol.test.js.map +1 -1
  79. package/storage/SiDict.d.ts.map +1 -1
  80. package/storage/SiDict.js +0 -1
  81. package/storage/SiDict.js.map +1 -1
  82. package/storage/siStringEncoding.d.ts.map +1 -1
  83. package/storage/siStringEncoding.js +3 -1
  84. package/storage/siStringEncoding.js.map +1 -1
  85. package/testUtils.d.ts.map +1 -1
  86. package/testUtils.js +0 -1
  87. package/testUtils.js.map +1 -1
  88. package/utils/events.d.ts.map +1 -1
  89. package/utils/events.js +3 -2
  90. package/utils/events.js.map +1 -1
  91. package/utils/events.test.js +1 -0
  92. package/utils/events.test.js.map +1 -1
  93. package/utils/index.d.ts +1 -0
  94. package/utils/index.d.ts.map +1 -1
  95. package/utils/index.js +1 -0
  96. package/utils/index.js.map +1 -1
  97. package/utils/logging.d.ts +48 -0
  98. package/utils/logging.d.ts.map +1 -0
  99. package/utils/logging.js +99 -0
  100. package/utils/logging.js.map +1 -0
  101. package/utils/logging.test.d.ts +2 -0
  102. package/utils/logging.test.d.ts.map +1 -0
  103. package/utils/logging.test.js +197 -0
  104. package/utils/logging.test.js.map +1 -0
  105. package/utils/mixins.js +1 -1
  106. package/utils/mixins.js.map +1 -1
  107. package/utils/mixins.test.js +1 -0
  108. package/utils/mixins.test.js.map +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"SiCard6.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard6.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;AAOjD,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,MAAkC,CAAC;AAE9E,eAAO,MAAM,WAAW,eAAgB,CAAC,qBAAqB,GAAG,SAAS,CAAC,EAAE,KAAG,MAAM,EAKrF,CAAC;AAaF,MAAM,WAAW,qBAAsB,SAAQ,wBAAwB;IACtE,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE;QACX,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;QAC7B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1B,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;QACxB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;QAC7B,UAAU,EAAE,OAAO,GAAG,SAAS,CAAC;KAChC,CAAC;CACF;AAED,eAAO,MAAM,uBAAuB,EAAE,OAAO,CAAC,mBAAmB,CAAC,qBAAqB,CA0CtF,CAAC;AACF,eAAO,MAAM,wBAAwB,gFAAwD,CAAC;AAE9F,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;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;gBAEpB,UAAU,EAAE,MAAM;IAK9B,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAkB1D,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtC,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3C,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;CAuBxC"}
1
+ {"version":3,"file":"SiCard6.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard6.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;AAUjD,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,MAAkC,CAAC;AAE9E,eAAO,MAAM,WAAW,eAAgB,CAAC,qBAAqB,GAAG,SAAS,CAAC,EAAE,KAAG,MAAM,EAKrF,CAAC;AAaF,MAAM,WAAW,qBAAsB,SAAQ,wBAAwB;IACtE,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE;QACX,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;QAC7B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1B,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;QACxB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;QAC7B,UAAU,EAAE,OAAO,GAAG,SAAS,CAAC;KAChC,CAAC;CACF;AAED,eAAO,MAAM,uBAAuB,EAAE,OAAO,CAAC,mBAAmB,CAAC,qBAAqB,CAiDtF,CAAC;AACF,eAAO,MAAM,wBAAwB,gFAAwD,CAAC;AAE9F,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;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;gBAEpB,UAAU,EAAE,MAAM;IAK9B,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAoB1D,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtC,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3C,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;CAuBxC"}
@@ -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('SiCard6');
41
43
  class ReadFinishedException {
42
44
  }
43
45
  const punchesPerPage = 32;
@@ -77,8 +79,15 @@ exports.siCard6StorageLocations = {
77
79
  punchCount: new storage.SiInt([[0x12]]),
78
80
  punchCountPlus1: new storage.SiInt([[0x13]]),
79
81
  punches: new storage.SiModified(new storage.SiArray(MAX_NUM_PUNCHES, (i) => new storage.SiDict({
80
- code: new storage.SiInt([[(0, exports.getPunchOffset)(i) + 1]]),
81
- time: new siProtocol.SiTime([[(0, exports.getPunchOffset)(i) + 3], [(0, exports.getPunchOffset)(i) + 2], [(0, exports.getPunchOffset)(i) + 0]])
82
+ code: new storage.SiInt([
83
+ [((0, exports.getPunchOffset)(i) + 1)],
84
+ [(0, exports.getPunchOffset)(i) + 0, 7, 8],
85
+ ]),
86
+ time: new siProtocol.SiTime([
87
+ [(0, exports.getPunchOffset)(i) + 3],
88
+ [(0, exports.getPunchOffset)(i) + 2],
89
+ [(0, exports.getPunchOffset)(i) + 0],
90
+ ])
82
91
  })), (allPunches) => (0, exports.cropPunches)(allPunches)),
83
92
  cardHolder: new storage.SiDict({
84
93
  lastName: new storage.SiModified(new storage.SiArray(20, (i) => new storage.SiInt([[0x30 + i]])), (charCodes) => getCroppedString(charCodes)),
@@ -129,7 +138,9 @@ class SiCard6 extends BaseSiCard_1.BaseSiCard {
129
138
  parameters: [pageNumber]
130
139
  }, 1)
131
140
  .then((data) => {
132
- console.assert(data[0][2] === pageNumber, `Page number ${data[0][2]} retrieved (expected ${pageNumber})`);
141
+ if (data[0][2] !== pageNumber) {
142
+ logger.warn(`Page number assertion failed: ${data[0][2]} retrieved (expected ${pageNumber})`);
143
+ }
133
144
  return data[0].slice(3);
134
145
  });
135
146
  }
@@ -162,7 +173,7 @@ class SiCard6 extends BaseSiCard_1.BaseSiCard {
162
173
  this.storage.splice(bytesPerPage * 0, bytesPerPage, ...page0);
163
174
  const readCardNumber = this.storage.get('cardNumber').value;
164
175
  if (this.cardNumber !== readCardNumber) {
165
- console.warn(`SICard6 Number ${readCardNumber} (expected ${this.cardNumber})`);
176
+ logger.warn(`Card number mismatch`, { expected: this.cardNumber, actual: readCardNumber });
166
177
  }
167
178
  });
168
179
  }
@@ -1 +1 @@
1
- {"version":3,"file":"SiCard6.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard6.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SiCard6.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard6.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"SiCard8.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard8.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAiC,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACjG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAQ3D,eAAO,MAAM,cAAc,MAAO,MAAM,KAAG,MAAsB,CAAC;AAgBlE,MAAM,WAAW,qBAAsB,SAAQ,wBAAwB;IACtE,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,OAAO,kBAAkB,CAAC;CAC5C;AAED,eAAO,MAAM,uBAAuB,EAAE,OAAO,CAAC,mBAAmB,CAAC,qBAAqB,CA2BtF,CAAC;AACF,eAAO,MAAM,wBAAwB,gFAAwD,CAAC;AAE9F,qBAAa,OAAQ,SAAQ,YAAY;IACxC,MAAM,CAAC,aAAa,SAAmB;IAEvC,MAAM,CAAC,+BAA+B,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS;IAWnF,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;IAEnD,GAAG,CAAC,EAAE,MAAM,CAAC;gBAER,UAAU,EAAE,MAAM;IAK9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAwCjC"}
1
+ {"version":3,"file":"SiCard8.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard8.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAiC,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACjG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAU3D,eAAO,MAAM,cAAc,MAAO,MAAM,KAAG,MAAsB,CAAC;AAgBlE,MAAM,WAAW,qBAAsB,SAAQ,wBAAwB;IACtE,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,OAAO,kBAAkB,CAAC;CAC5C;AAED,eAAO,MAAM,uBAAuB,EAAE,OAAO,CAAC,mBAAmB,CAAC,qBAAqB,CAkCtF,CAAC;AACF,eAAO,MAAM,wBAAwB,gFAAwD,CAAC;AAE9F,qBAAa,OAAQ,SAAQ,YAAY;IACxC,MAAM,CAAC,aAAa,SAAmB;IAEvC,MAAM,CAAC,+BAA+B,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS;IAWnF,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;IAEnD,GAAG,CAAC,EAAE,MAAM,CAAC;gBAER,UAAU,EAAE,MAAM;IAK9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAwCjC"}
@@ -36,8 +36,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.SiCard8 = exports.siCard8StorageDefinition = exports.siCard8StorageLocations = exports.getPunchOffset = void 0;
37
37
  const storage = __importStar(require("../../storage"));
38
38
  const siProtocol = __importStar(require("../../siProtocol"));
39
+ const utils = __importStar(require("../../utils"));
39
40
  const ModernSiCard_1 = require("./ModernSiCard");
40
41
  const BaseSiCard_1 = require("../BaseSiCard");
42
+ const logger = utils.getLogger('SiCard8');
41
43
  class ReadFinishedException {
42
44
  }
43
45
  const punchesPerPage = 32;
@@ -71,8 +73,15 @@ exports.siCard8StorageLocations = {
71
73
  checkTime: new siProtocol.SiTime([[0x0b], [0x0a], [0x08]]),
72
74
  punchCount: new storage.SiInt([[0x16]]),
73
75
  punches: new storage.SiModified(new storage.SiArray(MAX_NUM_PUNCHES, (i) => new storage.SiDict({
74
- code: new storage.SiInt([[(0, exports.getPunchOffset)(i) + 1]]),
75
- time: new siProtocol.SiTime([[(0, exports.getPunchOffset)(i) + 3], [(0, exports.getPunchOffset)(i) + 2], [(0, exports.getPunchOffset)(i) + 0]])
76
+ code: new storage.SiInt([
77
+ [((0, exports.getPunchOffset)(i) + 1)],
78
+ [(0, exports.getPunchOffset)(i) + 0, 7, 8],
79
+ ]),
80
+ time: new siProtocol.SiTime([
81
+ [(0, exports.getPunchOffset)(i) + 3],
82
+ [(0, exports.getPunchOffset)(i) + 2],
83
+ [(0, exports.getPunchOffset)(i) + 0],
84
+ ])
76
85
  })), (allPunches) => (0, ModernSiCard_1.cropPunches)(allPunches)),
77
86
  cardHolder: new storage.SiModified(new storage.SiArray(0x60, (i) => new storage.SiInt([[0x20 + i]])), (charCodes) => parseCardHolder(charCodes))
78
87
  };
@@ -99,7 +108,7 @@ class SiCard8 extends ModernSiCard_1.ModernSiCard {
99
108
  this.storage.splice(bytesPerPage * 0, bytesPerPage, ...page0);
100
109
  const readCardNumber = this.storage.get('cardNumber').value;
101
110
  if (this.cardNumber !== readCardNumber) {
102
- console.warn(`SICard8 Number ${readCardNumber} (expected ${this.cardNumber})`);
111
+ logger.warn('Card number mismatch', { expected: this.cardNumber, actual: readCardNumber });
103
112
  }
104
113
  if (this.storage.get('punchCount').value <= punchesPerPage * 0) {
105
114
  throw new ReadFinishedException();
@@ -1 +1 @@
1
- {"version":3,"file":"SiCard8.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard8.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,6DAA+C;AAC/C,iDAAiG;AAEjG,8CAA2C;AAE3C,MAAM,qBAAqB;CAAG;AAC9B,MAAM,cAAc,GAAG,EAAE,CAAC;AAC1B,MAAM,YAAY,GAAG,GAAG,CAAC;AACzB,MAAM,eAAe,GAAG,EAAE,CAAC;AAEpB,MAAM,cAAc,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;AAArD,QAAA,cAAc,kBAAuC;AAElE,MAAM,qBAAqB,GAAG,CAAC,wBAAgC,EAAmC,EAAE;IACnG,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClE,OAAO;QACN,SAAS,EAAE,qBAAqB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QAClF,QAAQ,EAAE,qBAAqB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QACjF,UAAU,EAAE,qBAAqB,CAAC,MAAM,GAAG,CAAC;KAC5C,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,cAAsC,EAAE,EAAE;IAClE,MAAM,wBAAwB,GAAG,IAAA,+BAAgB,EAAC,cAAc,CAAC,CAAC;IAClE,OAAO,qBAAqB,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC;AAC9D,CAAC,CAAC;AAOW,QAAA,uBAAuB,GAAuD;IAC1F,GAAG,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACxD,UAAU,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,iCAAkB,CAAC;IAC5D,UAAU,EAAE,IAAI,OAAO,CAAC,UAAU,CACjC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACpE,CAAC,cAAc,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,cAAc,CAAC;IAC7D,yDAAyD;IACzD,mCAAmC;IACnC,wDAAwD;IACxD,+FAA+F;KAC/F;IACD,SAAS,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,UAAU,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3D,SAAS,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,UAAU,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,OAAO,EAAE,IAAI,OAAO,CAAC,UAAU,CAC9B,IAAI,OAAO,CAAC,OAAO,CAClB,eAAe,EACf,CAAC,CAAC,EAAE,EAAE,CACL,IAAI,OAAO,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAClD,IAAI,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,IAAA,sBAAc,EAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,IAAA,sBAAc,EAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KACxG,CAAC,CACH,EACD,CAAC,UAAU,EAAE,EAAE,CAAC,IAAA,0BAAW,EAAC,UAAU,CAAC,CACvC;IACD,UAAU,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;CAChJ,CAAC;AACW,QAAA,wBAAwB,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,+BAAuB,CAAC,CAAC;AAE9F,MAAa,OAAQ,SAAQ,2BAAY;IAGxC,MAAM,CAAC,+BAA+B,CAAC,OAA6B;QACnE,MAAM,IAAI,GAAG,IAAI,CAAC,iCAAiC,CAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;IAMD,YAAY,UAAkB;QAC7B,KAAK,CAAC,UAAU,CAAC,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,IAAA,gCAAwB,GAAE,CAAC;IAC3C,CAAC;IAED,gBAAgB;QACf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;iBACzB,IAAI,CAAC,CAAC,KAAe,EAAE,EAAE;gBACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC;gBAE9D,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK,CAAC;gBAC7D,IAAI,IAAI,CAAC,UAAU,KAAK,cAAc,EAAE,CAAC;oBACxC,OAAO,CAAC,IAAI,CAAC,kBAAkB,cAAc,cAAc,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;gBAChF,CAAC;gBAED,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;oBACjE,MAAM,IAAI,qBAAqB,EAAE,CAAC;gBACnC,CAAC;gBACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;YACpC,CAAC,CAAC;iBACD,IAAI,CAAC,CAAC,KAAe,EAAE,EAAE;gBACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC;gBAC9D,MAAM,IAAI,qBAAqB,EAAE,CAAC;YACnC,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;;gBACrB,IAAI,GAAG,YAAY,qBAAqB,EAAE,CAAC;oBAC1C,IAAI,CAAC,UAAU,GAAG;wBACjB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK;wBACjD,SAAS,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,0CAAE,KAAK;wBAC/C,UAAU,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,0CAAE,KAAK;wBACjD,SAAS,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,0CAAE,KAAK;wBAC/C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC,KAAK;wBAC3C,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK;qBACjD,CAAC;oBACF,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK,CAAC;oBACxD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK,CAAC;oBACxD,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,KAAK,CAAC;oBAC1C,OAAO,EAAE,CAAC;gBACX,CAAC;qBAAM,CAAC;oBACP,MAAM,CAAC,GAAG,CAAC,CAAC;gBACb,CAAC;YACF,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACJ,CAAC;;AA9DF,0BA+DC;AA9DO,qBAAa,GAAG,eAAe,CAAC;AA+DxC,uBAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC1D,uBAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC"}
1
+ {"version":3,"file":"SiCard8.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard8.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,6DAA+C;AAC/C,mDAAqC;AACrC,iDAAiG;AAEjG,8CAA2C;AAE3C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AAE1C,MAAM,qBAAqB;CAAG;AAC9B,MAAM,cAAc,GAAG,EAAE,CAAC;AAC1B,MAAM,YAAY,GAAG,GAAG,CAAC;AACzB,MAAM,eAAe,GAAG,EAAE,CAAC;AAEpB,MAAM,cAAc,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;AAArD,QAAA,cAAc,kBAAuC;AAElE,MAAM,qBAAqB,GAAG,CAAC,wBAAgC,EAAmC,EAAE;IACnG,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClE,OAAO;QACN,SAAS,EAAE,qBAAqB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QAClF,QAAQ,EAAE,qBAAqB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QACjF,UAAU,EAAE,qBAAqB,CAAC,MAAM,GAAG,CAAC;KAC5C,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,cAAsC,EAAE,EAAE;IAClE,MAAM,wBAAwB,GAAG,IAAA,+BAAgB,EAAC,cAAc,CAAC,CAAC;IAClE,OAAO,qBAAqB,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC;AAC9D,CAAC,CAAC;AAOW,QAAA,uBAAuB,GAAuD;IAC1F,GAAG,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACxD,UAAU,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,iCAAkB,CAAC;IAC5D,UAAU,EAAE,IAAI,OAAO,CAAC,UAAU,CACjC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACpE,CAAC,cAAc,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,cAAc,CAAC;IAC7D,yDAAyD;IACzD,mCAAmC;IACnC,wDAAwD;IACxD,+FAA+F;KAC/F;IACD,SAAS,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,UAAU,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3D,SAAS,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,UAAU,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,OAAO,EAAE,IAAI,OAAO,CAAC,UAAU,CAC9B,IAAI,OAAO,CAAC,OAAO,CAClB,eAAe,EACf,CAAC,CAAC,EAAE,EAAE,CACL,IAAI,OAAO,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC;YACvB,CAAC,CAAC,IAAA,sBAAc,EAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACzB,CAAC,IAAA,sBAAc,EAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SAC7B,CAAC;QACF,IAAI,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC3B,CAAC,IAAA,sBAAc,EAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC,IAAA,sBAAc,EAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC,IAAA,sBAAc,EAAC,CAAC,CAAC,GAAG,CAAC,CAAC;SACvB,CAAC;KACF,CAAC,CACH,EACD,CAAC,UAAU,EAAE,EAAE,CAAC,IAAA,0BAAW,EAAC,UAAU,CAAC,CACvC;IACD,UAAU,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;CAChJ,CAAC;AACW,QAAA,wBAAwB,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,+BAAuB,CAAC,CAAC;AAE9F,MAAa,OAAQ,SAAQ,2BAAY;IAGxC,MAAM,CAAC,+BAA+B,CAAC,OAA6B;QACnE,MAAM,IAAI,GAAG,IAAI,CAAC,iCAAiC,CAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;IAMD,YAAY,UAAkB;QAC7B,KAAK,CAAC,UAAU,CAAC,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,IAAA,gCAAwB,GAAE,CAAC;IAC3C,CAAC;IAED,gBAAgB;QACf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;iBACzB,IAAI,CAAC,CAAC,KAAe,EAAE,EAAE;gBACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC;gBAE9D,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK,CAAC;gBAC7D,IAAI,IAAI,CAAC,UAAU,KAAK,cAAc,EAAE,CAAC;oBACxC,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;gBAC5F,CAAC;gBAED,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;oBACjE,MAAM,IAAI,qBAAqB,EAAE,CAAC;gBACnC,CAAC;gBACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;YACpC,CAAC,CAAC;iBACD,IAAI,CAAC,CAAC,KAAe,EAAE,EAAE;gBACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC;gBAC9D,MAAM,IAAI,qBAAqB,EAAE,CAAC;YACnC,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;;gBACrB,IAAI,GAAG,YAAY,qBAAqB,EAAE,CAAC;oBAC1C,IAAI,CAAC,UAAU,GAAG;wBACjB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK;wBACjD,SAAS,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,0CAAE,KAAK;wBAC/C,UAAU,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,0CAAE,KAAK;wBACjD,SAAS,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,0CAAE,KAAK;wBAC/C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC,KAAK;wBAC3C,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK;qBACjD,CAAC;oBACF,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK,CAAC;oBACxD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK,CAAC;oBACxD,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,KAAK,CAAC;oBAC1C,OAAO,EAAE,CAAC;gBACX,CAAC;qBAAM,CAAC;oBACP,MAAM,CAAC,GAAG,CAAC,CAAC;gBACb,CAAC;YACF,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACJ,CAAC;;AA9DF,0BA+DC;AA9DO,qBAAa,GAAG,eAAe,CAAC;AA+DxC,uBAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC1D,uBAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"SiCard9.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard9.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAiC,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACjG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAQ3D,eAAO,MAAM,cAAc,MAAO,MAAM,KAAG,MAAsB,CAAC;AAgBlE,MAAM,WAAW,qBAAsB,SAAQ,wBAAwB;IACtE,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,OAAO,kBAAkB,CAAC;CAC5C;AAED,eAAO,MAAM,uBAAuB,EAAE,OAAO,CAAC,mBAAmB,CAAC,qBAAqB,CA2BtF,CAAC;AACF,eAAO,MAAM,wBAAwB,gFAAwD,CAAC;AAE9F,qBAAa,OAAQ,SAAQ,YAAY;IACxC,MAAM,CAAC,aAAa,SAAmB;IAEvC,MAAM,CAAC,+BAA+B,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS;IAWnF,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;IAEnD,GAAG,CAAC,EAAE,MAAM,CAAC;gBAER,UAAU,EAAE,MAAM;IAK9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAwCjC"}
1
+ {"version":3,"file":"SiCard9.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard9.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAiC,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACjG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAU3D,eAAO,MAAM,cAAc,MAAO,MAAM,KAAG,MAAsB,CAAC;AAgBlE,MAAM,WAAW,qBAAsB,SAAQ,wBAAwB;IACtE,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,OAAO,kBAAkB,CAAC;CAC5C;AAED,eAAO,MAAM,uBAAuB,EAAE,OAAO,CAAC,mBAAmB,CAAC,qBAAqB,CAkCtF,CAAC;AACF,eAAO,MAAM,wBAAwB,gFAAwD,CAAC;AAE9F,qBAAa,OAAQ,SAAQ,YAAY;IACxC,MAAM,CAAC,aAAa,SAAmB;IAEvC,MAAM,CAAC,+BAA+B,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS;IAWnF,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;IAEnD,GAAG,CAAC,EAAE,MAAM,CAAC;gBAER,UAAU,EAAE,MAAM;IAK9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAwCjC"}
@@ -36,8 +36,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.SiCard9 = exports.siCard9StorageDefinition = exports.siCard9StorageLocations = exports.getPunchOffset = void 0;
37
37
  const storage = __importStar(require("../../storage"));
38
38
  const siProtocol = __importStar(require("../../siProtocol"));
39
+ const utils = __importStar(require("../../utils"));
39
40
  const ModernSiCard_1 = require("./ModernSiCard");
40
41
  const BaseSiCard_1 = require("../BaseSiCard");
42
+ const logger = utils.getLogger('SiCard9');
41
43
  class ReadFinishedException {
42
44
  }
43
45
  const punchesPerPage = 32;
@@ -71,8 +73,15 @@ exports.siCard9StorageLocations = {
71
73
  checkTime: new siProtocol.SiTime([[0x0b], [0x0a], [0x08]]),
72
74
  punchCount: new storage.SiInt([[0x16]]),
73
75
  punches: new storage.SiModified(new storage.SiArray(MAX_NUM_PUNCHES, (i) => new storage.SiDict({
74
- code: new storage.SiInt([[(0, exports.getPunchOffset)(i) + 1]]),
75
- time: new siProtocol.SiTime([[(0, exports.getPunchOffset)(i) + 3], [(0, exports.getPunchOffset)(i) + 2], [(0, exports.getPunchOffset)(i) + 0]])
76
+ code: new storage.SiInt([
77
+ [((0, exports.getPunchOffset)(i) + 1)],
78
+ [(0, exports.getPunchOffset)(i) + 0, 7, 8],
79
+ ]),
80
+ time: new siProtocol.SiTime([
81
+ [(0, exports.getPunchOffset)(i) + 3],
82
+ [(0, exports.getPunchOffset)(i) + 2],
83
+ [(0, exports.getPunchOffset)(i) + 0],
84
+ ])
76
85
  })), (allPunches) => (0, ModernSiCard_1.cropPunches)(allPunches)),
77
86
  cardHolder: new storage.SiModified(new storage.SiArray(0x18, (i) => new storage.SiInt([[0x20 + i]])), (charCodes) => parseCardHolder(charCodes))
78
87
  };
@@ -99,7 +108,7 @@ class SiCard9 extends ModernSiCard_1.ModernSiCard {
99
108
  this.storage.splice(bytesPerPage * 0, bytesPerPage, ...page0);
100
109
  const readCardNumber = this.storage.get('cardNumber').value;
101
110
  if (this.cardNumber !== readCardNumber) {
102
- console.warn(`SICard9 Number ${readCardNumber} (expected ${this.cardNumber})`);
111
+ logger.warn('Card number mismatch', { expected: this.cardNumber, actual: readCardNumber });
103
112
  }
104
113
  if (this.storage.get('punchCount').value <= punchesPerPage * 0) {
105
114
  throw new ReadFinishedException();
@@ -1 +1 @@
1
- {"version":3,"file":"SiCard9.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard9.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SiCard9.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard9.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,98 @@
1
+ import { SiCardSample } from '../ISiCardExamples';
2
+ export declare const getCardWith16Punches: () => {
3
+ cardData: {
4
+ uid: number;
5
+ cardNumber: number;
6
+ startTime: {
7
+ time: number;
8
+ weekcounter: number;
9
+ weekday: number;
10
+ };
11
+ finishTime: null;
12
+ checkTime: {
13
+ time: number;
14
+ weekcounter: number;
15
+ weekday: number;
16
+ };
17
+ punchCount: number;
18
+ punches: {
19
+ code: number;
20
+ time: {
21
+ time: number;
22
+ weekcounter: number;
23
+ weekday: number;
24
+ };
25
+ }[];
26
+ cardHolder: {
27
+ firstName: string;
28
+ lastName: string;
29
+ isComplete: boolean;
30
+ };
31
+ };
32
+ storageData: (number | undefined)[];
33
+ };
34
+ export declare const getFullCard: () => {
35
+ cardData: {
36
+ uid: number;
37
+ cardNumber: number;
38
+ startTime: {
39
+ time: number;
40
+ weekcounter: number;
41
+ weekday: number;
42
+ };
43
+ finishTime: {
44
+ time: number;
45
+ weekcounter: number;
46
+ weekday: number;
47
+ };
48
+ checkTime: {
49
+ time: number;
50
+ weekcounter: number;
51
+ weekday: number;
52
+ };
53
+ punchCount: number;
54
+ punches: {
55
+ code: number;
56
+ time: {
57
+ time: number;
58
+ weekcounter: number;
59
+ weekday: number;
60
+ };
61
+ }[];
62
+ cardHolder: {
63
+ firstName: string;
64
+ lastName: string;
65
+ isComplete: boolean;
66
+ };
67
+ };
68
+ storageData: (number | undefined)[];
69
+ };
70
+ export declare const getEmptyCard: () => {
71
+ cardData: {
72
+ uid: number;
73
+ cardNumber: number;
74
+ startTime: {
75
+ time: number;
76
+ weekcounter: number;
77
+ weekday: number;
78
+ };
79
+ finishTime: null;
80
+ checkTime: {
81
+ time: number;
82
+ weekcounter: number;
83
+ weekday: number;
84
+ };
85
+ punchCount: number;
86
+ punches: never[];
87
+ cardHolder: {
88
+ firstName: undefined;
89
+ lastName: undefined;
90
+ isComplete: boolean;
91
+ };
92
+ };
93
+ storageData: (number | undefined)[];
94
+ };
95
+ export declare const getPCardExamples: () => {
96
+ [name: string]: SiCardSample;
97
+ };
98
+ //# sourceMappingURL=pCardExamples.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pCardExamples.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/pCardExamples.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AA+BhD,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyDhC,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BvB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;CA+BxB,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAO;IAAC,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;CAI/D,CAAC"}
@@ -0,0 +1,178 @@
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
+ Object.defineProperty(exports, "__esModule", { value: true });
36
+ exports.getPCardExamples = exports.getEmptyCard = exports.getFullCard = exports.getCardWith16Punches = void 0;
37
+ const utils = __importStar(require("../../utils"));
38
+ const cache = {};
39
+ const getFullTimesPage = utils.cached(cache, () => utils.unPrettyHex(`
40
+ 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
41
+ 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
42
+ 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
43
+ 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
44
+ 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
45
+ 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
46
+ 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
47
+ 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
48
+ `));
49
+ const getNoTimesPage = utils.cached(cache, () => utils.unPrettyHex(`
50
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
51
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
52
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
53
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
54
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
55
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
56
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
57
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
58
+ `));
59
+ exports.getCardWith16Punches = utils.cached(cache, () => ({
60
+ cardData: {
61
+ uid: 0x772A4299,
62
+ cardNumber: 4567890,
63
+ startTime: { time: 8721 + 43200, weekcounter: 0, weekday: 3 },
64
+ finishTime: null,
65
+ checkTime: { time: 8735 + 43200, weekcounter: 3, weekday: 3 },
66
+ punchCount: 16,
67
+ punches: [
68
+ { code: 31, time: { time: 7967 + 43200, weekcounter: 1, weekday: 7 } },
69
+ { code: 32, time: { time: 8224, weekcounter: 2, weekday: 0 } },
70
+ { code: 33, time: { time: 8481 + 43200, weekcounter: 2, weekday: 0 } },
71
+ { code: 34, time: { time: 8738, weekcounter: 2, weekday: 1 } },
72
+ { code: 35, time: { time: 8995 + 43200, weekcounter: 2, weekday: 1 } },
73
+ { code: 36, time: { time: 9252, weekcounter: 2, weekday: 2 } },
74
+ { code: 37, time: { time: 9509 + 43200, weekcounter: 2, weekday: 2 } },
75
+ { code: 38, time: { time: 9766, weekcounter: 2, weekday: 3 } },
76
+ { code: 39, time: { time: 10023 + 43200, weekcounter: 2, weekday: 3 } },
77
+ { code: 40, time: { time: 10280, weekcounter: 2, weekday: 4 } },
78
+ { code: 41, time: { time: 10537 + 43200, weekcounter: 2, weekday: 4 } },
79
+ { code: 42, time: { time: 10794, weekcounter: 2, weekday: 5 } },
80
+ { code: 43, time: { time: 11051 + 43200, weekcounter: 2, weekday: 5 } },
81
+ { code: 44, time: { time: 11308, weekcounter: 2, weekday: 6 } },
82
+ { code: 45, time: { time: 11565 + 43200, weekcounter: 2, weekday: 6 } },
83
+ { code: 46, time: { time: 11822, weekcounter: 2, weekday: 7 } }
84
+ ],
85
+ cardHolder: {
86
+ firstName: 'a',
87
+ lastName: 'b',
88
+ isComplete: true,
89
+ },
90
+ },
91
+ storageData: [
92
+ ...utils.unPrettyHex(`
93
+ 77 2A 42 99 EA EA EA EA 37 02 22 1F 07 03 22 11
94
+ EE EE EE EE 0F 7F 10 09 0F 45 B3 52 06 0F 61 53
95
+ 61 3B 62 3B EE EE EE EE EE EE EE EE EE EE EE EE
96
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
97
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
98
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
99
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
100
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
101
+ `),
102
+ ...utils.unPrettyHex(`
103
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
104
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
105
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
106
+ 1F 1F 1F 1F 20 20 20 20 21 21 21 21 22 22 22 22
107
+ 23 23 23 23 24 24 24 24 25 25 25 25 26 26 26 26
108
+ 27 27 27 27 28 28 28 28 29 29 29 29 2A 2A 2A 2A
109
+ 2B 2B 2B 2B 2C 2C 2C 2C 2D 2D 2D 2D 2E 2E 2E 2E
110
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
111
+ `),
112
+ ],
113
+ }));
114
+ exports.getFullCard = utils.cached(cache, () => ({
115
+ cardData: {
116
+ uid: 0x772A4299,
117
+ cardNumber: 4567890,
118
+ startTime: { time: 8721 + 43200, weekcounter: 0, weekday: 3 },
119
+ finishTime: { time: 8481 + 43200, weekcounter: 0, weekday: 3 },
120
+ checkTime: { time: 8735 + 43200, weekcounter: 3, weekday: 3 },
121
+ punchCount: 20,
122
+ punches: Array.from({ length: 20 }, (_, i) => i).map(() => ({ code: 32, time: { time: 8224, weekcounter: 2, weekday: 0 } })),
123
+ cardHolder: {
124
+ firstName: 'aaaaaaaaaaaaaaa',
125
+ lastName: 'bbbbbbb',
126
+ isComplete: true,
127
+ },
128
+ },
129
+ storageData: [
130
+ ...utils.unPrettyHex(`
131
+ 77 2A 42 99 EA EA EA EA 37 02 22 1F 07 03 22 11
132
+ 07 04 21 21 0F 7F 14 09 0F 45 B3 52 06 0F 61 53
133
+ 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 3B
134
+ 62 62 62 62 62 62 62 3B 20 20 20 20 20 20 20 20
135
+ 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
136
+ 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
137
+ 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
138
+ 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
139
+ `),
140
+ ...getFullTimesPage(),
141
+ ],
142
+ }));
143
+ exports.getEmptyCard = utils.cached(cache, () => ({
144
+ cardData: {
145
+ uid: 0x772A4299,
146
+ cardNumber: 4567890,
147
+ startTime: { time: 8721 + 43200, weekcounter: 0, weekday: 3 },
148
+ finishTime: null,
149
+ checkTime: { time: 8735 + 43200, weekcounter: 3, weekday: 3 },
150
+ punchCount: 0,
151
+ punches: [],
152
+ cardHolder: {
153
+ firstName: undefined,
154
+ lastName: undefined,
155
+ isComplete: false,
156
+ },
157
+ },
158
+ storageData: [
159
+ ...utils.unPrettyHex(`
160
+ 77 2A 42 99 EA EA EA EA 37 02 22 1F 07 03 22 11
161
+ EE EE EE EE 0F 7F 00 09 0F 45 B3 52 06 0F 61 53
162
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
163
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
164
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
165
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
166
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
167
+ EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE EE
168
+ `),
169
+ ...getNoTimesPage(),
170
+ ],
171
+ }));
172
+ const getPCardExamples = () => ({
173
+ cardWith16Punches: (0, exports.getCardWith16Punches)(),
174
+ fullCard: (0, exports.getFullCard)(),
175
+ emptyCard: (0, exports.getEmptyCard)(),
176
+ });
177
+ exports.getPCardExamples = getPCardExamples;
178
+ //# sourceMappingURL=pCardExamples.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pCardExamples.js","sourceRoot":"","sources":["../../../src/SiCard/types/pCardExamples.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ export declare class SiDevice<T extends ISiDeviceDriverData<ISiDeviceDriver<T>>>
6
6
  ident: string;
7
7
  data: T;
8
8
  private internalState;
9
+ private logger;
9
10
  constructor(typeSpecificIdent: string, data: T);
10
11
  get state(): SiDeviceState;
11
12
  setState(newState: SiDeviceState): void;
@@ -1 +1 @@
1
- {"version":3,"file":"SiDevice.d.ts","sourceRoot":"","sources":["../../src/SiDevice/SiDevice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,KAAK,cAAc,EAAwB,aAAa,EAA4B,MAAM,aAAa,CAAC;AAC9K,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,qBAAa,QAAQ,CAAC,CAAC,SAAS,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAE,YAAW,SAAS,CAAC,CAAC,CAAC;IAC/F,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,aAAa,CAAgB;gBAEzB,iBAAiB,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAO9C,IAAI,KAAK,IAAI,aAAa,CAEzB;IAED,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAOvC,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IA6B5B,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IA2B7B,WAAW,IAAI,IAAI;IAgCnB,iCAAiC,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;IAI1D,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI5B,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAIxC;AAED,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,WAAW,CAAC,cAAc,CAAC;CAAG"}
1
+ {"version":3,"file":"SiDevice.d.ts","sourceRoot":"","sources":["../../src/SiDevice/SiDevice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,KAAK,cAAc,EAAwB,aAAa,EAA4B,MAAM,aAAa,CAAC;AAC9K,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAElC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGzD,qBAAa,QAAQ,CAAC,CAAC,SAAS,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAE,YAAW,SAAS,CAAC,CAAC,CAAC;IAC/F,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,MAAM,CAAyB;gBAE3B,iBAAiB,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAO9C,IAAI,KAAK,IAAI,aAAa,CAEzB;IAED,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAOvC,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IA6B5B,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IA2B7B,WAAW,IAAI,IAAI;IAgCnB,iCAAiC,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;IAI1D,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI5B,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAIxC;AAED,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,WAAW,CAAC,cAAc,CAAC;CAAG"}
@@ -36,8 +36,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.SiDevice = void 0;
37
37
  const ISiDevice_1 = require("./ISiDevice");
38
38
  const utils = __importStar(require("../utils"));
39
+ const logging_1 = require("../utils/logging");
40
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
39
41
  class SiDevice {
40
42
  constructor(typeSpecificIdent, data) {
43
+ this.logger = (0, logging_1.getLogger)('SiDevice');
41
44
  this.data = data;
42
45
  this.name = `${data.driver.name}(${typeSpecificIdent})`;
43
46
  this.ident = `${data.driver.name}-${typeSpecificIdent}`;
@@ -67,7 +70,7 @@ class SiDevice {
67
70
  return this.data.driver
68
71
  .open(this)
69
72
  .then(() => {
70
- console.debug('Starting Receive Loop...');
73
+ this.logger.debug('Starting Receive Loop...');
71
74
  this.receiveLoop();
72
75
  this.setState(ISiDevice_1.SiDeviceState.Opened);
73
76
  return this;
@@ -116,15 +119,15 @@ class SiDevice {
116
119
  }
117
120
  this.receive()
118
121
  .then((uint8Data) => {
119
- console.debug(`<= (${this.name})\n${utils.prettyHex(uint8Data, 16)}`);
122
+ this.logger.debug(`<= (${this.name})\n${utils.prettyHex(uint8Data, 16)}`);
120
123
  this.dispatchEvent('receive', new ISiDevice_1.SiDeviceReceiveEvent(this, uint8Data));
121
124
  })
122
125
  .catch((err) => {
123
126
  if (this.shouldStopReceivingBecauseOfError(err)) {
124
- console.warn('Receive loop stopped while receiving');
127
+ this.logger.warn('Receive loop stopped while receiving');
125
128
  throw err;
126
129
  }
127
- console.warn(`${this.name}: Error receiving: ${err.message}`);
130
+ this.logger.warn(`${this.name}: Error receiving: ${err.message}`);
128
131
  return utils.waitFor(100);
129
132
  })
130
133
  .then(() => this.receiveLoop())
@@ -132,9 +135,9 @@ class SiDevice {
132
135
  }
133
136
  catch (exc) {
134
137
  const err = utils.getErrorOrThrow(exc);
135
- console.warn(`${this.name}: Error starting receiving: ${err.message}`);
138
+ this.logger.warn(`${this.name}: Error starting receiving: ${err.message}`);
136
139
  if (this.shouldStopReceivingBecauseOfError(err)) {
137
- console.warn('Receive loop stopped while starting receiving');
140
+ this.logger.warn('Receive loop stopped while starting receiving');
138
141
  return;
139
142
  }
140
143
  utils.waitFor(100).then(() => this.receiveLoop());
@@ -147,7 +150,7 @@ class SiDevice {
147
150
  return this.data.driver.receive(this);
148
151
  }
149
152
  send(buffer) {
150
- console.debug(`=> (${this.name})\n${utils.prettyHex(buffer, 16)}`);
153
+ this.logger.debug(`=> (${this.name})\n${utils.prettyHex(buffer, 16)}`);
151
154
  return this.data.driver.send(this, buffer);
152
155
  }
153
156
  }