@trevrpc/trevrpc-js 0.1.9 → 0.2.2

package/bin/protoc-gen-trevrpc-js.js

@@ -1,4 +1,4 @@
-#!/nix/store/hwjfj8m2kcsl7kz2xa5yf84jbfh9jssf-nodejs-24.18.1/bin/node
+#!/usr/bin/env node
 
 import { runGenerator } from "../src/generator.js";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trevrpc/trevrpc-js",
-  "version": "0.1.9",
+  "version": "0.2.2",
   "description": "JavaScript WebTransport runtime and protobuf.js code generator for TrevRPC",
   "homepage": "https://trev.zip/llc/TrevRPC",
   "bugs": {
@@ -65,24 +65,25 @@
     "format": "oxfmt --write",
     "format:check": "oxfmt --check",
     "lint": "oxlint --deny-warnings",
+    "prepack": "node -e 'if (process.env.TREVRPC_NIX_PUBLICATION !== \"1\") throw new Error(\"Build release tarballs with nix build .#trevrpc-js^npm\")'",
     "test": "node --test --test-concurrency=1 test/*.test.js",
     "typecheck": "tsc -p tsconfig.json && tsc -p tsconfig.browser.json && tsc -p tsconfig.node.json",
     "verify:native:production": "node -e 'const { readFileSync } = require(\"node:fs\"); const path = \"./build/native/trevrpc_native.node\"; const expectedExports = [\"connectMsQuic\", \"createCancellation\", \"listenMsQuic\"]; const actualExports = Object.getOwnPropertyNames(require(path)).sort(); const exportsMatch = JSON.stringify(actualExports) === JSON.stringify(expectedExports); const embedsDebugNames = readFileSync(path).includes(Buffer.from(\"_debug\")); if (!exportsMatch || embedsDebugNames) throw new Error(`production addon exports ${JSON.stringify(actualExports)}; expected exactly ${JSON.stringify(expectedExports)}${embedsDebugNames ? \"; binary contains _debug\" : \"\"}`);'"
   },
   "dependencies": {
-    "protobufjs": "^8.7.1"
+    "protobufjs": "^8.8.0"
   },
   "devDependencies": {
     "@types/node": "^24.13.3",
-    "esbuild": "^0.28.1",
-    "playwright": "^1.62.1",
+    "esbuild": "^0.28.2",
+    "playwright": "1.61.1",
     "typescript": "^7.0.2"
   },
-  "optionalDependencies": {
-    "@trevrpc/trevrpc-js-native-linux-x64-gnu": "0.1.9"
-  },
   "engines": {
     "node": ">=24 <25"
   },
-  "packageManager": "npm@11.19.0"
+  "packageManager": "npm@12.0.2",
+  "optionalDependencies": {
+    "@trevrpc/trevrpc-js-native-linux-x64-gnu": "0.2.2"
+  }
 }

package/src/browser-channel.js

@@ -1,6 +1,10 @@
 import { ChannelStateMachine, stripChannelOptions, waitForInitialReady } from "./channel.js";
 import { unavailable } from "./status.js";
