From e39f25f3be74a442a8f14bc76b57173873a0696f Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Tue, 26 Mar 2024 16:24:38 -0400 Subject: [PATCH 1/4] init commit --- src/electron/go_vpn_tunnel.ts | 2 +- src/infrastructure/electron/app_paths.ts | 4 ++-- src/tun2socks/build.action.mjs | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/electron/go_vpn_tunnel.ts b/src/electron/go_vpn_tunnel.ts index 33d11bb2f2..99f61a2651 100755 --- a/src/electron/go_vpn_tunnel.ts +++ b/src/electron/go_vpn_tunnel.ts @@ -221,7 +221,7 @@ class GoTun2socks { private readonly process: ChildProcessHelper; constructor(private readonly config: ShadowsocksSessionConfig) { - this.process = new ChildProcessHelper(pathToEmbeddedBinary('outline-go-tun2socks', 'tun2socks')); + this.process = new ChildProcessHelper(pathToEmbeddedBinary('tun2socks')); } async start(isUdpEnabled: boolean): Promise { diff --git a/src/infrastructure/electron/app_paths.ts b/src/infrastructure/electron/app_paths.ts index 34df231dbf..0c6d957981 100644 --- a/src/infrastructure/electron/app_paths.ts +++ b/src/infrastructure/electron/app_paths.ts @@ -42,6 +42,6 @@ export function getAppPath() { return electronAppPath; } -export function pathToEmbeddedBinary(toolname: string, filename: string) { - return path.join(unpackedAppPath(), 'third_party', toolname, os.platform(), filename + (isWindows ? '.exe' : '')); +export function pathToEmbeddedBinary(filename: string) { + return path.join(unpackedAppPath(), 'output', 'build', os.platform(), filename + (isWindows ? '.exe' : '')); } diff --git a/src/tun2socks/build.action.mjs b/src/tun2socks/build.action.mjs index c91c9889e6..9037a7d37f 100644 --- a/src/tun2socks/build.action.mjs +++ b/src/tun2socks/build.action.mjs @@ -14,6 +14,7 @@ import url from 'url'; import os from 'os'; +import fs from 'fs'; import {spawnStream} from '../build/spawn_stream.mjs'; import {getBuildParameters} from '../build/get_build_parameters.mjs'; @@ -42,6 +43,12 @@ export async function main(...parameters) { } await spawnStream('make', ['ios', 'macos', 'maccatalyst'].includes(targetPlatform) ? 'apple' : targetPlatform); + + + // THIS IS JUST FOR DEBUGGING + fs.readdir(`output/build/${targetPlatform}`, (err, files) => { + files.forEach(console.log); + }) } if (import.meta.url === url.pathToFileURL(process.argv[1]).href) { From 3ca642f5fb0ed3caf5b9c3fefbee5f88f77f2591 Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Tue, 26 Mar 2024 16:31:22 -0400 Subject: [PATCH 2/4] revert this --- src/electron/go_vpn_tunnel.ts | 2 +- src/infrastructure/electron/app_paths.ts | 4 ++-- src/tun2socks/build.action.mjs | 7 ------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/electron/go_vpn_tunnel.ts b/src/electron/go_vpn_tunnel.ts index 99f61a2651..8be383052f 100755 --- a/src/electron/go_vpn_tunnel.ts +++ b/src/electron/go_vpn_tunnel.ts @@ -221,7 +221,7 @@ class GoTun2socks { private readonly process: ChildProcessHelper; constructor(private readonly config: ShadowsocksSessionConfig) { - this.process = new ChildProcessHelper(pathToEmbeddedBinary('tun2socks')); + this.process = new ChildProcessHelper(pathToEmbeddedBinary('tun2socks', 'tun2socks')); } async start(isUdpEnabled: boolean): Promise { diff --git a/src/infrastructure/electron/app_paths.ts b/src/infrastructure/electron/app_paths.ts index 0c6d957981..e7158a3f85 100644 --- a/src/infrastructure/electron/app_paths.ts +++ b/src/infrastructure/electron/app_paths.ts @@ -42,6 +42,6 @@ export function getAppPath() { return electronAppPath; } -export function pathToEmbeddedBinary(filename: string) { - return path.join(unpackedAppPath(), 'output', 'build', os.platform(), filename + (isWindows ? '.exe' : '')); +export function pathToEmbeddedBinary(toolname: string, filename: string) { + return path.join(unpackedAppPath(), 'output', 'build', os.platform(), toolname, filename + (isWindows ? '.exe' : '')); } diff --git a/src/tun2socks/build.action.mjs b/src/tun2socks/build.action.mjs index 9037a7d37f..c91c9889e6 100644 --- a/src/tun2socks/build.action.mjs +++ b/src/tun2socks/build.action.mjs @@ -14,7 +14,6 @@ import url from 'url'; import os from 'os'; -import fs from 'fs'; import {spawnStream} from '../build/spawn_stream.mjs'; import {getBuildParameters} from '../build/get_build_parameters.mjs'; @@ -43,12 +42,6 @@ export async function main(...parameters) { } await spawnStream('make', ['ios', 'macos', 'maccatalyst'].includes(targetPlatform) ? 'apple' : targetPlatform); - - - // THIS IS JUST FOR DEBUGGING - fs.readdir(`output/build/${targetPlatform}`, (err, files) => { - files.forEach(console.log); - }) } if (import.meta.url === url.pathToFileURL(process.argv[1]).href) { From 2449bce4614cd5e7283f4bc8033b2c7eaeaf2b39 Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Wed, 27 Mar 2024 10:09:57 -0400 Subject: [PATCH 3/4] Update app_paths.ts --- src/infrastructure/electron/app_paths.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/infrastructure/electron/app_paths.ts b/src/infrastructure/electron/app_paths.ts index e7158a3f85..0c6d957981 100644 --- a/src/infrastructure/electron/app_paths.ts +++ b/src/infrastructure/electron/app_paths.ts @@ -42,6 +42,6 @@ export function getAppPath() { return electronAppPath; } -export function pathToEmbeddedBinary(toolname: string, filename: string) { - return path.join(unpackedAppPath(), 'output', 'build', os.platform(), toolname, filename + (isWindows ? '.exe' : '')); +export function pathToEmbeddedBinary(filename: string) { + return path.join(unpackedAppPath(), 'output', 'build', os.platform(), filename + (isWindows ? '.exe' : '')); } From 0bf9286e169d9e52ff2f902c71bd3cd477becf84 Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Wed, 27 Mar 2024 10:10:17 -0400 Subject: [PATCH 4/4] Update go_vpn_tunnel.ts --- src/electron/go_vpn_tunnel.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/electron/go_vpn_tunnel.ts b/src/electron/go_vpn_tunnel.ts index 8be383052f..99f61a2651 100755 --- a/src/electron/go_vpn_tunnel.ts +++ b/src/electron/go_vpn_tunnel.ts @@ -221,7 +221,7 @@ class GoTun2socks { private readonly process: ChildProcessHelper; constructor(private readonly config: ShadowsocksSessionConfig) { - this.process = new ChildProcessHelper(pathToEmbeddedBinary('tun2socks', 'tun2socks')); + this.process = new ChildProcessHelper(pathToEmbeddedBinary('tun2socks')); } async start(isUdpEnabled: boolean): Promise {