@meshagent/meshagent 0.47.0 → 0.48.0

package/dist/node/mounts-client.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MountsClient = void 0;
+const response_js_1 = require("./response.js");
+const room_server_client_js_1 = require("./room-server-client.js");
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseMountedVolume(value) {
+    if (!isRecord(value)
+        || typeof value["id"] !== "string"
+        || typeof value["name"] !== "string"
+        || typeof value["required"] !== "boolean") {
+        throw new room_server_client_js_1.RoomServerException("unexpected return type from mounts.list");
+    }
+    const metadata = isRecord(value["metadata"]) ? value["metadata"] : {};
+    const rawAnnotations = isRecord(value["annotations"]) ? value["annotations"] : {};
+    const annotations = {};
+    for (const [key, item] of Object.entries(rawAnnotations)) {
+        if (typeof item === "string") {
+            annotations[key] = item;
+        }
+    }
+    const rawConsumers = value["consumers"] ?? [];
+    if (!Array.isArray(rawConsumers)) {
+        throw new room_server_client_js_1.RoomServerException("unexpected return type from mounts.list");
+    }
+    const consumers = rawConsumers.map((consumer) => {
+        if (!isRecord(consumer)
+            || (consumer["kind"] !== "room" && consumer["kind"] !== "container")
+            || (consumer["kind"] === "container" && typeof consumer["container_id"] !== "string")
+            || (consumer["kind"] === "room" && consumer["container_id"] !== undefined)) {
+            throw new room_server_client_js_1.RoomServerException("unexpected return type from mounts.list");
+        }
+        return {
+            kind: consumer["kind"],
+            containerId: typeof consumer["container_id"] === "string"
+                ? consumer["container_id"]
+                : undefined,
+        };
+    });
+    const storageClass = value["storage_class"] ?? "standard";
+    if (storageClass !== "standard" && storageClass !== "juice" && storageClass !== "zerofs") {
+        throw new room_server_client_js_1.RoomServerException("unexpected return type from mounts.list");
+    }
+    const maxSizeMb = value["max_size_mb"];
+    if (maxSizeMb !== undefined && (typeof maxSizeMb !== "number" || !Number.isInteger(maxSizeMb) || maxSizeMb <= 0)) {
+        throw new room_server_client_js_1.RoomServerException("unexpected return type from mounts.list");
+    }
+    return {
+        id: value["id"],
+        name: value["name"],
+        required: value["required"],
+        description: typeof value["description"] === "string" ? value["description"] : "",
+        metadata,
+        annotations,
+        storageClass,
+        maxSizeMb,
+        consumers,
+    };
+}
+class MountsClient {
+    constructor(room) {
+        this.room = room;
+    }
+    async list() {
+        const response = await this.room.invokeContent({
+            toolkit: "mounts",
+            tool: "list",
+            input: {},
+        });
+        if (!(response instanceof response_js_1.JsonContent)) {
+            throw new room_server_client_js_1.RoomServerException("unexpected return type from mounts.list");
+        }
+        const volumes = response.json["volumes"];
+        if (!Array.isArray(volumes)) {
+            throw new room_server_client_js_1.RoomServerException("unexpected return type from mounts.list");
+        }
+        return volumes.map(parseMountedVolume);
+    }
+}
+exports.MountsClient = MountsClient;

package/dist/node/participant-token.d.ts

