Merge pull request #136 from ciderapp/main

merge from main

index.js

@@ -1,14 +1,14 @@
 require('v8-compile-cache');
-const {app, components} = require('electron'),
+const { app, components } = require('electron'), { resolve, join } = require("path"),
-    {resolve, join} = require("path"),
     CiderBase = require('./src/main/cider-base');
-
+const customProtocols = require('./package.json').fileAssociations[0].protocols
+console.log(customProtocols)
 const comps = components;
 
 
 // Analytics for debugging.
 const ElectronSentry = require("@sentry/electron");
-ElectronSentry.init({dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.ingest.sentry.io/6112214"});
+ElectronSentry.init({ dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.ingest.sentry.io/6112214" });
 
 const configDefaults = {
     "general": {
@@ -152,10 +152,10 @@ app.commandLine.appendSwitch('no-sandbox');
 // app.commandLine.appendSwitch('js-flags', '--max-old-space-size=1024')
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* App Event Handlers
+ * App Event Handlers
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-app.whenReady().then(async () => {
+app.whenReady().then(async() => {
     if (process.platform === "win32") {
         app.commandLine.appendSwitch('high-dpi-support', 'true')
         app.commandLine.appendSwitch('force-device-scale-factor', '1')
@@ -208,25 +208,28 @@ app.on('widevine-error', (error) => {
 
 if (process.defaultApp) {
     if (process.argv.length >= 2) {
-        app.setAsDefaultProtocolClient('cider', process.execPath, [resolve(process.argv[1])])
+        customProtocols.forEach((customProtocol) => {
-        app.setAsDefaultProtocolClient('ame', process.execPath, [resolve(process.argv[1])])
+            app.setAsDefaultProtocolClient(customProtocol, process.execPath, [resolve(process.argv[1])])
-        app.setAsDefaultProtocolClient('itms', process.execPath, [resolve(process.argv[1])])
+        })
-        app.setAsDefaultProtocolClient('itmss', process.execPath, [resolve(process.argv[1])])
-        app.setAsDefaultProtocolClient('musics', process.execPath, [resolve(process.argv[1])])
-        app.setAsDefaultProtocolClient('music', process.execPath, [resolve(process.argv[1])])
     }
 } else {
-    app.setAsDefaultProtocolClient('cider') // Custom AME Protocol
+    /*
-    app.setAsDefaultProtocolClient('ame') // Custom AME Protocol
+     *  cider - Custom Cider Protocol
-    app.setAsDefaultProtocolClient('itms') // iTunes HTTP Protocol
+     *  ame - Custom AME Protocol (Backwards Compat.)
-    app.setAsDefaultProtocolClient('itmss') // iTunes HTTPS Protocol
+     *  itms - iTunes HTTP Protocol
-    app.setAsDefaultProtocolClient('musics') // macOS Client Protocol
+     *  itmss - iTunes HTTPS Protocol
-    app.setAsDefaultProtocolClient('music') // macOS Client Protocol
+     *  musics - macOS Client Protocol
+     *  music - macOS Client Protocol
+     */
+    customProtocols.forEach((customProtocol) => {
+        app.setAsDefaultProtocolClient(customProtocol)
+    })
+
 }
 
 app.on('open-url', (event, url) => {
     event.preventDefault()
-    if (url.includes('ame://') || url.includes('itms://') || url.includes('itmss://') || url.includes('musics://') || url.includes('music://')) {
+    if (customProtocols.some(protocol => url.includes(protocol))) {
         CiderBase.LinkHandler(url)
     }
 })
@@ -236,8 +239,7 @@ app.on('second-instance', (_e, argv) => {
 
     // Checks if first instance is authorized and if second instance has protocol args
     argv.forEach((value) => {
-        if (value.includes('ame://') || value.includes('itms://') || value.includes('itmss://') || value.includes('musics://') || value.includes('music://')) {
+        if (customProtocols.some(protocol => value.includes(protocol))) {
-            console.warn(`[InstanceHandler][SecondInstanceHandler] Found Protocol!`)
             CiderBase.LinkHandler(value);
         }
     })
@@ -258,6 +260,3 @@ if (!app.requestSingleInstanceLock() && true) {
     app.quit();
     // app.isQuiting = true
 }
-
-
-  

src/main/cider-base.js

@@ -101,8 +101,9 @@ const CiderBase = {
         })
 
         win.webContents.session.webRequest.onHeadersReceived((details, callback) => {
-            if(details.url.match(/^https:\/\/store-\d{3}\.blobstore\.apple\.com/) || details.url.startsWith("https://store-037.blobstore.apple.com")){
+            if (details.url.match(/^https:\/\/store-\d{3}\.blobstore\.apple\.com/) || details.url.startsWith("https://store-037.blobstore.apple.com")) {
-            details.responseHeaders['Access-Control-Allow-Origin'] = '*';}
+                details.responseHeaders['Access-Control-Allow-Origin'] = '*';
+            }
             callback({ responseHeaders: details.responseHeaders })
         })
 
@@ -338,10 +339,11 @@ const CiderBase = {
     },
     LinkHandler: (startArgs) => {
         if (!startArgs) return;
-        console.log("lfmtoken", String(startArgs))
+
         if (String(startArgs).includes('auth')) {
             let authURI = String(startArgs).split('/auth/')[1]
             if (authURI.startsWith('lastfm')) { // If we wanted more auth options
+                console.log("lfmtoken", String(startArgs))
                 const authKey = authURI.split('lastfm?token=')[1];
                 app.cfg.set('lastfm.enabled', true);
                 app.cfg.set('lastfm.auth_token', authKey);
@@ -349,17 +351,28 @@ const CiderBase = {
                 lastfm.authenticate()
             }
         } else {
-            const formattedSongID = startArgs.replace('ame://', '').replace('/', '');
+            if (String(startArgs).includes('/play/')) { //Steer away from protocal:// specific conditionals
-            console.warn(`[LinkHandler] Attempting to load song id: ${formattedSongID}`);
+                const playParam = String(startArgs).split('/play/')[1]
-
+                if (playParam.includes('s/')) { // setQueue can be done with album, song, url, playlist id
-            // setQueue can be done with album, song, url, playlist id
+                    console.log(playParam)
+                    let song = playParam.split('s/')[1]
+                    console.warn(`[LinkHandler] Attempting to load song by id: ${song}`);
                     this.win.webContents.executeJavaScript(`
-                MusicKit.getInstance().setQueue({ song: '${formattedSongID}'}).then(function(queue) {
+                        MusicKit.getInstance().setQueue({ song: '${song}'}).then(function(queue) {
                             MusicKit.getInstance().play();
                         });
                     `).catch((err) => console.error(err));
                 }
 
+
+
+            }
+
+
+
+
+        }
+
     },
 
     async InitWebServer() {

src/main/discordrpc.js

@@ -1,4 +1,4 @@
-const {app} = require('electron'),
+const { app } = require('electron'),
     DiscordRPC = require('discord-rpc')
 
 module.exports = {
@@ -7,16 +7,16 @@ module.exports = {
      * Connects to Discord RPC
      * @param {string} clientId
      */
-    connect: function (clientId) {
+    connect: function(clientId) {
-        app.discord = {isConnected: false};
+        app.discord = { isConnected: false };
         if (app.cfg.get('general.discord_rpc') == 0 || app.discord.isConnected) return;
 
         DiscordRPC.register(clientId) // Apparently needed for ask to join, join, spectate etc.
-        const client = new DiscordRPC.Client({transport: "ipc"});
+        const client = new DiscordRPC.Client({ transport: "ipc" });
-        app.discord = Object.assign(client, {error: false, activityCache: null, isConnected: false});
+        app.discord = Object.assign(client, { error: false, activityCache: null, isConnected: false });
 
         // Login to Discord
-        app.discord.login({clientId})
+        app.discord.login({ clientId })
             .then(() => {
                 app.discord.isConnected = true;
             })
@@ -37,7 +37,7 @@ module.exports = {
     /**
      * Disconnects from Discord RPC
      */
-    disconnect: function () {
+    disconnect: function() {
         if (app.cfg.get('general.discord_rpc') == 0 || !app.discord.isConnected) return;
 
         try {
@@ -54,7 +54,7 @@ module.exports = {
      * Sets the activity of the client
      * @param {object} attributes
      */
-    updateActivity: function (attributes) {
+    updateActivity: function(attributes) {
         if (app.cfg.get('general.discord_rpc') == 0) return;
 
         if (!app.discord.isConnected) {
@@ -64,20 +64,20 @@ module.exports = {
 
         // console.log('[DiscordRPC][updateActivity] Updating Discord Activity.')
 
-        const listenURL = `https://applemusicelectron.com/p?id=${attributes.playParams.id}`
+        const listenURL = `https://cider.sh/p?s&id=${attributes.playParams.id}` // cider://play/s/[id] (for song) 
             //console.log(attributes)
         let ActivityObject = {
             details: attributes.name,
             state: `by ${attributes.artistName}`,
             startTimestamp: attributes.startTime,
             endTimestamp: attributes.endTime,
-            largeImageKey: (attributes.artwork.url.replace('{w}', '1024').replace('{h}', '1024')) ?? 'cider',
+            largeImageKey: (attributes.artwork.url.replace('{w}', '1024').replace('{h}', '1024')) ? ? 'cider',
             largeImageText: attributes.albumName,
             smallImageKey: (attributes.status ? 'play' : 'pause'),
             smallImageText: (attributes.status ? 'Playing' : 'Paused'),
             instance: true,
             buttons: [
-                {label: "Listen on Cider", url: listenURL},
+                { label: "Listen on Cider", url: listenURL },
             ]
         };
         if (ActivityObject.largeImageKey == "" || ActivityObject.largeImageKey == null) {

src/renderer/style.less

@@ -2929,6 +2929,8 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 
   .autoplay {
     background: rgb(200 200 200 / 15%);
+    color:rgb(255 255 255);
+    font-size: larger;
     appearance: none;
     border: 0;
     border-radius: 6px;

src/renderer/views/components/queue.ejs

@@ -5,7 +5,7 @@
                 <h3 class="queue-header-text">Queue</h3>
             </div>
             <div class="col-auto flex-center">
-                <button class="autoplay" :style="{'background': app.mk.autoplayEnabled ? 'var(--keyColor)' : ''}" @click="app.mk.autoplayEnabled = !app.mk.autoplayEnabled">AUTO</button>
+                <button class="autoplay" :style="{'background': app.mk.autoplayEnabled ? 'var(--keyColor)' : ''}" @click="app.mk.autoplayEnabled = !app.mk.autoplayEnabled">∞</button>
             </div>
         </div>
         <div class="queue-body">

src/renderer/views/main.ejs

@@ -142,8 +142,11 @@
                                 @click="invokeDrawer('queue')"></button>
                     </div>
                     <div class="app-chrome-item generic">
+                        <template v-if="lyrics && lyrics != [] && lyrics.length > 0">
                             <button class="playback-button--small lyrics" :class="{'active': drawer.panel == 'lyrics'}"
                                 @click="invokeDrawer('lyrics')"></button>
+                            </template>
+                        
                     </div>
                     <div class="app-chrome-item full-height" v-if="chrome.windowControlPosition == 'right'">
                         <div class="window-controls">
@@ -517,7 +520,7 @@
 
                 </div>
                 <transition name="drawertransition">
-                    <div class="app-drawer" v-if="drawer.open && drawer.panel == 'lyrics'">
+                    <div class="app-drawer" v-if="drawer.open && drawer.panel == 'lyrics' && lyrics && lyrics != [] && lyrics.length > 0">
                         <div class="bgArtworkMaterial">
                             <div class="bg-artwork-container">
                                 <img class="bg-artwork a" :src="$store.state.artwork.playerLCD">