Merge pull request #97 from putyy/dev

完善content type

README.md

@@ -1,10 +1,11 @@
-## res-downloader(爱享素材下载器) 【[点击加入群聊](https://qm.qq.com/q/W8mVeZideE)】
+## res-downloader
+### 爱享素材下载器【[加入群聊](https://qm.qq.com/q/mfDMSpCxQ4)】
 🎯 基于 [electron-vite-vue](https://github.com/electron-vite/electron-vite-vue.git)  
-📦 操作简单、可获取不同类型的资源
-🖥️ 支持Win10、Win11、Mac  
-🌐 支持视频、音频、图片、m3u8等网络资源下载    
+📦 操作简单、可获取不同类型的资源  
+🖥️ 支持Win10、Win11、Mac、Linux  
+🌐 支持视频、音频、图片、m3u8、直播流等常见网络资源拦截  
 💪 支持微信视频号、小程序、抖音、快手、小红书、酷狗音乐、qq音乐等网络资源下载  
-👼 支持设置代理以获取特殊网络下的资源
+👼 支持设置代理以获取特殊网络下的资源  
 
 ## 软件下载
 🆕 [github下载](https://github.com/putyy/res-downloader/releases)  
@@ -21,7 +22,13 @@
 ![](public/show.webp)
 
 ## 常见问题
-下载慢、大视频下载失败
+m3u8预览和下载：
+> [下载](https://m3u8-down.gowas.cn/) [预览](https://m3u8play.com/)
+
+直播流 预览和录制：
+> [使用obs进行预览和录制]( https://obsproject.com/)
+
+下载慢、大视频下载失败(最新版本以内置aria2下载器)
 > 推荐使用如下工具加速下载，视频号可以下载完成后再到对应视频操作项选择 “视频解密(视频号)” 按钮
 >> [Neat Download Manager](https://www.neatdownloadmanager.com/index.php/en/)、[Motrix](https://motrix.app/download)等软件进行下载
 
@@ -39,7 +46,8 @@ Win7无法使用
 >> MAC: /Users/你的用户名称/.res-downloader@putyy/res-downloader-installed.lock
 >> Win: C:\Users\Admin\.res-downloader@putyy/res-downloader-installed.lock
 
-其他问题请留言 https://github.com/putyy/res-downloader/issues
+其他问题  
+[github](https://github.com/putyy/res-downloader/issues)  、 [爱享论坛](https://s.gowas.cn/d/4089)  
 
 ## 二次开发
 > ps： 打包慢的问题可以参考 https://www.putyy.com/articles/87
@@ -57,7 +65,13 @@ yarn run build --universal --mac
 
 # 打包win
 yarn run build --win
+
+# 打包win
+yarn run build --linux
 ```
 
+## 实现&初衷
+通过代理网络抓包拦截响应，筛选出有用的资源， 同fiddler、charles等抓包软件、浏览器F12打开控制也能达到目的，只不过这些软件需要手动进行筛选，对于小白用户上手还是有点难度，本软件对部分资源做了特殊处理，更适合大众用户，所以就有了本项目。
+
 ## 免责声明
 本软件用于学习研究使用，若因使用本软件造成的一切法律责任均与本人无关！

components.d.ts

@@ -20,7 +20,6 @@ declare module 'vue' {
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
-    ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     Footer: typeof import('./src/components/layout/Footer.vue')['default']

electron-builder.json5

@@ -10,8 +10,7 @@
   },
   "files": [
     "dist-electron",
-    "dist",
-    "electron/res/**/*"
+    "dist"
   ],
   "mac": {
     "icon": "electron/res/icon/mac.icns",
@@ -29,13 +28,48 @@
     ],
     "extraResources": [
       {
-        "from": "electron/res/mac/aria2/aria2.conf",
-        "to": "electron/res/mac/aria2/aria2.conf",
+        "from": "electron/res/darwin/aria2/aria2.conf",
+        "to": "electron/res/darwin/aria2/aria2.conf",
         "filter": ["**/*"]
       },
       {
-        "from": "electron/res/mac/aria2/${arch}/aria2c",
-        "to": "electron/res/mac/aria2/aria2c",
+        "from": "electron/res/darwin/aria2/${arch}/aria2c",
+        "to": "electron/res/darwin/aria2/aria2c",
+        "filter": ["**/*"],
+      }
+    ]
+  },
+  "linux": {
+    "icon": "electron/res/icon/icon.png",
+    "artifactName": "${productName}_${version}.${arch}.${ext}",
+    "category": "Network",
+    "target": [
+      {
+        "target": "AppImage",
+        "arch": [
+          "x64",
+          "arm64",
+          "armv7l"
+        ]
+      },
+      {
+        "target": "deb",
+        "arch": [
+          "x64",
+          "arm64",
+          "armv7l"
+        ]
+      }
+    ],
+    "extraResources": [
+      {
+        "from": "electron/res/linux/aria2/aria2.conf",
+        "to": "electron/res/linux/aria2/aria2.conf",
+        "filter": ["**/*"]
+      },
+      {
+        "from": "electron/res/linux/aria2/${arch}/aria2c",
+        "to": "electron/res/linux/aria2/aria2c",
         "filter": ["**/*"],
       }
     ]

electron/main/cert.ts

@@ -25,6 +25,18 @@ export async function installCert(checkInstalled = true) {
                 message: `命令已复制到剪贴板,粘贴命令到终端并运行以安装并信任证书`,
             });
 
+            reject()
+        });
+    } else if (process.platform === 'linux') {
+        return new Promise((resolve, reject) => {
+            clipboard.writeText(
+                "https://github.com/putyy/res-downloader/blob/master/electron/res/keys/public.pem",
+            )
+            dialog.showMessageBoxSync({
+                type: "info",
+                message: `Linux系统请手动安装证书，已复制下载地址`,
+            });
+
             reject()
         });
     } else {

electron/main/index.ts

@@ -144,6 +144,8 @@ function createPreviewWindow(parent: BrowserWindow) {
         parent: parent,
         width: 600,
         height: 400,
+        minWidth: 600,
+        minHeight: 400,
         show: false,
         // paintWhenInitiallyHidden: false,
         webPreferences: {
@@ -169,7 +171,7 @@ function createPreviewWindow(parent: BrowserWindow) {
     })
 }
 
-function createArua2Process() {
+function createAria2Process() {
     // 根据操作系统选择 aria2 的路径
     try {
         let aria2Path, aria2Conf
@@ -178,8 +180,8 @@ function createArua2Process() {
             aria2Path = path.join(CONFIG.EXECUTABLE_PATH, "./win/aria2/aria2c.exe")
             aria2Conf = path.join(CONFIG.EXECUTABLE_PATH, "./win/aria2/aria2.conf")
         } else {
-            aria2Path = path.join(CONFIG.EXECUTABLE_PATH, "./mac/aria2" + (CONFIG.IS_DEV ? `/${process.arch}` : '/') + "/aria2c");
-            aria2Conf = path.join(CONFIG.EXECUTABLE_PATH, "./mac/aria2/aria2.conf")
+            aria2Path = path.join(CONFIG.EXECUTABLE_PATH, `./${process.platform}/aria2` + (CONFIG.IS_DEV ? `/${process.arch}` : '/') + "/aria2c");
+            aria2Conf = path.join(CONFIG.EXECUTABLE_PATH, `./${process.platform}/aria2/aria2.conf`)
         }
         // 启动 aria2
         console.log("启动 aria2")
@@ -208,6 +210,6 @@ app.whenReady().then(() => {
     initIPC()
     createWindow()
     createPreviewWindow(mainWindow)
-    createArua2Process()
+    createAria2Process()
     setWin(mainWindow, previewWin)
 })

electron/main/ipc.ts

@@ -1,11 +1,12 @@
 import {ipcMain, dialog, BrowserWindow, app, shell} from 'electron'
 import {startServer} from './proxyServer'
 import {installCert, checkCertInstalled} from './cert'
-import {decodeWxFile, suffix, getCurrentDateTimeFormatted} from './utils'
+import {decodeWxFile, typeSuffix, getCurrentDateTimeFormatted} from './utils'
 // @ts-ignore
 import {hexMD5} from '../../src/common/md5'
 import {Aria2RPC} from './aria2Rpc'
 import fs from "fs"
+import urlTool from "url";
 
 let win: BrowserWindow
 let previewWin: BrowserWindow
@@ -71,7 +72,16 @@ export default function initIPC() {
                 resolve(false);
             });
         }
-        if (quality !== "-1" && data.decode_key && data.file_format) {
+        if(quality === "0" && data.decode_key){
+            const urlInfo = urlTool.parse(down_url, true);
+            console.log('urlInfo', urlInfo)
+            if (urlInfo.query["token"] && urlInfo.query["encfilekey"]) {
+                down_url = urlInfo.protocol + "//" + urlInfo.hostname + urlInfo.pathname.replace("251/20302", "251/20304") +
+                    "?encfilekey=" + urlInfo.query["encfilekey"] +
+                    "&token=" + urlInfo.query["token"]
+                console.log("down_url:", down_url)
+            }
+        } else if (quality !== "-1" && data.decode_key && data.file_format) {
             const format = data.file_format.split('#');
             const qualityMap = [
                 format[0],
@@ -81,7 +91,7 @@ export default function initIPC() {
             down_url += "&X-snsvideoflag=" + qualityMap[quality];
         }
         let fileName = data?.description ? data.description.replace(/[^a-zA-Z0-9\u4e00-\u9fa5]/g, '') : hexMD5(down_url);
-        fileName = fileName + "_" + getCurrentDateTimeFormatted() + suffix(data.type)
+        fileName = fileName + "_" + getCurrentDateTimeFormatted() + typeSuffix(data.type)[1]
         let save_path_file = `${save_path}/${fileName}`
         if (process.platform === 'win32') {
             save_path_file = `${save_path}\\${fileName}`

electron/main/proxyServer.ts

@@ -1,10 +1,9 @@
 import fs from 'fs'
 import log from 'electron-log'
 import CONFIG from './const'
-import {closeProxy, setProxy} from './setProxy'
-import {app} from "electron"
+import {setProxy} from './setProxy'
 import * as urlTool from "url"
-import {toSize} from "./utils"
+import {toSize, typeSuffix} from "./utils"
 // @ts-ignore
 import {hexMD5} from '../../src/common/md5'
 import pkg from '../../package.json'
@@ -47,15 +46,15 @@ export async function startServer({win, upstreamProxy, setProxyErrorCallback = f
                     cert: fs.readFileSync(CONFIG.CERT_PUBLIC_PATH),
                 },
             })
-                .listen(port, () => {
-                    setProxy('127.0.0.1', port)
-                        .then((res) => {
-                            resolve()
-                        })
-                        .catch((err) => {
-                            setProxyErrorCallback(err)
-                            reject('setting proxy err: ' + err.toString())
-                        });
+                .listen(port, async () => {
+                    try {
+                        await setProxy('127.0.0.1', port)
+                        resolve()
+                    } catch (err) {
+                        console.error(err);
+                        setProxyErrorCallback(err)
+                        reject("请手动设置系统代理" + err.toString())
+                    }
                 })
                 .on('error', err => {
                     setProxyErrorCallback(err)
@@ -147,87 +146,24 @@ export async function startServer({win, upstreamProxy, setProxyErrorCallback = f
                 async (req, res) => {
                     try {
                         // 拦截响应
-                        const ctype = res?._data?.headers?.['content-type']
-                        const url_sign: string = hexMD5(req.fullUrl())
-                        const res_url = req.fullUrl()
-                        const urlInfo = urlTool.parse(res_url, true)
-                        switch (ctype) {
-                            case "video/mp4":
-                            case "video/webm":
-                            case "video/ogg":
-                            case "video/x-msvideo":
-                            case "video/mpeg":
-                            case "video/quicktime":
-                            case "video/x-ms-wmv":
-                            case "video/x-flv":
-                            case "video/3gpp":
-                            case "video/x-matroska":
-                                if (global.videoList.hasOwnProperty(url_sign) === false) {
-                                    global.videoList[url_sign] = res_url
-                                    win.webContents.send('on_get_queue', Object.assign({}, resObject, {
-                                        url: res_url,
-                                        url_sign: url_sign,
-                                        platform: urlInfo.hostname,
-                                        size: toSize(res?._data?.headers?.['content-length'] ?? 0),
-                                        type: ctype,
-                                        type_str: 'video',
-                                    }))
-                                }
-                                break;
-                            case "image/png":
-                            case "image/webp":
-                            case "image/jpeg":
-                            case "image/jpg":
-                            case "image/svg+xml":
-                            case "image/gif":
-                            case "image/avif":
-                            case "image/bmp":
-                            case "image/tiff":
-                            case "image/x-icon":
-                            case "image/heic":
-                            case "image/vnd.adobe.photoshop":
+                        const contentType = res?._data?.headers?.['content-type']
+                        const [resType, suffix] = typeSuffix(contentType)
+                        if (resType) {
+                            const url_sign: string = hexMD5(req.fullUrl())
+                            const res_url = req.fullUrl()
+                            const urlInfo = urlTool.parse(res_url, true)
+                            const contentLength = res?._data?.headers?.['content-length']
+                            if (global.videoList.hasOwnProperty(url_sign) === false) {
+                                global.videoList[url_sign] = res_url
                                 win.webContents.send('on_get_queue', Object.assign({}, resObject, {
                                     url: res_url,
                                     url_sign: url_sign,
                                     platform: urlInfo.hostname,
-                                    size: res?._data?.headers?.['content-length'] ? toSize(res?._data?.headers?.['content-length']) : 0,
-                                    type: ctype,
-                                    type_str: 'image',
+                                    size: toSize(contentLength ? contentLength : 0),
+                                    type: contentType,
+                                    type_str: resType,
                                 }))
-                                break
-                            case "audio/mpeg":
-                            case "audio/wav":
-                            case "audio/aiff":
-                            case "audio/x-aiff":
-                            case "audio/aac":
-                            case "audio/ogg":
-                            case "audio/flac":
-                            case "audio/midi":
-                            case "audio/x-midi":
-                            case "audio/x-ms-wma":
-                            case "audio/opus":
-                            case "audio/webm":
-                            case "audio/mp4":
-                                win.webContents.send('on_get_queue', Object.assign({}, resObject, {
-                                    url: res_url,
-                                    url_sign: url_sign,
-                                    platform: urlInfo.hostname,
-                                    size: res?._data?.headers?.['content-length'] ? toSize(res?._data?.headers?.['content-length']) : 0,
-                                    type: ctype,
-                                    type_str: 'audio',
-                                }))
-                                break
-                            case "application/vnd.apple.mpegurl":
-                            case "application/x-mpegURL":
-                                win.webContents.send('on_get_queue', Object.assign({}, resObject, {
-                                    url: res_url,
-                                    url_sign: url_sign,
-                                    platform: urlInfo.hostname,
-                                    size: res?._data?.headers?.['content-length'] ? toSize(res?._data?.headers?.['content-length']) : 0,
-                                    type: ctype,
-                                    type_str: 'm3u8',
-                                }))
-                                break
+                            }
                         }
                     } catch (e) {
                         log.log(e.toString())

electron/main/setProxy.ts

@@ -2,6 +2,7 @@ import {exec} from 'child_process'
 // @ts-ignore
 import regedit from 'regedit'
 import CONFIG from './const'
+import {dialog} from "electron";
 
 regedit.setExternalVBSLocation(CONFIG.REGEDIT_VBS_PATH)
 
@@ -34,6 +35,12 @@ export async function setProxy(host, port) {
                 });
             }),
         );
+    } else if (process.platform === 'linux') {
+        dialog.showMessageBoxSync({
+            type: "info",
+            message: `请手动设置系统代理`,
+        });
+        return new Promise((resolve, reject) => {})
     } else {
         const valuesToPut = {
             'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings': {
@@ -81,6 +88,11 @@ export async function closeProxy() {
                 });
             }),
         );
+    } else if (process.platform === 'linux') {
+        dialog.showMessageBoxSync({
+            type: "info",
+            message: `请手动取消系统代理`,
+        });
     } else {
         const valuesToPut = {
             'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings': {

electron/main/utils.ts

@@ -1,8 +1,9 @@
 import fs from 'fs'
-import {Transform } from 'stream'
+import {Transform} from 'stream'
 import {getDecryptionArray} from '../wxjs/decrypt.js'
 
 const axios = require('axios')
+
 function xorTransform(decryptionArray) {
     let processedBytes = 0;
     return new Transform({
@@ -32,7 +33,7 @@ function downloadFile(url, decodeKey, fullFileName, progressCallback) {
         },
     }
 
-    if (url.includes("douyin")){
+    if (url.includes("douyin")) {
         config.headers['Referer'] = url
     }
 
@@ -57,7 +58,7 @@ function downloadFile(url, decodeKey, fullFileName, progressCallback) {
                         });
                     }),
                 );
-            }else{
+            } else {
                 data.pipe(
                     fs.createWriteStream(fullFileName).on('finish', () => {
                         resolve({
@@ -97,7 +98,7 @@ function toSize(size: number) {
     return size + 'b'
 }
 
-function suffix(type: string) {
+function typeSuffix(type: string) {
     switch (type) {
         case "video/mp4":
         case "video/webm":
@@ -106,23 +107,25 @@ function suffix(type: string) {
         case "video/mpeg":
         case "video/quicktime":
         case "video/x-ms-wmv":
-        case "video/x-flv":
         case "video/3gpp":
         case "video/x-matroska":
-            return ".mp4";
+            return ["video", ".mp4"];
+        case "audio/video":
+        case  "video/x-flv":
+            return ["live", ".mp4"];
         case "image/png":
         case "image/webp":
         case "image/jpeg":
         case "image/jpg":
-        case "image/svg+xml":
         case "image/gif":
         case "image/avif":
         case "image/bmp":
         case "image/tiff":
-        case "image/x-icon":
         case "image/heic":
+        case "image/x-icon":
+        case "image/svg+xml":
         case "image/vnd.adobe.photoshop":
-            return ".png";
+            return ["image", ".png"];
         case "audio/mpeg":
         case "audio/wav":
         case "audio/aiff":
@@ -136,12 +139,25 @@ function suffix(type: string) {
         case "audio/opus":
         case "audio/webm":
         case "audio/mp4":
-            return ".mp3";
+        case "audio/mp3":
+        case "audio/mp4;charset=UTF-8":
+            return ["audio", ".mp3"];
         case "application/vnd.apple.mpegurl":
         case "application/x-mpegURL":
-            return ".m3u8";
+            return ["m3u8", ".m3u8"];
+        case "application/pdf":
+            return ["pdf", ".pdf"];
+        case "application/vnd.ms-powerpoint":
+        case "application/vnd.openxmlformats-officedocument.presentationml.presentation":
+            return ["ppt", ".ppt"];
+        case "application/vnd.ms-excel":
+        case "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet":
+            return ["xls", ".xls"];
+        case "application/msword":
+        case "application/vnd.openxmlformats-officedocument.wordprocessingml.document":
+            return ["doc", ".doc"];
     }
-    return ""
+    return ["", ""]
 }
 
 function getCurrentDateTimeFormatted() {
@@ -157,4 +173,4 @@ function getCurrentDateTimeFormatted() {
     return `${year}${month}${day}${hours}${minutes}${seconds}`;
 }
 
-export {downloadFile, toSize, decodeWxFile, suffix, getCurrentDateTimeFormatted}
+export {downloadFile, toSize, decodeWxFile, typeSuffix, getCurrentDateTimeFormatted}

electron/res/linux/aria2/aria2.conf

@@ -0,0 +1,25 @@
+#允许rpc
+enable-rpc=true
+#允许非外部访问
+rpc-listen-all=true
+
+#最大同时下载数(任务数), 路由建议值: 3
+max-concurrent-downloads=3
+#断点续传
+continue=true
+#同服务器连接数
+max-connection-per-server=10
+#最小文件分片大小, 下载线程数上限取决于能分出多少片, 对于小文件重要
+min-split-size=10M
+#单文件最大线程数, 路由建议值: 5
+split=10
+#下载速度限制
+max-overall-download-limit=0
+#单文件速度限制
+max-download-limit=0
+#上传速度限制
+max-overall-upload-limit=0
+#单文件速度限制
+max-upload-limit=0
+
+check-certificate=false

electron/res/win/openssl/CA.pl

@@ -0,0 +1,239 @@
+#!/usr/bin/env perl
+# Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the Apache License 2.0 (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+#
+# Wrapper around the ca to make it easier to use
+#
+# WARNING: do not edit!
+# Generated by makefile from apps\CA.pl.in
+
+use strict;
+use warnings;
+
+my $verbose = 1;
+my @OPENSSL_CMDS = ("req", "ca", "pkcs12", "x509", "verify");
+
+my $openssl = $ENV{'OPENSSL'} // "openssl";
+$ENV{'OPENSSL'} = $openssl;
+my $OPENSSL_CONFIG = $ENV{"OPENSSL_CONFIG"} // "";
+
+# Command invocations.
+my $REQ = "$openssl req $OPENSSL_CONFIG";
+my $CA = "$openssl ca $OPENSSL_CONFIG";
+my $VERIFY = "$openssl verify";
+my $X509 = "$openssl x509";
+my $PKCS12 = "$openssl pkcs12";
+
+# Default values for various configuration settings.
+my $CATOP = "./demoCA";
+my $CAKEY = "cakey.pem";
+my $CAREQ = "careq.pem";
+my $CACERT = "cacert.pem";
+my $CACRL = "crl.pem";
+my $DAYS = "-days 365";
+my $CADAYS = "-days 1095";	# 3 years
+my $EXTENSIONS = "-extensions v3_ca";
+my $POLICY = "-policy policy_anything";
+my $NEWKEY = "newkey.pem";
+my $NEWREQ = "newreq.pem";
+my $NEWCERT = "newcert.pem";
+my $NEWP12 = "newcert.p12";
+
+# Commandline parsing
+my %EXTRA;
+my $WHAT = shift @ARGV || "";
+@ARGV = parse_extra(@ARGV);
+my $RET = 0;
+
+# Split out "-extra-CMD value", and return new |@ARGV|. Fill in
+# |EXTRA{CMD}| with list of values.
+sub parse_extra
+{
+    foreach ( @OPENSSL_CMDS ) {
+        $EXTRA{$_} = '';
+    }
+
+    my @result;
+    while ( scalar(@_) > 0 ) {
+        my $arg = shift;
+        if ( $arg !~ m/-extra-([a-z0-9]+)/ ) {
+            push @result, $arg;
+            next;
+        }
+        $arg =~ s/-extra-//;
+        die("Unknown \"-${arg}-extra\" option, exiting")
+            unless scalar grep { $arg eq $_ } @OPENSSL_CMDS;
+        $EXTRA{$arg} .= " " . shift;
+    }
+    return @result;
+}
+
+
+# See if reason for a CRL entry is valid; exit if not.
+sub crl_reason_ok
+{
+    my $r = shift;
+
+    if ($r eq 'unspecified' || $r eq 'keyCompromise'
+        || $r eq 'CACompromise' || $r eq 'affiliationChanged'
+        || $r eq 'superseded' || $r eq 'cessationOfOperation'
+        || $r eq 'certificateHold' || $r eq 'removeFromCRL') {
+        return 1;
+    }
+    print STDERR "Invalid CRL reason; must be one of:\n";
+    print STDERR "    unspecified, keyCompromise, CACompromise,\n";
+    print STDERR "    affiliationChanged, superseded, cessationOfOperation\n";
+    print STDERR "    certificateHold, removeFromCRL";
+    exit 1;
+}
+
+# Copy a PEM-format file; return like exit status (zero means ok)
+sub copy_pemfile
+{
+    my ($infile, $outfile, $bound) = @_;
+    my $found = 0;
+
+    open IN, $infile || die "Cannot open $infile, $!";
+    open OUT, ">$outfile" || die "Cannot write to $outfile, $!";
+    while (<IN>) {
+        $found = 1 if /^-----BEGIN.*$bound/;
+        print OUT $_ if $found;
+        $found = 2, last if /^-----END.*$bound/;
+    }
+    close IN;
+    close OUT;
+    return $found == 2 ? 0 : 1;
+}
+
+# Wrapper around system; useful for debugging.  Returns just the exit status
+sub run
+{
+    my $cmd = shift;
+    print "====\n$cmd\n" if $verbose;
+    my $status = system($cmd);
+    print "==> $status\n====\n" if $verbose;
+    return $status >> 8;
+}
+
+
+if ( $WHAT =~ /^(-\?|-h|-help)$/ ) {
+    print STDERR <<EOF;
+Usage:
+    CA.pl -newcert | -newreq | -newreq-nodes | -xsign | -sign | -signCA | -signcert | -crl | -newca [-extra-cmd parameter]
+    CA.pl -pkcs12 [certname]
+    CA.pl -verify certfile ...
+    CA.pl -revoke certfile [reason]
+EOF
+    exit 0;
+}
+
+if ($WHAT eq '-newcert' ) {
+    # create a certificate
+    $RET = run("$REQ -new -x509 -keyout $NEWKEY -out $NEWCERT $DAYS"
+            . " $EXTRA{req}");
+    print "Cert is in $NEWCERT, private key is in $NEWKEY\n" if $RET == 0;
+} elsif ($WHAT eq '-precert' ) {
+    # create a pre-certificate
+    $RET = run("$REQ -x509 -precert -keyout $NEWKEY -out $NEWCERT $DAYS"
+            . " $EXTRA{req}");
+    print "Pre-cert is in $NEWCERT, private key is in $NEWKEY\n" if $RET == 0;
+} elsif ($WHAT =~ /^\-newreq(\-nodes)?$/ ) {
+    # create a certificate request
+    $RET = run("$REQ -new $1 -keyout $NEWKEY -out $NEWREQ $DAYS $EXTRA{req}");
+    print "Request is in $NEWREQ, private key is in $NEWKEY\n" if $RET == 0;
+} elsif ($WHAT eq '-newca' ) {
+    # create the directory hierarchy
+    my @dirs = ( "${CATOP}", "${CATOP}/certs", "${CATOP}/crl",
+                "${CATOP}/newcerts", "${CATOP}/private" );
+    die "${CATOP}/index.txt exists.\nRemove old sub-tree to proceed,"
+        if -f "${CATOP}/index.txt";
+    die "${CATOP}/serial exists.\nRemove old sub-tree to proceed,"
+        if -f "${CATOP}/serial";
+    foreach my $d ( @dirs ) {
+        if ( -d $d ) {
+            warn "Directory $d exists" if -d $d;
+        } else {
+            mkdir $d or die "Can't mkdir $d, $!";
+        }
+    }
+
+    open OUT, ">${CATOP}/index.txt";
+    close OUT;
+    open OUT, ">${CATOP}/crlnumber";
+    print OUT "01\n";
+    close OUT;
+    # ask user for existing CA certificate
+    print "CA certificate filename (or enter to create)\n";
+    my $FILE;
+    $FILE = "" unless defined($FILE = <STDIN>);
+    $FILE =~ s{\R$}{};
+    if ($FILE ne "") {
+        copy_pemfile($FILE,"${CATOP}/private/$CAKEY", "PRIVATE");
+        copy_pemfile($FILE,"${CATOP}/$CACERT", "CERTIFICATE");
+    } else {
+        print "Making CA certificate ...\n";
+        $RET = run("$REQ -new -keyout ${CATOP}/private/$CAKEY"
+                . " -out ${CATOP}/$CAREQ $EXTRA{req}");
+        $RET = run("$CA -create_serial"
+                . " -out ${CATOP}/$CACERT $CADAYS -batch"
+                . " -keyfile ${CATOP}/private/$CAKEY -selfsign"
+                . " $EXTENSIONS"
+                . " -infiles ${CATOP}/$CAREQ $EXTRA{ca}") if $RET == 0;
+        print "CA certificate is in ${CATOP}/$CACERT\n" if $RET == 0;
+    }
+} elsif ($WHAT eq '-pkcs12' ) {
+    my $cname = $ARGV[0];
+    $cname = "My Certificate" unless defined $cname;
+    $RET = run("$PKCS12 -in $NEWCERT -inkey $NEWKEY"
+            . " -certfile ${CATOP}/$CACERT -out $NEWP12"
+            . " -export -name \"$cname\" $EXTRA{pkcs12}");
+    print "PKCS #12 file is in $NEWP12\n" if $RET == 0;
+} elsif ($WHAT eq '-xsign' ) {
+    $RET = run("$CA $POLICY -infiles $NEWREQ $EXTRA{ca}");
+} elsif ($WHAT eq '-sign' ) {
+    $RET = run("$CA $POLICY -out $NEWCERT"
+            . " -infiles $NEWREQ $EXTRA{ca}");
+    print "Signed certificate is in $NEWCERT\n" if $RET == 0;
+} elsif ($WHAT eq '-signCA' ) {
+    $RET = run("$CA $POLICY -out $NEWCERT"
+            . " $EXTENSIONS -infiles $NEWREQ $EXTRA{ca}");
+    print "Signed CA certificate is in $NEWCERT\n" if $RET == 0;
+} elsif ($WHAT eq '-signcert' ) {
+    $RET = run("$X509 -x509toreq -in $NEWREQ -signkey $NEWREQ"
+            . " -out tmp.pem $EXTRA{x509}");
+    $RET = run("$CA $POLICY -out $NEWCERT"
+            .  "-infiles tmp.pem $EXTRA{ca}") if $RET == 0;
+    print "Signed certificate is in $NEWCERT\n" if $RET == 0;
+} elsif ($WHAT eq '-verify' ) {
+    my @files = @ARGV ? @ARGV : ( $NEWCERT );
+    foreach my $file (@files) {
+        # -CAfile quoted for VMS, since the C RTL downcases all unquoted
+        # arguments to C programs
+        my $status = run("$VERIFY \"-CAfile\" ${CATOP}/$CACERT $file $EXTRA{verify}");
+        $RET = $status if $status != 0;
+    }
+} elsif ($WHAT eq '-crl' ) {
+    $RET = run("$CA -gencrl -out ${CATOP}/crl/$CACRL $EXTRA{ca}");
+    print "Generated CRL is in ${CATOP}/crl/$CACRL\n" if $RET == 0;
+} elsif ($WHAT eq '-revoke' ) {
+    my $cname = $ARGV[0];
+    if (!defined $cname) {
+        print "Certificate filename is required; reason optional.\n";
+        exit 1;
+    }
+    my $reason = $ARGV[1];
+    $reason = " -crl_reason $reason"
+        if defined $reason && crl_reason_ok($reason);
+    $RET = run("$CA -revoke \"$cname\"" . $reason . $EXTRA{ca});
+} else {
+    print STDERR "Unknown arg \"$WHAT\"\n";
+    print STDERR "Use -help for help.\n";
+    exit 1;
+}
+
+exit $RET;

electron/res/win/openssl/OpenSSL License.txt

@@ -1,126 +0,0 @@
-
-  LICENSE ISSUES
-  ==============
-
-  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
-  the OpenSSL License and the original SSLeay license apply to the toolkit.
-  See below for the actual license texts. Actually both licenses are BSD-style
-  Open Source licenses. In case of any license issues related to OpenSSL
-  please contact openssl-core@openssl.org.
-
-  OpenSSL License
-  ---------------
-
-/* ====================================================================
- * Copyright (c) 1998-2016 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
- Original SSLeay License
- -----------------------
-
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */

electron/res/win/openssl/ReadMe.txt

@@ -1,59 +0,0 @@
-=============================================================================
-OpenSSL v1.0.2q                                Precompiled Binaries for Win32
------------------------------------------------------------------------------
-
-                         *** Release Information ***
-
-Release Date:     Nov 22, 2018
-
-Author:           Frederik A. Winkelsdorf (opendec.wordpress.com)
-                  for the Indy Project (www.indyproject.org)
-
-Requirements:     Indy 10.5.5+ (SVN Version or Delphi 2009 and newer)
-
-Dependencies:     The libraries have no noteworthy dependencies
-
-Installation:     Copy both DLL files into your application directory
-
-Supported OS:     Windows 2000 up to Windows 10
-
------------------------------------------------------------------------------
-
-                          *** Legal Disclaimer ***
-
-THIS SOFTWARE IS PROVIDED BY ITS AUTHOR AND THE INDY PROJECT "AS IS" AND ANY 
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY 
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-OpenSSL license terms are provided in the file "OpenSSL License.txt".
-
-PLEASE CHECK IF YOU NEED TO COMPLY WITH EXPORT RESTRICTIONS FOR CRYPTOGRAPHIC
-SOFTWARE AND/OR PATENTS.
-
------------------------------------------------------------------------------
-
-                       *** Build Information Win32 ***
-
-Built with:       Microsoft Visual C++ 2008 Express Edition
-                  The Netwide Assembler (NASM) v2.11.08 Win32
-                  Strawberry Perl v5.22.0.1 Win32 Portable
-                  Windows PowerShell
-                  FinalBuilder 7
-
-Commands:         perl configure VC-WIN32
-                  ms\do_nasm
-                  adjusted ms\ntdll.mak       (replaced "/MD" with "/MT")
-                  adjusted ms\version32.rc    (Indy Information inserted)
-                  nmake -f ms\ntdll.mak
-                  nmake -f ms\ntdll.mak test
-                  editbin.exe /rebase:base=0x11000000 libeay32.dll
-                  editbin.exe /rebase:base=0x12000000 ssleay32.dll
-
-=============================================================================

electron/res/win/openssl/progs.pl

@@ -0,0 +1,218 @@
+#! /usr/bin/env perl
+# Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the Apache License 2.0 (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+# Generate progs.h file by looking for command mains in list of C files
+# passed on the command line.
+
+use strict;
+use warnings;
+use lib '.';
+use configdata qw/@disablables %unified_info/;
+
+my $opt          = shift @ARGV;
+die "Unrecognised option, must be -C or -H\n"
+    unless ($opt eq '-H' || $opt eq '-C');
+
+my %commands     = ();
+my $cmdre        = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/;
+my $apps_openssl = shift @ARGV;
+my $YEAR         = [gmtime($ENV{SOURCE_DATE_EPOCH} || time())]->[5] + 1900;
+
+# because the program apps/openssl has object files as sources, and
+# they then have the corresponding C files as source, we need to chain
+# the lookups in %unified_info
+my @openssl_source =
+    map { @{$unified_info{sources}->{$_}} }
+    grep { /\.o$/
+           && !$unified_info{attributes}->{sources}->{$apps_openssl}->{$_}->{nocheck} }
+        @{$unified_info{sources}->{$apps_openssl}};
+
+foreach my $filename (@openssl_source) {
+    open F, $filename or die "Couldn't open $filename: $!\n";
+    foreach ( grep /$cmdre/, <F> ) {
+        my @foo = /$cmdre/;
+        $commands{$1} = 1;
+    }
+    close F;
+}
+
+@ARGV = sort keys %commands;
+
+if ($opt eq '-H') {
+    print <<"EOF";
+/*
+ * WARNING: do not edit!
+ * Generated by apps/progs.pl
+ *
+ * Copyright 1995-$YEAR The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include "function.h"
+
+EOF
+
+    foreach (@ARGV) {
+        printf "extern int %s_main(int argc, char *argv[]);\n", $_;
+    }
+    print "\n";
+
+    foreach (@ARGV) {
+        printf "extern const OPTIONS %s_options[];\n", $_;
+    }
+    print "\n";
+    print "extern FUNCTION functions[];\n";
+}
+
+if ($opt eq '-C') {
+    print <<"EOF";
+/*
+ * WARNING: do not edit!
+ * Generated by apps/progs.pl
+ *
+ * Copyright 1995-$YEAR The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include "progs.h"
+
+EOF
+
+    my %cmd_disabler = (
+        ciphers  => "sock",
+        genrsa   => "rsa",
+        gendsa   => "dsa",
+        dsaparam => "dsa",
+        gendh    => "dh",
+        dhparam  => "dh",
+        ecparam  => "ec",
+    );
+    my %cmd_deprecated = (
+# The format of this table is:
+#   [0] = alternative command to use instead
+#   [1] = deprecented in this version
+#   [2] = preprocessor conditional for excluding irrespective of deprecation
+#        rsa      => [ "pkey",      "3_0", "rsa" ],
+#        genrsa   => [ "genpkey",   "3_0", "rsa" ],
+        rsautl   => [ "pkeyutl",   "3_0", "rsa" ],
+#        dhparam  => [ "pkeyparam", "3_0", "dh"  ],
+#        dsaparam => [ "pkeyparam", "3_0", "dsa" ],
+#        dsa      => [ "pkey",      "3_0", "dsa" ],
+#        gendsa   => [ "genpkey",   "3_0", "dsa" ],
+#        ec       => [ "pkey",      "3_0", "ec"  ],
+#        ecparam  => [ "pkeyparam", "3_0", "ec"  ],
+    );
+
+    print "FUNCTION functions[] = {\n";
+    foreach my $cmd ( @ARGV ) {
+        my $str =
+            "    {FT_general, \"$cmd\", ${cmd}_main, ${cmd}_options, NULL, NULL},\n";
+        if ($cmd =~ /^s_/) {
+            print "#ifndef OPENSSL_NO_SOCK\n${str}#endif\n";
+        } elsif (my $deprecated = $cmd_deprecated{$cmd}) {
+            my @dep = @{$deprecated};
+            my $daltprg = $dep[0];
+            my $dver = $dep[1];
+            my $dsys = $dep[2];
+            print "#if !defined(OPENSSL_NO_DEPRECATED_" . $dver . ")";
+            if ($dsys) {
+                print " && !defined(OPENSSL_NO_" . uc($dsys) . ")";
+            }
+            $dver =~ s/_/./g;
+            my $dalt = "\"" . $daltprg . "\", \"" . $dver . "\"";
+            $str =~ s/NULL, NULL/$dalt/;
+            print "\n${str}#endif\n";
+        } elsif (grep { $cmd eq $_ } @disablables) {
+            print "#ifndef OPENSSL_NO_" . uc($cmd) . "\n${str}#endif\n";
+        } elsif (my $disabler = $cmd_disabler{$cmd}) {
+            print "#ifndef OPENSSL_NO_" . uc($disabler) . "\n${str}#endif\n";
+        } else {
+            print $str;
+        }
+    }
+
+    my %md_disabler = (
+        blake2b512 => "blake2",
+        blake2s256 => "blake2",
+    );
+    foreach my $cmd (
+        "md2", "md4", "md5",
+        "sha1", "sha224", "sha256", "sha384",
+        "sha512", "sha512-224", "sha512-256",
+        "sha3-224", "sha3-256", "sha3-384", "sha3-512",
+        "shake128", "shake256",
+        "mdc2", "rmd160", "blake2b512", "blake2s256",
+        "sm3"
+    ) {
+        my $str = "    {FT_md, \"$cmd\", dgst_main, NULL, NULL},\n";
+        if (grep { $cmd eq $_ } @disablables) {
+            print "#ifndef OPENSSL_NO_" . uc($cmd) . "\n${str}#endif\n";
+        } elsif (my $disabler = $md_disabler{$cmd}) {
+            print "#ifndef OPENSSL_NO_" . uc($disabler) . "\n${str}#endif\n";
+        } else {
+            print $str;
+        }
+    }
+
+    my %cipher_disabler = (
+        des3  => "des",
+        desx  => "des",
+        cast5 => "cast",
+    );
+    foreach my $cmd (
+        "aes-128-cbc", "aes-128-ecb",
+        "aes-192-cbc", "aes-192-ecb",
+        "aes-256-cbc", "aes-256-ecb",
+        "aria-128-cbc", "aria-128-cfb",
+        "aria-128-ctr", "aria-128-ecb", "aria-128-ofb",
+        "aria-128-cfb1", "aria-128-cfb8",
+        "aria-192-cbc", "aria-192-cfb",
+        "aria-192-ctr", "aria-192-ecb", "aria-192-ofb",
+        "aria-192-cfb1", "aria-192-cfb8",
+        "aria-256-cbc", "aria-256-cfb",
+        "aria-256-ctr", "aria-256-ecb", "aria-256-ofb",
+        "aria-256-cfb1", "aria-256-cfb8",
+        "camellia-128-cbc", "camellia-128-ecb",
+        "camellia-192-cbc", "camellia-192-ecb",
+        "camellia-256-cbc", "camellia-256-ecb",
+        "base64", "zlib", "brotli", "zstd",
+        "des", "des3", "desx", "idea", "seed", "rc4", "rc4-40",
+        "rc2", "bf", "cast", "rc5",
+        "des-ecb", "des-ede", "des-ede3",
+        "des-cbc", "des-ede-cbc","des-ede3-cbc",
+        "des-cfb", "des-ede-cfb","des-ede3-cfb",
+        "des-ofb", "des-ede-ofb","des-ede3-ofb",
+        "idea-cbc","idea-ecb", "idea-cfb", "idea-ofb",
+        "seed-cbc","seed-ecb", "seed-cfb", "seed-ofb",
+        "rc2-cbc", "rc2-ecb", "rc2-cfb","rc2-ofb", "rc2-64-cbc", "rc2-40-cbc",
+        "bf-cbc", "bf-ecb", "bf-cfb", "bf-ofb",
+        "cast5-cbc","cast5-ecb", "cast5-cfb","cast5-ofb",
+        "cast-cbc", "rc5-cbc", "rc5-ecb", "rc5-cfb", "rc5-ofb",
+        "sm4-cbc", "sm4-ecb", "sm4-cfb", "sm4-ofb", "sm4-ctr"
+    ) {
+        my $str = "    {FT_cipher, \"$cmd\", enc_main, enc_options, NULL},\n";
+        (my $algo = $cmd) =~ s/-.*//g;
+        if (grep { $algo eq $_ } @disablables) {
+            print "#ifndef OPENSSL_NO_" . uc($algo) . "\n${str}#endif\n";
+        } elsif (my $disabler = $cipher_disabler{$algo}) {
+            print "#ifndef OPENSSL_NO_" . uc($disabler) . "\n${str}#endif\n";
+        } else {
+            print $str;
+        }
+    }
+
+    print "    {0, NULL, NULL, NULL, NULL}\n};\n";
+}

electron/res/win/openssl/tsget.pl

@@ -0,0 +1,200 @@
+#!/usr/bin/env perl
+# Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright (c) 2002 The OpenTSA Project. All rights reserved.
+#
+# Licensed under the Apache License 2.0 (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+use strict;
+use IO::Handle;
+use Getopt::Std;
+use File::Basename;
+use WWW::Curl::Easy;
+
+use vars qw(%options);
+
+# Callback for reading the body.
+sub read_body {
+    my ($maxlength, $state) = @_;
+    my $return_data = "";
+    my $data_len = length ${$state->{data}};
+    if ($state->{bytes} < $data_len) {
+        $data_len = $data_len - $state->{bytes};
+        $data_len = $maxlength if $data_len > $maxlength;
+        $return_data = substr ${$state->{data}}, $state->{bytes}, $data_len;
+        $state->{bytes} += $data_len;
+    }
+    return $return_data;
+}
+
+# Callback for writing the body into a variable.
+sub write_body {
+    my ($data, $pointer) = @_;
+    ${$pointer} .= $data;
+    return length($data);
+}
+
+# Initialise a new Curl object.
+sub create_curl {
+    my $url = shift;
+
+    # Create Curl object.
+    my $curl = WWW::Curl::Easy::new();
+
+    # Error-handling related options.
+    $curl->setopt(CURLOPT_VERBOSE, 1) if $options{d};
+    $curl->setopt(CURLOPT_FAILONERROR, 1);
+    $curl->setopt(CURLOPT_USERAGENT,
+        "OpenTSA tsget.pl/openssl-3.3.1");
+
+    # Options for POST method.
+    $curl->setopt(CURLOPT_UPLOAD, 1);
+    $curl->setopt(CURLOPT_CUSTOMREQUEST, "POST");
+    $curl->setopt(CURLOPT_HTTPHEADER,
+        ["Content-Type: application/timestamp-query",
+        "Accept: application/timestamp-reply,application/timestamp-response"]);
+    $curl->setopt(CURLOPT_READFUNCTION, \&read_body);
+    $curl->setopt(CURLOPT_HEADERFUNCTION, sub { return length($_[0]); });
+
+    # Options for getting the result.
+    $curl->setopt(CURLOPT_WRITEFUNCTION, \&write_body);
+
+    # SSL related options.
+    $curl->setopt(CURLOPT_SSLKEYTYPE, "PEM");
+    $curl->setopt(CURLOPT_SSL_VERIFYPEER, 1);    # Verify server's certificate.
+    $curl->setopt(CURLOPT_SSL_VERIFYHOST, 2);    # Check server's CN.
+    $curl->setopt(CURLOPT_SSLKEY, $options{k}) if defined($options{k});
+    $curl->setopt(CURLOPT_SSLKEYPASSWD, $options{p}) if defined($options{p});
+    $curl->setopt(CURLOPT_SSLCERT, $options{c}) if defined($options{c});
+    $curl->setopt(CURLOPT_CAINFO, $options{C}) if defined($options{C});
+    $curl->setopt(CURLOPT_CAPATH, $options{P}) if defined($options{P});
+    $curl->setopt(CURLOPT_RANDOM_FILE, $options{r}) if defined($options{r});
+    $curl->setopt(CURLOPT_EGDSOCKET, $options{g}) if defined($options{g});
+
+    # Setting destination.
+    $curl->setopt(CURLOPT_URL, $url);
+
+    return $curl;
+}
+
+# Send a request and returns the body back.
+sub get_timestamp {
+    my $curl = shift;
+    my $body = shift;
+    my $ts_body;
+    local $::error_buf;
+
+    # Error-handling related options.
+    $curl->setopt(CURLOPT_ERRORBUFFER, "::error_buf");
+
+    # Options for POST method.
+    $curl->setopt(CURLOPT_INFILE, {data => $body, bytes => 0});
+    $curl->setopt(CURLOPT_INFILESIZE, length(${$body}));
+
+    # Options for getting the result.
+    $curl->setopt(CURLOPT_FILE, \$ts_body);
+
+    # Send the request...
+    my $error_code = $curl->perform();
+    my $error_string;
+    if ($error_code != 0) {
+        my $http_code = $curl->getinfo(CURLINFO_HTTP_CODE);
+        $error_string = "could not get timestamp";
+        $error_string .= ", http code: $http_code" unless $http_code == 0;
+        $error_string .= ", curl code: $error_code";
+        $error_string .= " ($::error_buf)" if defined($::error_buf);
+    } else {
+        my $ct = $curl->getinfo(CURLINFO_CONTENT_TYPE);
+        if (lc($ct) ne "application/timestamp-reply"
+            && lc($ct) ne "application/timestamp-response") {
+            $error_string = "unexpected content type returned: $ct";
+        }
+    }
+    return ($ts_body, $error_string);
+
+}
+
+# Print usage information and exists.
+sub usage {
+
+    print STDERR "usage: $0 -h <server_url> [-e <extension>] [-o <output>] ";
+    print STDERR "[-v] [-d] [-k <private_key.pem>] [-p <key_password>] ";
+    print STDERR "[-c <client_cert.pem>] [-C <CA_certs.pem>] [-P <CA_path>] ";
+    print STDERR "[-r <file:file...>] [-g <EGD_socket>] [<request>]...\n";
+    exit 1;
+}
+
+# ----------------------------------------------------------------------
+#   Main program
+# ----------------------------------------------------------------------
+
+# Getting command-line options (default comes from TSGET environment variable).
+my $getopt_arg =  "h:e:o:vdk:p:c:C:P:r:g:";
+if (exists $ENV{TSGET}) {
+    my @old_argv = @ARGV;
+    @ARGV = split /\s+/, $ENV{TSGET};
+    getopts($getopt_arg, \%options) or usage;
+    @ARGV = @old_argv;
+}
+getopts($getopt_arg, \%options) or usage;
+
+# Checking argument consistency.
+if (!exists($options{h}) || (@ARGV == 0 && !exists($options{o}))
+    || (@ARGV > 1 && exists($options{o}))) {
+    print STDERR "Inconsistent command line options.\n";
+    usage;
+}
+# Setting defaults.
+@ARGV = ("-") unless @ARGV != 0;
+$options{e} = ".tsr" unless defined($options{e});
+
+# Processing requests.
+my $curl = create_curl $options{h};
+undef $/;   # For reading whole files.
+REQUEST: foreach (@ARGV) {
+    my $input = $_;
+    my ($base, $path) = fileparse($input, '\.[^.]*');
+    my $output_base = $base . $options{e};
+    my $output = defined($options{o}) ? $options{o} : $path . $output_base;
+
+    STDERR->printflush("$input: ") if $options{v};
+    # Read request.
+    my $body;
+    if ($input eq "-") {
+        # Read the request from STDIN;
+        $body = <STDIN>;
+    } else {
+        # Read the request from file.
+        open INPUT, "<" . $input
+            or warn("$input: could not open input file: $!\n"), next REQUEST;
+        $body = <INPUT>;
+        close INPUT
+            or warn("$input: could not close input file: $!\n"), next REQUEST;
+    }
+
+    # Send request.
+    STDERR->printflush("sending request") if $options{v};
+
+    my ($ts_body, $error) = get_timestamp $curl, \$body;
+    if (defined($error)) {
+        die "$input: fatal error: $error\n";
+    }
+    STDERR->printflush(", reply received") if $options{v};
+
+    # Write response.
+    if ($output eq "-") {
+        # Write to STDOUT.
+        print $ts_body;
+    } else {
+        # Write to file.
+        open OUTPUT, ">", $output
+            or warn("$output: could not open output file: $!\n"), next REQUEST;
+        print OUTPUT $ts_body;
+        close OUTPUT
+            or warn("$output: could not close output file: $!\n"), next REQUEST;
+    }
+    STDERR->printflush(", $output written.\n") if $options{v};
+}
+$curl->cleanup();

index.html

@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
+    <meta charset="UTF-8"/>
+    <link rel="icon" href="/favicon.ico"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';"/>
     <title>爱享素材下载器</title>
   </head>
   <body>

package.json

@@ -1,9 +1,13 @@
 {
   "name": "res-downloader",
-  "version": "2.1.0",
+  "version": "2.1.3",
   "main": "dist-electron/main/index.js",
   "description": "res-downloader(爱享素材下载器)，支持视频号、小程序、抖音、快手、小红书、酷狗音乐、qq音乐、qq短视频等",
-  "author": "putyy@qq.com",
+  "homepage": "https://github.com/putyy/res-downloader",
+  "author": {
+    "name": "putyy",
+    "email": "putyy@qq.com"
+  },
   "license": "MIT",
   "private": true,
   "keywords": [
@@ -54,8 +58,6 @@
   },
   "dependencies": {
     "axios": "^1.5.0",
-    "electron-store": "^8.1.0",
-    "getmac": "^5.20.0",
     "hoxy": "^3.3.1",
     "tunnel-agent": "^0.6.0"
   }

src/components/layout/Footer.vue

@@ -2,53 +2,17 @@
 import {ipcRenderer} from 'electron'
 import pkg from '../../../package.json'
 const v = pkg.version
-const jump = (scene: number)=>{
-  switch (scene) {
-    case 1:
-      ipcRenderer.invoke('invoke_open_default_browser', {
-        url: "https://s.gowas.cn/d/4089-quan-ping-tai-zi-yuan-xia-zai-ruan-jian"
-      })
-      break;
-    case 2:
-      ipcRenderer.invoke('invoke_open_default_browser', {
-        url: "https://s.gowas.cn"
-      })
-      break;
-    case 3:
-      ipcRenderer.invoke('invoke_open_default_browser', {
-        url: "https://i.gowas.cn"
-      })
-      break;
-    case 4:
-      ipcRenderer.invoke('invoke_open_default_browser', {
-        url: "https://s.gowas.cn/d/4089-quan-ping-tai-zi-yuan-xia-zai-ruan-jian"
-      })
-      break;
-    case 5:
-      ipcRenderer.invoke('invoke_open_default_browser', {
-        url: "https://www.ais.do/ivi/rr2GaZ"
-      })
-      break;
-    case 6:
-      ipcRenderer.invoke('invoke_open_default_browser', {
-        url: "https://github.com/putyy/res-downloader"
-      })
-      break;
-  }
+const jump = (url: string)=>{
+  ipcRenderer.invoke('invoke_open_default_browser', {
+    url: url
+  })
 }
 </script>
 <template lang="pug">
 div.line
   a.item 当前版本: {{v}}
-  a.item 站长邮箱: gowas.work@gmail.com
-  a.item(@click="jump(1)") 获取更新
-  a.item(@click="jump(4)") 问题反馈
-div.line
-  a.item 推荐:
-  a.item(@click="jump(5)") Ai助手(免费)
-  a.item(@click="jump(2)") 网盘资源
-  a.item(@click="jump(3)") 图片无损压缩
-  a.item(@click="jump(6)") 软件源码
+  a.item(@click="jump('https://s.gowas.cn/d/4089-quan-ping-tai-zi-yuan-xia-zai-ruan-jian')") 获取更新&问题反馈
+  a.item(@click="jump('https://github.com/putyy/res-downloader')") 软件源码
 </template>
 
 <style lang="less" scoped>

src/components/layout/Index.vue

@@ -16,8 +16,8 @@ el-container
         keep-alive(v-if="route.meta.keepAlive")
           component(:is="Component")
         component(v-else :is="Component")
-    el-footer
-      Footer
+      el-footer
+        Footer
 </template>
 
 <style lang="less" scoped>
@@ -27,4 +27,9 @@ el-container
 .el-main {
   text-align: center;
 }
+.el-footer{
+  margin: unset !important;
+  padding: unset !important;
+  height: auto !important;
+}
 </style>

src/views/About.vue

@@ -30,6 +30,7 @@ const str = "使用方法\n" +
     "     2. 软件首页选择要获取的资源类型（默认选中的视频）\n" +
     "     3. 打开要捕获的源， 如：视频号、网页、小程序等等\n" +
     "     4. 返回软件首页即可看到要下载的资源\n" +
+    "     5. 直播流复制的链接如何使用？可以使用obs或者ffmpeg命令\n" +
     "常见问题\n" +
     "     1. 无法拦截获取\n" +
     "        手动检测系统代理是否设置正确 本软件代理地址: 127.0.0.1:8899\n" +
@@ -56,8 +57,7 @@ div.about
     el-button(@click="jump(3)") 获取更新
   div 4. 问题反馈  
     el-button(@click="jump(4)") 点击前往
-  div.more
-    pre {{str}}
+  div.more {{str}}
 
 </template>
 
@@ -74,7 +74,9 @@ div.about
     white-space: pre-wrap;
   }
   .more{
-
+    width: 100%; /* 设置容器宽度 */
+    white-space: pre-wrap;
+    overflow-wrap: break-word; /* 允许在单词边界内换行 */
   }
 }
 </style>

src/views/Index.vue

@@ -20,24 +20,51 @@ interface resData {
 
 const tableData = ref<resData[]>([])
 
-const resType = ref({
-  video: true,
-  audio: true,
-  image: false,
-  m3u8: false
-})
-
 
 const isInitApp = ref(false)
 
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const multipleSelection = ref<resData[]>([])
 const loading = ref()
+const resType = ref(["all"])
+const typeOptions = ref([
+  {
+    value: "all",
+    label: "全部",
+  },
+  {
+    value: "image",
+    label: "图片",
+  }, {
+    value: "audio",
+    label: "音频"
+  }, {
+    value: "video",
+    label: "视频"
+  }, {
+    value: "m3u8",
+    label: "m3u8"
+  }, {
+    value: "live",
+    label: "直播流"
+  }, {
+    value: "xls",
+    label: "文档"
+  }, {
+    value: "doc",
+    label: "doc"
+  }, {
+    value: "pdf",
+    label: "pdf"
+  }
+])
+
+const tableHeight = ref(400)
 
 onMounted(() => {
-  let resTypeCache = localStorageCache.get("res-type")
+  let resTypeCache = localStorageCache.get("res-type-arr")
   if (resTypeCache) {
-    resType.value = resTypeCache
+    resType.value = resTypeCache.split(",")
   }
 
   let tableDataCache = localStorageCache.get("res-table-data")
@@ -47,7 +74,7 @@ onMounted(() => {
 
   ipcRenderer.on('on_get_queue', (res, data) => {
     // @ts-ignore
-    if (resType.value.hasOwnProperty(data.type_str) && resType.value[data.type_str]) {
+    if (resType.value.includes("all") || resType.value.includes(data.type_str)) {
       tableData.value.push(data)
       localStorageCache.set("res-table-data", tableData.value, -1)
     }
@@ -79,6 +106,8 @@ onMounted(() => {
     })
     loading.value.close()
   })
+  window.addEventListener("resize", handleResize);
+  handleResize()
 })
 
 onUnmounted(() => {
@@ -92,9 +121,14 @@ onUnmounted(() => {
 })
 
 watch(resType, (res, res1) => {
-  localStorageCache.set("res-type", resType.value, -1)
+  localStorageCache.set("res-type-arr", resType.value.join(","), -1)
 }, {deep: true})
 
+const handleResize = () => {
+  const height = document.documentElement.clientHeight || window.innerHeight;
+  tableHeight.value = height - 115
+}
+
 const handleSelectionChange = (val: resData[]) => {
   multipleSelection.value = val
 }
@@ -270,55 +304,63 @@ const handleInitApp = () => {
 
 <template lang="pug">
 el-container.container
-  el-header
-    el-row
-      div
-        el-button(type="primary" @click="handleBatchDown") 批量下载
-        el-button(v-if="isInitApp" @click="handleInitApp")
-          el-icon
-            Promotion
-          p 安装检测(如果看到此按钮说明软件安装未完成则需要手动点击此按钮)
-        el-button(@click="handleClear")
-          el-icon
-            Delete
-          p 清空列表
-        el-button(@click="resType.video=!resType.video" :type="resType.video ? 'primary' : 'info'" ) 视频
-        el-button(@click="resType.audio=!resType.audio" :type="resType.audio ? 'primary' : 'info'" ) 音频
-        el-button(@click="resType.image=!resType.image" :type="resType.image ? 'primary' : 'info'" ) 图片
-        el-button(@click="resType.m3u8=!resType.m3u8" :type="resType.m3u8 ? 'primary' : 'info'" ) m3u8
-        a(style="color: red") &nbsp;&nbsp;&nbsp;点击左边选项，选择需要拦截的资源类型
-  el-main
-    el-table(ref="multipleTableRef" @selection-change="handleSelectionChange" :data="tableData" max-height="100%" stripe)
-      el-table-column(type="selection")
-      el-table-column(label="预览" show-overflow-tooltip width="150px")
-        template(#default="scope")
-          div.show_res
-            video.video(v-if="scope.row.type_str === 'video'" :src="scope.row.url" controls preload="none")
-            img.img(v-if="scope.row.type_str === 'image'" :src="scope.row.url" crossorigin="anonymous")
-            audio.audio(v-if="scope.row.type_str === 'audio'" controls preload="none")
-              source(:src="scope.row.url" :type="scope.row.type")
-            div {{scope.row.description}}
-      el-table-column(prop="type_str" label="类型" show-overflow-tooltip)
-      el-table-column(prop="platform" label="主机地址")
-      el-table-column(prop="size" label="资源大小")
-      el-table-column(prop="save_path" label="保存目录")
-      el-table-column(prop="progress_bar" label="下载进度")
-      el-table-column(label="操作" width="135px" )
-        template(#default="scope")
-          div.actions
-            template(v-if="scope.row.type_str !== 'm3u8'" )
-              el-button(link type="primary" @click="handleDown(scope.$index, scope.row)") {{scope.row.decode_key || scope.row.decryptor_array ? "解密下载(视频号)" : "下载"}}
-              el-button(v-if="scope.row.decode_key || scope.row.decryptor_array" link type="primary" @click="decodeWxFile(scope.$index)") 视频解密(视频号)
-              el-button(link type="primary" @click="handlePreview(scope.$index, scope.row)") 窗口预览
-            el-button(link type="primary" @click="handleCopy(scope.row.url)") 复制链接
-            el-button(link type="primary" @click="handleDel(scope.$index)") 删除
-            el-button(v-if="scope.row.save_path" link type="primary" @click="openFileDir(scope.$index)") 打开文件目录
+  el-header(style="display:flex;align-items: center")
+    el-button(type="primary" @click="handleBatchDown") 批量下载
+    el-button(v-if="isInitApp" @click="handleInitApp")
+      el-icon
+        Promotion
+      p 安装检测(如果看到此按钮说明软件安装未完成则需要手动点击此按钮)
+    el-button(@click="handleClear")
+      el-icon
+        Delete
+      p 清空列表
+    el-select(
+      v-model="resType"
+      multiple
+      collapse-tags
+      collapse-tags-tooltip
+      :max-collapse-tags="3"
+      placeholder="资源拦截类型"
+      style="width: auto;min-width:130px"
+    )
+      el-option(v-for="item in typeOptions"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value")
+  el-table(ref="multipleTableRef" @selection-change="handleSelectionChange" :data="tableData" :height="tableHeight" max-height="100%" stripe)
+    el-table-column(type="selection")
+    el-table-column(label="预览" show-overflow-tooltip width="150px")
+      template(#default="scope")
+        div.show_res
+          video.video(v-if="scope.row.type_str === 'video'" :src="scope.row.url" controls preload="none")
+          img.img(v-if="scope.row.type_str === 'image'" :src="scope.row.url" crossorigin="anonymous")
+          audio.audio(v-if="scope.row.type_str === 'audio'" controls preload="none")
+            source(:src="scope.row.url" :type="scope.row.type")
+          div(v-if="scope.row.type_str !== 'video' && scope.row.type_str !== 'image' && scope.row.type_str !== 'audio'") {{scope.row.type_str}}类型无法预览
+          div {{scope.row.description}}
+    el-table-column(prop="type_str" label="类型" show-overflow-tooltip)
+    el-table-column(prop="platform" label="主机地址")
+    el-table-column(prop="size" label="资源大小")
+    el-table-column(prop="save_path" label="保存目录" width="135px" :show-overflow-tooltip="true")
+    el-table-column(prop="progress_bar" label="下载进度")
+    el-table-column(label="操作" width="135px" )
+      template(#default="scope")
+        div.actions
+          template(v-if="scope.row.type_str !== 'm3u8' && scope.row.type_str !== 'live'" )
+            el-button(link type="primary" @click="handleDown(scope.$index, scope.row)") {{scope.row.decode_key || scope.row.decryptor_array ? "解密下载(视频号)" : "下载"}}
+            el-button(v-if="scope.row.decode_key || scope.row.decryptor_array" link type="primary" @click="decodeWxFile(scope.$index)") 视频解密(视频号)
+            el-button(link type="primary" @click="handlePreview(scope.$index, scope.row)") 窗口预览
+          el-button(link type="primary" @click="handleCopy(scope.row.url)") 复制链接
+          el-button(link type="primary" @click="handleDel(scope.$index)") 删除
+          el-button(v-if="scope.row.save_path" link type="primary" @click="openFileDir(scope.$index)") 打开文件目录
 </template>
 
 <style scoped lang="less">
 .container {
   padding: 0.5rem;
-
+  .el-table{
+    padding-top: 1rem;
+  }
   .el-button {
     margin: 0.1rem;
   }