add support for more platforms, fix pypi and npm publish

Author: mikolalysenko

.github/workflows/ci.yml

@@ -40,6 +40,28 @@ jobs:
       - name: Run tests
         run: cargo test --workspace
 
+  dispatch-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        with:
+          node-version: '20'
+
+      - name: Run npm dispatch tests
+        run: node --test npm/socket-patch/bin/socket-patch.test.mjs
+
+      - name: Setup Python
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
+        with:
+          python-version: '3.12'
+
+      - name: Run pypi dispatch tests
+        run: python pypi/socket-patch/test_dispatch.py
+
   e2e:
     needs: test
     strategy:

.github/workflows/release.yml

@@ -80,6 +80,26 @@ jobs:
             runner: windows-latest
             archive: zip
             build-tool: cargo
+          - target: i686-pc-windows-msvc
+            runner: windows-latest
+            archive: zip
+            build-tool: cargo
+          - target: aarch64-pc-windows-msvc
+            runner: windows-latest
+            archive: zip
+            build-tool: cargo
+          - target: aarch64-linux-android
+            runner: ubuntu-latest
+            archive: tar.gz
+            build-tool: cross
+          - target: arm-unknown-linux-gnueabihf
+            runner: ubuntu-latest
+            archive: tar.gz
+            build-tool: cross
+          - target: i686-unknown-linux-gnu
+            runner: ubuntu-latest
+            archive: tar.gz
+            build-tool: cross
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout
@@ -213,8 +233,10 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
-          node-version: '20'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: '22'
+
+      - name: Update npm for trusted publishing
+        run: npm install -g npm@latest
 
       - name: Stage binaries
         run: |
@@ -227,16 +249,24 @@ jobs:
           mv npm/socket-patch/bin/socket-patch npm/socket-patch/bin/socket-patch-linux-x64
           tar xzf artifacts/socket-patch-aarch64-unknown-linux-gnu.tar.gz -C npm/socket-patch/bin/
           mv npm/socket-patch/bin/socket-patch npm/socket-patch/bin/socket-patch-linux-arm64
+          tar xzf artifacts/socket-patch-arm-unknown-linux-gnueabihf.tar.gz -C npm/socket-patch/bin/
+          mv npm/socket-patch/bin/socket-patch npm/socket-patch/bin/socket-patch-linux-arm
+          tar xzf artifacts/socket-patch-i686-unknown-linux-gnu.tar.gz -C npm/socket-patch/bin/
+          mv npm/socket-patch/bin/socket-patch npm/socket-patch/bin/socket-patch-linux-ia32
+          tar xzf artifacts/socket-patch-aarch64-linux-android.tar.gz -C npm/socket-patch/bin/
+          mv npm/socket-patch/bin/socket-patch npm/socket-patch/bin/socket-patch-android-arm64
           cd npm/socket-patch/bin
           unzip ../../../artifacts/socket-patch-x86_64-pc-windows-msvc.zip
           mv socket-patch.exe socket-patch-win32-x64.exe
+          unzip ../../../artifacts/socket-patch-i686-pc-windows-msvc.zip
+          mv socket-patch.exe socket-patch-win32-ia32.exe
+          unzip ../../../artifacts/socket-patch-aarch64-pc-windows-msvc.zip
+          mv socket-patch.exe socket-patch-win32-arm64.exe
 
       - name: Copy README for npm package
         run: cp README.md npm/socket-patch/README.md
 
       - name: Publish package
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npm publish ./npm/socket-patch --provenance --access public
 
   pypi-publish:
@@ -262,38 +292,12 @@ jobs:
         with:
           python-version: '3.12'
 
-      - name: Install build tools
-        run: pip install build
-
-      - name: Stage binaries
-        run: |
-          mkdir -p pypi/socket-patch/socket_patch/bin
-          tar xzf artifacts/socket-patch-aarch64-apple-darwin.tar.gz -C pypi/socket-patch/socket_patch/bin/
-          mv pypi/socket-patch/socket_patch/bin/socket-patch pypi/socket-patch/socket_patch/bin/socket-patch-darwin-arm64
-          tar xzf artifacts/socket-patch-x86_64-apple-darwin.tar.gz -C pypi/socket-patch/socket_patch/bin/
-          mv pypi/socket-patch/socket_patch/bin/socket-patch pypi/socket-patch/socket_patch/bin/socket-patch-darwin-x64
-          tar xzf artifacts/socket-patch-x86_64-unknown-linux-musl.tar.gz -C pypi/socket-patch/socket_patch/bin/
-          mv pypi/socket-patch/socket_patch/bin/socket-patch pypi/socket-patch/socket_patch/bin/socket-patch-linux-x64
-          tar xzf artifacts/socket-patch-aarch64-unknown-linux-gnu.tar.gz -C pypi/socket-patch/socket_patch/bin/
-          mv pypi/socket-patch/socket_patch/bin/socket-patch pypi/socket-patch/socket_patch/bin/socket-patch-linux-arm64
-          cd pypi/socket-patch/socket_patch/bin
-          unzip ../../../../artifacts/socket-patch-x86_64-pc-windows-msvc.zip
-          mv socket-patch.exe socket-patch-win32-x64.exe
-
-      - name: Set executable permissions
+      - name: Build platform wheels
         run: |
