sportident.js 1.5.3 → 1.6.0

package/SiCard/types/ModernSiCard.js

@@ -149,6 +149,12 @@ class ModernSiCard extends BaseSiCard_1.BaseSiCard {
         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 +196,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 +210,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 +220,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 +228,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 +236,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 +244,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,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,eAAe,IAAI,MAAM;IAIzB,sBAAsB,IAAI,MAAM;IAIhC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CA0CjC"}

package/SiCard/types/PCard.js

@@ -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/SiCard5.d.ts

@@ -25,6 +25,8 @@ export declare class SiCard5 extends BaseSiCard {
     punchCount?: number;
     softwareVersion?: number;
     constructor(cardNumber: number);
+    getMaxReadSteps(): number;
+    getEstimatedStepTimeMs(): number;
     typeSpecificRead(): Promise<void>;
 }
 export {};

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

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

package/SiCard/types/SiCard5.js

@@ -95,6 +95,12 @@ class SiCard5 extends BaseSiCard_1.BaseSiCard {
         super(cardNumber);
         this.storage = (0, exports.siCard5StorageDefinition)();
     }
+    getMaxReadSteps() {
+        return 1;
+    }
+    getEstimatedStepTimeMs() {
+        return 1500;
+    }
     typeSpecificRead() {
         if (!this.mainStation) {
             return Promise.reject(new Error('No main station'));
@@ -107,6 +113,7 @@ class SiCard5 extends BaseSiCard_1.BaseSiCard {
             .then((data) => {
             var _a, _b, _c;
             this.storage.splice(bytesPerPage * 0, bytesPerPage, ...data[0].slice(2));
+            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 });

package/SiCard/types/SiCard5.js.map

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

package/SiCard/types/SiCard6.d.ts

@@ -39,6 +39,8 @@ export declare class SiCard6 extends BaseSiCard {
     punchCountPlus1?: number;
     lastPunchedCode?: number;
     constructor(cardNumber: number);
+    getMaxReadSteps(): number;
+    getEstimatedStepTimeMs(): number;
     typeSpecificGetPage(pageNumber: number): Promise<number[]>;
     typeSpecificRead(): Promise<void>;
     typeSpecificReadBasic(): Promise<void>;

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

@@ -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;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"}
+{"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,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;IAwBjC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYtC,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3C,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;CAyBxC"}

package/SiCard/types/SiCard6.js

@@ -128,6 +128,12 @@ class SiCard6 extends BaseSiCard_1.BaseSiCard {
         super(cardNumber);
         this.storage = (0, exports.siCard6StorageDefinition)();
     }
+    getMaxReadSteps() {
+        return 4;
+    }
+    getEstimatedStepTimeMs() {
+        return 1500;
+    }
     typeSpecificGetPage(pageNumber) {
         if (!this.mainStation) {
             return Promise.reject(new Error('No main station'));
@@ -171,6 +177,7 @@ class SiCard6 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 });
@@ -181,6 +188,7 @@ class SiCard6 extends BaseSiCard_1.BaseSiCard {
         // TODO: test this with real device
         return this.typeSpecificGetPage(1).then((page1) => {
             this.storage.splice(bytesPerPage * 1, bytesPerPage, ...page1);
+            this.emitProgress('cardHolder', 1);
         });
     }
     typeSpecificReadPunches() {
@@ -190,6 +198,7 @@ class SiCard6 extends BaseSiCard_1.BaseSiCard {
         return this.typeSpecificGetPage(6)
             .then((page6) => {
             this.storage.splice(bytesPerPage * 6, bytesPerPage, ...page6);
+            this.emitProgress('punches', 6);
             if (this.storage.get('punchCount').value <= punchesPerPage * 1) {
                 throw new ReadFinishedException();
             }
@@ -197,6 +206,7 @@ class SiCard6 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/SiCard6.js.map

@@ -1 +1 @@
-{"version":3,"file":"SiCard6.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard6.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,6DAA+C;AAC/C,+CAAwC;AAExC,8CAA2C;AAE3C,mDAAqC;AAErC,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;AAOpB,MAAM,cAAc,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,YAAY,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAAjE,QAAA,cAAc,kBAAmD;AAEvE,MAAM,WAAW,GAAG,CAAC,UAAiD,EAAY,EAAE;IAC1F,MAAM,iBAAiB,GAAG,CAAC,KAAwC,EAAmB,EAAE,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;IAC5L,MAAM,iBAAiB,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IACrF,MAAM,mBAAmB,GAAG,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;IAC3G,OAAO,mBAAmB,CAAC,MAAM,CAAS,iBAAiB,CAAC,CAAC;AAC9D,CAAC,CAAC;AALW,QAAA,WAAW,eAKtB;AAEF,MAAM,gBAAgB,GAAG,CAAC,cAAsC,EAAE,EAAE;IACnE,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,aAAiC,EAAE,EAAE,CAAC,aAAa,KAAK,SAAS,CAAC,EAAE,CAAC;QAC7F,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,SAAS,GAAG,cAA0B,CAAC;IAC7C,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,QAAQ,KAAK,IAAI,CAAC;IACnE,MAAM,iBAAiB,GAAG,SAAS,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAClE,MAAM,gBAAgB,GAAG,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACtG,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,QAAgB,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC3F,CAAC,CAAC;AAuBW,QAAA,uBAAuB,GAAuD;IAC1F,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,SAAS,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,eAAe,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACpD,UAAU,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,eAAe,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5C,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,mBAAW,EAAC,UAAU,CAAC,CACvC;IACD,UAAU,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC;QAC9B,QAAQ,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,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,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC7I,SAAS,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,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,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9I,OAAO,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,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,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC3I,IAAI,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,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,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACzI,MAAM,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,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,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC3I,KAAK,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,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,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC1I,KAAK,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,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,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC1I,MAAM,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,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,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC3I,IAAI,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,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,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACzI,GAAG,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,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,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACvI,MAAM,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,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,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC1I,QAAQ,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,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,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC5I,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,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;KAC3K,CAAC;CACF,CAAC;AACW,QAAA,wBAAwB,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,+BAAuB,CAAC,CAAC;AAE9F,MAAa,OAAQ,SAAQ,uBAAU;IAGtC,MAAM,CAAC,+BAA+B,CAAC,OAA6B;QACnE,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAChC,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,OAAO,CAAC,OAAO,KAAK,iBAAK,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YAC3C,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,MAAM,UAAU,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpH,0BAA0B;QAC1B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7B,CAAC;IAQD,YAAY,UAAkB;QAC7B,KAAK,CAAC,UAAU,CAAC,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,IAAA,gCAAwB,GAAE,CAAC;IAC3C,CAAC;IAED,mBAAmB,CAAC,UAAkB;QACrC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,IAAI,CAAC,WAAW;aACrB,WAAW,CACX;YACC,OAAO,EAAE,iBAAK,CAAC,GAAG,CAAC,OAAO;YAC1B,UAAU,EAAE,CAAC,UAAU,CAAC;SACxB,EACD,CAAC,CACD;aACA,IAAI,CAAC,CAAC,IAAgB,EAAE,EAAE;YAC1B,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,CAAC;gBAC/B,MAAM,CAAC,IAAI,CAAC,iCAAiC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,wBAAwB,UAAU,GAAG,CAAC,CAAC;YAC/F,CAAC;YACD,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB;QACf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,IAAI,CAAC,qBAAqB,EAAE;iBAC1B,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC;iBAC7C,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;iBAC1C,IAAI,CAAC,GAAG,EAAE;;gBACV,IAAI,CAAC,UAAU,GAAG;oBACjB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK;oBACjD,SAAS,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,0CAAE,KAAK;oBAC/C,UAAU,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,0CAAE,KAAK;oBACjD,SAAS,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,0CAAE,KAAK;oBAC/C,SAAS,EAAE,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,0CAAE,KAAK;oBAC/C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC,KAAK;oBAC3C,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK;iBACjD,CAAC;gBACF,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK,CAAC;gBACxD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAE,CAAC,KAAK,CAAC;gBAClE,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAE,CAAC,KAAK,CAAC;gBAClE,OAAO,EAAE,CAAC;YACX,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,qBAAqB;QACpB,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAe,EAAE,EAAE;YAC3D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC;YAE9D,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK,CAAC;YAC7D,IAAI,IAAI,CAAC,UAAU,KAAK,cAAc,EAAE,CAAC;gBACxC,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;YAC5F,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,0BAA0B;QACzB,mCAAmC;QACnC,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAe,EAAE,EAAE;YAC3D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,uBAAuB;QACtB,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;YACjE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;aAChC,IAAI,CAAC,CAAC,KAAe,EAAE,EAAE;YACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC;YAC9D,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;gBACjE,MAAM,IAAI,qBAAqB,EAAE,CAAC;YACnC,CAAC;YACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;QACpC,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,KAAe,EAAE,EAAE;YACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC;YAC9D,MAAM,IAAI,qBAAqB,EAAE,CAAC;QACnC,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;YACrB,IAAI,GAAG,YAAY,qBAAqB,EAAE,CAAC;gBAC1C,OAAO;YACR,CAAC;YACD,MAAM,GAAG,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC;;AApHF,0BAqHC;AApHO,qBAAa,GAAG,eAAe,CAAC;AAqHxC,uBAAU,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AACzD,uBAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC"}
+{"version":3,"file":"SiCard6.js","sourceRoot":"","sources":["../../../src/SiCard/types/SiCard6.ts"],"names":[],"mappings":"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"}

package/SiCard/types/SiCard8.d.ts

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

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

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

package/SiCard/types/SiCard8.js

@@ -101,11 +101,18 @@ class SiCard8 extends ModernSiCard_1.ModernSiCard {
         super(cardNumber);
         this.storage = (0, exports.siCard8StorageDefinition)();
     }
+    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 });
@@ -117,6 +124,7 @@ class SiCard8 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/SiCard8.js.map

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

package/SiCard/types/SiCard9.d.ts

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

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

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

package/SiCard/types/SiCard9.js

@@ -101,11 +101,18 @@ class SiCard9 extends ModernSiCard_1.ModernSiCard {
         super(cardNumber);
         this.storage = (0, exports.siCard9StorageDefinition)();
     }
+    getMaxReadSteps() {
+        return 2;
+    }
+    getEstimatedStepTimeMs() {
+        return 600;
+    }
     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 });
@@ -117,6 +124,7 @@ class SiCard9 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/SiCard9.js.map

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

package/SiCard/types/TCard.d.ts

@@ -2,6 +2,7 @@ import type * as siProtocol from '../../siProtocol';
 import { BaseSiCard } from '../BaseSiCard';
 export declare class TCard extends BaseSiCard {
     static typeSpecificInstanceFromMessage(_message: siProtocol.SiMessage): TCard | undefined;
+    getMaxReadSteps(): number;
     typeSpecificRead(): Promise<void>;
 }
 //# sourceMappingURL=TCard.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"TCard.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/TCard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,UAAU,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,qBAAa,KAAM,SAAQ,UAAU;IACpC,MAAM,CAAC,+BAA+B,CAAC,QAAQ,EAAE,UAAU,CAAC,SAAS,GAAG,KAAK,GAAG,SAAS;IAIzF,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAGjC"}
+{"version":3,"file":"TCard.d.ts","sourceRoot":"","sources":["../../../src/SiCard/types/TCard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,UAAU,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,qBAAa,KAAM,SAAQ,UAAU;IACpC,MAAM,CAAC,+BAA+B,CAAC,QAAQ,EAAE,UAAU,CAAC,SAAS,GAAG,KAAK,GAAG,SAAS;IAIzF,eAAe,IAAI,MAAM;IAIzB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAGjC"}

package/SiCard/types/TCard.js

@@ -40,6 +40,9 @@ class TCard extends BaseSiCard_1.BaseSiCard {
     static typeSpecificInstanceFromMessage(_message) {
         return undefined;
     }
+    getMaxReadSteps() {
+        return 0; // Not implemented
+    }
     typeSpecificRead() {
         return Promise.reject(new utils.NotImplementedError());
     }

package/SiCard/types/TCard.js.map

@@ -1 +1 @@
-{"version":3,"file":"TCard.js","sourceRoot":"","sources":["../../../src/SiCard/types/TCard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAqC;AAErC,8CAA2C;AAE3C,MAAa,KAAM,SAAQ,uBAAU;IACpC,MAAM,CAAC,+BAA+B,CAAC,QAA8B;QACpE,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,gBAAgB;QACf,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACxD,CAAC;CACD;AARD,sBAQC;AACD,uBAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC"}
+{"version":3,"file":"TCard.js","sourceRoot":"","sources":["../../../src/SiCard/types/TCard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAqC;AAErC,8CAA2C;AAE3C,MAAa,KAAM,SAAQ,uBAAU;IACpC,MAAM,CAAC,+BAA+B,CAAC,QAA8B;QACpE,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,eAAe;QACd,OAAO,CAAC,CAAC,CAAC,kBAAkB;IAC7B,CAAC;IAED,gBAAgB;QACf,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACxD,CAAC;CACD;AAZD,sBAYC;AACD,uBAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC"}

package/index.d.ts

@@ -67,6 +67,10 @@ export declare const si: {
     getModernSiCardExamples: () => {
         [name: string]: import("./SiCard/ISiCardExamples").SiCardSample;
     };
+    SiCardReadStartEvent: typeof siCardExports.SiCardReadStartEvent;
+    SiCardReadProgressEvent: typeof siCardExports.SiCardReadProgressEvent;
+    SiCardReadCompleteEvent: typeof siCardExports.SiCardReadCompleteEvent;
+    SiCardReadErrorEvent: typeof siCardExports.SiCardReadErrorEvent;
 };
 export default si;
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,aAAa,MAAM,UAAU,CAAC;AAC1C,OAAO,KAAK,eAAe,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,YAAY,MAAM,SAAS,CAAC;AACxC,OAAO,KAAK,gBAAgB,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,cAAc,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CASd,CAAC;AAEF,eAAe,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,aAAa,MAAM,UAAU,CAAC;AAC1C,OAAO,KAAK,eAAe,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,YAAY,MAAM,SAAS,CAAC;AACxC,OAAO,KAAK,gBAAgB,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,cAAc,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CASd,CAAC;AAEF,eAAe,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sportident.js",
-  "version": "1.5.3",
+  "version": "1.6.0",
   "description": "JavaScript interface to SportIdent devices",
   "scripts": {
     "build": "tsc -b --verbose",
@@ -31,7 +31,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "immutable": "^5.1.3"
+    "immutable": "^5.1.4"
   },
   "bugs": {
     "url": "https://github.com/fadnincx/sportident.js/issues"
@@ -41,9 +41,9 @@
     "@types/jest": "^30.0.0",
     "@types/w3c-web-serial": "^1.0.8",
     "@types/w3c-web-usb": "^1.0.13",
-    "@typescript-eslint/eslint-plugin": "^8.45.0",
-    "@typescript-eslint/parser": "^8.45.0",
-    "eslint": "^9.36.0",
+    "@typescript-eslint/eslint-plugin": "^8.54.0",
+    "@typescript-eslint/parser": "^8.54.0",
+    "eslint": "^9.36.2",
     "jest": "^30.2.0",
     "jest-environment-jsdom": "^30.2.0",
     "ts-jest": "^29.4.4",