chore(client/electron): move src/electron into client/src/electron

src/electron/build.action.mjs → client/src/electron/build.action.mjs

@@ -13,13 +13,13 @@
 // limitations under the License.
 
 import minimist from 'minimist';
-import {runAction} from '../build/run_action.mjs';
-import {getBuildParameters} from '../../client/src/build/get_build_parameters.mjs';
+import {runAction} from '../../../src/build/run_action.mjs';
+import {getBuildParameters} from '../build/get_build_parameters.mjs';
 import electron, {Platform} from 'electron-builder';
 import copydir from 'copy-dir';
 import fs from 'fs/promises';
 import url from 'url';
-import {getRootDir} from '../build/get_root_dir.mjs';
+import {getRootDir} from '../../../src/build/get_root_dir.mjs';
 import path from 'path';
 
 const ELECTRON_BUILD_DIR = 'build';
@@ -49,16 +49,16 @@ export async function main(...parameters) {
   }
 
   await runAction('client/src/www/build', ...parameters);
-  await runAction('client/src/tun2socks/build', ...parameters);
-  await runAction('src/electron/build_main', ...parameters);
+  // await runAction('client/src/tun2socks/build', ...parameters);
+  await runAction('client/src/electron/build_main', ...parameters);
 
   await copydir.sync(
-    path.join(getRootDir(), 'src', 'electron', 'icons'),
-    path.join(getRootDir(), ELECTRON_BUILD_DIR, 'icons')
+    path.join(getRootDir(), 'client', 'src', 'electron', 'icons'),
+    path.join(getRootDir(), 'client', ELECTRON_BUILD_DIR, 'icons')
   );
 
   const electronConfig = JSON.parse(
-    await fs.readFile(path.resolve(getRootDir(), 'src', 'electron', 'electron-builder.json'))
+    await fs.readFile(path.resolve(getRootDir(), 'client', 'src', 'electron', 'electron-builder.json'))
   );
 
   // build electron binary

src/electron/build_main.action.mjs → client/src/electron/build_main.action.mjs

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {runAction} from '../build/run_action.mjs';
-import {getBuildParameters} from '../../client/src/build/get_build_parameters.mjs';
-import {getWebpackBuildMode} from '../../client/src/build/get_webpack_build_mode.mjs';
-import {runWebpack} from '../../client/src/build/run_webpack.mjs';
+import {runAction} from '../../../src/build/run_action.mjs';
+import {getBuildParameters} from '../build/get_build_parameters.mjs';
+import {getWebpackBuildMode} from '../build/get_webpack_build_mode.mjs';
+import {runWebpack} from '../build/run_webpack.mjs';
 import electronMainWebpackConfigs from './webpack_electron_main.mjs';
 import fs from 'fs/promises';
 import path from 'path';
 import url from 'url';
-import {getRootDir} from '../build/get_root_dir.mjs';
+import {getRootDir} from '../../../src/build/get_root_dir.mjs';
 
 const ELECTRON_BUILD_DIR = 'build';
 const ELECTRON_PLATFORMS = ['linux', 'windows'];
@@ -57,7 +57,7 @@ export async function main(...parameters) {
       windowsEnvironment += `\n!define SENTRY_URL "<debug>"`;
     }
 
-    await fs.writeFile(path.resolve(getRootDir(), ELECTRON_BUILD_DIR, 'env.nsh'), windowsEnvironment);
+    await fs.writeFile(path.resolve(getRootDir(), 'client', ELECTRON_BUILD_DIR, 'env.nsh'), windowsEnvironment);
   }
 }
 

src/electron/connectivity.ts → client/src/electron/connectivity.ts

@@ -14,8 +14,8 @@
 
 import * as dns from 'dns';
 
-import {timeoutPromise} from '../../client/src/infrastructure/timeout_promise';
-import * as errors from '../../client/src/www/model/errors';
+import {timeoutPromise} from '../infrastructure/timeout_promise';
+import * as errors from '../www/model/errors';
 
 const DNS_LOOKUP_TIMEOUT_MS = 10000;
 

src/electron/custom_install_steps.nsh → client/src/electron/custom_install_steps.nsh

@@ -57,10 +57,10 @@ ${StrRep}
 
   ; OutlineService files, stopping the service first in case it's still running.
   nsExec::Exec "$SYSDIR\net stop OutlineService"