-          chmod +x pypi/socket-patch/socket_patch/bin/socket-patch-darwin-arm64
-          chmod +x pypi/socket-patch/socket_patch/bin/socket-patch-darwin-x64
-          chmod +x pypi/socket-patch/socket_patch/bin/socket-patch-linux-x64
-          chmod +x pypi/socket-patch/socket_patch/bin/socket-patch-linux-arm64
-
-      - name: Copy README for PyPI package
-        run: cp README.md pypi/socket-patch/README.md
-
-      - name: Build package
-        run: python -m build pypi/socket-patch
+          VERSION="${{ needs.sync-and-tag.outputs.version }}"
+          python scripts/build-pypi-wheels.py --version "$VERSION" --artifacts artifacts --dist dist
 
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
         with:
-          packages-dir: pypi/socket-patch/dist/
+          packages-dir: dist/

Cargo.lock

@@ -7,7 +7,12 @@ const BINARIES = {
   "darwin x64": "socket-patch-darwin-x64",
   "linux x64": "socket-patch-linux-x64",
   "linux arm64": "socket-patch-linux-arm64",
+  "linux arm": "socket-patch-linux-arm",
+  "linux ia32": "socket-patch-linux-ia32",
   "win32 x64": "socket-patch-win32-x64.exe",
+  "win32 ia32": "socket-patch-win32-ia32.exe",
+  "win32 arm64": "socket-patch-win32-arm64.exe",
+  "android arm64": "socket-patch-android-arm64",
 };
 
 const key = `${process.platform} ${process.arch}`;

npm/socket-patch/bin/socket-patch

@@ -0,0 +1,71 @@
+import { describe, it } from "node:test";
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { dirname, join } from "node:path";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const src = readFileSync(join(__dirname, "socket-patch"), "utf8");
+
+// Extract the BINARIES object from the source
+const match = src.match(/const BINARIES = \{([\s\S]*?)\};/);
+assert.ok(match, "BINARIES 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]
+);
+const BINARIES = Object.fromEntries(entries);
+
+const EXPECTED_KEYS = [
+  "darwin arm64",
+  "darwin x64",
+  "linux x64",
+  "linux arm64",
+  "linux arm",
+  "linux ia32",
+  "win32 x64",
+  "win32 ia32",
+  "win32 arm64",
+  "android arm64",
+];
+
+describe("npm platform dispatch", () => {
+  it("has all expected platform keys", () => {
+    for (const key of EXPECTED_KEYS) {
+      assert.ok(BINARIES[key], `missing platform key: ${key}`);
+    }
+  });
+
+  it("has no unexpected platform keys", () => {
+    for (const key of Object.keys(BINARIES)) {
+      assert.ok(EXPECTED_KEYS.includes(key), `unexpected platform key: ${key}`);
+    }
+  });
+
+  it("binary names follow socket-patch-<platform>-<arch>[.exe] convention", () => {
+    for (const [key, bin] of Object.entries(BINARIES)) {
+      const [platform, arch] = key.split(" ");
+      const expected = platform === "win32"
+        ? `socket-patch-${platform}-${arch}.exe`
+        : `socket-patch-${platform}-${arch}`;
+      assert.equal(bin, expected, `binary name mismatch for ${key}`);
+    }
+  });
+
+  it("windows entries end in .exe", () => {
+    for (const [key, bin] of Object.entries(BINARIES)) {
+      if (key.startsWith("win32")) {
+        assert.ok(bin.endsWith(".exe"), `${key} should end in .exe`);
+      }
+    }
+  });
+
+  it("non-windows entries do not end in .exe", () => {
+    for (const [key, bin] of Object.entries(BINARIES)) {
+      if (!key.startsWith("win32")) {
+        assert.ok(!bin.endsWith(".exe"), `${key} should not end in .exe`);
+      }
+    }
+  });
+});

npm/socket-patch/bin/socket-patch.test.mjs

@@ -1,23 +1,20 @@
 import os
 import sys
 import subprocess
-import platform
-
-BINARIES = {
-    ("darwin", "arm64"): "socket-patch-darwin-arm64",
-    ("darwin", "x86_64"): "socket-patch-darwin-x64",
-    ("linux", "x86_64"): "socket-patch-linux-x64",
-    ("linux", "aarch64"): "socket-patch-linux-arm64",
-    ("win32", "amd64"): "socket-patch-win32-x64.exe",
-}
 
 
 def main():
-    machine = platform.machine().lower()
-    key = (sys.platform, machine)
-    bin_name = BINARIES.get(key)
-    if not bin_name:
-        print(f"Unsupported platform: {sys.platform} {machine}", file=sys.stderr)
+    bin_dir = os.path.join(os.path.dirname(__file__), "bin")
+    try:
+        entries = os.listdir(bin_dir)
+    except OSError:
+        entries = []
+    bins = [e for e in entries if e.startswith("socket-patch")]
+    if len(bins) != 1:
+        print(
+            f"Expected exactly one socket-patch binary in {bin_dir}, found {len(bins)}",
+            file=sys.stderr,
+        )
         sys.exit(1)
-    bin_path = os.path.join(os.path.dirname(__file__), "bin", bin_name)
+    bin_path = os.path.join(bin_dir, bins[0])
     raise SystemExit(subprocess.call([bin_path] + sys.argv[1:]))