electron/index.js

@@ -4,7 +4,7 @@
 import '@babel/polyfill';
 import SemVer from 'semver';
 import https from 'https';
-import { app, dialog, ipcMain, session, shell } from 'electron';
+import { app, dialog, ipcMain, session, shell, protocol } from 'electron';
 import { autoUpdater } from 'electron-updater';
 import { Lbry } from 'lbry-redux';
 import LbryFirstInstance from './LbryFirstInstance';
@@ -46,8 +46,15 @@ let lbryFirst;
 
 const appState = {};
 
-if (process.platform !== 'linux') {
-  app.setAsDefaultProtocolClient('lbry');
+const PROTOCOL = 'lbry'
+
+if (isDev && process.platform === 'win32') {
+  // Setting this is required to get this working in dev mode.
+  app.setAsDefaultProtocolClient(PROTOCOL, process.execPath, [
+    path.resolve(process.argv[1])
+  ]);
+} else {
+  app.setAsDefaultProtocolClient(PROTOCOL);
 }
 
 app.name = 'LBRY';
@@ -149,9 +156,16 @@ if (!gotSingleInstanceLock) {
   app.on('second-instance', (event, argv) => {
     // Send the url to the app to navigate first, then focus
     if (rendererWindow) {
-      if ((process.platform === 'win32' || process.platform === 'linux') && String(argv[1]).startsWith('lbry')) {
-        let URI = argv[1];
-
+      // External uri (last item on argv):
+      // Required to work on dev mode
+      const EXTERNAL_URI = argv[argv.length ? (argv.length-1) : 0]
+      // Handle protocol requests for windows and linux
+      const platforms = (process.platform === 'win32' || process.platform === 'linux')
+      // Is LBRY protocol
+      const isProtocolURI = String(EXTERNAL_URI).startsWith(PROTOCOL)
+      // External protocol requested:
+      if (platforms  && isProtocolURI) {
+        let URI = EXTERNAL_URI;
         // Keep only command line / deep linked arguments
         // Windows normalizes URIs when they're passed in from other apps. On Windows, this tries to
         // restore the original URI that was typed.