From a2889169c3a2ebe287d9f5fd26fa67a793fd9cc1 Mon Sep 17 00:00:00 2001
From: Evert Prants <imsonotsleepy@gmail.com>
Date: Sat, 20 Apr 2019 14:20:41 +0300
Subject: [PATCH] remove websocket shit

---
 package.json          |  5 ++-
 public/index.html     | 13 --------
 public/index.js       |  4 +--
 src/remote-control.js | 75 -------------------------------------------
 src/server.js         |  4 ---
 5 files changed, 3 insertions(+), 98 deletions(-)
 delete mode 100644 src/remote-control.js

diff --git a/package.json b/package.json
index 5aa0dc4..ff10302 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,8 @@
     "fluent-ffmpeg": "^2.1.2",
     "fs-extra": "^7.0.0",
     "socket.io": "^2.1.1",
-    "sqlite": "^3.0.0",
-    "sqlite3": "^4.0.3",
-    "ws": "^6.1.3"
+    "sqlite": "^3.0.2",
+    "sqlite3": "^4.0.6"
   },
   "devDependencies": {
     "babel-core": "^6.26.3",
diff --git a/public/index.html b/public/index.html
index d82d14b..8ae9392 100644
--- a/public/index.html
+++ b/public/index.html
@@ -112,19 +112,6 @@
 							<option value="desc">Descending order</option>
 						</select>
 					</div>
-					<div class="separator">Remote Control</div>
-					<div class="option checkbox">
-						<label for="st-remote">Allow remote control</label>
-						<input type="checkbox" id="st-remote" name="remote">
-					</div>
-					<div class="option">
-						<label for="st-device">Device name</label>
-						<input type="text" id="st-device" name="device">
-					</div>
-					<div class="option action">
-						<button id="dc">Take Remote Control</button>
-						<button id="dc-stop">Release Remote</button>
-					</div>
 				</div>
 			</div>
 		</div>
diff --git a/public/index.js b/public/index.js
index fac0ef8..7b121f2 100644
--- a/public/index.js
+++ b/public/index.js
@@ -45,9 +45,7 @@
     trackids: true,
     streamable: true,
     sortby: 'id',
-    sortdir: 'asc',
-    device: '',
-    remote: false
+    sortdir: 'asc'
   }
 
   window.mobilecheck = function() {
diff --git a/src/remote-control.js b/src/remote-control.js
deleted file mode 100644
index 31494d4..0000000
--- a/src/remote-control.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import WebSocket from 'ws'
-
-const wss = new WebSocket.Server({ noServer: true })
-
-function getClientByDevice (dev) {
-  for (let i in wss.clients) {
-    let client = wss.clients[i]
-    if (client.device === dev) return client
-  }
-  return null
-}
-
-wss.on('connection', function (ws) {
-  ws.on('device', function (devid) {
-    ws.device = devid
-  })
-
-  ws.on('connect', function (devid) {
-    let target = getClientByDevice(devid)
-    if (!target) return ws.emit('errno', { code: 100, error: 'Target device is not available.' })
-    target.emit('request', ws.device)
-  })
-
-  ws.on('detach', function () {
-    if (!ws.controlled) return
-    ws.controlled = null
-    let target = getClientByDevice(devid)
-    if (!target) return
-    target.controller = null
-    target.emit('detach')
-  })
-
-  ws.on('accept', function (devid) {
-    ws.controller = devid
-    let target = getClientByDevice(devid)
-    if (!target) return ws.emit('errno', { code: 100, error: 'Target device is not available.' })
-    target.controlled = devid
-    target.emit('accepted', devid)
-  })
-
-  ws.on('play', function (id) {
-    if (!ws.controlled) return
-    let target = getClientByDevice(ws.controlled)
-    if (!target) return ws.emit('errno', { code: 100, error: 'Target device is not available.' })
-    target.emit('play', id)
-  })
-
-  ws.on('seekto', function (num) {
-    if (!ws.controlled) return
-    let target = getClientByDevice(ws.controlled)
-    if (!target) return ws.emit('errno', { code: 100, error: 'Target device is not available.' })
-    target.emit('seekto', num)
-  })
-
-  ws.on('volumeto', function (num) {
-    if (!ws.controlled) return
-    let target = getClientByDevice(ws.controlled)
-    if (!target) return ws.emit('errno', { code: 100, error: 'Target device is not available.' })
-    target.emit('volumeto', num)
-  })
-})
-
-module.exports = function (server) {
-  server.on('upgrade', function (request, socket, head) {
-    const pathname = url.parse(request.url).pathname
-
-    if (pathname === '/remote') {
-      wss.handleUpgrade(request, socket, head, function (ws) {
-        wss.emit('connection', ws, request)
-      })
-    } else {
-      socket.destroy()
-    }
-  })
-}
diff --git a/src/server.js b/src/server.js
index 55f192f..b1ec486 100644
--- a/src/server.js
+++ b/src/server.js
@@ -7,7 +7,6 @@ import https from 'https'
 import ffmpeg from 'fluent-ffmpeg'
 
 import lfmda from './lastfm'
-import remote from './remote-control'
 
 require('express-async-errors')
 
@@ -224,9 +223,6 @@ app.use('/', express.static(path.join(process.cwd(), 'public')))
 
 const host = process.env.NODE_ENV === 'development' ? '0.0.0.0' : '127.0.0.1'
 
-// Initialize remote control
-remote(server)
-
 server.listen(port, host, function () {
   console.log(`app running on port ${port}`)
 })