From bb5a36c4f6408d8f124565ea5f0d72d4f54fe376 Mon Sep 17 00:00:00 2001
From: Oj <oj@oojmed.com>
Date: Thu, 13 Jan 2022 13:42:04 +0000
Subject: [PATCH] [CmdSwitches] Cleaner rewrite, add more presets

---
 src/cmdSwitches.js | 61 +++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/cmdSwitches.js b/src/cmdSwitches.js
index d5f139c..9e502a3 100644
--- a/src/cmdSwitches.js
+++ b/src/cmdSwitches.js
@@ -3,49 +3,60 @@ const { app } = require('electron');
 const presets = {
   'perf': `--enable-gpu-rasterization --enable-zero-copy --ignore-gpu-blocklist --enable-hardware-overlays=single-fullscreen,single-on-top,underlay --enable-features=BackForwardCache:TimeToLiveInBackForwardCacheInSeconds/300/should_ignore_blocklists/true/enable_same_site/true,ThrottleDisplayNoneAndVisibilityHiddenCrossOriginIframes,UseSkiaRenderer,WebAssemblyLazyCompilation --disable-features=Vulkan`, // Performance
   'perf-ex': '--enable-quic --enable-features=EnableDrDc,CanvasOopRasterization', // Performance experimental (not known / tested benefit)
-  'disablemediakeys': '--disable-features=HardwareMediaKeyHandling', // Disables media keys (common want)
-  'battery': '--enable-features=TurnOffStreamingMediaCachingAlways' // Known to have better battery life for Chromium
+  'perf-ex2': 'auto-detect=false no-proxy-server', // Does this do anything past electron 3.0.1 ? - include as a preset because why not
+  'perf-ex3': '--force_high_performance_gpu​', // Is this worth it?
+  'memory-ex': '--process-per-site --renderer-process-limit=2', // "Reducing" memory usage (rough / unknown results)
+  'memory-ex2': '--process-per-tab',
+  'debug': '--show-fps-counter', // Debugging tools
+  'disablemediakeys': '--disable-features=HardwareMediaKeyHandling', // Disables media keys (common want?)
+  'battery': '--enable-features=TurnOffStreamingMediaCachingAlways', // Known to have better battery life for Chromium?
+  'battery-tradeoff': '--force_low_power_gpu' // Improves battery life but with perf tradeoffs?
 };
 
+const combinePresets = (keys) => {
+  let total = {};
+  for (const pre of keys) {
+    for (const cmd of presets[pre].split(' ')) {
+      const [ key, value ] = cmd.split('=');
+
+      if (total[key]) {
+        if (value) {
+          total[key] += ',' + value; // Concat value with , for flags like --enable-features
+        } // Else no value, ignore as it already exists
+      } else {
+        total[key] = value;
+      }
+    }
+  }
+  
+  return Object.keys(total).reduce((acc, x) => acc += (x + (total[x] ? ('=' + total[x]) : '') + ' '), '');
+};
+
+
 module.exports = () => {
-  const preset = oaConfig.cmdPreset || 'perf,perf-ex,battery'; // Default to most (should default to none?)
+  const preset = oaConfig.cmdPreset || 'perf,perf-ex,battery'; // Default to most (should default to none?) // 'perf,perf-ex,perf-ex2,battery,memory-ex2'
   let cmdSwitches = presets[preset] || ''; // Default to blank (no switches)
 
   log('CmdSwitches', 'Preset:', preset);
 
-  if (preset.includes(',')) {
-    let total = {};
-    for (const pre of preset.split(',')) {
-      for (const cmd of presets[pre].split(' ')) {
-        const [ key, value ] = cmd.split('=');
-
-        if (total[key]) {
-          if (value) {
-            total[key] += ',' + value; // Concat value with , for flags like --enable-features
-          } // Else no value, ignore as it already exists
-        } else {
-          total[key] = value;
-        }
-      }
-    }
-
-    console.log(total);
-
-    cmdSwitches = Object.keys(total).reduce((acc, x) => acc += (x + (total[x] ? ('=' + total[x]) : '') + ' '), '');
-  }
+  if (preset.includes(',')) cmdSwitches = combinePresets(preset.split(','));
 
   if (cmdSwitches) {
     cmdSwitches = `--flag-switches-begin ` + cmdSwitches + ` --flag-switches-end`; // Probably unneeded for Chromium / Electron manual flags but add anyway
 
     log('CmdSwitches', 'Switches:', cmdSwitches);
 
+    module.exports.cmd = cmdSwitches;
+    module.exports.preset = preset;
+
     const switches = cmdSwitches.split(' ');
 
     for (const cmd of switches) {
-      const [ key, value ] = cmd.split('=');
+      let [ key, value ] = cmd.split('=');
+      key = key.replace('--', ''); // Replace --key with key (?)
 
       app.commandLine.appendSwitch(key, value);
       log('CmdSwitches', 'Appended switch', key, value);
     }
   }
-}
\ No newline at end of file
+}