dhali-js 2.0.0 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dhali-js",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "A JavaScript library for managing XRPL payment channels and generating auth tokens for Dhali APIs",
   "main": "src/index.js",
   "type": "commonjs",

package/src/dhali/utils.js

@@ -0,0 +1,44 @@
+/**
+ * Wraps a base64 encoded claim and a base64 encoded requirement into an x402 compliant payload.
+ *
+ * @param {string} claimBase64 - The base64 encoded claim object.
+ * @param {string} paymentRequirementBase64 - The base64 encoded payment requirement object.
+ * @returns {string} The base64 encoded x402 payment payload.
+ */
+function wrapAsX402PaymentPayload(claimBase64, paymentRequirementBase64) {
+    const decodedClaim = JSON.parse(
+        Buffer.from(claimBase64, "base64").toString("utf-8")
+    );
+    let req = JSON.parse(
+        Buffer.from(paymentRequirementBase64, "base64").toString("utf-8")
+    );
+
+    if (req.accepts) {
+        req = Array.isArray(req.accepts) ? req.accepts[0] : req.accepts;
+    }
+
+    // Normalize fields to match Dhali-wallet's PaymentRequirements defaults (camelCase)
+    const normalizedReq = {
+        scheme: req.scheme || "",
+        network: req.network || "",
+        asset: req.asset || (req.price ? req.price.asset : "") || "",
+        amount: String(req.amount || (req.price ? req.price.amount : "0")),
+        payTo: req.payTo || req.pay_to || "",
+        maxTimeoutSeconds: parseInt(
+            req.maxTimeoutSeconds || req.max_timeout_seconds || 1209600
+        ),
+        extra: req.extra || {},
+    };
+
+    const x402Payload = {
+        x402Version: 2,
+        payload: decodedClaim,
+        accepted: normalizedReq,
+    };
+
+    return Buffer.from(JSON.stringify(x402Payload)).toString("base64");
+}
+
+module.exports = {
+    wrapAsX402PaymentPayload,
+};

package/src/index.js

@@ -3,6 +3,7 @@ const { DhaliXrplChannelManager, ChannelNotFound } = require("./dhali/DhaliXrplC
 const { DhaliEthChannelManager } = require("./dhali/DhaliEthChannelManager");
 const { Currency } = require("./dhali/Currency");
 const { getAvailableDhaliCurrencies } = require("./dhali/configUtils");
+const { wrapAsX402PaymentPayload } = require("./dhali/utils");
 
 module.exports = {
   DhaliChannelManager,
@@ -10,5 +11,6 @@ module.exports = {
   DhaliEthChannelManager,
   ChannelNotFound,
   Currency,
-  getAvailableDhaliCurrencies
+  getAvailableDhaliCurrencies,
+  wrapAsX402PaymentPayload
 };

package/tests/utils.test.js

@@ -0,0 +1,70 @@
+const { wrapAsX402PaymentPayload } = require("../src/dhali/utils");
+
+describe("wrapAsX402PaymentPayload", () => {
+    const mockClaim = {
+        version: "2",
+        account: "rAccount",
+        protocol: "XRPL.MAINNET",
+        currency: { code: "XRP", scale: 6 },
+        destination_account: "rDest",
+        authorized_to_claim: "1000000",
+        channel_id: "chan123",
+        signature: "sig123",
+    };
+    const claimBase64 = Buffer.from(JSON.stringify(mockClaim)).toString("base64");
+
+    const mockReqFull = {
+        accepts: [
+            {
+                scheme: "dhali",
+                network: "xrpl:0",
+                asset: "xrpl:0/native:xrp",
+                amount: "70",
+                pay_to: "rLggTEwmTe3eJgyQbCSk4wQazow2TeKrtR",
+                max_timeout_seconds: 1209600,
+                extra: {},
+            },
+        ],
+    };
+    const reqFullBase64 = Buffer.from(JSON.stringify(mockReqFull)).toString(
+        "base64"
+    );
+
+    const mockReqDhaliApp = {
+        scheme: "dhali",
+        network: "eip155:1",
+        payTo: "0x3D85634D9EA2854F4276eE5372Bf32Eb4ACDbf77",
+        price: {
+            amount: "10000000000",
+            asset: "eip155:1/erc20:0x8292Bb45bf1Ee4d140127049757C2E0fF06317eD",
+        },
+        maxTimeoutSeconds: 1209600,
+        extra: {},
+    };
+    const reqDhaliAppBase64 = Buffer.from(JSON.stringify(mockReqDhaliApp)).toString(
+        "base64"
+    );
+
+    test("should wrap claim and full requirements correctly", () => {
+        const resultBase64 = wrapAsX402PaymentPayload(claimBase64, reqFullBase64);
+        const result = JSON.parse(Buffer.from(resultBase64, "base64").toString());
+
+        expect(result.x402Version).toBe(2);
+        expect(result.payload).toEqual(mockClaim);
+        expect(result.accepted.amount).toBe("70");
+        expect(result.accepted.payTo).toBe("rLggTEwmTe3eJgyQbCSk4wQazow2TeKrtR");
+    });
+
+    test("should wrap and normalize Dhali-app style requirements correctly", () => {
+        const resultBase64 = wrapAsX402PaymentPayload(claimBase64, reqDhaliAppBase64);
+        const result = JSON.parse(Buffer.from(resultBase64, "base64").toString());
+
+        expect(result.accepted.amount).toBe("10000000000");
+        expect(result.accepted.asset).toBe(
+            "eip155:1/erc20:0x8292Bb45bf1Ee4d140127049757C2E0fF06317eD"
+        );
+        expect(result.accepted.payTo).toBe(
+            "0x3D85634D9EA2854F4276eE5372Bf32Eb4ACDbf77"
+        );
+    });
+});