Skip to content

[Performance] Memoize platformAndArch and use startsWith #7618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gonzaloriestra wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −2
Draft

[Performance] Memoize platformAndArch and use startsWith #7618

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 deletions packages/cli-kit/src/public/node/os.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ export async function username(platform: typeof process.platform = process.platf

type PlatformArch = Exclude<typeof process.arch, 'x64' | 'ia32'> | 'amd64' | '386'
type PlatformStrings = Exclude<typeof process.platform, 'win32'> | 'windows'

/**
* Memoized value for the platform and architecture.
*/
let memoizedPlatformAndArch: {platform: PlatformStrings; arch: PlatformArch} | undefined

/**
* Returns the platform and architecture.
* @returns Returns the current platform and architecture.
Expand All @@ -57,6 +63,10 @@ export function platformAndArch(
platform: PlatformStrings
arch: PlatformArch
} {
if (platform === process.platform && arch === process.arch && memoizedPlatformAndArch) {
return memoizedPlatformAndArch
}

let archString: PlatformArch
if (arch === 'x64') {
archString = 'amd64'
Expand All @@ -65,8 +75,13 @@ export function platformAndArch(
} else {
archString = arch
}
const platformString = (platform.match(/^win.+/) ? 'windows' : platform) as PlatformStrings
return {platform: platformString, arch: archString}
const platformString = (platform.startsWith('win') ? 'windows' : platform) as PlatformStrings

const result = {platform: platformString, arch: archString}
if (platform === process.platform && arch === process.arch) {
memoizedPlatformAndArch = result
}
return result
}

function getEnvironmentVariable() {
Expand Down
Loading