@pmate/cli 0.29.5 → 0.29.7

package/dist/index.d.ts

@@ -743,6 +743,8 @@ type CallCommandArgs = {
     name: string;
     payload?: Record<string, unknown>;
     filePath?: string;
+    binaryFilePath?: string;
+    contentType?: string;
     hubBaseUrl?: string;
     timeoutMs?: number;
     json: boolean;

package/dist/index.js

@@ -8249,26 +8249,51 @@ var init_src3 = __esm({
   }
 });
 
-// node_modules/.pnpm/@pmate+hub-sdk@0.3.2/node_modules/@pmate/hub-sdk/dist/AgentClient.js
+// node_modules/.pnpm/@pmate+hub-sdk@0.4.1/node_modules/@pmate/hub-sdk/dist/AgentClient.js
 var init_AgentClient = __esm({
-  "node_modules/.pnpm/@pmate+hub-sdk@0.3.2/node_modules/@pmate/hub-sdk/dist/AgentClient.js"() {
+  "node_modules/.pnpm/@pmate+hub-sdk@0.4.1/node_modules/@pmate/hub-sdk/dist/AgentClient.js"() {
     "use strict";
     init_src();
     init_src3();
   }
 });
 
-// node_modules/.pnpm/@pmate+hub-sdk@0.3.2/node_modules/@pmate/hub-sdk/dist/FunctionService.js
+// node_modules/.pnpm/@pmate+hub-sdk@0.4.1/node_modules/@pmate/hub-sdk/dist/FunctionService.js
 var init_FunctionService = __esm({
-  "node_modules/.pnpm/@pmate+hub-sdk@0.3.2/node_modules/@pmate/hub-sdk/dist/FunctionService.js"() {
+  "node_modules/.pnpm/@pmate+hub-sdk@0.4.1/node_modules/@pmate/hub-sdk/dist/FunctionService.js"() {
     "use strict";
   }
 });
 
-// node_modules/.pnpm/@pmate+hub-sdk@0.3.2/node_modules/@pmate/hub-sdk/dist/HubClient.js
+// node_modules/.pnpm/@pmate+hub-sdk@0.4.1/node_modules/@pmate/hub-sdk/dist/HubClient.js
 function createCallId(functionId) {
   return uniqHash(`${functionId}-${Date.now()}-${Math.random()}`, "task-v1" /* Task */);
 }
+function defaultTransportFactory(url) {
+  return new WebsocketClientV2(url);
+}
+function streamContentType(value) {
+  if (typeof Blob !== "undefined" && value instanceof Blob) {
+    return value.type || "application/octet-stream";
+  }
+  if (value instanceof Uint8Array || value instanceof ArrayBuffer) {
+    return "application/octet-stream";
+  }
+  if (typeof value === "string")
+    return "text";
+  return "application/json";
+}
+async function streamInputForWire(value) {
+  if (typeof Blob !== "undefined" && value instanceof Blob) {
+    return new Uint8Array(await value.arrayBuffer());
+  }
+  return value;
+}
+function abortError(reason) {
+  if (reason instanceof Error)
+    return reason;
+  return new Error(typeof reason === "string" ? reason : "Function stream aborted");
+}
 function ensureWsProtocol(baseUrl) {
   if (/^wss?:\/\//i.test(baseUrl))
     return baseUrl;
@@ -8299,13 +8324,14 @@ function withTimeout(promise, timeoutMs, message) {
     });
   });
 }
