fix: Critical fixes for traffic redirection

- Add TPWS_PORTS=80,443 to config generation (required for pf.sh to create redirect rules)
- Fix LaunchDaemon to use 'start' instead of 'start-daemons' (enables firewall rules on boot)
- Fix typo TPPORT vs TPPORT_SOCKS in macos/functions
- Write complete working config on install instead of empty file
- Add uninstall script

Author: roninreilly

Sources/main.swift

@@ -194,6 +194,7 @@ enum ZapretStrategy: String, CaseIterable, Identifiable {
         let commonVars = """
         TPWS_ENABLE=1
         TPWS_SOCKS_ENABLE=1
+        TPWS_PORTS=80,443
         INIT_APPLY_FW=1
         DISABLE_IPV6=0
         GZIP_LISTS=0

install_darkware.sh

@@ -26,9 +26,17 @@ mkdir -p "$TARGET_DIR"
 # Copy files (using dot syntax for reliable copying of content)
 cp -R "$SOURCE_DIR/." "$TARGET_DIR/" || { echo "Copy failed" >> "$LOG"; exit 1; }
 
-# Create/Reset strategy config if not exists
+# Create/Reset strategy config if not exists - write default working config
 if [ ! -f "$TARGET_DIR/config_custom" ]; then
-    echo "# Custom strategy config" > "$TARGET_DIR/config_custom"
+    cat > "$TARGET_DIR/config_custom" <<'CONFIGEOF'
+TPWS_ENABLE=1
+TPWS_SOCKS_ENABLE=1
+TPWS_PORTS=80,443
+INIT_APPLY_FW=1
+DISABLE_IPV6=0
+GZIP_LISTS=0
+TPWS_OPT="--filter-tcp=80 --methodeol --hostlist=/opt/darkware-zapret/ipset/zapret-hosts.txt --hostlist-auto=/opt/darkware-zapret/ipset/zapret-hosts-auto.txt --hostlist-auto-fail-threshold=3 --hostlist-auto-fail-time=60 --hostlist-auto-retrans-threshold=3 --new --filter-tcp=443 --split-pos=1,midsld --disorder --hostlist=/opt/darkware-zapret/ipset/zapret-hosts.txt --hostlist-auto=/opt/darkware-zapret/ipset/zapret-hosts-auto.txt --hostlist-auto-fail-threshold=3 --hostlist-auto-fail-time=60 --hostlist-auto-retrans-threshold=3"
+CONFIGEOF
 fi
 chmod 666 "$TARGET_DIR/config_custom"
 
@@ -90,7 +98,7 @@ cat > "$PLIST_PATH" <<EOF
     <key>ProgramArguments</key>
     <array>
         <string>/opt/darkware-zapret/init.d/macos/zapret</string>
-        <string>start-daemons</string>
+        <string>start</string>
     </array>
     <key>RunAtLoad</key>
     <true/>

uninstall_darkware.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+echo "Stopping Application..."
+pkill -f "darkware zapret" || true
+
+echo "Unloading LaunchDaemon..."
+sudo launchctl unload /Library/LaunchDaemons/com.darkware.zapret.plist 2>/dev/null || true
+
+echo "Stopping Service..."
+sudo /opt/darkware-zapret/init.d/macos/zapret stop 2>/dev/null || true
+
+echo "Removing Files..."
+rm -rf "/Applications/darkware zapret.app"
+sudo rm -rf /opt/darkware-zapret
+sudo rm -f /Library/LaunchDaemons/com.darkware.zapret.plist
+sudo rm -f /etc/sudoers.d/darkware-zapret
+
+echo "Cleaning Preferences & Logs..."
+defaults delete com.darkware.zapret 2>/dev/null || true
+rm -f /tmp/darkware-zapret.*
+rm -f /tmp/darkware_install.log
+
+echo "✅ System Cleaned Successfully!"

zapret_src/init.d/macos/functions

@@ -15,7 +15,7 @@ IPSET_DIR=$ZAPRET_BASE/ipset
 
 PIDDIR=/var/run
 [ -n "$TPPORT" ] || TPPORT=988
-[ -n "$TPPORT_SOCKS" ] || TPPORT=987
+[ -n "$TPPORT_SOCKS" ] || TPPORT_SOCKS=987
 [ -n "$WS_USER" ] || WS_USER=daemon
 TPWS_WAIT="--bind-wait-ifup=30 --bind-wait-ip=30"
 TPWS_WAIT_SOCKS6="$TPWS_WAIT --bind-wait-ip-linklocal=30"