fix file opening

Author: timsuchanek

packages/graphql-playground-electron/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://github.com/graphcool/graphql-playground",
   "repository": "graphcool/graphql-playground",
   "description": "Playground app",
-  "version": "1.3.0-beta.2",
+  "version": "1.3.0-beta.4",
   "author": {
     "name": "Graphcool",
     "email": "[email protected]",
@@ -93,6 +93,7 @@
     "date-fns": "^1.28.5",
     "electron-is-dev": "^0.3.0",
     "electron-localshortcut": "^2.0.2",
+    "electron-log": "^2.2.11",
     "electron-updater": "^2.13.0",
     "find-up": "^2.1.0",
     "graphcool-styles": "^0.1.31",

packages/graphql-playground-electron/src/ElectronApp.tsx

@@ -37,6 +37,25 @@ interface State {
   env?: any
 }
 
+const events: any[] = []
+
+ipcRenderer.on('OpenSelectedFile', pushSelectedFile)
+ipcRenderer.on('OpenUrl', pushOpenUrl)
+
+function pushSelectedFile() {
+  events.push({
+    type: 'OpenSelectedFile',
+    args: arguments,
+  })
+}
+
+function pushOpenUrl() {
+  events.push({
+    type: 'OpenUrl',
+    args: arguments,
+  })
+}
+
 export default class ElectronApp extends React.Component<{}, State> {
   private playground: IPlayground
 
@@ -130,11 +149,27 @@ cd ${folderPath}; graphql playground`)
   }
 
   componentDidMount() {
+    ipcRenderer.removeListener('OpenUrl', pushOpenUrl)
+    ipcRenderer.removeListener('OpenSelectedFile', pushSelectedFile)
     ipcRenderer.on('Tab', this.readTabMessage)
     ipcRenderer.on('File', this.readFileMessage)
     ipcRenderer.on('OpenSelectedFile', this.readOpenSelectedFileMessage)
     ipcRenderer.on('OpenUrl', this.handleUrl)
     window.addEventListener('keydown', this.handleKeyDown)
+    this.consumeEvents()
+    ipcRenderer.send('ready', '')
+  }
+
+  consumeEvents() {
+    while (events.length > 0) {
+      const event = events.shift()
+      switch (event.type) {
+        case 'OpenSelectedFile':
+          return this.readOpenSelectedFileMessage.call(this, ...event.args)
+        case 'OpenUrl':
+          return this.handleUrl.call(this, ...event.args)
+      }
+    }
   }
 
   componentWillUnmount() {
@@ -416,6 +451,8 @@ cd ${folderPath}; graphql playground`)
                 canSaveConfig={true}
                 env={this.state.env}
                 folderName={this.state.folderName}
+                showNewWorkspace={true}
+                onNewWorkspace={this.handleOpenNewWindow}
               />
             </div>
           )}

packages/graphql-playground-electron/src/main.ts

@@ -10,6 +10,8 @@ import {
   protocol,
 } from 'electron'
 import * as electronLocalShortcut from 'electron-localshortcut'
+import * as fs from 'fs'
+import * as os from 'os'
 import { autoUpdater } from 'electron-updater'
 const dev = require('electron-is-dev')
 
@@ -20,6 +22,38 @@ const { newWindowConfig } = require('./utils')
 const server = 'https://hazel-wmigqegsed.now.sh'
 const feed = `${server}/update/${process.platform}/${app.getVersion()}`
 
+app.setAsDefaultProtocolClient('graphql-playground')
+
+const log = {
+  info: (...args) => {
+    console.log(...args)
+    // fs.appendFileSync(
+    //   os.homedir() + '/pg-logs.log',
+    //   JSON.stringify(args) + '\n',
+    // )
+  },
+}
+
+log.info(protocol)
+// log.info(protocol.registerStringProtocol)
+
+// protocol.registerBufferProtocol('graphql-playground', (request, callback) => {
+//   setTimeout(() => {
+//     forceSend('OpenUrl', request.url)
+//   }, 5000)
+//   callback()
+// })
+
+app.on('open-url', (event, url) => {
+  event.preventDefault()
+  forceSend('OpenUrl', url)
+})
+
+app.on('open-file', (event, path) => {
+  event.preventDefault()
+  forceSend('OpenSelectedFile', path)
+})
+
 function getFocusedWindow(): any | null {
   return BrowserWindow.getFocusedWindow()
 }
