Continue when isValid path fails. Koenkk/zigbee2mqtt#2122

Koenkk · Oct 24, 2019 · f18d11a · f18d11a
1 parent b636821
commit f18d11a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/src/adapter/adapter.ts b/src/adapter/adapter.ts
@@ -46,16 +46,20 @@ abstract class Adapter extends events.EventEmitter {
                 throw new Error("No path provided and failed to auto detect path");
             }
         } else {
-            // Path can be a symlink, resolve it.
-            serialPortOptions.path = RealpathSync(serialPortOptions.path);
-
-            // Determine adapter to use
-            for (const candidate of adapters) {
-                if (await candidate.isValidPath(serialPortOptions.path)) {
-                    debug(`Path '${serialPortOptions.path}' is valid for '${candidate.name}'`);
-                    adapter = candidate;
-                    break;
+            try {
+                // Path can be a symlink, resolve it.
+                serialPortOptions.path = RealpathSync(serialPortOptions.path);
+
+                // Determine adapter to use
+                for (const candidate of adapters) {
+                    if (await candidate.isValidPath(serialPortOptions.path)) {
+                        debug(`Path '${serialPortOptions.path}' is valid for '${candidate.name}'`);
+                        adapter = candidate;
+                        break;
+                    }
                 }
+            } catch (error) {
+                debug(`Failed to validate path: '${error}'`);
             }
         }
 

diff --git a/test/controller.test.ts b/test/controller.test.ts
@@ -1672,6 +1672,13 @@ describe('Controller', () => {
         expect(ZStackAdapter).toHaveBeenCalledWith(null, {"baudRate": 100, "path": "/dev/bla", "rtscts": false}, null);
     });
 
+    it('Adapter create continue when is valid path fails', async () => {
+        mockZStackAdapterIsValidPath.mockImplementationOnce(() => {throw new Error('failed')});
+        await Adapter.create(null, {path: '/dev/bla', baudRate: 100, rtscts: false}, null);
+        expect(mockZStackAdapterIsValidPath).toHaveBeenCalledWith('/dev/bla');
+        expect(ZStackAdapter).toHaveBeenCalledWith(null, {"baudRate": 100, "path": "/dev/bla", "rtscts": false}, null);
+    });
+
     it('Adapter create auto detect', async () => {
         mockZStackAdapterIsValidPath.mockReturnValueOnce(true);
         mockZStackAdapterAutoDetectPath.mockReturnValueOnce('/dev/test');