@gaossr/kiri 0.1.6 → 0.1.9-darwin-x64

package/README.md

@@ -1,8 +1,8 @@
 # Kiri npm Packaging
 
-This directory packages Kiri for npm with precompiled macOS binaries.
+This directory packages Kiri for npm with precompiled macOS, Linux x64, and Windows x64 binaries.
 
-After the npm package is published, users install it with:
+Users install it with:
 
 ```bash
 npm install -g @gaossr/kiri
@@ -21,7 +21,9 @@ Root package optional dependencies:
 ```json
 {
   "@gaossr/kiri-darwin-arm64": "npm:@gaossr/kiri@<version>-darwin-arm64",
-  "@gaossr/kiri-darwin-x64": "npm:@gaossr/kiri@<version>-darwin-x64"
+  "@gaossr/kiri-darwin-x64": "npm:@gaossr/kiri@<version>-darwin-x64",
+  "@gaossr/kiri-linux-x64": "npm:@gaossr/kiri@<version>-linux-x64",
+  "@gaossr/kiri-win32-x64": "npm:@gaossr/kiri@<version>-win32-x64"
 }
 ```
 
@@ -33,6 +35,10 @@ vendor/
     ports
   darwin-x64/
     ports
+  linux-x64/
+    ports
+  win32-x64/
+    ports.exe
 ```
 
 If the matching binary is missing, the shim prints a clear error explaining that the npm package artifacts are missing and should be reinstalled.
@@ -49,15 +55,33 @@ Build release tarballs from GitHub Release assets:
 
 ```bash
 node scripts/build-packages.js \
-  --version 0.1.6 \
+  --version 0.1.9 \
   --release-dir ../../dist \
   --output-dir ../../dist/npm
 ```
 
-Publish order, after verifying tarball contents and npm authentication:
+Publishing uses npm Trusted Publishing through GitHub Actions OIDC. Do not store
+`NPM_TOKEN` in GitHub Actions secrets for the normal release path.
+
+Required npm trusted publisher configuration for `@gaossr/kiri`:
+
+- Provider: GitHub Actions
+- Repository: `GaoSSR/kiri`
+- Workflow filename: `npm-publish.yml`
+- Allowed action: `npm publish`
+
+The equivalent npm CLI setup command is:
+
+```bash
+npm trust github @gaossr/kiri --file npm-publish.yml --repo GaoSSR/kiri --allow-publish
+```
+
+This requires npm CLI 11.10.0 or newer, write access to `@gaossr/kiri`, and
+2FA enabled on the npm account.
+
+After the Release workflow has uploaded and checksummed the npm tarballs, publish
+the already-built artifacts with:
 
 ```bash
-npm publish ../../dist/npm/kiri-npm-darwin-arm64-0.1.6.tgz --tag darwin-arm64 --access public --registry https://registry.npmjs.org/
-npm publish ../../dist/npm/kiri-npm-darwin-x64-0.1.6.tgz --tag darwin-x64 --access public --registry https://registry.npmjs.org/
-npm publish ../../dist/npm/kiri-npm-0.1.6.tgz --access public --registry https://registry.npmjs.org/
+gh workflow run "Publish npm" --repo GaoSSR/kiri --ref main -f version=<version>
 ```

package/package.json

@@ -1,27 +1,25 @@
 {
   "name": "@gaossr/kiri",
-  "version": "0.1.6",
-  "description": "Kiri CLI for inspecting local development ports; installs the ports command",
+  "version": "0.1.9-darwin-x64",
+  "description": "Kiri CLI for inspecting local development ports; installs the ports command (darwin-x64)",
   "license": "Apache-2.0",
-  "bin": {
-    "ports": "./bin/ports.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/GaoSSR/kiri.git",
-    "directory": "packaging/npm"
-  },
+  "os": [
+    "darwin"
+  ],
+  "cpu": [
+    "x64"
+  ],
   "files": [
     "LICENSE",
     "README.md",
-    "bin/",
-    "lib/"
+    "vendor/"
   ],
-  "optionalDependencies": {
-    "@gaossr/kiri-darwin-arm64": "npm:@gaossr/kiri@0.1.6-darwin-arm64",
-    "@gaossr/kiri-darwin-x64": "npm:@gaossr/kiri@0.1.6-darwin-x64"
-  },
   "engines": {
     "node": ">=18"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/GaoSSR/kiri.git",
+    "directory": "packaging/npm"
   }
 }

