From b93dda0985b74b0b3587271b731835d699c196d4 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Wed, 17 Feb 2021 18:42:16 +0100
Subject: [PATCH] Wait for lektord to reply to pings for installing all
callbacks, fix bug where lkt couldn't connect to lektord
---
common/lkt.js | 4 ++++
instance/main.js | 14 +++++++++-----
main.js | 6 ++++++
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/common/lkt.js b/common/lkt.js
index 54fdcfd..41b7e86 100644
--- a/common/lkt.js
+++ b/common/lkt.js
@@ -262,6 +262,10 @@ class LktClient {
static getSongTimeData() {
return this.timeData;
}
+
+ static ping() {
+ return LktClient.__execSimple('ping');
+ }
}
function __mpdToObject(string) {
diff --git a/instance/main.js b/instance/main.js
index 8001561..a026754 100644
--- a/instance/main.js
+++ b/instance/main.js
@@ -100,11 +100,7 @@ window.onload = () => {
addIpcToButton('openKurisu', ['toggle-kurisu']);
addIpcToButton('openUserView', ['toggle-client-view']);
- setTimeout(() => ipcRenderer.send('reload-queue-request'), 1000);
- setInterval(() => ipcRenderer.send('verify-queue-reloaded-request'), 50);
- setInterval(() => ipcRenderer.send('get-song-time-data'), 50);
- setInterval(() => ipcRenderer.send('get-runnings'), 10000);
- setInterval(() => ipcRenderer.send('verify-state'), 500);
+ ipcRenderer.send('verify-lektord');
logger.debug('instance', 'Window loaded');
$('#filterInput').on('keypress', e => {
@@ -179,6 +175,14 @@ ipcRenderer.on('reload-queue-responce', (event, arg) => {
[].forEach.call(document.querySelectorAll('#panelRight .karaCard'), addQueueKaraEventHandlers);
});
+ipcRenderer.on('send-lektord', (event, state) => {
+ setTimeout(() => ipcRenderer.send('reload-queue-request'), 1000);
+ setInterval(() => ipcRenderer.send('verify-queue-reloaded-request'), 50);
+ setInterval(() => ipcRenderer.send('get-song-time-data'), 50);
+ setInterval(() => ipcRenderer.send('get-runnings'), 10000);
+ setInterval(() => ipcRenderer.send('verify-state'), 500);
+});
+
ipcRenderer.on('send-state', (event, state) => updatePlayPauseButton(state));
ipcRenderer.on('send-song-time-data', (event, timeData) => {
diff --git a/main.js b/main.js
index 9eb3b2d..4c85923 100644
--- a/main.js
+++ b/main.js
@@ -282,6 +282,12 @@ ipcMain.on('add-kara-queue-pos', (event, addparams) => {
ipcMain.on('verify-state', (event, arg) => lkt.commandStatus().then(data => event.reply('send-state', data.state)));
+ipcMain.on('verify-lektord', (event, arg) => {
+ lkt.ping().then(data => {
+ event.reply('send-lektord');
+ });
+});
+
ipcMain.on('get-song-time-data', (event, arg) => {
var newSongTimeData = lkt.getSongTimeData();
if (newSongTimeData.elapsed != songTimeData.elapsed || newSongTimeData.song != songTimeData.song) {
--
GitLab