chore: fix electron example

running tests with electron will come soon

closes #2011

Author: hugomrdias

examples/run-in-electron/README.md

@@ -6,9 +6,5 @@ To try it by yourself, do:
 
 ```
 > npm install
-> ./node_modules/.bin/electron-rebuild
-# or 
-> ./build.sh
-#
-# You can also try to use `npm start` to see where electron errors
+> npm start
 ```

examples/run-in-electron/main.js

@@ -1,24 +1,18 @@
 'use strict'
 
-const electron = require('electron')
-const app = electron.app
-const BrowserWindow = electron.BrowserWindow
-
-const IPFS = require('ipfs')
-const path = require('path')
-const url = require('url')
+const { app, BrowserWindow } = require('electron')
 
 let mainWindow
 
 function createWindow () {
-  mainWindow = new BrowserWindow({ width: 800, height: 600 })
+  mainWindow = new BrowserWindow({ width: 800,
+    height: 600,
+    webPreferences: {
+      nodeIntegration: true
+    } })
 
   // and load the index.html of the app.
-  mainWindow.loadURL(url.format({
-    pathname: path.join(__dirname, 'index.html'),
-    protocol: 'file:',
-    slashes: true
-  }))
+  mainWindow.loadFile('index.html')
 
   // Open the DevTools.
   mainWindow.webContents.openDevTools()
@@ -32,9 +26,8 @@ function createWindow () {
 app.on('ready', () => {
   createWindow()
 
-  // Spawn your IPFS node \o/
+  const IPFS = require('ipfs')
   const node = new IPFS()
-
   node.on('ready', () => {
     node.id((err, id) => {
       if (err) {
@@ -43,6 +36,9 @@ app.on('ready', () => {
       console.log(id)
     })
   })
+  node.on('error', (err) => {
+    return console.log(err)
+  })
 })
 
 // Quit when all windows are closed.

examples/run-in-electron/package.json

@@ -5,7 +5,7 @@
   "main": "main.js",
   "scripts": {
     "start": "electron .",
-    "postinstall": "electron-rebuild"
+    "postinstall": "./rebuild.sh"
   },
   "keywords": [
     "Electron",
@@ -15,8 +15,8 @@
   "author": "David Dias <[email protected]>",
   "license": "MIT",
   "devDependencies": {
-    "electron": "^2.0.0",
-    "electron-rebuild": "^1.7.2",
+    "electron": "^4.2.0",
+    "electron-rebuild": "^1.8.4",
     "ipfs": "ipfs/js-ipfs"
   }
 }

examples/run-in-electron/build.sh renamed to examples/run-in-electron/rebuild.sh

@@ -1,5 +1,5 @@
 # Electron's version.
-export npm_config_target=2.0.0
+export npm_config_target=4.2.0
 # The architecture of Electron, can be ia32 or x64.
 export npm_config_arch=x64
 export npm_config_target_arch=x64
@@ -10,4 +10,4 @@ export npm_config_runtime=electron
 # Tell node-pre-gyp to build module from source code.
 export npm_config_build_from_source=true
 # Install all dependencies, and store cache to ~/.electron-gyp.
-HOME=~/.electron-gyp npm install
+HOME=~/.electron-gyp npm rebuild

examples/run-in-electron/renderer.js

@@ -0,0 +1,3 @@
+// This file is required by the index.html file and will
+// be executed in the renderer process for that window.
+// All of the Node.js APIs are available in this process.

test/core/pin.js

@@ -189,7 +189,8 @@ describe('pin', function () {
         .catch(err => expect(err).to.match(/already pinned recursively/))
     })
 
-    it('can\'t pin item not in datastore', () => {
+    it('can\'t pin item not in datastore', function () {
+      this.timeout(5 * 1000)
       const falseHash = `${pins.root.slice(0, -2)}ss`
       return expectTimeout(pin.add(falseHash), 4000)
     })