@xyo-network/xl1-rpc 3.0.5 → 3.0.7

package/dist/neutral/engine-node/createRpcDispatchMiddleware.d.ts

@@ -0,0 +1,17 @@
+import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine/v2';
+import type { Logger, Promisable } from '@xylabs/sdk-js';
+import type { RpcSchemaMap } from '../types/schema/RpcSchemaMap.ts';
+type RpcHandlerRecord = Record<string, ((params: never) => Promisable<unknown>) | undefined>;
+/** RpcDispatchMiddlewareOptions interface. */
+export interface RpcDispatchMiddlewareOptions {
+    logger?: Logger;
+    methodNotFound?: (method: string) => Error;
+}
+/**
+ * Validates, dispatches, and serializes a single JSON-RPC request against a
+ * paired schema map and handler record. Method names are narrowed generically
+ * from both arguments — callers only pass the schemas they own.
+ */
+export declare const createRpcDispatchMiddleware: <TSchemas extends RpcSchemaMap, THandlers extends RpcHandlerRecord>(schemas: TSchemas, handlers: THandlers, options?: RpcDispatchMiddlewareOptions) => JsonRpcMiddleware;
+export {};
+//# sourceMappingURL=createRpcDispatchMiddleware.d.ts.map

package/dist/neutral/engine-node/createRpcDispatchMiddleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createRpcDispatchMiddleware.d.ts","sourceRoot":"","sources":["../../../src/engine-node/createRpcDispatchMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAC3E,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAKxD,OAAO,KAAK,EAAe,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAEhF,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,KAAK,KAAK,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAA;AAE5F,8CAA8C;AAC9C,MAAM,WAAW,4BAA4B;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,KAAK,CAAA;CAC3C;AAED;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,GACtC,QAAQ,SAAS,YAAY,EAC7B,SAAS,SAAS,gBAAgB,EAElC,SAAS,QAAQ,EACjB,UAAU,SAAS,EACnB,UAAU,4BAA4B,KACrC,iBA+BF,CAAA"}

package/dist/neutral/engine-node/index.d.ts

@@ -1,4 +1,5 @@
 export * from './composedRpcEngineFromConnection.ts';
+export * from './createRpcDispatchMiddleware.ts';
 export * from './middleware/index.ts';
 export * from './rpcEngineFromConnection.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/neutral/engine-node/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/engine-node/index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAA;AACpD,cAAc,uBAAuB,CAAA;AACrC,cAAc,8BAA8B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/engine-node/index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAA;AACpD,cAAc,kCAAkC,CAAA;AAChD,cAAc,uBAAuB,CAAA;AACrC,cAAc,8BAA8B,CAAA"}

package/dist/neutral/engine-node/rpcEngineFromConnection.d.ts

@@ -1,4 +1,3 @@
-import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine/v2';
 import { JsonRpcEngineV2, JsonRpcServer } from '@metamask/json-rpc-engine/v2';
 import type { Logger } from '@xylabs/sdk-js';
 import type { XyoConnection } from '@xyo-network/xl1-protocol-lib';
@@ -7,5 +6,5 @@ export declare const rpcEngineFromConnection: (connection: XyoConnection, logger
     [x: number]: unknown;
     [x: symbol]: unknown;
 }>>;
-export declare function rpcServerFromConnection(connection: XyoConnection, logger?: Logger): JsonRpcServer<JsonRpcMiddleware>;
+export declare function rpcServerFromConnection(connection: XyoConnection, logger?: Logger): JsonRpcServer<import("@metamask/json-rpc-engine/v2").JsonRpcMiddleware>;
 //# sourceMappingURL=rpcEngineFromConnection.d.ts.map