-var DEFAULT_TIMEOUT_MS, HubClient, AsyncCallQueue;
+var DEFAULT_TIMEOUT_MS, DEFAULT_STREAM_TIMEOUT_MS, HubClient, AsyncCallQueue;
 var init_HubClient = __esm({
-  "node_modules/.pnpm/@pmate+hub-sdk@0.3.2/node_modules/@pmate/hub-sdk/dist/HubClient.js"() {
+  "node_modules/.pnpm/@pmate+hub-sdk@0.4.1/node_modules/@pmate/hub-sdk/dist/HubClient.js"() {
     "use strict";
     init_src();
     init_src3();
     DEFAULT_TIMEOUT_MS = 4e4;
+    DEFAULT_STREAM_TIMEOUT_MS = 12e4;
     HubClient = class {
       options;
       ws;
@@ -8313,7 +8339,10 @@ var init_HubClient = __esm({
       token;
       authenticated = false;
       calls = /* @__PURE__ */ new Map();
+      streamInputs = /* @__PURE__ */ new Map();
       timeoutMs;
+      streamTimeoutMs;
+      minChunkSizeBytes;
       connectWaiter;
       authWaiter;
       reconnectEnabled = false;
@@ -8321,6 +8350,8 @@ var init_HubClient = __esm({
       constructor(options) {
         this.options = options;
         this.timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+        this.streamTimeoutMs = options.streamTimeoutMs ?? DEFAULT_STREAM_TIMEOUT_MS;
+        this.minChunkSizeBytes = options.minChunkSizeBytes ?? 0;
       }
       isConnected() {
         return this.authenticated;
@@ -8331,7 +8362,7 @@ var init_HubClient = __esm({
         this.token = options.token;
         this.connectWaiter = deferred();
         this.authWaiter = deferred();
-        const ws = new WebsocketClientV2(ensureWsProtocol(this.options.baseUrl));
+        const ws = (this.options.transportFactory ?? defaultTransportFactory)(ensureWsProtocol(this.options.baseUrl));
         this.ws = ws;
         const stream = ws.getStream();
         void this.consume(stream);
@@ -8392,6 +8423,39 @@ var init_HubClient = __esm({
           this.cancelPendingCall(callId);
         }
       }
+      stream(request2) {
+        this.ensureAuthenticated();
+        const callId = createCallId(request2.functionId);
+        const timeoutMs = request2.timeoutMs ?? this.streamTimeoutMs;
+        const result = new Promise((resolve, reject) => {
+          const timer = setTimeout(() => {
+            void this.abortFunctionStream(callId, new Error(`Function stream timed out: ${request2.functionId}`));
+          }, timeoutMs);
+          this.calls.set(callId, {
+            resolve,
+            reject,
+            timer,
+            abort: (error) => this.sendFunctionStreamCancel(callId, request2.functionId, error)
+          });
+        });
+        void result.catch(() => {
+        });
+        const onAbort = () => {
+          void this.abortFunctionStream(callId, abortError(request2.signal?.reason));
+        };
+        request2.signal?.addEventListener("abort", onAbort, { once: true });
+        if (request2.signal?.aborted)
+          onAbort();
+        void this.sendFunctionStream(callId, request2).catch((error) => {
+          void this.abortFunctionStream(callId, error instanceof Error ? error : new Error(String(error)));
+        });
+        void result.finally(() => request2.signal?.removeEventListener("abort", onAbort)).catch(() => {
+        });
+        return {
+          finish: () => result,
+          cancel: (reason) => this.abortFunctionStream(callId, new Error(reason ?? "Function stream cancelled"))
+        };
+      }
       close() {
         this.reconnectEnabled = false;
         this.reauthenticating = void 0;
@@ -8484,7 +8548,13 @@ var init_HubClient = __esm({
           return;
         clearTimeout(call.timer);
         this.calls.delete(callId);
-        call.reject(error);
+        const input = this.streamInputs.get(callId);
+        this.streamInputs.delete(callId);
+        void input?.return?.();
+        if (call.abort)
+          void call.abort(error).then(() => call.reject(error), () => call.reject(error));
+        else
+          call.reject(error);
       }
       handleConnectionLoss(error) {
         this.authenticated = false;
@@ -8498,6 +8568,72 @@ var init_HubClient = __esm({
           profileId
         }, 0 /* PIPELINE */));
       }
+      async sendFunctionStream(callId, request2) {
+        this.ensureAuthenticated();
+        const ws = this.ws;
+        const profileId = this.profileId;
+        const auth = { token: this.token, profileId };
+        const send = (op, contentType, input2) => ws.sendMsg(Msg.create(profileId, "@hub", 6 /* CALL */, {
+          kind: "request",
+          callId,
+          functionId: request2.functionId,
+          op,
+          auth,
+          contentType,
+          ...input2 !== void 0 ? { input: input2 } : {}
+        }, 0 /* PIPELINE */));
+        await send(0 /* Start */, "application/json", request2.params);
+        const minChunkSizeBytes = request2.minChunkSizeBytes ?? this.minChunkSizeBytes;
+        const input = minChunkSizeBytes > 0 ? AsyncStream.chunkBlob(request2.stream, { minBytes: minChunkSizeBytes }) : request2.stream;
+        const iterator = input[Symbol.asyncIterator]();
+        this.streamInputs.set(callId, iterator);
+        try {
+          while (this.calls.has(callId)) {
+            const next = await iterator.next();
+            if (next.done)
+              break;
+            await send(1 /* Data */, streamContentType(next.value), await streamInputForWire(next.value));
+          }
+          if (!this.calls.has(callId))
+            return;
+          await send(2 /* End */, "application/json");
+        } finally {
+          this.streamInputs.delete(callId);
+        }
+      }
+      async abortFunctionStream(callId, error) {
+        const call = this.calls.get(callId);
+        if (!call)
+          return;
+        clearTimeout(call.timer);
+        this.calls.delete(callId);
+        const input = this.streamInputs.get(callId);
+        this.streamInputs.delete(callId);
+        await input?.return?.();
+        try {
+          await call.abort?.(error);
+        } finally {
+          call.reject(error);
+        }
+      }
+      async sendFunctionStreamCancel(callId, functionId, error) {
+        if (!this.ws || !this.profileId || !this.token || !this.authenticated)
+          return;
+        const body = {
+          kind: "request",
+          callId,
+          functionId,
+          op: 3 /* Cancel */,
+          input: { reason: error.message },
+          auth: { token: this.token, profileId: this.profileId }
+        };
+        await this.ws.sendMsg(Msg.create(this.profileId, "@hub", 6 /* CALL */, body, 0 /* PIPELINE */));
+      }
+      ensureAuthenticated() {
+        if (!this.ws || !this.profileId || !this.token || !this.authenticated) {
+          throw new Error("HubClient is not logged in");
+        }
+      }
       reauthenticate() {
         if (this.reauthenticating)
           return this.reauthenticating;
@@ -8610,9 +8746,9 @@ var init_HubClient = __esm({
   }
 });
 
-// node_modules/.pnpm/@pmate+hub-sdk@0.3.2/node_modules/@pmate/hub-sdk/dist/index.js
+// node_modules/.pnpm/@pmate+hub-sdk@0.4.1/node_modules/@pmate/hub-sdk/dist/index.js
 var init_dist2 = __esm({
-  "node_modules/.pnpm/@pmate+hub-sdk@0.3.2/node_modules/@pmate/hub-sdk/dist/index.js"() {
+  "node_modules/.pnpm/@pmate+hub-sdk@0.4.1/node_modules/@pmate/hub-sdk/dist/index.js"() {
     "use strict";
     init_AgentClient();
     init_FunctionService();
@@ -16742,11 +16878,8 @@ var CallCommandHandler = class {
     const input = args.filePath ? readJson2(args.filePath) : args.payload;
     try {
       await hub.login({ token: session.token, profileId: session.profileId, timeoutMs: args.timeoutMs });
-      const output = await hub.call({
-        functionId: `${args.namespace}:${args.name}`,
-        input,
-        timeoutMs: args.timeoutMs
-      });
+      const functionId = `${args.namespace}:${args.name}`;
+      const output = args.binaryFilePath ? await callWithBinaryFile(hub, functionId, args.binaryFilePath, args.contentType, args.timeoutMs) : await hub.call({ functionId, input, timeoutMs: args.timeoutMs });
       if (args.json || typeof output !== "string") ui.plain(JSON.stringify(output ?? null, null, 2));
       else ui.plain(output);
     } finally {
@@ -16754,6 +16887,35 @@ var CallCommandHandler = class {
     }
   }
 };
+async function callWithBinaryFile(hub, functionId, filePath, contentType, timeoutMs) {
+  const absolutePath = import_node_path20.default.resolve(process.cwd(), filePath);
+  if (!(0, import_node_fs15.existsSync)(absolutePath)) throw new Error(`Binary file not found: ${absolutePath}`);
+  const mimeType = contentType || inferContentType(absolutePath);
+  const result = hub.stream({
+    functionId,
+    stream: streamFile(absolutePath, mimeType),
+    timeoutMs
+  });
+  return result.finish();
+}
+async function* streamFile(filePath, contentType) {
+  for await (const chunk of (0, import_node_fs15.createReadStream)(filePath)) {
+    yield new Blob([chunk], { type: contentType });
+  }
+}
+function inferContentType(filePath) {
+  const contentTypes = {
+    ".aac": "audio/aac",
+    ".flac": "audio/flac",
+    ".m4a": "audio/mp4",
+    ".mp3": "audio/mpeg",
+    ".ogg": "audio/ogg",
+    ".opus": "audio/opus",
+    ".wav": "audio/wav",
+    ".webm": "audio/webm"
+  };
+  return contentTypes[import_node_path20.default.extname(filePath).toLowerCase()] || "application/octet-stream";
+}
 function readJson2(filePath) {
   const absolutePath = import_node_path20.default.resolve(process.cwd(), filePath);
   if (!(0, import_node_fs15.existsSync)(absolutePath)) throw new Error(`JSON file not found: ${absolutePath}`);
@@ -19199,7 +19361,7 @@ var ServiceRuntimeRunner = class {
       `if [ -f ~/.profile ]; then . ~/.profile; fi`,
       `if [ -f ~/.bashrc ]; then . ~/.bashrc; fi`,
       `if [ -n "$(git status --porcelain)" ]; then git reset --hard HEAD; git clean -fd; fi`,
-      `git pull`,
+      `git pull --rebase`,
       `pnpm install`,
       ...envSyncCommand ? [envSyncCommand] : [],
       buildIfNeeded,
@@ -19268,7 +19430,7 @@ var ServiceRuntimeRunner = class {
       `if [ -f ~/.profile ]; then . ~/.profile; fi`,
       `if [ -f ~/.bashrc ]; then . ~/.bashrc; fi`,
       `if [ -n "$(git status --porcelain)" ]; then git reset --hard HEAD; git clean -fd; fi`,
-      `git pull`,
+      `git pull --rebase`,
       ...envSyncCommand ? [envSyncCommand] : [],
       `"${scriptPath}" restart --env ${shellQuote2(envName)}`
     ].join(" && ");
@@ -22739,10 +22901,12 @@ init_namespacedRef();
 function parseCallArgs(tokens) {
   const rest = [...tokens];
   const ref = rest.shift();
-  if (!ref) throw new Error("Usage: call <namespace:functionId> [--payload <json>|--file <path>]");
+  if (!ref) throw new Error("Usage: call <namespace:functionId> [--payload <json>|--file <path>|--binary-file <path>]");
   const parsed = parseNamespacedRef(ref, { entityLabel: "function ref" });
   let payload;
   let filePath;
+  let binaryFilePath;
+  let contentType;
   let hubBaseUrl;
   let timeoutMs;
   let json = false;
@@ -22760,12 +22924,17 @@ function parseCallArgs(tokens) {
       }
       payload = decoded;
     } else if (option === "--file") filePath = value();
+    else if (option === "--binary-file") binaryFilePath = value();
+    else if (option === "--content-type") contentType = value();
     else if (option === "--hub-base-url") hubBaseUrl = value();
     else if (option === "--timeout-ms") timeoutMs = Number.parseInt(value(), 10);
     else if (option === "--json") json = true;
     else throw new Error(`Unknown call option: ${option}`);
   }
-  if (payload && filePath) throw new Error("Provide only one of --payload or --file");
+  if ([payload, filePath, binaryFilePath].filter(Boolean).length > 1) {
+    throw new Error("Provide only one of --payload, --file or --binary-file");
+  }
+  if (contentType && !binaryFilePath) throw new Error("--content-type requires --binary-file");
   if (timeoutMs !== void 0 && (!Number.isInteger(timeoutMs) || timeoutMs < 1)) {
     throw new Error("--timeout-ms must be a positive integer");
   }
@@ -22775,6 +22944,8 @@ function parseCallArgs(tokens) {
     name: parsed.objectId,
     payload,
     filePath,
+    binaryFilePath,
+    contentType,
     hubBaseUrl,
     timeoutMs,
     json

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.29.5",
+  "version": "0.29.7",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {
@@ -31,7 +31,7 @@
     "@alicloud/sts20150401": "^1.2.0",
     "@linear/sdk": "^70.0.0",
     "@pmate/chat-sdk": "^0.2.0",
-    "@pmate/hub-sdk": "^0.3.2",
+    "@pmate/hub-sdk": "^0.4.1",
     "@types/ali-oss": "^6.16.13",
     "ajv": "^8.17.1",
     "ali-oss": "^6.23.0",