update: v1.06.2308310-1

5 files changed, 82 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b6a4b03de095..1ecba0c1f3ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wechat-devtools
 	pkgdesc = WeChat Devtools For Linux.
-	pkgver = 1.06.2209070
+	pkgver = 1.06.2308310
 	pkgrel = 1
 	epoch = 2
 	url = https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html
@@ -17,9 +17,9 @@ pkgbase = wechat-devtools
 	depends = libxkbfile
 	options = !strip
 	source = nwjs-v0.55.0.tar.gz::https://npm.taobao.org/mirrors/nwjs/v0.55.0/nwjs-sdk-v0.55.0-linux-x64.tar.gz
-	source = wechat_devtools_1.06.2209070_x64.exe::https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1062209070&version_type=1
+	source = wechat_devtools_1.06.2308310_x64.exe::https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1062308310&version_type=1
 	source = node-v16.4.2.tar.gz::https://npm.taobao.org/mirrors/node/v16.4.2/node-v16.4.2-linux-x64.tar.gz
-	source = compiler-v1.06.2209070-1.tar.gz::https://github.com/msojocs/wechat-web-devtools-linux/releases/download/v1.06.2209070-1/compiler.tar.gz
+	source = compiler-v1.06.2308310-1.tar.gz::https://github.com/msojocs/wechat-web-devtools-linux/releases/download/v1.06.2308310-1/compiler.tar.gz
 	source = wechat-devtools.desktop
 	source = logo.svg
 	source = wechat-devtools
@@ -33,20 +33,20 @@ pkgbase = wechat-devtools
 	source = wxvpkg_unpack.js
 	source = fix-other.sh
 	md5sums = ac7680788544c457daee11aaf69798fe
-	md5sums = 8c6be639c117f8c8e6493d335bb17eee
+	md5sums = 2e73b7fc2eb617b4a745c35e4fd63133
 	md5sums = 4d14589085ebbf79ce504dc27330d33b
-	md5sums = d50fc9dd35f3ae2887e5b434dd248e7e
+	md5sums = SKIP
 	md5sums = 4d3f5273be80a74741c841fcfa4185d3
 	md5sums = 0f4353664123320280ea4d6bb295dce2
-	md5sums = ae685283b21becd9c097aca4571f7556
-	md5sums = 912b5948dc8a968e1b53390173c9d363
-	md5sums = 951538b31000bf541446502069dcd92f
-	md5sums = 468facecd8c3a4fbf4da03b5ceae1320
-	md5sums = e7735636b20240bcb1d61c1ac0085643
-	md5sums = 8adadb9176aed175d85f271929e0055c
-	md5sums = d43f68ce696b5dad3ea4e7ff89b9d4ad
-	md5sums = 38f8ed65b632c50ee5cef1231984f224
-	md5sums = 005ce9329dfbd97106daab0f2ca4a90e
-	md5sums = 5b24e5f379987f008bacda92d77fb2c8
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = wechat-devtools
diff --git a/PKGBUILD b/PKGBUILD
index 959c5f1bd79c..a8254aaa4d38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,11 +7,11 @@
 # https://github.com/dragonation/wechat-devtools
 # https://github.com/cytle/wechat_web_devtools
 
-_wechat_devtools_ver="1.06.2209070"
+_wechat_devtools_ver="1.06.2308310"
 # https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1052203030&version_type=1
 _wechat_devtools_url="https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=${_wechat_devtools_ver//\./}&version_type=1"
 # _wechat_devtools_url="https://dldir1.qq.com/WechatWebDev/release/p-ae42ee2cde4d42ee80ac60b35f183a99/wechat_devtools_1.05.2201240_x64.exe"
-_wechat_devtools_md5="0073a70263614777fc41f21afbfc377d"
+_wechat_devtools_md5="2e73b7fc2eb617b4a745c35e4fd63133"
 
 _wechat_devtools_exe="wechat_devtools_${_wechat_devtools_ver}_x64.exe"
 _nwjs_ver="0.55.0"
