simplify injection regardless of cache

electron/ipc.js

@@ -1,11 +1,9 @@
-import os from 'os';
-import path from 'path';
 import { ipcMain, dialog } from 'electron';
 import log from 'electron-log';
 import { throttle } from 'lodash';
 import { startServer } from './proxyServer';
 import { installCert, checkCertInstalled } from './cert';
-import { downloadFile, deleteFiles } from './utils';
+import { downloadFile } from './utils';
 
 let win;
 
@@ -19,23 +17,6 @@ export default function initIPC() {
   });
 
   ipcMain.handle('invoke_启动服务', async (event, arg) => {
-    let cachePath;
-    let pattern;
-    if (process.platform === 'darwin') {
-      cachePath = 'Library/Containers/com.tencent.xinWeChat/Data/.wxapplet/web/profiles/';
-      pattern = 'multitab**/Cache/Cache_Data';
-    } else {
-      cachePath = 'AppData/Roaming/Tencent/WeChat/radium/web/profiles/';
-      pattern = 'multitab**/Cache/Cache_Data/**';
-    }
-    cachePath = path.join(os.homedir(), cachePath);
-    console.log('cwd:', cachePath);
-    // delete cached polyfillxxxx.js files first (the proxy.intercept to enforce no-cache request header not working!)
-    // deleteFiles(cachePath, [/.*LOCK/], /zn.POLYFILL/);
-    // delete Cache_Data dirs, works well in macOS
-    // in Windows we need to run this tool before wechat
-    // otherwise the cache can't be cleared thoroughly due to file locks and the tool can't capture videos later!
-    process.platform === 'darwin' && await deleteFiles(cachePath, pattern);
     return startServer({
       win: win,
       setProxyErrorCallback: err => {

electron/proxyServer.js

@@ -15,6 +15,10 @@ if (process.platform === 'win32') {
 
 const WVDS_DEBUG = process.env.WVDS_DEBUG !== undefined;
 
+const injection_html = `
+<script type="text/javascript" src="//res.wx.qq.com/t/wx_fed/finder/web/web-finder/res/js/wvds.inject.js"></script>
+`;
+
 // setTimeout to allow working in macOS
 // in windows: H5ExtTransfer:ok
 // in macOS: finderH5ExtTransfer:ok
@@ -115,21 +119,6 @@ setTimeout(() => {
 
 export async function startServer({ win, setProxyErrorCallback = f => f }) {
   const port = await getPort();
-  let caches = {};
-
-  async function directDownload(url) {
-    const hash = md5(url);
-    if (caches[hash] !== undefined) return caches[hash];
-    console.log(`no hash ${hash} in caches, fetching ${url}...`);
-    let resp = await fetch(url);
-    if (resp.ok) {
-      caches[hash] = await resp.text();
-      console.log(`direct fetch ${url}: ${caches[hash].length}`);
-    } else {
-      console.error(`failed to fetch ${url} from res.wx.qq.com, ${resp.status}!`);
-    }
-    return caches[hash];
-  }
 
   return new Promise(async (resolve, reject) => {
     const proxy = hoxy
@@ -165,6 +154,21 @@ export async function startServer({ win, setProxyErrorCallback = f => f }) {
       },
     );
 
+    proxy.intercept(
+      {
+        phase: 'response',
+        hostname: 'channels.weixin.qq.com',
+        as: 'string',
+      },
+      async (req, res) => {
+        if (req.url.includes('/web/pages/feed')) {
+          res.string = res.string.replace('</body>', injection_html + "\n</body>");
+          res.statusCode = 200;
+          console.log('inject[channels.weixin.qq.com]:', req.url, res.string.length);
+        }
+      },
+    );
+
     proxy.intercept(
       {
         phase: 'response',
@@ -172,16 +176,11 @@ export async function startServer({ win, setProxyErrorCallback = f => f }) {
         as: 'string'
       },
       async (req, res) => {
-        // console.log('response(res.wx.qq.com):', req.url);
-        if (req.url.includes('polyfills.publish')) {
-          // windows has some issues to clear caches due to file locks, so we fetch it here!
-          if (res.string.length == 0) {
-            res.string = await directDownload('https://res.wx.qq.com' + req.url);
-          }
-          console.log('before injection:', res.string.length);
-          res.string = res.string + '\n' + injection_script;
+        // console.log('response[res.wx.qq.com]:', req.url);
+        if (req.url.includes('wvds.inject.js')) {
+          console.log('inject[res.wx.qq.com]:', req.url, res.string.length);
+          res.string = injection_script;
           res.statusCode = 200;
-          console.log('after injection:', res.string.length);
         }
       },
     );

electron/utils.js

@@ -2,10 +2,8 @@ import { get } from 'axios';
 import { app, dialog, shell } from 'electron';
 import semver from 'semver';
 import fs from 'fs';
-import path from 'path';
 import {getDecryptionArray} from './decrypt';
 import {Transform } from 'stream';
-import { glob } from 'glob';
 
 // packageUrl 需要包含 { "version": "1.0.0" } 结构
 function checkUpdate(
@@ -83,28 +81,4 @@ function downloadFile(url,decodeKey, fullFileName, progressCallback) {
   });
 }
 
-async function deleteFiles(cwd, pattern, options = {}) {
-  const files = await glob(pattern, {cwd: cwd, absolute: true});
-  files.forEach(file => {
-    fs.stat(file, (err, stats) => {
-      if (err) {
-        console.error(`Error accessing file ${file}:`, err);
-        return;
-      }
-
-      if (stats.isDirectory()) {
-        fs.rm(file, { recursive: true }, (err) => {
-          if (err) console.error(`Error removing directory ${file}:`, err);
-          else console.log(`Directory removed: ${file}`);
-        });
-      } else {
-        fs.unlink(file, (err) => {
-          if (err) console.error(`Error removing file ${file}:`, err);
-          else console.log(`File removed: ${file}`);
-        });
-      }
-    });
-  });
-}
-
-export { checkUpdate, downloadFile, deleteFiles };
+export { checkUpdate, downloadFile };

package.json

@@ -56,7 +56,6 @@
     "electron-is-dev": "^2.0.0",
     "electron-log": "^4.4.7",
     "get-port": "^6.1.2",
-    "glob": "^10.3.10",
     "hoxy": "^3.3.1",
     "lodash": "^4.17.21",
     "mkdirp": "^1.0.4",