Switch back to '@electron/remote' and switch back to 'electron-contex…

…t-menu'.

app/Application.js

@@ -27,10 +27,10 @@ Ext.define('Hamsket.Application', {
 
 
 		// Set cookies to help Tooltip.io messages segmentation
-		Ext.util.Cookies.set('version', require('electron').remote.app.getVersion());
+		Ext.util.Cookies.set('version', require('@electron/remote').app.getVersion());
 
 		// Check for updates
-		if ( require('electron').remote.process.argv.indexOf('--without-update') === -1 ) Hamsket.app.checkUpdate(true);
+		if ( require('@electron/remote').process.argv.indexOf('--without-update') === -1 ) Hamsket.app.checkUpdate(true);
 
 		// Mouse Wheel zooming
 		document.addEventListener('mousewheel', function(e) {
@@ -85,7 +85,7 @@ Ext.define('Hamsket.Application', {
 			,method: 'GET'
 			,success(response) {
 				const json = JSON.parse(response.responseText);
-				const appVersion = new Ext.Version(require('electron').remote.app.getVersion());
+				const appVersion = new Ext.Version(require('@electron/remote').app.getVersion());
 				const updateVersion = new Ext.Version(json.tag_name);
 				if ( appVersion.isLessThan(updateVersion) ) {
 					console.info('New version is available', updateVersion);

app/ux/FileBackup.js

@@ -3,7 +3,7 @@ Ext.define('Hamsket.ux.FileBackup', {
 	constructor() {
 		const me = this;
 		me.callParent(arguments);
-		me.remote = require('electron').remote;
+		me.remote = require('@electron/remote');
 		me.path = me.remote.require('path');
 		me.fs = me.remote.require('fs');
 		me.userPath = me.remote.app.getPath('userData');

app/ux/WebView.js

@@ -164,7 +164,7 @@ Ext.define('Hamsket.ux.WebView',{
 					,partition: 'persist:' + me.record.get('type') + '_' + me.id.replace('tab_', '')
 					,allowtransparency: 'on'
 					,autosize: 'on'
-					,webpreferences: 'nativeWindowOpen=yes,enableRemoteModule=yes,spellcheck=yes,contextIsolation=no' //,nativeWindowOpen=true
+					,webpreferences: 'nativeWindowOpen=yes,spellcheck=yes,contextIsolation=no' //,nativeWindowOpen=true
 					,allowpopups: 'on'
 					//,disablewebsecurity: 'on' // Disabled because some services (Like Google Drive) dont work with this enabled
 					,userAgent: me.getUserAgent()
@@ -265,7 +265,7 @@ Ext.define('Hamsket.ux.WebView',{
 			// Block some Deep links to prevent that open its app (Ex: Slack)
 			if (['slack:'].includes(protocol)) return;
 			// Allow Deep links
-			if (!['http:', 'https:', 'about:'].includes(protocol)) return require('electron').shell.openExternal(url.href);
+			if (!['http:', 'https:', 'about:'].includes(protocol)) return require('@electron/remote').shell.openExternal(url.href);
 		});
 
 		webview.addEventListener('will-navigate', function(e, url) {
@@ -437,7 +437,7 @@ Ext.define('Hamsket.ux.WebView',{
 			}
 
 			function showWindowAndActivateTab(event) {
-				const currentWindow = require('electron').remote.getCurrentWindow();
+				const currentWindow = require('@electron/remote').getCurrentWindow();
 				currentWindow.show();
 				currentWindow.focus();
 				const tabPanel = Ext.cq1('app-main');
@@ -700,10 +700,11 @@ Ext.define('Hamsket.ux.WebView',{
 	}
 	,getWebContents() {
 		if ( this.record.get('enabled') ) {
-			const remote = require('electron').remote;
+			const remote = require('@electron/remote');
 			const webview = this.getWebView();
 			const id = webview.getWebContentsId();
-			return remote.webContents.fromId(id);
+			const webContents = remote.webContents.fromId(id);
+			return webContents;
 		} else {
 			return false;
 		}
@@ -743,7 +744,7 @@ Ext.define('Hamsket.ux.WebView',{
 	}
 	,getOSArch(platform) {
 		const me = this;
-		const remote = require('electron').remote;
+		const remote = require('@electron/remote');
 		platform = platform ? platform : remote.require('os').platform();
 		let arch = remote.require('os').arch();
 
@@ -765,7 +766,7 @@ Ext.define('Hamsket.ux.WebView',{
 		return arch;
 	}
 	,getOSArchType() {
-		let arch = require('electron').remote.require('os').arch();
+		let arch = require('@electron/remote').require('os').arch();
 
 		switch(arch) {
 			case 'x64':
@@ -797,7 +798,7 @@ Ext.define('Hamsket.ux.WebView',{
 	}
 	,getOSPlatform(platform) {
 		const me = this;
-		platform = platform ? platform : require('electron').remote.require('os').platform();
+		platform = platform ? platform : require('@electron/remote').require('os').platform();
 		switch (platform) {
 			case 'win32':
 				platform = `${me.getOSRelease(platform)}; ${me.getOSArch(platform)}`;
@@ -820,23 +821,23 @@ Ext.define('Hamsket.ux.WebView',{
 		return platform;
 	}
 	,isWindows(platform) {
-		platform = platform ? platform : require('electron').remote.require('os').platform();
+		platform = platform ? platform : require('@electron/remote').require('os').platform();
 		return platform === 'win32';
 	}
 	,isMac(platform) {
-		platform = platform ? platform : require('electron').remote.require('os').platform();
+		platform = platform ? platform : require('@electron/remote').require('os').platform();
 		return platform === 'darwin';
 	}
 	,is32bit() {
-		const arch = require('electron').remote.require('os').arch();
+		const arch = require('@electron/remote').require('os').arch();
 		if (arch === 'ia32' || arch === 'x32')
 			return true;
 		else
 			return false;
 	}
 	,getOSRelease(platform) {
 		const me = this;
-		const remote = require('electron').remote;
+		const remote = require('@electron/remote');
 		if (me.isWindows(platform)) {
 			if (platform)
 			{
@@ -852,13 +853,13 @@ Ext.define('Hamsket.ux.WebView',{
 		}
 	}
 	,getChromeVersion(version) {
-		return version || require('electron').remote.require('process').versions['chrome'];
+		return version || require('@electron/remote').process.versions['chrome'];
 	}
 	,getElectronVersion() {
-		return require('electron').require('process').versions['electron'];
+		return require('@electron/remote').process.versions['electron'];
 	}
 	,getAppVersion() {
-		return require('electron').remote.app.getVersion();
+		return require('@electron/remote').app.getVersion();
 	}
 	,blur() {
 		this.getWebView().blur();

app/view/main/About.js

@@ -15,7 +15,7 @@ Ext.define('Hamsket.view.main.About', {
 		me.data.buildversion = require('fs').readFileSync( __dirname + '/BUILDVERSION', 'utf8');
 	}
 	,data: {
-		 version: require('electron').remote.app.getVersion()
+		 version: require('@electron/remote').app.getVersion()
 		,platform: process.platform
 		,arch: process.arch
 		,electron: process.versions.electron

app/view/main/MainController.js

@@ -137,7 +137,7 @@ Ext.define('Hamsket.view.main.MainController', {
 
 		// Get Record
 		const rec = Ext.getStore('Services').getById(serviceId);
-		const {session: rsession} = require('electron').remote;
+		const {session: rsession} = require('@electron/remote');
 
 		if ( !rec.get('enabled') ) {
 			const session = rsession.fromPartition(`persist:${rec.get('type')}_${serviceId}`);

electron/main.js

@@ -12,6 +12,7 @@ const updater = require('./updater');
 // File System
 const fs = require("fs");
 const path = require('path');
+const contextMenu = require('electron-context-menu');
 
 // If 'data' folder exists in Hamsket's folder, set userdata, logs, and usercache path to there
 var basepath = app.getAppPath();
@@ -117,11 +118,12 @@ function createWindow () {
 			partition: 'persist:hamsket',
 			nodeIntegration: true,
 			webviewTag: true,
-			enableRemoteModule: true,
-			contextIsolation: false
+			contextIsolation: false,
 		}
 	});
 
+	require("@electron/remote/main").enable(mainWindow.webContents);
+
 	if ( !config.get('start_minimized') && config.get('maximized') ) mainWindow.maximize();
 	if (config.get('start_minimized')){
 		if (config.get('window_display_behavior') == 'show_taskbar') {
@@ -235,11 +237,11 @@ function createMasterPasswordWindow() {
 		,frame: false
 		,webPreferences: {
 			nodeIntegration: true,
-			enableRemoteModule: true,
 			contextIsolation: false
 		}
 
 	});
+	require("@electron/remote/main").enable(mainMasterPasswordWindow.webContents);
 
 	mainMasterPasswordWindow.loadURL('file://' + __dirname + '/../masterpassword.html');
 	mainMasterPasswordWindow.on('close', function() { mainMasterPasswordWindow = null; });
@@ -585,6 +587,7 @@ if ( config.get('disable_gpu') ) app.disableHardwareAcceleration();
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 app.on('ready', function() {
+	require('@electron/remote/main').initialize();
 	if (config.get('master_password')) {
 		createMasterPasswordWindow();
 	} else {
@@ -621,8 +624,18 @@ app.on('before-quit', function () {
 
 // Prevent the ability to create webview with nodeIntegration.
 app.on('web-contents-created', (event, contents) => {
+	const contextMenuWebContentsDispose = contextMenu({
+		window: contents,
+		showCopyImageAddress: true,
+		showSaveImage: false,
+		showSaveImageAs: true,
+	});
     contents.on('will-attach-webview', (event, webPreferences, params) => {
 		// Always prevent node integration
 		webPreferences.nodeIntegration = false;
+
 	});
+	contents.on('destroyed', function() {
+		contextMenuWebContentsDispose();
+	})
 });

masterpassword.html

@@ -48,7 +48,7 @@
 		}
 
 		function exit() {
-			require('electron').remote.app.quit();
+			require('@electron/remote').app.quit();
 		}
 
 	</script>