mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-11-16 07:52:06 +08:00
chore: trim excessive comments
This commit is contained in:
@@ -3,19 +3,12 @@ import fs from 'fs/promises'
|
||||
import path from 'path'
|
||||
import { promisify } from 'util'
|
||||
|
||||
/**
|
||||
* 为Alpha版本重命名版本号
|
||||
*/
|
||||
const execPromise = promisify(exec)
|
||||
|
||||
/**
|
||||
* 标准输出HEAD hash
|
||||
*/
|
||||
async function getLatestCommitHash() {
|
||||
try {
|
||||
const { stdout } = await execPromise('git rev-parse HEAD')
|
||||
const commitHash = stdout.trim()
|
||||
// 格式化,只截取前7位字符
|
||||
const formathash = commitHash.substring(0, 7)
|
||||
console.log(`Found the latest commit hash code: ${commitHash}`)
|
||||
return formathash
|
||||
@@ -24,31 +17,20 @@ async function getLatestCommitHash() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string 传入格式化后的hash
|
||||
* 将新的版本号写入文件 package.json
|
||||
*/
|
||||
async function updatePackageVersion(newVersion) {
|
||||
// 获取内容根目录
|
||||
const _dirname = process.cwd()
|
||||
const packageJsonPath = path.join(_dirname, 'package.json')
|
||||
try {
|
||||
// 读取文件
|
||||
const data = await fs.readFile(packageJsonPath, 'utf8')
|
||||
const packageJson = JSON.parse(data)
|
||||
// 获取键值替换
|
||||
let result = packageJson.version.replace('alpha', newVersion)
|
||||
// 检查当前版本号是否已经包含了 alpha- 后缀
|
||||
if (!packageJson.version.includes(`alpha-`)) {
|
||||
// 如果只有 alpha 而没有 alpha-,则替换为 alpha-newVersion
|
||||
result = packageJson.version.replace('alpha', `alpha-${newVersion}`)
|
||||
} else {
|
||||
// 如果已经是 alpha-xxx 格式,则更新 xxx 部分
|
||||
result = packageJson.version.replace(/alpha-[^-]*/, `alpha-${newVersion}`)
|
||||
}
|
||||
console.log('[INFO]: Current version is: ', result)
|
||||
packageJson.version = result
|
||||
// 写入版本号
|
||||
await fs.writeFile(
|
||||
packageJsonPath,
|
||||
JSON.stringify(packageJson, null, 2),
|
||||
|
||||
+8
-47
@@ -13,14 +13,7 @@ import { extract } from 'tar'
|
||||
import { resolveServiceRelease } from './service-release.mjs'
|
||||
import { log_debug, log_error, log_info, log_success } from './utils.mjs'
|
||||
|
||||
/**
|
||||
* Prebuild script with optimization features:
|
||||
* 1. Skip downloading mihomo core if it already exists (unless --force is used)
|
||||
* 2. Cache version information for 1 hour to avoid repeated version checks
|
||||
* 3. Use file hash to detect changes and skip unnecessary chmod/copy operations
|
||||
* 4. Use --force or -f flag to force re-download and update all resources
|
||||
*
|
||||
*/
|
||||
/** Prepares platform resources, caching versions and unchanged files unless `--force` is used. */
|
||||
|
||||
const cwd = process.cwd()
|
||||
const TEMP_DIR = path.join(cwd, 'node_modules/.verge')
|
||||
@@ -76,9 +69,7 @@ const SIDECAR_DIR = path.join(cwd, 'src-tauri', 'sidecar')
|
||||
// Linux service binaries are bundled as externalBin sidecars (see tauri.linux.conf.json)
|
||||
const SERVICE_DIR = platform === 'linux' ? SIDECAR_DIR : RESOURCES_DIR
|
||||
|
||||
// =======================
|
||||
// Version Cache
|
||||
// =======================
|
||||
// Version cache
|
||||
async function loadVersionCache() {
|
||||
try {
|
||||
if (fs.existsSync(VERSION_CACHE_FILE)) {
|
||||
@@ -114,9 +105,7 @@ async function setCachedVersion(key, version) {
|
||||
await saveVersionCache(cache)
|
||||
}
|
||||
|
||||
// =======================
|
||||
// Hash Cache & File Hash
|
||||
// =======================
|
||||
// File hash cache
|
||||
async function calculateFileHash(filePath) {
|
||||
try {
|
||||
const fileBuffer = await fsp.readFile(filePath)
|
||||
@@ -170,9 +159,7 @@ async function updateHashCache(targetPath) {
|
||||
}
|
||||
}
|
||||
|
||||
// =======================
|
||||
// Meta maps (stable & alpha)
|
||||
// =======================
|
||||
// Mihomo release maps
|
||||
const META_ALPHA_VERSION_URL =
|
||||
'https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha/version.txt'
|
||||
const META_ALPHA_URL_PREFIX = `https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha`
|
||||
@@ -211,9 +198,7 @@ const META_MAP = {
|
||||
'linux-loong64': 'mihomo-linux-loong64',
|
||||
}
|
||||
|
||||
// =======================
|
||||
// Fetch latest versions
|
||||
// =======================
|
||||
// Release discovery
|
||||
async function getLatestAlphaVersion() {
|
||||
if (!FORCE) {
|
||||
const cached = await getCachedVersion('META_ALPHA_VERSION')
|
||||
@@ -280,9 +265,6 @@ async function getLatestReleaseVersion() {
|
||||
}
|
||||
}
|
||||
|
||||
// =======================
|
||||
// Validate availability
|
||||
// =======================
|
||||
if (!META_MAP[`${platform}-${arch}`]) {
|
||||
throw new Error(`clash meta unsupported platform "${platform}-${arch}"`)
|
||||
}
|
||||
@@ -290,9 +272,6 @@ if (!META_ALPHA_MAP[`${platform}-${arch}`]) {
|
||||
throw new Error(`clash meta alpha unsupported platform "${platform}-${arch}"`)
|
||||
}
|
||||
|
||||
// =======================
|
||||
// Build meta objects
|
||||
// =======================
|
||||
function clashMetaAlpha() {
|
||||
const name = META_ALPHA_MAP[`${platform}-${arch}`]
|
||||
const isWin = platform === 'win32'
|
||||
@@ -319,9 +298,6 @@ function clashMeta() {
|
||||
}
|
||||
}
|
||||
|
||||
// =======================
|
||||
// download helper (增强:status + magic bytes)
|
||||
// =======================
|
||||
async function downloadFile(url, outPath) {
|
||||
const options = {}
|
||||
const httpProxy =
|
||||
@@ -338,7 +314,6 @@ async function downloadFile(url, outPath) {
|
||||
})
|
||||
if (!response.ok) {
|
||||
const body = await response.text().catch(() => '')
|
||||
// 将 body 写到文件以便排查(可通过临时目录查看)
|
||||
await fsp.mkdir(path.dirname(outPath), { recursive: true })
|
||||
await fsp.writeFile(outPath, body)
|
||||
throw new Error(`Failed to download ${url}: status ${response.status}`)
|
||||
@@ -347,7 +322,6 @@ async function downloadFile(url, outPath) {
|
||||
const buf = Buffer.from(await response.arrayBuffer())
|
||||
await fsp.mkdir(path.dirname(outPath), { recursive: true })
|
||||
|
||||
// 简单 magic 字节检查
|
||||
if (url.endsWith('.gz') || url.endsWith('.tgz')) {
|
||||
if (!(buf[0] === 0x1f && buf[1] === 0x8b)) {
|
||||
await fsp.writeFile(outPath, buf)
|
||||
@@ -368,9 +342,6 @@ async function downloadFile(url, outPath) {
|
||||
log_success(`download finished: ${url}`)
|
||||
}
|
||||
|
||||
// =======================
|
||||
// resolveSidecar (支持 zip / tgz / gz)
|
||||
// =======================
|
||||
async function resolveSidecar(binInfo) {
|
||||
const { name, targetFile, zipFile, exeFile, downloadURL } = binInfo
|
||||
const sidecarPath = path.join(SIDECAR_DIR, targetFile)
|
||||
@@ -397,11 +368,9 @@ async function resolveSidecar(binInfo) {
|
||||
log_debug(`"${name}" entry: ${entry.entryName}`)
|
||||
})
|
||||
zip.extractAllTo(tempDir, true)
|
||||
// 尝试按 exeFile 重命名,否则找第一个可执行文件
|
||||
if (fs.existsSync(tempExe)) {
|
||||
await fsp.rename(tempExe, sidecarPath)
|
||||
} else {
|
||||
// 搜索候选
|
||||
const files = await fsp.readdir(tempDir)
|
||||
const candidate = files.find(
|
||||
(f) =>
|
||||
@@ -419,7 +388,6 @@ async function resolveSidecar(binInfo) {
|
||||
await extract({ cwd: tempDir, file: tempZip })
|
||||
const files = await fsp.readdir(tempDir)
|
||||
log_debug(`"${name}" extracted files:`, files)
|
||||
// 优先寻找给定 exeFile 或已知前缀
|
||||
let extracted = files.find(
|
||||
(f) =>
|
||||
f === path.basename(exeFile) ||
|
||||
@@ -432,7 +400,6 @@ async function resolveSidecar(binInfo) {
|
||||
await fsp.chmod(sidecarPath, 0o755)
|
||||
log_success(`tgz processed: "${name}"`)
|
||||
} else {
|
||||
// .gz
|
||||
const readStream = fs.createReadStream(tempZip)
|
||||
const writeStream = fs.createWriteStream(sidecarPath)
|
||||
await new Promise((resolve, reject) => {
|
||||
@@ -496,7 +463,7 @@ async function resolveResource(binInfo) {
|
||||
log_success(`${file} finished`)
|
||||
}
|
||||
|
||||
// SimpleSC.dll (win plugin)
|
||||
// Windows NSIS plugin
|
||||
const resolvePlugin = async () => {
|
||||
const url =
|
||||
'https://nsis.sourceforge.io/mediawiki/images/e/ef/NSIS_Simple_Service_Plugin_Unicode_1.30.zip'
|
||||
@@ -524,7 +491,6 @@ const resolvePlugin = async () => {
|
||||
await fsp.cp(tempDll, pluginPath, { recursive: true, force: true })
|
||||
log_success(`unzip finished: "SimpleSC"`)
|
||||
} else {
|
||||
// 如果 dll 名称不同,尝试找到 dll
|
||||
const files = await fsp.readdir(tempDir)
|
||||
const dll = files.find((f) => f.toLowerCase().endsWith('.dll'))
|
||||
if (dll) {
|
||||
@@ -542,7 +508,7 @@ const resolvePlugin = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
// service chmod (保留并使用 glob)
|
||||
// Service executable permissions
|
||||
const resolveServicePermission = async () => {
|
||||
const serviceExecutables = [
|
||||
'clash-verge-service*',
|
||||
@@ -578,9 +544,7 @@ const resolveServicePermission = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
// =======================
|
||||
// Other resource resolvers (service, mmdb, geosite, geoip, enableLoopback)
|
||||
// =======================
|
||||
// Other resources
|
||||
const SERVICE_BINARIES = [
|
||||
'clash-verge-service',
|
||||
'clash-verge-service-install',
|
||||
@@ -698,9 +662,6 @@ const resolveUnSetDnsScript = () =>
|
||||
localPath: path.join(cwd, 'scripts/unset_dns.sh'),
|
||||
})
|
||||
|
||||
// =======================
|
||||
// Tasks
|
||||
// =======================
|
||||
const tasks = [
|
||||
{
|
||||
name: 'verge-mihomo-alpha',
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
// scripts/publish-version.mjs
|
||||
import { execFileSync, spawn } from 'child_process'
|
||||
import { existsSync, readFileSync } from 'fs'
|
||||
import path from 'path'
|
||||
@@ -17,7 +16,6 @@ if (!versionArg) {
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
// 1. 调用 release-version.mjs
|
||||
const runRelease = () =>
|
||||
new Promise((resolve, reject) => {
|
||||
const child = spawn('node', [scriptPath, versionArg], { stdio: 'inherit' })
|
||||
@@ -27,7 +25,6 @@ const runRelease = () =>
|
||||
})
|
||||
})
|
||||
|
||||
// 2. 判断是否需要打 tag
|
||||
function isSemver(version) {
|
||||
return /^v?\d+\.\d+\.\d+(-(alpha|beta|rc)(\.\d+)?)?(\+[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*)?$/i.test(
|
||||
version,
|
||||
@@ -57,7 +54,6 @@ async function run() {
|
||||
|
||||
let tag = null
|
||||
if (versionArg === 'alpha') {
|
||||
// 读取 release-version.mjs 写入后的版本
|
||||
tag = normalizeVersion(readPackageVersion())
|
||||
} else if (isSemver(versionArg)) {
|
||||
// 1.2.3、v1.2.3、1.2.3-beta.1 或 1.2.3+build.1
|
||||
@@ -67,7 +63,6 @@ async function run() {
|
||||
if (tag) {
|
||||
validateTag(tag)
|
||||
|
||||
// 打 tag 并推送
|
||||
try {
|
||||
execFileSync('git', ['tag', tag], { stdio: 'inherit' })
|
||||
execFileSync('git', ['push', 'origin', tag], { stdio: 'inherit' })
|
||||
|
||||
@@ -20,13 +20,6 @@
|
||||
* pnpm release-version autobuild-latest
|
||||
* pnpm release-version deploytest
|
||||
*
|
||||
* The script will:
|
||||
* - Validate and normalize the version argument
|
||||
* - Update the version field in package.json
|
||||
* - Update the version field in src-tauri/Cargo.toml
|
||||
* - Update the version field in src-tauri/tauri.conf.json
|
||||
*
|
||||
* Errors are logged and the process exits with code 1 on failure.
|
||||
*/
|
||||
|
||||
import { execSync } from 'child_process'
|
||||
@@ -35,10 +28,6 @@ import path from 'path'
|
||||
|
||||
import { program } from 'commander'
|
||||
|
||||
/**
|
||||
* 获取当前 git 短 commit hash
|
||||
* @returns {string}
|
||||
*/
|
||||
function getGitShortCommit() {
|
||||
try {
|
||||
return execSync('git rev-parse --short HEAD').toString().trim()
|
||||
@@ -48,10 +37,6 @@ function getGitShortCommit() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取最新 Tauri 相关提交的短 hash
|
||||
* @returns {string}
|
||||
*/
|
||||
function getLatestTauriCommit() {
|
||||
try {
|
||||
const fullHash = execSync(
|
||||
@@ -73,13 +58,7 @@ function getLatestTauriCommit() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成短时间戳(格式:MMDD)或带 commit(格式:MMDD.cc39b27)
|
||||
* 使用 Asia/Shanghai 时区
|
||||
* @param {boolean} withCommit 是否带 commit
|
||||
* @param {boolean} useTauriCommit 是否使用 Tauri 相关的 commit(仅当 withCommit 为 true 时有效)
|
||||
* @returns {string}
|
||||
*/
|
||||
/** Generates `MMDD`, optionally followed by a commit, in the Asia/Shanghai timezone. */
|
||||
function generateShortTimestamp(withCommit = false, useTauriCommit = false) {
|
||||
const now = new Date()
|
||||
|
||||
@@ -102,41 +81,22 @@ function generateShortTimestamp(withCommit = false, useTauriCommit = false) {
|
||||
return `${month}${day}`
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证版本号格式
|
||||
* @param {string} version
|
||||
* @returns {boolean}
|
||||
*/
|
||||
function isValidVersion(version) {
|
||||
return /^v?\d+\.\d+\.\d+(-(alpha|beta|rc)(\.\d+)?)?(\+[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*)?$/i.test(
|
||||
version,
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* 标准化版本号
|
||||
* @param {string} version
|
||||
* @returns {string}
|
||||
*/
|
||||
function normalizeVersion(version) {
|
||||
return version.startsWith('v') ? version : `v${version}`
|
||||
}
|
||||
|
||||
/**
|
||||
* 提取基础版本号(去掉所有 -tag 和 +build 部分)
|
||||
* @param {string} version
|
||||
* @returns {string}
|
||||
*/
|
||||
function getBaseVersion(version) {
|
||||
let base = version.replace(/-(alpha|beta|rc)(\.\d+)?/i, '')
|
||||
base = base.replace(/\+[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*/g, '')
|
||||
return base
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新 package.json 版本号
|
||||
* @param {string} newVersion
|
||||
*/
|
||||
async function updatePackageVersion(newVersion) {
|
||||
const _dirname = process.cwd()
|
||||
const packageJsonPath = path.join(_dirname, 'package.json')
|
||||
@@ -165,10 +125,6 @@ async function updatePackageVersion(newVersion) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新 Cargo.toml 版本号
|
||||
* @param {string} newVersion
|
||||
*/
|
||||
async function updateCargoVersion(newVersion) {
|
||||
const _dirname = process.cwd()
|
||||
const cargoTomlPath = path.join(_dirname, 'src-tauri', 'Cargo.toml')
|
||||
@@ -197,10 +153,6 @@ async function updateCargoVersion(newVersion) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新 tauri.conf.json 版本号
|
||||
* @param {string} newVersion
|
||||
*/
|
||||
async function updateTauriConfigVersion(newVersion) {
|
||||
const _dirname = process.cwd()
|
||||
const tauriConfigPath = path.join(_dirname, 'src-tauri', 'tauri.conf.json')
|
||||
@@ -216,7 +168,6 @@ async function updateTauriConfigVersion(newVersion) {
|
||||
tauriConfig.version,
|
||||
)
|
||||
|
||||
// 使用完整版本信息,包含build metadata
|
||||
tauriConfig.version = versionWithoutV
|
||||
|
||||
await fs.writeFile(
|
||||
@@ -233,9 +184,6 @@ async function updateTauriConfigVersion(newVersion) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前版本号
|
||||
*/
|
||||
async function getCurrentVersion() {
|
||||
const _dirname = process.cwd()
|
||||
const packageJsonPath = path.join(_dirname, 'package.json')
|
||||
@@ -249,9 +197,6 @@ async function getCurrentVersion() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 主函数
|
||||
*/
|
||||
async function main(versionArg) {
|
||||
if (!versionArg) {
|
||||
console.error('Error: Version argument is required')
|
||||
@@ -274,16 +219,11 @@ async function main(versionArg) {
|
||||
const baseVersion = getBaseVersion(currentVersion)
|
||||
|
||||
if (versionArg.toLowerCase() === 'autobuild') {
|
||||
// 格式: 2.3.0+autobuild.1004.cc39b27
|
||||
// 使用 Tauri 相关的最新 commit hash
|
||||
newVersion = `${baseVersion}+autobuild.${generateShortTimestamp(true, true)}`
|
||||
} else if (versionArg.toLowerCase() === 'autobuild-latest') {
|
||||
// 格式: 2.3.0+autobuild.1004.a1b2c3d (使用最新 Tauri 提交)
|
||||
const latestTauriCommit = getLatestTauriCommit()
|
||||
newVersion = `${baseVersion}+autobuild.${generateShortTimestamp()}.${latestTauriCommit}`
|
||||
} else if (versionArg.toLowerCase() === 'deploytest') {
|
||||
// 格式: 2.3.0+deploytest.1004.cc39b27
|
||||
// 使用 Tauri 相关的最新 commit hash
|
||||
newVersion = `${baseVersion}+deploytest.${generateShortTimestamp(true, true)}`
|
||||
} else {
|
||||
newVersion = `${baseVersion}-${versionArg.toLowerCase()}`
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#!/bin/bash
|
||||
|
||||
# 验证IPv4地址格式
|
||||
function is_valid_ipv4() {
|
||||
local ip=$1
|
||||
local IFS='.'
|
||||
@@ -18,7 +17,6 @@ function is_valid_ipv4() {
|
||||
return 0
|
||||
}
|
||||
|
||||
# 验证IPv6地址格式
|
||||
function is_valid_ipv6() {
|
||||
local ip=$1
|
||||
if [[ ! $ip =~ ^([0-9a-fA-F]{0,4}:){1,7}[0-9a-fA-F]{0,4}$ ]] &&
|
||||
@@ -28,27 +26,21 @@ function is_valid_ipv6() {
|
||||
return 0
|
||||
}
|
||||
|
||||
# 验证IP地址是否为有效的IPv4或IPv6
|
||||
function is_valid_ip() {
|
||||
is_valid_ipv4 "$1" || is_valid_ipv6 "$1"
|
||||
}
|
||||
|
||||
# 检查参数
|
||||
[ $# -lt 1 ] && echo "Usage: $0 <IP address>" && exit 1
|
||||
! is_valid_ip "$1" && echo "$1 is not a valid IP address." && exit 1
|
||||
|
||||
# 获取网络接口和硬件端口
|
||||
nic=$(route -n get default | grep "interface" | awk '{print $2}')
|
||||
# 从网络服务列表中获取硬件端口
|
||||
hardware_port=$(networksetup -listnetworkserviceorder | awk -v dev="$nic" '
|
||||
/^\([0-9]+\) /{port=$0; sub(/^\([0-9]+\) /, "", port)}
|
||||
/\(Hardware Port:/{interface=$NF;sub(/\)/, "", interface); if (interface == dev) {print port; exit}}
|
||||
')
|
||||
|
||||
# 获取当前DNS设置
|
||||
original_dns=$(networksetup -getdnsservers "$hardware_port")
|
||||
|
||||
# 检查当前DNS设置是否有效
|
||||
is_valid_dns=false
|
||||
for ip in $original_dns; do
|
||||
ip=$(echo "$ip" | tr -d '[:space:]')
|
||||
@@ -58,7 +50,6 @@ for ip in $original_dns; do
|
||||
fi
|
||||
done
|
||||
|
||||
# 更新DNS设置
|
||||
if [ "$is_valid_dns" = false ]; then
|
||||
echo "empty" >.original_dns.txt
|
||||
else
|
||||
|
||||
+1
-12
@@ -32,7 +32,6 @@ async function sendTelegramNotification() {
|
||||
log_info(`Target channel: ${chatId}`)
|
||||
log_info(`Download URL: ${downloadUrl}`)
|
||||
|
||||
// 读取发布说明和下载地址
|
||||
let releaseContent
|
||||
try {
|
||||
releaseContent = readFileSync('release.txt', 'utf-8')
|
||||
@@ -42,7 +41,6 @@ async function sendTelegramNotification() {
|
||||
releaseContent = '更多新功能现已支持,详细更新日志请查看发布页面。'
|
||||
}
|
||||
|
||||
// Markdown 转换为 HTML
|
||||
function convertMarkdownToTelegramHTML(content) {
|
||||
// Strip stray HTML tags and markdown bold from heading text
|
||||
const cleanHeading = (text) =>
|
||||
@@ -88,20 +86,13 @@ async function sendTelegramNotification() {
|
||||
.replace(/<br\s*\/?>/g, '\n')
|
||||
}
|
||||
|
||||
// Strip HTML tags not supported by Telegram and escape stray angle brackets
|
||||
function sanitizeTelegramHTML(content) {
|
||||
// Telegram supports: b, strong, i, em, u, ins, s, strike, del,
|
||||
// a, code, pre, blockquote, tg-spoiler, tg-emoji
|
||||
const allowedTag =
|
||||
/^<\/?(?:b|strong|i|em|u|ins|s|strike|del|a|code|pre|blockquote|tg-spoiler|tg-emoji)(?:\s[^<>]*)?>$/i
|
||||
// Match a well-formed tag (name first, no nested angle brackets) OR a lone
|
||||
// '<'/'>'. Matching lone brackets is what keeps a stray '<' in the changelog
|
||||
// (e.g. "原始配置 < Merge") from greedily swallowing the next real tag and
|
||||
// leaving its closing tag orphaned ("Unexpected end tag").
|
||||
// Match tags or lone brackets separately so stray changelog text cannot swallow a real tag.
|
||||
return content.replace(/<\/?[a-z][^<>]*>|[<>]/gi, (token) => {
|
||||
if (token === '<') return '<'
|
||||
if (token === '>') return '>'
|
||||
// Keep supported tags; escape everything else so it displays as text.
|
||||
return allowedTag.test(token)
|
||||
? token
|
||||
: token.replace(/</g, '<').replace(/>/g, '>')
|
||||
@@ -118,7 +109,6 @@ async function sendTelegramNotification() {
|
||||
const releaseTag = isAutobuild ? 'autobuild' : `v${version}`
|
||||
const content = `<b>🎉 <a href="https://github.com/clash-verge-rev/clash-verge-rev/releases/tag/${releaseTag}">Clash Verge Rev v${version}</a> ${releaseTitle}</b>\n\n${formattedContent}`
|
||||
|
||||
// 发送到 Telegram
|
||||
try {
|
||||
await axios.post(
|
||||
`https://api.telegram.org/bot${process.env.TELEGRAM_BOT_TOKEN}/sendMessage`,
|
||||
@@ -144,7 +134,6 @@ async function sendTelegramNotification() {
|
||||
}
|
||||
}
|
||||
|
||||
// 执行函数
|
||||
sendTelegramNotification().catch((error) => {
|
||||
log_error('脚本执行失败:', error)
|
||||
process.exit(1)
|
||||
|
||||
@@ -6,8 +6,6 @@ const UPDATE_TAG_NAME = 'updater'
|
||||
const UPDATE_JSON_FILE = 'update-fixed-webview2.json'
|
||||
const UPDATE_JSON_PROXY = 'update-fixed-webview2-proxy.json'
|
||||
|
||||
/// generate update.json
|
||||
/// upload to update tag's release asset
|
||||
async function resolveUpdater() {
|
||||
if (process.env.GITHUB_TOKEN === undefined) {
|
||||
throw new Error('GITHUB_TOKEN is required')
|
||||
@@ -22,7 +20,6 @@ async function resolveUpdater() {
|
||||
page: 1,
|
||||
})
|
||||
|
||||
// get the latest publish tag
|
||||
const tag = tags.find((t) => t.name.startsWith('v'))
|
||||
|
||||
console.log(tag)
|
||||
@@ -48,33 +45,27 @@ async function resolveUpdater() {
|
||||
const promises = latestRelease.assets.map(async (asset) => {
|
||||
const { name, browser_download_url } = asset
|
||||
|
||||
// win64 url
|
||||
if (name.endsWith('x64_fixed_webview2-setup.exe')) {
|
||||
updateData.platforms['windows-x86_64'].url = browser_download_url
|
||||
}
|
||||
// win64 signature
|
||||
if (name.endsWith('x64_fixed_webview2-setup.exe.sig')) {
|
||||
const sig = await getSignature(browser_download_url)
|
||||
updateData.platforms['windows-x86_64'].signature = sig
|
||||
}
|
||||
|
||||
// win32 url
|
||||
if (name.endsWith('x86_fixed_webview2-setup.exe')) {
|
||||
updateData.platforms['windows-x86'].url = browser_download_url
|
||||
updateData.platforms['windows-i686'].url = browser_download_url
|
||||
}
|
||||
// win32 signature
|
||||
if (name.endsWith('x86_fixed_webview2-setup.exe.sig')) {
|
||||
const sig = await getSignature(browser_download_url)
|
||||
updateData.platforms['windows-x86'].signature = sig
|
||||
updateData.platforms['windows-i686'].signature = sig
|
||||
}
|
||||
|
||||
// win arm url
|
||||
if (name.endsWith('arm64_fixed_webview2-setup.exe')) {
|
||||
updateData.platforms['windows-aarch64'].url = browser_download_url
|
||||
}
|
||||
// win arm signature
|
||||
if (name.endsWith('arm64_fixed_webview2-setup.exe.sig')) {
|
||||
const sig = await getSignature(browser_download_url)
|
||||
updateData.platforms['windows-aarch64'].signature = sig
|
||||
@@ -84,8 +75,6 @@ async function resolveUpdater() {
|
||||
await Promise.allSettled(promises)
|
||||
console.log(updateData)
|
||||
|
||||
// maybe should test the signature as well
|
||||
// delete the null field
|
||||
Object.entries(updateData.platforms).forEach(([key, value]) => {
|
||||
if (!value.url) {
|
||||
console.log(`[Error]: failed to parse release for "${key}"`)
|
||||
@@ -93,8 +82,6 @@ async function resolveUpdater() {
|
||||
}
|
||||
})
|
||||
|
||||
// 生成一个代理github的更新文件
|
||||
// 使用 https://hub.fastgit.xyz/ 做github资源的加速
|
||||
const updateDataNew = JSON.parse(JSON.stringify(updateData))
|
||||
|
||||
Object.entries(updateDataNew.platforms).forEach(([key, value]) => {
|
||||
@@ -105,13 +92,11 @@ async function resolveUpdater() {
|
||||
}
|
||||
})
|
||||
|
||||
// update the update.json
|
||||
const { data: updateRelease } = await github.rest.repos.getReleaseByTag({
|
||||
...options,
|
||||
tag: UPDATE_TAG_NAME,
|
||||
})
|
||||
|
||||
// delete the old assets
|
||||
for (const asset of updateRelease.assets) {
|
||||
if (asset.name === UPDATE_JSON_FILE) {
|
||||
await github.rest.repos.deleteReleaseAsset({
|
||||
@@ -127,7 +112,6 @@ async function resolveUpdater() {
|
||||
}
|
||||
}
|
||||
|
||||
// upload new assets
|
||||
await github.rest.repos.uploadReleaseAsset({
|
||||
...options,
|
||||
release_id: updateRelease.id,
|
||||
@@ -143,7 +127,6 @@ async function resolveUpdater() {
|
||||
})
|
||||
}
|
||||
|
||||
// get the signature file content
|
||||
async function getSignature(url) {
|
||||
const response = await fetch(url, {
|
||||
method: 'GET',
|
||||
|
||||
+2
-40
@@ -2,17 +2,13 @@ import { context, getOctokit } from '@actions/github'
|
||||
|
||||
import { resolveUpdateLog, resolveUpdateLogDefault } from './updatelog.mjs'
|
||||
|
||||
// Add stable update JSON filenames
|
||||
const UPDATE_TAG_NAME = 'updater'
|
||||
const UPDATE_JSON_FILE = 'update.json'
|
||||
const UPDATE_JSON_PROXY = 'update-proxy.json'
|
||||
// Add alpha update JSON filenames
|
||||
const ALPHA_TAG_NAME = 'updater-alpha'
|
||||
const ALPHA_UPDATE_JSON_FILE = 'update.json'
|
||||
const ALPHA_UPDATE_JSON_PROXY = 'update-proxy.json'
|
||||
|
||||
/// generate update.json
|
||||
/// upload to update tag's release asset
|
||||
async function resolveUpdater() {
|
||||
if (process.env.GITHUB_TOKEN === undefined) {
|
||||
throw new Error('GITHUB_TOKEN is required')
|
||||
@@ -21,7 +17,6 @@ async function resolveUpdater() {
|
||||
const options = { owner: context.repo.owner, repo: context.repo.repo }
|
||||
const github = getOctokit(process.env.GITHUB_TOKEN)
|
||||
|
||||
// Fetch all tags using pagination
|
||||
let allTags = []
|
||||
let page = 1
|
||||
const perPage = 100
|
||||
@@ -35,7 +30,6 @@ async function resolveUpdater() {
|
||||
|
||||
allTags = allTags.concat(pageTags)
|
||||
|
||||
// Break if we received fewer tags than requested (last page)
|
||||
if (pageTags.length < perPage) {
|
||||
break
|
||||
}
|
||||
@@ -46,12 +40,9 @@ async function resolveUpdater() {
|
||||
const tags = allTags
|
||||
console.log(`Retrieved ${tags.length} tags in total`)
|
||||
|
||||
// More flexible tag detection with regex patterns
|
||||
const stableTagRegex = /^v\d+\.\d+\.\d+$/ // Matches vX.Y.Z format
|
||||
// const preReleaseRegex = /^v\d+\.\d+\.\d+-(alpha|beta|rc|pre)/i; // Matches vX.Y.Z-alpha/beta/rc format
|
||||
const preReleaseRegex = /^(alpha|beta|rc|pre)$/i // Matches exact alpha/beta/rc/pre tags
|
||||
const stableTagRegex = /^v\d+\.\d+\.\d+$/
|
||||
const preReleaseRegex = /^(alpha|beta|rc|pre)$/i
|
||||
|
||||
// Get the latest stable tag and pre-release tag
|
||||
const stableTag = tags.find((t) => stableTagRegex.test(t.name))
|
||||
const preReleaseTag = tags.find((t) => preReleaseRegex.test(t.name))
|
||||
|
||||
@@ -63,18 +54,15 @@ async function resolveUpdater() {
|
||||
)
|
||||
console.log()
|
||||
|
||||
// Process stable release
|
||||
if (stableTag) {
|
||||
await processRelease(github, options, stableTag, false)
|
||||
}
|
||||
|
||||
// Process pre-release if found
|
||||
if (preReleaseTag) {
|
||||
await processRelease(github, options, preReleaseTag, true)
|
||||
}
|
||||
}
|
||||
|
||||
// Process a release (stable or alpha) and generate update files
|
||||
async function processRelease(github, options, tag, isAlpha) {
|
||||
if (!tag) return
|
||||
|
||||
@@ -129,67 +117,55 @@ async function processRelease(github, options, tag, isAlpha) {
|
||||
const promises = release.assets.map(async (asset) => {
|
||||
const { name, browser_download_url } = asset
|
||||
|
||||
// Process all the platform URL and signature data
|
||||
// win64 url
|
||||
if (name.endsWith('x64-setup.exe')) {
|
||||
updateData.platforms['windows-x86_64'].url = browser_download_url
|
||||
updateData.platforms['windows-x86_64-nsis'].url = browser_download_url
|
||||
}
|
||||
// win64 signature
|
||||
if (name.endsWith('x64-setup.exe.sig')) {
|
||||
const sig = await getSignature(browser_download_url)
|
||||
updateData.platforms['windows-x86_64'].signature = sig
|
||||
updateData.platforms['windows-x86_64-nsis'].signature = sig
|
||||
}
|
||||
// win32 url
|
||||
if (name.endsWith('x86-setup.exe')) {
|
||||
updateData.platforms['windows-x86'].url = browser_download_url
|
||||
updateData.platforms['windows-x86-nsis'].url = browser_download_url
|
||||
updateData.platforms['windows-i686-nsis'].url = browser_download_url
|
||||
}
|
||||
// win32 signature
|
||||
if (name.endsWith('x86-setup.exe.sig')) {
|
||||
const sig = await getSignature(browser_download_url)
|
||||
updateData.platforms['windows-x86'].signature = sig
|
||||
updateData.platforms['windows-x86-nsis'].signature = sig
|
||||
updateData.platforms['windows-i686-nsis'].signature = sig
|
||||
}
|
||||
// win arm url
|
||||
if (name.endsWith('arm64-setup.exe')) {
|
||||
updateData.platforms['windows-aarch64'].url = browser_download_url
|
||||
updateData.platforms['windows-aarch64-nsis'].url = browser_download_url
|
||||
}
|
||||
// win arm signature
|
||||
if (name.endsWith('arm64-setup.exe.sig')) {
|
||||
const sig = await getSignature(browser_download_url)
|
||||
updateData.platforms['windows-aarch64'].signature = sig
|
||||
updateData.platforms['windows-aarch64-nsis'].signature = sig
|
||||
}
|
||||
|
||||
// darwin url (intel)
|
||||
if (name.endsWith('.app.tar.gz') && !name.includes('aarch')) {
|
||||
updateData.platforms['darwin-x86_64'].url = browser_download_url
|
||||
updateData.platforms['darwin-x86_64-app'].url = browser_download_url
|
||||
}
|
||||
// darwin signature (intel)
|
||||
if (name.endsWith('.app.tar.gz.sig') && !name.includes('aarch')) {
|
||||
const sig = await getSignature(browser_download_url)
|
||||
updateData.platforms['darwin-x86_64'].signature = sig
|
||||
updateData.platforms['darwin-x86_64-app'].signature = sig
|
||||
}
|
||||
// darwin url (aarch)
|
||||
if (name.endsWith('aarch64.app.tar.gz')) {
|
||||
updateData.platforms['darwin-aarch64'].url = browser_download_url
|
||||
updateData.platforms['darwin-aarch64-app'].url = browser_download_url
|
||||
}
|
||||
// darwin signature (aarch)
|
||||
if (name.endsWith('aarch64.app.tar.gz.sig')) {
|
||||
const sig = await getSignature(browser_download_url)
|
||||
updateData.platforms['darwin-aarch64'].signature = sig
|
||||
updateData.platforms['darwin-aarch64-app'].signature = sig
|
||||
}
|
||||
|
||||
// Linux x86
|
||||
if (name.endsWith('i386.deb')) {
|
||||
updateData.platforms['linux-x86'].url = browser_download_url
|
||||
updateData.platforms['linux-x86-deb'].url = browser_download_url
|
||||
@@ -213,7 +189,6 @@ async function processRelease(github, options, tag, isAlpha) {
|
||||
updateData.platforms['linux-i686-rpm'].signature = sig
|
||||
}
|
||||
|
||||
// Linux x86_64
|
||||
if (name.endsWith('amd64.deb')) {
|
||||
updateData.platforms['linux-x86_64'].url = browser_download_url
|
||||
updateData.platforms['linux-x86_64-deb'].url = browser_download_url
|
||||
@@ -231,7 +206,6 @@ async function processRelease(github, options, tag, isAlpha) {
|
||||
updateData.platforms['linux-x86_64-rpm'].signature = sig
|
||||
}
|
||||
|
||||
// Linux aarch64
|
||||
if (name.endsWith('arm64.deb')) {
|
||||
updateData.platforms['linux-aarch64'].url = browser_download_url
|
||||
updateData.platforms['linux-aarch64-deb'].url = browser_download_url
|
||||
@@ -249,7 +223,6 @@ async function processRelease(github, options, tag, isAlpha) {
|
||||
updateData.platforms['linux-aarch64-rpm'].signature = sig
|
||||
}
|
||||
|
||||
// Linux armv7
|
||||
if (name.endsWith('armhf.deb')) {
|
||||
updateData.platforms['linux-armv7'].url = browser_download_url
|
||||
updateData.platforms['linux-armv7-deb'].url = browser_download_url
|
||||
@@ -271,8 +244,6 @@ async function processRelease(github, options, tag, isAlpha) {
|
||||
await Promise.allSettled(promises)
|
||||
console.log(updateData)
|
||||
|
||||
// maybe should test the signature as well
|
||||
// delete the null field
|
||||
Object.entries(updateData.platforms).forEach(([key, value]) => {
|
||||
if (!value.url) {
|
||||
console.log(`[Error]: failed to parse release for "${key}"`)
|
||||
@@ -280,7 +251,6 @@ async function processRelease(github, options, tag, isAlpha) {
|
||||
}
|
||||
})
|
||||
|
||||
// Generate a proxy update file for accelerated GitHub resources
|
||||
const updateDataNew = JSON.parse(JSON.stringify(updateData))
|
||||
|
||||
Object.entries(updateDataNew.platforms).forEach(([key, value]) => {
|
||||
@@ -292,7 +262,6 @@ async function processRelease(github, options, tag, isAlpha) {
|
||||
}
|
||||
})
|
||||
|
||||
// Get the appropriate updater release based on isAlpha flag
|
||||
const releaseTag = isAlpha ? ALPHA_TAG_NAME : UPDATE_TAG_NAME
|
||||
console.log(
|
||||
`Processing ${isAlpha ? 'alpha' : 'stable'} release:`,
|
||||
@@ -303,7 +272,6 @@ async function processRelease(github, options, tag, isAlpha) {
|
||||
let updateRelease
|
||||
|
||||
try {
|
||||
// Try to get the existing release
|
||||
const response = await github.rest.repos.getReleaseByTag({
|
||||
...options,
|
||||
tag: releaseTag,
|
||||
@@ -313,7 +281,6 @@ async function processRelease(github, options, tag, isAlpha) {
|
||||
`Found existing ${releaseTag} release with ID: ${updateRelease.id}`,
|
||||
)
|
||||
} catch (error) {
|
||||
// If release doesn't exist, create it
|
||||
if (error.status === 404) {
|
||||
console.log(
|
||||
`Release with tag ${releaseTag} not found, creating new release...`,
|
||||
@@ -332,16 +299,13 @@ async function processRelease(github, options, tag, isAlpha) {
|
||||
`Created new ${releaseTag} release with ID: ${updateRelease.id}`,
|
||||
)
|
||||
} else {
|
||||
// If it's another error, throw it
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
// File names based on release type
|
||||
const jsonFile = isAlpha ? ALPHA_UPDATE_JSON_FILE : UPDATE_JSON_FILE
|
||||
const proxyFile = isAlpha ? ALPHA_UPDATE_JSON_PROXY : UPDATE_JSON_PROXY
|
||||
|
||||
// Delete existing assets with these names
|
||||
for (const asset of updateRelease.assets) {
|
||||
if (asset.name === jsonFile) {
|
||||
await github.rest.repos.deleteReleaseAsset({
|
||||
@@ -357,7 +321,6 @@ async function processRelease(github, options, tag, isAlpha) {
|
||||
}
|
||||
}
|
||||
|
||||
// Upload new assets
|
||||
await github.rest.repos.uploadReleaseAsset({
|
||||
...options,
|
||||
release_id: updateRelease.id,
|
||||
@@ -390,7 +353,6 @@ async function processRelease(github, options, tag, isAlpha) {
|
||||
}
|
||||
}
|
||||
|
||||
// get the signature file content
|
||||
async function getSignature(url) {
|
||||
const response = await fetch(url, {
|
||||
method: 'GET',
|
||||
|
||||
Reference in New Issue
Block a user