Merge remote-tracking branch 'origin/main' into fix/postinstall-npx-command

mikolalysenko · mikolalysenko · commit b35dcc4a213f · 2026-03-10T21:09:55.000-04:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -68,6 +68,10 @@ jobs:
             runner: macos-14
             archive: tar.gz
             build-tool: cargo
+          - target: x86_64-unknown-linux-gnu
+            runner: ubuntu-latest
+            archive: tar.gz
+            build-tool: cross
           - target: x86_64-unknown-linux-musl
             runner: ubuntu-latest
             archive: tar.gz
@@ -76,6 +80,10 @@ jobs:
             runner: ubuntu-latest
             archive: tar.gz
             build-tool: cross
+          - target: aarch64-unknown-linux-musl
+            runner: ubuntu-latest
+            archive: tar.gz
+            build-tool: cross
           - target: x86_64-pc-windows-msvc
             runner: windows-latest
             archive: zip
@@ -96,10 +104,18 @@ jobs:
             runner: ubuntu-latest
             archive: tar.gz
             build-tool: cross
+          - target: arm-unknown-linux-musleabihf
+            runner: ubuntu-latest
+            archive: tar.gz
+            build-tool: cross
           - target: i686-unknown-linux-gnu
             runner: ubuntu-latest
             archive: tar.gz
             build-tool: cross
+          - target: i686-unknown-linux-musl
+            runner: ubuntu-latest
+            archive: tar.gz
+            build-tool: cross
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout
@@ -254,10 +270,14 @@ jobs:
 
           stage_unix socket-patch-aarch64-apple-darwin       npm/socket-patch-darwin-arm64
           stage_unix socket-patch-x86_64-apple-darwin        npm/socket-patch-darwin-x64
-          stage_unix socket-patch-x86_64-unknown-linux-musl  npm/socket-patch-linux-x64
-          stage_unix socket-patch-aarch64-unknown-linux-gnu  npm/socket-patch-linux-arm64
-          stage_unix socket-patch-arm-unknown-linux-gnueabihf npm/socket-patch-linux-arm
-          stage_unix socket-patch-i686-unknown-linux-gnu     npm/socket-patch-linux-ia32
+          stage_unix socket-patch-x86_64-unknown-linux-gnu      npm/socket-patch-linux-x64-gnu
+          stage_unix socket-patch-x86_64-unknown-linux-musl     npm/socket-patch-linux-x64-musl
+          stage_unix socket-patch-aarch64-unknown-linux-gnu     npm/socket-patch-linux-arm64-gnu
+          stage_unix socket-patch-aarch64-unknown-linux-musl    npm/socket-patch-linux-arm64-musl
+          stage_unix socket-patch-arm-unknown-linux-gnueabihf   npm/socket-patch-linux-arm-gnu
+          stage_unix socket-patch-arm-unknown-linux-musleabihf  npm/socket-patch-linux-arm-musl
+          stage_unix socket-patch-i686-unknown-linux-gnu        npm/socket-patch-linux-ia32-gnu
+          stage_unix socket-patch-i686-unknown-linux-musl       npm/socket-patch-linux-ia32-musl
           stage_unix socket-patch-aarch64-linux-android      npm/socket-patch-android-arm64
 
           stage_win socket-patch-x86_64-pc-windows-msvc      npm/socket-patch-win32-x64
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,13 +3,13 @@ members = ["crates/socket-patch-core", "crates/socket-patch-cli"]
 resolver = "2"
 
 [workspace.package]
-version = "2.0.0"
+version = "2.1.0"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/SocketDev/socket-patch"
 
 [workspace.dependencies]