@@ -46,17 +46,17 @@ source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs
         "wxvpkg_unpack.js"
         "fix-other.sh")
 md5sums=('ac7680788544c457daee11aaf69798fe'
-         '8c6be639c117f8c8e6493d335bb17eee'
+         '2e73b7fc2eb617b4a745c35e4fd63133'
          '4d14589085ebbf79ce504dc27330d33b'
-         'd50fc9dd35f3ae2887e5b434dd248e7e'
+         'ffa370a96aca134ea7a2c2d5d658b561'
          '4d3f5273be80a74741c841fcfa4185d3'
          '0f4353664123320280ea4d6bb295dce2'
          'ae685283b21becd9c097aca4571f7556'
          '912b5948dc8a968e1b53390173c9d363'
          '951538b31000bf541446502069dcd92f'
-         '468facecd8c3a4fbf4da03b5ceae1320'
-         'e7735636b20240bcb1d61c1ac0085643'
-         '8adadb9176aed175d85f271929e0055c'
+         'b4cab718cc7a9181c776eab8bf932df4'
+         'ae62f9e78e4a3d0addb3c55c34333b87'
+         'd39251e3b81e7e48506d0a8211a2c5d3'
          'd43f68ce696b5dad3ea4e7ff89b9d4ad'
          '38f8ed65b632c50ee5cef1231984f224'
          '005ce9329dfbd97106daab0f2ca4a90e'
diff --git a/fix-core.sh b/fix-core.sh
index 6a547df81e41..daa1808d2832 100755
--- a/fix-core.sh
+++ b/fix-core.sh
@@ -1,18 +1,21 @@
 #!/bin/bash
 root_dir=$(cd `dirname $0`/.. && pwd -P)
-set -e
-trap 'catchError $LINENO "$BASH_COMMAND"' ERR # 捕获错误情况
-catchError() {
-    exit_code=$?
-    if [ $exit_code -ne 0 ]; then
-        fail "\033[31mcommand: $2\n  at $0:$1\n  at $STEP\033[0m"
-    fi
-    exit $exit_code
-}
+# set -e
+# trap 'catchError $LINENO "$BASH_COMMAND"' ERR # 捕获错误情况
+# catchError() {
+#     exit_code=$?
+#     if [ $exit_code -ne 0 ]; then
+#         fail "\033[31mcommand: $2\n  at $0:$1\n  at $STEP\033[0m"
+#     fi
+#     exit $exit_code
+# }
 
 notice() {
     echo -e "\033[36m $1 \033[0m "
 }
+warn() {
+    echo -e "\033[43;37m 警告 \033[0m $1"
+}
 fail() {
     echo -e "\033[41;37m 失败 \033[0m $1"
 }
@@ -41,6 +44,8 @@ if [[ ! -z $open_find_result ]];then
   # replace
   new_cb_handle="this.props.onWindowOpenFail());Object.keys(window).forEach(key=>{if(!e.window[key]){try{e.window[key]=window[key];}catch(e){console.error(e);}}});"
   sed -i "s/this.props.onWindowOpenFail());/$new_cb_handle/g" $open_find_result
+else
+  warn "云开发控制台启动点未找到"
 fi
 
 token_find_result=$( grep -lr "constructor(){this._sessionToken=\"\",this._tokenMap={}}" "$tmp_dir/core.wxvpkg" )
@@ -48,6 +53,8 @@ echo "WebSocket token存储对象位置: $token_find_result"
 if [[ ! -z $token_find_result ]];then
   new_constructor="constructor(){if(window.tokenData){/*有就直接用*/this._sessionToken=window.tokenData._sessionToken;this._tokenMap=window.tokenData._tokenMap;}else{/*没有就新建*/this._sessionToken=\"\",this._tokenMap={};window.tokenData=this;/*新建完要给中间人*/}}"
   sed -i "s#constructor(){this._sessionToken=\"\",this._tokenMap={}}#$new_constructor#g" "$token_find_result"
+else
+  warn "WebSocket token存储对象位置未找到"
 fi
 
 # open -a Terminal "`pwd`" --> gnome-terminal
@@ -57,6 +64,8 @@ echo "Terminal启动位置: $find_result"
 if [[ ! -z $find_result ]];then
   new_str="gnome-terminal"
   sed -i "s#open -a Terminal \"\`pwd\`\"#$new_str#g" "$find_result"
+else
+  warn "Terminal启动位置未找到"
 fi
 
 # wcc、wcsc处理，设置WINE=fasle环境变量生效
@@ -80,6 +89,8 @@ if [[ "$WINE" != 'true' ]];then
     sed -i "s#wcc\\.exe#wcc#g" "$find_result"
     sed -i "s#wcsc\\.exe#wcsc#g" "$find_result"
     sed -i "s#code/package.nw#package.nw#g" "$find_result"
+  else
+    warn "wcc位置未找到"
   fi
   # 处理报错时控制台显示的环境
   find_result=$( grep -lr '(env:' "$tmp_dir/core.wxvpkg" )
@@ -88,6 +99,8 @@ if [[ "$WINE" != 'true' ]];then
     for file in $find_result; do
       sed -i 's#"Windows"#"Linux"#g' "$file"
     done
+  else
+    warn "Windows字符串位置未找到"
   fi
 
   current=`date "+%Y-%m-%d %H:%M:%S"`
@@ -108,6 +121,8 @@ if [[ -n $find_result ]];then
   sed -i 's/mediaQuery.matches/isDark/' $find_result
   # add functions
   sed -i 's#}getDefaultTheme#}get isDark(){try{const{DESKTOP_SESSION}=process.env;console.log(DESKTOP_SESSION);let theme="";switch(DESKTOP_SESSION){case"deepin":theme=execSync(`gsettings get com.deepin.dde.appearance gtk-theme`);break;case"gnome":case"gnome-classic":theme=execSync(`gsettings get org.gnome.desktop.interface ${this.gnomeScheme}`);break;default:break}return theme.includes("dark");}catch(err){console.error("尝试获取主题信息失败，使用默认暗色",err);return true;}}get gnomeScheme(){try{const gnomeVersion=execSync(`gnome-shell --version`).toString().replace(/[\\r\\n]/g,"").split(" ");const gnomeVersionNum=gnomeVersion.length==3?Number(gnomeVersion[2]):0;return gnomeVersionNum>=42?"color-scheme":"gtk-theme";}catch(err){console.error("检查gnome版本失败, 使用gtk-theme", err);return "gtk-theme";}}monitorTheme(){try{let monitor=null;const{DESKTOP_SESSION}=process.env;switch(DESKTOP_SESSION){case"deepin":monitor=spawn("gsettings",["monitor","com.deepin.dde.appearance","gtk-theme",]);break;case"gnome":case"gnome-classic":monitor=spawn("gsettings",["monitor","org.gnome.desktop.interface",this.gnomeScheme,]);break;default:console.warn(`NOT SUPPORTED!!!DESKTOP_SESSION:${DESKTOP_SESSION}`);break}monitor\&\&monitor.on("error",(err)=>{console.error("monitorTheme",err)});monitor\&\&monitor.stdout.on("data",e.debounce((chunk)=>{const data=chunk.toString();const t=data.toLowerCase().includes("dark");(this._theme=t?i.Dark:i.Light),this._onDidThemeChange.fire(this._theme)},400));process.on("SIGTERM",(signal)=>{monitor.kill(signal);});}catch(err){console.error("尝试监听主题失败！", err);}}getDefaultTheme#' $find_result
+else
+  warn "theme位置未找到"
 fi
 
 # fix update check
@@ -118,6 +133,6 @@ grep -lr "t=>{R(\"new_version_hint" "$find_result"
 sed -i 's#t=>{R("new_version_hint#t=>{const keys = ["shareData", "windowMap", "isSimple","masterProxyPort", "proxyPort", "masterH2ProxyPort", "h2ProxyPort"];for(let k of keys)t.window.global[k] = global[k];R("new_version_hint#' $find_result
 
 # pack 路径 到 文件
-echo "pack"
+notice "pack"
 node "$pack_script" "$tmp_dir/core.wxvpkg" "$package_dir/core.wxvpkg"
-rm -rf "$tmp_dir/core.wxvpkg"
+rm -rf "$tmp_dir/core.wxvpkg"
\ No newline at end of file
diff --git a/fix-menu.sh b/fix-menu.sh
index 9adcfdd92214..34e352f13937 100755
--- a/fix-menu.sh
+++ b/fix-menu.sh
@@ -3,6 +3,9 @@
 
 set -e
 
+warn() {
+    echo -e "\033[43;37m 警告 \033[0m $1"
+}
 root_dir=$(cd `dirname $0`/.. && pwd -P)
 NW_PACKAGE_DIR="$root_dir/package.nw"
 
@@ -15,8 +18,8 @@ if [ ! -f "$target_file" ]; then
 fi
 # 判断匹配函数，匹配函数不为0，则包含给定字符
 if [ `grep -c "patch wechat devtools begin" $target_file` -ne '0' ];then
-    echo -e "\e[1;31m$target_file seems to have been modified\e[0m" >&2
-    exit 1
+    warn "$target_file seems to have been modified"
+    exit 0
 fi
 
 tmp_file=$(mktemp)
@@ -127,4 +130,4 @@ EOF
 cat "$target_file" >> "$tmp_file"
 
 cat "$tmp_file" > "$target_file"
-rm "$tmp_file"
+rm "$tmp_file"
\ No newline at end of file
diff --git a/rebuild-node-modules.sh b/rebuild-node-modules.sh
index 62c651e91bd6..2d3394f78465 100755
--- a/rebuild-node-modules.sh
+++ b/rebuild-node-modules.sh
@@ -8,6 +8,10 @@ notice() {
     echo -e "\033[36m $1 \033[0m "
 }
 
+fail() {
+    echo -e "\033[41;37m 失败 \033[0m $1"
+}
+
 root_dir=$(cd `dirname $0`/.. && pwd -P)
 package_dir="$root_dir/package.nw"
 export PATH="$root_dir/node/bin:$PATH"
@@ -22,7 +26,7 @@ fi
 
 PY_VERSION=`python -V 2>&1|awk '{print $2}'|awk -F '.' '{print $1}'`
 if [ $PY_VERSION != 2 ]; then
-  hash python2 2>/dev/null || { echo >&2 "I require python2 but it's not installed.  Aborting."; exit 1; }
+  hash python2 2>/dev/null || { fail "I require python2 but it's not installed.  Aborting."; exit 1; }
   ln -s "$( which python2 )" "$root_dir/node/bin/python"
 fi
 
@@ -41,7 +45,9 @@ python3 --version
 
 # these modules are only available in windows
 cd "${package_dir}/node_modules" && \
-rm -fr "vscode-windows-ca-certs" "vscode-windows-registry" "vscode-windows-registry-node" "windows-process-tree"
+rm -fr "vscode-windows-ca-certs" \
+"vscode-windows-registry" "vscode-windows-registry-node" "windows-process-tree" \
+"node-pty" "node-pty-node"
 
 rm -fr "${package_dir}/node_modules/vscode-ripgrep/bin/"* # redownload bin on linux
 # https://github.com/microsoft/ripgrep-prebuilt
@@ -52,8 +58,19 @@ mkdir -p tmp && cd tmp
 #     notice "非ACTION模式, 设置镜像源"
 #     export https_proxy="http://127.0.0.1:7890"
 # fi
-wget https://github.com/microsoft/ripgrep-prebuilt/releases/download/v12.1.1-1/ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz -O ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz
-tar xvf ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz -C ../bin && \
+
+# ripgrep版本
+ripgrep_version="12.1.1-1"
+# ripgrep路径
+ripgrep_path="$root_dir/cache/ripgrep-v${ripgrep_version}-x86_64-unknown-linux-musl.tar.gz"
+mkdir -p "$root_dir/cache"
+# 文件不存在，下载
+if [ ! -f "$ripgrep_path" ];then
+  wget https://github.com/microsoft/ripgrep-prebuilt/releases/download/v12.1.1-1/ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz \
+  -O "${ripgrep_path}.tmp"
+  mv "${ripgrep_path}.tmp" "${ripgrep_path}"
+fi
+tar xvf "$ripgrep_path" -C ../bin && \
 cd .. && rm -rf tmp
 
 (cd "${package_dir}/node_modules" && \
@@ -71,7 +88,7 @@ export JOBS=$max_thread
 (cd "${package_dir}/node_modules_tmp" && npm install \
     extract-file-icon \
     native-keymap \
-    node-pty \
+    node-pty@1.0.0 \
     native-watchdog \
     oniguruma \
     spdlog@0.11.1 \
@@ -86,6 +103,10 @@ notice "rebuild node-pty"
 cd "$package_dir/node_modules_tmp/node_modules" && \
 cp -fr "node-pty" "node-pty-node" && \
 cd "node-pty" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" --dist-url=https://registry.npmmirror.com/-/binary/nwjs
+mkdir -p "$package_dir/node_modules/node-pty/build/Release" && \
+cp -rf "$package_dir/node_modules_tmp/node_modules/node-pty/lib" "$package_dir/node_modules/node-pty/lib" && \
+cp -rf "$package_dir/node_modules_tmp/node_modules/node-pty/package.json" "$package_dir/node_modules/node-pty/package.json" && \
+cp -rf "$package_dir/node_modules/node-pty" "$package_dir/node_modules/node-pty-node"
 
 notice "rebuild native-watchdog"
 cd "$package_dir/node_modules_tmp/node_modules/native-watchdog" && \
@@ -112,8 +133,9 @@ find -name "*.a" -delete && \
 find -name "*.lib" -delete && \
 find -name "*.mk" -delete)
 
+# TODO: 检查路径包含空格时，是否正常
 notice "copy node files"
 (cd "${package_dir}/node_modules_tmp/node_modules" && \
 find -name "*.node" | xargs -I{} \cp -rf {} ${package_dir}/node_modules/{})
 
-rm -rf "${package_dir}/node_modules_tmp"
+rm -rf "${package_dir}/node_modules_tmp"
\ No newline at end of file