Sun Jul 25 25:13 WIB 2022

fix: schedule update core

Author: taamarin

scripts/clash.config

@@ -1,5 +1,6 @@
 #!/system/bin/sh
 
+# before editing CLASH.CONFIG turn off CFM first
 # DATE DAY
 date_day=`date`
 date_log="[`date "+%H:%M"`]"
@@ -34,7 +35,7 @@ auto_updateSubcript="false"
 
 # info set interval https://crontab.guru/
 # SET INTERVAL UPDATE 
-update_interval="false"
+update_interval="0 00 * * *"
 
 # URL LANGGANAN CONFIG
 Subcript_url="https://raw.githubusercontent.com/stealth-sr/config/vpn/yamete.yaml"
@@ -47,7 +48,7 @@ else
 fi
 
 # CGROUP UNTUK MEMBATASI PENGGUNAAN MEMORI,
-Cgroup_memory="true"
+Cgroup_memory="false"
 Cgroup_memory_path=""
 Cgroup_memory_limit="20M"
 
@@ -71,6 +72,7 @@ Clash_Premium="/data/clash/core/lib/Clash.Premium"
 Clash_Meta="/data/clash/core/lib/Clash.Meta"
 # DIRECTORY SCRIPTS
 Clash_scripts_dir="/data/clash/scripts"
+
 # CUSTOM CONFIG.YAML
 use_config="false"
 if [ "${use_config}" == "false" ]; then
@@ -88,7 +90,8 @@ system_packages_file="/data/system/packages.list"
 
 # AUTO UPDATE CORE
 schedule_update_core="false"
-url_meta="https://github.com/taamarin/Clash.Meta/releases"
+meta_alpha="false"
+url_meta="https://github.com/MetaCubeX/Clash.Meta/releases"
 url_premium="https://github.com/Dreamacro/clash/releases"
 if [ "${use_premium}" == "false" ]; then
     file_core="Clash.Meta"

scripts/clash.service

