update: improve module start/stop handling, enhance error reporting, and update filter lists

Author: twoone-3

action.sh

@@ -12,23 +12,42 @@ update_description() {
 }
 
 if [ -f "$PID_FILE" ]; then
-  echo "Stopping AdGuardHome..."
+  echo "trying to stop module"
   if [ "$enable_iptables" = true ]; then
     $SCRIPT_DIR/iptables.sh disable
+    if [ $? -ne 0 ]; then
+      update_description "🔴failed to disable iptables"
+      exit 1
+    fi
   fi
   $SCRIPT_DIR/service.sh stop
-  update_description "🔴AdGuardHome is stopped"
+  if [ $? -ne 0 ]; then
+    update_description "🔴failed to stop bin"
+    exit 1
+  fi
+  echo "module is disabled"
+  update_description "🔴module is disabled"
 else
-  echo "Starting AdGuardHome..."
+  echo "trying to start module"
   $SCRIPT_DIR/service.sh start
+  if [ $? -ne 0 ]; then
+    update_description "🔴failed to start bin"
+    exit 1
+  fi
   if [ "$enable_iptables" = true ]; then
     $SCRIPT_DIR/iptables.sh enable
-    update_description "🟢AdGuardHome is running | iptables is enabled"
+    if [ $? -ne 0 ]; then
+      update_description "🔴failed to enable iptables"
+      exit 1
+    fi
+    echo "iptables is enabled"
+    update_description "🟢bin is running \& iptables is enabled"
   else
-    update_description "🟢AdGuardHome is running | iptables is disabled"
+    echo "iptables is disabled"
+    update_description "🟢bin is running \& iptables is disabled"
   fi
 fi
 
 echo "Waiting for 1 second..."
 echo "Refresh the page to see the changes."
-sleep 1
+sleep 1

bin/data/filters/1732747955.txt

@@ -1,6 +1,4 @@
 ||1010pic.com^
-||16dd-advertise-1252317822.file.myqcloud.com^
-||16dd-advertise-1252317822.image.myqcloud.com^
 ||8le8le.com^
 ||a0.app.xiaomi.com^
 ||aaid.umeng.com^
@@ -92,6 +90,7 @@
 ||adserver.unityads.unity3d.com^
 ||adservice.google.cn^
 ||adservice.google.com^
+||adservice.sigmob.cn^
 ||adserviceretry.kugou.com^
 ||adsfile.bssdlbig.kugou.com^
 ||adsfile.qq.com^
@@ -147,7 +146,6 @@
 ||analysis.yozocloud.cn^
 ||analytics-api.samsunghealthcn.com^
 ||analytics.126.net^
-||analytics.95516.com^
 ||analytics.google.com^
 ||analytics.pinterest.com^
 ||analytics.pointdrive.linkedin.com^
@@ -235,6 +233,7 @@
 ||cdn-ads.oss-cn-shanghai.aliyuncs.com^
 ||cdn-plugin-sync-upgrade-juui.hismarttv.com^
 ||cdn.ad.xiaomi.com^
+||cdn.aiclk.com^
 ||cdn.ynuf.aliapp.org^
 ||cfg.imtt.qq.com^
 ||chat1.jd.com^
@@ -251,6 +250,7 @@
 ||commdata.v.qq.com^
 ||config.chsmarttv.com^
 ||config.unityads.unity3d.com^
+||cpc-service-square.aiclk.com^
 ||cpro.baidustatic.com^
 ||crashlytics.com^
 ||crashlyticsreports-pa.googleapis.com^
@@ -261,6 +261,7 @@
 ||data.mistat.india.xiaomi.com^
 ||data.mistat.rus.xiaomi.com^
 ||data.mistat.xiaomi.com^
+||dc.sigmob.cn^
 ||diagnosis.ad.xiaomi.com^
 ||dig.bdurl.net^
 ||dl.zuimeitianqi.com^
@@ -375,6 +376,7 @@
 ||kl.67it.com^
 ||klink.volceapplog.com^
 ||knicks.jd.com^
+||ks.ferlytc.com^
 ||ks.pull.yximgs.com^
 ||launcher.smart-tv.cn^
 ||launcherimg.smart-tv.cn^
@@ -417,6 +419,7 @@
 ||log.zijieapi.com^
 ||log1.cmpassport.com^
 ||logbak.hicloud.com^
+||logrcv.aiclk.com^
 ||logs.amap.com^
 ||logservice.hicloud.com^
 ||logservice1.hicloud.com^
@@ -444,6 +447,7 @@
 ||mine.baidu.com^
 ||mission-pub.smart-tv.cn^
 ||miui-fxcse.avlyun.com^
