@meshagent/meshagent 0.42.0 → 0.43.0

package/dist/esm/protocol.js

@@ -1,34 +1,27 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketClientProtocol = exports.Protocol = exports.ProtocolMessageStream = exports.WebSocketProtocolChannel = exports.StreamProtocolChannel = exports.ProtocolHandshakeException = exports.ProtocolCloseException = exports.ProtocolReconnectUnsupportedException = exports.ProtocolCloseKind = void 0;
-const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
-const completer_1 = require("./completer");
-const utils_1 = require("./utils");
+import WebSocket from "isomorphic-ws";
+import { Completer } from "./completer.js";
+import { decoder, encoder, mergeUint8Arrays, unpackMessage } from "./utils.js";
 class ProtocolMessage {
     constructor({ id, type, data }) {
         this.id = id;
         this.type = type;
         this.data = data;
-        this.sent = new completer_1.Completer();
+        this.sent = new Completer();
     }
 }
-var ProtocolCloseKind;
+export var ProtocolCloseKind;
 (function (ProtocolCloseKind) {
     ProtocolCloseKind["CLIENT"] = "client";
     ProtocolCloseKind["SERVER"] = "server";
     ProtocolCloseKind["ERROR"] = "error";
-})(ProtocolCloseKind || (exports.ProtocolCloseKind = ProtocolCloseKind = {}));
-class ProtocolReconnectUnsupportedException extends Error {
+})(ProtocolCloseKind || (ProtocolCloseKind = {}));
+export class ProtocolReconnectUnsupportedException extends Error {
     constructor(message) {
         super(message);
         this.name = "ProtocolReconnectUnsupportedException";
     }
 }
