more socat stuff : shrug emoji : :)

1 files changed, 25 insertions, 8 deletions

diff --git a/players.js b/players.js
index f2cced2..5d332b3 100644
--- a/players.js
+++ b/players.js
@@ -4,6 +4,10 @@ const { spawn } = require('child_process')
 const { commandExists, killProcess, getTimeStrings } = require('./general-util')
 const EventEmitter = require('events')
 const Socat = require('./socat')
+const fs = require('fs')
+const util = require('util')
+
+const unlink = util.promisify(fs.unlink)
 
 class Player extends EventEmitter {
   constructor() {
@@ -120,16 +124,19 @@ module.exports.ControllableMPVPlayer = class extends module.exports.MPVPlayer {
   }
 
   playFile(file) {
-    let path
+    this.removeSocket(this.socketPath)
+
     do {
-      // path = '/tmp/mtui-socket-' + Math.floor(Math.random() * 10000)
-      path = './mtui-socket-' + Math.floor(Math.random() * 10000)
-    } while (this.existsSync(path))
+      // this.socketPathpath = '/tmp/mtui-socket-' + Math.floor(Math.random() * 10000)
+      this.socketPath = __dirname + '/mtui-socket-' + Math.floor(Math.random() * 10000)
+    } while (this.existsSync(this.socketPath))
 
-    this.socat = new Socat(path)
+    this.socat = new Socat(this.socketPath)
 
     const mpv = super.playFile(file)
 
+    mpv.then(() => this.removeSocket(this.socketPath))
+
     return mpv
   }
 
@@ -191,11 +198,21 @@ module.exports.ControllableMPVPlayer = class extends module.exports.MPVPlayer {
     this.sendCommand('set', 'loop', this.isLooping)
   }
 
-  kill() {
+  async kill() {
+    const path = this.socketPath
+    delete this.socketPath
     if (this.socat) {
-      this.socat.stop()
+      await this.socat.dispose()
+      await this.socat.stop()
+    }
+    await super.kill()
+    await this.removeSocket(path)
+  }
+
+  async removeSocket(path) {
+    if (path) {
+      await unlink(path).catch(() => {})
     }
-    return super.kill()
   }
 }