@tbsoft-gmbh/signature-sdk 1.0.1 → 1.0.2

package/dist/driver-hid.js

@@ -353,7 +353,7 @@ var UsbTransportDevice = class extends import_events.EventEmitter {
     this.iface = null;
   }
 };
-function listUsbDevices(log) {
+async function listUsbDevices(log) {
   let usb;
   try {
     usb = require("usb");
@@ -367,10 +367,34 @@ function listUsbDevices(log) {
     for (const device of deviceList) {
       const desc = device.deviceDescriptor;
       if (desc.idVendor === SIGNOTEC_VID && desc.idProduct === SIGNOTEC_PID) {
+        let serialNumber = "";
+        let product = "Signotec Pad";
+        if (desc.iSerialNumber || desc.iProduct) {
+          try {
+            device.open();
+            if (desc.iSerialNumber) {
+              serialNumber = await new Promise((resolve) => {
+                device.getStringDescriptor(desc.iSerialNumber, (err, val) => {
+                  resolve(err ? "" : (val || "").trim());
+                });
+              });
+            }
+            if (desc.iProduct) {
+              product = await new Promise((resolve) => {
+                device.getStringDescriptor(desc.iProduct, (err, val) => {
+                  resolve(err ? "Signotec Pad" : (val || "Signotec Pad").trim());
+                });
+              });
+            }
+            device.close();
+          } catch (err) {
+            log.debug?.("Could not read USB string descriptors:", err.message);
+          }
+        }
         results.push({
           path: `usb:${desc.idVendor}:${desc.idProduct}:${device.busNumber}:${device.deviceAddress}`,
-          serialNumber: "",
-          product: "Signotec Pad",
+          serialNumber,
+          product,
           _usbDevice: device
         });
       }
@@ -488,7 +512,7 @@ var HidProtocol = class {
    * HID devices are found (e.g., Windows without HID class driver).
    * @returns Array of device descriptors (never throws).
    */
-  listDevices() {
+  async listDevices() {
     this.usbDeviceMap.clear();
     try {
       const hidDevices = this.HID.devices().filter((d) => d.vendorId === SIGNOTEC_VID2 && d.productId === SIGNOTEC_PID2).map((d) => ({
@@ -505,7 +529,7 @@ var HidProtocol = class {
     }
     this.log.info("No Signotec pads found via HID, trying raw USB...");
     try {
-      const usbDevices = listUsbDevices(this.log);
+      const usbDevices = await listUsbDevices(this.log);
       if (usbDevices.length > 0) {
         this.log.info(`Found ${usbDevices.length} Signotec pad(s) via raw USB`);
         for (const d of usbDevices) {
@@ -1786,7 +1810,7 @@ function createHidDriver(config) {
     const maxAttempts = config?.reconnectAttempts ?? 10;
     const interval = config?.reconnectIntervalMs ?? 2e3;
     let attempts = 0;
-    const tryReconnect = () => {
+    const tryReconnect = async () => {
       attempts++;
       if (attempts > maxAttempts) {
         log.error(`Signotec pad reconnection failed after ${maxAttempts} attempts`);
@@ -1797,7 +1821,7 @@ function createHidDriver(config) {
       log.info(`Signotec reconnect attempt ${attempts}/${maxAttempts}...`);
       try {
         const prot = new HidProtocol(config);
-        const devices = prot.listDevices();
+        const devices = await prot.listDevices();
         if (devices.length > 0) {
           log.info("Signotec pad reconnected - cancelling session (state lost)");
           currentHandlers?.onUserEvent("cancel", { serialNo: currentSerialNo || "unknown" });
@@ -1861,7 +1885,7 @@ function createHidDriver(config) {
       await cleanup();
     }
     protocol = new HidProtocol(config);
-    const devices = protocol.listDevices();
+    const devices = await protocol.listDevices();
     if (devices.length === 0) {
       protocol = null;
       throw new Error(`No device with serialNo.: ${serialNo} was found.`);
@@ -1920,14 +1944,44 @@ function createHidDriver(config) {
     }
     emit("info", "Signing session started", "session", { serialNo: currentSerialNo });
   }
+  function emergencyClose() {
+    const prot = protocol;
+    if (!prot) return;
+    protocol = null;
+    try {
+      prot.close();
+    } catch {
+    }
+  }
+  let exitHandlersInstalled = false;
+  function installExitHandlers() {
+    if (exitHandlersInstalled) return;
+    exitHandlersInstalled = true;
+    process.on("exit", emergencyClose);
+    const gracefulExit = async (signal) => {
+      log.info(`Received ${signal}, closing Signotec device...`);
+      try {
+        await cleanup();
+      } catch {
+      }
+      process.removeListener(signal, gracefulExit);
+      process.kill(process.pid, signal);
+    };
+    process.on("SIGINT", gracefulExit);
+    process.on("SIGTERM", gracefulExit);
+    if (process.platform === "win32") {
+      process.on("SIGBREAK", gracefulExit);
+    }
+  }
+  installExitHandlers();
   const driver = {
-    getSignotecPads() {
+    async getSignotecPads() {
       if (cachedDeviceList && Date.now() - cacheTimestamp < CACHE_TTL) {
         return cachedDeviceList;
       }
       try {
         const prot = new HidProtocol(config);
-        const devices = prot.listDevices();
+        const devices = await prot.listDevices();
         cachedDeviceList = devices.map((d, i) => ({
           serialNo: d.serialNumber || `signotec-${i}`,
           type: 1,
@@ -2026,7 +2080,7 @@ function createHidDriver(config) {
       }
       try {
         const prot = new HidProtocol(config);
-        const devices = prot.listDevices();
+        const devices = await prot.listDevices();
         if (devices.length === 0) {
           log.error("No Signotec device connected for standby image upload");
           return false;
@@ -2061,7 +2115,7 @@ function createHidDriver(config) {
       const start = Date.now();
       const interval = 1e3;
       while (Date.now() - start < timeoutMs) {
-        const pads = driver.getSignotecPads();
+        const pads = await driver.getSignotecPads();
         if (pads.length > 0) return pads[0];
         await new Promise((r) => setTimeout(r, interval));
       }