package/dist/neutral/engine-node/rpcEngineFromConnection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpcEngineFromConnection.d.ts","sourceRoot":"","sources":["../../../src/engine-node/rpcEngineFromConnection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAC3E,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAQlE,eAAO,MAAM,uBAAuB,GAClC,YAAY,aAAa,EACzB,SAAS,MAAM;;;;GA6ChB,CAAA;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,MAAM,oCAGjF"}
+{"version":3,"file":"rpcEngineFromConnection.d.ts","sourceRoot":"","sources":["../../../src/engine-node/rpcEngineFromConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAOlE,eAAO,MAAM,uBAAuB,GAClC,YAAY,aAAa,EACzB,SAAS,MAAM;;;;GAMhB,CAAA;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,MAAM,2EAGjF"}

package/dist/neutral/index.mjs

@@ -1572,11 +1572,8 @@ import { creatableProvider } from "@xyo-network/xl1-protocol-sdk";
 import { AccountBalanceViewerMoniker } from "@xyo-network/xl1-protocol-lib";
 
 // src/provider/viewer/JsonRpcViewer.ts
-import {
-  AbstractCreatableProvider,
-  HttpRpcRemoteConfigZod,
-  PostMessageRpcRemoteConfigZod
-} from "@xyo-network/xl1-protocol-sdk";
+import { isDefined as isDefined5 } from "@xylabs/sdk-js";
+import { AbstractCreatableProvider } from "@xyo-network/xl1-protocol-sdk";
 
 // src/transport/HttpRpcTransport.ts
 import {
@@ -1841,6 +1838,14 @@ var PostMessageRpcTransport = class {
 };
 
 // src/provider/viewer/JsonRpcViewer.ts
+function resolveRpcConnection(connections) {
+  const named = connections["default-rpc"];
+  if (isDefined5(named) && named.type === "rpc") {
+    return named;
+  }
+  const first = Object.values(connections).find((connection) => connection?.type === "rpc");
+  return first;
+}
 var AbstractJsonRpcViewer = class extends AbstractCreatableProvider {
   _transport;
   get transport() {
@@ -1851,15 +1856,14 @@ var AbstractJsonRpcViewer = class extends AbstractCreatableProvider {
     await super.createHandler();
   }
   createTransport() {
-    const httpRemoteConfig = HttpRpcRemoteConfigZod.safeParse(this.config.remote.rpc);
-    if (httpRemoteConfig.success) {
-      const { url } = httpRemoteConfig.data;
-      return new HttpRpcTransport(url, this.schemas());
-    }
-    const postMessageRemoteConfig = PostMessageRpcRemoteConfigZod.safeParse(this.config.remote.rpc);
-    if (postMessageRemoteConfig.success) {
-      const { networkId, sessionId } = postMessageRemoteConfig.data;
-      return new PostMessageRpcTransport(networkId, this.schemas(), sessionId, this.logger);
+    const connection = resolveRpcConnection(this.config.connections);
+    if (isDefined5(connection)) {
+      if (connection.protocol === "postMessage" || isDefined5(connection.networkId)) {
+        return new PostMessageRpcTransport(connection.networkId ?? "", this.schemas(), connection.sessionId ?? "", this.logger);
+      }
+      if (isDefined5(connection.url)) {
+        return new HttpRpcTransport(connection.url, this.schemas());
+      }
     }
     throw new Error("Unable to create transport");
   }
@@ -1924,20 +1928,20 @@ import {
 } from "@xyo-network/xl1-protocol-sdk";
 
 // src/provider/viewer/JsonRpcBlockViewer/JsonRpcBlockViewerMethods.ts
-import { isDefined as isDefined5 } from "@xylabs/sdk-js";
+import { isDefined as isDefined6 } from "@xylabs/sdk-js";
 import { BlockViewerMoniker } from "@xyo-network/xl1-protocol-lib";
 var JsonRpcBlockViewerMethods = class extends AbstractJsonRpcViewer {
   moniker = BlockViewerMoniker;
   async blocksByHash(hash, limit) {
     return await this.transport.sendRequest(
       "blockViewer_blocksByHash",
-      isDefined5(limit) ? [hash, limit] : [hash]
+      isDefined6(limit) ? [hash, limit] : [hash]
     );
   }
   async blocksByNumber(block, limit) {
     return await this.transport.sendRequest(
       "blockViewer_blocksByNumber",
-      isDefined5(limit) ? [block, limit] : [block]
+      isDefined6(limit) ? [block, limit] : [block]
     );
   }
   async blocksByStep(stepLevel, stepIndex) {
@@ -2782,11 +2786,16 @@ import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/sdk-js";
 import { elevatedTransaction, MempoolRunnerMoniker } from "@xyo-network/xl1-protocol-lib";
 
 // src/provider/runner/JsonRpcRunner.ts
-import {
-  AbstractCreatableProvider as AbstractCreatableProvider2,
-  HttpRpcRemoteConfigZod as HttpRpcRemoteConfigZod2,
-  PostMessageRpcRemoteConfigZod as PostMessageRpcRemoteConfigZod2
-} from "@xyo-network/xl1-protocol-sdk";
+import { isDefined as isDefined7 } from "@xylabs/sdk-js";
+import { AbstractCreatableProvider as AbstractCreatableProvider2 } from "@xyo-network/xl1-protocol-sdk";
+function resolveRpcConnection2(connections) {
+  const named = connections["default-rpc"];
+  if (isDefined7(named) && named.type === "rpc") {
+    return named;
+  }
+  const first = Object.values(connections).find((connection) => connection?.type === "rpc");
+  return first;
+}
 var AbstractJsonRpcRunner = class extends AbstractCreatableProvider2 {
   get transport() {
     return this.params.transport;
@@ -2796,15 +2805,14 @@ var AbstractJsonRpcRunner = class extends AbstractCreatableProvider2 {
     await super.createHandler();
   }
   createTransport() {
-    const httpRemoteConfig = HttpRpcRemoteConfigZod2.safeParse(this.config.remote.rpc);
-    if (httpRemoteConfig.success) {
-      const { url } = httpRemoteConfig.data;
-      return new HttpRpcTransport(url, this.schemas());
-    }
-    const postMessageRemoteConfig = PostMessageRpcRemoteConfigZod2.safeParse(this.config.remote.rpc);
-    if (postMessageRemoteConfig.success) {
-      const { networkId, sessionId } = postMessageRemoteConfig.data;
-      return new PostMessageRpcTransport(networkId, this.schemas(), sessionId, this.logger);
+    const connection = resolveRpcConnection2(this.config.connections);
+    if (isDefined7(connection)) {
+      if (connection.protocol === "postMessage" || isDefined7(connection.networkId)) {
+        return new PostMessageRpcTransport(connection.networkId ?? "", this.schemas(), connection.sessionId ?? "", this.logger);
+      }
+      if (isDefined7(connection.url)) {
+        return new HttpRpcTransport(connection.url, this.schemas());
+      }
     }
     throw new Error("Unable to create transport");
   }
@@ -3056,36 +3064,40 @@ var composedRpcServerFromConnection = (connection, logger) => {
   return new JsonRpcServer2({ engine });
 };
 
+// src/engine-node/createRpcDispatchMiddleware.ts
+var createRpcDispatchMiddleware = (schemas, handlers, options) => async ({ request }) => {
+  const method = request.method;
+  const handler = handlers[method];
+  const schema = schemas[method];
+  if (schema === void 0 || handler === void 0) {
+    const createError = options?.methodNotFound ?? (() => new Error(JsonRpcErrorCodes.MethodNotFound.message));
+    throw createError(method);
+  }
+  let requestSchema = requestSchemas[method];
+  if (requestSchema == void 0) {
+    requestSchema = createRequestSchema(method, schema.params.from);
+    requestSchemas[method] = requestSchema;
+  }
+  const parsed = requestSchema.safeParse(request);
+  if (!parsed.success) {
+    options?.logger?.error("RPC Request Validation Error", parsed.error);
+    throw new Error(parsed.error.message);
+  }
+  const { params } = parsed.data;
+  try {
+    const result = await handler(params);
+    return schema.result.to.parse(result);
+  } catch (error) {
+    options?.logger?.error("RPC Response Handler Error", error);
+    throw error;
+  }
+};
+
 // src/engine-node/rpcEngineFromConnection.ts
 import { JsonRpcEngineV2 as JsonRpcEngineV22, JsonRpcServer as JsonRpcServer3 } from "@metamask/json-rpc-engine/v2";
 var rpcEngineFromConnection = (connection, logger) => {
   const handlers = rpcMethodHandlersFromConnection(connection);
-  const middleware = async ({ request }) => {
-    const method = request.method;
-    const handler = handlers[method];
-    const schema = AllRpcSchemas[method];
-    if (schema === void 0 || handler === void 0) {
-      throw new Error(JsonRpcErrorCodes.MethodNotFound.message);
-    }
-    let requestSchema = requestSchemas[method];
-    if (requestSchema == void 0) {
-      requestSchema = createRequestSchema(method, schema.params.from);
-      requestSchemas[method] = requestSchema;
-    }
-    const parsed = requestSchema.safeParse(request);
-    if (!parsed.success) {
-      logger?.error("RPC Request Validation Error", parsed.error);
-      throw new Error(parsed.error.message);
-    }
-    const { params } = parsed.data;
-    try {
-      const result = await handler(params);
-      return schema.result.to.parse(result);
-    } catch (error) {
-      logger?.error("RPC Response Handler Error", error);
-      throw error;
-    }
-  };
+  const middleware = createRpcDispatchMiddleware(AllRpcSchemas, handlers, { logger });
   return JsonRpcEngineV22.create({ middleware: [middleware] });
 };
 function rpcServerFromConnection(connection, logger) {
@@ -3168,6 +3180,7 @@ export {
   createMethodNotFoundMiddleware,
   createRequestSchema,
   createResponseSchema,
+  createRpcDispatchMiddleware,
   createTypedHandlerMiddleware,
   createValidationMiddleware,
   hasSessionId,