Merge branch 'release/1.0.1'

6XGate · Dec 27, 2019 · 94df34d · 94df34d
2 parents 34ae027 + 4900b7f
commit 94df34d
Show file tree

Hide file tree

Showing 7 changed files with 249 additions and 186 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bridgecmdr",
   "productName": "BridgeCmdr",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Professional Raspberry Pi A/V switch and monitor controller for retro gaming",
   "main": "dist/main/index.js",
   "scripts": {

diff --git a/render/app/Application.vue b/render/app/Application.vue
@@ -169,7 +169,12 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
                 this.buttons = await makeButtons(button => this.onButtonActivated(button));
             },
             async powerOff() {
-                await Promise.all(Switch.all().map(_switch => _switch.powerOff()));
+                try {
+                    await Promise.all(Switch.all().map(_switch => _switch.powerOff()));
+                } catch (error) {
+                    console.error(error);
+                }
+
                 if (process.env.NODE_ENV === "production") {
                     await helpers.signalShutdown();
                 }

diff --git a/render/drivers/extron-matrix-switch.ts b/render/drivers/extron-matrix-switch.ts
@@ -16,9 +16,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import stream                                                                  from "stream";
-import Driver, { DriverCapabilities, DriverDescriptor }                        from "../support/system/driver";
-import { openStream, SerialBits, SerialParity, SerialStopBits, writeToStream } from "../support/stream";
+import Driver, { DriverCapabilities, DriverDescriptor }         from "../support/system/driver";
+import { openStream, SerialBits, SerialParity, SerialStopBits } from "../support/streams/command";
 
 const capabilities =
     DriverCapabilities.HAS_MULTIPLE_OUTPUTS |
@@ -30,21 +29,14 @@ const about = {
 };
 
 export default class ExtronMatrixSwitch extends Driver {
-    private readonly connection: stream.Duplex;
+    private readonly path: string;
 
     public static about(): DriverDescriptor {
         return about;
     }
 
-    public static async load(path: string): Promise<Driver> {
-        const connection = await openStream(path, {
-            baudReat: 9600,
-            bits:     SerialBits.EIGHT,
-            parity:   SerialParity.NONE,
-            stopBits: SerialStopBits.ONE,
-        });
-
-        return Promise.resolve(new ExtronMatrixSwitch(connection));
+    public static load(path: string): Promise<Driver> {
+        return Promise.resolve(new ExtronMatrixSwitch(path));
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -57,24 +49,34 @@ export default class ExtronMatrixSwitch extends Driver {
         return about.title;
     }
 
-    private constructor(connection: stream.Duplex) {
+    private constructor(path: string) {
         super(capabilities);
-        this.connection = connection;
-        connection.setEncoding("ascii");
-
-        // TODO: Other situation handlers...
-        connection.on("data", data => console.debug(`DEBUG: ${about.title}: return: ${data}`));
-        connection.on("error", error => console.error(`ERROR: ${about.title}: ${error}`));
+        this.path = path;
     }
 
-    public setTie(inputChannel: number, videoOutputChannel: number, audioOutputChannel: number): Promise<void> {
+    public async setTie(inputChannel: number, videoOutputChannel: number, audioOutputChannel: number): Promise<void> {
         console.log(`Extron SIS: ${inputChannel}, ${videoOutputChannel}, ${audioOutputChannel}`);
 
         const videoCommand = `${inputChannel}*${videoOutputChannel}%`;
         const audioCommand = `${inputChannel}*${audioOutputChannel}$`;
         const command      = `${videoCommand}\r\n${audioCommand}\r\n`;
 
-        return writeToStream(this.connection, command);
+        const connection = await openStream(this.path, {
+            baudReat: 9600,
+            bits:     SerialBits.EIGHT,
+            parity:   SerialParity.NONE,
+            stopBits: SerialStopBits.ONE,
+            port:     23,
+        });
+
+        connection.setEncoding("ascii");
+
+        // TODO: Other situation handlers...
+        connection.on("data", data => console.debug(`DEBUG: ${about.title}: return: ${data}`));
+        connection.on("error", error => console.error(`ERROR: ${about.title}: ${error}`));
+
+        await connection.write(command);
+        await connection.close();
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -87,12 +89,8 @@ export default class ExtronMatrixSwitch extends Driver {
         return Promise.resolve();
     }
 
-    public async unload(): Promise<void> {
-        await new Promise((resolve, reject) => {
-            this.connection.once("error", error => reject(error));
-            this.connection.end(() => resolve());
-        });
-
-        this.connection.destroy();
+    // eslint-disable-next-line class-methods-use-this
+    public unload(): Promise<void> {
+        return Promise.resolve();
     }
 }
diff --git a/render/drivers/sony-serial--monitor.ts b/render/drivers/sony-serial--monitor.ts
@@ -16,10 +16,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import stream                                                                  from "stream";
-import Driver, { DriverCapabilities, DriverDescriptor }                        from "../support/system/driver";
-import { openStream, SerialBits, SerialParity, SerialStopBits, writeToStream } from "../support/stream";
-import { Address, AddressKind, Command, CommandBlock }                         from "../support/specialized/sony-bvm-support";
+import Driver, { DriverCapabilities, DriverDescriptor }         from "../support/system/driver";
+import { openStream, SerialBits, SerialParity, SerialStopBits } from "../support/streams/command";
+import { Address, AddressKind, Command, CommandBlock }          from "../support/specialized/sony-bvm-support";
 
 const capabilities = DriverCapabilities.NONE;
 const about        = Object.freeze({
@@ -29,21 +28,14 @@ const about        = Object.freeze({
 });
 
 export default class SonySerialMonitor extends Driver {
-    private readonly connection: stream.Duplex;
+    private readonly path: string;
 
     public static about(): DriverDescriptor {
         return about;
     }
 
-    public static async load(path: string): Promise<Driver> {
-        const connection = await openStream(path, {
-            baudReat: 38400,
-            bits:     SerialBits.EIGHT,
-            parity:   SerialParity.ODD,
-            stopBits: SerialStopBits.ONE,
-        });
-
-        return new SonySerialMonitor(connection);
+    public static load(path: string): Promise<Driver> {
+        return Promise.resolve(new SonySerialMonitor(path));
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -56,13 +48,9 @@ export default class SonySerialMonitor extends Driver {
         return about.title;
     }
 
-    private constructor(connection: stream.Duplex) {
+    private constructor(path: string) {
         super(capabilities);
-        this.connection = connection;
-
-        // TODO: Other situation handlers...
-        connection.on("data", data => console.debug(`DEBUG: ${about.title}: return: ${data}`));
-        connection.on("error", error => console.error(`ERROR: ${about.title}: ${error}`));
+        this.path = path;
     }
 
     public setTie(inputChannel: number): Promise<void> {
@@ -72,29 +60,41 @@ export default class SonySerialMonitor extends Driver {
     }
 
     public powerOn(): Promise<void> {
+        console.log("Sony BVM: Power On");
+
         return this.sendCommand(Command.POWER_ON);
     }
 
     public powerOff(): Promise<void> {
+        console.log("Sony BVM: Power Off");
+
         return this.sendCommand(Command.POWER_OFF);
     }
 
-    public async unload(): Promise<void> {
-        await new Promise((resolve, reject) => {
-            this.connection.once("error", error => reject(error));
-            this.connection.end(() => resolve());
-        });
-
-        this.connection.destroy();
+    // eslint-disable-next-line class-methods-use-this
+    public unload(): Promise<void> {
+        return Promise.resolve();
     }
 
-    private sendCommand(command: Command, arg0 = -1, arg1 = -1): Promise<void> {
+    private async sendCommand(command: Command, arg0 = -1, arg1 = -1): Promise<void> {
         const source = new Address(AddressKind.ALL, 0);
         const destination = new Address(AddressKind.ALL, 0);
 
         const block = new CommandBlock(destination, source, command, arg0, arg1);
         const packet = block.package();
 
-        return writeToStream(this.connection, packet.package());
+        const connection = await openStream(this.path, {
+            baudReat: 38400,
+            bits:     SerialBits.EIGHT,
+            parity:   SerialParity.ODD,
+            stopBits: SerialStopBits.ONE,
+        });
+
+        // TODO: Other situation handlers...
+        connection.on("data", data => console.debug(`DEBUG: ${about.title}: return: ${data}`));
+        connection.on("error", error => console.error(`ERROR: ${about.title}: ${error}`));
+
+        await connection.write(packet.package());
+        await connection.close();
     }
 }
diff --git a/render/drivers/tesla-smart-matrix-switch.ts b/render/drivers/tesla-smart-matrix-switch.ts
@@ -16,9 +16,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import stream                                                                  from "stream";
-import Driver, { DriverCapabilities, DriverDescriptor }                        from "../support/system/driver";
-import { openStream, SerialBits, SerialParity, SerialStopBits, writeToStream } from "../support/stream";
+import Driver, { DriverCapabilities, DriverDescriptor }         from "../support/system/driver";
+import { openStream, SerialBits, SerialParity, SerialStopBits } from "../support/streams/command";
 
 const capabilities = DriverCapabilities.NONE;
 const about        = {
@@ -28,21 +27,14 @@ const about        = {
 };
 
 export default class TeslaSmartMatrixSwitch extends Driver {
-    private readonly connection: stream.Duplex;
+    private readonly path: string;
 
     public static about(): DriverDescriptor {
         return about;
     }
 
-    public static async load(path: string): Promise<Driver> {
-        const connection = await openStream(path, {
-            baudReat: 9600,
-            bits:     SerialBits.EIGHT,
-            parity:   SerialParity.NONE,
-            stopBits: SerialStopBits.ONE,
-        });
-
-        return new TeslaSmartMatrixSwitch(connection);
+    public static load(path: string): Promise<Driver> {
+        return Promise.resolve(new TeslaSmartMatrixSwitch(path));
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -55,21 +47,29 @@ export default class TeslaSmartMatrixSwitch extends Driver {
         return about.title;
     }
 
-    private constructor(connection: stream.Duplex) {
+    private constructor(path: string) {
         super(capabilities);
-        this.connection = connection;
-
-        // TODO: Other situation handlers...
-        connection.on("data", data => console.debug(`DEBUG: ${about.title}: return: ${data}`));
-        connection.on("error", error => console.error(`ERROR: ${about.title}: ${error}`));
+        this.path = path;
     }
 
-    public setTie(inputChannel: number): Promise<void> {
+    public async setTie(inputChannel: number): Promise<void> {
         console.log(`Tesla: ${inputChannel}`);
 
         const command = Buffer.from(Uint8Array.from([ 0xAA, 0xBB, 0x03, 0x01, inputChannel, 0xEE ]));
 
-        return writeToStream(this.connection, command);
+        const connection = await openStream(this.path, {
+            baudReat: 9600,
+            bits:     SerialBits.EIGHT,
+            parity:   SerialParity.NONE,
+            stopBits: SerialStopBits.ONE,
+        });
+
+        // TODO: Other situation handlers...
+        connection.on("data", data => console.debug(`DEBUG: ${about.title}: return: ${data}`));
+        connection.on("error", error => console.error(`ERROR: ${about.title}: ${error}`));
+
+        await connection.write(command);
+        await connection.close();
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -82,12 +82,8 @@ export default class TeslaSmartMatrixSwitch extends Driver {
         return Promise.resolve();
     }
 
-    public async unload(): Promise<void> {
-        await new Promise((resolve, reject) => {
-            this.connection.once("error", error => reject(error));
-            this.connection.end(() => resolve());
-        });
-
-        this.connection.destroy();
+    // eslint-disable-next-line class-methods-use-this
+    public unload(): Promise<void> {
+        return Promise.resolve();
     }
 }