update: devtools to v1.06.2207210

6 files changed, 69 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6dd35f4e3aa2..3bbae95fc34f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wechat-devtools
 	pkgdesc = WeChat Devtools For Linux.
-	pkgver = 1.06.2206090
+	pkgver = 1.06.2207210
 	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.2206090_x64.exe::https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1062206090&version_type=1
+	source = wechat_devtools_1.06.2207210_x64.exe::https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1062207210&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.2206090-1.tar.gz::https://github.com/msojocs/wechat-web-devtools-linux/releases/download/v1.06.2206090-1/compiler.tar.gz
+	source = compiler-v1.06.2207210-1.tar.gz::https://github.com/msojocs/wechat-web-devtools-linux/releases/download/v1.06.2207210-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 = a2e0e0826571daeab239755d5b3347e5
+	md5sums = 7599cfeeebb57bda7ae5594daf2e0659
 	md5sums = 4d14589085ebbf79ce504dc27330d33b
-	md5sums = 2b90ce6acba9778b94c4e085e1c5ca12
+	md5sums = 807f1ebc16e344386c723a25fdb2276e
 	md5sums = 4d3f5273be80a74741c841fcfa4185d3
 	md5sums = 0f4353664123320280ea4d6bb295dce2
 	md5sums = ae685283b21becd9c097aca4571f7556
 	md5sums = 912b5948dc8a968e1b53390173c9d363
 	md5sums = 951538b31000bf541446502069dcd92f
 	md5sums = 468facecd8c3a4fbf4da03b5ceae1320
-	md5sums = 1c33cf717c99e4c8625e238ad31a7d95
-	md5sums = 03cdaa275789ea5143574f52a7be01c6
+	md5sums = e7735636b20240bcb1d61c1ac0085643
+	md5sums = 8adadb9176aed175d85f271929e0055c
 	md5sums = d43f68ce696b5dad3ea4e7ff89b9d4ad
 	md5sums = 38f8ed65b632c50ee5cef1231984f224
-	md5sums = 66b98acbdfcaa249082d526ccac8e7d8
-	md5sums = 122556d1d021adb3094d38ff1d999b0a
+	md5sums = 005ce9329dfbd97106daab0f2ca4a90e
+	md5sums = 5b24e5f379987f008bacda92d77fb2c8
 
 pkgname = wechat-devtools
diff --git a/PKGBUILD b/PKGBUILD
index 8e8a14c7625b..6b450125aa1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 # https://github.com/dragonation/wechat-devtools
 # https://github.com/cytle/wechat_web_devtools
 
-_wechat_devtools_ver="1.06.2206090"
+_wechat_devtools_ver="1.06.2207210"
 # 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"
