@vzn/vx-reapi 0.0.590 → 0.0.594

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vzn/vx-reapi",
-  "version": "0.0.590",
+  "version": "0.0.594",
   "license": "MIT",
   "description": "Bazel Remote Execution API plugin for vx — remote cache (ActionCache + CAS) against NativeLink, BuildBuddy, Buildbarn or bazel-remote.",
   "keywords": [
@@ -33,14 +33,13 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.12.0",
-    "@grpc/proto-loader": "^0.7.13",
-    "protobufjs": "^7.4.0"
+    "@grpc/proto-loader": "^0.7.13"
   },
   "publishConfig": {
     "access": "public"
   },
   "peerDependencies": {
-    "@vzn/vx": "^0.0.590"
+    "@vzn/vx": "^0.0.594"
   },
   "repository": {
     "type": "git",

package/src/executor.ts

@@ -30,6 +30,9 @@ import {
 import { execDigestFor } from './cache.js'
 import type { ActionResult, Digest, Directory, Operation, ReapiClient } from './wire.js'
 
+// A default decoder strips a leading U+FEFF, which is part of a path.
+const PATH_UTF8 = new TextDecoder('utf-8', { ignoreBOM: true })
+
 /**
  * Split a coarse output directory into the paths its GLOB actually names.
  *
@@ -346,7 +349,7 @@ function decodeOutputFile(buf: Uint8Array): {
       i = l
       const slice = buf.subarray(i, i + len)
       i += len
-      if (field === 1) out.path = new TextDecoder().decode(slice)
+      if (field === 1) out.path = PATH_UTF8.decode(slice)
       else if (field === 2) out.digest = decodeDigest(slice)
       else if (field === 5 && len > 0) out.contents = slice
     } else if (wire === 0) {
@@ -370,8 +373,8 @@ function decodeOutputSymlink(buf: Uint8Array): { path: string; target: string }
     i = l
     const slice = buf.subarray(i, i + len)
     i += len
-    if (key >>> 3 === 1) out.path = new TextDecoder().decode(slice)
-    else if (key >>> 3 === 2) out.target = new TextDecoder().decode(slice)
+    if (key >>> 3 === 1) out.path = PATH_UTF8.decode(slice)
+    else if (key >>> 3 === 2) out.target = PATH_UTF8.decode(slice)
   }
   return out
 }
@@ -445,7 +448,7 @@ function decodeOutputDirectory(buf: Uint8Array): { path: string; tree_digest: Di
     i = l
     const slice = buf.subarray(i, i + len)
     i += len
-    if (field === 1) out.path = new TextDecoder().decode(slice)
+    if (field === 1) out.path = PATH_UTF8.decode(slice)
     else if (field === 3) out.tree_digest = decodeDigest(slice)
   }
   return out
@@ -1342,7 +1345,7 @@ export function commandEnvironment(
   return [...merged].map(([name, value]) => ({ name, value }))
 }
 
-export interface OutputPathSets {
+interface OutputPathSets {
   /** v2.1+ `output_paths` — deduped, sorted. */
   outputPaths: string[]
   /** v2.0 legacy split: wildcard-free globs are files, prefix-derived are directories. */

package/src/merkle.ts

@@ -14,12 +14,15 @@ import { lstat, readlink } from 'node:fs/promises'
 import path from 'node:path'
 import type { Digest, Directory, DirectoryNode, FileNode, SymlinkNode } from './wire.js'
 
+// A default decoder strips a leading U+FEFF, which is part of a name.
+const PATH_UTF8 = new TextDecoder('utf-8', { ignoreBOM: true })
+
 export interface Blob {
   digest: Digest
   data: Uint8Array
 }
 
-export interface InputTree {
+interface InputTree {
   /** Digest of the root `Directory` — goes in `Action.input_root_digest`. */
   root: Digest
   /** Every blob the server needs: file contents plus the Directory nodes. */
@@ -740,7 +743,7 @@ function decodeFileNode(buf: Uint8Array): FileNode {
       i = l
       const slice = buf.subarray(i, i + len)
       i += len
-      if (field === 1) f.name = new TextDecoder().decode(slice)
+      if (field === 1) f.name = PATH_UTF8.decode(slice)
       else if (field === 2) f.digest = decodeDigestBytes(slice)
       else if (field === 6) f.node_properties = decodeNodeProperties(slice)
     } else if (wire === 0) {
@@ -802,7 +805,7 @@ function decodeDirectoryNode(buf: Uint8Array): DirectoryNode {
     i = l
     const slice = buf.subarray(i, i + len)
     i += len
-    if (key >>> 3 === 1) d.name = new TextDecoder().decode(slice)
+    if (key >>> 3 === 1) d.name = PATH_UTF8.decode(slice)
     else if (key >>> 3 === 2) d.digest = decodeDigestBytes(slice)
   }
   return d
@@ -819,8 +822,8 @@ function decodeSymlinkNode(buf: Uint8Array): SymlinkNode {
     i = l
     const slice = buf.subarray(i, i + len)
     i += len
-    if (key >>> 3 === 1) sl.name = new TextDecoder().decode(slice)
-    else if (key >>> 3 === 2) sl.target = new TextDecoder().decode(slice)
+    if (key >>> 3 === 1) sl.name = PATH_UTF8.decode(slice)
+    else if (key >>> 3 === 2) sl.target = PATH_UTF8.decode(slice)
   }
   return sl
 }

package/src/wire.ts

@@ -82,7 +82,7 @@ export interface Digest {
   size_bytes: number
 }
 
-export interface ServerCapabilities {
+interface ServerCapabilities {
   digestFunctions: string[]
   maxBatchBytes: number
   acUpdateEnabled: boolean
@@ -1566,7 +1566,7 @@ export interface Operation {
   metadata?: { type_url?: string; value?: Uint8Array }
 }
 
-export interface ExecuteOptions {
+interface ExecuteOptions {
   /** The operation's name, once the server has given one. */
   onOperation?: (name: string) => void
   /** Default TRUE: vx owns the cache decision, so the server must not re-check its own AC. */