@threadedstack/wmd 0.1.19 → 0.1.21

package/index.d.ts

@@ -4,11 +4,18 @@ export declare const PROGRAMS: readonly string[]
 export declare const version: string
 /** The full commit this release was built from. */
 export declare const commit: string
-/** The platform package's name, e.g. @threadedstack/wmd-darwin-arm64. */
-export declare function platformPackage(platform?: string, arch?: string): string
-/** The bin folder of this machine's platform package. */
-export declare function binDir(): string
+/** The guest architecture of this machine's cpu (x64 is amd64). */
+export declare function hostGuestArch(arch?: string): 'arm64' | 'amd64'
+/** The C library of this Linux; null on another os. */
+export declare function hostLibc(
+  platform?: string,
+  getReport?: () => { header?: { glibcVersionRuntime?: string } } | null,
+): 'glibc' | 'musl' | null
+/** The platform package's name, e.g. @threadedstack/wmd-darwin-arm64 or @threadedstack/wmd-linux-x64-musl. */
+export declare function platformPackage(platform?: string, arch?: string, libc?: 'glibc' | 'musl' | null): string
+/** The bin folder of this machine's platform package (or of the given platform's). */
+export declare function binDir(platform?: string, arch?: string, libc?: 'glibc' | 'musl' | null): string
 /** The path of one program (wmd, wmdd, wmd-run, wmd-relay, wmd-exe-stub, wmd-fixtures-gen, bootlock.sh). */
 export declare function binPath(name?: string): string
-/** The guest files folder (vm.wasm, Image, Image-4k, initramfs.cpio.gz, features, config). */
+/** The guest files folder of arch (default: this cpu's): arm64 has Image and Image-4k, amd64 has bzImage. */
 export declare function guestDir(arch?: string): string

package/index.js

@@ -19,18 +19,46 @@ export const PROGRAMS = ['wmd', 'wmdd', 'wmd-run', 'wmd-relay', 'wmd-exe-stub',
 export const version = self.version
 export const commit = self.wmd?.commit ?? ''
 
-/** The platform package's name for this machine, e.g. @threadedstack/wmd-darwin-arm64. */
-export function platformPackage(platform = process.platform, arch = process.arch) {
-  return `@threadedstack/wmd-${platform}-${arch}`
+/** The guest architecture of a cpu (default: this machine's): arm64, or amd64 for x64; throws for any other. */
+export function hostGuestArch(arch = process.arch) {
+  if (arch === 'x64') return 'amd64'
+  if (arch === 'arm64') return 'arm64'
+  throw new Error(`wmd: no guest for cpu ${arch}; there is one for arm64 and x64`)
+}
+
+let report
+/** The process report, read once (it is slow); without the network part. */
+function processReport() {
+  if (report === undefined) {
+    const was = process.report?.excludeNetwork
+    try {
+      if (process.report) process.report.excludeNetwork = true
+      report = process.report?.getReport?.() ?? null
+    } finally {
+      if (process.report) process.report.excludeNetwork = was
+    }
+  }
+  return report
+}
+
+/** The C library of this Linux: 'glibc' or 'musl'; null on another os. A glibc process reports its version. */
+export function hostLibc(platform = process.platform, getReport = processReport) {
+  if (platform !== 'linux') return null
+  return getReport()?.header?.glibcVersionRuntime ? 'glibc' : 'musl'
+}
+
+/** The platform package's name, e.g. @threadedstack/wmd-darwin-arm64; the Linux musl ones end in -musl. */
+export function platformPackage(platform = process.platform, arch = process.arch, libc = hostLibc()) {
+  return `@threadedstack/wmd-${platform}-${arch}${platform === 'linux' && libc === 'musl' ? '-musl' : ''}`
 }
 
 /** The bin folder of this machine's platform package; throws, naming what to install, when there is none. */
-export function binDir() {
-  const name = platformPackage()
+export function binDir(platform = process.platform, arch = process.arch, libc = hostLibc()) {
+  const name = platformPackage(platform, arch, libc)
   if (!Object.hasOwn(self.optionalDependencies ?? {}, name))
     throw new Error(
-      `wmd: no build for ${process.platform} ${process.arch}; there is one for ` +
-        Object.keys(self.optionalDependencies ?? {}).map((n) => n.replace('@threadedstack/wmd-', '')).join(', '),
+      `wmd: no build for ${platform} ${arch}${platform === 'linux' && libc ? ` (${libc})` : ''}; there is one for ` +
+        Object.keys(self.optionalDependencies ?? {}).sort().map((n) => n.replace('@threadedstack/wmd-', '')).join(', '),
     )
   let pkg
   try {
@@ -54,8 +82,8 @@ export function binPath(name = 'wmd') {
   return p
 }
 
-/** The guest files folder (vm.wasm, Image, Image-4k, initramfs.cpio.gz, features, config) for arch. */
-export function guestDir(arch = 'arm64') {
+/** The guest files folder for arch: arm64 has vm.wasm, Image, Image-4k, initramfs.cpio.gz, features, config; amd64 has vm.wasm, bzImage, initramfs.cpio.gz, features, config. */
+export function guestDir(arch = hostGuestArch()) {
   const d = join(binDir(), 'guest', arch)
   if (!existsSync(d)) throw new Error(`wmd: this build has no ${arch} guest (${d})`)
   return d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threadedstack/wmd",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "license": "MIT",
   "homepage": "https://github.com/threadedstack/wmd-releases",
   "repository": {
@@ -9,8 +9,8 @@
   },
   "description": "wmd: a Docker Engine API compatible daemon and CLI that runs Linux containers in WebAssembly",
   "wmd": {
-    "tag": "v0.1.19",
-    "commit": "89688f12e0caef39ab0a159b39c00f3525e31051"
+    "tag": "v0.1.21",
+    "commit": "19edd3aa9241c6cc1d2838a9a58a33b559703dc8"
   },
   "type": "module",
   "exports": {
@@ -35,6 +35,10 @@
     "node": ">=18"
   },
   "optionalDependencies": {
-    "@threadedstack/wmd-darwin-arm64": "0.1.19"
+    "@threadedstack/wmd-darwin-arm64": "0.1.21",
+    "@threadedstack/wmd-linux-arm64": "0.1.21",
+    "@threadedstack/wmd-linux-x64": "0.1.21",
+    "@threadedstack/wmd-linux-arm64-musl": "0.1.21",
+    "@threadedstack/wmd-linux-x64-musl": "0.1.21"
   }
 }