-exports.ProtocolReconnectUnsupportedException = ProtocolReconnectUnsupportedException;
-class ProtocolCloseException extends Error {
+export class ProtocolCloseException extends Error {
     constructor({ closeCode, reason }) {
         super(reason == null || reason.trim().length === 0 ? `connection closed with status ${closeCode}` : reason);
         this.name = "ProtocolCloseException";
@@ -36,8 +29,7 @@ class ProtocolCloseException extends Error {
         this.reason = reason;
     }
 }
-exports.ProtocolCloseException = ProtocolCloseException;
-class ProtocolHandshakeException extends Error {
+export class ProtocolHandshakeException extends Error {
     constructor({ statusCode, statusText }) {
         const normalizedStatusText = statusText?.trim();
         super(normalizedStatusText == null || normalizedStatusText.length === 0
@@ -48,11 +40,21 @@ class ProtocolHandshakeException extends Error {
         this.statusText = normalizedStatusText;
     }
 }
-exports.ProtocolHandshakeException = ProtocolHandshakeException;
 function isNodeRuntime() {
     return typeof process !== "undefined" && process.release?.name === "node";
 }
-class StreamProtocolChannel {
+function resolveWebSocketUrl(url) {
+    const baseUrl = globalThis.location?.href;
+    const resolved = baseUrl == null ? new URL(url) : new URL(url, baseUrl);
+    if (resolved.protocol === "https:") {
+        resolved.protocol = "wss:";
+    }
+    else if (resolved.protocol === "http:") {
+        resolved.protocol = "ws:";
+    }
+    return resolved;
+}
+export class StreamProtocolChannel {
     constructor({ input, output, }) {
         this.started = false;
         this._iterator = null;
@@ -90,11 +92,10 @@ class StreamProtocolChannel {
         this.output.add(data);
     }
 }
-exports.StreamProtocolChannel = StreamProtocolChannel;
-class WebSocketProtocolChannel {
+export class WebSocketProtocolChannel {
     constructor({ url, jwt }) {
         this.webSocket = null;
-        this._opened = new completer_1.Completer();
+        this._opened = new Completer();
         this._finished = false;
         this._onUnexpectedResponse = (_request, response) => {
             const statusCode = response.statusCode;
@@ -121,7 +122,7 @@ class WebSocketProtocolChannel {
                 return;
             }
             if (typeof data === "string") {
-                this._onDataReceived?.(utils_1.encoder.encode(data));
+                this._onDataReceived?.(encoder.encode(data));
                 return;
             }
             if (data instanceof ArrayBuffer) {
@@ -151,16 +152,18 @@ class WebSocketProtocolChannel {
         this.jwt = jwt;
     }
     start(onDataReceived, { onDone, onError }) {
-        const url = new URL(this.url);
-        url.searchParams.set("token", this.jwt);
-        this._opened = new completer_1.Completer();
+        const url = resolveWebSocketUrl(this.url);
+        this._opened = new Completer();
         this._finished = false;
         this._onDataReceived = onDataReceived;
         this._doneHandler = onDone;
         this._errorHandler = onError;
         const socket = isNodeRuntime()
-            ? new isomorphic_ws_1.default(url.toString(), [], { perMessageDeflate: true })
-            : new isomorphic_ws_1.default(url.toString());
+            ? new WebSocket(url.toString(), [], {
+                headers: this.jwt == null ? undefined : { Authorization: `Bearer ${this.jwt}` },
+                perMessageDeflate: true,
+            })
+            : new WebSocket(url.toString(), this.jwt == null ? [] : [`meshagent-room.${this.jwt}`]);
         this.webSocket = socket;
         if (isNodeRuntime()) {
             socket.on("unexpected-response", this._onUnexpectedResponse);
@@ -195,7 +198,7 @@ class WebSocketProtocolChannel {
         if (isNodeRuntime()) {
             socket.off("unexpected-response", this._onUnexpectedResponse);
         }
-        if (socket.readyState === isomorphic_ws_1.default.CONNECTING || socket.readyState === isomorphic_ws_1.default.OPEN) {
+        if (socket.readyState === WebSocket.CONNECTING || socket.readyState === WebSocket.OPEN) {
             socket.close(1000);
         }
     }
@@ -208,11 +211,10 @@ class WebSocketProtocolChannel {
         socket.send(data);
     }
 }
-exports.WebSocketProtocolChannel = WebSocketProtocolChannel;
-class ProtocolMessageStream {
+export class ProtocolMessageStream {
     constructor() {
         this._messages = [];
-        this._messageAdded = new completer_1.Completer();
+        this._messageAdded = new Completer();
         this._closed = false;
     }
     add(message) {
@@ -230,7 +232,7 @@ class ProtocolMessageStream {
     async *stream() {
         while (!this._closed) {
             await this._messageAdded.fut;
-            this._messageAdded = new completer_1.Completer();
+            this._messageAdded = new Completer();
             while (this._messages.length > 0 && !this._closed) {
                 const message = this._messages.shift();
                 if (message !== undefined) {
@@ -240,13 +242,12 @@ class ProtocolMessageStream {
         }
     }
 }
-exports.ProtocolMessageStream = ProtocolMessageStream;
-class Protocol {
+export class Protocol {
     constructor({ channel }) {
         this.handlers = {};
         this._id = 0;
         this._send = new ProtocolMessageStream();
-        this._done = new completer_1.Completer();
+        this._done = new Completer();
         this._sendLoop = null;
         this._open = false;
         this._closed = false;
@@ -325,7 +326,7 @@ class Protocol {
     async handleMessage(messageId, type, data) {
         const handler = this.handlers[type] ?? this.handlers["*"];
         if (handler == null) {
-            const unpacked = (0, utils_1.unpackMessage)(data);
+            const unpacked = unpackMessage(data);
             console.warn(`No handler for message type ${type}; data:`, unpacked);
             return;
         }
@@ -357,7 +358,7 @@ class Protocol {
         await message.sent.fut;
     }
     async sendJson(object) {
-        await this.send("application/json", utils_1.encoder.encode(JSON.stringify(object)));
+        await this.send("application/json", encoder.encode(JSON.stringify(object)));
     }
     start({ onMessage, onDone, onError, } = {}) {
         if (this._sendLoop != null) {
@@ -419,14 +420,14 @@ class Protocol {
                 headerView.setUint32(4, message.id & 0xffffffff, false);
                 headerView.setUint32(8, 0, false);
                 headerView.setUint32(12, packets, false);
-                await this.channel.sendData((0, utils_1.mergeUint8Arrays)(header, utils_1.encoder.encode(message.type)));
+                await this.channel.sendData(mergeUint8Arrays(header, encoder.encode(message.type)));
                 for (let i = 0; i < packets; i += 1) {
                     const packetHeader = new Uint8Array(12);
                     const packetHeaderView = new DataView(packetHeader.buffer);
                     packetHeaderView.setUint32(0, Math.floor(message.id / 2 ** 32), false);
                     packetHeaderView.setUint32(4, message.id & 0xffffffff, false);
                     packetHeaderView.setUint32(8, i + 1, false);
-                    await this.channel.sendData((0, utils_1.mergeUint8Arrays)(packetHeader, message.data.subarray(i * 1024, Math.min((i + 1) * 1024, message.data.length))));
+                    await this.channel.sendData(mergeUint8Arrays(packetHeader, message.data.subarray(i * 1024, Math.min((i + 1) * 1024, message.data.length))));
                 }
                 if (!message.sent.completed) {
                     message.sent.complete();
@@ -461,10 +462,10 @@ class Protocol {
             if (this._recvState === "ready" || this._recvState === "error") {
                 this._recvPacketTotal = dataView.getUint32(12, false);
                 this._recvMessageId = messageId;
-                this._recvType = utils_1.decoder.decode(dataPacket.subarray(16));
+                this._recvType = decoder.decode(dataPacket.subarray(16));
                 if (this._recvPacketTotal === 0) {
                     try {
-                        const merged = (0, utils_1.mergeUint8Arrays)(...this._recvPackets);
+                        const merged = mergeUint8Arrays(...this._recvPackets);
                         this._recvPackets.length = 0;
                         this._dispatchMessage({ messageId, type: this._recvType, data: merged });
                     }
@@ -498,7 +499,7 @@ class Protocol {
         this._recvPackets.push(dataPacket.subarray(12));
         if (this._recvPacketTotal === this._recvPacketId) {
             try {
-                const merged = (0, utils_1.mergeUint8Arrays)(...this._recvPackets);
+                const merged = mergeUint8Arrays(...this._recvPackets);
                 this._recvPackets.length = 0;
                 this._dispatchMessage({ messageId, type: this._recvType, data: merged });
             }
@@ -518,8 +519,7 @@ class Protocol {
         });
     }
 }
-exports.Protocol = Protocol;
-class WebSocketClientProtocol extends Protocol {
+export class WebSocketClientProtocol extends Protocol {
     constructor({ url, token }) {
         super({
             channel: new WebSocketProtocolChannel({ url, jwt: token }),
@@ -527,6 +527,9 @@ class WebSocketClientProtocol extends Protocol {
         this._url = url;
         this._token = token;
     }
+    static withIAP({ url = "./.well-known/meshagent/room/connect" } = {}) {
+        return new WebSocketClientProtocol({ url, token: null });
+    }
     get url() {
         return this._url;
     }
@@ -534,4 +537,3 @@ class WebSocketClientProtocol extends Protocol {
         return this._token;
     }
 }
-exports.WebSocketClientProtocol = WebSocketClientProtocol;

package/dist/esm/queues-client.d.ts

@@ -1,4 +1,4 @@
-import { RoomClient } from "./room-client";
+import { RoomClient } from "./room-client.js";
 export declare class Queue {
     name: string;
     size: number;

package/dist/esm/queues-client.js

@@ -1,21 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueuesClient = exports.Queue = void 0;
-const response_1 = require("./response");
-const room_server_client_1 = require("./room-server-client");
-class Queue {
+import { EmptyContent, JsonContent } from "./response.js";
+import { RoomServerException } from "./room-server-client.js";
+export class Queue {
     constructor({ name, size }) {
         this.name = name;
         this.size = size;
     }
 }
-exports.Queue = Queue;
-class QueuesClient {
+export class QueuesClient {
     constructor({ room }) {
         this.client = room;
     }
     _unexpectedResponseError(operation) {
-        return new room_server_client_1.RoomServerException(`unexpected return type from queues.${operation}`);
+        return new RoomServerException(`unexpected return type from queues.${operation}`);
     }
     async _invoke(operation, arguments_) {
         return await this.client.invoke({
@@ -26,7 +22,7 @@ class QueuesClient {
     }
     async list() {
         const response = await this._invoke("list", {});
-        if (!(response instanceof response_1.JsonContent)) {
+        if (!(response instanceof JsonContent)) {
             throw this._unexpectedResponseError("list");
         }
         const queues = response.json["queues"];
@@ -34,25 +30,25 @@ class QueuesClient {
     }
     async open(name) {
         const response = await this._invoke("open", { name });
-        if (!(response instanceof response_1.EmptyContent)) {
+        if (!(response instanceof EmptyContent)) {
             throw this._unexpectedResponseError("open");
         }
     }
     async drain(name) {
         const response = await this._invoke("drain", { name });
-        if (!(response instanceof response_1.EmptyContent)) {
+        if (!(response instanceof EmptyContent)) {
             throw this._unexpectedResponseError("drain");
         }
     }
     async close(name) {
         const response = await this._invoke("close", { name });
-        if (!(response instanceof response_1.EmptyContent)) {
+        if (!(response instanceof EmptyContent)) {
             throw this._unexpectedResponseError("close");
         }
     }
     async send(name, message, { create = true }) {
         const response = await this._invoke("send", { name, create, message });
-        if (!(response instanceof response_1.EmptyContent)) {
+        if (!(response instanceof EmptyContent)) {
             throw this._unexpectedResponseError("send");
         }
     }
@@ -62,13 +58,12 @@ class QueuesClient {
             create,
             wait,
         });
-        if (response instanceof response_1.EmptyContent) {
+        if (response instanceof EmptyContent) {
             return null;
         }
-        if (response instanceof response_1.JsonContent) {
+        if (response instanceof JsonContent) {
             return response.json;
         }
         throw this._unexpectedResponseError("receive");
     }
 }
-exports.QueuesClient = QueuesClient;

package/dist/esm/requirement.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequiredSchema = exports.RequiredToolkit = exports.Requirement = exports.RoomException = void 0;
-class RoomException extends Error {
+export class RoomException extends Error {
     constructor(message) {
         super(message);
         this.name = "RoomException";
     }
 }
-exports.RoomException = RoomException;
-class Requirement {
+export class Requirement {
     constructor({ name }) {
         this.name = name;
     }
@@ -26,8 +22,7 @@ class Requirement {
         throw new RoomException("invalid requirement json");
     }
 }
-exports.Requirement = Requirement;
-class RequiredToolkit extends Requirement {
+export class RequiredToolkit extends Requirement {
     constructor({ name, tools, participantName, }) {
         super({ name });
         this.tools = tools;
@@ -41,8 +36,7 @@ class RequiredToolkit extends Requirement {
         };
     }
 }
-exports.RequiredToolkit = RequiredToolkit;
-class RequiredSchema extends Requirement {
+export class RequiredSchema extends Requirement {
     constructor({ name }) {
         super({ name });
     }
@@ -52,4 +46,3 @@ class RequiredSchema extends Requirement {
         };
     }
 }
-exports.RequiredSchema = RequiredSchema;

package/dist/esm/response.js

@@ -1,9 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControlContent = exports.ControlCloseStatus = exports.EmptyContent = exports.ErrorContent = exports.JsonContent = exports.TextContent = exports.FileContent = exports.LinkContent = exports.BinaryContent = void 0;
-exports.unpackContent = unpackContent;
-const utils_1 = require("./utils");
-class BinaryContent {
+import { packMessage, splitMessageHeader, splitMessagePayload } from "./utils.js";
+export class BinaryContent {
     constructor({ data, headers = {} }) {
         this.data = data;
         this.headers = headers;
@@ -15,7 +11,7 @@ class BinaryContent {
         });
     }
     pack() {
-        return (0, utils_1.packMessage)({
+        return packMessage({
             type: "binary",
             headers: this.headers,
         }, this.data);
@@ -24,8 +20,7 @@ class BinaryContent {
         return `BinaryContent: headers=${JSON.stringify(this.headers)} length=${this.data.length}`;
     }
 }
-exports.BinaryContent = BinaryContent;
-class LinkContent {
+export class LinkContent {
     constructor({ url, name }) {
         this.url = url;
         this.name = name;
@@ -37,7 +32,7 @@ class LinkContent {
         });
     }
     pack() {
-        return (0, utils_1.packMessage)({
+        return packMessage({
             type: "link",
             name: this.name,
             url: this.url,
@@ -47,8 +42,7 @@ class LinkContent {
         return `LinkContent (${this.name}): ${this.url}`;
     }
 }
-exports.LinkContent = LinkContent;
-class FileContent {
+export class FileContent {
     constructor({ data, name, mimeType }) {
         this.data = data;
         this.name = name;
@@ -62,7 +56,7 @@ class FileContent {
         });
     }
     pack() {
-        return (0, utils_1.packMessage)({
+        return packMessage({
             type: "file",
             name: this.name,
             mime_type: this.mimeType,
@@ -72,8 +66,7 @@ class FileContent {
         return `FileContent (${this.name}): ${this.mimeType}`;
     }
 }
-exports.FileContent = FileContent;
-class TextContent {
+export class TextContent {
     constructor({ text }) {
         this.text = text;
     }
@@ -83,7 +76,7 @@ class TextContent {
         });
     }
     pack() {
-        return (0, utils_1.packMessage)({
+        return packMessage({
             type: "text",
             text: this.text,
         });
@@ -92,8 +85,7 @@ class TextContent {
         return `TextContent: ${this.text}`;
     }
 }
-exports.TextContent = TextContent;
-class JsonContent {
+export class JsonContent {
     constructor({ json }) {
         this.json = json;
     }
@@ -101,7 +93,7 @@ class JsonContent {
         return new JsonContent({ json: header["json"] });
     }
     pack() {
-        return (0, utils_1.packMessage)({
+        return packMessage({
             type: "json",
             json: this.json,
         });
@@ -110,8 +102,7 @@ class JsonContent {
         return `JsonContent: ${JSON.stringify(this.json)}`;
     }
 }
-exports.JsonContent = JsonContent;
-class ErrorContent {
+export class ErrorContent {
     constructor({ text, code }) {
         this.text = text;
         this.code = code;
@@ -138,7 +129,7 @@ class ErrorContent {
         if (this.code !== undefined) {
             header["code"] = this.code;
         }
-        return (0, utils_1.packMessage)(header);
+        return packMessage(header);
     }
     toString() {
         return this.code !== undefined
@@ -146,25 +137,23 @@ class ErrorContent {
             : `ErrorContent: ${this.text}`;
     }
 }
-exports.ErrorContent = ErrorContent;
-class EmptyContent {
+export class EmptyContent {
     static unpack(_header, _payload) {
         return new EmptyContent();
     }
     pack() {
-        return (0, utils_1.packMessage)({ type: "empty" });
+        return packMessage({ type: "empty" });
     }
     toString() {
         return `EmptyContent`;
     }
 }
-exports.EmptyContent = EmptyContent;
-var ControlCloseStatus;
+export var ControlCloseStatus;
 (function (ControlCloseStatus) {
     ControlCloseStatus[ControlCloseStatus["NORMAL"] = 1000] = "NORMAL";
     ControlCloseStatus[ControlCloseStatus["INVALID_DATA"] = 1007] = "INVALID_DATA";
-})(ControlCloseStatus || (exports.ControlCloseStatus = ControlCloseStatus = {}));
-class ControlContent {
+})(ControlCloseStatus || (ControlCloseStatus = {}));
+export class ControlContent {
     constructor({ method, statusCode, message, }) {
         this.method = method;
         this.statusCode = method === "close" ? statusCode ?? ControlCloseStatus.NORMAL : statusCode;
@@ -203,13 +192,12 @@ class ControlContent {
                 header["message"] = this.message;
             }
         }
-        return (0, utils_1.packMessage)(header);
+        return packMessage(header);
     }
     toString() {
         return `ControlContent: ${this.method}`;
     }
 }
-exports.ControlContent = ControlContent;
 const _contentTypes = {
     binary: BinaryContent.unpack,
     control: ControlContent.unpack,
@@ -220,9 +208,9 @@ const _contentTypes = {
     link: LinkContent.unpack,
     text: TextContent.unpack,
 };
-function unpackContent(data) {
-    const header = JSON.parse((0, utils_1.splitMessageHeader)(data));
-    const payload = (0, utils_1.splitMessagePayload)(data);
+export function unpackContent(data) {
+    const header = JSON.parse(splitMessageHeader(data));
+    const payload = splitMessagePayload(data);
     const typeKey = header["type"];
     if (!_contentTypes[typeKey]) {
         throw new Error(`Unknown content type: ${typeKey}`);

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

@@ -1,20 +1,20 @@
-import { DatasetsClient } from "./datasets-client";
-import { DeveloperClient } from "./developer-client";
-import { type EventHandler, type EventName } from "./event-emitter";
-import { MessagingClient } from "./messaging-client";
-import { MemoryClient } from "./memory-client";
-import { LocalParticipant } from "./participant";
-import { Protocol, ProtocolCloseKind, type MessageHandler, type ProtocolFactory } from "./protocol";
-import { QueuesClient } from "./queues-client";
-import type { Content } from "./response";
-import { RoomEvent } from "./room-event";
-import { RoomServerException } from "./room-server-client";
-import { SecretsClient, type OAuthTokenRequestHandler, type SecretRequestHandler } from "./secrets-client";
-import { ServicesClient } from "./services-client";
-import { StorageClient } from "./storage-client";
-import { SyncClient } from "./sync-client";
-import { AgentsClient, ToolkitDescription } from "./agent-client";
-import { ContainersClient } from "./containers-client";
+import { DatasetsClient } from "./datasets-client.js";
+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 { LocalParticipant } from "./participant.js";
+import { Protocol, ProtocolCloseKind, type MessageHandler, type ProtocolFactory } from "./protocol.js";
+import { QueuesClient } from "./queues-client.js";
+import type { Content } from "./response.js";
+import { RoomEvent } from "./room-event.js";
+import { RoomServerException } from "./room-server-client.js";
+import { SecretsClient, type OAuthTokenRequestHandler, type SecretRequestHandler } from "./secrets-client.js";
+import { ServicesClient } from "./services-client.js";
+import { StorageClient } from "./storage-client.js";
+import { SyncClient } from "./sync-client.js";
+import { AgentsClient, ToolkitDescription } from "./agent-client.js";
+import { ContainersClient } from "./containers-client.js";
 interface RequestHeader {
     [key: string]: unknown;
 }
@@ -98,6 +98,12 @@ export declare class RoomClient {
         oauthTokenRequestHandler?: OAuthTokenRequestHandler;
         secretRequestHandler?: SecretRequestHandler;
     });
+    static withIAP({ url, reconnectTimeout, oauthTokenRequestHandler, secretRequestHandler, }?: {
+        url?: string;
+        reconnectTimeout?: number | null;
+        oauthTokenRequestHandler?: OAuthTokenRequestHandler;
+        secretRequestHandler?: SecretRequestHandler;
+    }): RoomClient;
     get localParticipant(): LocalParticipant | null;
     get ready(): Promise<void>;
     get isConnected(): boolean;