fixes Windows PNP ID regex

synthetos · Jun 12, 2018 · 3a69e55 · 3a69e55
1 parent 9a64f2e
commit 3a69e55
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/lib/g2core-api.js b/lib/g2core-api.js
@@ -1206,20 +1206,27 @@ class G2coreAPI extends EventEmitter {
 
         for (let i = 0; i < results.length; i++) {
           let item = results[i];
+          let x;
 
           if (process.platform === 'win32') {
             // Windows:
             // pnpId: USB\VID_1D50&PID_606D&MI_00\6&3B3CEA53&0&0000
             // pnpId: USB\VID_1D50&PID_606D&MI_02\6&3B3CEA53&0&0002
+            // pnpId: USB\VID_1D50&PID_606D\0084-D639-0084-08C6
 
             // WARNING -- explicit test against VIP/PID combo.
-            if ((x = item.pnpId.match(/^USB\\VID_([0-9A-Fa-f]+)&PID_([0-9A-Fa-f]+)&MI_([0-9]+)\\(.*)$/)) &&  // eslint-disable-line
+            if ((x = item.pnpId.match(/^USB\\VID_([0-9A-Fa-f]+)&PID_([0-9A-Fa-f]+)(?:(?:&MI_([0-9]+)\\(.*))|(?:\\(.*)))$/)) &&  // eslint-disable-line
               (x[1] == '1D50') && (x[2] == '606D')
             ) {
+              let serialNumber;
               // let vendor = x[1]; // never used
               // let pid = x[2];    // never used
-              let theRest = x[4].split('&');
-              let serialNumber = theRest[1];
+              if(x[4]) {
+                let theRest = x[4].split('&');
+                serialNumber = theRest[1];  
+              } else {
+                serialNumber = x[5];
+              }
 
               if (
                 (g2s.length > 0) &&