@xyo-network/xl1-rpc 1.10.0 → 1.10.2

package/dist/neutral/index.mjs

@@ -58,7 +58,7 @@ var MemoryXyoClient = class {
 };
 
 // src/provider/client/PermissionsStore/getPermissionsStoreFromTransport.ts
-var getPermissionsStoreFromTransport = (transport) => {
+var getPermissionsStoreFromTransport = (_transport) => {
   throw new Error("Not implemented");
 };
 
@@ -717,7 +717,11 @@ var MemoryRpcTransport = class {
   }
 };
 
-// src/transport/post-message/PostMessageRpcTransport.ts
+// src/transport/post-message/LegacyPostMessageRpcTransport.ts
+import {
+  isJsonRpcError,
+  isJsonRpcSuccess
+} from "@metamask/utils";
 import { isDefined } from "@xylabs/typeof";
 import { v4 as v43 } from "uuid";
 
@@ -726,23 +730,32 @@ var isRpcError = (data) => {
   return data && typeof data === "object" && "error" in data && data.error;
 };
 
-// src/transport/post-message/SessionEnvelope.ts
-var buildSessionMessageRequest = (data, destination) => {
-  const request = {
-    data,
-    destination,
-    sessionId: globalThis.xyoWalletExtensionId ?? ""
-  };
-  return request;
+// src/transport/post-message/resolveData.ts
+var hasMatchingId = (eventData, targetId) => {
+  return eventData?.id === targetId ? { legacyEventData: eventData } : false;
+};
+var hasMatchingNestedId = (eventData, targetId) => {
+  return eventData?.data?.id === targetId ? { eventData: eventData.data } : false;
+};
+var resolvedEvent = (event, targetId) => {
+  return hasMatchingId(event.data, targetId) || hasMatchingNestedId(event.data, targetId);
 };
 
-// src/transport/post-message/PostMessageRpcTransport.ts
-var PostMessageRpcTransport = class {
+// src/transport/post-message/LegacyPostMessageRpcTransport.ts
+var isValidBaseRpcEvent = (data) => {
+  return !!(data && typeof data === "object" && "jsonrpc" in data && data.jsonrpc === "2.0" && "method" in data && typeof data.method === "string" && "id" in data && typeof data.id === "string");
+};
+var isRpcResponse = (data, targetId) => {
+  return isValidBaseRpcEvent(data) && (isDefined(targetId) ? data.id === targetId : true) && "result" in data && Array.isArray(data.result);
+};
+var LegacyPostMessageRpcTransport = class {
   destination;
   schemas;
-  constructor(defaultDestination, schemas = XyoGatewayRpcSchemas) {
+  sessionId;
+  constructor(defaultDestination, schemas = XyoGatewayRpcSchemas, sessionId) {
     this.schemas = schemas;
     this.destination = defaultDestination;
+    this.sessionId = sessionId;
   }
   async sendRequest(method, params) {
     const id = v43();
@@ -759,22 +772,53 @@ var PostMessageRpcTransport = class {
       const id2 = body.id;
       const handler = (event) => {
         if (event.origin !== globalThis.window.origin) return;
-        if (event.data.id !== id2) return;
+        if (!isRpcResponse(event.data, id2)) return;
+        const data = resolvedEvent(event, id2);
+        if (data === false) return;
         globalThis.removeEventListener("message", handler);
-        if (event.data.result.some(isRpcError)) {
-          reject(event.data.result[0]);
-        } else {
-          resolve(event.data.result[0]);
+        if (data.legacyEventData) {
+          if (data.legacyEventData.result.some(isRpcError)) {
+            reject(data.legacyEventData.result[0]);
+          } else {
+            resolve(data.legacyEventData.result[0]);
+          }
+          return;
+        }
+        if (data.eventData) {
+          if (isJsonRpcError(data.eventData)) {
+            reject(data.eventData);
+            return;
+          }
+          if (isJsonRpcSuccess(data.eventData)) {
+            resolve(data.eventData);
+            return;
+          }
+          reject(new Error("Unexpected response format"));
         }
       };
       globalThis.addEventListener("message", handler);
       globalThis.postMessage(
-        buildSessionMessageRequest(body, this.destination),
+        {
+          data: body,
+          destination: this.destination,
+          sessionId: this.sessionId
+        },
         globalThis.location.origin
       );
     });
   }
 };
+var PostMessageRpcTransport = LegacyPostMessageRpcTransport;
+
+// src/transport/post-message/SessionEnvelope.ts
+var buildSessionMessageRequest = (data, destination) => {
+  const request = {
+    data,
+    destination,
+    sessionId: globalThis.xyo.walletExtensionId() ?? ""
+  };
+  return request;
+};
 
 // src/provider/datalake/AbstractXyoDataLake.ts
 import { ObjectHasher } from "@xyo-network/hash";
@@ -1331,6 +1375,7 @@ export {
   JsonRpcXyoRunner,
   JsonRpcXyoSigner,
   JsonRpcXyoViewer,
+  LegacyPostMessageRpcTransport,
   MemoryPermissionsStore,
   MemoryRpcTransport,
   MemoryXyoClient,