sportident.js 1.5.3 → 1.7.0

package/SiCard/types/ModernSiCard.d.ts.map

@@ -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;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"}
+{"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;AAYjD,eAAO,MAAM,kBAAkB;;;;;;;;;CAS9B,CAAC;AAGF,eAAO,MAAM,qBAAqB,QAC5B,MAAM,OACN,MAAM,OACN,MAAM,OACN,MAAM,KACT,MAAM,OAAO,kBAAkB,GAAG,SAuBpC,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;AAGD,eAAO,MAAM,yBAAyB;;;;;2FAgBrC,CAAC;AAEF,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;IA8BjJ,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,eAAe,IAAI,MAAM;IAIzB,sBAAsB,IAAI,MAAM;IAIhC,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;IAYtC,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3C,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;CAyCxC"}

package/SiCard/types/ModernSiCard.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModernSiCard = exports.modernSiCardStorageDefinition = exports.modernSiCardStorageLocations = exports.parseCardHolder = exports.parseCardHolderString = exports.getCroppedString = exports.cropPunches = exports.getPunchOffset = exports.ModernSiCardSeries = void 0;
+exports.ModernSiCard = exports.modernSiCardStorageDefinition = exports.modernSiCardStorageLocations = exports.cardSeriesStorageLocation = exports.parseCardHolder = exports.parseCardHolderString = exports.getCroppedString = exports.cropPunches = exports.getPunchOffset = exports.getModernSiCardSeries = exports.ModernSiCardSeries = void 0;
 const constants_1 = require("../../constants");
 const storage = __importStar(require("../../storage"));
 const utils = __importStar(require("../../utils"));
