memeloop 0.2.0 → 0.2.2

package/dist/device-network.d.ts

@@ -1,6 +1,6 @@
-export { A as AttachmentBlobWire, C as CreateDevicePairingInviteOptions, D as DEVICE_ORCHESTRATION_PROTOCOL, a as DEVICE_PAIRING_INVITE_PROTOCOL, b as DEVICE_PAIRING_INVITE_TTL_MS, c as DeviceCloudComponentStatus, d as DeviceCloudConnectionAdapter, e as DeviceCloudConnectionComponent, f as DeviceCloudConnectionCoordinator, g as DeviceCloudConnectionCoordinatorOptions, h as DeviceCloudConnectionSnapshot, i as DeviceCloudConnectionStatus, j as DeviceCloudStepResult, k as DeviceOrchestrationStreamHandler, l as DeviceOrchestrationStreamHandlerInput, m as DeviceOrchestrationStreamHandlerOptions, n as DeviceOrchestrationTransportOptions, o as DevicePairingInvite, p as DevicePairingInviteIdentityVerifier, q as DevicePairingInviteIdentityVerifierInput, r as DevicePairingInviteUnsignedPayload, s as DeviceSyncStateStore, J as JsonFrameError, t as JsonFrameErrorCode, u as JsonFrameReaderOptions, L as LIBP2P_RPC_REQUEST_TYPE, v as LIBP2P_RPC_RESPONSE_TYPE, w as LIBP2P_SYNC_REQUEST_TYPE, x as LIBP2P_SYNC_RESPONSE_TYPE, y as Libp2pDeviceSyncTransport, z as Libp2pDeviceSyncTransportOptions, B as Libp2pRpcRequest, E as Libp2pRpcResponse, F as Libp2pSyncMethod, G as Libp2pSyncRequest, H as Libp2pSyncResponse, I as LocalTrustDeviceAuthorizer, K as LocalTrustDeviceAuthorizerOptions, M as MemoryDeviceSyncStateStore, P as ParseDevicePairingInviteOptions, R as RemoteOrchestrationHandler, N as attachmentBlobFromWire, O as canonicalDevicePairingInviteBytes, Q as createDeviceOrchestrationStreamHandler, S as createDeviceOrchestrationTransport, T as createDevicePairingInvite, U as createJsonFrameReader, V as encodeDevicePairingInvite, W as encodeJsonFrame, X as encodeJsonFrames, Y as isLibp2pRpcRequest, Z as isLibp2pRpcResponse, _ as isLibp2pSyncRequest, $ as isLibp2pSyncResponse, a0 as parseDevicePairingInvite } from './pairingInvite-Dkz8CLsb.js';
+export { A as AttachmentBlobWire, C as CreateDevicePairingInviteOptions, D as DEVICE_BINDING_SIGNATURE_DOMAIN, a as DEVICE_CONNECTION_GRANT_SIGNATURE_DOMAIN, b as DEVICE_ORCHESTRATION_PROTOCOL, c as DEVICE_PAIRING_INVITE_PROTOCOL, d as DEVICE_PAIRING_INVITE_TTL_MS, e as DEVICE_RELAY_ADMISSION_SIGNATURE_DOMAIN, f as DeviceCloudComponentStatus, g as DeviceCloudConnectionAdapter, h as DeviceCloudConnectionComponent, i as DeviceCloudConnectionCoordinator, j as DeviceCloudConnectionCoordinatorOptions, k as DeviceCloudConnectionSnapshot, l as DeviceCloudConnectionStatus, m as DeviceCloudStepResult, n as DeviceOrchestrationStreamHandler, o as DeviceOrchestrationStreamHandlerInput, p as DeviceOrchestrationStreamHandlerOptions, q as DeviceOrchestrationTransportOptions, r as DevicePairingInvite, s as DevicePairingInviteIdentityVerifier, t as DevicePairingInviteIdentityVerifierInput, u as DevicePairingInviteUnsignedPayload, v as DeviceSyncStateStore, J as JsonFrameError, w as JsonFrameErrorCode, x as JsonFrameReaderOptions, L as LIBP2P_RPC_REQUEST_TYPE, y as LIBP2P_RPC_RESPONSE_TYPE, z as LIBP2P_SYNC_REQUEST_TYPE, B as LIBP2P_SYNC_RESPONSE_TYPE, E as Libp2pDeviceSyncTransport, F as Libp2pDeviceSyncTransportOptions, G as Libp2pRpcRequest, H as Libp2pRpcResponse, I as Libp2pSyncMethod, K as Libp2pSyncRequest, M as Libp2pSyncResponse, N as LocalTrustDeviceAuthorizer, O as LocalTrustDeviceAuthorizerOptions, P as MemoryDeviceSyncStateStore, Q as ParseDevicePairingInviteOptions, R as RemoteOrchestrationHandler, S as attachmentBlobFromWire, T as buildDeviceBindingMessage, U as buildDeviceConnectionGrantMessage, V as buildDeviceRelayReservationTokenMessage, W as canonicalDevicePairingInviteBytes, X as createDeviceOrchestrationStreamHandler, Y as createDeviceOrchestrationTransport, Z as createDevicePairingInvite, _ as createJsonFrameReader, $ as encodeDevicePairingInvite, a0 as encodeJsonFrame, a1 as encodeJsonFrames, a2 as isLibp2pRpcRequest, a3 as isLibp2pRpcResponse, a4 as isLibp2pSyncRequest, a5 as isLibp2pSyncResponse, a6 as parseDevicePairingInvite } from './pairingInvite-CPQkuhLQ.js';
 export { A as AgentExecutionLocation, a as AgentExecutionState, b as AttachmentBlob, C as CloudDeviceClient, c as CloudDeviceRecord, d as ConversationExecutionPlacement, D as Device, e as DeviceAccountBindingRequest, f as DeviceAuthorizer, g as DeviceCapabilities, h as DeviceConnectionGrant, i as DeviceConnectionGrantVerificationInput, j as DeviceNetworkListenOptions, k as DeviceNetworkPath, l as DeviceNetworkService, m as DevicePlatform, n as DeviceProtocolDirection, o as DeviceReachability, p as DeviceReachabilityState, q as DeviceRelayReservationToken, r as DeviceRelayReservationTokenVerificationInput, s as DeviceRpcHandler, t as DeviceRpcHandlerInput, u as DeviceSyncTransport, v as DeviceTrustMode, w as DeviceTrustStore, E as ExchangeVersionVectorResult, L as LocalDeviceIdentity, x as LocalPairingRequestOptions, M as MemeLoopDuplexStream, y as MemeLoopProtocol, P as PairingSession, z as PairingSessionDirection, B as PairingSessionStatus, S as SyncResult, T as TrustedDeviceRecord } from './types-CcFFIk8W.js';
 export { ChatSyncEngine, ChatSyncEngineOptions, ChatSyncPeer, PeerNodeSyncAdapter, PeerNodeTransport, decodeAttachmentBlobRpc } from './device-network-portable.js';
 export { C as ConversationMeta, a as ConversationMetadataPage, I as IAgentStorage, V as VersionRange, b as VersionVector, c as computeMissingVersionRanges, i as isConversationMeta } from './interface-3C3eG8Hn.js';
 export { M as MemoryDeviceNetworkService, a as MemoryDeviceNetworkServiceOptions, s as syncCloudDevices } from './syncCloudDevices-C8fCUhnX.js';