+||mmgame.qpic.cn^
 ||mnqlog.ldmnq.com^
 ||mobads-logs.baidu.com^
 ||mobads-pre-config.cdn.bcebos.com^
@@ -476,6 +480,7 @@
 ||open.snssdk.com^
 ||optimus-ads.amap.com^
 ||orbit.jd.com^
+||oss.cdn.aiclk.com^
 ||oth.eve.mdt.qq.com^
 ||oth.str.mdt.qq.com^
 ||otheve.play.aiseet.atianqi.com^
@@ -519,6 +524,7 @@
 ||res2.hubcloud.com.cn^
 ||res3.hubcloud.com.cn^
 ||resolve.umeng.com^
+||rev.aiclk.com^
 ||review.gdtimg.com^
 ||rms-drcn.platform.dbankcloud.cn^
 ||roi.soulapp.cn^
@@ -532,7 +538,6 @@
 ||samsung-com.112.2o7.net^
 ||samsungads.com^
 ||sanme2.taisantech.com^
-||saveu5-normal-lq.zijieapi.com^
 ||scdown.qq.com^
 ||scs.openspeech.cn^
 ||sdk-ab-config.qquanquan.com^
@@ -620,6 +625,7 @@
 ||tnc3-bjlgy.zijieapi.com^
 ||toblog.ctobsnssdk.com^
 ||trace.qq.com^
+||tracelog-debug.aiclk.com^
 ||tracelog-debug.qquanquan.com^
 ||track.lc.quark.cn^
 ||track.uc.cn^
@@ -648,9 +654,11 @@
 ||union.baidu.com^
 ||update.avlyun.sec.miui.com^
 ||update.lejiao.tv^
+||update0.aiclk.com^
 ||upgrade-update.hismarttv.com^
 ||uranus.jd.com^
 ||us.l.qq.com^
+||usr-api.aiclk.com^
 ||v.adintl.cn^
 ||v.adx.hubcloud.com.cn^
 ||v1-ad.video.yximgs.com^
@@ -709,6 +717,7 @@
 ||ws.sj.qq.com^
 ||www42.zskwai.com^
 ||wxa.wxs.qq.com^
+||wxaintpcos.wxqcloud.qq.com.cn^
 ||wximg.wxs.qq.com^
 ||wxsmw.wxs.qq.com^
 ||wxsnsad.tc.qq.com^
@@ -717,7 +726,6 @@
 ||wxsnsdythumb.wxs.qq.com^
 ||xc.gdt.qq.com^
 ||xiaomi-dtv.m.cn.miaozhen.com^
-||xiaoshuo.wtzw.com^
 ||xlivrdr.com^
 ||xlmzc.cnjp-exp.com^
 ||xlog.jd.com^

scripts/inotify.sh

@@ -9,18 +9,29 @@ source "$AGH_DIR/scripts/config.sh"
 
 exec >>$AGH_DIR/agh.log 2>&1
 
-update_description () {
+update_description() {
   sed -i "s/description=\[.*\]/description=\[$1\]/" "$MOD_PATH/module.prop"
 }
 
 if [ "${monitor_file}" = "disable" ]; then
   if [ "${events}" = "d" ]; then
+    echo "trying to stop module"
     $SCRIPT_DIR/service.sh start
+    if [ $? -ne 0 ]; then
+      update_description "🔴failed to start bin"
+      exit 1
+    fi
     if [ "$enable_iptables" = true ]; then
       $SCRIPT_DIR/iptables.sh enable
-      update_description "🟢AdGuardHome is running | iptables is enabled"
+      if [ $? -ne 0 ]; then
+        update_description "🔴failed to enable iptables"
+        exit 1
+      fi
+      echo "iptables is enabled"
+      update_description "🟢bin is running \& iptables is enabled"
     else
-      update_description "🟢AdGuardHome is running | iptables is disabled"
+      echo "iptables is disabled"
+      update_description "🟢bin is running \& iptables is disabled"
     fi
   elif [ "${events}" = "n" ]; then
     if [ "$enable_iptables" = true ]; then
@@ -29,4 +40,4 @@ if [ "${monitor_file}" = "disable" ]; then
     $SCRIPT_DIR/service.sh stop
     update_description "🔴AdGuardHome is stopped"
   fi
-fi
+fi

service.sh

@@ -36,10 +36,11 @@ exec >$AGH_DIR/agh.log 2>&1
         update_description "🔴failed to enable iptables"
         exit 1
       fi
-      update_description "🟢bin is running & iptables is enabled"
+      echo "iptables is enabled"
+      update_description "🟢bin is running \& iptables is enabled"
     else
       echo "iptables is disabled"
-      update_description "🟢bin is running & iptables is disabled"
+      update_description "🟢bin is running \& iptables is disabled"
     fi
   else
     echo "module is disabled"