okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

partially fix web-remote

Browse source
This commit is contained in:
vapormusic 2022-01-20 22:53:01 +07:00
parent 443711df79
commit ac93ef1aee
5 changed files with 97 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -52,6 +52,7 @@
"devDependencies": { "devDependencies": {
"@types/discord-rpc": "^4.0.0", "@types/discord-rpc": "^4.0.0",
"@types/express": "^4.17.13", "@types/express": "^4.17.13",
"@types/ws": "^8.2.2",
"electron": "https://github.com/castlabs/electron-releases.git", "electron": "https://github.com/castlabs/electron-releases.git",
"electron-builder": "^22.14.5", "electron-builder": "^22.14.5",
"electron-webpack": "^2.8.2", "electron-webpack": "^2.8.2",

6
src/main/base/win.ts
View file

@ -85,12 +85,12 @@ export class Win {
this.options.height = windowState.height; this.options.height = windowState.height;
// Start the webserver for the browser window to load // Start the webserver for the browser window to load
const ws = new wsapi()
ws.InitWebSockets()
this.startWebServer(); this.startWebServer();
this.win = new electron.BrowserWindow(this.options); this.win = new electron.BrowserWindow(this.options);
const ws = new wsapi(this.win)
ws.InitWebSockets()
// and load the renderer. // and load the renderer.
this.startSession(); this.startSession();
this.startHandlers(); this.startHandlers();

166
src/main/base/wsapi.ts
View file

@ -1,5 +1,3 @@
// @ts-nocheck
import * as ws from "ws"; import * as ws from "ws";
import * as http from "http"; import * as http from "http";
import * as https from "https"; import * as https from "https";
@ -10,17 +8,25 @@ import * as electron from "electron";
const WebSocket = ws; const WebSocket = ws;
const WebSocketServer = ws.Server; const WebSocketServer = ws.Server;
private class standardResponse { interface standardResponse {
status: number; status?: Number,
message: string; message?: String,
data: any; data?: any,
type: string; type?: string,
} }
export class wsapi { export class wsapi {
static clients: any;
port: any = 26369 port: any = 26369
wss: any = null wss: any = null
clients: [] clients: any = []
private _win : any;
constructor(win : any) {
this._win = win;
}
createId() { createId() {
// create random guid // create random guid
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
@ -30,33 +36,33 @@ export class wsapi {
}); });
} }
public async InitWebSockets () { public async InitWebSockets () {
electron.ipcMain.on('wsapi-updatePlaybackState', (event, arg) => { electron.ipcMain.on('wsapi-updatePlaybackState', (event :any, arg :any) => {
wsapi.updatePlaybackState(arg); this.updatePlaybackState(arg);
}) })
electron.ipcMain.on('wsapi-returnQueue', (event, arg) => { electron.ipcMain.on('wsapi-returnQueue', (event :any, arg :any) => {
wsapi.returnQueue(JSON.parse(arg)); this.returnQueue(JSON.parse(arg));
}); });
electron.ipcMain.on('wsapi-returnSearch', (event, arg) => { electron.ipcMain.on('wsapi-returnSearch', (event :any, arg :any) => {
console.log("SEARCH") console.log("SEARCH")
wsapi.returnSearch(JSON.parse(arg)); this.returnSearch(JSON.parse(arg));
}); });
electron.ipcMain.on('wsapi-returnSearchLibrary', (event, arg) => { electron.ipcMain.on('wsapi-returnSearchLibrary', (event :any, arg :any) => {
wsapi.returnSearchLibrary(JSON.parse(arg)); this.returnSearchLibrary(JSON.parse(arg));
}); });
electron.ipcMain.on('wsapi-returnDynamic', (event, arg, type) => { electron.ipcMain.on('wsapi-returnDynamic', (event :any, arg :any, type :any) => {
wsapi.returnDynamic(JSON.parse(arg), type); this.returnDynamic(JSON.parse(arg), type);
}); });
electron.ipcMain.on('wsapi-returnMusicKitApi', (event, arg, method) => { electron.ipcMain.on('wsapi-returnMusicKitApi', (event :any, arg :any, method :any) => {
wsapi.returnMusicKitApi(JSON.parse(arg), method); this.returnMusicKitApi(JSON.parse(arg), method);
}); });
electron.ipcMain.on('wsapi-returnLyrics', (event, arg) => { electron.ipcMain.on('wsapi-returnLyrics', (event :any, arg :any) => {
wsapi.returnLyrics(JSON.parse(arg)); this.returnLyrics(JSON.parse(arg));
}); });
this.wss = new WebSocketServer({ this.wss = new WebSocketServer({
port: this.port, port: this.port,
@ -82,20 +88,20 @@ export class wsapi {
}) })
console.log(`WebSocketServer started on port: ${this.port}`); console.log(`WebSocketServer started on port: ${this.port}`);
const defaultResponse = new standardResponse(0, {}, "OK"); const defaultResponse :standardResponse = {status :0, data:{}, message:"OK", type:"generic"};
this.wss.on('connection', function connection(ws) { this.wss.on('connection', (ws : any) => {
ws.id = wsapi.createId(); ws.id = this.createId();
console.log(`Client ${ws.id} connected`) console.log(`Client ${ws.id} connected`)
wsapi.clients.push(ws); this.clients.push(ws);
ws.on('message', function incoming(message) { ws.on('message', function incoming(message : any) {
}); });
// ws on message // ws on message
ws.on('message', function incoming(message) { ws.on('message', (message : any) => {
let data = JSON.parse(message); let data = JSON.parse(message);
let response = new standardResponse(0, {}, "OK");; let response :standardResponse = {status :0, data:{}, message:"OK", type:"generic"};
if (data.action) { if (data.action) {
data.action.toLowerCase(); data.action.toLowerCase();
} }
@ -116,103 +122,103 @@ export class wsapi {
} }
break; break;
case "play-next": case "play-next":
electron.app.win.webContents.executeJavaScript(`wsapi.playNext(\`${data.type}\`,\`${data.id}\`)`); this._win.webContents.executeJavaScript(`wsapi.playNext(\`${data.type}\`,\`${data.id}\`)`);
response.message = "Play Next"; response.message = "Play Next";
break; break;
case "play-later": case "play-later":
electron.app.win.webContents.executeJavaScript(`wsapi.playLater(\`${data.type}\`,\`${data.id}\`)`); this._win.webContents.executeJavaScript(`wsapi.playLater(\`${data.type}\`,\`${data.id}\`)`);
response.message = "Play Later"; response.message = "Play Later";
break; break;
case "quick-play": case "quick-play":
electron.app.win.webContents.executeJavaScript(`wsapi.quickPlay(\`${data.term}\`)`); this._win.webContents.executeJavaScript(`wsapi.quickPlay(\`${data.term}\`)`);
response.message = "Quick Play"; response.message = "Quick Play";
break; break;
case "get-lyrics": case "get-lyrics":
electron.app.win.webContents.executeJavaScript(`wsapi.getLyrics()`); this._win.webContents.executeJavaScript(`wsapi.getLyrics()`);
break; break;
case "shuffle": case "shuffle":
electron.app.win.webContents.executeJavaScript(`wsapi.toggleShuffle()`); this._win.webContents.executeJavaScript(`wsapi.toggleShuffle()`);
break; break;
case "set-shuffle": case "set-shuffle":
if(data.shuffle == true) { if(data.shuffle == true) {
electron.app.win.webContents.executeJavaScript(`MusicKit.getInstance().shuffleMode = 1`); this._win.webContents.executeJavaScript(`MusicKit.getInstance().shuffleMode = 1`);
}else{ }else{
electron.app.win.webContents.executeJavaScript(`MusicKit.getInstance().shuffleMode = 0`); this._win.webContents.executeJavaScript(`MusicKit.getInstance().shuffleMode = 0`);
} }
break; break;
case "repeat": case "repeat":
electron.app.win.webContents.executeJavaScript(`wsapi.toggleRepeat()`); this._win.webContents.executeJavaScript(`wsapi.toggleRepeat()`);
break; break;
case "seek": case "seek":
electron.app.win.webContents.executeJavaScript(`MusicKit.getInstance().seekToTime(${parseFloat(data.time)})`); this._win.webContents.executeJavaScript(`MusicKit.getInstance().seekToTime(${parseFloat(data.time)})`);
response.message = "Seek"; response.message = "Seek";
break; break;
case "pause": case "pause":
electron.app.win.webContents.executeJavaScript(`MusicKit.getInstance().pause()`); this._win.webContents.executeJavaScript(`MusicKit.getInstance().pause()`);
response.message = "Paused"; response.message = "Paused";
break; break;
case "play": case "play":
electron.app.win.webContents.executeJavaScript(`MusicKit.getInstance().play()`); this._win.webContents.executeJavaScript(`MusicKit.getInstance().play()`);
response.message = "Playing"; response.message = "Playing";
break; break;
case "stop": case "stop":
electron.app.win.webContents.executeJavaScript(`MusicKit.getInstance().stop()`); this._win.webContents.executeJavaScript(`MusicKit.getInstance().stop()`);
response.message = "Stopped"; response.message = "Stopped";
break; break;
case "volume": case "volume":
electron.app.win.webContents.executeJavaScript(`MusicKit.getInstance().volume = ${parseFloat(data.volume)}`); this._win.webContents.executeJavaScript(`MusicKit.getInstance().volume = ${parseFloat(data.volume)}`);
response.message = "Volume"; response.message = "Volume";
break; break;
case "mute": case "mute":
electron.app.win.webContents.executeJavaScript(`MusicKit.getInstance().mute()`); this._win.webContents.executeJavaScript(`MusicKit.getInstance().mute()`);
response.message = "Muted"; response.message = "Muted";
break; break;
case "unmute": case "unmute":
electron.app.win.webContents.executeJavaScript(`MusicKit.getInstance().unmute()`); this._win.webContents.executeJavaScript(`MusicKit.getInstance().unmute()`);
response.message = "Unmuted"; response.message = "Unmuted";
break; break;
case "next": case "next":
electron.app.win.webContents.executeJavaScript(`MusicKit.getInstance().skipToNextItem()`); this._win.webContents.executeJavaScript(`MusicKit.getInstance().skipToNextItem()`);
response.message = "Next"; response.message = "Next";
break; break;
case "previous": case "previous":
electron.app.win.webContents.executeJavaScript(`MusicKit.getInstance().skipToPreviousItem()`); this._win.webContents.executeJavaScript(`MusicKit.getInstance().skipToPreviousItem()`);
response.message = "Previous"; response.message = "Previous";
break; break;
case "musickit-api": case "musickit-api":
electron.app.win.webContents.executeJavaScript(`wsapi.musickitApi(\`${data.method}\`, \`${data.id}\`, ${JSON.stringify(data.params)})`); this._win.webContents.executeJavaScript(`wsapi.musickitApi(\`${data.method}\`, \`${data.id}\`, ${JSON.stringify(data.params)})`);
break; break;
case "musickit-library-api": case "musickit-library-api":
break; break;
case "set-autoplay": case "set-autoplay":
electron.app.win.webContents.executeJavaScript(`wsapi.setAutoplay(${data.autoplay})`); this._win.webContents.executeJavaScript(`wsapi.setAutoplay(${data.autoplay})`);
break; break;
case "queue-move": case "queue-move":
electron.app.win.webContents.executeJavaScript(`wsapi.moveQueueItem(${data.from},${data.to})`); this._win.webContents.executeJavaScript(`wsapi.moveQueueItem(${data.from},${data.to})`);
break; break;
case "get-queue": case "get-queue":
electron.app.win.webContents.executeJavaScript(`wsapi.getQueue()`); this._win.webContents.executeJavaScript(`wsapi.getQueue()`);
break; break;
case "search": case "search":
if (!data.limit) { if (!data.limit) {
data.limit = 10; data.limit = 10;
} }
electron.app.win.webContents.executeJavaScript(`wsapi.search(\`${data.term}\`, \`${data.limit}\`)`); this._win.webContents.executeJavaScript(`wsapi.search(\`${data.term}\`, \`${data.limit}\`)`);
break; break;
case "library-search": case "library-search":
if (!data.limit) { if (!data.limit) {
data.limit = 10; data.limit = 10;
} }
electron.app.win.webContents.executeJavaScript(`wsapi.searchLibrary(\`${data.term}\`, \`${data.limit}\`)`); this._win.webContents.executeJavaScript(`wsapi.searchLibrary(\`${data.term}\`, \`${data.limit}\`)`);
break; break;
case "show-window": case "show-window":
electron.app.win.show() this._win.show()
break; break;
case "hide-window": case "hide-window":
electron.app.win.hide() this._win.hide()
break; break;
case "play-mediaitem": case "play-mediaitem":
electron.app.win.webContents.executeJavaScript(`wsapi.playTrackById(${data.id}, \`${data.kind}\`)`); this._win.webContents.executeJavaScript(`wsapi.playTrackById(${data.id}, \`${data.kind}\`)`);
response.message = "Playing track"; response.message = "Playing track";
break; break;
case "get-status": case "get-status":
@ -222,62 +228,62 @@ export class wsapi {
response.message = "Status"; response.message = "Status";
break; break;
case "get-currentmediaitem": case "get-currentmediaitem":
electron.app.win.webContents.executeJavaScript(`wsapi.getPlaybackState()`); this._win.webContents.executeJavaScript(`wsapi.getPlaybackState()`);
break; break;
} }
ws.send(JSON.stringify(response)); ws.send(JSON.stringify(response));
}); });
ws.on('close', function close() { ws.on('close', () => {
// remove client from list // remove client from list
wsapi.clients.splice(wsapi.clients.indexOf(ws), 1); this.clients.splice(wsapi.clients.indexOf(ws), 1);
console.log(`Client ${ws.id} disconnected`); console.log(`Client ${ws.id} disconnected`);
}); });
ws.send(JSON.stringify(defaultResponse)); ws.send(JSON.stringify(defaultResponse));
}); });
} }
sendToClient(id) { sendToClient(id : any) {
// replace the clients.forEach with a filter to find the client that requested // replace the clients.forEach with a filter to find the client that requested
} }
updatePlaybackState(attr) { updatePlaybackState(attr : any) {
const response = new standardResponse(0, attr, "OK", "playbackStateUpdate"); const response : standardResponse = {status: 0, data: attr, message: "OK", type:"playbackStateUpdate"};
wsapi.clients.forEach(function each(client) { this.clients.forEach(function each(client: any) {
client.send(JSON.stringify(response)); client.send(JSON.stringify(response));
}); });
} }
returnMusicKitApi(results, method) { returnMusicKitApi(results :any, method :any) {
const response = new standardResponse(0, results, "OK", `musickitapi.${method}`); const response : standardResponse = {status :0, data: results, message:"OK", type:`musickitapi.${method}`};
wsapi.clients.forEach(function each(client) { this.clients.forEach(function each(client :any) {
client.send(JSON.stringify(response)); client.send(JSON.stringify(response));
}); });
} }
returnDynamic(results, type) { returnDynamic(results :any, type :any) {
const response = new standardResponse(0, results, "OK", type); const response : standardResponse = {status :0, data: results, message: "OK", type: type};
wsapi.clients.forEach(function each(client) { this.clients.forEach(function each(client :any) {
client.send(JSON.stringify(response)); client.send(JSON.stringify(response));
}); });
} }
returnLyrics(results) { returnLyrics(results :any) {
const response = new standardResponse(0, results, "OK", "lyrics"); const response : standardResponse = {status :0, data: results, message: "OK", type: "lyrics"};
wsapi.clients.forEach(function each(client) { this.clients.forEach(function each(client :any) {
client.send(JSON.stringify(response)); client.send(JSON.stringify(response));
}); });
} }
returnSearch(results) { returnSearch(results :any) {
const response = new standardResponse(0, results, "OK", "searchResults"); const response : standardResponse = {status :0, data: results, message: "OK", type: "searchResults"};
wsapi.clients.forEach(function each(client) { this.clients.forEach(function each(client :any) {
client.send(JSON.stringify(response)); client.send(JSON.stringify(response));
}); });
} }
returnSearchLibrary(results) { returnSearchLibrary(results :any) {
const response = new standardResponse(0, results, "OK", "searchResultsLibrary"); const response: standardResponse = {status :0, data :results, message:"OK", type:"searchResultsLibrary"};
wsapi.clients.forEach(function each(client) { this.clients.forEach(function each(client :any) {
client.send(JSON.stringify(response)); client.send(JSON.stringify(response));
}); });
} }
returnQueue(queue) { returnQueue(queue :any) {
const response = new standardResponse(0, queue, "OK", "queue"); const response : standardResponse = {status :0,data :queue, message:"OK", type:"queue"};
wsapi.clients.forEach(function each(client) { this.clients.forEach(function each(client :any) {
client.send(JSON.stringify(response)); client.send(JSON.stringify(response));
}); });
} }

1
src/main/plugins/lastfm.ts
View file

@ -209,7 +209,6 @@ export default class LastFMPlugin {
this.authenticate(); this.authenticate();
} }
} }
this.authenticate()
}) })
} }