-  File "${PROJECT_DIR}\tools\OutlineService\OutlineService\bin\OutlineService.exe"
-  File "${PROJECT_DIR}\tools\smartdnsblock\bin\smartdnsblock.exe"
+  File "${PROJECT_DIR}\client\tools\OutlineService\OutlineService\bin\OutlineService.exe"
+  File "${PROJECT_DIR}\client\tools\smartdnsblock\bin\smartdnsblock.exe"
   File "${PROJECT_DIR}\third_party\newtonsoft\Newtonsoft.Json.dll"
-  File "${PROJECT_DIR}\src\electron\install_windows_service.bat"
+  File "${PROJECT_DIR}\client\src\electron\install_windows_service.bat"
 
   ; ExecToStack captures both stdout and stderr from the script, in the order output.
   ; Set a (long) timeout in case the device never becomes visible to netsh.

src/electron/go_vpn_tunnel.ts → client/src/electron/go_vpn_tunnel.ts

@@ -15,10 +15,10 @@
 import {powerMonitor} from 'electron';
 import {platform} from 'os';
 
-import {pathToEmbeddedBinary} from '../../client/src/infrastructure/electron/app_paths';
-import {ShadowsocksSessionConfig} from '../../client/src/www/app/tunnel';
-import {TunnelStatus} from '../../client/src/www/app/tunnel';
-import {ErrorCode, fromErrorCode, UnexpectedPluginError} from '../../client/src/www/model/errors';
+import {pathToEmbeddedBinary} from '../infrastructure/electron/app_paths';
+import {ShadowsocksSessionConfig} from '../www/app/tunnel';
+import {TunnelStatus} from '../www/app/tunnel';
+import {ErrorCode, fromErrorCode, UnexpectedPluginError} from '../www/model/errors';
 
 import {ChildProcessHelper, ProcessTerminatedExitCodeError, ProcessTerminatedSignalError} from './process';
 import {RoutingDaemon} from './routing_service';

src/electron/index.ts → client/src/electron/index.ts

@@ -23,10 +23,10 @@ import * as process from 'process';
 import * as url from 'url';
 import autoLaunch = require('auto-launch'); // tslint:disable-line
 
-import * as errors from '../../client/src/www/model/errors';
+import * as errors from '../www/model/errors';
 
-import {ShadowsocksSessionConfig} from '../../client/src/www/app/tunnel';
-import {TunnelStatus} from '../../client/src/www/app/tunnel';
+import {ShadowsocksSessionConfig} from '../www/app/tunnel';
+import {TunnelStatus} from '../www/app/tunnel';
 import {GoVpnTunnel} from './go_vpn_tunnel';
 import {installRoutingServices, RoutingDaemon} from './routing_service';
 import {TunnelStore, SerializableTunnel} from './tunnel_store';

src/electron/routing_service.ts → client/src/electron/routing_service.ts

@@ -19,9 +19,9 @@ import {platform, userInfo} from 'os';
 import * as path from 'path';
 import * as sudo from 'sudo-prompt';
 
-import {getAppPath} from '../../client/src/infrastructure/electron/app_paths';
-import {TunnelStatus} from '../../client/src/www/app/tunnel';
-import {ErrorCode, SystemConfigurationException} from '../../client/src/www/model/errors';
+import {getAppPath} from '../infrastructure/electron/app_paths';
+import {TunnelStatus} from '../www/app/tunnel';
+import {ErrorCode, SystemConfigurationException} from '../www/model/errors';
 
 const isLinux = platform() === 'linux';
 const isWindows = platform() === 'win32';

src/electron/start.action.mjs → client/src/electron/start.action.mjs

@@ -15,10 +15,10 @@
 import url from 'url';
 import electron from 'electron';
 