package/bin/ports.js

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-const { runBinary } = require("../lib/resolve-binary");
-
-runBinary("ports");

package/lib/resolve-binary.js

@@ -1,127 +0,0 @@
-"use strict";
-
-const fs = require("node:fs");
-const path = require("node:path");
-const { spawnSync } = require("node:child_process");
-
-const PLATFORM_PACKAGES = {
-  "darwin-arm64": "@gaossr/kiri-darwin-arm64",
-  "darwin-x64": "@gaossr/kiri-darwin-x64",
-};
-
-function platformKey(runtime = process) {
-  const platform = runtime.platform;
-  const arch = runtime.arch;
-
-  if (platform === "darwin" && arch === "arm64") {
-    return "darwin-arm64";
-  }
-  if (platform === "darwin" && arch === "x64") {
-    return "darwin-x64";
-  }
-  if (platform === "linux" && arch === "x64") {
-    return "linux-x64";
-  }
-  if (platform === "win32" && arch === "x64") {
-    return "win32-x64";
-  }
-
-  return `${platform}-${arch}`;
-}
-
-function binaryName(command) {
-  return process.platform === "win32" ? `${command}.exe` : command;
-}
-
-function platformPackageName(key) {
-  return PLATFORM_PACKAGES[key];
-}
-
-function binaryPath(command, options = {}) {
-  const packageRoot = options.packageRoot || path.join(__dirname, "..");
-  const runtime = options.runtime || process;
-  return path.join(packageRoot, "vendor", platformKey(runtime), binaryName(command));
-}
-
-function platformPackageBinaryPath(packageRoot, key, command) {
-  return path.join(packageRoot, "vendor", key, binaryName(command));
-}
-
-function resolveBinary(command, options = {}) {
-  const runtime = options.runtime || process;
-  const key = platformKey(runtime);
-  const platformPackage = platformPackageName(key);
-
-  if (!platformPackage) {
-    return null;
-  }
-
-  const requireFn = options.requireFn || require;
-  try {
-    const packageJsonPath = requireFn.resolve(`${platformPackage}/package.json`);
-    const resolved = platformPackageBinaryPath(
-      path.dirname(packageJsonPath),
-      key,
-      command
-    );
-    if (fs.existsSync(resolved)) {
-      return resolved;
-    }
-  } catch {
-    // Fall back to local vendor for staged-package verification.
-  }
-
-  const localBinary = binaryPath(command, options);
-  if (fs.existsSync(localBinary)) {
-    return localBinary;
-  }
-
-  return null;
-}
-
-function runBinary(command) {
-  const key = platformKey();
-  const resolved = resolveBinary(command);
-
-  if (!platformPackageName(key)) {
-    console.error(
-      [
-        `Kiri does not have a bundled binary for ${key}.`,
-        "macOS is supported first; Linux and Windows packages will be added after their collectors ship.",
-        "This npm package does not compile Rust locally and does not require Cargo.",
-      ].join("\n")
-    );
-    process.exit(1);
-  }
-
-  if (!resolved || !fs.existsSync(resolved)) {
-    console.error(
-      [
-        `Kiri npm package artifacts are missing for ${key}.`,
-        "Reinstall Kiri with: npm install -g @gaossr/kiri@latest",
-        "The npm package uses precompiled release binaries and does not compile Rust locally.",
-        "This npm package does not compile Rust locally and does not require Cargo.",
-      ].join("\n")
-    );
-    process.exit(1);
-  }
-
-  const result = spawnSync(resolved, process.argv.slice(2), {
-    stdio: "inherit",
-  });
-
-  if (result.error) {
-    console.error(result.error.message);
-    process.exit(1);
-  }
-
-  process.exit(result.status ?? 1);
-}
-
-module.exports = {
-  binaryPath,
-  platformPackageName,
-  platformKey,
-  resolveBinary,
-  runBinary,
-};