🔖 v0.5.9

updated contributing guide

.travis.yml

@@ -1,12 +1,21 @@
-language: node_js
+sudo: required
+dist: trusty
 
 os:
 - osx
 - linux
-sudo: required
 
+addons:
+  apt:
+    packages:
+    - build-essential
+    - libxext-dev
+    - libxtst-dev
+    - libxkbfile-dev
+
+language: node_js
 node_js:
-  - 'node'
+- '6'
 
 before_install:
 - npm install -g gulp
@@ -14,7 +23,16 @@ before_install:
 
 cache:
   directories:
-    - node_modules
+  - node_modules
+  - app/node_modules
+  - $HOME/.electron
+  - $HOME/.cache
 
 script:
 - npm run travis
+notifications:
+  webhooks:
+    urls:
+      - https://zulip.org/zulipbot/travis
+    on_success: always
+    on_failure: always

CONTRIBUTING.md

@@ -1,16 +1,24 @@
-#Contributing Guidelines
+# Contributing Guidelines
 
 Thanks for taking the time to contribute!
 
-The following is a set of guidelines for contributing to zulip-electron. These are just guidelines, not rules, use your best judgment and feel free to propose changes to this document in a pull request.
+The following is a set of guidelines for contributing to zulip-electron. These are just guidelines, not rules, use your best judgement and feel free to propose changes to this document in a pull request.
 
 ## Getting Started
 
 Zulip-Desktop app is built on top of [Electron](http://electron.atom.io/). If you are new to Electron please head over to [this](http://jlord.us/essential-electron/) great article.
 
+## Community
+
+* The whole zulip documentation such as development environment, setting up with zulip project, testing, code of conduct can be read [here](https://zulip.readthedocs.io).
+
+* If you have any questions regarding zulip-electron, open an [issue](https://github.com/zulip/zulip-electron/issues/new/) or ask it [here](https://chat.zulip.org/#narrow/stream/electron).
+
 ## Issue
 Ensure the bug was not already reported by searching on GitHub under [Issues](https://github.com/zulip/zulip-electron/issues). If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/zulip/zulip-electron/issues/new). Please pay attention to following points while opening an issue.
 
+The [Zulipbot](https://github.com/zulip/zulipbot) helps to claim the issue by commenting the following in the comment section: "**@zulipbot** claim". **@zulipbot** will assign you to the issue and label the issue as **in progress**. For more details, check out [**@zulipbot**](https://github.com/zulip/zulipbot).
+
 ### Does it happen on web browsers? (especially Chrome)
 Zulip-Desktop is based on Electron, which integrates the Chrome engine within a standalone application.
 If the problem you encounter can be reproduced on web browsers, it may be an issue with Zulip web app.

README.md

@@ -5,7 +5,7 @@
 
 This is an experimental replacement for the [Zulip Desktop
 app](https://github.com/zulip/zulip-desktop) implemented in
-[Electron](http://electron.atom.io/).
+[Electron](http://electron.atom.io/).eeee
 
 The goal is to achieve feature-compatibility with the old desktop app
 and then start adding cool features like easy support for
@@ -13,11 +13,13 @@ multi-account, auto-updates etc.
 
 ## Prerequisites
 * node >= v6.3.1
-* npm >= 3.10.3
-* If you're on Debian or Ubuntu, you'll also need to install
-`nodejs-legacy`:
+> Use [nvm](https://github.com/creationix/nvm) to install the current stable version of node
+
+
+* python (v2.7.x recommended)
+* If you're on Debian or Ubuntu, you'll need to install following packages:
 ```sh
-$ sudo apt-get install nodejs-legacy
+$ sudo apt-get install build-essential libxext-dev libxtst-dev libxkbfile-dev
 ```
 
 ## Installation
@@ -60,6 +62,8 @@ You can create Windows installer only when running on Windows, the same is true
 
 - [x] Native Notifications
 - [x] SpellChecker
+- [x] OSX/Win/Linux installer
+- [x] Automatic Updates (macOS/Windows)
 - [x] Keyboard shortcuts
 
 Description            | Keys
@@ -69,9 +73,6 @@ Change Zulip Server    | <kbd>Cmd/Ctrl</kbd> <kbd>,</kbd>
 Back                   | <kbd>Cmd/Ctrl</kbd> <kbd>[</kbd>
 Forward                | <kbd>Cmd/Ctrl</kbd> <kbd>]</kbd>
 
-- [x] OSX/Win/Linux installer
-- [ ] Launch on OS startup
-- [ ] Automatic Updates
 
 ## Contribute
 

app/main/autoupdater.js

@@ -1,49 +1,47 @@
 'use strict';
-const {app, autoUpdater, dialog} = require('electron');
-const version = app.getVersion();
-const os = require('os');
-const platform = os.platform() + '_' + os.arch();  // usually returns darwin_64
-
-const updaterFeedURL = 'http://zulipdesktop.herokuapp.com/update/'+ platform + '/' + version;
+const {app, dialog} = require('electron');
+const {autoUpdater} = require('electron-updater');
 
 function appUpdater() {
-
-	autoUpdater.setFeedURL(updaterFeedURL);
-
 	// Log whats happening
-	autoUpdater.on('error', err => console.log(err))
-    autoUpdater.on('checking-for-update', () => console.log('checking-for-update'))
-	autoUpdater.on('update-available', () => console.log('update-available'))
-	autoUpdater.on('update-not-available', () => console.log('update-not-available'))
+	const log = require('electron-log');
+	log.transports.file.level = 'info';
+	autoUpdater.logger = log;
+	/*
+	autoUpdater.on('error', err => log.info(err));
+	autoUpdater.on('checking-for-update', () => log.info('checking-for-update'));
+	autoUpdater.on('update-available', () => log.info('update-available'));
+	autoUpdater.on('update-not-available', () => log.info('update-not-available'));
+	*/
 
 	// Ask the user if update is available
-	autoUpdater.on('update-downloaded', (event, releaseNotes, releaseName, releaseDate) => {
-
-		let message = app.getName() + ' ' + releaseName + ' is now available. It will be installed the next time you restart the application.';
-		if (releaseNotes) {
-			let splitNotes = releaseNotes.split(/[^\r]\n/);
-			message += '\n\nRelease notes:\n';
-			splitNotes.forEach(function (notes) {
-				message += notes + '\n\n';
-			})
-		};
+	// eslint-disable-next-line no-unused-vars
+	autoUpdater.on('update-downloaded', (event, info) => {
+		// let message = app.getName() + ' ' + info.releaseName + ' is now available. It will be installed the next time you restart the application.';
+		// if (info.releaseNotes) {
+			// const splitNotes = info.releaseNotes.split(/[^\r]\n/);
+			// message += '\n\nRelease notes:\n';
+			// splitNotes.forEach(notes => {
+				// message += notes + '\n\n';
+			// });
+		// }
 		// Ask user to update the app
 		dialog.showMessageBox({
 			type: 'question',
-		    buttons: ['Install and Relaunch' ,'Cancel'],
-		    defaultId: 0,
-		    message: 'A new version of ' + app.getName() + ' has been downloaded',
-		    detail: message
-		  }, response => {
-		  	if (response === 0) {
-		  		setTimeout(() => autoUpdater.quitAndInstall(), 1);
-		  	}
-		  })
-	})
+			buttons: ['Install and Relaunch', 'Later'],
+			defaultId: 0,
+			message: 'A new version of ' + app.getName() + ' has been downloaded',
+			detail: 'It will be installed the next time you restart the application'
+		}, response => {
+			if (response === 0) {
+				setTimeout(() => autoUpdater.quitAndInstall(), 1);
+			}
+		});
+	});
 	// init for updates
-	autoUpdater.checkForUpdates()
+	autoUpdater.checkForUpdates();
 }
 
 exports = module.exports = {
 	appUpdater
-}
+};

app/main/domain.js

@@ -1,36 +1,48 @@
-const JsonDB = require('node-json-db');
 const {app} = require('electron').remote;
-const request = require('request');
 const ipcRenderer = require('electron').ipcRenderer;
+const JsonDB = require('node-json-db');
+const request = require('request');
 
 const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
 const data = db.getData('/');
 
 console.log(data.domain);
-
-// if (data.domain && window.location.href.indexOf(data.domain) === -1) {
-// 	window.location.href = data.domain
-// }
-// require('electron-connect').client.create();
-
 window.addDomain = function () {
-	document.getElementById('main').innerHTML = 'checking...';
-
 	let newDomain = document.getElementById('url').value;
 	newDomain = newDomain.replace(/^https?:\/\//, '');
-
-	const domain = 'https://' + newDomain;
-	const checkDomain = domain + '/static/audio/zulip.ogg';
-
-	request(checkDomain, (error, response) => {
-		if (!error && response.statusCode !== 404) {
-			document.getElementById('main').innerHTML = 'Connect';
-			db.push('/domain', domain);
-			ipcRenderer.send('new-domain', domain);
+	newDomain = newDomain.replace(/^http?:\/\//, '');
+	if (newDomain === '') {
+		document.getElementById('server-status').innerHTML = 'Please input a value';
+	} else {
+		document.getElementById('main').innerHTML = 'Checking...';
+		if (newDomain.indexOf('localhost:') >= 0) {
+			const domain = 'http://' + newDomain;
+			const checkDomain = domain + '/static/audio/zulip.ogg';
+			request(checkDomain, (error, response) => {
+				if (!error && response.statusCode !== 404) {
+					document.getElementById('main').innerHTML = 'Connect';
+					db.push('/domain', domain);
+					ipcRenderer.send('new-domain', domain);
+				} else {
+					document.getElementById('main').innerHTML = 'Connect';
+					document.getElementById('server-status').innerHTML = 'Not a valid Zulip Local Server.';
+				}
+			});
+			//	});
 		} else {
-			document.getElementById('main').innerHTML = 'Connect';
-			document.getElementById('server-status').innerHTML = 'Not a vaild Zulip Server.';
-		}
-	});
-};
+			const domain = 'https://' + newDomain;
+			const checkDomain = domain + '/static/audio/zulip.ogg';
 
+			request(checkDomain, (error, response) => {
+				if (!error && response.statusCode !== 404) {
+					document.getElementById('main').innerHTML = 'Connect';
+					db.push('/domain', domain);
+					ipcRenderer.send('new-domain', domain);
+				} else {
+					document.getElementById('main').innerHTML = 'Connect';
+					document.getElementById('server-status').innerHTML = 'Not a valid Zulip Server.';
+				}
+			});
+		}
+	}
+};

app/main/index.js

@@ -1,17 +1,21 @@
 'use strict';
 const path = require('path');
 const fs = require('fs');
+const os = require('os');
 const electron = require('electron');
 const {app} = require('electron');
-const electronLocalshortcut = require('electron-localshortcut');
 const ipc = require('electron').ipcMain;
-const Configstore = require('configstore');
+const {dialog} = require('electron');
+const https = require('https');
+const http = require('http');
+const electronLocalshortcut = require('electron-localshortcut');
+const Configstore = require('electron-config');
 const JsonDB = require('node-json-db');
 const isDev = require('electron-is-dev');
 const tray = require('./tray');
 const appMenu = require('./menu');
 const {linkIsInternal, skipImages} = require('./link-helper');
-const { appUpdater } = require('./autoupdater')
+const {appUpdater} = require('./autoupdater');
 
 const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
 const data = db.getData('/');
@@ -19,7 +23,26 @@ const data = db.getData('/');
 // adds debug features like hotkeys for triggering dev tools and reload
 require('electron-debug')();
 
-const conf = new Configstore('Zulip-Desktop');
+const conf = new Configstore();
+
+function userOS() {
+	if (os.platform() === 'darwin') {
+		return 'Mac';
+	}
+	if (os.platform() === 'linux') {
+		return 'Linux';
+	}
+	if (os.platform() === 'win32' || os.platform() === 'win64') {
+		if (parseFloat(os.release()) < 6.2) {
+			return 'Windows 7';
+		} else {
+			return 'Windows 10';
+		}
+	}
+}
+
+// setting userAgent so that server-side code can identify the desktop app
+const isUserAgent = 'ZulipElectron/' + app.getVersion() + ' ' + userOS();
 
 // prevent window being garbage collected
 let mainWindow;
@@ -31,11 +54,62 @@ const staticURL = 'file://' + path.join(__dirname, '../renderer', 'index.html');
 const targetURL = function () {
 	if (data.domain === undefined) {
 		return staticURL;
-	} else {
-		return data.domain;
 	}
+	return data.domain;
 };
 
+function serverError(targetURL) {
+	if (targetURL.indexOf('localhost:') < 0 && data.domain) {
+		const req = https.request(targetURL + '/static/audio/zulip.ogg', res => {
+			console.log('Server StatusCode:', res.statusCode);
+			console.log('You are connected to:', res.req._headers.host);
+			if (res.statusCode >= 500 && res.statusCode <= 599) {
+				return dialog.showErrorBox('SERVER IS DOWN!', 'We are getting a ' + res.statusCode + ' error status from the server ' + res.req._headers.host + '. Please try again after some time or you may switch server.');
+			}
+		});
+		req.on('error', e => {
+			console.error(e);
+		});
+		req.end();
+	} else if (data.domain) {
+		const req = http.request(targetURL + '/static/audio/zulip.ogg', res => {
+			console.log('Server StatusCode:', res.statusCode);
+			console.log('You are connected to:', res.req._headers.host);
+		});
+		req.on('error', e => {
+			console.error(e);
+		});
+		req.end();
+	}
+}
+
+function checkConnectivity() {
+	return dialog.showMessageBox({
+		title: 'Internet connection problem',
+		message: 'No internet available! Try again?',
+		type: 'warning',
+		buttons: ['Try again', 'Close'],
+		defaultId: 0
+	}, index => {
+		if (index === 0) {
+			mainWindow.webContents.reload();
+		}
+		if (index === 1) {
+			app.quit();
+		}
+	});
+}
+
+function checkConnection() {
+	// eslint-disable-next-line no-unused-vars
+	mainWindow.webContents.on('did-fail-load', (event, errorCode, errorDescription, validatedURL) => {
+		if (errorDescription === 'ERR_INTERNET_DISCONNECTED' || errorDescription === 'ERR_PROXY_CONNECTION_FAILED') {
+			console.log('Error Description:' + errorDescription);
+			checkConnectivity();
+		}
+	});
+}
+
 const isAlreadyRunning = app.makeSingleInstance(() => {
 	if (mainWindow) {
 		if (mainWindow.isMinimized()) {
@@ -57,6 +131,10 @@ function checkWindowURL() {
 	return targetLink;
 }
 
+function isWindowsOrmacOS() {
+	return process.platform === 'darwin' || process.platform === 'win32';
+}
+
 const APP_ICON = path.join(__dirname, '../resources', 'Icon');
 
 const iconPath = () => {
@@ -64,8 +142,8 @@ const iconPath = () => {
 };
 
 function onClosed() {
-	// dereference the window
-	// for multiple windows store them in an array
+	// Dereference the window
+	// For multiple windows, store them in an array
 	mainWindow = null;
 }
 
@@ -96,10 +174,20 @@ function createMainWindow() {
 			plugins: true,
 			allowDisplayingInsecureContent: true,
 			nodeIntegration: false
-		}
+		},
+		show: false
+	});
+
+	win.once('ready-to-show', () => {
+		win.show();
+	});
+
+	serverError(targetURL());
+
+	win.loadURL(targetURL(), {
+		userAgent: isUserAgent + ' ' + win.webContents.getUserAgent()
 	});
 
-	win.loadURL(targetURL());
 	win.on('closed', onClosed);
 	win.setTitle('Zulip');
 
@@ -151,6 +239,8 @@ function createMainWindow() {
 app.commandLine.appendSwitch('ignore-certificate-errors', 'true');
 
 app.on('window-all-closed', () => {
+	// unregister all the shortcuts so that they don't interfare with other apps
+	electronLocalshortcut.unregisterAll(mainWindow);
 	if (process.platform !== 'darwin') {
 		app.quit();
 	}
@@ -165,7 +255,7 @@ app.on('activate', () => {
 app.on('ready', () => {
 	electron.Menu.setApplicationMenu(appMenu);
 	mainWindow = createMainWindow();
-	tray.create(mainWindow);
+	tray.create();
 
 	const page = mainWindow.webContents;
 
@@ -200,14 +290,19 @@ app.on('ready', () => {
 		electron.shell.openExternal(url);
 	});
 
+	page.once('did-frame-finish-load', () => {
+		const checkOS = isWindowsOrmacOS();
+		if (checkOS && !isDev) {
+			// Initate auto-updates on MacOS and Windows
+			appUpdater();
+		}
+	});
+	checkConnection();
+});
 
-	page.once("did-frame-finish-load", () => {
-	  if (process.platform === 'darwin' && !isDev) {
-	  	// Initate auto-updates
-	  	appUpdater()
-	  }
-	})
-
+app.on('will-quit', () => {
+	// unregister all the shortcuts so that they don't interfare with other apps
+	electronLocalshortcut.unregisterAll(mainWindow);
 });
 
 ipc.on('new-domain', (e, domain) => {
@@ -220,6 +315,7 @@ ipc.on('new-domain', (e, domain) => {
 		mainWindow.show();
 	} else {
 		mainWindow.loadURL(domain);
+		serverError(domain);
 	}
 	targetLink = domain;
 });

app/main/menu.js

@@ -2,10 +2,13 @@
 const os = require('os');
 const electron = require('electron');
 
+const {dialog} = require('electron');
+
 const app = electron.app;
 const BrowserWindow = electron.BrowserWindow;
 const shell = electron.shell;
 const appName = app.getName();
+const tray = require('./tray');
 
 const {addDomain, about} = require('./windowmanager');
 
@@ -19,10 +22,17 @@ function sendAction(action) {
 	win.webContents.send(action);
 }
 
+function clearCache() {
+	const win = BrowserWindow.getAllWindows()[0];
+	const ses = win.webContents.session;
+	ses.clearCache(() => {
+		dialog.showMessageBox({type: 'info', buttons: [], message: 'Cache cleared!'});
+	});
+}
+
 const viewSubmenu = [
 	{
 		label: 'Reload',
-		accelerator: 'CmdOrCtrl+R',
 		click(item, focusedWindow) {
 			if (focusedWindow) {
 				focusedWindow.reload();
@@ -65,6 +75,14 @@ const viewSubmenu = [
 	{
 		type: 'separator'
 	},
+	{
+		label: 'Toggle Tray Icon',
+		click(item, focusedWindow) {
+			if (focusedWindow) {
+				tray.toggle();
+			}
+		}
+	},
 	{
 		label: 'Toggle Developer Tools',
 		accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
@@ -135,8 +153,15 @@ const darwinTpl = [
 			{
 				type: 'separator'
 			},
+			{
+				label: 'Clear Cache',
+				click() {
+					clearCache();
+				}
+			},
 			{
 				label: 'Log Out',
+				accelerator: 'Cmd+L',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						sendAction('log-out');
@@ -264,8 +289,15 @@ const otherTpl = [
 			{
 				type: 'separator'
 			},
+			{
+				label: 'Clear Cache',
+				click() {
+					clearCache();
+				}
+			},
 			{
 				label: 'Log Out',
+				accelerator: 'Ctrl+L',
 				click(item, focusedWindow) {
 					if (focusedWindow) {
 						sendAction('log-out');
@@ -313,7 +345,6 @@ const otherTpl = [
 			{
 				role: 'selectall'
 			}
-
 		]
 	},
 	{

app/main/preload.js

@@ -1,8 +1,19 @@
 'use strict';
 const ipcRenderer = require('electron').ipcRenderer;
+const {webFrame} = require('electron');
+const {spellChecker} = require('./spellchecker');
 
-// Handle zooming functionality
+const _setImmediate = setImmediate;
+const _clearImmediate = clearImmediate;
+process.once('loaded', () => {
+	global.setImmediate = _setImmediate;
+	global.clearImmediate = _clearImmediate;
+});
 
+// eslint-disable-next-line import/no-unassigned-import
+require('./domain');
+
+// handle zooming functionality
 const zoomIn = () => {
 	webFrame.setZoomFactor(webFrame.getZoomFactor() + 0.1);
 };
@@ -15,7 +26,7 @@ const zoomActualSize = () => {
 	webFrame.setZoomFactor(1);
 };
 
-// Get zooming actions from main process
+// get zooming actions from main process
 ipcRenderer.on('zoomIn', () => {
 	zoomIn();
 });
@@ -38,15 +49,18 @@ ipcRenderer.on('log-out', () => {
 
 ipcRenderer.on('shortcut', () => {
 	// create the menu for the below
-	document.querySelector('.dropdown-toggle').click();
-
-	const nodes = document.querySelectorAll('.dropdown-menu li:nth-child(4) a');
-	nodes[nodes.length - 1].click();
+	const node = document.querySelector('a[data-overlay-trigger=keyboard-shortcuts]');
+	// additional check
+	if (node.text.trim().toLowerCase() === 'keyboard shortcuts') {
+		node.click();
+	} else {
+		// atleast click the dropdown
+		document.querySelector('.dropdown-toggle').click();
+	}
 });
 
-require('./domain');
-
 // To prevent failing this script on linux we need to load it after the document loaded
-document.addEventListener('DOMContentLoaded', function () {
-	require('./spellchecker');
+document.addEventListener('DOMContentLoaded', () => {
+	// init spellchecker
+	spellChecker();
 });

app/main/spellchecker.js

@@ -1,14 +1,27 @@
 const {SpellCheckHandler, ContextMenuListener, ContextMenuBuilder} = require('electron-spellchecker');
 
-// Implement spellcheck using electron api
+function spellChecker() {
+	// Implement spellcheck using electron api
+	window.spellCheckHandler = new SpellCheckHandler();
+	window.spellCheckHandler.attachToInput();
 
-window.spellCheckHandler = new SpellCheckHandler();
-window.spellCheckHandler.attachToInput();
+	// Start off as US English
+	window.spellCheckHandler.switchLanguage('en-US');
 
-// Start off as US English
-window.spellCheckHandler.switchLanguage('en-US');
+	const contextMenuBuilder = new ContextMenuBuilder(window.spellCheckHandler);
+	const contextMenuListener = new ContextMenuListener(info => {
+		contextMenuBuilder.showPopupMenu(info);
+	});
 
-let contextMenuBuilder = new ContextMenuBuilder(window.spellCheckHandler);
-let contextMenuListener = new ContextMenuListener((info) => {
-  contextMenuBuilder.showPopupMenu(info);
-});
+	// Clean up events after you navigate away from this page;
+	// otherwise, you may experience errors
+	window.addEventListener('beforeunload', () => {
+	// eslint-disable-next-line no-undef
+		spellCheckHandler.unsubscribe();
+		contextMenuListener.unsubscribe();
+	});
+}
+
+exports = module.exports = {
+	spellChecker
+};

app/main/tray.js

@@ -10,12 +10,12 @@ const APP_ICON = path.join(__dirname, '../resources/tray', 'tray');
 
 const iconPath = () => {
 	if (process.platform === 'linux') {
-		return APP_ICON + 'linux.png'
+		return APP_ICON + 'linux.png';
 	}
 	return APP_ICON + (process.platform === 'win32' ? 'win.ico' : 'osx.png');
 };
 
-exports.create = () => {
+const createHandler = () => {
 	const contextMenu = electron.Menu.buildFromTemplate([
 		{
 			label: 'About',
@@ -59,3 +59,23 @@ exports.create = () => {
 	tray.setContextMenu(contextMenu);
 };
 
+const destroyHandler = () => {
+	tray.destroy();
+	if (tray.isDestroyed()) {
+		tray = null;
+	} else {
+		throw new Error('Tray icon not properly destroyed.');
+	}
+};
+
+const toggleHandler = () => {
+	if (tray) {
+		destroyHandler();
+	} else {
+		createHandler();
+	}
+};
+
+exports.create = createHandler;
+exports.destroy = destroyHandler;
+exports.toggle = toggleHandler;

app/main/windowmanager.js

@@ -2,6 +2,11 @@
 const path = require('path');
 const electron = require('electron');
 
+const APP_ICON = path.join(__dirname, '../resources', 'Icon');
+
+const iconPath = () => {
+	return APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
+};
 let domainWindow;
 let aboutWindow;
 
@@ -14,10 +19,14 @@ function onClosed() {
 // Change Zulip server Window
 function createdomainWindow() {
 	const domainwin = new electron.BrowserWindow({
+		title: 'Switch Server',
 		frame: false,
 		height: 300,
 		resizable: false,
-		width: 400
+		width: 400,
+		show: false,
+		icon: iconPath()
+
 	});
 	const domainURL = 'file://' + path.join(__dirname, '../renderer', 'pref.html');
 	domainwin.loadURL(domainURL);
@@ -25,13 +34,20 @@ function createdomainWindow() {
 
 	return domainwin;
 }
-
 // Call this window onClick addDomain in tray
 function addDomain() {
 	domainWindow = createdomainWindow();
-	domainWindow.show();
+	domainWindow.once('ready-to-show', () => {
+		domainWindow.show();
+	});
+	setTimeout(() => {
+		if (domainWindow !== null) {
+			if (!domainWindow.isDestroyed()) {
+				domainWindow.destroy();
+			}
+		}
+	}, 15000);
 }
-
 // About window
 function createAboutWindow() {
 	const aboutwin = new electron.BrowserWindow({
@@ -61,9 +77,9 @@ function createAboutWindow() {
 // Call this onClick About in tray
 function about() {
 	aboutWindow = createAboutWindow();
-	aboutWindow.show();
+	aboutWindow.once('ready-to-show', () => {
+		aboutWindow.show();
+	});
 }
 
-exports = module.exports = {
-	addDomain, about
-};
+exports = module.exports = {addDomain, about};

app/package.json

@@ -1,11 +1,11 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "0.5.2",
+  "version": "0.5.9",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
-  "email":"<svnitakash@gmail.com>",
-  "copyright": "©2016 Kandra Labs, Inc.",
+  "email": "<svnitakash@gmail.com>",
+  "copyright": "©2017 Kandra Labs, Inc.",
   "author": {
     "name": "Akash Nimare",
     "email": "svnitakash@gmail.com"
@@ -27,16 +27,16 @@
     "InstantMessaging"
   ],
   "dependencies": {
-    "electron-is-dev": "*",
-    "configstore": "^2.0.0",
-    "dialogs": "1.1.14",
-    "electron-context-menu": "0.4.0",
-    "electron-debug": "^1.0.0",
-    "electron-dl": "^0.2.0",
-    "electron-localshortcut": "^0.6.1",
-    "node-json-db": "^0.7.2",
-    "request": "^2.74.0",
-    "electron-spellchecker": "^0.5.12",
-    "wurl": "^2.1.0"
+    "electron-config":"0.2.1",
+    "electron-debug": "1.1.0",
+    "electron-is-dev": "0.1.2",
+    "electron-localshortcut": "1.0.0",
+    "electron-log": "1.3.0",
+    "electron-spellchecker": "1.0.5",
+    "electron-updater": "1.11.2",
+    "https": "^1.0.0",
+    "node-json-db": "0.7.3",
+    "request": "2.79.0",
+    "wurl": "2.1.0"
   }
 }

app/renderer/css/pref.css

@@ -71,13 +71,4 @@ button:focus {
     top: -61%;
     left: 25%;
     text-align: center;
-}
-
-#pic {
-width: 20px;
-left: 36%;
-margin-left: 4px;
-top: 63%;
-display: none;
-position: absolute;
 }

app/renderer/index.html

@@ -18,12 +18,12 @@
       <section class="content">
         <section class="server">
           <div class="container">
-            <h1>Login to Zulip Server</h1>
+            <h1>Enter your Zulip Server URL</h1>
             <form id="frm-signInForm" class="form-large" onsubmit="addDomain(); return false">
               <fieldset>
                 <div class="control-group control-required">
                   <div class="control-field">
-                    <input type="text" id="url"  autofocus="autofocus" spellcheck="false" placeholder="zulip.tabbott.net">
+                    <input type="text" id="url"  autofocus="autofocus" spellcheck="false" placeholder="Server URL">
                   </div>
                 </div>
                 <div class="control-group">

app/renderer/js/pref.js

@@ -1,4 +1,5 @@
 'use strict';
+// eslint-disable-next-line import/no-extraneous-dependencies
 const {remote} = require('electron');
 
 const prefWindow = remote.getCurrentWindow();
@@ -13,33 +14,54 @@ document.addEventListener('keydown', event => {
 	}
 });
 // eslint-disable-next-line no-unused-vars
-function addDomain() {
+window.prefDomain = function () {
 	const request = require('request');
+	// eslint-disable-next-line import/no-extraneous-dependencies
 	const ipcRenderer = require('electron').ipcRenderer;
 	const JsonDB = require('node-json-db');
-	const {app} = require('electron').remote;
+	// eslint-disable-next-line import/no-extraneous-dependencies
+	const {
+		app
+	} = require('electron').remote;
 
 	const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
-	document.getElementById('main').innerHTML = 'checking...';
-	document.getElementById('pic').style.display = 'block';
 
 	let newDomain = document.getElementById('url').value;
 	newDomain = newDomain.replace(/^https?:\/\//, '');
+	newDomain = newDomain.replace(/^http?:\/\//, '');
 
-	const domain = 'https://' + newDomain;
-	const checkDomain = domain + '/static/audio/zulip.ogg';
-
-	request(checkDomain, (error, response) => {
-		if (!error && response.statusCode !== 404) {
-			document.getElementById('pic').style.display = 'none';
-			document.getElementById('main').innerHTML = 'Switch';
-			document.getElementById('urladded').innerHTML = 'Switched to ' + newDomain;
-			db.push('/domain', domain);
-			ipcRenderer.send('new-domain', domain);
+	if (newDomain === '') {
+		document.getElementById('urladded').innerHTML = 'Please input a value';
+	} else {
+		document.getElementById('main').innerHTML = 'Checking...';
+		if (newDomain.indexOf('localhost:') >= 0) {
+			const domain = 'http://' + newDomain;
+			const checkDomain = domain + '/static/audio/zulip.ogg';
+			request(checkDomain, (error, response) => {
+				if (!error && response.statusCode !== 404) {
+					document.getElementById('main').innerHTML = 'Switch';
+					document.getElementById('urladded').innerHTML = 'Switched to ' + newDomain;
+					db.push('/domain', domain);
+					ipcRenderer.send('new-domain', domain);
+				} else {
+					document.getElementById('main').innerHTML = 'Switch';
+					document.getElementById('urladded').innerHTML = 'Not a valid Zulip Local Server.';
+				}
+			});
 		} else {
-			document.getElementById('pic').style.display = 'none';
-			document.getElementById('main').innerHTML = 'Switch';
-			document.getElementById('urladded').innerHTML = 'Not a vaild Zulip Server.';
+			const domain = 'https://' + newDomain;
+			const checkDomain = domain + '/static/audio/zulip.ogg';
+			request(checkDomain, (error, response) => {
+				if (!error && response.statusCode !== 404) {
+					document.getElementById('main').innerHTML = 'Switch';
+					document.getElementById('urladded').innerHTML = 'Switched to ' + newDomain;
+					db.push('/domain', domain);
+					ipcRenderer.send('new-domain', domain);
+				} else {
+					document.getElementById('main').innerHTML = 'Switch';
+					document.getElementById('urladded').innerHTML = 'Not a valid Zulip Server.';
+				}
+			});
 		}
-	});
-}
+	}
+};

app/renderer/pref.html

@@ -3,20 +3,17 @@
 	<head>
 		<meta charset="UTF-8">
 		<link rel="stylesheet" href="css/pref.css">
-		<script type="text/javascript">
-		</script>
 	</head>
 	<body>
 		<div class="close" id="close-button">Close</div>
 		<div class="form">
-			<form onsubmit="addDomain(); return false">
-				<input id="url" type="text" placeholder="zulip.example.com">
-				<button type="submit" id="main" value="Submit" onclick="addDomain();">
+			<form onsubmit="prefDomain(); return false">
+				<input id="url" type="text" placeholder="Server URL">
+				<button type="submit" id="main" value="Submit">
 				Switch</button>
-				<img id="pic" src="img/loader.gif" />
 			</form>
 			<p id="urladded"><p>
 			</div>
 			<script src="js/pref.js"></script>
 		</body>
-	</html>
+	</html>

package.json

@@ -1,11 +1,12 @@
 {
   "name": "zulip",
   "productName": "Zulip",
-  "version": "0.5.2",
+  "version": "0.5.9",
+  "main": "./app/main",
   "description": "Zulip Desktop App",
   "license": "Apache-2.0",
-  "email":"<svnitakash@gmail.com>",
-  "copyright": "©2016 Kandra Labs, Inc.",
+  "email": "<svnitakash@gmail.com>",
+  "copyright": "©2017 Kandra Labs, Inc.",
   "author": {
     "name": "Akash Nimare",
     "email": "svnitakash@gmail.com"
@@ -24,30 +25,33 @@
     "dev": "gulp dev",
     "pack": "build --dir",
     "dist": "build",
+    "build:win": "build --win nsis-web --ia32 --x64",
     "travis": "cd ./scripts && ./travis-build-test.sh"
   },
   "build": {
     "appId": "org.zulip.zulip-electron",
-    "asar": "true",
+    "asar": true,
     "files": [
       "**/*",
       "!node_modules/@paulcbetts/cld/deps/cld${/*}"
     ],
-    "copyright": "©2016 Kandra Labs, Inc.",
+    "copyright": "©2017 Kandra Labs, Inc.",
     "mac": {
       "category": "public.app-category.productivity"
     },
-    "linux" : {
-      "synopsis": "Zulip Desktop App",
+    "linux": {
       "category": "",
       "packageCategory": "GNOME;GTK;Network;InstantMessaging",
       "description": "Zulip Desktop Client for Linux",
-      "target" : ["deb", "AppImage"],
-      "version" : "0.5.1",
-      "title" : "Zulip",
-      "license": "Apache-2.0",
+      "target": [
+        "deb",
+        "AppImage"
+      ],
       "maintainer": "Akash Nimare <svnitakash@gmail.com>"
     },
+    "deb": {
+      "synopsis": "Zulip Desktop App"
+    },
     "dmg": {
       "background": "build/appdmg.png",
       "icon": "build/icon.icns",
@@ -69,21 +73,25 @@
     "win": {
       "target": "nsis",
       "icon": "build/icon.ico"
+      },
+    "nsis": {
+      "perMachine": true,
+      "oneClick": false
     }
   },
   "keywords": [
-  	"Zulip",
-  	"Group Chat app",
-  	"electron-app",
-  	"electron",
-  	"Desktop app",
-  	"InstantMessaging"
+    "Zulip",
+    "Group Chat app",
+    "electron-app",
+    "electron",
+    "Desktop app",
+    "InstantMessaging"
   ],
   "devDependencies": {
     "assert": "^1.4.1",
     "devtron": "^1.1.0",
-    "electron-builder": "*",
-    "electron": "1.4.7",
+    "electron-builder": "16.6.0",
+    "electron": "1.4.15",
     "electron-connect": "^0.4.6",
     "gulp": "^3.9.1",
     "gulp-mocha": "^3.0.1",
@@ -98,15 +106,18 @@
         "rules": {
           "max-lines": [
             "warn",
-            350
+            500
           ],
           "no-warning-comments": 0,
-          "no-else-return": 0
+          "no-else-return": 0,
+          "import/no-unresolved": 0,
+          "import/no-extraneous-dependencies": 0
         }
       }
     ],
     "ignore": [
-      "tests/*.js"
+      "tests/*.js",
+      "app/main/macos-swipe-navigation.js"
     ],
     "envs": [
       "node",

scripts/travis-build-test.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-  export DISPLAY=:99.0
+  export {no_proxy,NO_PROXY}="127.0.0.1,localhost"
+	export DISPLAY=:99.0
   sh -e /etc/init.d/xvfb start
   sleep 3
 fi

tests/index.js

@@ -2,12 +2,12 @@ const assert = require('assert')
 const Application = require('spectron').Application
 
 describe('application launch', function () {
-  this.timeout(10000)
+  this.timeout(15000)
 
   beforeEach(function () {
     this.app = new Application({
       path: require('electron'),
-      args: [__dirname + '/../app/main/index.js']
+      args: [__dirname + '/../app/renderer/index.html']
     })
     return this.app.start()
   })

zulip-electron-launcher.sh

@@ -74,11 +74,11 @@ gitCheckout()
 }
 
 # }}}
-# {{{ npmUpgradeStart()
+# {{{ npmInstallStart()
 
-npmUpgradeStart()
+npmInstallStart()
 {
-	npm upgrade
+	npm install
 	npm start &
 }
 
@@ -105,5 +105,5 @@ cleanUp()
 
 envSetup $*
 gitCheckout
-npmUpgradeStart
-cleanUp
+npmInstallStart
+cleanUp