-import { RawWebTransport, createWebTransportSession } from "./webtransport.js";
+import {
+  RawWebTransport,
+  createWebTransportSession,
+  waitForWebTransportReady,
+} from "./webtransport.js";
 
 /** Browser channel with background session reconnection. */
 export class Channel extends ChannelStateMachine {
@@ -31,7 +35,7 @@ async function connectWebTransport(url, options, signal) {
   signal.addEventListener("abort", onAbort, { once: true });
 
   try {
-    await session.ready;
+    await waitForWebTransportReady(session);
     if (signal.aborted) {
       throw unavailable("channel is closed");
     }

package/src/native-loader.js

@@ -13,17 +13,17 @@ const packageVersion = (() => {
     return "unknown";
   }
 })();
-const SupportedTarget = "linux/x64/glibc";
+const SupportedOptionalTarget = "linux/x64/glibc";
 const LinuxX64GnuPackage = "@trevrpc/trevrpc-js-native-linux-x64-gnu";
 
 /** Loads the target-specific native addon without building during installation. */
-export function loadNativeAddon() {
+export function loadNativeAddon({ loadOptionalPackage = true, loadBundledAddon = true } = {}) {
   const target = nativeTarget();
   const packageName = nativePackageName(target);
   let packageError;
   let packageState = "unsupported";
 
-  if (packageName != null) {
+  if (loadOptionalPackage && packageName != null) {
     try {
       return require(packageName);
     } catch (error) {
@@ -32,6 +32,16 @@ export function loadNativeAddon() {
     }
   }
 
+  const bundled = loadBundledAddon ? bundledNativePath() : null;
+  let bundledError;
+  if (bundled != null) {
+    try {
+      return require(bundled);
+    } catch (error) {
+      bundledError = error;
+    }
+  }
+
   const fallback = developmentFallbackPath();
   let fallbackError;
   if (fallback != null) {
@@ -44,6 +54,8 @@ export function loadNativeAddon() {
 
   const detected = targetName(target);
   const expected = packageName ?? "no optional package (unsupported target)";
+  const bundledState =
+    bundled == null ? "no Nix-bundled addon was present" : "the Nix-bundled addon failed to load";
   const fallbackState =
     fallback == null
       ? "no source-checkout fallback was present"
@@ -52,10 +64,10 @@ export function loadNativeAddon() {
         : "the source-checkout fallback failed to load";
   throw new Error(
     `TrevRPC native addon is unavailable for detected target ${detected}. ` +
-      `Supported targets: ${SupportedTarget}. Expected optional package: ${expected}@${packageVersion}; ` +
-      `package state: ${packageState}; ${fallbackState}. ` +
+      `Supported optional-package targets: ${SupportedOptionalTarget}. Expected optional package: ${expected}@${packageVersion}; ` +
+      `package state: ${packageState}; ${bundledState}; ${fallbackState}. ` +
       "Install the matching optional package or build build/native/trevrpc_native.node explicitly in a source checkout; npm installation never starts a source build.",
-    { cause: fallbackError ?? packageError },
+    { cause: fallbackError ?? bundledError ?? packageError },
   );
 }
 
@@ -75,6 +87,11 @@ function nativePackageName(target) {
   return null;
 }
 
+function bundledNativePath() {
+  const path = join(packageRoot, "native", "trevrpc_native.node");
+  return existsSync(path) ? path : null;
+}
+
 function developmentFallbackPath() {
   if (!existsSync(join(packageRoot, "native", "CMakeLists.txt"))) {
     return null;

package/src/webtransport.js

@@ -30,13 +30,13 @@ export class RawWebTransport {
   /** Opens a WebTransport session and wraps it in a TrevRPC client. */
   static async connect(url, options = {}) {
     const session = createWebTransportSession(url, options);
-    await session.ready;
+    await waitForWebTransportReady(session);
     return new RawWebTransport(session, options);
   }
 
   /** Waits for the underlying WebTransport session to become ready. */
   async ready() {
-    await this.session.ready;
+    await waitForWebTransportReady(this.session);
   }
 
   /** Closes the underlying WebTransport session. */
@@ -146,6 +146,21 @@ export class RawWebTransport {
   }
 }
 
+/** Waits for readiness without hanging when a session closes during setup. */
+export async function waitForWebTransportReady(session) {
+  if (session.closed == null) {
+    await session.ready;
+    return;
+  }
+
+  await Promise.race([
+    session.ready,
+    Promise.resolve(session.closed).then(() => {
+      throw unavailable("WebTransport session closed before becoming ready");
+    }),
+  ]);
+}
+
 /** Creates a WebTransport session using only browser constructor options. */
 export function createWebTransportSession(url, options = {}) {
   const WebTransportCtor = options.WebTransport ?? globalThis.WebTransport;