Fix

Author: Haakam21

src/wrapper/mppx.ts

@@ -1,22 +1,28 @@
-import { probe402 } from "./probe402.js";
+import { probe402, wsToHttp } from "./util.js";
 
 export interface MppxClient {
-    fetch: typeof globalThis.fetch;
-    transport: {
-        setCredential(request: Request, credential: string): Request;
-    };
-    createCredential(response: Response): Promise<string>;
+  fetch: typeof globalThis.fetch;
+  transport: {
+    setCredential(request: Request, credential: string): Request;
+  };
+  createCredential(response: Response): Promise<string>;
 }
 
-export async function getPaymentCredentials(wsUrl: string, mppx: MppxClient): Promise<Record<string, string>> {
-    const response = await probe402(wsUrl);
+export async function getPaymentCredentials(
+  wsUrl: string,
+  mppx: MppxClient
+): Promise<Record<string, string>> {
+  const response = await probe402(wsUrl);
 
-    const credential = await mppx.createCredential(response);
-    const signed = mppx.transport.setCredential(new Request(wsUrl), credential);
+  const credential = await mppx.createCredential(response);
+  const signed = mppx.transport.setCredential(
+    new Request(wsToHttp(wsUrl)),
+    credential
+  );
 
-    const headers: Record<string, string> = {};
-    signed.headers.forEach((value: string, key: string) => {
-        headers[key] = value;
-    });
-    return headers;
+  const headers: Record<string, string> = {};
+  signed.headers.forEach((value: string, key: string) => {
+    headers[key] = value;
+  });
+  return headers;
 }

src/wrapper/probe402.ts

@@ -0,0 +1,14 @@
+export function wsToHttp(wsUrl: string): string {
+  return wsUrl.replace(/^wss:\/\//, "https://").replace(/^ws:\/\//, "http://");
+}
+
+export async function probe402(wsUrl: string): Promise<Response> {
+  const httpUrl = wsToHttp(wsUrl);
+
+  const response = await fetch(httpUrl);
+  if (response.status !== 402) {
+    throw new Error(`Expected 402 from ${httpUrl} but got ${response.status}`);
+  }
+
+  return response;
+}

src/wrapper/util.ts

@@ -1,22 +1,28 @@
 import type { x402Client } from "@x402/fetch";
-import { probe402 } from "./probe402.js";
+import { probe402 } from "./util.js";
 
-export async function getPaymentCredentials(wsUrl: string, client: x402Client): Promise<Record<string, string>> {
-    const { x402HTTPClient } = await import("@x402/fetch");
-    const httpClient = new x402HTTPClient(client);
+export async function getPaymentCredentials(
+  wsUrl: string,
+  client: x402Client
+): Promise<Record<string, string>> {
+  const { x402HTTPClient } = await import("@x402/fetch");
+  const httpClient = new x402HTTPClient(client);
 
-    const response = await probe402(wsUrl);
+  const response = await probe402(wsUrl);
 
-    let body: unknown;
-    try {
-        body = JSON.parse(await response.text());
-    } catch {
-        body = undefined;
-    }
+  let body: unknown;
+  try {
+    body = JSON.parse(await response.text());
+  } catch {
+    body = undefined;
+  }
 
-    const getHeader = (name: string) => response.headers.get(name);
-    const paymentRequired = httpClient.getPaymentRequiredResponse(getHeader, body);
+  const getHeader = (name: string) => response.headers.get(name);
+  const paymentRequired = httpClient.getPaymentRequiredResponse(
+    getHeader,
+    body
+  );
 
-    const paymentPayload = await httpClient.createPaymentPayload(paymentRequired);
-    return httpClient.encodePaymentSignatureHeader(paymentPayload);
+  const paymentPayload = await httpClient.createPaymentPayload(paymentRequired);
+  return httpClient.encodePaymentSignatureHeader(paymentPayload);
 }