Fix handling of the custom protocol on windows

MarshallOfSound · MarshallOfSound · commit e66db3a1309e · 2016-11-22T18:53:38.000+11:00
diff --git a/main-process/system/protocol-handler.js b/main-process/system/protocol-handler.js
@@ -1,8 +1,19 @@
 const app = require('electron').app
 const dialog = require('electron').dialog
+const path = require('path')
 
-app.setAsDefaultProtocolClient('electron-api-demos')
+// If we are running a non-packaged version of the app
+if (process.defaultApp) {
+  // If we have the path to our app we set the protocol client to launch electron.exe with the path to our app
+  if (process.argv.length >= 2) {
+    app.setAsDefaultProtocolClient('electron-api-demos', process.execPath, [path.resolve(process.argv[1])])
+  }
+} else {
+  app.setAsDefaultProtocolClient('electron-api-demos')
+}
 
+// NOTE: See the makeSingleInstance function in main.js for reference as to how
+//       this event is fired on Windows
 app.on('open-url', function (event, url) {
   dialog.showErrorBox('Welcome Back', `You arrived from: ${url}`)
 })
diff --git a/main.js b/main.js
@@ -73,10 +73,18 @@ function initialize () {
 function makeSingleInstance () {
   if (process.mas) return false
 
-  return app.makeSingleInstance(function () {
+  return app.makeSingleInstance(function (argv) {
     if (mainWindow) {
       if (mainWindow.isMinimized()) mainWindow.restore()
       mainWindow.focus()
+      // On windows we have to check the second instance arguments to emit the open-url event
+      if (process.platform === 'win32') {
+        // Check if the second instance was attempting to launch a URL for our protocol client
+        const url = argv.find(function (arg) {
+          return /^electron-api-demos:\/\//.test(arg)
+        })
+        if (url) app.emit('open-url', null, url.replace(/^electron-api-demos:\/\//, ''))
+      }
     }
   })
 }
