diff --git a/src/main/base/win.ts b/src/main/base/win.ts index b0de8a35..4bd9be78 100644 --- a/src/main/base/win.ts +++ b/src/main/base/win.ts @@ -1,3 +1,4 @@ +// @ts-nocheck import * as path from "path"; import * as electron from "electron"; import * as windowStateKeeper from "electron-window-state"; @@ -5,8 +6,9 @@ import * as express from "express"; import * as getPort from "get-port"; import * as yt from "youtube-search-without-api-key"; import * as fs from "fs"; -import {Stream} from "stream"; - +import { Stream } from "stream"; +import * as qrcode from "qrcode-terminal"; +import * as os from "os"; export class Win { win: any | undefined = null; app: any | undefined = null; @@ -24,17 +26,21 @@ export class Win { ciderCache: path.resolve(electron.app.getPath("userData"), "CiderCache"), themes: path.resolve(electron.app.getPath("userData"), "Themes"), plugins: path.resolve(electron.app.getPath("userData"), "Plugins"), - } + }; private audioStream: any = new Stream.PassThrough(); private clientPort: number = 0; + private remotePort: number = 6942; private EnvironmentVariables: object = { - "env": { + env: { platform: process.platform, - dev: electron.app.isPackaged - } + dev: electron.app.isPackaged, + }, }; private options: any = { - icon: path.join(this.paths.resourcePath, `icons/icon.` + (process.platform === "win32" ? "ico" : "png")), + icon: path.join( + this.paths.resourcePath, + `icons/icon.` + (process.platform === "win32" ? "ico" : "png") + ), width: 1024, height: 600, x: undefined, @@ -43,8 +49,8 @@ export class Win { minHeight: 410, frame: false, title: "Cider", - vibrancy: 'dark', - transparent: (process.platform === "darwin"), + vibrancy: "dark", + transparent: process.platform === "darwin", hasShadow: false, webPreferences: { nodeIntegration: true, @@ -57,27 +63,27 @@ export class Win { nodeIntegrationInWorker: false, webSecurity: false, - preload: path.join(this.paths.srcPath, './preload/cider-preload.js') - } + preload: path.join(this.paths.srcPath, "./preload/cider-preload.js"), + }, }; /** * Creates the browser window */ async createWindow(): Promise { - this.clientPort = await getPort({port: 9000}); + this.clientPort = await getPort({ port: 9000 }); this.verifyFiles(); // Load the previous state with fallback to defaults const windowState = windowStateKeeper({ defaultWidth: 1024, - defaultHeight: 600 + defaultHeight: 600, }); this.options.width = windowState.width; this.options.height = windowState.height; // Start the webserver for the browser window to load - this.startWebServer() + this.startWebServer(); this.win = new electron.BrowserWindow(this.options); @@ -88,7 +94,6 @@ export class Win { // Register listeners on Window to track size and position of the Window. windowState.manage(this.win); - return this.win; } @@ -96,25 +101,29 @@ export class Win { * Verifies the files for the renderer to use (Cache, library info, etc.) */ private verifyFiles(): void { - const expectedDirectories = [ - "CiderCache" - ] + const expectedDirectories = ["CiderCache"]; const expectedFiles = [ "library-songs.json", "library-artists.json", "library-albums.json", "library-playlists.json", "library-recentlyAdded.json", - ] + ]; for (let i = 0; i < expectedDirectories.length; i++) { - if (!fs.existsSync(path.join(electron.app.getPath("userData"), expectedDirectories[i]))) { - fs.mkdirSync(path.join(electron.app.getPath("userData"), expectedDirectories[i])) + if ( + !fs.existsSync( + path.join(electron.app.getPath("userData"), expectedDirectories[i]) + ) + ) { + fs.mkdirSync( + path.join(electron.app.getPath("userData"), expectedDirectories[i]) + ); } } for (let i = 0; i < expectedFiles.length; i++) { - const file = path.join(this.paths.ciderCache, expectedFiles[i]) + const file = path.join(this.paths.ciderCache, expectedFiles[i]); if (!fs.existsSync(file)) { - fs.writeFileSync(file, JSON.stringify([])) + fs.writeFileSync(file, JSON.stringify([])); } } } @@ -124,23 +133,31 @@ export class Win { */ private startWebServer(): void { const app = express(); - - app.use(express.static(path.join(this.paths.srcPath, './renderer/'))); - app.set("views", path.join(this.paths.srcPath, './renderer/views')); + + app.use(express.static(path.join(this.paths.srcPath, "./renderer/"))); + app.set("views", path.join(this.paths.srcPath, "./renderer/views")); app.set("view engine", "ejs"); - + let firstRequest = true; app.use((req, res, next) => { // @ts-ignore - if (req.url.includes("audio.webm") || (req.headers.host.includes("localhost") && (this.devMode || req.headers["user-agent"].includes("Electron")))) { + if ( + req.url.includes("audio.webm") || + (req.headers.host.includes("localhost") && + (this.devMode || req.headers["user-agent"].includes("Electron"))) + ) { next(); + } else { + res.redirect("https://discord.gg/applemusic"); } }); + + app.get("/", (req, res) => { - app.get('/', (req, res) => { - res.render("main", this.EnvironmentVariables) + + res.render("main", this.EnvironmentVariables); }); - app.get('/audio.webm', (req, res) => { + app.get("/audio.webm", (req, res) => { try { req.socket.setTimeout(Number.MAX_SAFE_INTEGER); // CiderBase.requests.push({req: req, res: res}); @@ -150,21 +167,43 @@ export class Win { // requests.splice(pos, 1); // console.info("CLOSED", CiderBase.requests.length); // }); - this.audioStream.on('data', (data: any) => { + this.audioStream.on("data", (data: any) => { try { res.write(data); } catch (ex) { - console.log(ex) + console.log(ex); } - }) + }); } catch (ex) { - console.log(ex) + console.log(ex); } }); + //app.use(express.static()) app.listen(this.clientPort, () => { console.log(`Cider client port: ${this.clientPort}`); }); + + /* + * Remote Client (I had no idea how to add it to our existing express server, so I just made another one) -@quacksire + */ + const remote = express(); + remote.use(express.static(path.join(this.paths.srcPath, "./web-remote/"))) + remote.listen(this.remotePort, () => { + console.log(`Cider remote port: ${this.clientPort}`); + if (firstRequest) { + console.log("---- Ignore Me ;) ---"); + qrcode.generate(`http://${os.hostname}:${this.clientPort}/remote`); + console.log("---- Ignore Me ;) ---"); + /* + * + * USING https://www.npmjs.com/package/qrcode-terminal for terminal + * WE SHOULD USE https://www.npmjs.com/package/qrcode for the remote (or others) for showing to user via an in-app dialog + * -@quacksire + */ + } + firstRequest = false; + }) } /** @@ -174,181 +213,225 @@ export class Win { // intercept "https://js-cdn.music.apple.com/hls.js/2.141.0/hls.js/hls.js" and redirect to local file "./apple-hls.js" instead this.win.webContents.session.webRequest.onBeforeRequest( { - urls: ["https://*/*.js"] + urls: ["https://*/*.js"], }, - (details: { url: string | string[]; }, callback: (arg0: { redirectURL?: string; cancel?: boolean; }) => void) => { + ( + details: { url: string | string[] }, + callback: (arg0: { redirectURL?: string; cancel?: boolean }) => void + ) => { if (details.url.includes("hls.js")) { callback({ - redirectURL: `http://localhost:${this.clientPort}/apple-hls.js` - }) + redirectURL: `http://localhost:${this.clientPort}/apple-hls.js`, + }); } else { callback({ - cancel: false - }) + cancel: false, + }); } } - ) + ); - this.win.webContents.session.webRequest.onBeforeSendHeaders(async (details: { url: string; requestHeaders: { [x: string]: string; }; }, callback: (arg0: { requestHeaders: any; }) => void) => { - if (details.url === "https://buy.itunes.apple.com/account/web/info") { - details.requestHeaders['sec-fetch-site'] = 'same-site'; - details.requestHeaders['DNT'] = '1'; - let itspod = await this.win.webContents.executeJavaScript(`window.localStorage.getItem("music.ampwebplay.itspod")`) - if (itspod != null) - details.requestHeaders['Cookie'] = `itspod=${itspod}` + this.win.webContents.session.webRequest.onBeforeSendHeaders( + async ( + details: { url: string; requestHeaders: { [x: string]: string } }, + callback: (arg0: { requestHeaders: any }) => void + ) => { + if (details.url === "https://buy.itunes.apple.com/account/web/info") { + details.requestHeaders["sec-fetch-site"] = "same-site"; + details.requestHeaders["DNT"] = "1"; + let itspod = await this.win.webContents.executeJavaScript( + `window.localStorage.getItem("music.ampwebplay.itspod")` + ); + if (itspod != null) + details.requestHeaders["Cookie"] = `itspod=${itspod}`; + } + callback({ requestHeaders: details.requestHeaders }); } - callback({requestHeaders: details.requestHeaders}) - }) + ); - let location = `http://localhost:${this.clientPort}/` + let location = `http://localhost:${this.clientPort}/`; if (electron.app.isPackaged) { - this.win.loadURL(location) + this.win.loadURL(location); } else { - this.win.loadURL(location, {userAgent: 'Cider Development Environment'}) + this.win.loadURL(location, { + userAgent: "Cider Development Environment", + }); } - } /** * Initializes the window handlers */ private startHandlers(): void { - /********************************************************************************************************************** * ipcMain Events ****************************************************************************************************************** */ electron.ipcMain.on("cider-platform", (event) => { - event.returnValue = process.platform - }) - - electron.ipcMain.on("get-gpu-mode", (event) => { - event.returnValue = process.platform - }) - - electron.ipcMain.on("is-dev", (event) => { - event.returnValue = this.devMode - }) - - electron.ipcMain.on('close', () => { // listen for close event - this.win.close(); - }) - - electron.ipcMain.on('put-library-songs', (event, arg) => { - fs.writeFileSync(path.join(this.paths.ciderCache, "library-songs.json"), JSON.stringify(arg)) - }) - - electron.ipcMain.on('put-library-artists', (event, arg) => { - fs.writeFileSync(path.join(this.paths.ciderCache, "library-artists.json"), JSON.stringify(arg)) - }) - - electron.ipcMain.on('put-library-albums', (event, arg) => { - fs.writeFileSync(path.join(this.paths.ciderCache, "library-albums.json"), JSON.stringify(arg)) - }) - - electron.ipcMain.on('put-library-playlists', (event, arg) => { - fs.writeFileSync(path.join(this.paths.ciderCache, "library-playlists.json"), JSON.stringify(arg)) - }) - - electron.ipcMain.on('put-library-recentlyAdded', (event, arg) => { - fs.writeFileSync(path.join(this.paths.ciderCache, "library-recentlyAdded.json"), JSON.stringify(arg)) - }) - - electron.ipcMain.on('get-library-songs', (event) => { - let librarySongs = fs.readFileSync(path.join(this.paths.ciderCache, "library-songs.json"), "utf8") - event.returnValue = JSON.parse(librarySongs) - }) - - electron.ipcMain.on('get-library-artists', (event) => { - let libraryArtists = fs.readFileSync(path.join(this.paths.ciderCache, "library-artists.json"), "utf8") - event.returnValue = JSON.parse(libraryArtists) - }) - - electron.ipcMain.on('get-library-albums', (event) => { - let libraryAlbums = fs.readFileSync(path.join(this.paths.ciderCache, "library-albums.json"), "utf8") - event.returnValue = JSON.parse(libraryAlbums) - }) - - electron.ipcMain.on('get-library-playlists', (event) => { - let libraryPlaylists = fs.readFileSync(path.join(this.paths.ciderCache, "library-playlists.json"), "utf8") - event.returnValue = JSON.parse(libraryPlaylists) - }) - - electron.ipcMain.on('get-library-recentlyAdded', (event) => { - let libraryRecentlyAdded = fs.readFileSync(path.join(this.paths.ciderCache, "library-recentlyAdded.json"), "utf8") - event.returnValue = JSON.parse(libraryRecentlyAdded) - }) - - electron.ipcMain.handle('getYTLyrics', async (event, track, artist) => { - const u = track + " " + artist + " official video"; - return await yt.search(u) - }) - - electron.ipcMain.handle('setVibrancy', (event, key, value) => { - this.win.setVibrancy(value) + event.returnValue = process.platform; }); - electron.ipcMain.on('maximize', () => { // listen for maximize event - if (this.win.isMaximized()) { - this.win.unmaximize() - } else { - this.win.maximize() - } - }) + electron.ipcMain.on("get-gpu-mode", (event) => { + event.returnValue = process.platform; + }); - electron.ipcMain.on('minimize', () => { // listen for minimize event + electron.ipcMain.on("is-dev", (event) => { + event.returnValue = this.devMode; + }); + + electron.ipcMain.on("close", () => { + // listen for close event + this.win.close(); + }); + + electron.ipcMain.on("put-library-songs", (event, arg) => { + fs.writeFileSync( + path.join(this.paths.ciderCache, "library-songs.json"), + JSON.stringify(arg) + ); + }); + + electron.ipcMain.on("put-library-artists", (event, arg) => { + fs.writeFileSync( + path.join(this.paths.ciderCache, "library-artists.json"), + JSON.stringify(arg) + ); + }); + + electron.ipcMain.on("put-library-albums", (event, arg) => { + fs.writeFileSync( + path.join(this.paths.ciderCache, "library-albums.json"), + JSON.stringify(arg) + ); + }); + + electron.ipcMain.on("put-library-playlists", (event, arg) => { + fs.writeFileSync( + path.join(this.paths.ciderCache, "library-playlists.json"), + JSON.stringify(arg) + ); + }); + + electron.ipcMain.on("put-library-recentlyAdded", (event, arg) => { + fs.writeFileSync( + path.join(this.paths.ciderCache, "library-recentlyAdded.json"), + JSON.stringify(arg) + ); + }); + + electron.ipcMain.on("get-library-songs", (event) => { + let librarySongs = fs.readFileSync( + path.join(this.paths.ciderCache, "library-songs.json"), + "utf8" + ); + event.returnValue = JSON.parse(librarySongs); + }); + + electron.ipcMain.on("get-library-artists", (event) => { + let libraryArtists = fs.readFileSync( + path.join(this.paths.ciderCache, "library-artists.json"), + "utf8" + ); + event.returnValue = JSON.parse(libraryArtists); + }); + + electron.ipcMain.on("get-library-albums", (event) => { + let libraryAlbums = fs.readFileSync( + path.join(this.paths.ciderCache, "library-albums.json"), + "utf8" + ); + event.returnValue = JSON.parse(libraryAlbums); + }); + + electron.ipcMain.on("get-library-playlists", (event) => { + let libraryPlaylists = fs.readFileSync( + path.join(this.paths.ciderCache, "library-playlists.json"), + "utf8" + ); + event.returnValue = JSON.parse(libraryPlaylists); + }); + + electron.ipcMain.on("get-library-recentlyAdded", (event) => { + let libraryRecentlyAdded = fs.readFileSync( + path.join(this.paths.ciderCache, "library-recentlyAdded.json"), + "utf8" + ); + event.returnValue = JSON.parse(libraryRecentlyAdded); + }); + + electron.ipcMain.handle("getYTLyrics", async (event, track, artist) => { + const u = track + " " + artist + " official video"; + return await yt.search(u); + }); + + electron.ipcMain.handle("setVibrancy", (event, key, value) => { + this.win.setVibrancy(value); + }); + + electron.ipcMain.on("maximize", () => { + // listen for maximize event + if (this.win.isMaximized()) { + this.win.unmaximize(); + } else { + this.win.maximize(); + } + }); + + electron.ipcMain.on("minimize", () => { + // listen for minimize event this.win.minimize(); - }) + }); // Set scale - electron.ipcMain.on('setScreenScale', (event, scale) => { - this.win.webContents.setZoomFactor(parseFloat(scale)) - }) + electron.ipcMain.on("setScreenScale", (event, scale) => { + this.win.webContents.setZoomFactor(parseFloat(scale)); + }); /* ********************************************************************************************* - * Window Events - * **********************************************************************************************/ + * Window Events + * **********************************************************************************************/ if (process.platform === "win32") { let WND_STATE = { MINIMIZED: 0, NORMAL: 1, MAXIMIZED: 2, - FULL_SCREEN: 3 - } - let wndState = WND_STATE.NORMAL + FULL_SCREEN: 3, + }; + let wndState = WND_STATE.NORMAL; this.win.on("resize", (_: any) => { - const isMaximized = this.win.isMaximized() - const isMinimized = this.win.isMinimized() - const isFullScreen = this.win.isFullScreen() + const isMaximized = this.win.isMaximized(); + const isMinimized = this.win.isMinimized(); + const isFullScreen = this.win.isFullScreen(); const state = wndState; if (isMinimized && state !== WND_STATE.MINIMIZED) { - wndState = WND_STATE.MINIMIZED + wndState = WND_STATE.MINIMIZED; } else if (isFullScreen && state !== WND_STATE.FULL_SCREEN) { - wndState = WND_STATE.FULL_SCREEN + wndState = WND_STATE.FULL_SCREEN; } else if (isMaximized && state !== WND_STATE.MAXIMIZED) { - wndState = WND_STATE.MAXIMIZED - this.win.webContents.executeJavaScript(`app.chrome.maximized = true`) + wndState = WND_STATE.MAXIMIZED; + this.win.webContents.executeJavaScript(`app.chrome.maximized = true`); } else if (state !== WND_STATE.NORMAL) { - wndState = WND_STATE.NORMAL - this.win.webContents.executeJavaScript(`app.chrome.maximized = false`) + wndState = WND_STATE.NORMAL; + this.win.webContents.executeJavaScript( + `app.chrome.maximized = false` + ); } - }) + }); } this.win.on("closed", () => { - this.win = null - }) + this.win = null; + }); // Set window Handler this.win.webContents.setWindowOpenHandler((x: any) => { if (x.url.includes("apple") || x.url.includes("localhost")) { - return {action: "allow"} + return { action: "allow" }; } - electron.shell.openExternal(x.url).catch(console.error) - return {action: 'deny'} - }) - + electron.shell.openExternal(x.url).catch(console.error); + return { action: "deny" }; + }); } -} \ No newline at end of file +} diff --git a/src/web-remote/index.html b/src/web-remote/index.html index 18695a58..8fd381a9 100644 --- a/src/web-remote/index.html +++ b/src/web-remote/index.html @@ -14,9 +14,9 @@ -
- -