🔖 0.9.5-beta

bepass-org · May 27, 2024 · 65943c4 · 65943c4
1 parent a1cf15b
commit 65943c4
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 63 deletions.
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
         "url": "https://github.com/bepass-org/oblivion-desktop/issues",
         "email": "[email protected]"
     },
-    "version": "0.9.0-beta",
+    "version": "0.9.5-beta",
     "license": "Restrictive",
     "main": "./src/main/main.ts",
     "scripts": {

diff --git a/release/app/package.json b/release/app/package.json
@@ -1,7 +1,7 @@
 {
     "name": "oblivion-desktop",
     "description": "unofficial desktop version of oblivion",
-    "version": "0.9.0-beta",
+    "version": "0.9.5-beta",
     "homepage": "https://github.com/bepass-org/oblivion-desktop#readme",
     "license": "Restrictive",
     "author": "ircfspace+kiomarzsss <[email protected]> (https://ircf.space/)",

diff --git a/src/defaultSettings.ts b/src/defaultSettings.ts
@@ -31,7 +31,7 @@ export const defaultSettings = {
     location: '',
     license: '',
     theme: 'light',
-    lang: (getTimeZone?.includes('iran') ? 'fa' : 'en'),
+    lang: getTimeZone?.includes('iran') ? 'fa' : 'en',
     systemTray: false,
     flag: 'xx',
     ipData: true,

diff --git a/src/main/lib/proxy.ts b/src/main/lib/proxy.ts
@@ -52,7 +52,7 @@ const macOSNetworkSetup = (args: string[]) => {
 
 const getMacOSActiveNetworkHardwarePorts = () => {
     return new Promise((resolve, reject) => {
-      const command = `
+        const command = `
         for interface in $(networksetup -listallhardwareports | awk '/Device/ {print $2}'); do
           if ifconfig $interface | grep -q "inet "; then
             networksetup -listallhardwareports | awk -v iface=$interface '
@@ -61,25 +61,25 @@ const getMacOSActiveNetworkHardwarePorts = () => {
           fi
         done
       `;
-  
-      exec(command, (error, stdout, stderr) => {
-        if (error) {
-          log.error(`Error executing command: ${error}`);
-          return reject(error.toString());
-        }
-        if (stderr) {
-          log.error(`Error in command output: ${stderr}`);
-          return reject(stderr.toString());
-        }
-        const results = stdout.trim().split('\n'); // Get all active hardware ports
-        if (results.length > 0) {
-          log.info(`Active Hardware Ports: ${results.join(', ')}`);
-          resolve(results);
-        } else {
-          log.error("Active Network Devices not found.");
-          reject("Active Network Devices not found.");
-        }
-      });
+
+        exec(command, (error, stdout, stderr) => {
+            if (error) {
+                log.error(`Error executing command: ${error}`);
+                return reject(error.toString());
+            }
+            if (stderr) {
+                log.error(`Error in command output: ${stderr}`);
+                return reject(stderr.toString());
+            }
+            const results = stdout.trim().split('\n'); // Get all active hardware ports
+            if (results.length > 0) {
+                log.info(`Active Hardware Ports: ${results.join(', ')}`);
+                resolve(results);
+            } else {
+                log.error('Active Network Devices not found.');
+                reject('Active Network Devices not found.');
+            }
+        });
     });
 };
 
@@ -134,7 +134,6 @@ export const enableProxy = async (regeditVbsDirPath: string, ipcEvent?: IpcMainE
                         },
                         ProxyOverride: {
                             type: 'REG_SZ',
-                            // TODO read from user settings
                             value: String(setRoutingRules(routingRules))
                         },
                         AutoConfigURL: {
@@ -159,32 +158,37 @@ export const enableProxy = async (regeditVbsDirPath: string, ipcEvent?: IpcMainE
         });
     } else if (process.platform === 'darwin') {
         return new Promise<void>(async (resolve, reject) => {
-            const hardwarePorts: string[] = await getMacOSActiveNetworkHardwarePorts() as string[];
+            const hardwarePorts: string[] =
+                (await getMacOSActiveNetworkHardwarePorts()) as string[];
             log.info('using hardwarePort:', hardwarePorts);
             hardwarePorts.forEach(async (hardwarePort) => {
                 log.info('using hardwarePort:', hardwarePort);
-          
+
                 try {
-                  await macOSNetworkSetup([
-                    '-setsocksfirewallproxy',
-                    hardwarePort,
-                    hostIP.toString(),
-                    port.toString()
-                  ]);
-                  await macOSNetworkSetup([
-                    '-setproxybypassdomains',
-                    hardwarePort,
-                    // TODO read from user settings
-                    String(setRoutingRules(routingRules))
-                ]);
-                  await macOSNetworkSetup(['-setsocksfirewallproxystate', hardwarePort, 'on']);
-                  log.info(`System proxy has been set for ${hardwarePort}.`);
+                    await macOSNetworkSetup([
+                        '-setsocksfirewallproxy',
+                        hardwarePort,
+                        hostIP.toString(),
+                        port.toString()
+                    ]);
+                    await macOSNetworkSetup([
+                        '-setproxybypassdomains',
+                        hardwarePort,
+                        String(setRoutingRules(routingRules))
+                    ]);
+                    await macOSNetworkSetup(['-setsocksfirewallproxystate', hardwarePort, 'on']);
+                    log.info(`System proxy has been set for ${hardwarePort}.`);
                 } catch (error) {
-                  log.error(`Error while trying to set system proxy for ${hardwarePort}: ${error}`);
-                  ipcEvent?.reply('guide-toast', `پیکربندی پروکسی برای ${hardwarePort} با خطا روبرو شد!`);
+                    log.error(
+                        `Error while trying to set system proxy for ${hardwarePort}: ${error}`
+                    );
+                    ipcEvent?.reply(
+                        'guide-toast',
+                        `پیکربندی پروکسی برای ${hardwarePort} با خطا روبرو شد!`
+                    );
                 }
-              });
-              resolve();
+            });
+            resolve();
         });
     } else {
         return new Promise<void>((resolve, reject) => {
@@ -240,31 +244,24 @@ export const disableProxy = async (regeditVbsDirPath: string, ipcEvent?: IpcMain
         });
     } else if (process.platform === 'darwin') {
         return new Promise<void>(async (resolve, reject) => {
-            const hardwarePorts: string[] = await getMacOSActiveNetworkHardwarePorts() as string[];
+            const hardwarePorts: string[] =
+                (await getMacOSActiveNetworkHardwarePorts()) as string[];
             log.info('using hardwarePort:', hardwarePorts);
             hardwarePorts.forEach(async (hardwarePort) => {
                 log.info('using hardwarePort:', hardwarePort);
-          
+
                 try {
-                  await macOSNetworkSetup([
-                    '-setsocksfirewallproxy',
-                    hardwarePort,
-                    ''
-                  ]);
-                  await macOSNetworkSetup([
-                    '-setsocksfirewallproxystate',
-                    hardwarePort,
-                    'off'
-                  ]);
-                  log.info('system proxy has been disabled on your system.');
-                  resolve();
+                    await macOSNetworkSetup(['-setsocksfirewallproxy', hardwarePort, '']);
+                    await macOSNetworkSetup(['-setsocksfirewallproxystate', hardwarePort, 'off']);
+                    log.info('system proxy has been disabled on your system.');
+                    resolve();
                 } catch (error) {
-                  log.error(`error while trying to disable system proxy: , ${error}`);
-                  reject(error);
-                  ipcEvent?.reply('guide-toast', `پیکربندی پروکسی با خطا روبرو شد!`);
+                    log.error(`error while trying to disable system proxy: , ${error}`);
+                    reject(error);
+                    ipcEvent?.reply('guide-toast', `پیکربندی پروکسی با خطا روبرو شد!`);
                 }
-              });
-              resolve();
+            });
+            resolve();
         });
     } else {
         return new Promise<void>((resolve, reject) => {