bugfix

Author: osdio

build.js

@@ -24,7 +24,7 @@ const startBuild = async () => {
             formatFile(fPath, folderLevel);
         }
     }, './');
-    no_build && copyFolder('./vite-web-wallet/dist', path.join(appPath, 'walletPages'));
+    // no_build && copyFolder('./vite-web-wallet/dist', path.join(appPath, 'walletPages'));
     copyIcon();
     writePackage();
     if (!no_build) {

package.json

@@ -13,6 +13,9 @@
         "build": "FORCE_COLOR=1 gulp && FORCE_COLOR=1 NODE_ENV=prod node build.js",
         "builddev": "gulp && NODE_ENV=dev node build.js",
         "build:win": "FORCE_COLOR=1 p=WIN npm run build",
+        "build:web": "npm run build:web:test && npm run build:web:prod",
+        "build:web:prod": "cd vite-web-wallet && npm run build && cd ../ && cp -rf vite-web-wallet/dist/ app/walletPages",
+        "build:web:test": "cd vite-web-wallet && npm run build:testPC && cd ../ && cp -rf vite-web-wallet/dist/ app/walletPages-test",
         "dev": "NO_BUILD=true npm run builddev && NODE_ENV=dev HOT_RELOAD=true electron .",
         "dev:nohot": "NO_BUILD=true npm run builddev && NODE_ENV=dev electron .",
         "test": "mocha",

release.js

@@ -64,17 +64,10 @@ const release = async () => {
 
     console.log(`npm version ${bumps.indexOf(bump) > -1 ? bump : version }`);
 
-    // Build Mainnet files
-    await execWrapper(`npm`, ['run', 'build'], {
-        cwd: path.join(process.cwd(), 'vite-web-wallet')
-    });
-    await execWrapper('cp', ['-rf', 'vite-web-wallet/dist/', 'app/walletPages']);
+    // Delete files
+    await execWrapper('npm', ['run', 'clean']);
 
-    // Build Testnet files
-    await execWrapper(`npm`, ['run', 'build:testPC'], {
-        cwd: path.join(process.cwd(), 'vite-web-wallet')
-    });
-    await execWrapper('cp', ['-rf', 'vite-web-wallet/dist/', 'app/walletPages-test']);
+    await execWrapper('npm', ['run', 'build:web']);
 
     const releaseConfig = {
         env: {

walletSrc/modules/init/initWEB.js

@@ -1,18 +1,35 @@
 const path = require('path');
 
-const { shell } = require('electron');
+const { shell, protocol } = require('electron');
 const serve = require('electron-serve');
 
 const netTypes = ['mainnet', 'testnet'];
+const privileges = {
+    standard: true,
+    secure: true,
+    allowServiceWorkers: true,
+    supportFetchAPI: true,
+    corsEnabled: true
+};
+
 
 function serveFile(netType) {
     return serve({
-        directory: path.join(global.APP_PATH, netType === 'mainnet' ? 'walletPages' : 'walletPages-test')
+        directory: path.join(global.APP_PATH, netType === 'mainnet' ? 'walletPages' : 'walletPages-test'),
+        scheme: netType
     });
 }
 
-serveFile('mainnet');
 serveFile('testnet');
+serveFile('mainnet');
+
+// This is for fix a bugs of muti-scheme of electron-serve, details: https://www.electronjs.org/docs/api/protocol#protocolregisterschemesasprivilegedcustomschemes
+protocol.registerSchemesAsPrivileged(netTypes.map(item => {
+    return {
+        scheme: item,
+        privileges
+    }
+}));
 
 function loadWebDom() {
     const walletWindow = global.WALLET_WIN;
@@ -27,15 +44,15 @@ function loadWebDom() {
     if (process.env.HOT_RELOAD === 'true') {
         walletWindow.loadURL('http://localhost:8081');
     } else {
-        global.WALLET_WIN.loadURL(`app://${netType}.vite.net`);
+        global.WALLET_WIN.loadURL(`${netType}://x.vite.net`);
     }
 
     walletWindow.webContents.once('dom-ready', () => {
         console.info('Web dom ready');
     });
 
     global.viteEventEmitter.on('change-net', (_netType) => {
-        global.WALLET_WIN.loadURL(`app://${_netType}.vite.net`);
+        global.WALLET_WIN.loadURL(`${_netType}://x-test.vite.net`);
     });
 }
 
@@ -47,16 +64,6 @@ module.exports = function loadWeb() {
     console.info('Start to load web.');
     loadWebDom();
 
-    // global.WALLET_WIN.webContents.on('will-navigate', (event, url) => {
-    //     if (url.indexOf('file') !== 0) {
-    //         return;
-    //     }
-
-    //     event.preventDefault();
-    //     console.info(`Location change: ${url}`);
-    //     loadWebDom();
-    // });
-
     // Redefine file
     global.WALLET_WIN.webContents.on('new-window', (event, url) => {
         event.preventDefault();