123-lang 2.1.17 → 2.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "123-lang",
-  "version": "2.1.17",
+  "version": "2.1.18",
   "description": "",
   "main": "index.js",
   "scripts": {

package/source/Customization/electron/{last → electron-configuration}/electron-configuration/configuration.js

@@ -60,7 +60,7 @@ const config = {
 	isEnableWhiteLabelUpdater: true,
 	certificate: {
 		dir: 'electron-configuration',
-		fileName: 'BitHideRoot.crt',
+		fileName: 'Root.crt',
 		fileNameSecondary: 'Wallet.crt',
 	},
 	macUpdateConfig: {
@@ -83,19 +83,13 @@ const whiteLabelUpdaterConfiguration = {
 		version: '0',
 		enabled: true,
 		productName: 'Wallet',
-		creditCurrency: 'Credits',
+		creditCurrency: 'Service Units',
 		assets: { ...defaultAssets.defaultAssets },
 	},
 	systemDir: 'userData',
 	internalAssetsDir: 'Updates/UI/White-Label/assets/',
 	configFileName: 'config.json',
-	assetFiles: [
-		'logo-dark.svg',
-		'logo-light.svg',
-		'favicon.png',
-		'icon.ico',
-		'icon.png',
-	],
+	assetFiles: ['logo-dark.svg', 'logo-light.svg', 'favicon.png', 'icon.ico', 'icon.png'],
 	localStorageConfigName: 'whiteLabelConfig',
 	tempIconPrefix: 'app-icon-',
 	desktopDir: 'Desktop',

package/source/Customization/electron/{last → electron-configuration}/electron-configuration/modules/WhiteLabelUpdater.js

@@ -5,8 +5,13 @@ const log = require('electron-log');
 const { localStorage } = require('electron-browser-storage');
 const os = require('os');
 const axios = require('axios');
+const https = require('https');
+const store = require('../store/store.js');
 
 const { whiteLabelUpdaterConfiguration, config } = require('../configuration');
+const agent = new https.Agent({
+	rejectUnauthorized: false,
+});
 
 class WhiteLabelUpdater {
 	constructor() {
@@ -15,15 +20,16 @@ class WhiteLabelUpdater {
 
 	async initStore() {
 		try {
-			const { default: Store } = await import('electron-store');
-			let store = new Store();
 			if (!store?.has('cache')) {
 				store.set('cache.default', {
 					...whiteLabelUpdaterConfiguration?.defaultResult,
 				});
+			} else {
+				store.set('cache.default', {
+					...whiteLabelUpdaterConfiguration?.defaultResult,
+				});
 			}
 			log.info('[WL] Store was created successful');
-			this.store = store;
 		} catch (err) {
 			log.error('[WL] There is some error on Store creation', err);
 		}
@@ -31,7 +37,7 @@ class WhiteLabelUpdater {
 
 	async checkLoginDomain() {
 		try {
-			const domainURL = await localStorage.getItem(config.storageNames.domain);
+			const domainURL = store.get('domain');
 			log.info('[WL] Domain checked', domainURL);
 			return domainURL;
 		} catch (err) {
@@ -62,17 +68,22 @@ class WhiteLabelUpdater {
 		try {
 			log.info(
 				'[WL] fetch data',
-				`${domain}${whiteLabelUpdaterConfiguration?.internalAssetsDir}${whiteLabelUpdaterConfiguration?.configFileName}`,
+				`${domain}${whiteLabelUpdaterConfiguration?.internalAssetsDir}${whiteLabelUpdaterConfiguration?.configFileName}`
 			);
 			const res = await axios.get(
 				`${domain}${whiteLabelUpdaterConfiguration?.internalAssetsDir}${whiteLabelUpdaterConfiguration?.configFileName}`,
-				{ timeout: whiteLabelUpdaterConfiguration?.timeOutMs },
+				{
+					timeout: whiteLabelUpdaterConfiguration?.timeOutMs,
+					httpsAgent: agent,
+				}
 			);
-			if (res.status === 200) {
+			if (res.status === 200 && res.data.version) {
 				log.info('[WL] response', res.status);
 				const remoteConfig = res.data;
 				log.info('[WL] remote config', remoteConfig);
 				return remoteConfig;
+			} else {
+				return null;
 			}
 		} catch (err) {
 			log.error('[WL] Server unavailable, using cache fallback.', err);
@@ -81,7 +92,7 @@ class WhiteLabelUpdater {
 	}
 
 	async fetchAssetsData(domain) {
-		const assets = { ...this.store.get('cache.default.assets') };
+		const assets = { ...store.get('cache.default.assets') };
 
 		const assetResults = await Promise.all(
 			whiteLabelUpdaterConfiguration?.assetFiles?.map(async file => {
@@ -91,7 +102,8 @@ class WhiteLabelUpdater {
 						{
 							responseType: 'arraybuffer',
 							timeout: whiteLabelUpdaterConfiguration?.timeOutMs,
-						},
+							httpsAgent: agent,
+						}
 					);
 
 					const buffer = Buffer.from(res.data);
@@ -113,7 +125,7 @@ class WhiteLabelUpdater {
 					log.error(`[WL] Failed to download asset: ${file}`, err.message);
 					return null;
 				}
-			}),
+			})
 		);
 
 		assetResults.forEach(result => {
@@ -132,18 +144,18 @@ class WhiteLabelUpdater {
 		const encodedDomain = this.encodeUrl(domain);
 		const config = await this.fetchConfig(domain);
 
-		if (this.store.has(`cache.${encodedDomain}`)) {
+		if (store.has(`cache.${encodedDomain}`)) {
 			log.info('[WL] cache exists');
-			const currentConfig = this.store.get(`cache.${encodedDomain}`);
+			const currentConfig = store.get(`cache.${encodedDomain}`);
 			log.info(
 				'[WL] compare caches: ',
 				currentConfig?.version,
-				config?.version,
+				config?.version
 			);
 			if (config !== null && config?.version > currentConfig?.version) {
 				log.info('[WL] cache updating ...', domain);
 				const remoteAssets = await this.fetchAssetsData(domain);
-				this.store.set(`cache.${encodedDomain}`, {
+				store.set(`cache.${encodedDomain}`, {
 					...config,
 					assets: { ...remoteAssets },
 				});
@@ -153,7 +165,7 @@ class WhiteLabelUpdater {
 			if (config !== null) {
 				log.info('[WL] cache creating ...', domain);
 				const remoteAssets = await this.fetchAssetsData(domain);
-				this.store.set(`cache.${encodedDomain}`, {
+				store.set(`cache.${encodedDomain}`, {
 					...config,
 					assets: { ...remoteAssets },
 				});
@@ -163,9 +175,9 @@ class WhiteLabelUpdater {
 
 	readCache(domain) {
 		const encodedDomain = this.encodeUrl(domain);
-		return this.store.has(`cache.${encodedDomain}`)
-			? this.store.get(`cache.${encodedDomain}`)
-			: this.store.get('cache.default');
+		return store.has(`cache.${encodedDomain}`)
+			? store.get(`cache.${encodedDomain}`)
+			: store.get('cache.default');
 	}
 
 	encodeUrl(url) {
@@ -176,7 +188,7 @@ class WhiteLabelUpdater {
 
 	decodeUrl(hexString) {
 		const bytes = new Uint8Array(
-			hexString.match(/.{1,2}/g).map(byte => parseInt(byte, 16)),
+			hexString.match(/.{1,2}/g).map(byte => parseInt(byte, 16))
 		);
 		return new TextDecoder().decode(bytes);
 	}
@@ -194,7 +206,7 @@ class WhiteLabelUpdater {
 		try {
 			await localStorage.setItem(
 				whiteLabelUpdaterConfiguration?.localStorageConfigName,
-				JSON.stringify(whiteLabelData),
+				JSON.stringify(whiteLabelData)
 			);
 			log.info('[WL] Info successful send to web localstorage');
 		} catch (e) {
@@ -228,7 +240,7 @@ class WhiteLabelUpdater {
 				if (
 					file.startsWith(whiteLabelUpdaterConfiguration?.tempIconPrefix) &&
 					file.endsWith(
-						`.${whiteLabelUpdaterConfiguration?.fileExtension?.ico}`,
+						`.${whiteLabelUpdaterConfiguration?.fileExtension?.ico}`
 					)
 				) {
 					fs.unlinkSync(path.join(userDataPath, file));
@@ -238,13 +250,13 @@ class WhiteLabelUpdater {
 			fs.writeFileSync(
 				iconPath,
 				cleanBase64,
-				whiteLabelUpdaterConfiguration?.fileExtension?.base64,
+				whiteLabelUpdaterConfiguration?.fileExtension?.base64
 			);
 
 			const desktopPath = path.join(
 				os.homedir(),
 				whiteLabelUpdaterConfiguration?.desktopDir,
-				`${config?.mainWindow?.title}.${whiteLabelUpdaterConfiguration?.fileExtension?.lnk}`,
+				`${config?.mainWindow?.title}.${whiteLabelUpdaterConfiguration?.fileExtension?.lnk}`
 			);
 
 			const success = shell.writeShortcutLink(desktopPath, 'replace', {
@@ -259,7 +271,7 @@ class WhiteLabelUpdater {
 				fs.utimesSync(desktopPath, now, now);
 
 				log.info(
-					`[WL] Shortcut successfully replaced and redrawn with: ${uniqueIconName}`,
+					`[WL] Shortcut successfully replaced and redrawn with: ${uniqueIconName}`
 				);
 			} else {
 				log.info('[WL] Failed to replace the shortcut.');

package/source/Customization/electron/electron-configuration/electron-configuration/store/store.js

@@ -0,0 +1,6 @@
+const Store = require('electron-store');
+
+// You can optionally add a schema or default values here
+const store = new Store();
+
+module.exports = store;

package/source/Customization/electron/electron.js

@@ -22,6 +22,8 @@ const { autoUpdater } = require('electron-updater');
 const log = require('electron-log');
 const forge = require('node-forge');
 const os = require('os');
+const whiteLabelUpdater = require('./electron-configuration/modules/WhiteLabelUpdater.js');
+const store = require('./electron-configuration/store/store.js');
 
 const getLang = async () => localStorage.getItem(config.storageNames.lang);
 
@@ -30,12 +32,12 @@ const { isEnableDevTools, isAvailableDomainInput, certificate } = config;
 const rootCertificatePath = path.join(
 	__dirname,
 	certificate.dir,
-	certificate.fileName,
+	certificate.fileName
 );
 const rootCertificatePathSecondary = path.join(
 	__dirname,
 	certificate.dir,
-	certificate.fileNameSecondary,
+	certificate.fileNameSecondary
 );
 
 const currentPlatform = platformsNames[os.platform()];
@@ -51,33 +53,8 @@ autoUpdater.autoInstallOnAppQuit = currentPlatform !== platforms.MAC;
 // the app runs in a Wayland session.
 app.commandLine.appendSwitch('enable-features', 'GlobalShortcutsPortal');
 
-const serverUrl = 'http://localhost:3100/';
-
-async function createWindow() {
-	let appIcon = null;
-	if (config.isEnableWhiteLabelUpdater && !!config.isEnableWhiteLabelUpdater) {
-		// White Labels
-		const whiteLabelUpdater = require('./electron-configuration/modules/WhiteLabelUpdater.js');
-
-		const wlConfig = await whiteLabelUpdater.getWhiteLabelData(serverUrl);
-		appIcon = whiteLabelUpdater.createAppIcon(wlConfig?.assets['icon.png']);
-
-		await whiteLabelUpdater.sendWhiteLabelDataForWeb(wlConfig);
-
-		if (process.platform === 'win32' && wlConfig?.assets['icon.ico']) {
-			whiteLabelUpdater?.updateShortcutWithBase64(wlConfig?.assets['icon.ico']);
-		}
-
-		try {
-			if (process.platform === 'darwin') {
-				app.dock.setIcon(appIcon);
-				log.info('[WL][MAC] Icon successfully changed');
-			}
-		} catch (e) {
-			log.error('[WL][MAC] Icon error', e);
-		}
-	}
-
+async function createWindow(wlConfig) {
+	const appIcon = whiteLabelUpdater.createAppIcon(wlConfig?.assets['icon.png']);
 	// Create the browser window.
 	const win = new BrowserWindow({
 		...config.mainWindow,
@@ -87,6 +64,19 @@ async function createWindow() {
 			nodeIntegration: true,
 		},
 	});
+	// White Label
+	if (process.platform === 'win32' && wlConfig?.assets['icon.ico']) {
+		whiteLabelUpdater?.updateShortcutWithBase64(wlConfig?.assets['icon.ico']);
+	}
+
+	try {
+		if (process.platform === 'darwin') {
+			app.dock.setIcon(appIcon);
+			log.info('[WL][MAC] Icon successfully changed');
+		}
+	} catch (e) {
+		log.error('[WL][MAC] Icon error', e);
+	}
 
 	win.webContents.on('new-window', function (e, url) {
 		e.preventDefault();
@@ -121,7 +111,7 @@ async function createWindow() {
 	win.loadURL(
 		isDev
 			? 'http://localhost:3000'
-			: `file://${path.join(__dirname, '../build/index.html')}`,
+			: `file://${path.join(__dirname, '../build/index.html')}`
 	);
 
 	// Open the DevTools.
@@ -153,6 +143,7 @@ async function createWindow() {
 	const generateUpdateConfig = async () => {
 		let status = true;
 		const domainURL = await localStorage.getItem(config.storageNames.domain);
+		store.set('domain', domainURL);
 		// Test local server
 		// const domainURL = `http://localhost:3100/`;
 		if (!domainURL) {
@@ -194,14 +185,23 @@ async function createWindow() {
 		autoUpdater.logger = log;
 		autoUpdater.checkForUpdates();
 	}
+
+	return win;
 }
 
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
-app.whenReady().then(() => {
-	createWindow();
-
+app.whenReady().then(async () => {
+	if (config.isEnableWhiteLabelUpdater) {
+		const wlCache = await whiteLabelUpdater.getWhiteLabelStatus();
+		await whiteLabelUpdater.sendWhiteLabelDataForWeb(wlCache);
+
+		createWindow(wlCache);
+		await whiteLabelUpdater.runWhiteLabelUpdater();
+	} else {
+		createWindow();
+	}
 	// MAC OS FIX: Re-create a window in the app when the dock icon is clicked
 	app.on('activate', () => {
 		if (BrowserWindow.getAllWindows().length === 0) createWindow();
@@ -240,12 +240,12 @@ autoUpdater.on('update-available', info => {
 		dialog.showMessageBox(options).then(response => {
 			if (response.response === 0) {
 				shell.openExternal(
-					`${updatesPath}${config?.macUpdateConfig?.installerName}`,
+					`${updatesPath}${config?.macUpdateConfig?.installerName}`
 				);
 				showInfoDialog(lang);
 			} else if (response.response === 1) {
 				shell.openExternal(
-					`${updatesPath}${config?.macUpdateConfig?.manualMap[lang]}`,
+					`${updatesPath}${config?.macUpdateConfig?.manualMap[lang]}`
 				);
 				showInfoDialog(lang);
 			}
@@ -296,32 +296,32 @@ app.on(
 		try {
 			const rootCertificateContent = fs.readFileSync(
 				rootCertificatePath,
-				'utf8',
+				'utf8'
 			);
 			const rootCertificateContentSecondary = fs.readFileSync(
 				rootCertificatePathSecondary,
-				'utf8',
+				'utf8'
 			);
 			const rootCert = forge.pki.certificateFromPem(rootCertificateContent);
 			const rootCertSecondary = forge.pki.certificateFromPem(
-				rootCertificateContentSecondary,
+				rootCertificateContentSecondary
 			);
 			const clientCert = forge.pki.certificateFromPem(
-				certificate.data.toString(),
+				certificate.data.toString()
 			);
 			callback(
-				clientCert.isIssuer(rootCert) || clientCert.isIssuer(rootCertSecondary),
+				clientCert.isIssuer(rootCert) || clientCert.isIssuer(rootCertSecondary)
 			);
 		} catch (e) {
 			log.error('Certificate validation error:');
 			log.error(e);
 			callback(false);
 		}
-	},
+	}
 );
 
 // Clear Cache
-app.on('ready', () => {
+app.on('ready', async () => {
 	session.defaultSession.clearCache().then(() => {
 		log.info('Cache cleared!');
 	});

package/source/Customization/electron/electron-configuration/configuration.js

@@ -1,121 +0,0 @@
-const defaultAssets = require('./default-assets.js');
-
-const size = {
-	defaultWidth: 1366,
-	defaultHeight: 768,
-	resizeWidthFactor: 0.5,
-	resizeHeightFactor: 0.75,
-};
-
-const platforms = {
-	WINDOWS: 'WINDOWS',
-	MAC: 'MAC',
-	LINUX: 'LINUX',
-	SUN: 'SUN',
-	OPENBSD: 'OPENBSD',
-	ANDROID: 'ANDROID',
-	AIX: 'AIX',
-};
-
-const platformsNames = {
-	win32: platforms.WINDOWS,
-	darwin: platforms.MAC,
-	linux: platforms.LINUX,
-	sunos: platforms.SUN,
-	openbsd: platforms.OPENBSD,
-	android: platforms.ANDROID,
-	aix: platforms.AIX,
-};
-
-const config = {
-	mainWindow: {
-		width: size.defaultWidth,
-		height: size.defaultHeight,
-		center: true,
-		useContentSize: true,
-		minWidth: Math.floor(size.defaultWidth * size.resizeWidthFactor),
-		minHeight: Math.floor(size.defaultHeight * size.resizeHeightFactor),
-		title: 'Wallet',
-	},
-	provider: 'generic',
-	updaterCacheDirName: 'wallet-updater',
-	storageNames: {
-		lang: 'lang',
-		domain: 'domain_server',
-	},
-	updatesPath: 'Updates/UI/',
-	updatesLocalPath: '../../',
-	updatesPathForPlatform: {
-		WINDOWS: 'Updates/UI/Windows/',
-		MAC: 'Updates/UI/MacOS/',
-		LINUX: 'Updates/UI/Linux/',
-		SUN: 'Updates/UI/',
-		OPENBSD: 'Updates/UI/',
-		ANDROID: 'Updates/UI/',
-		AIX: 'Updates/UI/',
-	},
-	updatesFileName: 'app-update.yml',
-	isEnableDevTools: false,
-	isAvailableDomainInput: true,
-	isEnableWhiteLabelUpdater: true,
-	certificate: {
-		dir: 'electron-configuration',
-		fileName: 'BitHideRoot.crt',
-		fileNameSecondary: 'Wallet.crt',
-	},
-	macUpdateConfig: {
-		installerName: 'installer.dmg',
-		manualMap: {
-			en: 'installing_guide_en.pdf',
-			ru: 'installing_guide_ru.pdf',
-			uk: 'installing_guide_ua.pdf',
-		},
-	},
-	shortCuts: {
-		devTools: 'CommandOrControl+Shift+I',
-	},
-};
-
-const whiteLabelUpdaterConfiguration = {
-	cacheDirName: 'wl-cache',
-	timeOutMs: 5000,
-	defaultResult: {
-		version: '0',
-		enabled: true,
-		productName: 'Wallet',
-		creditCurrency: 'Credits',
-		assets: { ...defaultAssets.defaultAssets },
-	},
-	systemDir: 'userData',
-	internalAssetsDir: '/Updates/UI/White-Label/assets/',
-	configFileName: 'config.json',
-	assetFiles: [
-		'logo-dark.svg',
-		'logo-light.svg',
-		'favicon.png',
-		'icon.ico',
-		'icon.png',
-	],
-	localStorageConfigName: 'whiteLabelConfig',
-	tempIconPrefix: 'app-icon-',
-	desktopDir: 'Desktop',
-	fileExtension: {
-		ico: 'ico',
-		svg: 'svg',
-		png: 'png',
-		jpg: 'jpg',
-		jpeg: 'jpeg',
-		lnk: 'lnk',
-		base64: 'base64',
-		tmp: 'tmp',
-		json: 'json',
-	},
-	imageSize: { width: 256, height: 256 },
-};
-
-module.exports = {
-	config,
-	platforms,
-	platformsNames,
-	whiteLabelUpdaterConfiguration,
-};

package/source/Customization/electron/electron-configuration/configuration_.js

@@ -1,120 +0,0 @@
-const defaultAssets = require('./default-assets.js');
-
-const size = {
-	defaultWidth: 1366,
-	defaultHeight: 768,
-	resizeWidthFactor: 0.5,
-	resizeHeightFactor: 0.75,
-};
-
-const platforms = {
-	WINDOWS: 'WINDOWS',
-	MAC: 'MAC',
-	LINUX: 'LINUX',
-	SUN: 'SUN',
-	OPENBSD: 'OPENBSD',
-	ANDROID: 'ANDROID',
-	AIX: 'AIX',
-};
-
-const platformsNames = {
-	win32: platforms.WINDOWS,
-	darwin: platforms.MAC,
-	linux: platforms.LINUX,
-	sunos: platforms.SUN,
-	openbsd: platforms.OPENBSD,
-	android: platforms.ANDROID,
-	aix: platforms.AIX,
-};
-
-const config = {
-	mainWindow: {
-		width: size.defaultWidth,
-		height: size.defaultHeight,
-		center: true,
-		useContentSize: true,
-		minWidth: Math.floor(size.defaultWidth * size.resizeWidthFactor),
-		minHeight: Math.floor(size.defaultHeight * size.resizeHeightFactor),
-		title: 'Wallet',
-	},
-	provider: 'generic',
-	updaterCacheDirName: 'wallet-updater',
-	storageNames: {
-		lang: 'lang',
-		domain: 'domain_server',
-	},
-	updatesPath: 'Updates/UI/',
-	updatesLocalPath: '../../',
-	updatesPathForPlatform: {
-		WINDOWS: 'Updates/UI/Windows/',
-		MAC: 'Updates/UI/MacOS/',
-		LINUX: 'Updates/UI/Linux/',
-		SUN: 'Updates/UI/',
-		OPENBSD: 'Updates/UI/',
-		ANDROID: 'Updates/UI/',
-		AIX: 'Updates/UI/',
-	},
-	updatesFileName: 'app-update.yml',
-	isEnableDevTools: false,
-	isAvailableDomainInput: true,
-	certificate: {
-		dir: 'electron-configuration',
-		fileName: 'BitHideRoot.crt',
-		fileNameSecondary: 'Wallet.crt',
-	},
-	macUpdateConfig: {
-		installerName: 'installer.dmg',
-		manualMap: {
-			en: 'installing_guide_en.pdf',
-			ru: 'installing_guide_ru.pdf',
-			uk: 'installing_guide_ua.pdf',
-		},
-	},
-	shortCuts: {
-		devTools: 'CommandOrControl+Shift+I',
-	},
-};
-
-const whiteLabelUpdaterConfiguration = {
-	cacheDirName: 'wl-cache',
-	timeOutMs: 5000,
-	defaultResult: {
-		version: '0',
-		enabled: true,
-		productName: 'Wallet',
-		creditCurrency: 'Credits',
-		assets: { ...defaultAssets.defaultAssets },
-	},
-	systemDir: 'userData',
-	internalAssetsDir: '/Updates/UI/White-Label/assets/',
-	configFileName: 'config.json',
-	assetFiles: [
-		'logo-dark.svg',
-		'logo-light.svg',
-		'favicon.png',
-		'icon.ico',
-		'icon.png',
-	],
-	localStorageConfigName: 'whiteLabelConfig',
-	tempIconPrefix: 'app-icon-',
-	desktopDir: 'Desktop',
-	fileExtension: {
-		ico: 'ico',
-		svg: 'svg',
-		png: 'png',
-		jpg: 'jpg',
-		jpeg: 'jpeg',
-		lnk: 'lnk',
-		base64: 'base64',
-		tmp: 'tmp',
-		json: 'json',
-	},
-	imageSize: { width: 256, height: 256 },
-};
-
-module.exports = {
-	config,
-	platforms,
-	platformsNames,
-	whiteLabelUpdaterConfiguration,
-};