@@ -46,21 +46,21 @@ source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs
         "wxvpkg_unpack.js"
         "fix-other.sh")
 md5sums=('ac7680788544c457daee11aaf69798fe'
-         'a2e0e0826571daeab239755d5b3347e5'
+         '7599cfeeebb57bda7ae5594daf2e0659'
          '4d14589085ebbf79ce504dc27330d33b'
-         '2b90ce6acba9778b94c4e085e1c5ca12'
+         '807f1ebc16e344386c723a25fdb2276e'
          '4d3f5273be80a74741c841fcfa4185d3'
          '0f4353664123320280ea4d6bb295dce2'
          'ae685283b21becd9c097aca4571f7556'
          '912b5948dc8a968e1b53390173c9d363'
          '951538b31000bf541446502069dcd92f'
          '468facecd8c3a4fbf4da03b5ceae1320'
-         '1c33cf717c99e4c8625e238ad31a7d95'
-         '03cdaa275789ea5143574f52a7be01c6'
+         'e7735636b20240bcb1d61c1ac0085643'
+         '8adadb9176aed175d85f271929e0055c'
          'd43f68ce696b5dad3ea4e7ff89b9d4ad'
          '38f8ed65b632c50ee5cef1231984f224'
-         '66b98acbdfcaa249082d526ccac8e7d8'
-         '122556d1d021adb3094d38ff1d999b0a')
+         '005ce9329dfbd97106daab0f2ca4a90e'
+         '5b24e5f379987f008bacda92d77fb2c8')
 options=('!strip')
 
 prepare() {
@@ -120,7 +120,7 @@ package() {
     find ./package.nw -type d | xargs -I {} chmod -R a+rx {}
 
     cp ${srcdir}/node.${_node_version} nwjs/node
-    cd nwjs && ln -s node node.exe
+    cd nwjs && ln -s node node.exe && ln -s ../package.nw package.nw
 
     install -Dm755 "${srcdir}/wechat-devtools" "${pkgdir}${_install_dir}/bin/wechat-devtools"
     install -Dm755 "${srcdir}/wechat-devtools-cli" "${pkgdir}${_install_dir}/bin/wechat-devtools-cli"
diff --git a/fix-core.sh b/fix-core.sh
index 6338d86b6ffb..6a547df81e41 100755
--- a/fix-core.sh
+++ b/fix-core.sh
@@ -1,5 +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
+}
+
+notice() {
+    echo -e "\033[36m $1 \033[0m "
+}
+fail() {
+    echo -e "\033[41;37m 失败 \033[0m $1"
+}
 
 package_dir="$root_dir/package.nw"
 tmp_dir="$root_dir/tmp/core"
@@ -35,6 +51,7 @@ if [[ ! -z $token_find_result ]];then
 fi
 
 # open -a Terminal "`pwd`" --> gnome-terminal
+notice "fix terminal"
 find_result=$( grep -lr 'open -a Terminal "`pwd`"' "$tmp_dir/core.wxvpkg" )
 echo "Terminal启动位置: $find_result"
 if [[ ! -z $find_result ]];then
@@ -45,23 +62,24 @@ fi
 # wcc、wcsc处理，设置WINE=fasle环境变量生效
 if [[ "$WINE" != 'true' ]];then
   # "wcc.exe":!0,"wcsc.exe":!0
-  find_result=$( grep -lr '{wcc:!0,wcsc:!0}' "$tmp_dir/core.wxvpkg" )
+  find_result=$( grep -lr 'wcc-exec' "$tmp_dir/core.wxvpkg" )
   echo "wcc: $find_result"
   if [[ ! -z $find_result ]];then
-    new_str='{"wcc.bin":!0,"wcsc.bin":!0,wcc:!0,wcsc:!0}'
-    sed -i "s#{wcc:!0,wcsc:!0}#$new_str#g" "$find_result"
-    new_str='"linux"===process.platform'
-    sed -i "s#\"darwin\"===process.platform#$new_str#g" "$find_result"
+    # new_str='{"wcc.bin":!0,"wcsc.bin":!0,wcc:!0,wcsc:!0}'
+    # sed -i "s#{wcc:!0,wcsc:!0}#$new_str#g" "$find_result"
+    # new_str='"linux"===process.platform'
+    # sed -i "s#\"darwin\"===process.platform#$new_str#g" "$find_result"
     
-    return_exp_wcc=$(cat $find_result | grep -P 'return [a-z]+\("wcc"\)' -o)  # return ?("wcc")
-    return_exp_wcc_replace="${return_exp_wcc//wcc/wcc.bin}" # return ?("wcc.bin")
-    return_exp_wcc_replace="${return_exp_wcc//return /${return_exp_wcc_replace},}" # return ?("wcc.bin")
+    # return_exp_wcc=$(cat $find_result | grep -P 'return [a-z]+\("wcc"\)' -o)  # return ?("wcc")
+    # return_exp_wcc_replace="${return_exp_wcc//wcc/wcc.bin}" # return ?("wcc.bin")
+    # return_exp_wcc_replace="${return_exp_wcc//return /${return_exp_wcc_replace},}" # return ?("wcc.bin")
 
-    return_exp_wcsc=$(cat $find_result | grep -P 'return [a-z]+\("wcsc"\)' -o)  # return ?("wcsc")
-    return_exp_wcsc_replace="${return_exp_wcc_replace//wcc/wcsc}"
+    # return_exp_wcsc=$(cat $find_result | grep -P 'return [a-z]+\("wcsc"\)' -o)  # return ?("wcsc")
+    # return_exp_wcsc_replace="${return_exp_wcc_replace//wcc/wcsc}"
 
-    sed -i "s#$return_exp_wcc#$return_exp_wcc_replace#g" "$find_result"
-    sed -i "s#$return_exp_wcsc#$return_exp_wcsc_replace#g" "$find_result"
+    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"
   fi
   # 处理报错时控制台显示的环境
   find_result=$( grep -lr '(env:' "$tmp_dir/core.wxvpkg" )
@@ -78,6 +96,7 @@ if [[ "$WINE" != 'true' ]];then
 fi
 
 # fix theme
+notice "fix theme"
 find_result=$( grep -lr "OSThemeController=" "$tmp_dir/core.wxvpkg" )
 echo "theme: $find_result"
 if [[ -n $find_result ]];then
@@ -92,8 +111,11 @@ if [[ -n $find_result ]];then
 fi
 
 # fix update check
+notice "fix update check"
+sed -i 's#</body><script src=../js/core#</body><script src="../js/unpack/hackrequire/index.js"></script><script src=../js/core#' "$package_dir/html/whatsnew.html"
 find_result=$( grep -lr "whatsnew.html" "$tmp_dir/core.wxvpkg" )
-sed -i 's#t=>{W("new_version_hint#t=>{t.window.global.shareData=global.shareData;t.window.global.windowMap=global.windowMap;W("new_version_hint#' $find_result
+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"
diff --git a/fix-other.sh b/fix-other.sh
index 3f87583a5915..023fa41b8ab8 100755
--- a/fix-other.sh
+++ b/fix-other.sh
@@ -26,10 +26,10 @@ ls -l "${srcdir}/compiler"
 # 预览编译，设置 WINE!=true 环境变量生效
 # 如果是mac执行wcc,否则wcc.exe
 if [[ "$WINE" != 'true' ]];then
-  \cp -rf "${srcdir}/compiler/generatemd5.js" "${package_dir}/js/vendor/generatemd5.js"
-  \cp "${srcdir}/compiler/nodejs"/* "${package_dir}/js/vendor"
-  cd "${package_dir}/js/vendor" && chmod 0755 wcc wcsc wcc.bin wcsc.bin
-  node "${package_dir}/js/vendor/generatemd5.js"
+  # \cp -rf "${srcdir}/compiler/generatemd5.js" "${package_dir}/js/vendor/generatemd5.js"
+  \cp "${srcdir}/compiler/nodejs"/* "${package_dir}/node_modules/wcc-exec"
+  cd "${package_dir}/node_modules/wcc-exec" && chmod 0755 wcc wcsc wcc.bin wcsc.bin
+  # node "${package_dir}/js/vendor/generatemd5.js"
 
   current=`date "+%Y-%m-%d %H:%M:%S"`
   timeStamp=`date -d "$current" +%s`
diff --git a/rebuild-node-modules.sh b/rebuild-node-modules.sh
index b92df6ff1f74..62c651e91bd6 100755
--- a/rebuild-node-modules.sh
+++ b/rebuild-node-modules.sh
@@ -48,6 +48,10 @@ rm -fr "${package_dir}/node_modules/vscode-ripgrep/bin/"* # redownload bin on li
 cd "${package_dir}/node_modules/vscode-ripgrep" && \
 mkdir -p tmp && cd tmp
 
+# if [ "$ACTION_MODE" != "true" ]; then
+#     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 && \
 cd .. && rm -rf tmp
@@ -55,7 +59,7 @@ cd .. && rm -rf tmp
 (cd "${package_dir}/node_modules" && \
 find -name *.pdb | xargs -I{} rm -rf {} && \
 find -name *.lib | xargs -I{} rm -rf {} && \
-find -name *.exe | xargs -I{} rm -rf {} && \
+# find -name *.exe | xargs -I{} rm -rf {} && \
 find -name *.dll | xargs -I{} rm -rf {}) # remove pdb debugging file
 
 rm -fr "${package_dir}/node_modules_tmp" # remove previous hacking tmp 
diff --git a/wxvpkg_unpack.js b/wxvpkg_unpack.js
index 561a86e4fdd2..a8d773c68c7e 100755
--- a/wxvpkg_unpack.js
+++ b/wxvpkg_unpack.js
@@ -1,5 +1,12 @@
 #!/usr/bin/env node
 // Extract core.wxvpkg of current folder to dest folder
+/**
+ * 使用：
+ * 两个参数
+ * uppack.js from to
+ * from: pkg文件
+ * to: 目标文件夹
+ */
 const path = require('path')
 const fs = require('fs')
 
@@ -20,6 +27,7 @@ function readSync(start, length) {
 }
 
 const totalCount = readSync(14, 4).readInt32BE(0)
+console.log('totalCount', totalCount)
 const map = {};
 let n = 18;
 for (let i = 0; i < totalCount; i++) {