-socket-patch-core = { path = "crates/socket-patch-core", version = "2.0.0" }
+socket-patch-core = { path = "crates/socket-patch-core", version = "2.1.0" }
 clap = { version = "4", features = ["derive"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
diff --git a/npm/socket-patch-android-arm64/package.json b/npm/socket-patch-android-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@socketsecurity/socket-patch-android-arm64",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "socket-patch binary for Android ARM64",
   "os": [
     "android"
diff --git a/npm/socket-patch-darwin-arm64/package.json b/npm/socket-patch-darwin-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@socketsecurity/socket-patch-darwin-arm64",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "socket-patch binary for macOS ARM64",
   "os": [
     "darwin"
diff --git a/npm/socket-patch-darwin-x64/package.json b/npm/socket-patch-darwin-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@socketsecurity/socket-patch-darwin-x64",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "socket-patch binary for macOS x64",
   "os": [
     "darwin"
diff --git a/npm/socket-patch-linux-arm-gnu/package.json b/npm/socket-patch-linux-arm-gnu/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@socketsecurity/socket-patch-linux-arm-gnu",
+  "version": "2.1.0",
+  "description": "socket-patch binary for Linux ARM (glibc)",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "arm"
+  ],
+  "libc": [
+    "glibc"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/SocketDev/socket-patch"
+  }
+}
diff --git a/npm/socket-patch-linux-arm-musl/package.json b/npm/socket-patch-linux-arm-musl/package.json
@@ -1,13 +1,16 @@
 {
-  "name": "@socketsecurity/socket-patch-linux-arm",
-  "version": "2.0.0",
-  "description": "socket-patch binary for Linux ARM",
+  "name": "@socketsecurity/socket-patch-linux-arm-musl",
+  "version": "2.1.0",
+  "description": "socket-patch binary for Linux ARM (musl)",
   "os": [
     "linux"
   ],
   "cpu": [
     "arm"
   ],
+  "libc": [
+    "musl"
+  ],
   "publishConfig": {
     "access": "public"
   },
diff --git a/npm/socket-patch-linux-arm64-gnu/package.json b/npm/socket-patch-linux-arm64-gnu/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@socketsecurity/socket-patch-linux-arm64-gnu",
+  "version": "2.1.0",
+  "description": "socket-patch binary for Linux ARM64 (glibc)",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "arm64"
+  ],
+  "libc": [
+    "glibc"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/SocketDev/socket-patch"
+  }
+}
diff --git a/npm/socket-patch-linux-arm64-musl/package.json b/npm/socket-patch-linux-arm64-musl/package.json
@@ -1,13 +1,16 @@
 {
-  "name": "@socketsecurity/socket-patch-linux-arm64",
-  "version": "2.0.0",
-  "description": "socket-patch binary for Linux ARM64",
+  "name": "@socketsecurity/socket-patch-linux-arm64-musl",
+  "version": "2.1.0",
+  "description": "socket-patch binary for Linux ARM64 (musl)",
   "os": [
     "linux"
   ],
   "cpu": [
     "arm64"
   ],
+  "libc": [
+    "musl"
+  ],
   "publishConfig": {
     "access": "public"
   },
diff --git a/npm/socket-patch-linux-ia32-gnu/package.json b/npm/socket-patch-linux-ia32-gnu/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@socketsecurity/socket-patch-linux-ia32-gnu",
+  "version": "2.1.0",
+  "description": "socket-patch binary for Linux ia32 (glibc)",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "ia32"
+  ],
+  "libc": [
+    "glibc"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/SocketDev/socket-patch"
+  }
+}
diff --git a/npm/socket-patch-linux-ia32-musl/package.json b/npm/socket-patch-linux-ia32-musl/package.json
@@ -1,13 +1,16 @@
 {
-  "name": "@socketsecurity/socket-patch-linux-ia32",
-  "version": "2.0.0",
-  "description": "socket-patch binary for Linux ia32",
+  "name": "@socketsecurity/socket-patch-linux-ia32-musl",
+  "version": "2.1.0",
+  "description": "socket-patch binary for Linux ia32 (musl)",
   "os": [
     "linux"
   ],
   "cpu": [
     "ia32"
   ],
+  "libc": [
+    "musl"
+  ],
   "publishConfig": {
     "access": "public"
   },
diff --git a/npm/socket-patch-linux-x64-gnu/package.json b/npm/socket-patch-linux-x64-gnu/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@socketsecurity/socket-patch-linux-x64-gnu",
+  "version": "2.1.0",
+  "description": "socket-patch binary for Linux x64 (glibc)",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "x64"
+  ],
+  "libc": [
+    "glibc"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/SocketDev/socket-patch"
+  }
+}
diff --git a/npm/socket-patch-linux-x64-musl/package.json b/npm/socket-patch-linux-x64-musl/package.json
@@ -1,13 +1,16 @@
 {
-  "name": "@socketsecurity/socket-patch-linux-x64",
-  "version": "2.0.0",
-  "description": "socket-patch binary for Linux x64",
+  "name": "@socketsecurity/socket-patch-linux-x64-musl",
+  "version": "2.1.0",
+  "description": "socket-patch binary for Linux x64 (musl)",
   "os": [
     "linux"
   ],
   "cpu": [
     "x64"
   ],
+  "libc": [
+    "musl"
+  ],
   "publishConfig": {
     "access": "public"
   },
diff --git a/npm/socket-patch-win32-arm64/package.json b/npm/socket-patch-win32-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@socketsecurity/socket-patch-win32-arm64",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "socket-patch binary for Windows ARM64",
   "os": [
     "win32"
diff --git a/npm/socket-patch-win32-ia32/package.json b/npm/socket-patch-win32-ia32/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@socketsecurity/socket-patch-win32-ia32",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "socket-patch binary for Windows ia32",
   "os": [
     "win32"
diff --git a/npm/socket-patch-win32-x64/package.json b/npm/socket-patch-win32-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@socketsecurity/socket-patch-win32-x64",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "socket-patch binary for Windows x64",
   "os": [
     "win32"
diff --git a/npm/socket-patch/bin/socket-patch b/npm/socket-patch/bin/socket-patch
@@ -3,31 +3,35 @@ const { spawnSync } = require("child_process");
 const path = require("path");
 
 const PLATFORMS = {
-  "darwin arm64": "@socketsecurity/socket-patch-darwin-arm64",
-  "darwin x64": "@socketsecurity/socket-patch-darwin-x64",
-  "linux x64": "@socketsecurity/socket-patch-linux-x64",
-  "linux arm64": "@socketsecurity/socket-patch-linux-arm64",
-  "linux arm": "@socketsecurity/socket-patch-linux-arm",
-  "linux ia32": "@socketsecurity/socket-patch-linux-ia32",
-  "win32 x64": "@socketsecurity/socket-patch-win32-x64",
-  "win32 ia32": "@socketsecurity/socket-patch-win32-ia32",
-  "win32 arm64": "@socketsecurity/socket-patch-win32-arm64",
-  "android arm64": "@socketsecurity/socket-patch-android-arm64",
+  "darwin arm64": ["@socketsecurity/socket-patch-darwin-arm64"],
+  "darwin x64": ["@socketsecurity/socket-patch-darwin-x64"],
+  "linux x64": ["@socketsecurity/socket-patch-linux-x64-gnu", "@socketsecurity/socket-patch-linux-x64-musl"],
+  "linux arm64": ["@socketsecurity/socket-patch-linux-arm64-gnu", "@socketsecurity/socket-patch-linux-arm64-musl"],
+  "linux arm": ["@socketsecurity/socket-patch-linux-arm-gnu", "@socketsecurity/socket-patch-linux-arm-musl"],
+  "linux ia32": ["@socketsecurity/socket-patch-linux-ia32-gnu", "@socketsecurity/socket-patch-linux-ia32-musl"],
+  "win32 x64": ["@socketsecurity/socket-patch-win32-x64"],
+  "win32 ia32": ["@socketsecurity/socket-patch-win32-ia32"],
+  "win32 arm64": ["@socketsecurity/socket-patch-win32-arm64"],
+  "android arm64": ["@socketsecurity/socket-patch-android-arm64"],
 };
 
 const key = `${process.platform} ${process.arch}`;
-const pkg = PLATFORMS[key];
-if (!pkg) {
+const candidates = PLATFORMS[key];
+if (!candidates) {
   console.error(`Unsupported platform: ${key}`);
   process.exit(1);
 }
 
 const exe = process.platform === "win32" ? "socket-patch.exe" : "socket-patch";
 let binPath;
-try {
-  const pkgDir = path.dirname(require.resolve(`${pkg}/package.json`));
-  binPath = path.join(pkgDir, exe);
-} catch {
+for (const pkg of candidates) {
+  try {
+    const pkgDir = path.dirname(require.resolve(`${pkg}/package.json`));
+    binPath = path.join(pkgDir, exe);
+    break;
+  } catch {}
+}
+if (!binPath) {
   // Fallback: try local bin directory (for development or bundled installs)
   const localBin = process.platform === "win32"
     ? `socket-patch-${key.replace(" ", "-")}.exe`
diff --git a/npm/socket-patch/bin/socket-patch.test.mjs b/npm/socket-patch/bin/socket-patch.test.mjs
@@ -11,10 +11,16 @@ const src = readFileSync(join(__dirname, "socket-patch"), "utf8");
 const match = src.match(/const PLATFORMS = \{([\s\S]*?)\};/);
 assert.ok(match, "PLATFORMS object not found in socket-patch");
 
-// Parse keys and values from the object literal
-const entries = [...match[1].matchAll(/"([^"]+)":\s*"([^"]+)"/g)].map(
-  ([, key, value]) => [key, value]
-);
+// Parse keys and array values from the object literal
+// Matches: "key": ["value1", "value2"] or "key": ["value1"]
+const entries = [];
+const entryRegex = /"([^"]+)":\s*\[([\s\S]*?)\]/g;
+let m;
+while ((m = entryRegex.exec(match[1])) !== null) {
+  const key = m[1];
+  const values = [...m[2].matchAll(/"([^"]+)"/g)].map(([, v]) => v);
+  entries.push([key, values]);
+}
 const PLATFORMS = Object.fromEntries(entries);
 
 const EXPECTED_KEYS = [
@@ -43,11 +49,25 @@ describe("npm platform dispatch", () => {
     }
   });
 
-  it("package names follow @socketsecurity/socket-patch-<platform>-<arch> convention", () => {
-    for (const [key, pkg] of Object.entries(PLATFORMS)) {
+  it("non-Linux package names follow @socketsecurity/socket-patch-<platform>-<arch> convention", () => {
+    for (const [key, candidates] of Object.entries(PLATFORMS)) {
+      if (key.startsWith("linux ")) continue;
       const [platform, arch] = key.split(" ");
+      assert.equal(candidates.length, 1, `expected 1 candidate for ${key}`);
       const expected = `@socketsecurity/socket-patch-${platform}-${arch}`;
-      assert.equal(pkg, expected, `package name mismatch for ${key}`);
+      assert.equal(candidates[0], expected, `package name mismatch for ${key}`);
+    }
+  });
+
+  it("Linux entries have both glibc and musl candidates", () => {
+    for (const [key, candidates] of Object.entries(PLATFORMS)) {
+      if (!key.startsWith("linux ")) continue;
+      const [, arch] = key.split(" ");
+      assert.equal(candidates.length, 2, `expected 2 candidates for ${key}`);
+      const gnuPkg = `@socketsecurity/socket-patch-linux-${arch}-gnu`;
+      const muslPkg = `@socketsecurity/socket-patch-linux-${arch}-musl`;
+      assert.equal(candidates[0], gnuPkg, `first candidate for ${key} should be gnu`);
+      assert.equal(candidates[1], muslPkg, `second candidate for ${key} should be musl`);
     }
   });
 });
diff --git a/npm/socket-patch/package.json b/npm/socket-patch/package.json
diff --git a/pypi/socket-patch/pyproject.toml b/pypi/socket-patch/pyproject.toml
diff --git a/scripts/build-pypi-wheels.py b/scripts/build-pypi-wheels.py
diff --git a/scripts/install.sh b/scripts/install.sh

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@socketsecurity/socket-patch-android-arm64",`
`3`		`- "version": "2.0.0",`
	`3`	`+ "version": "2.1.0",`
`4`	`4`	`"description": "socket-patch binary for Android ARM64",`
`5`	`5`	`"os": [`
`6`	`6`	`"android"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@socketsecurity/socket-patch-darwin-arm64",`
`3`		`- "version": "2.0.0",`
	`3`	`+ "version": "2.1.0",`
`4`	`4`	`"description": "socket-patch binary for macOS ARM64",`
`5`	`5`	`"os": [`
`6`	`6`	`"darwin"`