!redo your config, change in fileformat, also obs websocket-link is n…

…ow optional. fixed edit song

app.js

@@ -16,7 +16,9 @@ console.log("LoistoTxt starting...");
 CheckDir("./data");
 CheckDir("./data/songs");
 CheckDir("./data/shows");
-connectObs();
+if (config.obs.enabled) {
+  connectObs();
+}
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
@@ -85,8 +87,8 @@ async function connectObs() {
     console.log("Connecting to local obs websocket!");
 
     await obs.connect({
-      address: config.websocket.address || "127.0.0.1:4444",
-      password: config.websocket.password || ""
+      address: config.obs.websocket.address || "127.0.0.1:4444",
+      password: config.obs.websocket.password || ""
     });
   }
   catch (e) {

bin/websocket.js

@@ -20,13 +20,13 @@ class websocket {
             }
         }
 
-        this.obs = obs;
+        this.obs = obs || {};
         this.io = io;
         let self = this;
 
 
         obs.on('SwitchScenes', data => {
-            self.serverOptions.obs.currentScene = data.sceneName;            
+            self.serverOptions.obs.currentScene = data.sceneName;
             io.emit("obs.update", self.serverOptions);
         });
 
@@ -35,8 +35,10 @@ class websocket {
             client => {
                 client.emit("update", self.serverOptions)
                 client.emit("callback.dataUpdate", self.getIndexFile());
-                self.getObsStatus(client);
-
+                if (config.obs.enabled) {
+                    self.getObsStatus(client);
+                }
+
                 client.on("showTitles", data => {
                     self.serverOptions.showTitle = true;
                     self.serverOptions.currentText = "";
@@ -58,9 +60,9 @@ class websocket {
 
                 client.on("obs.setScene", async (scene) => {
                     try {
-                    let data = await obs.send("SetCurrentScene", { 'scene-name': scene });
+                        let data = await obs.send("SetCurrentScene", { 'scene-name': scene });
                     } catch (e) {
-                       io.emit("obs.update", self.serverOptions);
+                        io.emit("obs.update", self.serverOptions);
                     }
                 });
 
@@ -101,6 +103,7 @@ class websocket {
             socket.emit("obs.scenelist", { currentScene: data.currentScene, scenes: outScenes });
         } catch (e) {
             console.log(e);
+            socket.emit("obs.scenelist", { currentScene: "", scenes: [] });
         }
     }
 

config-default.json

@@ -1,12 +1,13 @@
 {
-    "websocket": {
-        "address": "127.0.0.1:4444",
-        "password": "admin"
-    },
     "obs": {
+        "enabled": false,
         "scenes": [
             "Example1",
             "Example2"
-        ]
+        ],
+        "websocket": {
+            "address": "127.0.0.1:4444",
+            "password": "admin"
+        }
     }
 }

public/javascripts/editor.js

@@ -1,11 +1,11 @@
 $(() => {
-    $.getJSON("/ajax/song/" + "{{ song }}", function (songData) {
+    $.getJSON("/ajax/song/" + song, function (songData) {
         let output = "";
         if (!Array.isArray(songData)) return;
         for (var data of songData) {
             output += `<div class="ui segment verse">
                     <div class="ui fluid labelled action input">                  
-                        <label class="ui label">Osan otsikko</label>
+                        <label class="ui label">Part title</label>
                         <input type="text" value="${data.title}" />
                         <button class="ui red inverted icon button" onclick="removeElem($(this).parent());"><i class="ui icon delete"></i>Delete part</button>
                     </div>

routes/index.js

@@ -24,9 +24,11 @@ router.get('/ajax/song', function (req, res, next) {
 
 router.get('/ajax/song/:uuid', function (req, res, next) {
   let songData = {};
-  let file = './data/songs/' + req.params.uuid + ".json";
+  let file = './data/songs/' + req.params.uuid.toString() + ".json";
   if (fs.existsSync(file)) {
     songData = JSON.parse(fs.readFileSync(file).toString()) || {};
+  } else {
+    console.log("error, file not exists.");
   }
 
   res.json(songData);

views/editsong.twig

@@ -39,6 +39,7 @@
 	<script src="/socket.io/socket.io.js"></script>
 	<script>
 		var socket = io.connect();
+		var song = "{{ song }}";
 	</script>
 	<script src="/javascripts/editor.js"></script>
 {% endblock %}