-import './remoteClient-D5hco6cS.js';
+import './remoteClient-DwBCoHpc.js';

package/dist/device-network.js

@@ -2,12 +2,15 @@ import {
   MemoryDeviceNetworkService,
   syncCloudDevices
 } from "./chunk-EPHRIRAL.js";
-import "./chunk-MXRXYGWW.js";
+import "./chunk-JRCEXHTP.js";
 import {
   ChatSyncEngine,
+  DEVICE_BINDING_SIGNATURE_DOMAIN,
+  DEVICE_CONNECTION_GRANT_SIGNATURE_DOMAIN,
   DEVICE_ORCHESTRATION_PROTOCOL,
   DEVICE_PAIRING_INVITE_PROTOCOL,
   DEVICE_PAIRING_INVITE_TTL_MS,
+  DEVICE_RELAY_ADMISSION_SIGNATURE_DOMAIN,
   DeviceCloudConnectionCoordinator,
   JsonFrameError,
   LIBP2P_RPC_REQUEST_TYPE,
@@ -19,6 +22,9 @@ import {
   MemoryDeviceSyncStateStore,
   PeerNodeSyncAdapter,
   attachmentBlobFromWire,
+  buildDeviceBindingMessage,
+  buildDeviceConnectionGrantMessage,
+  buildDeviceRelayReservationTokenMessage,
   canonicalDevicePairingInviteBytes,
   computeMissingVersionRanges,
   createDeviceOrchestrationStreamHandler,
@@ -35,13 +41,16 @@ import {
   isLibp2pSyncRequest,
   isLibp2pSyncResponse,
   parseDevicePairingInvite
-} from "./chunk-ECNKBH5A.js";
+} from "./chunk-KXVZQLJL.js";
 import "./chunk-FWSY5HOA.js";
 export {
   ChatSyncEngine,
+  DEVICE_BINDING_SIGNATURE_DOMAIN,
+  DEVICE_CONNECTION_GRANT_SIGNATURE_DOMAIN,
   DEVICE_ORCHESTRATION_PROTOCOL,
   DEVICE_PAIRING_INVITE_PROTOCOL,
   DEVICE_PAIRING_INVITE_TTL_MS,
+  DEVICE_RELAY_ADMISSION_SIGNATURE_DOMAIN,
   DeviceCloudConnectionCoordinator,
   JsonFrameError,
   LIBP2P_RPC_REQUEST_TYPE,
@@ -54,6 +63,9 @@ export {
   MemoryDeviceSyncStateStore,
   PeerNodeSyncAdapter,
   attachmentBlobFromWire,
+  buildDeviceBindingMessage,
+  buildDeviceConnectionGrantMessage,
+  buildDeviceRelayReservationTokenMessage,
   canonicalDevicePairingInviteBytes,
   computeMissingVersionRanges,
   createDeviceOrchestrationStreamHandler,

package/dist/index.cjs

@@ -22323,7 +22323,7 @@ var init_remoteClient = __esm({
   "src/orchestration/remoteClient.ts"() {
     "use strict";
     init_errors();
-    REMOTE_ORCHESTRATION_PROTOCOL = "memeloop.resource.v1";
+    REMOTE_ORCHESTRATION_PROTOCOL = "memeloop.resource.v2";
     REMOTE_OPERATIONS = /* @__PURE__ */ new Set([
       "capabilities",
       "apply",
@@ -26457,9 +26457,12 @@ __export(src_exports, {
   CREDENTIAL_GRANT_KIND: () => CREDENTIAL_GRANT_KIND,
   ChatSyncEngine: () => ChatSyncEngine,
   DEFAULT_DESTINATION_POLICIES: () => DEFAULT_DESTINATION_POLICIES,
+  DEVICE_BINDING_SIGNATURE_DOMAIN: () => DEVICE_BINDING_SIGNATURE_DOMAIN,
+  DEVICE_CONNECTION_GRANT_SIGNATURE_DOMAIN: () => DEVICE_CONNECTION_GRANT_SIGNATURE_DOMAIN,
   DEVICE_ORCHESTRATION_PROTOCOL: () => DEVICE_ORCHESTRATION_PROTOCOL,
   DEVICE_PAIRING_INVITE_PROTOCOL: () => DEVICE_PAIRING_INVITE_PROTOCOL,
   DEVICE_PAIRING_INVITE_TTL_MS: () => DEVICE_PAIRING_INVITE_TTL_MS,
+  DEVICE_RELAY_ADMISSION_SIGNATURE_DOMAIN: () => DEVICE_RELAY_ADMISSION_SIGNATURE_DOMAIN,
   DRIVER_MANIFEST_API_VERSION: () => DRIVER_MANIFEST_API_VERSION,
   DRIVER_MANIFEST_KIND: () => DRIVER_MANIFEST_KIND,
   DRIVER_REQUEST_API_VERSION: () => DRIVER_REQUEST_API_VERSION,
@@ -26576,6 +26579,9 @@ __export(src_exports, {
   base64UrlEncode: () => base64UrlEncode,
   bindWorkerSession: () => bindWorkerSession,
   buildAgent: () => buildAgent,
+  buildDeviceBindingMessage: () => buildDeviceBindingMessage,
+  buildDeviceConnectionGrantMessage: () => buildDeviceConnectionGrantMessage,
+  buildDeviceRelayReservationTokenMessage: () => buildDeviceRelayReservationTokenMessage,
   buildLegacyChatMessageParts: () => buildLegacyChatMessageParts,
   buildMemeloopFileUri: () => buildMemeloopFileUri,
   buildMemeloopUri: () => buildMemeloopUri,
@@ -28888,8 +28894,12 @@ var DeviceCloudConnectionCoordinator = class {
   async stop() {
     this.started = false;
     this.clearTimer();
-    this.controller.abort(new Error("device cloud coordinator stopped"));
+    const stoppedController = this.controller;
+    stoppedController.abort(new Error("device cloud coordinator stopped"));
     await this.inFlight?.catch(() => void 0);
+    if (this.controller === stoppedController) {
+      this.controller = new AbortController();
+    }
   }
   async setConfiguration(configuration) {
     this.configuration = configuration;
@@ -29038,6 +29048,43 @@ var DeviceCloudConnectionCoordinator = class {
   }
 };
 
+// src/device-network/deviceGrantMessages.ts
+var DEVICE_BINDING_SIGNATURE_DOMAIN = "memeloop-device-binding-v2";
+var DEVICE_CONNECTION_GRANT_SIGNATURE_DOMAIN = "memeloop-device-connection-grant-v2";
+var DEVICE_RELAY_ADMISSION_SIGNATURE_DOMAIN = "memeloop-device-relay-admission-v2";
+function buildDeviceBindingMessage(input) {
+  return new TextEncoder().encode([
+    DEVICE_BINDING_SIGNATURE_DOMAIN,
+    `accountId=${input.accountId}`,
+    `peerId=${input.peerId}`,
+    `publicKey=${input.publicKeyMultibase}`,
+    `nonce=${input.nonce}`
+  ].join("\n"));
+}
+function buildDeviceConnectionGrantMessage(grant) {
+  return new TextEncoder().encode([
+    DEVICE_CONNECTION_GRANT_SIGNATURE_DOMAIN,
+    `issuer=${grant.issuer}`,
+    `accountId=${grant.accountId}`,
+    `subjectPeerId=${grant.subjectPeerId}`,
+    `allowedPeerIds=${grant.allowedPeerIds.join(",")}`,
+    `issuedAt=${grant.issuedAt}`,
+    `expiresAt=${grant.expiresAt}`
+  ].join("\n"));
+}
+function buildDeviceRelayReservationTokenMessage(token) {
+  return new TextEncoder().encode([
+    DEVICE_RELAY_ADMISSION_SIGNATURE_DOMAIN,
+    `issuer=${token.issuer}`,
+    `accountId=${token.accountId}`,
+    `peerId=${token.peerId}`,
+    `relayMultiaddrs=${token.relayMultiaddrs.join(",")}`,
+    `bootstrapMultiaddrs=${token.bootstrapMultiaddrs.join(",")}`,
+    `issuedAt=${token.issuedAt}`,
+    `expiresAt=${token.expiresAt}`
+  ].join("\n"));
+}
+
 // src/device-network/deviceOrchestrationTransport.ts
 init_errors();
 
@@ -29435,39 +29482,92 @@ async function readSingleRequest(stream, maxFrameBytes) {
 }
 async function* withWatchBookmarks(source, request, signal) {
   const iterator = source[Symbol.asyncIterator]();
-  let pending2 = iterator.next();
+  let activity;
+  let activityWaiter;
+  let bookmarkTimer;
+  let readInFlight = false;
+  let lastResourceVersion = watchResourceVersion(request.payload.options) ?? "0";
+  const clearBookmarkTimer = () => {
+    if (bookmarkTimer !== void 0) clearTimeout(bookmarkTimer);
+    bookmarkTimer = void 0;
+  };
+  const publishActivity = (value) => {
+    if (activityWaiter) {
+      const resolve = activityWaiter;
+      activityWaiter = void 0;
+      clearBookmarkTimer();
+      resolve(value);
+      return;
+    }
+    activity = value;
+  };
+  const readNext = () => {
+    if (readInFlight) return;
+    readInFlight = true;
+    void iterator.next().then(
+      (value) => {
+        readInFlight = false;
+        publishActivity({ kind: "value", value });
+      },
+      (error2) => {
+        readInFlight = false;
+        publishActivity({ kind: "error", error: error2 });
+      }
+    );
+  };
+  const waitForActivity = () => {
+    if (activity) {
+      const value = activity;
+      activity = void 0;
+      return Promise.resolve(value);
+    }
+    if (signal.aborted) return Promise.resolve({ kind: "aborted" });
+    return new Promise((resolve) => {
+      activityWaiter = resolve;
+      bookmarkTimer = setTimeout(() => {
+        bookmarkTimer = void 0;
+        activityWaiter = void 0;
+        resolve({ kind: "bookmark" });
+      }, WATCH_BOOKMARK_INTERVAL_MS);
+    });
+  };
+  const onAbort = () => {
+    publishActivity({ kind: "aborted" });
+  };
+  signal.addEventListener("abort", onAbort, { once: true });
+  readNext();
   try {
     for (; ; ) {
-      const result = await Promise.race([
-        pending2.then((value) => ({ kind: "value", value })),
-        new Promise((resolve) => {
-          const timer = setTimeout(() => {
-            resolve({ kind: "bookmark" });
-          }, WATCH_BOOKMARK_INTERVAL_MS);
-          signal.addEventListener("abort", () => {
-            clearTimeout(timer);
-            resolve({ kind: "bookmark" });
-          }, { once: true });
-        })
-      ]);
-      if (signal.aborted) return;
+      const result = await waitForActivity();
+      if (result.kind === "aborted") return;
       if (result.kind === "bookmark") {
         yield {
           protocol: request.protocol,
           requestId: request.requestId,
           ok: true,
-          result: { type: "BOOKMARK", resourceVersion: String(Date.now()) }
+          result: { type: "BOOKMARK", resourceVersion: lastResourceVersion }
         };
         continue;
       }
+      if (result.kind === "error") throw result.error;
       if (result.value.done) return;
-      yield result.value.value;
-      pending2 = iterator.next();
+      const response = result.value.value;
+      lastResourceVersion = response.ok ? watchResourceVersion(response.result) ?? lastResourceVersion : lastResourceVersion;
+      yield response;
+      readNext();
     }
   } finally {
+    clearBookmarkTimer();
+    activityWaiter = void 0;
+    signal.removeEventListener("abort", onAbort);
     void iterator.return?.();
   }
 }
+function watchResourceVersion(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return void 0;
+  const resourceVersion = value.resourceVersion;
+  return typeof resourceVersion === "string" && resourceVersion.length > 0 ? resourceVersion : void 0;
+}
 function createDeviceOrchestrationStreamHandler(options) {
   const maxFrameBytes = options.maxFrameBytes ?? DEFAULT_MAX_FRAME_BYTES;
   assertFrameLimit(maxFrameBytes);
@@ -29575,6 +29675,12 @@ var Libp2pDeviceSyncTransport = class {
   async request(peerId, method, parameters) {
     const grant = await this.grantProvider?.(peerId);
     const stream = await this.deviceNetwork.openStream(peerId, "/memeloop/sync/2.0.0", grant);
+    let aborted = false;
+    const abort = async (error2) => {
+      if (aborted) return;
+      aborted = true;
+      await stream.abort(error2);
+    };
     const request = {
       type: LIBP2P_SYNC_REQUEST_TYPE,
       id: crypto.randomUUID(),
@@ -29589,7 +29695,7 @@ var Libp2pDeviceSyncTransport = class {
         maxPayloadBytes: 16 * 1024 * 1024,
         idleTimeoutMs: 15e3,
         totalTimeoutMs: 12e4,
-        abort: async (error2) => stream.abort(error2)
+        abort
       })) {
         if (response !== void 0) throw new Error("sync_response_multiple");
         response = value;
@@ -29599,7 +29705,7 @@ var Libp2pDeviceSyncTransport = class {
       if (!response.ok) throw new Error(response.error);
       return response.result;
     } catch (error2) {
-      if (error2 instanceof JsonFrameError) await stream.abort(error2);
+      if (error2 instanceof JsonFrameError) await abort(error2);
       throw error2;
     } finally {
       await stream.close().catch(() => void 0);
@@ -29947,7 +30053,7 @@ async function parseDevicePairingInvite(serialized, options) {
 }
 
 // src/device-network/peerDriverTransport.ts
-var PEER_DRIVER_PROTOCOL_VERSION = "memeloop-peer-driver/v1";
+var PEER_DRIVER_PROTOCOL_VERSION = "memeloop-peer-driver/v2";
 var IDENTIFIER_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:/-]*$/;
 var MAX_ASSIGNMENT_ID_LENGTH = 256;
 var MAX_OPERATION_LENGTH = 128;
@@ -31624,9 +31730,12 @@ function getToolDefinition(toolId) {
   CREDENTIAL_GRANT_KIND,
   ChatSyncEngine,
   DEFAULT_DESTINATION_POLICIES,
+  DEVICE_BINDING_SIGNATURE_DOMAIN,
+  DEVICE_CONNECTION_GRANT_SIGNATURE_DOMAIN,
   DEVICE_ORCHESTRATION_PROTOCOL,
   DEVICE_PAIRING_INVITE_PROTOCOL,
   DEVICE_PAIRING_INVITE_TTL_MS,
+  DEVICE_RELAY_ADMISSION_SIGNATURE_DOMAIN,
   DRIVER_MANIFEST_API_VERSION,
   DRIVER_MANIFEST_KIND,
   DRIVER_REQUEST_API_VERSION,
@@ -31743,6 +31852,9 @@ function getToolDefinition(toolId) {
   base64UrlEncode,
   bindWorkerSession,
   buildAgent,
+  buildDeviceBindingMessage,
+  buildDeviceConnectionGrantMessage,
+  buildDeviceRelayReservationTokenMessage,
   buildLegacyChatMessageParts,
   buildMemeloopFileUri,
   buildMemeloopUri,