@@ -18,7 +18,7 @@ start_clash() {
     fi
 
     echo -n "" > ${CFM_logs_file} && echo "${date_day}" >> ${CFM_logs_file}
-    echo "Clash for Magisk v1.12.8" >> ${CFM_logs_file}
+    echo "Clash for Magisk v1.12.9" >> ${CFM_logs_file}
 
     chmod 0755 /data/clash/core/lib/*
 
@@ -102,7 +102,7 @@ start_clash() {
         sed -i 's/listen:.*/listen: ""/' /data/clash/template
         sed -i 's/tproxy-port:.*/tproxy-port: 0/' /data/clash/template
     else
-        echo $date_log"info: using [proxy] mode." >> ${CFM_logs_file}
+        echo $date_log"info: using [tproxy] mode." >> ${CFM_logs_file}
         sed -i 's/listen:.*/listen: 0.0.0.0:1053/' /data/clash/template
         sed -i 's/tproxy-port:.*/tproxy-port: 9898/' /data/clash/template
     fi
@@ -147,14 +147,14 @@ start_clash() {
         chmod 0700 /data/clash/run/root
 
         if [ ! "${schedule_update_core}" == "false" ]; then
-            echo "${schedule_schedule_update_core} ${scripts_dir}/clash.tool -e" > ${Clash_run_path}/root \
-            && echo $date_log"info: schedule Update Core (${schedule_schedule_update_core})" >> ${CFM_logs_file}
+            echo "${schedule_update_core} ${scripts_dir}/clash.tool -e" > ${Clash_run_path}/root \
+            && echo $date_log"info: schedule Update Core (${schedule_update_core})" >> ${CFM_logs_file}
         else
             echo $date_log"info: schedule Update Core not active." >> ${CFM_logs_file}
         fi
 
         if [ ! "${update_interval}" == "false" ]; then
-            echo "${update_interval} ${scripts_dir}/clash.tool -u" > ${Clash_run_path}/root \
+            echo "${update_interval} ${scripts_dir}/clash.tool -u" >> ${Clash_run_path}/root \
             && echo $date_log"info: schedule Update GeoX & SubScription (${update_interval})." >> ${CFM_logs_file}
             echo $date_log"info: Geo status: [${auto_updateGeoX}] | Subs status: (${auto_updateSubcript})." >> ${CFM_logs_file}
         else

scripts/clash.tool

@@ -282,12 +282,18 @@ i=0
 
 update_core() {
     if [ "${use_premium}" == "false" ]; then
-        tag_meta=$(curl -fsSL ${url_meta} | grep -oE "v[0-9]+\.[0-9]+\.[0-9]+" | head -1)
-        filename="${file_core}-${platform}-${arch}-${tag_meta}"
-        update_file /data/clash/${file_core}.gz ${url_meta}/download/${tag_meta}/${filename}.gz >> /data/clash/run/UpCore.log
+        if [ "${meta_alpha}" == "false" ]; then
+            tag_meta=$(curl -fsSL ${url_meta} | grep -oE "v[0-9]+\.[0-9]+\.[0-9]+" | head -1)
+            filename="${file_core}-${platform}-${arch}-${tag_meta}"
+            update_file /data/clash/${file_core}.gz ${url_meta}/download/${tag_meta}/${filename}.gz > ${CFM_logs_file}
+        else
+            tag_meta=$(curl -fsSL ${url_meta} | grep -oE "alpha-[a-z,0-9]+" | head -1)
+            filename="${file_core}-${platform}-${arch}-${tag_meta}"
+            update_file /data/clash/${file_core}.gz ${url_meta}/download/Prerelease-Alpha/${filename}.gz > ${CFM_logs_file}
+        fi
     else
         filename=$(curl -fsSL "$url_premium/tag/premium" | grep -oE "clash-${platform}-${arch}-[0-9]+.[0-9]+.[0-9]+" | head -1)
-        update_file /data/clash/"${file_core}".gz ${url_premium}/download/premium/${filename}.gz >> /data/clash/run/UpCore.log
+        update_file /data/clash/"${file_core}".gz ${url_premium}/download/premium/${filename}.gz > ${CFM_logs_file}
     fi
 
     if (gunzip --help > /dev/null 2>&1) ; then
@@ -300,7 +306,11 @@ update_core() {
                     rm -rf /data/clash/"${file_core}".gz.bak
                 else
                     rm -rf /data/clash/"${file_core}".gz
-                fi                    
+                fi
+                if [ -f /data/clash/run/clash.pid ]; then
+                    echo $date_log"info: Clash service is running (PID: `cat ${Clash_pid_file}`)" >> ${CFM_logs_file}
+                    echo $date_log"info: Connect" >> ${CFM_logs_file}
+                fi
                 exit 1
             fi
         else
@@ -387,7 +397,6 @@ while getopts ":afklmupoxced" signal ; do
             ;;
         e)
             echo "proses download"
-            echo -n > /data/clash/run/UpCore.log
             update_core
             ;;
         d)

scripts/template

@@ -7,7 +7,7 @@ ipv6: false
 geodata-mode: true
 external-controller: 0.0.0.0:9090
 external-ui: dashboard/dist
-tcp-concurrent: true
+tcp-concurrent: false
 interface-name: ""
 enable-process: false
 geodata-loader: memconservative
@@ -16,14 +16,13 @@ secret: ""
 profile:
   store-selected: true
   store-fake-ip: false
-geox-url: {mmdb: "https://cdn.jsdelivr.net/gh/Dreamacro/maxmind-geoip@release/Country.mmdb", geoip: "https://github.com/v2fly/geoip/raw/release/cn.dat", geosite: "https://github.com/taamarin/v2ray-rules-dat/raw/release/geosite.dat"}
+# geox-url: {mmdb: "https://cdn.jsdelivr.net/gh/Dreamacro/maxmind-geoip@release/Country.mmdb", geoip: "https://github.com/v2fly/geoip/raw/release/cn.dat", geosite: "https://github.com/taamarin/v2ray-rules-dat/raw/release/geosite.dat"}
 # experimental:
-#  fingerprints:
-#    - "8F111FA9AD3CD8E917A118522CAC39EA33741B3BBE73F91CECE548D5CCB0E5E8"
+  # fingerprint: xxxx # 同 experimental.fingerprints 使用 sha256 指纹，配置协议独立的指纹，将忽略 experimental.fingerprints
 dns:
   enable: true
   device: Meta
-  ipv6: false
+  ipv6: true
   prefer-h3: false #start DOH to use http/3 first
   default-nameserver:
     - 1.1.1.1
@@ -34,9 +33,10 @@ dns:
   fake-ip-range: 198.18.0.1/16
   fake-ip-filter: ['networktest.twilio.com', '+.twilio.com', 'connect.rom.miui.com', '+.msftnsci.com', '+.msftconnecttest.com', '+.gstatic.com', '+.stun.*.*', '+.stun.*.*.*', '+.stun.*.*.*.*', '+.time.*', '+.time.*.*', '+.time.*.*.*', '+.ntp.*', '+.ntp.*.*', '+.ntp.*.*.*']
   nameserver:
+    - 172.67.199.34 ## GANTI BUG YG KALIAN GUNAKAN 
+    - https://1.1.1.1/dns-query
     - tls://dns.quad9.net
     - quic://dns.adguard.com
-    - https://1.1.1.1/dns-query
 #  proxy-server-nameserver:
 #    - 172.67.199.34
 #  fallback:
@@ -50,6 +50,7 @@ dns:
 #    ipcidr:
 #      - 0.0.0.0/32
 #    domain: ['+.google.com', '+.facebook.com', '+.youtube.com', '+.githubusercontent.com', '+.googlevideo.com', '+.msftconnecttest.com', '+.msftncsi.com', 'msftconnecttest.com', 'msftncsi.com']
+# feature CLASH PREMIUM 
 # auto-redir:
 #  enable: false
 #  auto-route: false
@@ -68,4 +69,4 @@ sniffer:
   port-whitelist: ['443', '80']
 hosts:
   'cacerts.digicert.com': 172.67.199.34
-tproxy-port: 9898
+tproxy-port: 9898