blackteay/WeChatVideoDownloader
1
0
Fork 0
mirror of https://github.com/lecepin/WeChatVideoDownloader.git synced 2025-04-06 04:15:43 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88 from harrysun2006/master

Browse Source 
fixed few issues
This commit is contained in:
乐平 2023-12-07 14:42:24 +08:00 committed by GitHub
commit 4c3dd69540
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 150 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -28,3 +28,5 @@ yarn.lock
package-lock.json package-lock.json
.parcel-cache .parcel-cache
.history
test.mjs

13
electron/ipc.js
View File

@ -35,12 +35,19 @@ export default function initIPC() {
return result?.[0]; return result?.[0];
}); });
ipcMain.handle('invoke_下载视频', async (event, { url, decodeKey, savePath }) => { ipcMain.handle('invoke_下载视频', async (event, { url, decodeKey, savePath, description }) => {
console.log(url, decodeKey); 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( return downloadFile(
url, url,
decodeKey, decodeKey,
`${savePath}/${Date.now()}.mp4`, // `${savePath}/${Date.now()}.mp4`,
`${savePath}/${fileName}.mp4`,
throttle(value => win?.webContents?.send?.('e_进度变化', value), 1000), throttle(value => win?.webContents?.send?.('e_进度变化', value), 1000),
).catch(err => { ).catch(err => {
console; console;

124
electron/proxyServer.js
View File

@ -1,7 +1,9 @@
import fs from 'fs'; import fs from 'fs';
import os from 'os';
import hoxy from 'hoxy'; import hoxy from 'hoxy';
import getPort from 'get-port'; import getPort from 'get-port';
import log from 'electron-log'; import log from 'electron-log';
import md5 from 'md5';
import { app } from 'electron'; import { app } from 'electron';
import CONFIG from './const'; import CONFIG from './const';
import { setProxy, closeProxy } from './setProxy'; import { setProxy, closeProxy } from './setProxy';
@ -11,61 +13,109 @@ if (process.platform === 'win32') {
process.env.OPENSSL_CONF = CONFIG.OPEN_SSL_CNF_PATH; process.env.OPENSSL_CONF = CONFIG.OPEN_SSL_CNF_PATH;
} }
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
const injection_script = ` const injection_script = `
(function () { setTimeout(() => {
if (window.wvds !== undefined) { if (window.wvds !== undefined) return;
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) { function send_response_if_is_video(response) {
if (response == undefined) { if (response == undefined) return;
return; // debug_wvds(JSON.stringify(response));
} debug_wvds("send 1: " + response["err_msg"]);
if (response["err_msg"] != "H5ExtTransfer:ok") { if (!response["err_msg"].includes("H5ExtTransfer:ok")) return;
return;
}
let value = JSON.parse(response["jsapi_resp"]["resp_json"]); 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) { 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 = { let video_data = {
"decode_key": media["decode_key"], "decode_key": media["decode_key"],
"url": media["url"]+media["url_token"], "url": media["url"]+media["url_token"],
"size": media["file_size"], "size": media["file_size"],
"description": value["object"]["object_desc"]["description"].trim(), "description": description,
"uploader": value["object"]["nickname"] "uploader": value["object"]["nickname"]
} };
fetch(receiver_url, { fetch(receiver_url, {
method: 'POST', method: "POST",
mode: 'no-cors', mode: "no-cors",
body: JSON.stringify(video_data), body: JSON.stringify(video_data),
}).then((resp) => { }).then((resp) => {
console.log(\`video data for \${video_data["description"]} sent\`); debug_wvds(\`video data for \${video_data["description"]} sent!\`);
}); });
} }
function wrapper(name,origin) { function wrapper(name,origin) {
console.log(\`injecting \${name}\`);
return function() { return function() {
let cmdName = arguments[0]; let cmdName = arguments[0];
if (arguments.length == 3) { if (arguments.length == 3) {
let original_callback = arguments[2]; let original_callback = arguments[2];
arguments[2] = async function () { arguments[2] = async function () {
if (arguments.length == 1) { if (arguments.length == 1) {
debug_wvds("wrapper 3: " + JSON.stringify(arguments[0]));
send_response_if_is_video(arguments[0]); send_response_if_is_video(arguments[0]);
} }
return await original_callback.apply(this, arguments); 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); let result = origin.apply(this,arguments);
return result; 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; window.wvds = true;
})() debug_wvds("Invoke WechatVideoDownloader Service!");
`; }, 1000);`;
export async function startServer({ win, setProxyErrorCallback = f => f }) { export async function startServer({ win, setProxyErrorCallback = f => f }) {
const port = await getPort(); const port = await getPort();
@ -75,8 +125,8 @@ export async function startServer({ win, setProxyErrorCallback = f => f }) {
.createServer({ .createServer({
certAuthority: { certAuthority: {
key: fs.readFileSync(CONFIG.CERT_PRIVATE_PATH), key: fs.readFileSync(CONFIG.CERT_PRIVATE_PATH),
cert: fs.readFileSync(CONFIG.CERT_PUBLIC_PATH), cert: fs.readFileSync(CONFIG.CERT_PUBLIC_PATH)
}, }
}) })
.listen(port, () => { .listen(port, () => {
setProxy('127.0.0.1', port) setProxy('127.0.0.1', port)
@ -97,6 +147,7 @@ export async function startServer({ win, setProxyErrorCallback = f => f }) {
as: 'json', as: 'json',
}, },
(req, res) => { (req, res) => {
console.log('request(aaaa.com):', req.json);
res.string = 'ok'; res.string = 'ok';
res.statusCode = 200; res.statusCode = 200;
win?.webContents?.send?.('VIDEO_CAPTURE', req.json); win?.webContents?.send?.('VIDEO_CAPTURE', req.json);
@ -106,15 +157,34 @@ export async function startServer({ win, setProxyErrorCallback = f => f }) {
proxy.intercept( proxy.intercept(
{ {
phase: 'response', phase: 'response',
hostname: 'res.wx.qq.com', hostname: 'channels.weixin.qq.com',
as: 'string', as: 'string',
}, },
async (req, res) => { async (req, res) => {
if (req.url.includes('polyfills.publish')) { if (req.url.includes('/web/pages/feed')) {
res.string = res.string + '\n' + injection_script; 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',
hostname: 'res.wx.qq.com',
as: 'string'
},
async (req, res) => {
// 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;
}
},
);
}); });
} }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "wechat-video-downloader", "name": "wechat-video-downloader",
"version": "2.0.0", "version": "2.0.1",
"description": "", "description": "",
"main": "./build-electron/index.js", "main": "./build-electron/index.js",
"homepage": "./", "homepage": "./",

4
src/App.jsx
View File

@ -61,7 +61,7 @@ function App() {
dataIndex: 'action', dataIndex: 'action',
key: 'action', key: 'action',
width: '210px', width: '210px',
render: (_, { url, decodeKey, hdUrl, fixUrl, fullFileName }) => ( render: (_, { url, decodeKey, hdUrl, fixUrl, description, fullFileName }) => (
<div> <div>
{fullFileName ? ( {fullFileName ? (
<Button <Button
@ -80,7 +80,7 @@ function App() {
icon={<DownloadOutlined />} icon={<DownloadOutlined />}
type="primary" type="primary"
onClick={() => { onClick={() => {
send({ type: 'e_下载', url: hdUrl || url, decodeKey: decodeKey }); send({ type: 'e_下载', url: hdUrl || url, decodeKey: decodeKey, description: description });
}} }}
size="small" size="small"
> >

8
src/fsm.js
View File

@ -190,13 +190,14 @@ export default createMachine(
.catch(() => send('e_取消')); .catch(() => send('e_取消'));
}, },
invoke_下载视频: invoke_下载视频:
({ currentUrl, savePath, decodeKey }) => ({ currentUrl, savePath, decodeKey, description }) =>
send => { send => {
ipcRenderer ipcRenderer
.invoke('invoke_下载视频', { .invoke('invoke_下载视频', {
url: currentUrl, url: currentUrl,
decodeKey: decodeKey, decodeKey,
savePath, savePath,
description,
}) })
.then(({ fullFileName }) => { .then(({ fullFileName }) => {
send({ type: 'e_下载完成', fullFileName, currentUrl }); send({ type: 'e_下载完成', fullFileName, currentUrl });
@ -239,10 +240,11 @@ export default createMachine(
captureList: [], captureList: [],
}; };
}), }),
action_设置当前地址: actions.assign((_, { url, decodeKey }) => { action_设置当前地址: actions.assign((_, { url, decodeKey, description }) => {
return { return {
currentUrl: url, currentUrl: url,
decodeKey: decodeKey, decodeKey: decodeKey,
description: description,
}; };
}), }),
action_存储下载位置: actions.assign((_, { data }) => { action_存储下载位置: actions.assign((_, { data }) => {