smartcard 2.0.1 → 2.0.3

package/lib/devices.js

@@ -50,6 +50,8 @@ class Devices extends EventEmitter {
         this._running = false;
         /** @type {Map<string, ReaderState>} */
         this._readers = new Map();
+        /** @type {Promise<void>} Event queue to serialize event handling */
+        this._eventQueue = Promise.resolve();
     }
 
     /**
@@ -131,10 +133,20 @@ class Devices extends EventEmitter {
 
     /**
      * Handle events from native monitor
+     * Queues events to prevent race conditions when multiple events arrive concurrently
+     * @param {MonitorEvent} event
+     */
+    _handleEvent(event) {
+        // Chain this event onto the queue to serialize processing
+        this._eventQueue = this._eventQueue.then(() => this._processEvent(event));
+    }
+
+    /**
+     * Process a single event (called sequentially via queue)
      * @param {MonitorEvent} event
      * @returns {Promise<void>}
      */
-    async _handleEvent(event) {
+    async _processEvent(event) {
         if (!this._running) {
             return;
         }
@@ -143,7 +155,7 @@ class Devices extends EventEmitter {
 
         switch (type) {
             case 'reader-attached':
-                this._handleReaderAttached(readerName, state, atr);
+                await this._handleReaderAttached(readerName, state, atr);
                 break;
 
             case 'reader-detached':
@@ -170,8 +182,9 @@ class Devices extends EventEmitter {
      * @param {string} readerName
      * @param {number} state
      * @param {Buffer|null} atr
+     * @returns {Promise<void>}
      */
-    _handleReaderAttached(readerName, state, atr) {
+    async _handleReaderAttached(readerName, state, atr) {
         // Initialize reader state
         this._readers.set(readerName, {
             hasCard: false,
@@ -189,7 +202,7 @@ class Devices extends EventEmitter {
 
         // Check if card is already present
         if ((state & SCARD_STATE_PRESENT) !== 0) {
-            this._handleCardInserted(readerName, state, atr);
+            await this._handleCardInserted(readerName, state, atr);
         }
     }
 
@@ -233,10 +246,27 @@ class Devices extends EventEmitter {
             const reader = readers.find(r => r.name === readerName);
 
             if (reader) {
-                const card = await reader.connect(
-                    SCARD_SHARE_SHARED,
-                    SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1
-                );
+                let card;
+                try {
+                    // First try with both T=0 and T=1 protocols
+                    card = await reader.connect(
+                        SCARD_SHARE_SHARED,
+                        SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1
+                    );
+                } catch (dualProtocolErr) {
+                    // If dual protocol fails (e.g., SCARD_W_UNRESPONSIVE_CARD),
+                    // fallback to T=0 only (issue #34)
+                    if (dualProtocolErr.message &&
+                        dualProtocolErr.message.toLowerCase().includes('unresponsive')) {
+                        card = await reader.connect(
+                            SCARD_SHARE_SHARED,
+                            SCARD_PROTOCOL_T0
+                        );
+                    } else {
+                        // Re-throw if it's a different error
+                        throw dualProtocolErr;
+                    }
+                }
 
                 state.card = card;
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "smartcard",
-    "version": "2.0.1",
+    "version": "2.0.3",
     "description": "PC/SC bindings for Node.js using N-API - ABI stable across Node.js versions",
     "author": "Tom KP",
     "license": "MIT",