@@ -45,17 +45,45 @@ class ReadFinishedException {
 const punchesPerPage = 32;
 const bytesPerPage = 128;
 const MAX_NUM_PUNCHES = 128;
+// SI3 byte values for card series - includes all card types
+// Note: SiCard10, SiCard11, SIAC all share SI3=0x0F - distinguished by card number range
 exports.ModernSiCardSeries = {
     SiCard8: 0x02,
     SiCard9: 0x01,
     SiCard10: 0x0f,
+    SiCard11: 0x0f, // Same SI3 as SiCard10 - distinguished by card number range
+    SIAC: 0x0f, // Same SI3 as SiCard10 - distinguished by card number range
     PCard: 0x04,
-    TCard: 0x06
-    // TODO: Find out these values
-    // SiCard11: ?,
-    // SIAC: ?,
-    // FCard: ?,
+    TCard: 0x06,
+    FCard: 0x0e,
 };
+// Detect card series from SI bytes (uses card number ranges for SI3=0x0F)
+const getModernSiCardSeries = (si0, si1, si2, si3) => {
+    // Unique SI3 values - can determine series directly
+    switch (si3) {
+        case 0x01: return 'SiCard9';
+        case 0x02: return 'SiCard8';
+        case 0x04: return 'PCard';
+        case 0x06: return 'TCard';
+        case 0x0e: return 'FCard';
+    }
+    // SI3 = 0x0F: need to check card number range
+    if (si3 === 0x0f) {
+        const cardNumber = siProtocol.arr2cardNumber([si0, si1, si2]);
+        if (cardNumber !== undefined) {
+            if (cardNumber >= 7000000 && cardNumber < 8000000)
+                return 'SiCard10';
+            if (cardNumber >= 8000000 && cardNumber < 9000000)
+                return 'SIAC';
+            if (cardNumber >= 9000000 && cardNumber < 10000000)
+                return 'SiCard11';
+        }
+        // Default for SI3=0x0F with unknown/out-of-range card number
+        return 'SiCard10';
+    }
+    return undefined;
+};
+exports.getModernSiCardSeries = getModernSiCardSeries;
 const getPunchOffset = (i) => bytesPerPage * 4 + i * 4;
 exports.getPunchOffset = getPunchOffset;
 const cropPunches = (allPunches) => {
@@ -95,9 +123,24 @@ const parseCardHolder = (maybeCharCodes) => {
     return (0, exports.parseCardHolderString)(semicolonSeparatedString || '');
 };
 exports.parseCardHolder = parseCardHolder;
+// Shared storage location for cardSeries - reads SI bytes and computes the correct series
+exports.cardSeriesStorageLocation = new storage.SiModified(new storage.SiDict({
+    si3: new storage.SiInt([[0x18]]),
+    si0: new storage.SiInt([[0x1b]]),
+    si1: new storage.SiInt([[0x1a]]),
+    si2: new storage.SiInt([[0x19]]),
+}), (data) => {
+    if (data.si0 === undefined || data.si1 === undefined ||
+        data.si2 === undefined || data.si3 === undefined) {
+        return undefined;
+    }
+    return (0, exports.getModernSiCardSeries)(data.si0, data.si1, data.si2, data.si3);
+}, undefined, // modifyForUpdate - not needed for read-only
+(value) => value // modifiedToString - enum value is already a string
+);
 exports.modernSiCardStorageLocations = {
     uid: new storage.SiInt([[0x03], [0x02], [0x01], [0x00]]),
-    cardSeries: new storage.SiEnum([[0x18]], exports.ModernSiCardSeries),
+    cardSeries: exports.cardSeriesStorageLocation,
     cardNumber: new storage.SiModified(new storage.SiArray(3, (i) => new storage.SiInt([[0x19 + (2 - i)]])), (extractedValue) => siProtocol.arr2cardNumber(extractedValue)
     // (cardNumber) => siProtocol.cardNumber2arr(cardNumber),
     // (cardNumber) => `${cardNumber}`,
@@ -133,22 +176,31 @@ class ModernSiCard extends BaseSiCard_1.BaseSiCard {
         if (message.parameters.length < 6) {
             return undefined;
         }
-        const cardNumber = siProtocol.arr2cardNumber([message.parameters[5], message.parameters[4], message.parameters[3]]);
+        const si0 = message.parameters[5];
+        const si1 = message.parameters[4];
+        const si2 = message.parameters[3];
+        const si3 = message.parameters[2];
+        const cardNumber = siProtocol.arr2cardNumber([si0, si1, si2]);
         /* istanbul ignore next */
         if (cardNumber === undefined) {
             throw new Error('card number cannot be undefined');
         }
-        const cardSeries = message.parameters[2];
-        const lookup = utils.getLookup(exports.ModernSiCardSeries);
-        return {
-            cardNumber: cardNumber,
-            cardSeries: lookup[cardSeries]
-        };
+        const cardSeries = (0, exports.getModernSiCardSeries)(si0, si1, si2, si3);
+        if (cardSeries === undefined) {
+            return undefined;
+        }
+        return { cardNumber, cardSeries };
     }
     constructor(cardNumber) {
         super(cardNumber);
         this.storage = (0, exports.modernSiCardStorageDefinition)();
     }
+    getMaxReadSteps() {
+        return 6;
+    }
+    getEstimatedStepTimeMs() {
+        return 700;
+    }
     typeSpecificGetPage(pageNumber) {
         if (!this.mainStation) {
             return Promise.reject(new Error('No main station'));
@@ -190,6 +242,7 @@ class ModernSiCard extends BaseSiCard_1.BaseSiCard {
     typeSpecificReadBasic() {
         return this.typeSpecificGetPage(0).then((page0) => {
             this.storage.splice(bytesPerPage * 0, bytesPerPage, ...page0);
+            this.emitProgress('basic', 0);
             const readCardNumber = this.storage.get('cardNumber').value;
             if (this.cardNumber !== readCardNumber) {
                 logger.warn('Card number mismatch', { expected: this.cardNumber, actual: readCardNumber });
@@ -203,6 +256,7 @@ class ModernSiCard extends BaseSiCard_1.BaseSiCard {
         }
         return this.typeSpecificGetPage(1).then((page1) => {
             this.storage.splice(bytesPerPage * 1, bytesPerPage, ...page1);
+            this.emitProgress('cardHolder', 1);
         });
     }
     typeSpecificReadPunches() {
@@ -212,6 +266,7 @@ class ModernSiCard extends BaseSiCard_1.BaseSiCard {
         return this.typeSpecificGetPage(4)
             .then((page4) => {
             this.storage.splice(bytesPerPage * 4, bytesPerPage, ...page4);
+            this.emitProgress('punches', 4);
             if (this.storage.get('punchCount').value <= punchesPerPage * 1) {
                 throw new ReadFinishedException();
             }
@@ -219,6 +274,7 @@ class ModernSiCard extends BaseSiCard_1.BaseSiCard {
         })
             .then((page5) => {
             this.storage.splice(bytesPerPage * 5, bytesPerPage, ...page5);
+            this.emitProgress('punches', 5);
             if (this.storage.get('punchCount').value <= punchesPerPage * 2) {
                 throw new ReadFinishedException();
             }
@@ -226,6 +282,7 @@ class ModernSiCard extends BaseSiCard_1.BaseSiCard {
         })
             .then((page6) => {
             this.storage.splice(bytesPerPage * 6, bytesPerPage, ...page6);
+            this.emitProgress('punches', 6);
             if (this.storage.get('punchCount').value <= punchesPerPage * 3) {
                 throw new ReadFinishedException();
             }
@@ -233,6 +290,7 @@ class ModernSiCard extends BaseSiCard_1.BaseSiCard {
         })
             .then((page7) => {
             this.storage.splice(bytesPerPage * 7, bytesPerPage, ...page7);
+            this.emitProgress('punches', 7);
             throw new ReadFinishedException();
         })
             .catch((exc) => {

package/SiCard/types/ModernSiCard.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModernSiCard.js","sourceRoot":"","sources":["../../../src/SiCard/types/ModernSiCard.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ModernSiCard.js","sourceRoot":"","sources":["../../../src/SiCard/types/ModernSiCard.ts"],"names":[],"mappings":"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"}

package/SiCard/types/PCard.d.ts

@@ -15,6 +15,8 @@ export declare class PCard extends ModernSiCard {
     storage: storage.ISiStorage<IPCardStorageFields>;
     uid?: number;
     constructor(cardNumber: number);
+    getMaxReadSteps(): number;
+    getEstimatedStepTimeMs(): number;
     typeSpecificRead(): Promise<void>;
 }
 //# sourceMappingURL=PCard.d.ts.map

package/SiCard/types/PCard.d.ts.map

@@ -1 +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"}
+{"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,EAA4B,MAAM,gBAAgB,CAAC;AAC1H,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,eAAe,IAAI,MAAM;IAIzB,sBAAsB,IAAI,MAAM;IAIhC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CA0CjC"}

package/SiCard/types/PCard.js

@@ -61,7 +61,7 @@ const parseCardHolder = (maybeCharCodes) => {
 };
 exports.pCardStorageLocations = {
     uid: new storage.SiInt([[0x03], [0x02], [0x01], [0x00]]),
-    cardSeries: new storage.SiEnum([[0x18]], ModernSiCard_1.ModernSiCardSeries),
+    cardSeries: ModernSiCard_1.cardSeriesStorageLocation,
     cardNumber: new storage.SiModified(new storage.SiArray(3, (i) => new storage.SiInt([[0x19 + (2 - i)]])), (extractedValue) => siProtocol.arr2cardNumber(extractedValue)),
     startTime: new siProtocol.SiTime([[0x0F], [0x0E], [0x0C]]),
     finishTime: new siProtocol.SiTime([[0x13], [0x12], [0x10]]),
@@ -96,11 +96,18 @@ class PCard extends ModernSiCard_1.ModernSiCard {
         super(cardNumber);
         this.storage = (0, exports.pCardStorageDefinition)();
     }
+    getMaxReadSteps() {
+        return 2;
+    }
+    getEstimatedStepTimeMs() {
+        return 800;
+    }
     typeSpecificRead() {
         return new Promise((resolve, reject) => {
             this.typeSpecificGetPage(0)
                 .then((page0) => {
                 this.storage.splice(bytesPerPage * 0, bytesPerPage, ...page0);
+                this.emitProgress('basic', 0);
                 const readCardNumber = this.storage.get('cardNumber').value;
                 if (this.cardNumber !== readCardNumber) {
                     logger.warn('Card number mismatch', { expected: this.cardNumber, actual: readCardNumber });
@@ -112,6 +119,7 @@ class PCard extends ModernSiCard_1.ModernSiCard {
             })
                 .then((page1) => {
                 this.storage.splice(bytesPerPage * 1, bytesPerPage, ...page1);
+                this.emitProgress('punches', 1);
                 throw new ReadFinishedException();
             })
                 .catch((exc) => {

package/SiCard/types/PCard.js.map

@@ -1 +1 @@
-{"version":3,"file":"PCard.js","sourceRoot":"","sources":["../../../src/SiCard/types/PCard.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PCard.js","sourceRoot":"","sources":["../../../src/SiCard/types/PCard.ts"],"names":[],"mappings":"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"}

package/SiCard/types/PCard.test.js

@@ -80,7 +80,7 @@ const FakePCard_1 = require("../../fakes/FakeSiCard/types/FakePCard");
         (0, globals_1.test)('returns undefined when the series does not match', () => {
             (0, globals_1.expect)(PCard_1.PCard.typeSpecificInstanceFromMessage({
                 command: constants_1.proto.cmd.SI8_DET,
-                parameters: [0x00, 0x00, testUtils.getRandomByteExcept([ModernSiCard_1.ModernSiCardSeries.PCard]), 0x22, 0x22, 0x22],
+                parameters: [0x00, 0x00, testUtils.getRandomByteExcept(Object.values(ModernSiCard_1.ModernSiCardSeries)), 0x22, 0x22, 0x22],
             })).toBe(undefined);
         });
     });

package/SiCard/types/PCard.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"PCard.test.js","sourceRoot":"","sources":["../../../src/SiCard/types/PCard.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PCard.test.js","sourceRoot":"","sources":["../../../src/SiCard/types/PCard.test.ts"],"names":[],"mappings":"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"}

package/SiCard/types/SIAC.d.ts

@@ -1,6 +1,46 @@
-import type * as siProtocol from '../../siProtocol';
-import { ModernSiCard } from './ModernSiCard';
+import * as storage from '../../storage';
+import * as siProtocol from '../../siProtocol';
+import { type IModernSiCardStorageFields, ModernSiCard } from './ModernSiCard';
+export declare const SIACBatteryStatus: {
+    OK: number;
+    LOW: number;
+};
+export interface ISIACStorageFields extends IModernSiCardStorageFields {
+    productionMonth: number;
+    productionYear: number;
+    hardwareVersionMajor: number;
+    hardwareVersionMinor: number;
+    softwareVersionMajor: number;
+    softwareVersionMinor: number;
+    batteryDate: Date;
+    batteryVoltage: number;
+    batteryRefV: number;
+    batteryStatus: keyof typeof SIACBatteryStatus;
+}
+export declare const siacStorageLocations: storage.ISiStorageLocations<ISIACStorageFields>;
+export declare const siacStorageDefinition: import("../../storage/interfaces").ISiStorageDefinition<ISIACStorageFields>;
 export declare class SIAC extends ModernSiCard {
     static typeSpecificInstanceFromMessage(message: siProtocol.SiMessage): SIAC | undefined;
+    storage: storage.ISiStorage<ISIACStorageFields>;
+    productionMonth?: number;
+    productionYear?: number;
+    hardwareVersionMajor?: number;
+    hardwareVersionMinor?: number;
+    softwareVersionMajor?: number;
+    softwareVersionMinor?: number;
+    batteryDate?: Date;
+    batteryVoltage?: number;
+    batteryRefV?: number;
+    batteryStatus?: keyof typeof SIACBatteryStatus;
+    constructor(cardNumber: number);
+    typeSpecificRead(): Promise<void>;
+    typeSpecificReadBattery(): Promise<void>;
+    private triggerBatteryMeasurement;
+    getMaxReadSteps(): number;
+    getBatteryVoltageV(): number | undefined;
+    getBatteryRefVoltageV(): number | undefined;
+    getProductionDate(): Date | undefined;
+    getHardwareVersion(): string | undefined;
+    getSoftwareVersion(): string | undefined;
 }
 //# sourceMappingURL=SIAC.d.ts.map

package/SiCard/types/SIAC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SIAC.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/SIAC.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,UAAU,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,qBAAa,IAAK,SAAQ,YAAY;IACrC,MAAM,CAAC,+BAA+B,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,GAAG,IAAI,GAAG,SAAS;CAYvF"}
+{"version":3,"file":"SIAC.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/SIAC.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACN,KAAK,0BAA0B,EAC/B,YAAY,EAEZ,MAAM,gBAAgB,CAAC;AAGxB,eAAO,MAAM,iBAAiB;;;CAG7B,CAAC;AAEF,MAAM,WAAW,kBAAmB,SAAQ,0BAA0B;IACrE,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,IAAI,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,OAAO,iBAAiB,CAAC;CAC9C;AAID,eAAO,MAAM,oBAAoB,EAAE,OAAO,CAAC,mBAAmB,CAAC,kBAAkB,CA2BhF,CAAC;AAEF,eAAO,MAAM,qBAAqB,6EAAqD,CAAC;AAExF,qBAAa,IAAK,SAAQ,YAAY;IACrC,MAAM,CAAC,+BAA+B,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,GAAG,IAAI,GAAG,SAAS;IAWhF,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAEhD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,OAAO,iBAAiB,CAAC;gBAE1C,UAAU,EAAE,MAAM;IAK9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6CjC,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;IASxC,OAAO,CAAC,yBAAyB;IAejC,eAAe,IAAI,MAAM;IAIzB,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAOxC,qBAAqB,IAAI,MAAM,GAAG,SAAS;IAO3C,iBAAiB,IAAI,IAAI,GAAG,SAAS;IAUrC,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAOxC,kBAAkB,IAAI,MAAM,GAAG,SAAS;CAMxC"}

package/SiCard/types/SIAC.js

@@ -1,21 +1,176 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SIAC = void 0;
+exports.SIAC = exports.siacStorageDefinition = exports.siacStorageLocations = exports.SIACBatteryStatus = void 0;
+const storage = __importStar(require("../../storage"));
+const constants_1 = require("../../constants");
 const ModernSiCard_1 = require("./ModernSiCard");
 const BaseSiCard_1 = require("../BaseSiCard");
+exports.SIACBatteryStatus = {
+    OK: 0xaa,
+    LOW: 0x6c,
+};
+const bytesPerPage = 128;
+exports.siacStorageLocations = Object.assign(Object.assign({}, ModernSiCard_1.modernSiCardStorageLocations), { productionMonth: new storage.SiInt([[0x1c]]), productionYear: new storage.SiInt([[0x1d]]), hardwareVersionMajor: new storage.SiInt([[0x1c0]]), hardwareVersionMinor: new storage.SiInt([[0x1c1]]), softwareVersionMajor: new storage.SiInt([[0x1c2]]), softwareVersionMinor: new storage.SiInt([[0x1c3]]), batteryDate: new storage.SiModified(new storage.SiDict({
+        year: new storage.SiInt([[0x1bc]]),
+        month: new storage.SiInt([[0x1bd]]),
+        day: new storage.SiInt([[0x1be]]),
+    }), (data) => {
+        if (data.year === undefined || data.month === undefined || data.day === undefined) {
+            return undefined;
+        }
+        if (data.year === 0 && data.month === 0 && data.day === 0) {
+            return undefined;
+        }
+        return new Date(2000 + data.year, data.month - 1, data.day);
+    }), batteryVoltage: new storage.SiInt([[0x1c7]]), batteryRefV: new storage.SiInt([[0x1d4]]), batteryStatus: new storage.SiEnum([[0x1d5]], exports.SIACBatteryStatus) });
+exports.siacStorageDefinition = storage.defineStorage(0x400, exports.siacStorageLocations);
 class SIAC extends ModernSiCard_1.ModernSiCard {
     static typeSpecificInstanceFromMessage(message) {
         const info = this.parseModernSiCardDetectionMessage(message);
         if (info === undefined) {
             return undefined;
         }
-        // if (info.cardSeries !== ModernSiCardSeries.SIAC) {
-        // TODO: find out the series value and remove this hack
-        if (info.cardNumber < 8000000 || info.cardNumber >= 9000000) {
+        if (info.cardSeries !== 'SIAC') {
             return undefined;
         }
         return new this(info.cardNumber);
     }
+    constructor(cardNumber) {
+        super(cardNumber);
+        this.storage = (0, exports.siacStorageDefinition)();
+    }
+    typeSpecificRead() {
+        return new Promise((resolve, reject) => {
+            this.typeSpecificReadBasic()
+                .then(() => this.typeSpecificReadCardHolder())
+                .then(() => this.typeSpecificReadPunches())
+                .then(() => this.typeSpecificReadBattery())
+                .then(() => {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+                this.punchCount = (_a = this.storage.get('punchCount')) === null || _a === void 0 ? void 0 : _a.value;
+                this.cardSeries = (_b = this.storage.get('cardSeries')) === null || _b === void 0 ? void 0 : _b.value;
+                this.productionMonth = (_c = this.storage.get('productionMonth')) === null || _c === void 0 ? void 0 : _c.value;
+                this.productionYear = (_d = this.storage.get('productionYear')) === null || _d === void 0 ? void 0 : _d.value;
+                this.hardwareVersionMajor = (_e = this.storage.get('hardwareVersionMajor')) === null || _e === void 0 ? void 0 : _e.value;
+                this.hardwareVersionMinor = (_f = this.storage.get('hardwareVersionMinor')) === null || _f === void 0 ? void 0 : _f.value;
+                this.softwareVersionMajor = (_g = this.storage.get('softwareVersionMajor')) === null || _g === void 0 ? void 0 : _g.value;
+                this.softwareVersionMinor = (_h = this.storage.get('softwareVersionMinor')) === null || _h === void 0 ? void 0 : _h.value;
+                this.batteryDate = (_j = this.storage.get('batteryDate')) === null || _j === void 0 ? void 0 : _j.value;
+                this.batteryVoltage = (_k = this.storage.get('batteryVoltage')) === null || _k === void 0 ? void 0 : _k.value;
+                this.batteryRefV = (_l = this.storage.get('batteryRefV')) === null || _l === void 0 ? void 0 : _l.value;
+                this.batteryStatus = (_m = this.storage.get('batteryStatus')) === null || _m === void 0 ? void 0 : _m.value;
+                this.raceResult = {
+                    cardNumber: ((_o = this.storage.get('cardNumber')) === null || _o === void 0 ? void 0 : _o.value) || 0,
+                    startTime: (_p = this.storage.get('startTime')) === null || _p === void 0 ? void 0 : _p.value,
+                    finishTime: (_q = this.storage.get('finishTime')) === null || _q === void 0 ? void 0 : _q.value,
+                    checkTime: (_r = this.storage.get('checkTime')) === null || _r === void 0 ? void 0 : _r.value,
+                    punches: (_s = this.storage.get('punches')) === null || _s === void 0 ? void 0 : _s.value,
+                    cardHolder: (_t = this.storage.get('cardHolder')) === null || _t === void 0 ? void 0 : _t.value,
+                    siac: {
+                        productionDate: this.getProductionDate(),
+                        hardwareVersion: this.getHardwareVersion(),
+                        softwareVersion: this.getSoftwareVersion(),
+                        battery: {
+                            date: this.batteryDate,
+                            voltage: this.getBatteryVoltageV(),
+                            referenceVoltage: this.getBatteryRefVoltageV(),
+                            status: this.batteryStatus,
+                        },
+                    },
+                };
+                resolve();
+            })
+                .catch((exc) => reject(exc));
+        });
+    }
+    typeSpecificReadBattery() {
+        return this.triggerBatteryMeasurement()
+            .then(() => this.typeSpecificGetPage(3))
+            .then((page3) => {
+            this.storage.splice(bytesPerPage * 3, bytesPerPage, ...page3);
+            this.emitProgress('battery', 3);
+        });
+    }
+    triggerBatteryMeasurement() {
+        if (!this.mainStation) {
+            return Promise.reject(new Error('No main station'));
+        }
+        return this.mainStation
+            .sendMessage({
+            command: constants_1.proto.cmd.SET_SI8,
+            parameters: [0x7e, 0x05, 0x05, 0x05, 0x05]
+        }, 1)
+            .then(() => { });
+    }
+    getMaxReadSteps() {
+        return 8; // pages 0, 1, measurement, 3, 4, 5, 6, 7
+    }
+    getBatteryVoltageV() {
+        if (this.batteryVoltage === undefined) {
+            return undefined;
+        }
+        return 1.9 + (this.batteryVoltage * 0.09);
+    }
+    getBatteryRefVoltageV() {
+        if (this.batteryRefV === undefined) {
+            return undefined;
+        }
+        return 1.9 + (this.batteryRefV * 0.09);
+    }
+    getProductionDate() {
+        if (this.productionMonth === undefined || this.productionYear === undefined) {
+            return undefined;
+        }
+        if (this.productionMonth === 0 && this.productionYear === 0) {
+            return undefined;
+        }
+        return new Date(2000 + this.productionYear, this.productionMonth - 1, 1);
+    }
+    getHardwareVersion() {
+        if (this.hardwareVersionMajor === undefined || this.hardwareVersionMinor === undefined) {
+            return undefined;
+        }
+        return `${this.hardwareVersionMajor}.${this.hardwareVersionMinor}`;
+    }
+    getSoftwareVersion() {
+        if (this.softwareVersionMajor === undefined || this.softwareVersionMinor === undefined) {
+            return undefined;
+        }
+        return `${this.softwareVersionMajor}.${this.softwareVersionMinor}`;
+    }
 }
 exports.SIAC = SIAC;
 BaseSiCard_1.BaseSiCard.registerNumberRange(8000000, 9000000, SIAC);

package/SiCard/types/SIAC.js.map

@@ -1 +1 @@
-{"version":3,"file":"SIAC.js","sourceRoot":"","sources":["../../../src/SiCard/types/SIAC.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAC9C,8CAA2C;AAE3C,MAAa,IAAK,SAAQ,2BAAY;IACrC,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,qDAAqD;QACrD,uDAAuD;QACvD,IAAI,IAAI,CAAC,UAAU,GAAG,OAAO,IAAI,IAAI,CAAC,UAAU,IAAI,OAAO,EAAE,CAAC;YAC7D,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;CACD;AAbD,oBAaC;AACD,uBAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC"}
+{"version":3,"file":"SIAC.js","sourceRoot":"","sources":["../../../src/SiCard/types/SIAC.ts"],"names":[],"mappings":"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"}