-import {runAction} from '../../client/src/build/run_action.mjs';
-import {getBuildParameters} from '../../client/src/build/get_build_parameters.mjs';
-import {getRootDir} from '../../client/src/build/get_root_dir.mjs';
-import {spawnStream} from '../../client/src/build/spawn_stream.mjs';
+import {runAction} from '../../../src/build/run_action.mjs';
+import {getBuildParameters} from '../build/get_build_parameters.mjs';
+import {getRootDir} from '../../../src/build/get_root_dir.mjs';
+import {spawnStream} from '../../../src/build/spawn_stream.mjs';
 
 /**
  * @description Builds and starts the electron application.

src/electron/tsconfig.json → client/src/electron/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../client/src/www/tsconfig.json",
+  "extends": "../www/tsconfig.json",
   "compilerOptions": {
     "outDir": "../../build/electron"
   }

src/electron/tunnel_store.ts → client/src/electron/tunnel_store.ts

@@ -15,7 +15,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 
-import {ShadowsocksSessionConfig} from '../../client/src/www/app/tunnel';
+import {ShadowsocksSessionConfig} from '../www/app/tunnel';
 
 // Format to store a tunnel configuration.
 export interface SerializableTunnel {

src/electron/vpn_tunnel.ts → client/src/electron/vpn_tunnel.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {TunnelStatus} from '../../client/src/www/app/tunnel';
+import {TunnelStatus} from '../www/app/tunnel';
 
 // Represents a VPN tunnel to a proxy server.
 export interface VpnTunnel {

src/electron/webpack_electron_main.mjs → client/src/electron/webpack_electron_main.mjs

@@ -22,7 +22,7 @@ const __dirname = path.dirname(__filename);
 
 export default ({sentryDsn, appVersion}) => [
   {
-    entry: './src/electron/index.ts',
+    entry: './client/src/electron/index.ts',
     target: 'electron-main',
     node: {
       __dirname: false,
@@ -53,7 +53,7 @@ export default ({sentryDsn, appVersion}) => [
     },
   },
   {
-    entry: './src/electron/preload.ts',
+    entry: './client/src/electron/preload.ts',
     target: 'electron-preload',
     devtool: 'inline-source-map',
     module: {

src/electron/windows/electron_builder_signing_plugin.cjs → client/src/electron/windows/electron_builder_signing_plugin.cjs

@@ -29,7 +29,7 @@
  * @param {Object} configuration.options a duplication of electron-builder.json
  */
 async function electronBuilderEntryPoint(configuration) {
-  const {runAction} = await import('../../build/run_action.mjs');
+  const {runAction} = await import('../../../../src/build/run_action.mjs');
   await runAction('src/electron/windows/sign_windows_executable',
     '--target', configuration.path,
     '--algorithm', configuration.hash);

src/electron/windows/sign_windows_executable.action.mjs → client/src/electron/windows/sign_windows_executable.action.mjs

@@ -19,7 +19,7 @@ import {dirname, resolve} from 'path';
 import {fileURLToPath, pathToFileURL} from 'url';
 import {format} from 'util';
 
-import {jsign} from '../../../third_party/jsign/index.mjs';
+import {jsign} from '../../../../third_party/jsign/index.mjs';
 
 /**
  * Get the parent folder path of this script.

client/src/www/app/electron_main.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/// <reference path="../../../../src/electron/preload.d.ts" />
+/// <reference path="../../electron/preload.d.ts" />
 
 import 'web-animations-js/web-animations-next-lite.min.js';
 import '@webcomponents/webcomponentsjs/webcomponents-bundle.js';

package.json

@@ -5,7 +5,7 @@
     "action:help": "npm run action list",
     "action:list": "npm run action list",
     "action": "node ./src/build/run_action.mjs",
-    "clean": "rimraf client/build client/output node_modules client/node_modules client/www client/platforms client/plugins third_party/jsign/*.jar",
+    "clean": "rimraf build output client/build client/output node_modules client/node_modules client/www client/platforms client/plugins third_party/jsign/*.jar",
     "format:all": "prettier --write \"**/*.{cjs,mjs,html,js,json,md,ts}\"",
     "format": "pretty-quick --staged --pattern \"**/*.{cjs,mjs,html,js,json,md,ts}\"",
     "lint:ts": "eslint --ext ts,mjs client/src",
@@ -20,8 +20,5 @@
     "server_manager",
     "client"
   ],
-  "devDependencies": {
-    "electron-builder": "^24.13.3"
-  },
-  "main": "build/electron/electron/index.js"
+  "main": "client/build/electron/electron/index.js"
 }

www/environment.json

@@ -0,0 +1 @@
+{"APP_VERSION":"0.0.0-debug","APP_BUILD_NUMBER":475649}