Adjustments for Sibelius macro implementation

Author: smithkyle

SibeliusConnect.js

@@ -15,10 +15,13 @@ class SibeliusConnect extends WebSocketClient {
     }
 
     onOpen(resolve) {
-        // reset the message queue so we don't send a bunch of queued commands
-        // on reconnect, and because we need to send the handshake message first
+        let savedMessageQueue = this.messageQueue;
         this.messageQueue = [];
+
         this._sendHandshake();
+
+        this.messageQueue = savedMessageQueue;
+        savedMessageQueue = []
 
         super.onOpen(resolve);
     }
@@ -42,7 +45,7 @@ class SibeliusConnect extends WebSocketClient {
             message.plugins = this.plugins;
         }
 
-        this.send(message);
+        super.send(message);
 
         if (message.sessionToken) {
             // Sibelius doesn't send a response if reconnecting with a sessionToken,
@@ -109,7 +112,7 @@ class SibeliusConnect extends WebSocketClient {
 
     async send(message) {
         if (!this.socket) {
-            await this.connect()
+            this.connect();
         }
 
         try {

customModule.js

@@ -1,4 +1,3 @@
-// const fs = nativeRequire('fs')
 const path = nativeRequire('path')
 
 const SibeliusConnect = require('SibeliusConnect.js')
@@ -25,7 +24,7 @@ module.exports = {
             }
 
             if (address === '/sibelius' || path.dirname(address) === '/sibelius') {
-                args.map(arg => {
+                args.forEach(arg => {
                     let addr = address
                     arg = arg.value
 
@@ -54,13 +53,8 @@ module.exports = {
                         }
                     }
 
-                    return msg
+                    global.SibeliusConnect.send(msg)
                 })
-                .reduce(async (a, msg) => {
-                    await a
-                    global.SibeliusConnect.sendMessage(msg)
-                    return new Promise(resolve => setTimeout(resolve, 50));
-                }, Promise.resolve())
             }
             else if (address === '/dorico') {
                 args.forEach(arg => {

session.json

@@ -1290,7 +1290,7 @@
             "label": "Add Wildcards\nTitle, SubTitle\nComposer, Lyricist\n(macro)",
             "vertical": false,
             "wrap": false,
-            "on": "plugin:cmdutils,GoToFirstBar_cu;\nplugin:cmdutils,TextStyleDefaultForCommands_cu,\"text.system.page_aligned.title\";\nplugin:cmdutils,Add_Text_cu,\"Title\";\nplugin:cmdutils,TextStyleDefaultForCommands_cu,\"text.system.page_aligned.subtitle\";\nplugin:cmdutils,Add_Text_cu,\"\\$Subtitle\\\";\nplugin:cmdutils,TextStyleDefaultForCommands_cu,\"text.system.page_aligned.composer\";\nplugin:cmdutils,Add_Text_cu,\"\\$Composer\\\";\nplugin:cmdutils,TextStyleDefaultForCommands_cu,\"text.system.page_aligned.lyricist\";\nplugin:cmdutils,Add_Text_cu,\"\\$Lyricist\\\";\ncommand:goto_selection_start;\nplugin:cmdutils,MessageBox_cu,\"Please fill in the Score Info fields for the title, subtitle, composer, and lyricist, then click the Ribbon Home tab.\";\ncommand:score_info",
+            "on": "plugin:cmdutils,GoToFirstBar_cu;\nplugin:cmdutils,TextStyleDefaultForCommands_cu,\"text.system.page_aligned.title\";\nplugin:cmdutils,Add_Text_cu,\"\\$Title\\\";\nplugin:cmdutils,TextStyleDefaultForCommands_cu,\"text.system.page_aligned.subtitle\";\nplugin:cmdutils,Add_Text_cu,\"\\$Subtitle\\\";\nplugin:cmdutils,TextStyleDefaultForCommands_cu,\"text.system.page_aligned.composer\";\nplugin:cmdutils,Add_Text_cu,\"\\$Composer\\\";\nplugin:cmdutils,TextStyleDefaultForCommands_cu,\"text.system.page_aligned.lyricist\";\nplugin:cmdutils,Add_Text_cu,\"\\$Lyricist\\\";\ncommand:goto_selection_start;\nplugin:cmdutils,MessageBox_cu,\"Please fill in the Score Info fields for the title, subtitle, composer, and lyricist, then click the Ribbon Home tab.\";\ncommand:score_info",
             "off": 0,
             "mode": "tap",
             "doubleTap": false,