7
src/preload/cider-preload.js
View file

@ -10,12 +10,19 @@ const MusicKitInterop = {
if (MusicKitInterop.filterTrack(MusicKitInterop.getAttributes(), true, false)) { if (MusicKitInterop.filterTrack(MusicKitInterop.getAttributes(), true, false)) {
console.log("ayy"); console.log("ayy");
global.ipcRenderer.send('playbackStateDidChange', MusicKitInterop.getAttributes()) global.ipcRenderer.send('playbackStateDidChange', MusicKitInterop.getAttributes())
ipcRenderer.send('wsapi-updatePlaybackState', self.getAttributes());
// if (typeof _plugins != "undefined") { // if (typeof _plugins != "undefined") {
// _plugins.execute("OnPlaybackStateChanged", {Attributes: MusicKitInterop.getAttributes()}) // _plugins.execute("OnPlaybackStateChanged", {Attributes: MusicKitInterop.getAttributes()})
// } // }
} }
}); });
/** wsapi */
MusicKit.getInstance().addEventListener(MusicKit.Events.playbackProgressDidChange, () => {
ipcRenderer.send('wsapi-updatePlaybackState', self.getAttributes());
});
/** wsapi */
MusicKit.getInstance().addEventListener(MusicKit.Events.nowPlayingItemDidChange, () => { MusicKit.getInstance().addEventListener(MusicKit.Events.nowPlayingItemDidChange, () => {
if (MusicKitInterop.filterTrack(MusicKitInterop.getAttributes(), false, true)) { if (MusicKitInterop.filterTrack(MusicKitInterop.getAttributes(), false, true)) {
global.ipcRenderer.send('nowPlayingItemDidChange', MusicKitInterop.getAttributes()); global.ipcRenderer.send('nowPlayingItemDidChange', MusicKitInterop.getAttributes());