Test for open MIDI port (#264)

voruti · web-flow · commit 4733bce119ab · 2021-10-16T21:19:54.000+02:00
diff --git a/nodecg-io-midi-input/extension/index.ts b/nodecg-io-midi-input/extension/index.ts
@@ -55,11 +55,12 @@ class MidiService extends ServiceBundle<MidiInputServiceConfig, MidiInputService
             this.nodecg.log.info(`Connecting to MIDI input device ${deviceName}.`);
             if (deviceName !== null) {
                 const client = new easymidi.Input(deviceName);
-                this.nodecg.log.info(`Successfully connected to MIDI input device ${deviceName}.`);
-                return success(client);
-            } else {
-                return error("Could not connect to the configured device!");
+                if (client.isPortOpen()) {
+                    this.nodecg.log.info(`Successfully connected to MIDI input device ${deviceName}.`);
+                    return success(client);
+                }
             }
+            return error("Could not connect to the configured device!");
         }
     }
 
diff --git a/nodecg-io-midi-input/package.json b/nodecg-io-midi-input/package.json
@@ -41,7 +41,7 @@
         "typescript": "^4.2.4"
     },
     "dependencies": {
-        "easymidi": "^2.0.4",
+        "easymidi": "^2.1.0",
         "nodecg-io-core": "^0.2.0"
     }
 }
diff --git a/nodecg-io-midi-output/extension/index.ts b/nodecg-io-midi-output/extension/index.ts
@@ -55,11 +55,12 @@ class MidiService extends ServiceBundle<MidiOutputServiceConfig, MidiOutputServi
             this.nodecg.log.info(`Connecting to MIDI output device ${deviceName}.`);
             if (deviceName !== null) {
                 const client = new easymidi.Output(deviceName);
-                this.nodecg.log.info(`Successfully connected to MIDI output device ${deviceName}.`);
-                return success(client);
-            } else {
-                return error("Could not connect to the configured device!");
+                if (client.isPortOpen()) {
+                    this.nodecg.log.info(`Successfully connected to MIDI output device ${deviceName}.`);
+                    return success(client);
+                }
             }
+            return error("Could not connect to the configured device!");
         }
     }
 
diff --git a/nodecg-io-midi-output/package.json b/nodecg-io-midi-output/package.json
@@ -41,7 +41,7 @@
         "typescript": "^4.2.4"
     },
     "dependencies": {
-        "easymidi": "^2.0.4",
+        "easymidi": "^2.1.0",
         "nodecg-io-core": "^0.2.0"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,12 @@ class MidiService extends ServiceBundle<MidiInputServiceConfig, MidiInputService`
`55`	`55`	this.nodecg.log.info(`Connecting to MIDI input device ${deviceName}.`);
`56`	`56`	`if (deviceName !== null) {`
`57`	`57`	`const client = new easymidi.Input(deviceName);`
`58`		- this.nodecg.log.info(`Successfully connected to MIDI input device ${deviceName}.`);
`59`		`- return success(client);`
`60`		`- } else {`
`61`		`- return error("Could not connect to the configured device!");`
	`58`	`+ if (client.isPortOpen()) {`
	`59`	+ this.nodecg.log.info(`Successfully connected to MIDI input device ${deviceName}.`);
	`60`	`+ return success(client);`
	`61`	`+ }`
`62`	`62`	`}`
	`63`	`+ return error("Could not connect to the configured device!");`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`"typescript": "^4.2.4"`
`42`	`42`	`},`
`43`	`43`	`"dependencies": {`
`44`		`- "easymidi": "^2.0.4",`
	`44`	`+ "easymidi": "^2.1.0",`
`45`	`45`	`"nodecg-io-core": "^0.2.0"`
`46`	`46`	`}`
`47`	`47`	`}`