@@ -54,30 +88,24 @@ function getFocusedWindow(): any | null {
 function send(channel: string, arg: string) {
   const focusedWindow = getFocusedWindow()
   if (focusedWindow) {
-    console.log('sending to focused window', channel, arg)
+    log.info('sending to focused window', channel, arg)
     focusedWindow.webContents.send(channel, arg)
   } else {
-    console.log('no focused window')
+    log.info('no focused window')
   }
 }
 
+const readyWindowsPromises = {}
+
 async function forceSend(channel: string, arg: string) {
   await appPromise
   const currentWindows = BrowserWindow.getAllWindows()
   let window = currentWindows[0]
   if (!window) {
     window = createWindow()
-    console.log('created window')
-    await new Promise(r => {
-      console.log('waiting for dom to be ready')
-      window.webContents.addListener('dom-ready', r)
-    })
-    await new Promise(r => setTimeout(r, 200))
-    console.log('did finish load')
   }
-  // send(channel, arg)
-  // console.log('window')
-  console.log('force sending', channel, arg)
+  await readyWindowsPromises[window.id]
+  log.info('force sending', channel, arg)
   window.webContents.send(channel, arg)
 }
 
@@ -147,12 +175,12 @@ function createWindow() {
     } = require('electron-devtools-installer')
 
     installExtension(REACT_DEVELOPER_TOOLS)
-      .then(name => console.log(`Added Extension:  ${name}`))
-      .catch(err => console.log('An error occurred: ', err))
+      .then(name => log.info(`Added Extension:  ${name}`))
+      .catch(err => log.info('An error occurred: ', err))
 
     installExtension(REDUX_DEVTOOLS)
-      .then(name => console.log(`Added Extension:  ${name}`))
-      .catch(err => console.log('An error occurred: ', err))
+      .then(name => log.info(`Added Extension:  ${name}`))
+      .catch(err => log.info('An error occurred: ', err))
 
     // newWindow.webContents.openDevTools()
   }
@@ -174,6 +202,11 @@ function createWindow() {
   // electronLocalShortcut.register(newWindow, 'Cmd+Shift+[', () => {
   //   send('Tab', 'Prev')
   // })
+  readyWindowsPromises[newWindow.id] = new Promise(r => {
+    ipcMain.once('ready', () => {
+      r()
+    })
+  })
 
   return newWindow
 }
@@ -292,35 +325,23 @@ app.on('ready', () => {
   Menu.setApplicationMenu(menu)
 
   ipcMain.on('get-file-data', event => {
-    console.log('get-file-data', event)
+    log.info('get-file-data', event)
     // this.fileAdded(event)
   })
 
   ipcMain.on('load-file-content', (event, filePath) => {
-    console.log('load-file-content', event, filePath)
+    log.info('load-file-content', event, filePath)
   })
 
   protocol.registerFileProtocol('file:', (request, filePath) => {
-    console.log('file:', request, filePath)
+    log.info('file:', request, filePath)
   })
 
   if (appResolve) {
     appResolve()
   }
 })
 
-app.setAsDefaultProtocolClient('graphql-playground')
-
-app.on('open-url', (event, url) => {
-  event.preventDefault()
-  forceSend('OpenUrl', url)
-})
-
-app.on('open-file', (event, path) => {
-  event.preventDefault()
-  forceSend('OpenSelectedFile', path)
-})
-
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
   // On OS X it is common for applications and their menu bar

packages/graphql-playground-electron/yarn.lock

@@ -2450,6 +2450,10 @@ electron-localshortcut@^2.0.2:
     debug "^2.6.8"
     electron-is-accelerator "^0.1.0"
 
+electron-log@^2.2.11:
+  version "2.2.11"
+  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.11.tgz#dc99118cda054aa866e47d081d1431c76baacd68"
+
 [email protected]:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.7.tgz#1d75647a82748eacd48bea70616ec83ffade3ee5"
@@ -6715,18 +6719,6 @@ styled-components@^2.2.3:
     postcss-load-plugins "^2.2.0"
     styled-jsx "^0.5.7"
 
-"styled-jsx-postcss@git+https://github.com/timsuchanek/styled-jsx-postcss.git#build3":
-  version "0.2.0"
-  uid "677ee0fb7f9138047a00e03c8c3e44adbb33cf2a"
-  resolved "git+https://github.com/timsuchanek/styled-jsx-postcss.git#677ee0fb7f9138047a00e03c8c3e44adbb33cf2a"
-  dependencies:
-    babel-traverse "^6.21.0"
-    babylon "^6.14.1"
-    deasync "^0.1.9"
-    postcss "^5.2.8"
-    postcss-load-plugins "^2.2.0"
-    styled-jsx "^0.5.7"
-
 [email protected]:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-0.5.2.tgz#59740216c3db371636f9beec02149f9da5ea02e5"