Deploy to dev instead of prod

Author: KentoNishi

.github/workflows/deploy.yaml

@@ -1,21 +1,21 @@
-name: Deploy to Production
+# name: Deploy to Production
 
-on:
-  push:
-    branches:
-      - master
-    workflow_dispatch:
+# on:
+#   push:
+#     branches:
+#       - master
+#     workflow_dispatch:
 
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
+# jobs:
+#   deploy:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@master
 
-      - name: Merge dev branch
-        uses: devmasx/[email protected]
-        with:
-          type: now
-          from_branch: develop
-          target_branch: master
-          github_token: ${{ github.token }}
+#       - name: Merge dev branch
+#         uses: devmasx/[email protected]
+#         with:
+#           type: now
+#           from_branch: develop
+#           target_branch: master
+#           github_token: ${{ github.token }}

Makefile

@@ -46,7 +46,7 @@ format: .gitignore node_modules
 .pull:
 	@git stash
 	@git reset --hard HEAD
-	@git checkout master
+	@git checkout develop
 	@git fetch --all
 	@git pull
 	@cd controller; npm install;

README.md

@@ -1,7 +1,7 @@
 # Kanatran
 [![Build Runner](https://github.com/LiveTL/kanatran/actions/workflows/build_runner.yaml/badge.svg)](https://github.com/LiveTL/kanatran/actions/workflows/build_runner.yaml)
 [![Build Watcher](https://github.com/LiveTL/kanatran/actions/workflows/build_watcher.yaml/badge.svg)](https://github.com/LiveTL/kanatran/actions/workflows/build_watcher.yaml)
-[![Deploy to Production](https://github.com/LiveTL/kanatran/actions/workflows/deploy.yaml/badge.svg)](https://github.com/LiveTL/kanatran/actions/workflows/deploy.yaml)
+<!-- [![Deploy to Production](https://github.com/LiveTL/kanatran/actions/workflows/deploy.yaml/badge.svg)](https://github.com/LiveTL/kanatran/actions/workflows/deploy.yaml) -->
 
 ## Usage
 

controller/src/index.js

@@ -48,7 +48,7 @@ function runQueue() {
         id: item,
         streamId: queue.top.data
       }));
-      sockets[item].runningContainers[queue.top.data] = false;
+      sockets[item].runningContainers[queue.top.data] = { playing: false };
       console.log(`Requesting to play ${queue.top.data} on ${item}`);
       // sockets[item].locked = true;
       queue.pop();
@@ -74,7 +74,7 @@ app.post('/stream', (req, res) => {
 app.post('/github', (req, res) => {
   res.status(200);
   res.end();
-  if (req.body.ref === 'refs/heads/master' ) {
+  if (req.body.ref === 'refs/heads/develop' ) {
     console.log('Pulling new changes and rebooting if neccessary...');
     exec('cd ..; make update &').stdout.pipe(process.stdout);
   }
@@ -93,7 +93,7 @@ wsServer.on('connection', (socket) => {
     switch (data.event){
     case 'status': {
       if (data.playing) {
-        sockets[socket.id].runningContainers[data.video] = true;
+        sockets[socket.id].runningContainers[data.video] = { playing: true };
         console.log(
           `${data.video} is ${data.alreadyPlaying ? 'already ' : ''}playing on ${socket.id}`
         );
@@ -119,6 +119,10 @@ wsServer.on('connection', (socket) => {
       sockets[socket.id].relativeLoad = data.relativeLoad;
       updateLog();
       break;
+    } case 'timestamp': {
+      sockets[socket.id].runningContainers[data.video].playBegin = data.playBegin;
+      updateLog();
+      break;
     }
     }
   });

controller/src/versionValidation.js

@@ -1,4 +1,4 @@
-const serverVersion = '1.1.0';
+const serverVersion = '1.2.0';
 
 // dynamic validation in case a range of versions are supported
 const serverVersionSplit = serverVersion.split('.').map(d => parseInt(d));