wao 0.29.1 → 0.29.3

package/esm/send.js

@@ -10,8 +10,6 @@ const {
 import { from } from "./httpsig.js"
 
 export async function send(signedMsg, fetchImpl = fetch) {
-  // IMPORTANT: Use the URL from signedMsg.url, NOT from any path header
-  // This ensures we send to the correct URL even if path header is different
   const fetchOptions = {
     method: signedMsg.method,
     headers: signedMsg.headers,
@@ -25,7 +23,6 @@ export async function send(signedMsg, fetchImpl = fetch) {
     fetchOptions.body = signedMsg.body
   }
 
-  // Use the URL as provided, ignoring any path header
   const response = await fetchImpl(signedMsg.url, fetchOptions)
   if (response.status >= 400) {
     throw new Error(`${response.status}: ${await response.text()}`)
@@ -36,10 +33,7 @@ export async function send(signedMsg, fetchImpl = fetch) {
     response.headers.forEach((v, k) => (headers[k] = v))
   } else headers = response.headers
   const http = { headers, body: await response.text(), status: response.status }
-  return {
-    out: from(http),
-    ...http,
-  }
+  return { ...from(http), ...http }
 }
 
 const httpSigName = address => {

package/esm/signer.js

@@ -1,97 +1,93 @@
 import { toHttpSigner } from "./send.js"
 import { enc } from "./encode.js"
+import { createSigner } from "@permaweb/aoconnect"
 
 const joinUrl = ({ url, path }) => {
-  if (path.startsWith("http://") || path.startsWith("https://")) {
-    return path
-  }
-  // Ensure path starts with /
+  if (path.startsWith("http://") || path.startsWith("https://")) return path
   const normalizedPath = path.startsWith("/") ? path : "/" + path
   return url.endsWith("/")
     ? url.slice(0, -1) + normalizedPath
     : url + normalizedPath
 }
 
-export function signer(config) {
-  const { signer, url = "http://localhost:10001" } = config
+export async function sign({ url, path, msg: encoded, jwk, signPath = false }) {
+  const signer = createSigner(jwk, url)
+  const { body = null, ...headers } = encoded
+  let _enc = { headers }
+  if (body) _enc.body = new Blob([body])
+  return await _sign({ signer, encoded: _enc, url, path, _path: signPath })
+}
 
-  if (!signer) {
-    throw new Error("Signer is required for mainnet mode")
+async function _sign({
+  encoded,
+  signer,
+  path,
+  url,
+  method = "POST",
+  _path = false,
+}) {
+  const headersObj = encoded ? encoded.headers : {}
+  const body = encoded ? encoded.body : undefined
+  const _url = joinUrl({ url, path })
+  headersObj["path"] = path
+  if (body && !headersObj["content-length"]) {
+    const bodySize = body.size || body.byteLength || 0
+    if (bodySize > 0) headersObj["content-length"] = String(bodySize)
+  }
+  const lowercaseHeaders = {}
+  for (const [key, value] of Object.entries(headersObj)) {
+    lowercaseHeaders[key.toLowerCase()] = value
+  }
+  const bodyKeys = headersObj["body-keys"]
+    ? headersObj["body-keys"]
+        .replace(/"/g, "")
+        .split(",")
+        .map(k => k.trim())
+    : []
+
+  const signingFields = Object.keys(lowercaseHeaders).filter(
+    key => key !== "body-keys" && key !== "path" && !bodyKeys.includes(key)
+  )
+
+  if (_path) signingFields.push("path")
+
+  if (signingFields.length === 0 && !body) {
+    lowercaseHeaders["content-length"] = "0"
+    signingFields.push("content-length")
   }
 
-  return async function sign(fields, { path: _path = false } = {}) {
-    const { path = "/relay/process", method = "POST", ...restFields } = fields
-    const aoFields = { ...restFields }
-    const encoded = await enc(aoFields)
-    const headersObj = encoded ? encoded.headers : {}
-    const body = encoded ? encoded.body : undefined
-
-    const _url = joinUrl({ url, path })
-
-    headersObj["path"] = path
-
-    if (body && !headersObj["content-length"]) {
-      const bodySize = body.size || body.byteLength || 0
-      if (bodySize > 0) {
-        headersObj["content-length"] = String(bodySize)
-      }
-    }
-
-    const lowercaseHeaders = {}
-    for (const [key, value] of Object.entries(headersObj)) {
-      lowercaseHeaders[key.toLowerCase()] = value
-    }
-    if (lowercaseHeaders.path && /^\//.test(lowercaseHeaders.path)) {
-      //const sp = lowercaseHeaders.path.split("/")
-      //lowercaseHeaders.path = sp.slice(sp.length - 1).join("/")
-    }
-    // Parse body-keys if present
-    const bodyKeys = headersObj["body-keys"]
-      ? headersObj["body-keys"]
-          .replace(/"/g, "")
-          .split(",")
-          .map(k => k.trim())
-      : []
-
-    // Collect fields to sign from headers
-    const signingFields = Object.keys(lowercaseHeaders).filter(
-      key => key !== "body-keys" && key !== "path" && !bodyKeys.includes(key) // Also exclude fields that are in body-keys
-    )
-    // Always include @path in the signature
-    //if (!signingFields.includes("path")) signingFields.push("path")
-    if (_path) signingFields.push("path")
-    // Ensure we have at least one field to sign
-    if (signingFields.length === 0 && !body) {
-      lowercaseHeaders["content-length"] = "0"
-      signingFields.push("content-length")
-    }
+  const signedRequest = await toHttpSigner(signer)({
+    request: { url: _url, method, headers: lowercaseHeaders },
+    fields: signingFields,
+  })
 
-    const signedRequest = await toHttpSigner(signer)({
-      request: {
-        url: _url,
-        method,
-        headers: lowercaseHeaders,
-      },
-      fields: signingFields,
-    })
-    const finalHeaders = {}
+  const finalHeaders = {}
 
-    for (const [key, value] of Object.entries(headersObj)) {
-      finalHeaders[key] = value
-    }
+  for (const [key, value] of Object.entries(headersObj)) {
+    finalHeaders[key] = value
+  }
 
-    finalHeaders["signature"] = signedRequest.headers["signature"]
-    finalHeaders["signature-input"] = signedRequest.headers["signature-input"]
+  finalHeaders["signature"] = signedRequest.headers["signature"]
+  finalHeaders["signature-input"] = signedRequest.headers["signature-input"]
 
-    if (headersObj["body-keys"]) {
-      finalHeaders["body-keys"] = headersObj["body-keys"]
-    }
-    const result = { url: _url, method, headers: finalHeaders }
+  if (headersObj["body-keys"]) {
+    finalHeaders["body-keys"] = headersObj["body-keys"]
+  }
+  const result = { url: _url, method, headers: finalHeaders }
 
-    if (body) result.body = body
+  if (body) result.body = body
 
-    return result
+  return result
+}
+export function signer(config) {
+  const { signer, url = "http://localhost:10001" } = config
+  if (!signer) throw new Error("Signer is required for mainnet mode")
+  return async (
+    fields,
+    { encoded: _encoded = false, path: _path = false } = {}
+  ) => {
+    const { path = "/relay/process", method = "POST", ...aoFields } = fields
+    const encoded = _encoded ? aoFields : await enc(aoFields)
+    return await _sign({ url, method, path, _path, encoded, signer })
   }
 }
-
-// stack / simple-pay / patch / hyperbeam / hyperbeam-aos / scheduler / cron

package/esm/workspace/package.json

@@ -8,6 +8,6 @@
     "deploy": "node scripts/deploy.js"
   },
   "dependencies": {
-    "wao": "^0.28.0"
+    "wao": "^0.29.2"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.29.1",
+  "version": "0.29.3",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"