Develop into master (#2804)

* improve 'METHOD_DENIED' error message (#2127)

* improve 'METHOD_DENIED' error message

* fix

* upstream fixes

* Swarm additions (#2764)

* fixes batch requests on isolated preloaders

* added 404 page for not found swarm content

* fixed coide climate issues

* show custom 404 error only for bzz://

* Error page fixes and build errors (#2780)

* fixes batch requests on isolated preloaders

* added 404 page for not found swarm content

* fixed coide climate issues

* show custom 404 error only for bzz://

* fixed borwser.js issue and sound and error pages

* trigger travis

* trigger travis

* adding globals to ESLint whitelist

* Small refactor; Fixing 3/4 tests

* Adjusting spectron version

* ESLint

* [Spectron] New fixture server; Fixes 4/4 test.

* Wallet shouldn't start Swarm

* Wallet shouldn't start Swarm

* Adding exception to eslint

* Fix wallet preloader issue

* Mac release path (#2808)

* Adding gitter channel info (#2807)

* Add bzz and .eth to urls (#2792)

* add .eth

* refactor ifs

* solve for wallet.ethereum.org

* Fixing delay problem

Author: evertonfraga

.eslintrc.yml

@@ -44,4 +44,4 @@ globals:  # don't warn about missing declarations
   _: true
   window: true
   location: true
-
+  document: true

README.md

@@ -12,7 +12,9 @@ Please note that this repository is the Electron host for the Meteor based walle
 
 ## Help and troubleshooting
 
-Please check the [Mist troubleshooting guide](https://github.com/ethereum/mist/wiki) for help.
+Please check the [Mist troubleshooting guide](https://github.com/ethereum/mist/wiki).
+
+Or the [Gitter Channel](https://gitter.im/ethereum/mist), to connect with the community for instant help.
 
 ## Installation
 

gulpTasks/building.js

@@ -35,6 +35,7 @@ gulp.task('copy-app-source-files', () => {
         '!./tests/wallet/*',
         `./icons/${type}/*`,
         './sounds/*',
+        './errorPages/*',
         'customProtocols.js'
     ], {
         base: './'
@@ -214,7 +215,8 @@ gulp.task('release-dist', (done) => {
             break;
         case 'mac':
             cp(
-                `${applicationName}-${version}.dmg`, `${appNameHypen}-macosx-${versionDashed}.dmg`);
+                path.join('mac', `${applicationName}-${version}.dmg`),
+                `${appNameHypen}-macosx-${versionDashed}.dmg`);
             break;
         case 'linux':
             cp(

gulpTasks/publishing.js

@@ -57,6 +57,8 @@ gulp.task('upload-binaries', (cb) => {
     // personal access token (public_repo) must be set using travis' ENVs
     const GITHUB_TOKEN = process.env.GITHUB_TOKEN;
 
+    console.info('Checking Github releases...');
+
     // query github releases
     got(`https://api.github.com/repos/ethereum/mist/releases?access_token=${GITHUB_TOKEN}`, { json: true })
     // filter draft with current version's tag

interface/client/lib/helpers/helperFunctions.js

@@ -79,11 +79,19 @@ Format Urls, e.g add a default protocol if on is missing.
 @param {String} url
 **/
 Helpers.formatUrl = function (url) {
+    if (!url) return;
+
     // add http:// if no protocol is present
-    if (url && url.length === 64 && !!url.match(/^[0-9a-f]+$/)) {
+    if (url.length === 64 && !!url.match(/^[0-9a-f]+$/)) {
         // if the url looks like a hash, add bzz
         url = 'bzz://' + url;
-    } else if (url && url.indexOf('://') === -1) {
+    } else if (!!url.match(/^([a-z]*:\/\/)?[^/]*\.eth(\/.*)?$/i)) {
+        // if uses .eth as a TLD
+        url = 'bzz://' + url.replace(/^([a-z]*:\/\/)?/i, '');
+    } else if (!!url.match(/^[^\.\/]*$/i)) {
+        // doesn't have a protocol nor a TLD
+        url = 'bzz://' + url + '.eth';
+    } else if (url.indexOf('://') === -1) {
         // if it doesn't have a protocol
         url = 'http://' + url;
     }

interface/client/mistAPIBackend.js

@@ -67,10 +67,9 @@ mistAPIBackend = function (event) {
             appBar: (_.contains(allowedBrowserBarStyles, appBarClass) ? appBarClass : null)
         }});
     }
-
     if (event.channel === 'mistAPI_sound') {
         sound.pause();
-        sound.src = Blaze._escape(arg);
+        sound.src = Blaze._escape('file://'+ dirname +'/sounds/' + arg + '.mp3');
         sound.play();
     }
 

interface/client/templates/views/webview.js

@@ -64,6 +64,21 @@ Template['views_webview'].onRendered(function () {
     webview.addEventListener('did-fail-load', showError.bind(webview, tabId));
     webview.addEventListener('crashed', showError.bind(webview, tabId));
 
+    // Forward SWARM status code errors to showError
+    webview.addEventListener('did-get-response-details', function (e) {
+        if (e && e.resourceType === 'mainFrame' && /^bzz:\//i.test(e.newURL)) {
+            switch (e.httpResponseCode) {
+            case 500:
+                showError.call(webview, tabId, {
+                    isMainFrame: true,
+                    errorCode: 404
+                });
+                break;
+            }
+        }
+    });
+
+
     // navigate page, and redirect to browser tab if necessary
     webview.addEventListener('will-navigate', webviewLoadStart.bind(webview, tabId));
     webview.addEventListener('did-get-redirect-request', webviewLoadStart.bind(webview, tabId));

interface/client/templates/webviewEvents.js

@@ -12,6 +12,9 @@ showError = function (tabId, e) {
         case -105:
             url = path + '404.html';
             break;
+        case 404:
+            url = path + '404.html';
+            break;
         case 500:
             url = path + '500.html';
             break;
@@ -41,7 +44,7 @@ webviewChangeUrl = function (tabId, e) {
     }
 
     // make sure to not store error pages in history
-    if (!url || url.indexOf('mist/errorPages/') !== -1) {
+    if (!url || url.indexOf('mist/errorPages/') !== -1 || url.indexOf('app.asar/errorPages/') !== -1) {
         return;
     }
 

interface/i18n/mist.en.i18n.json

@@ -81,8 +81,9 @@
             },
             "help": {
                 "label": "Help",
-                "reportBug": "Report an issue on Github",
-                "mistWiki": "Troubleshooting and Help"
+                "mistWiki": "Troubleshooting and Help",
+                "gitter": "Mist channel on Gitter",
+                "reportBug": "Report an issue on Github"
             }
         },
         "errors": {

main.js

@@ -381,6 +381,10 @@ onReady = () => {
             return ethereumNode.init();
         })
         .then(() => {
+            // Wallet shouldn't start Swarm
+            if (Settings.uiMode === 'wallet') {
+                return Promise.resolve();
+            }
             return swarmNode.init();
         })
         .then(function sanityCheck() {