@@ -404,6 +404,7 @@ export declare class ParticipantToken {
     addTunnelGrant(ports: number[]): void;
     addRoleGrant(role: string): void;
     addRoomGrant(roomName: string): void;
+    addSiteGrant(roomName: string): void;
     addApiGrant(grant: ApiScope): void;
     grantScope(name: string): string | ApiScope | undefined;
     getApiGrant(): ApiScope | undefined;

package/dist/node/participant-token.js

@@ -1323,6 +1323,9 @@ class ParticipantToken {
     addRoomGrant(roomName) {
         this.grants.push(new ParticipantGrant({ name: "room", scope: roomName }));
     }
+    addSiteGrant(roomName) {
+        this.grants.push(new ParticipantGrant({ name: "site", scope: roomName }));
+    }
     addApiGrant(grant) {
         for (const existingGrant of this.grants) {
             if (existingGrant.name === "api") {

package/dist/node/room-client.d.ts

@@ -4,6 +4,7 @@ import { DeveloperClient } from "./developer-client.js";
 import { type EventHandler, type EventName } from "./event-emitter.js";
 import { MessagingClient } from "./messaging-client.js";
 import { MemoryClient } from "./memory-client.js";
+import { MountsClient } from "./mounts-client.js";
 import { LocalParticipant } from "./participant.js";
 import { Protocol, ProtocolCloseKind, type MessageHandler, type ProtocolFactory } from "./protocol.js";
 import { QueuesClient } from "./queues-client.js";
@@ -59,6 +60,7 @@ export declare class RoomClient {
     readonly containers: ContainersClient;
     readonly memory: MemoryClient;
     readonly services: ServicesClient;
+    readonly mounts: MountsClient;
     _protocolInstance: Protocol;
     _entered: boolean;
     _allowDisconnectedRequests: boolean;
@@ -190,6 +192,7 @@ export declare class RoomClient {
     _sendLocalAttributesNowait(attributes: Record<string, unknown>): void;
     _resendLocalAttributesNowait(): void;
     sendRequest(type: string, request: RequestHeader, data?: Uint8Array, afterSend?: () => void): Promise<Content>;
+    private _dispatchRequest;
     call(params: {
         name: string;
         url: string;
@@ -249,7 +252,7 @@ export declare class RoomClient {
         participantId?: string;
         onBehalfOfId?: string;
     }): Promise<AsyncIterable<Content>>;
-    private _sendToolCallRequestChunk;
+    private _dispatchToolCallRequestChunk;
     private _streamInvokeToolRequestChunks;
     private _decodeToolCallContent;
     private _handleToolCallResponseChunk;

package/dist/node/room-client.js

@@ -8,6 +8,7 @@ const developer_client_js_1 = require("./developer-client.js");
 const event_emitter_js_1 = require("./event-emitter.js");
 const messaging_client_js_1 = require("./messaging-client.js");
 const memory_client_js_1 = require("./memory-client.js");
+const mounts_client_js_1 = require("./mounts-client.js");
 const participant_js_1 = require("./participant.js");
 const protocol_js_1 = require("./protocol.js");
 const queues_client_js_1 = require("./queues-client.js");
@@ -261,6 +262,7 @@ class RoomClient {
         this.containers = new containers_client_js_1.ContainersClient({ room: this });
         this.memory = new memory_client_js_1.MemoryClient({ room: this });
         this.services = new services_client_js_1.ServicesClient({ room: this });
+        this.mounts = new mounts_client_js_1.MountsClient(this);
     }
     static withIAP({ url = "./.well-known/meshagent/room/connect", reconnectTimeout = null, } = {}) {
         return new RoomClient({
@@ -1147,6 +1149,11 @@ class RoomClient {
         this._sendLocalAttributesNowait(attributes);
     }
     async sendRequest(type, request, data, afterSend) {
+        const response = this._dispatchRequest(type, request, data);
+        afterSend?.();
+        return await response;
+    }
+    _dispatchRequest(type, request, data) {
         this._raiseIfTerminal();
         if (this._entered && !this._connected && !this._allowDisconnectedRequests) {
             throw this._disconnectedError({ baseMessage: "room connection is disconnected" });
@@ -1155,9 +1162,8 @@ class RoomClient {
         const completer = new completer_js_1.Completer();
         this._pendingRequests.set(requestId, completer);
         try {
-            await this._protocolInstance.send(type, (0, utils_js_1.packMessage)(request, data), requestId);
-            afterSend?.();
-            return await completer.fut;
+            this._protocolInstance.sendNowait(type, (0, utils_js_1.packMessage)(request, data), { id: requestId });
+            return completer.fut;
         }
         catch (error) {
             this._pendingRequests.delete(requestId);
@@ -1263,7 +1269,6 @@ class RoomClient {
         let requestTask;
         if (params.streamInput === true) {
             request["arguments"] = { type: "control", method: "open" };
-            requestTask = this._streamInvokeToolRequestChunks(toolCallId, params.input);
         }
         else {
             const input = params.input;
@@ -1280,9 +1285,14 @@ class RoomClient {
         if (params.onBehalfOfId != null) {
             request["on_behalf_of_id"] = params.onBehalfOfId;
         }
+        const responseRequest = this._dispatchRequest("room.invoke_tool", request, requestData);
+        params.afterSend?.();
+        if (params.streamInput === true) {
+            requestTask = this._streamInvokeToolRequestChunks(toolCallId, params.input);
+        }
         try {
             const response = await Promise.race([
-                this.sendRequest("room.invoke_tool", request, requestData, params.afterSend),
+                responseRequest,
                 preOpenError.fut,
             ]);
             this._toolCallPreOpenErrors.delete(toolCallId);
@@ -1337,9 +1347,10 @@ class RoomClient {
         if (params.onBehalfOfId != null) {
             request["on_behalf_of_id"] = params.onBehalfOfId;
         }
+        const responseRequest = this._dispatchRequest("room.invoke_tool", request);
         const requestTask = this._streamInvokeToolRequestChunks(toolCallId, params.input);
         try {
-            const response = await this.sendRequest("room.invoke_tool", request);
+            const response = await responseRequest;
             await requestTask;
             if (response instanceof response_js_1.ControlContent && response.method === "open") {
                 throw new room_server_client_js_1.RoomServerException(`unexpected return type from ${params.toolkit}.${params.tool}`);
@@ -1370,6 +1381,7 @@ class RoomClient {
         if (params.onBehalfOfId != null) {
             request["on_behalf_of_id"] = params.onBehalfOfId;
         }
+        const responseRequest = this._dispatchRequest("room.invoke_tool", request);
         const requestTask = this._streamInvokeToolRequestChunks(toolCallId, params.input);
         void requestTask.catch((error) => {
             const stream = this._toolCallStreams.get(toolCallId);
@@ -1383,7 +1395,7 @@ class RoomClient {
         let response;
         try {
             response = await Promise.race([
-                this.sendRequest("room.invoke_tool", request),
+                responseRequest,
                 preOpenError.fut,
             ]);
         }
@@ -1405,24 +1417,27 @@ class RoomClient {
             },
         };
     }
-    async _sendToolCallRequestChunk(toolCallId, chunk) {
+    _dispatchToolCallRequestChunk(toolCallId, chunk) {
+        this._raiseIfTerminal();
+        if (this._entered && !this._connected && !this._allowDisconnectedRequests) {
+            throw this._disconnectedError({ baseMessage: "room connection is disconnected" });
+        }
         const packed = chunk.pack();
         const request = {
             tool_call_id: toolCallId,
             chunk: JSON.parse((0, utils_js_1.splitMessageHeader)(packed)),
         };
         const payload = (0, utils_js_1.splitMessagePayload)(packed);
-        await this.sendRequest("room.tool_call_request_chunk", request, payload.length > 0 ? payload : undefined);
+        this._protocolInstance.sendNowait("room.tool_call_request_chunk", (0, utils_js_1.packMessage)(request, payload.length > 0 ? payload : undefined));
     }
     async _streamInvokeToolRequestChunks(toolCallId, input) {
-        await Promise.resolve();
         try {
             for await (const item of input) {
-                await this._sendToolCallRequestChunk(toolCallId, item);
+                this._dispatchToolCallRequestChunk(toolCallId, item);
             }
         }
         finally {
-            await this._sendToolCallRequestChunk(toolCallId, new response_js_1.ControlContent({ method: "close" }));
+            this._dispatchToolCallRequestChunk(toolCallId, new response_js_1.ControlContent({ method: "close" }));
         }
     }
     _decodeToolCallContent(params) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meshagent/meshagent",
-    "version": "0.47.0",
+    "version": "0.48.0",
     "description": "Meshagent Client",
     "homepage": "https://github.com/meshagent/meshagent-ts",
     "scripts": {