admin/DeskClaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix discord channel native (#634)

Browse Source
This commit is contained in:
paisley
2026-03-23 14:56:41 +08:00
committed by GitHub
Unverified
parent f56cd5cc1d
commit 7b1e79ed7b
2 changed files with 75 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
scripts/after-pack.cjs
View File

@@ -101,16 +101,52 @@ function cleanupKoffi(nodeModulesDir, platform, arch) {
// ── Platform-specific: scoped native packages ────────────────────────────────
// Packages like @napi-rs/canvas-darwin-arm64, @img/sharp-linux-x64, etc.
// Only the variant matching the target platform should survive.
//
// Some packages use non-standard platform names:
// - @node-llama-cpp: "mac" instead of "darwin", "win" instead of "win32"
// - sqlite-vec: "windows" instead of "win32" (unscoped, handled separately)
// We normalise them before comparison.
const PLATFORM_ALIASES = {
darwin: 'darwin', mac: 'darwin',
linux: 'linux', linuxmusl: 'linux',
win32: 'win32', win: 'win32', windows: 'win32',
};
// Each regex MUST have capture group 1 = platform name and group 2 = arch name.
// Compound arch suffixes (e.g. "x64-msvc", "arm64-gnu", "arm64-metal") are OK —
// we strip the suffix after the first dash to get the base arch.
const PLATFORM_NATIVE_SCOPES = {
'@napi-rs': /^canvas-(darwin|linux|win32)-(x64|arm64)/,
'@img': /^sharp(?:-libvips)?-(darwin|linux|win32)-(x64|arm64)/,
'@img': /^sharp(?:-libvips)?-(darwin|linux(?:musl)?|win32)-(x64|arm64|arm|ppc64|riscv64|s390x)/,
'@mariozechner': /^clipboard-(darwin|linux|win32)-(x64|arm64|universal)/,
'@snazzah': /^davey-(darwin|linux|android|freebsd|win32|wasm32)-(x64|arm64|arm|ia32|arm64-gnu|arm64-musl|x64-gnu|x64-musl|x64-msvc|arm64-msvc|ia32-msvc|arm-eabi|arm-gnueabihf|wasi)/,
'@lydell': /^node-pty-(darwin|linux|win32)-(x64|arm64)/,
'@reflink': /^reflink-(darwin|linux|win32)-(x64|arm64|x64-gnu|x64-musl|arm64-gnu|arm64-musl|x64-msvc|arm64-msvc)/,
'@node-llama-cpp': /^(mac|linux|win)-(arm64|x64|armv7l)(-metal|-cuda|-cuda-ext|-vulkan)?$/,
'@esbuild': /^(darwin|linux|win32|android|freebsd|netbsd|openbsd|sunos|aix|openharmony)-(x64|arm64|arm|ia32|loong64|mips64el|ppc64|riscv64|s390x)/,
};
// Unscoped packages that follow a <name>-<platform>-<arch> convention.
// Each entry: { prefix, pattern } where pattern captures (platform, arch).
const UNSCOPED_NATIVE_PACKAGES = [
// sqlite-vec uses "windows" instead of "win32"
{ prefix: 'sqlite-vec-', pattern: /^sqlite-vec-(darwin|linux|windows)-(x64|arm64)$/ },
];
/**
* Normalise the base arch from a potentially compound value.
* e.g. "x64-msvc" → "x64", "arm64-gnu" → "arm64", "arm64-metal" → "arm64"
*/
function baseArch(rawArch) {
const dash = rawArch.indexOf('-');
return dash > 0 ? rawArch.slice(0, dash) : rawArch;
}
function cleanupNativePlatformPackages(nodeModulesDir, platform, arch) {
let removed = 0;
// 1. Scoped packages (e.g. @snazzah/davey-darwin-arm64)
for (const [scope, pattern] of Object.entries(PLATFORM_NATIVE_SCOPES)) {
const scopeDir = join(nodeModulesDir, scope);
if (!existsSync(scopeDir)) continue;
@@ -119,8 +155,8 @@ function cleanupNativePlatformPackages(nodeModulesDir, platform, arch) {
const match = entry.match(pattern);
if (!match) continue; // not a platform-specific package, leave it
const pkgPlatform = match[1];
const pkgArch = match[2];
const pkgPlatform = PLATFORM_ALIASES[match[1]] || match[1];
const pkgArch = baseArch(match[2]);
const isMatch =
pkgPlatform === platform &&
@@ -135,6 +171,31 @@ function cleanupNativePlatformPackages(nodeModulesDir, platform, arch) {
}
}
// 2. Unscoped packages (e.g. sqlite-vec-darwin-arm64)
for (const { pattern } of UNSCOPED_NATIVE_PACKAGES) {
let entries;
try { entries = readdirSync(nodeModulesDir); } catch { continue; }
for (const entry of entries) {
const match = entry.match(pattern);
if (!match) continue;
const pkgPlatform = PLATFORM_ALIASES[match[1]] || match[1];
const pkgArch = baseArch(match[2]);
const isMatch =
pkgPlatform === platform &&
(pkgArch === arch || pkgArch === 'universal');
if (!isMatch) {
try {
rmSync(join(nodeModulesDir, entry), { recursive: true, force: true });
removed++;
} catch { /* */ }
}
}
}
return removed;
}