Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions scripts/backend/runtime-arch-utils.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ const PROCESS_ARCH_MAP = {
arm64: 'arm64',
};

const hasNonEmptyEnvOverride = (env, key) => Boolean(String(env[key] ?? '').trim());

export const hasRuntimeArchOverride = (env = process.env) =>
hasNonEmptyEnvOverride(env, BUNDLED_RUNTIME_ARCH_ENV) ||
hasNonEmptyEnvOverride(env, DESKTOP_TARGET_ARCH_ENV);

export const normalizeDesktopArch = (rawArch, sourceName) => {
const raw = String(rawArch ?? '').trim().toLowerCase();
if (raw === 'amd64' || raw === 'x64') {
Expand All @@ -22,7 +28,7 @@ export const normalizeDesktopArch = (rawArch, sourceName) => {

export const resolveDesktopTargetArch = ({ arch = process.arch, env = process.env } = {}) => {
const overrideRaw = env[DESKTOP_TARGET_ARCH_ENV];
if (overrideRaw !== undefined && String(overrideRaw).trim()) {
if (hasNonEmptyEnvOverride(env, DESKTOP_TARGET_ARCH_ENV)) {
return normalizeDesktopArch(overrideRaw, DESKTOP_TARGET_ARCH_ENV);
}

Expand All @@ -40,7 +46,7 @@ export const resolveBundledRuntimeArch = ({
env = process.env,
} = {}) => {
const explicitBundledRuntimeArch = env[BUNDLED_RUNTIME_ARCH_ENV];
if (explicitBundledRuntimeArch !== undefined && String(explicitBundledRuntimeArch).trim()) {
if (hasNonEmptyEnvOverride(env, BUNDLED_RUNTIME_ARCH_ENV)) {
return normalizeDesktopArch(explicitBundledRuntimeArch, BUNDLED_RUNTIME_ARCH_ENV);
}

Expand All @@ -50,7 +56,7 @@ export const resolveBundledRuntimeArch = ({
}

const windowsArmBackendArch = env[WINDOWS_ARM_BACKEND_ARCH_ENV];
if (windowsArmBackendArch === undefined || !String(windowsArmBackendArch).trim()) {
if (!hasNonEmptyEnvOverride(env, WINDOWS_ARM_BACKEND_ARCH_ENV)) {
return 'amd64';
}

Expand All @@ -61,4 +67,14 @@ export const isWindowsArm64BundledRuntime = ({
platform = process.platform,
arch = process.arch,
env = process.env,
} = {}) => platform === 'win32' && resolveBundledRuntimeArch({ platform, arch, env }) === 'arm64';
} = {}) => {
if (platform !== 'win32') {
return false;
}

if (!hasRuntimeArchOverride(env) && !PROCESS_ARCH_MAP[arch]) {
return false;
}

return resolveBundledRuntimeArch({ platform, arch, env }) === 'arm64';
};
32 changes: 32 additions & 0 deletions scripts/backend/runtime-arch-utils.test.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import assert from 'node:assert/strict';
import { test } from 'node:test';

import * as runtimeArchUtils from './runtime-arch-utils.mjs';
import {
isWindowsArm64BundledRuntime,
resolveBundledRuntimeArch,
Expand Down Expand Up @@ -55,3 +56,34 @@ test('isWindowsArm64BundledRuntime uses explicit bundled runtime arch handoff',
false,
);
});

test('isWindowsArm64BundledRuntime returns false for unsupported Windows host arch', () => {
assert.equal(
isWindowsArm64BundledRuntime({
platform: 'win32',
arch: 'ia32',
env: {},
}),
false,
);
});

test('hasRuntimeArchOverride returns booleans for recognized override env vars', () => {
assert.equal(typeof runtimeArchUtils.hasRuntimeArchOverride, 'function');
assert.equal(runtimeArchUtils.hasRuntimeArchOverride({}), false);
assert.equal(
runtimeArchUtils.hasRuntimeArchOverride({
ASTRBOT_DESKTOP_BUNDLED_RUNTIME_ARCH: ' ',
ASTRBOT_DESKTOP_TARGET_ARCH: ' ',
}),
false,
);
assert.equal(
runtimeArchUtils.hasRuntimeArchOverride({ ASTRBOT_DESKTOP_BUNDLED_RUNTIME_ARCH: 'arm64' }),
true,
);
assert.equal(
runtimeArchUtils.hasRuntimeArchOverride({ ASTRBOT_DESKTOP_TARGET_ARCH: 'arm64' }),
true,
);
});