mirror of
https://github.com/lecepin/WeChatVideoDownloader.git
synced 2025-04-05 20:11:10 +08:00
fixed few issues
This commit is contained in:
Harry Sun
parent
685acd4233
commit
7b6365ebe6
2
.gitignore
vendored
2
.gitignore
vendored
@ -28,3 +28,5 @@ yarn.lock
|
||||
package-lock.json
|
||||
|
||||
.parcel-cache
|
||||
.history
|
||||
test.mjs
|
||||
@ -1,9 +1,11 @@
|
||||
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 } from './utils';
|
||||
import { downloadFile, deleteFiles } from './utils';
|
||||
|
||||
let win;
|
||||
|
||||
@ -17,6 +19,23 @@ 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 => {
|
||||
@ -35,12 +54,19 @@ export default function initIPC() {
|
||||
return result?.[0];
|
||||
});
|
||||
|
||||
ipcMain.handle('invoke_下载视频', async (event, { url, decodeKey, savePath }) => {
|
||||
console.log(url, decodeKey);
|
||||
ipcMain.handle('invoke_下载视频', async (event, { url, decodeKey, savePath, description }) => {
|
||||
let re = /(?:^|\s)(?!#\S+)\s*([^#\s]*)/;
|
||||
let m = description.match(re);
|
||||
let fileName = m && m.length > 1 ? m[1].replaceAll(/[,，]/g, "_") : description;
|
||||
console.log('description:', description);
|
||||
console.log("fileName:", fileName);
|
||||
console.log("url:", url)
|
||||
console.log("decodeKey:", decodeKey);
|
||||
return downloadFile(
|
||||
url,
|
||||
decodeKey,
|
||||
`${savePath}/${Date.now()}.mp4`,
|
||||
// `${savePath}/${Date.now()}.mp4`,
|
||||
`${savePath}/${fileName}.mp4`,
|
||||
throttle(value => win?.webContents?.send?.('e_进度变化', value), 1000),
|
||||
).catch(err => {
|
||||
console;
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
import fs from 'fs';
|
||||
import os from 'os';
|
||||
import hoxy from 'hoxy';
|
||||
import getPort from 'get-port';
|
||||
import log from 'electron-log';
|
||||
import md5 from 'md5';
|
||||
import { app } from 'electron';
|
||||
import CONFIG from './const';
|
||||
import { setProxy, closeProxy } from './setProxy';
|
||||
@ -11,72 +13,131 @@ if (process.platform === 'win32') {
|
||||
process.env.OPENSSL_CONF = CONFIG.OPEN_SSL_CNF_PATH;
|
||||
}
|
||||
|
||||
const WVDS_DEBUG = process.env.WVDS_DEBUG !== undefined;
|
||||
|
||||
// setTimeout to allow working in macOS
|
||||
// in windows: H5ExtTransfer:ok
|
||||
// in macOS: finderH5ExtTransfer:ok
|
||||
const injection_script = `
|
||||
(function () {
|
||||
if (window.wvds !== undefined) {
|
||||
return
|
||||
setTimeout(() => {
|
||||
if (window.wvds !== undefined) return;
|
||||
${WVDS_DEBUG ? `
|
||||
document.body.style.border = "2px solid #0000FF";
|
||||
let ele_app = document.getElementById("app");
|
||||
let ele_btn1 = document.createElement("a");
|
||||
let ele_btn2 = document.createElement("a");
|
||||
let ele_debug = document.createElement("textarea");
|
||||
` : ""}
|
||||
function debug_wvds(msg) {
|
||||
${WVDS_DEBUG ? `ele_debug.value += "\\n" + msg;` : ""}
|
||||
}
|
||||
let receiver_url = "https://aaaa.com"
|
||||
|
||||
${WVDS_DEBUG ? `
|
||||
ele_btn1.style = "position:absolute;top:3px;left:20px;width:80px;height:30px;cursor:pointer;";
|
||||
ele_btn1.text = "Source";
|
||||
ele_btn1.onclick = () => {
|
||||
var source = "<html>";
|
||||
source += document.getElementsByTagName('html')[0].innerHTML;
|
||||
source += "</html>";
|
||||
debug_wvds(source);
|
||||
};
|
||||
ele_app.appendChild(ele_btn1);
|
||||
|
||||
ele_btn2.style = "position:absolute;top:3px;left:120px;width:80px;height:30px;cursor:pointer;";
|
||||
ele_btn2.text = "Test";
|
||||
ele_btn2.onclick = () => {
|
||||
debug_wvds("Hello WeChatVideo Downloader!");
|
||||
};
|
||||
ele_app.appendChild(ele_btn2);
|
||||
|
||||
ele_debug.setAttribute("rows", "60");
|
||||
ele_debug.setAttribute("cols", "60");
|
||||
ele_debug.style = "position:absolute;top:600px;left:20px;width:600px;height:300px;border:2px solid #FF00FF;";
|
||||
ele_debug.value = "Debug:\\n";
|
||||
ele_app.appendChild(ele_debug);
|
||||
` : ""}
|
||||
let receiver_url = "https://aaaa.com";
|
||||
|
||||
function send_response_if_is_video(response) {
|
||||
if (response == undefined) {
|
||||
return;
|
||||
}
|
||||
if (response["err_msg"] != "H5ExtTransfer:ok") {
|
||||
return;
|
||||
}
|
||||
if (response == undefined) return;
|
||||
// debug_wvds(JSON.stringify(response));
|
||||
debug_wvds("send 1: " + response["err_msg"]);
|
||||
if (!response["err_msg"].includes("H5ExtTransfer:ok")) return;
|
||||
let value = JSON.parse(response["jsapi_resp"]["resp_json"]);
|
||||
// debug_wvds("send 2: " + JSON.stringify(value));
|
||||
if (value["object"] == undefined || value["object"]["object_desc"] == undefined || value["object"]["object_desc"]["media"].length == 0) {
|
||||
return
|
||||
return;
|
||||
}
|
||||
let media = value["object"]["object_desc"]["media"][0]
|
||||
let media = value["object"]["object_desc"]["media"][0];
|
||||
// debug_wvds("send 3: " + JSON.stringify(media));
|
||||
let description = value["object"]["object_desc"]["description"].trim();
|
||||
debug_wvds("send x decode key: " + media["decode_key"] + " for " + description);
|
||||
let video_data = {
|
||||
"decode_key": media["decode_key"],
|
||||
"url": media["url"]+media["url_token"],
|
||||
"size": media["file_size"],
|
||||
"description": value["object"]["object_desc"]["description"].trim(),
|
||||
"description": description,
|
||||
"uploader": value["object"]["nickname"]
|
||||
}
|
||||
};
|
||||
fetch(receiver_url, {
|
||||
method: 'POST',
|
||||
mode: 'no-cors',
|
||||
method: "POST",
|
||||
mode: "no-cors",
|
||||
body: JSON.stringify(video_data),
|
||||
}).then((resp) => {
|
||||
console.log(\`video data for \${video_data["description"]} sent\`);
|
||||
debug_wvds(\`video data for \${video_data["description"]} sent!\`);
|
||||
});
|
||||
}
|
||||
|
||||
function wrapper(name,origin) {
|
||||
console.log(\`injecting \${name}\`);
|
||||
return function() {
|
||||
let cmdName = arguments[0];
|
||||
if (arguments.length == 3) {
|
||||
let original_callback = arguments[2];
|
||||
arguments[2] = async function () {
|
||||
if (arguments.length == 1) {
|
||||
debug_wvds("wrapper 3: " + JSON.stringify(arguments[0]));
|
||||
send_response_if_is_video(arguments[0]);
|
||||
}
|
||||
return await original_callback.apply(this, arguments);
|
||||
}
|
||||
debug_wvds("wrapper 1: " + cmdName + ", " + typeof(arguments[1]) + ", " + typeof(arguments[2]));
|
||||
} else {
|
||||
debug_wvds("wrapper 2: " + cmdName + ", " + arguments.length + ", " + arguments[1] + ", " + typeof(arguments[2]));
|
||||
}
|
||||
let result = origin.apply(this,arguments);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
console.log(\`------- Invoke WechatVideoDownloader Service ---------\`);
|
||||
window.WeixinJSBridge.invoke = wrapper("WeixinJSBridge.invoke",window.WeixinJSBridge.invoke);
|
||||
window.WeixinJSBridge.invoke = wrapper("WeixinJSBridge.invoke", window.WeixinJSBridge.invoke);
|
||||
window.wvds = true;
|
||||
})()
|
||||
`;
|
||||
debug_wvds("Invoke WechatVideoDownloader Service!");
|
||||
}, 1000);`;
|
||||
|
||||
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
|
||||
.createServer({
|
||||
certAuthority: {
|
||||
key: fs.readFileSync(CONFIG.CERT_PRIVATE_PATH),
|
||||
cert: fs.readFileSync(CONFIG.CERT_PUBLIC_PATH),
|
||||
},
|
||||
cert: fs.readFileSync(CONFIG.CERT_PUBLIC_PATH)
|
||||
}
|
||||
})
|
||||
.listen(port, () => {
|
||||
setProxy('127.0.0.1', port)
|
||||
@ -97,6 +158,7 @@ export async function startServer({ win, setProxyErrorCallback = f => f }) {
|
||||
as: 'json',
|
||||
},
|
||||
(req, res) => {
|
||||
console.log('request(aaaa.com):', req.json);
|
||||
res.string = 'ok';
|
||||
res.statusCode = 200;
|
||||
win?.webContents?.send?.('VIDEO_CAPTURE', req.json);
|
||||
@ -107,14 +169,23 @@ export async function startServer({ win, setProxyErrorCallback = f => f }) {
|
||||
{
|
||||
phase: 'response',
|
||||
hostname: 'res.wx.qq.com',
|
||||
as: 'string',
|
||||
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;
|
||||
res.statusCode = 200;
|
||||
console.log('after injection:', res.string.length);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -2,8 +2,10 @@ 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(
|
||||
@ -81,4 +83,28 @@ function downloadFile(url,decodeKey, fullFileName, progressCallback) {
|
||||
});
|
||||
}
|
||||
|
||||
export { checkUpdate, downloadFile };
|
||||
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 };
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "wechat-video-downloader",
|
||||
"version": "2.0.0",
|
||||
"version": "2.0.1",
|
||||
"description": "",
|
||||
"main": "./build-electron/index.js",
|
||||
"homepage": "./",
|
||||
@ -56,6 +56,7 @@
|
||||
"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",
|
||||
|
||||
@ -61,7 +61,7 @@ function App() {
|
||||
dataIndex: 'action',
|
||||
key: 'action',
|
||||
width: '210px',
|
||||
render: (_, { url, decodeKey, hdUrl, fixUrl, fullFileName }) => (
|
||||
render: (_, { url, decodeKey, hdUrl, fixUrl, description, fullFileName }) => (
|
||||
<div>
|
||||
{fullFileName ? (
|
||||
<Button
|
||||
@ -80,7 +80,7 @@ function App() {
|
||||
icon={<DownloadOutlined />}
|
||||
type="primary"
|
||||
onClick={() => {
|
||||
send({ type: 'e_下载', url: hdUrl || url, decodeKey: decodeKey });
|
||||
send({ type: 'e_下载', url: hdUrl || url, decodeKey: decodeKey, description: description });
|
||||
}}
|
||||
size="small"
|
||||
>
|
||||
|
||||
@ -190,13 +190,14 @@ export default createMachine(
|
||||
.catch(() => send('e_取消'));
|
||||
},
|
||||
invoke_下载视频:
|
||||
({ currentUrl, savePath, decodeKey }) =>
|
||||
({ currentUrl, savePath, decodeKey, description }) =>
|
||||
send => {
|
||||
ipcRenderer
|
||||
.invoke('invoke_下载视频', {
|
||||
url: currentUrl,
|
||||
decodeKey: decodeKey,
|
||||
decodeKey,
|
||||
savePath,
|
||||
description,
|
||||
})
|
||||
.then(({ fullFileName }) => {
|
||||
send({ type: 'e_下载完成', fullFileName, currentUrl });
|
||||
@ -239,10 +240,11 @@ export default createMachine(
|
||||
captureList: [],
|
||||
};
|
||||
}),
|
||||
action_设置当前地址: actions.assign((_, { url, decodeKey }) => {
|
||||
action_设置当前地址: actions.assign((_, { url, decodeKey, description }) => {
|
||||
return {
|
||||
currentUrl: url,
|
||||
decodeKey: decodeKey,
|
||||
description: description,
|
||||
};
|
||||
}),
|
||||
action_存储下载位置: actions.assign((_, { data }) => {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user