Added fuzzy match for switch scenes

Author: 715209

lib/components/Chat.js

@@ -13,6 +13,8 @@ var _fs = _interopRequireDefault(require("fs"));
 
 var _signale = _interopRequireDefault(require("signale"));
 
+var _fastFuzzy = require("fast-fuzzy");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -420,33 +422,40 @@ function () {
       var _switch2 = _asyncToGenerator(
       /*#__PURE__*/
       regeneratorRuntime.mark(function _callee4(sceneName) {
+        var res;
         return regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                _context4.prev = 0;
-                _context4.next = 3;
+                res = (0, _fastFuzzy.search)(sceneName, this.obsProps.scenes, {
+                  keySelector: function keySelector(obj) {
+                    return obj.name;
+                  }
+                }); // switch scene
+
+                _context4.prev = 1;
+                _context4.next = 4;
                 return this.obs.setCurrentScene({
-                  "scene-name": sceneName
+                  "scene-name": res[0].name
                 });
 
-              case 3:
-                this.say("Scene successfully switched to \"".concat(sceneName, "\""));
-                _context4.next = 10;
+              case 4:
+                this.say("Scene successfully switched to \"".concat(res[0].name, "\""));
+                _context4.next = 11;
                 break;
 
-              case 6:
-                _context4.prev = 6;
-                _context4.t0 = _context4["catch"](0);
+              case 7:
+                _context4.prev = 7;
+                _context4.t0 = _context4["catch"](1);
                 log.error(_context4.t0);
                 this.say(_context4.t0.error);
 
-              case 10:
+              case 11:
               case "end":
                 return _context4.stop();
             }
           }
-        }, _callee4, this, [[0, 6]]);
+        }, _callee4, this, [[1, 7]]);
       }));
 
       function _switch(_x2) {

lib/components/ObsSwitcher.js

@@ -77,6 +77,7 @@ function (_EventEmitter) {
     _this.currentScene = null;
     _this.nginxSettings;
     _this.previousScene = _this.lowBitrateScene;
+    _this.scenes = null;
 
     _this.obs.connect({
       address: _this.address,
@@ -102,6 +103,8 @@ function (_EventEmitter) {
       return _this.heartbeat = heartbeat;
     });
 
+    _this.obs.on("ScenesChanged", _this.scenesChanged.bind(_assertThisInitialized(_assertThisInitialized(_this))));
+
     log.info("Connecting & authenticating");
     return _this;
   }
@@ -115,6 +118,7 @@ function (_EventEmitter) {
       this.obs.SetHeartbeat({
         enable: true
       });
+      this.getSceneList();
       this.interval = setInterval(
       /*#__PURE__*/
       _asyncToGenerator(
@@ -289,6 +293,43 @@ function (_EventEmitter) {
     value: function streamStarted() {
       this.obsStreaming = true;
     }
+  }, {
+    key: "getSceneList",
+    value: function () {
+      var _getSceneList = _asyncToGenerator(
+      /*#__PURE__*/
+      regeneratorRuntime.mark(function _callee3() {
+        var list;
+        return regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return this.obs.GetSceneList();
+
+              case 2:
+                list = _context3.sent;
+                this.scenes = list.scenes;
+
+              case 4:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function getSceneList() {
+        return _getSceneList.apply(this, arguments);
+      }
+
+      return getSceneList;
+    }()
+  }, {
+    key: "scenesChanged",
+    value: function scenesChanged() {
+      this.getSceneList();
+    }
   }]);
 
   return ObsSwitcher;

package-lock.json

@@ -12,6 +12,7 @@
     "author": "Brian Spit",
     "license": "MIT",
     "dependencies": {
+        "fast-fuzzy": "^1.8.4",
         "node-fetch": "^2.3.0",
         "obs-websocket-js": "^1.2.0",
         "signale": "^1.3.0",

package.json

@@ -2,6 +2,7 @@ import WebSocket from "ws";
 import config from "../../config";
 import fs from "fs";
 import signale from "signale";
+import { search } from "fast-fuzzy";
 
 signale.config({
     displayTimestamp: true,
@@ -306,12 +307,14 @@ class Chat {
     }
 
     async switch(sceneName) {
+        const res = search(sceneName, this.obsProps.scenes, { keySelector: obj => obj.name });
+
         // switch scene
         try {
             await this.obs.setCurrentScene({
-                "scene-name": sceneName
+                "scene-name": res[0].name
             });
-            this.say(`Scene successfully switched to "${sceneName}"`);
+            this.say(`Scene successfully switched to "${res[0].name}"`);
         } catch (e) {
             log.error(e);
             this.say(e.error);

src/components/Chat.js

@@ -33,6 +33,7 @@ class ObsSwitcher extends EventEmitter {
         this.currentScene = null;
         this.nginxSettings;
         this.previousScene = this.lowBitrateScene;
+        this.scenes = null;
 
         this.obs.connect({ address: this.address, password: this.password }).catch(e => {
             // handle this somewhere else
@@ -46,13 +47,15 @@ class ObsSwitcher extends EventEmitter {
         this.obs.on("StreamStopped", this.streamStopped.bind(this));
         this.obs.on("StreamStarted", this.streamStarted.bind(this));
         this.obs.on("Heartbeat", heartbeat => (this.heartbeat = heartbeat));
+        this.obs.on("ScenesChanged", this.scenesChanged.bind(this));
 
         log.info("Connecting & authenticating");
     }
 
     onAuth() {
         log.success(`Successfully connected`);
         this.obs.SetHeartbeat({ enable: true });
+        this.getSceneList();
 
         this.interval = setInterval(async () => {
             const currentScene = await this.obs.GetCurrentScene();
@@ -181,6 +184,15 @@ class ObsSwitcher extends EventEmitter {
     streamStarted() {
         this.obsStreaming = true;
     }
+
+    async getSceneList() {
+        const list = await this.obs.GetSceneList();
+        this.scenes = list.scenes;
+    }
+
+    scenesChanged() {
+        this.getSceneList();
+    }
 }
 
 export default ObsSwitcher;