@faremeter/facilitator 0.15.0 → 0.16.0

package/dist/src/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/routes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AAI1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAKvE,KAAK,2BAA2B,GAAG;IACjC,QAAQ,EAAE,kBAAkB,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE;QACR,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACH,CAAC;AAkBF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,2BAA2B,8EAgSxE"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/routes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AAI1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAKvE,KAAK,2BAA2B,GAAG;IACjC,QAAQ,EAAE,kBAAkB,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE;QACR,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACH,CAAC;AAoCF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,2BAA2B,8EAuQxE"}

package/dist/src/routes.js

@@ -1,10 +1,10 @@
-import { getLogger } from "@logtape/logtape";
+import { getLogger } from "@faremeter/logs";
 import { Hono } from "hono";
 import * as x from "@faremeter/types/x402";
 import { isValidationError } from "@faremeter/types";
 import {} from "@faremeter/types/x402";
 import { allSettledWithTimeout } from "./promise.js";
-const logger = getLogger(["faremeter", "facilitator"]);
+const logger = await getLogger(["faremeter", "facilitator"]);
 function summarizeRequirements({ scheme, network, asset, payTo, }) {
     return {
         scheme,
@@ -13,6 +13,21 @@ function summarizeRequirements({ scheme, network, asset, payTo, }) {
         payTo,
     };
 }
+function processException(step, e, cb) {
+    let msg = undefined;
+    // XXX - We can do a better job of determining if it's a chain
+    // error, or some other issue.
+    if (e instanceof Error) {
+        msg = e.message;
+    }
+    else {
+        msg = `unknown error handling ${step}`;
+    }
+    logger.error(`Caught exception during ${step}`, {
+        exception: e,
+    });
+    return cb(msg);
+}
 export function createFacilitatorRoutes(args) {
     const router = new Hono();
     function sendVerifyError(c, status, msg) {
@@ -42,7 +57,7 @@ export function createFacilitatorRoutes(args) {
             }
             paymentPayload = decodedHeader;
         }
-        logger.debug("starting verifyment attempt for request: {*}", x402Req);
+        logger.debug("starting verifyment attempt for request", x402Req);
         for (const handler of args.handlers) {
             let t;
             if (handler.handleVerify === undefined) {
@@ -52,28 +67,19 @@ export function createFacilitatorRoutes(args) {
                 t = await handler.handleVerify(x402Req.paymentRequirements, paymentPayload);
             }
             catch (e) {
-                let msg = undefined;
-                // XXX - We can do a better job of determining if it's a chain
-                // error, or some other issue.
-                if (e instanceof Error) {
-                    msg = e.message;
-                }
-                else {
-                    msg = "unknown error handling verifyment";
-                }
-                return sendVerifyError(c, 500, msg);
+                return processException("verify", e, (msg) => sendVerifyError(c, 500, msg));
             }
             if (t === null) {
                 continue;
             }
-            logger.debug("facilitator handler agreed to verify and returned: {*}", t);
-            logger.info(`${t.isValid ? "succeeded" : "failed"} verifying request: {*}`, {
+            logger.debug("facilitator handler agreed to verify and returned", t);
+            logger.info(`${t.isValid ? "succeeded" : "failed"} verifying request`, {
                 ...t,
                 requirements: summarizeRequirements(x402Req.paymentRequirements),
             });
             return c.json(t);
         }
-        logger.warning("attempt to verify was made with no handler found, requirements summary was: {*}", summarizeRequirements(x402Req.paymentRequirements));
+        logger.warning("attempt to verify was made with no handler found, requirements summary was", summarizeRequirements(x402Req.paymentRequirements));
         return sendVerifyError(c, 400, "no matching payment handler found");
     });
     function sendSettleError(c, status, msg) {
@@ -105,36 +111,27 @@ export function createFacilitatorRoutes(args) {
             }
             paymentPayload = decodedHeader;
         }
-        logger.debug("starting settlement attempt for request: {*}", x402Req);
+        logger.debug("starting settlement attempt for request", x402Req);
         for (const handler of args.handlers) {
             let t;
             try {
                 t = await handler.handleSettle(x402Req.paymentRequirements, paymentPayload);
             }
             catch (e) {
-                let msg = undefined;
-                // XXX - We can do a better job of determining if it's a chain
-                // error, or some other issue.
-                if (e instanceof Error) {
-                    msg = e.message;
-                }
-                else {
-                    msg = "unknown error handling settlement";
-                }
-                return sendSettleError(c, 500, msg);
+                return processException("settle", e, (msg) => sendSettleError(c, 500, msg));
             }
             if (t === null) {
                 continue;
             }
-            logger.debug("facilitator handler accepted settlement and returned: {*}", t);
-            logger.info(`${t.success ? "succeeded" : "failed"} settlement request: {*}`, {
+            logger.debug("facilitator handler accepted settlement and returned", t);
+            logger.info(`${t.success ? "succeeded" : "failed"} settlement request`, {
                 requirements: summarizeRequirements(x402Req.paymentRequirements),
                 txHash: t.txHash,
             });
             return c.json(t);
         }
         sendSettleError(c, 400, "no matching payment handler found");
-        logger.warning("attempt to settle was made with no handler found, requirements summary was: {*}", summarizeRequirements(x402Req.paymentRequirements));
+        logger.warning("attempt to settle was made with no handler found, requirements summary was", summarizeRequirements(x402Req.paymentRequirements));
     });
     router.post("/accepts", async (c) => {
         const x402Req = x.x402PaymentRequiredResponse(await c.req.json());
@@ -158,7 +155,7 @@ export function createFacilitatorRoutes(args) {
                 logger.error(`failed to retrieve requirements from facilitator handler: ${message}`, x.reason);
             }
         });
-        logger.debug(`returning ${accepts.length} accepts: {*}`, {
+        logger.debug(`returning ${accepts.length} accepts`, {
             accepts: accepts.map(summarizeRequirements),
         });
         c.status(200);
@@ -185,7 +182,7 @@ export function createFacilitatorRoutes(args) {
                 logger.error(`failed to retrieve supported from facilitator handler: ${message}`, x.reason);
             }
         });
-        logger.debug(`returning ${kinds.length} kinds supported: {*}`, {
+        logger.debug(`returning ${kinds.length} kinds supported`, {
             kinds,
         });
         c.status(200);