ajustes para token

2026-04-13 11:35:33 +02:00
parent 5905e79357
commit 2f17390405
5 changed files with 65 additions and 49 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,20 +1,20 @@
 {
    "name": "nfc-app-desktop",
-    "version": "1.0.0",
+    "version": "1.1.0",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
            "name": "nfc-app-desktop",
-            "version": "1.0.0",
+            "version": "1.1.0",
            "hasInstallScript": true,
            "dependencies": {
                "@electron-toolkit/preload": "^3.0.2",
                "@electron-toolkit/utils": "^4.0.0",
+                "@pokusew/pcsclite": "^0.6.0",
                "@tockawa/nfc-pcsc": "latest",
-                "axios": "^1.13.6",
                "electron-updater": "^6.3.9",
-                "nfc-pcsc": "latest"
+                "nfc-pcsc": "^0.8.1"
            },
            "devDependencies": {
                "@electron-toolkit/eslint-config-prettier": "3.0.0",
@@ -3151,6 +3151,7 @@
            "version": "0.4.0",
            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+            "dev": true,
            "license": "MIT"
        },
        "node_modules/at-least-node": {
@@ -3163,17 +3164,6 @@
                "node": ">= 4.0.0"
            }
        },
-        "node_modules/axios": {
-            "version": "1.13.6",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.6.tgz",
-            "integrity": "sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ==",
-            "license": "MIT",
-            "dependencies": {
-                "follow-redirects": "^1.15.11",
-                "form-data": "^4.0.5",
-                "proxy-from-env": "^1.1.0"
-            }
-        },
        "node_modules/balanced-match": {
            "version": "4.0.4",
            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
@@ -3545,6 +3535,7 @@
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
            "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "es-errors": "^1.3.0",
@@ -3740,6 +3731,7 @@
            "version": "1.0.8",
            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "delayed-stream": "~1.0.0"
@@ -3981,6 +3973,7 @@
            "version": "1.0.0",
            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+            "dev": true,
            "license": "MIT",
            "engines": {
                "node": ">=0.4.0"
@@ -4160,6 +4153,7 @@
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
            "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "call-bind-apply-helpers": "^1.0.1",
@@ -4541,6 +4535,7 @@
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
            "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+            "devOptional": true,
            "license": "MIT",
            "engines": {
                "node": ">= 0.4"
@@ -4550,6 +4545,7 @@
            "version": "1.3.0",
            "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+            "devOptional": true,
            "license": "MIT",
            "engines": {
                "node": ">= 0.4"
@@ -4559,6 +4555,7 @@
            "version": "1.1.1",
            "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
            "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "es-errors": "^1.3.0"
@@ -4571,6 +4568,7 @@
            "version": "2.1.0",
            "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
            "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "es-errors": "^1.3.0",
@@ -5128,26 +5126,6 @@
            "dev": true,
            "license": "ISC"
        },
-        "node_modules/follow-redirects": {
-            "version": "1.15.11",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-            "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://github.com/sponsors/RubenVerborgh"
-                }
-            ],
-            "license": "MIT",
-            "engines": {
-                "node": ">=4.0"
-            },
-            "peerDependenciesMeta": {
-                "debug": {
-                    "optional": true
-                }
-            }
-        },
        "node_modules/foreground-child": {
            "version": "3.3.1",
            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
@@ -5182,6 +5160,7 @@
            "version": "4.0.5",
            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
            "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "asynckit": "^0.4.0",
@@ -5247,6 +5226,7 @@
            "version": "1.1.2",
            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+            "dev": true,
            "license": "MIT",
            "funding": {
                "url": "https://github.com/sponsors/ljharb"
@@ -5276,6 +5256,7 @@
            "version": "1.3.0",
            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
            "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "call-bind-apply-helpers": "^1.0.2",
@@ -5300,6 +5281,7 @@
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
            "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "dunder-proto": "^1.0.1",
@@ -5455,6 +5437,7 @@
            "version": "1.2.0",
            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
            "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+            "devOptional": true,
            "license": "MIT",
            "engines": {
                "node": ">= 0.4"
@@ -5521,6 +5504,7 @@
            "version": "1.1.0",
            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
            "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+            "dev": true,
            "license": "MIT",
            "engines": {
                "node": ">= 0.4"
@@ -5533,6 +5517,7 @@
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
            "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "has-symbols": "^1.0.3"
@@ -5548,6 +5533,7 @@
            "version": "2.0.2",
            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "function-bind": "^1.1.2"
@@ -6116,6 +6102,7 @@
            "version": "1.1.0",
            "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
            "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+            "dev": true,
            "license": "MIT",
            "engines": {
                "node": ">= 0.4"
@@ -6138,6 +6125,7 @@
            "version": "1.52.0",
            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+            "dev": true,
            "license": "MIT",
            "engines": {
                "node": ">= 0.6"
@@ -6147,6 +6135,7 @@
            "version": "2.1.35",
            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "mime-db": "1.52.0"
@@ -6999,12 +6988,6 @@
                "signal-exit": "^3.0.2"
            }
        },
-        "node_modules/proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "license": "MIT"
-        },
        "node_modules/pump": {
            "version": "3.0.4",
            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz",
--- a/package.json
+++ b/package.json
@@ -25,8 +25,10 @@
    "dependencies": {
        "@electron-toolkit/preload": "^3.0.2",
        "@electron-toolkit/utils": "^4.0.0",
+        "@pokusew/pcsclite": "^0.6.0",
        "@tockawa/nfc-pcsc": "latest",
-        "electron-updater": "^6.3.9"
+        "electron-updater": "^6.3.9",
+        "nfc-pcsc": "^0.8.1"
    },
    "devDependencies": {
        "@electron-toolkit/eslint-config-prettier": "3.0.0",
--- a/src/main/handlers.ts
+++ b/src/main/handlers.ts
@@ -90,7 +90,7 @@ export async function printReqHandler(
            res("ok");
        });

-        socket.on("timeout", (err) => {
+        socket.on("timeout", (err: unknown) => {
            if (finished) return;
            finished = true;
            logger.error("Print timeout", err);
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -6,6 +6,7 @@ import { NfcService } from "../services/NfcService";
 import { labelReqHandler, printReqHandler } from "./handlers";
 import { logger } from "./LogService";
 import { createConnection } from "net";
+import { NfcServiceAlt } from "../services/NfcService-alt";

 // 1. Global Error Handling (CRITICAL: As early as possible)
 process.on("uncaughtException", (error) => {
@@ -21,7 +22,9 @@ process.on("unhandledRejection", (reason) => {
 });

 logger.info(">>> MAIN PROCESS BOOTSTRAP START <<<");
-logger.info(`Platform: ${process.platform} | Arch: ${process.arch} | Version: ${app.getVersion()}`);
+logger.info(
+    `Platform: ${process.platform} | Arch: ${process.arch} | Version: ${app.getVersion()}`,
+);

 function createWindow(): void {
    logger.info("Creating main window...");
@@ -38,7 +41,7 @@ function createWindow(): void {
        },
    });

-    let nfcService: NfcService | null = null;
+    let nfcService: NfcServiceAlt | null = null;

    ipcMain.handle("nfc:getReaderName", () => {
        return nfcService ? nfcService.getReaderName() : "OFFLINE";
@@ -46,11 +49,13 @@ function createWindow(): void {

    mainWindow.on("ready-to-show", () => {
        mainWindow.show();
+    });

+    mainWindow.on("show", () => {
        // 2. Initialize NFC AFTER window is ready to show (DEFERRED INIT)
        logger.info("Deferred: Initializing NfcService...");
        try {
-            nfcService = new NfcService((event) => {
+            nfcService = new NfcServiceAlt((event) => {
                if (!mainWindow.isDestroyed()) {
                    mainWindow.webContents.send(`nfc:${event.type}`, event);
                }
--- a/src/services/NfcService.ts
+++ b/src/services/NfcService.ts
@@ -1,12 +1,25 @@
-import PCSC, { Tag, Reader } from "@tockawa/nfc-pcsc";
+import PCSC, { Tag, Reader, KEYS } from "@tockawa/nfc-pcsc";
 import { logger } from "../main/LogService";

+function formatHexBuffer(buff: Buffer): string {
+    const str = (
+        buff
+            .toString("hex")
+            .replace(/(.{2})/g, "$1 ")
+            .match(/.{1,48}/g) ?? [""]
+    ).join("\n");
+    return str;
+}
+
 export type NfcEvent =
    | { type: "tag"; uid: string }
    | { type: "removed"; uid: string }
    | { type: "reader"; name: string }
    | { type: "error"; message: string };

+// Extract the KEY_TYPE_A constant from the KEYS module, which represents the type A authentication key.
+const { KEY_TYPE_A } = KEYS;
+
 export class NfcService {
    private nfc: PCSC;
    private onEvent?: (event: NfcEvent) => void;
@@ -32,21 +45,34 @@ export class NfcService {
    }

    private init(): void {
-        logger.info("NfcService: Starting initialization and attaching listeners...");
+        logger.info(
+            "NfcService: Starting initialization and attaching listeners...",
+        );
        this.nfc.on("reader", (reader: Reader) => {
            console.log(`Lector detectado: ${reader.name}`);
            logger.info(`NFC Reader detected: ${reader.name}`);
+            reader.aid = "a0000000041010";
+
            this.currentReaderName = reader.name;
            if (this.onEvent) {
                this.onEvent({ type: "reader", name: reader.name });
            }

            reader.on("card", async (card: Tag) => {
-                console.log(`Tarjeta detectada! UID: ${card.uid}`);
+                console.log(`Tarjeta detectada! UID: ${JSON.stringify(card)}`);
                logger.info(`NFC Tag detected: ${card.uid}`);
+                const GET_OPTIONS = "80A8000002830000";
+                const res = await reader.transmit(
+                    Buffer.from(GET_OPTIONS, "hex"),
+                    18,
+                );
+                console.log("PORCESSING OPTIONS", res.toString("hex"));
                if (this.onEvent) {
                    this.onEvent({ type: "tag", uid: card.uid });
                }
+                //await reader.authenticate(2, KEY_TYPE_A, "A000000004");
+                //const data = await reader.read(2, 16);
+                //console.log("bloque2", data.toString("utf8"));
            });

            reader.on("card.off", async (card: Tag) => {