@armory-sh/middleware-hono 0.3.2 → 0.3.8

package/dist/index.js

@@ -3,21 +3,49 @@ import {
   resolveNetwork,
   resolveToken,
   validateAcceptConfig,
-  isValidationError
+  isValidationError,
+  normalizeNetworkName as normalizeNetworkName2
 } from "@armory-sh/base";
 
 // src/core.ts
 import {
   getNetworkConfig,
   getNetworkByChainId,
-  encodePaymentPayload
+  encodePaymentPayload,
+  normalizeNetworkName
 } from "@armory-sh/base";
-var getNetworkName = (network) => {
-  if (typeof network === "string") return network;
-  const net = getNetworkByChainId(network);
-  if (!net) throw new Error(`No network found for chainId: ${network}`);
-  return net.name.toLowerCase().replace(" mainnet", "").replace(" sepolia", "-sepolia");
+var toSlug = (network) => {
+  if (typeof network === "number") {
+    const net = getNetworkByChainId(network);
+    if (!net) throw new Error(`No network found for chainId: ${network}`);
+    return normalizeNetworkName(net.name);
+  }
+  if (network.startsWith("eip155:")) {
+    const chainId = parseInt(network.split(":")[1], 10);
+    const net = getNetworkByChainId(chainId);
+    if (!net) throw new Error(`No network found for chainId: ${chainId}`);
+    return normalizeNetworkName(net.name);
+  }
+  return normalizeNetworkName(network);
+};
+var toEip155 = (network) => {
+  if (typeof network === "number") {
+    const net2 = getNetworkByChainId(network);
+    if (!net2) throw new Error(`No network found for chainId: ${network}`);
+    return net2.caip2Id;
+  }
+  if (network.startsWith("eip155:")) {
+    const net2 = getNetworkConfig(network);
+    if (!net2) throw new Error(`No network found for: ${network}`);
+    return net2.caip2Id;
+  }
+  const slug = normalizeNetworkName(network);
+  const net = getNetworkConfig(slug);
+  if (!net) throw new Error(`No network found for: ${slug}`);
+  return net.caip2Id;
 };
+var getNetworkName = (network) => toSlug(network);
+var getChainId = (network) => toEip155(network);
 var createV1Requirements = (config, expiry) => {
   const networkName = getNetworkName(config.network);
   const network = getNetworkConfig(networkName);
@@ -37,7 +65,7 @@ var createV2Requirements = (config, expiry) => {
   return {
     amount: config.amount,
     to: config.payTo,
-    chainId: network.caip2Id,
+    chainId: getChainId(config.network),
     assetId: network.caipAssetId,
     nonce: `${Date.now()}-${crypto.randomUUID()}`,
     expiry
@@ -145,7 +173,7 @@ var resolveMiddlewareConfig = (config) => {
     createHeaders: f.input.headers
   })) ?? [];
   const enrichedConfigs = result.config.map((c) => {
-    const networkName = c.network.config.name;
+    const networkName = normalizeNetworkName2(c.network.config.name);
     const tokenSymbol = c.token.config.symbol;
     const facilitatorPricing = c.facilitators.map((f) => {
       const pricingConfig = findPricingConfig(pricing, networkName, tokenSymbol, f.url);
@@ -172,7 +200,7 @@ var getPrimaryConfig = (resolved) => {
   }
   return {
     payTo: primary.payTo,
-    network: primary.network.config.name,
+    network: normalizeNetworkName2(primary.network.config.name),
     amount: primary.amount,
     facilitator: resolved.facilitators[0],
     settlementMode: "verify"
@@ -241,13 +269,12 @@ var acceptPaymentsViaArmory = (config) => {
   }
   const primaryConfig = getPrimaryConfig(resolved);
   const defaultVersion = config.defaultVersion ?? 2;
-  const requirementsV1 = createPaymentRequirements(primaryConfig, 1);
-  const requirementsV2 = createPaymentRequirements(primaryConfig, 2);
+  const createRequirements = (version) => createPaymentRequirements(primaryConfig, version);
   return async (c, next) => {
     const paymentHeader = c.req.header("X-Payment") || c.req.header("x402-payment");
     if (!paymentHeader) {
-      const requirements = defaultVersion === 1 ? requirementsV1 : requirementsV2;
       const version = defaultVersion === 1 ? 1 : 2;
+      const requirements = createRequirements(version);
       const headers = getHeadersForVersion(version);
       c.status(402);
       c.header(headers.required, encodeRequirements(requirements));
@@ -259,7 +286,7 @@ var acceptPaymentsViaArmory = (config) => {
       if (primaryConfig.facilitator) {
         const verifyResult = await verifyWithFacilitator(toHttpRequest(c), primaryConfig.facilitator);
         if (!verifyResult.success) {
-          const requirements = version === 1 ? requirementsV1 : requirementsV2;
+          const requirements = createRequirements(version);
           const headers2 = getHeadersForVersion(version);
           c.status(402);
           c.header(headers2.required, encodeRequirements(requirements));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/middleware-hono",
-  "version": "0.3.2",
+  "version": "0.3.8",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "type": "module",
@@ -28,8 +28,8 @@
     "hono": "^4"
   },
   "dependencies": {
-    "@armory-sh/base": "0.2.4",
-    "@armory-sh/facilitator": "0.2.4"
+    "@armory-sh/base": "0.2.9",
+    "@armory-sh/facilitator": "0.2.9"
   },
   "devDependencies": {
     "bun-types": "latest",