update: bilibili to v1.10.1.2297

update: electron to v21.3.3

CHANGELOG.MD

@@ -1,3 +1,8 @@
+# v1.10.1-1 / 2023-05-10
+
+- update: electron to v21.3.3
+- update: bilibili to v1.10.1.2297
+
 # v1.9.2-1 / 2023-03-25
 
 - update: bilibili to v1.9.2.2092

bin/bilibili

@@ -9,4 +9,10 @@ done
 root_dir="$( cd -P "$( dirname "$SOURCE" )"/.. >/dev/null 2>&1 && pwd )"
 # 启用检查更新 for electron-updater
 export APPIMAGE=1
-ELECTRON_FORCE_IS_PACKAGED=true "$root_dir/electron/electron" "$root_dir/app/app.asar" --no-sandbox "$@"
+
+DEBUG=1
+if [ DEBUG == 1 ]; then
+  ELECTRON_FORCE_IS_PACKAGED=true "$root_dir/electron/electron" "$root_dir/tmp/bili/resources/app" --no-sandbox "$@"
+else
+  ELECTRON_FORCE_IS_PACKAGED=true "$root_dir/electron/electron" "$root_dir/app/app.asar" --no-sandbox "$@"
+fi

conf/bilibili_version

@@ -1 +1 @@
-1.9.2.2092
+1.10.1.2297

tools/fix-other.sh

@@ -42,16 +42,16 @@ mv "app/main/temp.js" "app/main/index.js"
 notice "====app.js===="
 
 notice "屏蔽检测"
-grep -lr 'if(!qI' --exclude="app.asar" .
-sed -i 's#if(!qI#if(false\&\&!qI#g' app/main/app.js
+grep -lr 'if(!Dn' --exclude="app.asar" .
+sed -i 's#if(!Dn#if(false\&\&!Dn#g' app/main/app.js
 # ==='win';if(!
-grep -lr 'if(!ao)' --exclude="app.asar" .
-sed -i 's#if(!ao)#if(false\&\&!ao)#' app/main/app.js
+grep -lr 'if(!x5)' --exclude="app.asar" .
+sed -i 's#if(!x5)#if(false\&\&!x5)#' app/main/app.js
 # global['bootstrapApp']();
-grep -lr 'if(qI)' --exclude="app.asar" .
-sed -i 's#if(qI)#if(!qI)#' app/main/app.js
-grep -lr ';}!qI' --exclude="app.asar" .
-sed -i 's#;}!qI#;}false\&\&!qI#' app/main/app.js
+grep -lr 'if(Dn)' --exclude="app.asar" .
+sed -i 's#if(Dn)#if(!Dn)#' app/main/app.js
+grep -lr ';}!Dn' --exclude="app.asar" .
+sed -i 's#;}!Dn#;}false\&\&!Dn#' app/main/app.js
 
 notice "路由"
 grep -lr 'case"SettingsPage":n.push({name:"Settings"});return' --exclude="app.asar" .

tools/js-decode.js

@@ -66,8 +66,8 @@ resultCode = resultCode.replace(
     // 二分法查找异常点
     // 763 ok
     // 764 error
-    if(i === 11798){
-        // if(i === 11798){
+    if(i === 3311){
+        // if(i === 3312){
         //     console.log("--->", $0, $1, $2)
         //     let result = eval('"' + $1 + '"')
         //     console.log("--->", result)
@@ -100,5 +100,12 @@ resultCode = encodeUnicode(resultCode)
 resultCode = parseSubFunc(resultCode)
 resultCode = parseSubFunc(resultCode)
 resultCode = resultCode.replace(/'\+'/g, '')
+i = 0;
+resultCode = resultCode.replace(
+  /警告/g,
+  function ($0, $1, $2) {
+    return $0 + i++
+  }
+)
 fs.writeFileSync(dist, resultCode)
 // fs.writeFileSync(path.resolve(__dirname, '../'), resultCode)

tools/update-electron

@@ -14,7 +14,7 @@ notice() {
     echo -e "\033[36m $1 \033[0m "
 }
 
-electron_version="17.4.11"
+electron_version="21.3.3"
 download_url="https://npmmirror.com/mirrors/electron/${electron_version}/electron-v${electron_version}-linux-x64.zip"
 if [ "$BUILD_ARCH" == "arm64" ];then
   download_url=$(echo "${download_url}" | sed "s/x64/${BUILD_ARCH}/")