@xyo-network/xl1-rpc 1.8.1 → 1.8.3

package/dist/neutral/transport/post-message/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../src/transport/post-message/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAEhD,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG;IAClD,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAED,MAAM,WAAW,QAAS,SAAQ,UAAU;IAC1C,KAAK,EAAE,OAAO,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAChB;AAGD,eAAO,MAAM,UAAU,GAAI,MAAM,GAAG,KAAG,IAAI,IAAI,QAO9C,CAAA"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../src/transport/post-message/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAEhD,oEAAoE;AACpE,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG;IAClD,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAED,oEAAoE;AACpE,MAAM,WAAW,QAAS,SAAQ,UAAU;IAC1C,KAAK,EAAE,OAAO,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,oEAAoE;AAEpE,eAAO,MAAM,UAAU,GAAI,MAAM,GAAG,KAAG,IAAI,IAAI,QAO9C,CAAA"}

package/dist/node/index-node.mjs

@@ -928,64 +928,151 @@ var MemoryXyoNetwork = class {
   }
 };
 
-// src/provider/provider/confirmSubmittedTransaction.ts
-import { delay } from "@xylabs/delay";
-import { isDefined } from "@xylabs/typeof";
-import { PayloadBuilder } from "@xyo-network/payload-builder";
-var DEFAULT_CONFIRMATION_ATTEMPTS = 20;
-var DEFAULT_DELAY_BETWEEN_ATTEMPTS = 1e3;
-var confirmSubmittedTransaction = /* @__PURE__ */ __name(async (provider, txBW, options) => {
-  const { attempts: maxAttempts = DEFAULT_CONFIRMATION_ATTEMPTS, delay: attemptDelay = DEFAULT_DELAY_BETWEEN_ATTEMPTS } = options || {};
-  const txBWHash = await PayloadBuilder.hash(txBW);
-  options?.logger?.log("\u2705 confirming transaction:", txBWHash, "\n");
-  let attempts = 0;
-  while (true) {
-    const tx = await provider.viewer?.transactionByHash(txBWHash) ?? void 0;
-    if (isDefined(tx)) {
-      options?.logger?.log("\u{1F37B} Transaction confirmed:", txBWHash, "\n");
-      return tx;
-    } else {
-      attempts++;
-      if (attempts > maxAttempts) {
-        options?.logger?.error(`\u26A0\uFE0F Transaction not confirmed after ${maxAttempts} attempts`);
-        throw new Error(`Transaction ${txBWHash} not confirmed after ${maxAttempts} attempts`);
-      } else {
-        options?.logger?.log(`\u{1F504} Transaction not confirmed yet, attempt ${attempts}. Retrying...`, "\n");
-        await delay(attemptDelay);
+// src/provider/provider/HttpRpcXyoConnection.ts
+import { isDefined as isDefined2 } from "@xylabs/typeof";
+
+// src/transport/HttpRpcTransport.ts
+import { AxiosJson } from "@xylabs/axios";
+import { isError, isUndefinedOrNull } from "@xylabs/typeof";
+import { isAxiosError } from "axios";
+import { v4 } from "uuid";
+var HttpRpcTransport = class {
+  static {
+    __name(this, "HttpRpcTransport");
+  }
+  _rpcUrl;
+  _schemas;
+  constructor(rpcUrl, schemas) {
+    this._rpcUrl = rpcUrl;
+    this._schemas = schemas;
+  }
+  async sendRequest(method, params) {
+    return await this.callRpc(this._rpcUrl, this._schemas, method, params);
+  }
+  async callRpc(url, schemas, method, params) {
+    try {
+      const id = v4();
+      const body = {
+        jsonrpc,
+        id,
+        method
+      };
+      if (params) {
+        body.params = schemas[method].params.to.parse(params);
+      }
+      const res = await new AxiosJson().post(url, body);
+      const json = res.data;
+      if (isUndefinedOrNull(json) || json.error) {
+        throw new Error(json.error.message);
       }
+      return schemas[method].result.from.parse(json.result);
+    } catch (ex) {
+      let message = isError(ex) ? ex.message : String(ex);
+      if (isAxiosError(ex)) {
+        message = `Http error occurred [${ex.status}|${ex.code ?? "<unknown>"}]: ${ex.message}`;
+      }
+      throw new Error(`Error occurred while calling RPC method ${String(method)}: ${message}`);
     }
   }
-}, "confirmSubmittedTransaction");
+};
 
-// src/provider/provider/confirmTransaction.ts
-import { delay as delay2 } from "@xylabs/delay";
-import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
-var CONFIRMATION_ATTEMPTS = 20;
-var DELAY_BETWEEN_ATTEMPTS = 1e3;
-var confirmTransaction = /* @__PURE__ */ __name(async (provider, txBW, onConfirm, onTimeout) => {
-  const txBWHash = await PayloadBuilder2.hash(txBW);
-  console.log("\u2705 confirming transaction:", txBWHash, "\n");
-  let confirmed = false;
-  let attempts = 0;
-  while (!confirmed) {
-    const tx = await provider.viewer?.transactionByHash(txBWHash);
-    if (tx) {
-      confirmed = true;
-      console.log("\u{1F37B} Transaction confirmed:", txBWHash, "\n");
-      onConfirm?.(txBWHash);
-    } else {
-      attempts++;
-      if (attempts > CONFIRMATION_ATTEMPTS) {
-        console.error(`\u26A0\uFE0F Transaction not confirmed after ${CONFIRMATION_ATTEMPTS} attempts`);
-        onTimeout?.();
-        return;
-      } else {
-        console.log(`\u{1F504} Transaction not confirmed yet, attempt ${attempts}. Retrying...`, "\n");
-        await delay2(DELAY_BETWEEN_ATTEMPTS);
-      }
+// src/transport/MemoryRpcTransport.ts
+import { isObject } from "@xylabs/typeof";
+import { v4 as v42 } from "uuid";
+var MemoryRpcTransport = class {
+  static {
+    __name(this, "MemoryRpcTransport");
+  }
+  _rpcEngine;
+  _schemas;
+  requestSchemas = {};
+  responseSchemas = {};
+  constructor(rpcEngine, schemas = AllRpcSchemas) {
+    this._rpcEngine = rpcEngine;
+    this._schemas = schemas;
+  }
+  async sendRequest(method, params) {
+    const schema = this._schemas[method];
+    let requestSchema = this.requestSchemas[method];
+    if (!isObject(requestSchema)) {
+      requestSchema = createRequestSchema(method, schema.params.to);
+      this.requestSchemas[method] = requestSchema;
+    }
+    const req = {
+      jsonrpc,
+      id: v42(),
+      method,
+      params
+    };
+    const request = requestSchema.parse(req);
+    const response = await this._rpcEngine.handle(request);
+    let responseSchema = this.responseSchemas[method];
+    if (!isObject(responseSchema)) {
+      responseSchema = createResponseSchema(schema.result.from);
+      this.responseSchemas[method] = responseSchema;
     }
+    return responseSchema.parse(response)?.result;
+  }
+};
+
+// src/transport/post-message/PostMessageRpcTransport.ts
+import { isDefined } from "@xylabs/typeof";
+import { v4 as v43 } from "uuid";
+
+// src/transport/post-message/helpers.ts
+var isRpcError = /* @__PURE__ */ __name((data) => {
+  return data && typeof data === "object" && "error" in data && data.error;
+}, "isRpcError");
+
+// src/transport/post-message/SessionEnvelope.ts
+var buildSessionMessageRequest = /* @__PURE__ */ __name((data, destination) => {
+  const request = {
+    data,
+    destination,
+    sessionId: globalThis.xyo.walletExtensionId() ?? ""
+  };
+  return request;
+}, "buildSessionMessageRequest");
+
+// src/transport/post-message/PostMessageRpcTransport.ts
+var PostMessageRpcTransport = class {
+  static {
+    __name(this, "PostMessageRpcTransport");
+  }
+  destination;
+  schemas;
+  constructor(defaultDestination, schemas = XyoGatewayRpcSchemas) {
+    this.schemas = schemas;
+    this.destination = defaultDestination;
+  }
+  async sendRequest(method, params) {
+    const id = v43();
+    return await this.callRpc(this.schemas, method, id, params);
+  }
+  async callRpc(schemas, method, id, params) {
+    const body = {
+      jsonrpc,
+      id,
+      method
+    };
+    body.params = isDefined(params) && isDefined(schemas[method]) ? schemas[method].params.to.parse(params) : params;
+    return await new Promise((resolve, reject) => {
+      const id2 = body.id;
+      const handler = /* @__PURE__ */ __name((event) => {
+        if (event.origin !== globalThis.window.origin) return;
+        if (event.data.id !== id2) return;
+        globalThis.removeEventListener("message", handler);
+        if (event.data.result.some(isRpcError)) {
+          reject(event.data.result[0]);
+        } else {
+          resolve(event.data.result[0]);
+        }
+      }, "handler");
+      globalThis.addEventListener("message", handler);
+      globalThis.postMessage(buildSessionMessageRequest(body, this.destination), globalThis.location.origin);
+    });
   }
-}, "confirmTransaction");
+};
 
 // src/provider/runner/JsonRpcXyoRunner.ts
 var JsonRpcXyoRunner = class {
@@ -1005,7 +1092,7 @@ var JsonRpcXyoRunner = class {
 
 // src/provider/runner/MemoryXyoRunner.ts
 import { MemoryArchivist } from "@xyo-network/archivist-memory";
-import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
+import { PayloadBuilder } from "@xyo-network/payload-builder";
 import { flattenHydratedTransaction } from "@xyo-network/xl1-protocol-sdk";
 var MemoryXyoRunner = class {
   static {
@@ -1015,7 +1102,7 @@ var MemoryXyoRunner = class {
   async broadcastTransaction(transaction) {
     const archivist = await this.getArchivist();
     await archivist.insert(flattenHydratedTransaction(transaction));
-    return await PayloadBuilder3.hash(transaction[0]);
+    return await PayloadBuilder.hash(transaction[0]);
   }
   async getArchivist() {
     if (!this._archivist) {
@@ -1030,7 +1117,7 @@ var MemoryXyoRunner = class {
 // src/provider/runner/NodeXyoRunner.ts
 import { assertEx as assertEx2 } from "@xylabs/assert";
 import { asArchivistInstance } from "@xyo-network/archivist-model";
-import { PayloadBuilder as PayloadBuilder4 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
 import { PayloadBundleSchema } from "@xyo-network/payload-model";
 import { flattenHydratedTransaction as flattenHydratedTransaction2 } from "@xyo-network/xl1-protocol-sdk";
 var NodeXyoRunner = class {
@@ -1047,7 +1134,7 @@ var NodeXyoRunner = class {
   async broadcastTransaction(transaction) {
     const flattened = flattenHydratedTransaction2(transaction);
     const pendingArchivist = await this.getPendingArchivist();
-    const txHash = await PayloadBuilder4.hash(transaction[0]);
+    const txHash = await PayloadBuilder2.hash(transaction[0]);
     const payloadBundle = {
       schema: PayloadBundleSchema,
       payloads: flattened,
@@ -1193,7 +1280,7 @@ var JsonRpcXyoViewer = class {
 
 // src/provider/provider/XyoConnection.ts
 import { assertEx as assertEx3 } from "@xylabs/assert";
-import { PayloadBuilder as PayloadBuilder5 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
 import { isAnyPayload } from "@xyo-network/payload-model";
 import { defaultTransactionFees, isDataLakeProvider } from "@xyo-network/xl1-protocol";
 import { HydratedTransactionWrapper } from "@xyo-network/xl1-wrappers";
@@ -1252,8 +1339,8 @@ var XyoConnection = class {
     if (fromResolved === void 0) throw new Error("Failed to determine from address");
     const signedTransaction = assertEx3(await signer.createSignedTransaction(chainResolved, elevatedPayloads, additionalPayloads, nbfResolved, expResolved, feesResolved, fromResolved), () => "Failed to create transaction");
     const hydratedTransaction = [
-      await PayloadBuilder5.addStorageMeta(signedTransaction),
-      await PayloadBuilder5.addStorageMeta(elevatedPayloads)
+      await PayloadBuilder3.addStorageMeta(signedTransaction),
+      await PayloadBuilder3.addStorageMeta(elevatedPayloads)
     ];
     if (isDataLakeProvider(storage)) {
       const wrapper = await HydratedTransactionWrapper.parse(hydratedTransaction);
@@ -1264,17 +1351,18 @@ var XyoConnection = class {
   }
 };
 
-// src/provider/provider/RpcXyoConnection.ts
-var RpcXyoConnection = class extends XyoConnection {
+// src/provider/provider/HttpRpcXyoConnection.ts
+var HttpRpcXyoConnection = class extends XyoConnection {
   static {
-    __name(this, "RpcXyoConnection");
+    __name(this, "HttpRpcXyoConnection");
   }
   constructor(params) {
-    const transport = new HttpRpcTransport(params.endpoint, {
+    const { account, endpoint } = params;
+    const signer = isDefined2(account) ? new MemoryXyoSigner(account) : void 0;
+    const transport = new HttpRpcTransport(endpoint, {
       ...XyoRunnerRpcSchemas,
       ...XyoViewerRpcSchemas
     });
-    const signer = params.account ? new MemoryXyoSigner(params.account) : void 0;
     const runner = new JsonRpcXyoRunner(transport);
     const viewer = new JsonRpcXyoViewer(transport);
     super({
@@ -1284,147 +1372,9 @@ var RpcXyoConnection = class extends XyoConnection {
     });
   }
 };
-
-// src/transport/HttpRpcTransport.ts
-import { AxiosJson } from "@xylabs/axios";
-import { isError, isUndefinedOrNull } from "@xylabs/typeof";
-import { isAxiosError } from "axios";
-import { v4 } from "uuid";
-var HttpRpcTransport = class {
-  static {
-    __name(this, "HttpRpcTransport");
-  }
-  _rpcUrl;
-  _schemas;
-  constructor(rpcUrl, schemas) {
-    this._rpcUrl = rpcUrl;
-    this._schemas = schemas;
-  }
-  async sendRequest(method, params) {
-    return await this.callRpc(this._rpcUrl, this._schemas, method, params);
-  }
-  async callRpc(url, schemas, method, params) {
-    try {
-      const id = v4();
-      const body = {
-        jsonrpc,
-        id,
-        method
-      };
-      if (params) {
-        body.params = schemas[method].params.to.parse(params);
-      }
-      const res = await new AxiosJson().post(url, body);
-      const json = res.data;
-      if (isUndefinedOrNull(json) || json.error) {
-        throw new Error(json.error.message);
-      }
-      return schemas[method].result.from.parse(json.result);
-    } catch (ex) {
-      let message = isError(ex) ? ex.message : String(ex);
-      if (isAxiosError(ex)) {
-        message = `Http error occurred [${ex.status}|${ex.code ?? "<unknown>"}]: ${ex.message}`;
-      }
-      throw new Error(`Error occurred while calling RPC method ${String(method)}: ${message}`);
-    }
-  }
-};
-
-// src/transport/MemoryRpcTransport.ts
-import { isObject } from "@xylabs/typeof";
-import { v4 as v42 } from "uuid";
-var MemoryRpcTransport = class {
-  static {
-    __name(this, "MemoryRpcTransport");
-  }
-  _rpcEngine;
-  _schemas;
-  requestSchemas = {};
-  responseSchemas = {};
-  constructor(rpcEngine, schemas = AllRpcSchemas) {
-    this._rpcEngine = rpcEngine;
-    this._schemas = schemas;
-  }
-  async sendRequest(method, params) {
-    const schema = this._schemas[method];
-    let requestSchema = this.requestSchemas[method];
-    if (!isObject(requestSchema)) {
-      requestSchema = createRequestSchema(method, schema.params.to);
-      this.requestSchemas[method] = requestSchema;
-    }
-    const req = {
-      jsonrpc,
-      id: v42(),
-      method,
-      params
-    };
-    const request = requestSchema.parse(req);
-    const response = await this._rpcEngine.handle(request);
-    let responseSchema = this.responseSchemas[method];
-    if (!isObject(responseSchema)) {
-      responseSchema = createResponseSchema(schema.result.from);
-      this.responseSchemas[method] = responseSchema;
-    }
-    return responseSchema.parse(response)?.result;
-  }
-};
-
-// src/transport/post-message/PostMessageRpcTransport.ts
-import { isDefined as isDefined2 } from "@xylabs/typeof";
-import { v4 as v43 } from "uuid";
-
-// src/transport/post-message/helpers.ts
-var isRpcError = /* @__PURE__ */ __name((data) => {
-  return data && typeof data === "object" && "error" in data && data.error;
-}, "isRpcError");
-
-// src/transport/post-message/SessionEnvelope.ts
-var buildSessionMessageRequest = /* @__PURE__ */ __name((data, destination) => {
-  const request = {
-    data,
-    destination,
-    sessionId: globalThis.xyo.walletExtensionId() ?? ""
-  };
-  return request;
-}, "buildSessionMessageRequest");
-
-// src/transport/post-message/PostMessageRpcTransport.ts
-var PostMessageRpcTransport = class {
+var RpcXyoConnection = class extends HttpRpcXyoConnection {
   static {
-    __name(this, "PostMessageRpcTransport");
-  }
-  destination;
-  schemas;
-  constructor(defaultDestination, schemas = XyoGatewayRpcSchemas) {
-    this.schemas = schemas;
-    this.destination = defaultDestination;
-  }
-  async sendRequest(method, params) {
-    const id = v43();
-    return await this.callRpc(this.schemas, method, id, params);
-  }
-  async callRpc(schemas, method, id, params) {
-    const body = {
-      jsonrpc,
-      id,
-      method
-    };
-    body.params = isDefined2(params) && isDefined2(schemas[method]) ? schemas[method].params.to.parse(params) : params;
-    return await new Promise((resolve, reject) => {
-      const id2 = body.id;
-      const handler = /* @__PURE__ */ __name((event) => {
-        if (event.origin !== globalThis.window.origin) return;
-        if (event.data.id !== id2) return;
-        globalThis.removeEventListener("message", handler);
-        if (event.data.result.some(isRpcError)) {
-          reject(event.data.result[0]);
-        } else {
-          resolve(event.data.result[0]);
-        }
-      }, "handler");
-      globalThis.addEventListener("message", handler);
-      globalThis.postMessage(buildSessionMessageRequest(body, this.destination), globalThis.location.origin);
-    });
+    __name(this, "RpcXyoConnection");
   }
 };
 export {
@@ -1434,6 +1384,7 @@ export {
   CaveatsSchema,
   ChainConnectionSchema,
   HttpRpcTransport,
+  HttpRpcXyoConnection,
   InvokerPermissionSchema,
   JsonRpcErrorCodes,
   JsonRpcXyoRunner,
@@ -1458,8 +1409,6 @@ export {
   XyoSignerRpcSchemas,
   XyoViewerRpcSchemas,
   buildSessionMessageRequest,
-  confirmSubmittedTransaction,
-  confirmTransaction,
   createRequestSchema,
   createResponseSchema,
   getPermissionsStoreFromTransport,