wao 0.36.3 → 0.36.6

package/esm/adaptor-base.js

@@ -7,9 +7,6 @@ import {
   toGraphObj,
 } from "./utils.js"
 import { keys, map, isNil, reverse, omit } from "ramda"
-//import { httpbis, createVerifier } from "http-message-signatures"
-//import { createPublicKey } from "node:crypto"
-//const { verifyMessage } = httpbis
 
 class Adaptor {
   constructor({
@@ -406,6 +403,7 @@ class Adaptor {
     let type = null
     let item = null
     if (valid || true) item = new DataItem(body)
+    await item.setSignature(item.rawSignature)
     const _tags = tags(item.tags)
     let err = null
     if (_tags.Type === "Process") {

package/esm/ao.js

@@ -331,8 +331,8 @@ class AO {
           : "ao.TN.1",
       Type: "Module",
       "Module-Format": "wasm64-unknown-emscripten-draft_2024_02_15",
-      "Input-Encoding": "JSON-V1",
-      "Output-Encoding": "JSON-V1",
+      "Input-Encoding": "JSON-1",
+      "Output-Encoding": "JSON-1",
       "Memory-Limit": "1-gb",
       "Compute-Limit": "9000000000000",
       Extension: "WeaveDrive",

package/esm/aoconnect-base.js

@@ -6,7 +6,7 @@ const pkg = WarpArBundles.default ?? WarpArBundles
 const { DataItem } = pkg
 import crypto from "crypto"
 import base64url from "base64url"
-import { wait } from "./utils.js"
+import { toAddr, wait } from "./utils.js"
 import AO from "./ao.js"
 import { connect, createSigner } from "@permaweb/aoconnect"
 
@@ -334,7 +334,10 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
           }
         }
         // check: is owner=mu.addr right?
-        const msg = await genMsg(opt.message, p, data, _tags, from, mu.addr)
+        const _owner = opt.message_item?.owner
+          ? toAddr(opt.message_item.owner)
+          : mu.addr
+        const msg = await genMsg(opt.message, p, data, _tags, from, _owner)
         const _env = await genEnv({
           pid: p.id,
           owner: p.owner,
@@ -429,6 +432,32 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
                   target: opt.process,
                 })*/
               }
+            } else if (t.__SU__) {
+              const sch = t.__SU__
+              const tar = v.Target
+              /*const procs =
+                (await fetch(sch).then(r => r.json()))?.Processes ?? []*/
+              const ao = await new AO({ port: sch.split(":").pop() - 2 }).init(
+                mu.jwk
+              )
+              try {
+                let _tags = {
+                  ...t,
+                  "From-Process": opt.process,
+                  "Pushed-For": id,
+                }
+                const pr = (await mem.getTx(opt.process))?.tags ?? []
+                const module = tags(pr).Module
+                if (module) _tags["From-Module"] = module
+                const { mid } = await ao.msg({
+                  act: _tags["Action"] ?? null,
+                  pid: tar,
+                  tags: _tags,
+                  data: v.Data ?? "",
+                })
+              } catch (e) {
+                console.log(e)
+              }
             } else if (t.__Scheduler__) {
               const sch = t.__Scheduler__
               const tar = v.Target
@@ -526,7 +555,6 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
         owner = opt.owner ?? ""
         item = opt.item
       }
-
       const p = await mem.get("env", opt.process)
       if (!p) return null
       if (!opt.item && opt.signer) {

package/esm/bar.js

@@ -58,8 +58,10 @@ class AR extends MAR {
   async dataitem({ target = "", data = "1984", tags = {}, signer, item }) {
     let di = item
     if (!di) {
-      const _item = await signer({ data, tags: buildTags(tags), target })
-      di = new DataItem(_item.raw)
+      if (!item?.signature) {
+        const _item = await signer({ data, tags: buildTags(tags), target })
+        di = new DataItem(_item.raw)
+      }
     } else tags = t(di.tags)
     const owner = await this.owner(di)
     return { id: await di.id, owner, item: di, tags }

package/esm/bundler.js

@@ -31,80 +31,82 @@ const bundler = ({ port = 4001, jwk, timeout = 1000 * 60 } = {}) => {
       const out = structured_to(httpsig_from(toMsg(req)))
       for (const k in out.body?.commitments ?? {}) {
         const msg = out.body?.commitments[k]
-        const signer = {
-          signatureType: 1,
-          signatureLength: 512,
-          ownerLength: 512,
-          publicKey: msg.owner,
-          sign: async () => {},
-        }
-        const tags = []
-        let type = null
-        if (msg["original-tags"]) {
-          for (const tagObj of Object.values(msg["original-tags"])) {
-            tags.push({ name: tagObj.name, value: tagObj.value })
-            if (tagObj.name === "Type") {
-              type = tagObj.value
-            }
-          }
-        }
-        let opt = { tags }
-        if (type !== "Process") opt.target = out.process
-        const di = await createData(out.data || "", signer, opt)
-        await di.setSignature(msg.signature)
-        const res = await fetch("https://up.arweave.net:443/tx", {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/octet-stream",
-          },
-          body: di.binary,
-        })
-        console.log(res?.status, di.tags)
-        const dis = [di]
-        if (type === "Message") {
-          if (!out["block-timestamp"]) {
-            try {
-              if (Date.now() - last_checked > timeout) {
-                const json = await fetch(
-                  "https://arweave.net/block/current"
-                ).then(r => r.json())
-                height = json.height
-                timestamp = json.timestamp
-                last_checked = Date.now()
-              }
-            } catch (e) {
-              console.log(e)
-            }
-          }
-          const atags = {
-            Process: out.process,
-            Epoch: out.epoch,
-            Nonce: Number(++nonce).toString(),
-            "Hash-Chain": out["hash-chain"],
-            "Block-Height": Number(out["block-height"] ?? height).toString(),
-            Tmestamp: Number(out["block-timestamp"] ?? timestamp).toString(),
-            "Data-Protocol": "ao",
-            Slot: Number(out.slot).toString(),
-            Variant: "ao.WDB.1",
-            Type: "Assignment",
-            Message: di.id,
+        if (msg["commitment-device"] === "ans104@1.0") {
+          const signer = {
+            signatureType: 1,
+            signatureLength: 512,
+            ownerLength: 512,
+            publicKey: msg.owner,
+            sign: async () => {},
           }
           const tags = []
+          let type = null
           if (msg["original-tags"]) {
-            for (const k in atags) tags.push({ name: k, value: atags[k] })
+            for (const tagObj of Object.values(msg["original-tags"])) {
+              tags.push({ name: tagObj.name, value: tagObj.value })
+              if (tagObj.name === "Type") {
+                type = tagObj.value
+              }
+            }
           }
-          const signer = new ArweaveSigner(jwk)
-          const di2 = await createData("", signer, { tags })
-          await di2.sign(signer)
-          dis.push(di2)
-          const res2 = await fetch("https://up.arweave.net:443/tx", {
+          let opt = { tags }
+          if (type !== "Process") opt.target = out.process
+          const di = await createData(out.data || "", signer, opt)
+          await di.setSignature(msg.signature)
+          const res = await fetch("https://up.arweave.net:443/tx", {
             method: "POST",
             headers: {
               "Content-Type": "application/octet-stream",
             },
-            body: di2.binary,
+            body: di.binary,
           })
-          console.log(res2?.status, di2.tags)
+          console.log(res?.status, di.tags)
+          const dis = [di]
+          if (type === "Message") {
+            if (!out["block-timestamp"]) {
+              try {
+                if (Date.now() - last_checked > timeout) {
+                  const json = await fetch(
+                    "https://arweave.net/block/current"
+                  ).then(r => r.json())
+                  height = json.height
+                  timestamp = json.timestamp
+                  last_checked = Date.now()
+                }
+              } catch (e) {
+                console.log(e)
+              }
+            }
+            const atags = {
+              Process: out.process,
+              Epoch: out.epoch,
+              Nonce: Number(++nonce).toString(),
+              "Hash-Chain": out["hash-chain"],
+              "Block-Height": Number(out["block-height"] ?? height).toString(),
+              Tmestamp: Number(out["block-timestamp"] ?? timestamp).toString(),
+              "Data-Protocol": "ao",
+              Slot: Number(out.slot).toString(),
+              Variant: "ao.WDB.1",
+              Type: "Assignment",
+              Message: di.id,
+            }
+            const tags = []
+            if (msg["original-tags"]) {
+              for (const k in atags) tags.push({ name: k, value: atags[k] })
+            }
+            const signer = new ArweaveSigner(jwk)
+            const di2 = await createData("", signer, { tags })
+            await di2.sign(signer)
+            dis.push(di2)
+            const res2 = await fetch("https://up.arweave.net:443/tx", {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/octet-stream",
+              },
+              body: di2.binary,
+            })
+            console.log(res2?.status, di2.tags)
+          }
         }
       }
     } catch (e) {

package/esm/hb.js

@@ -1,8 +1,16 @@
 import { createSigner } from "@permaweb/aoconnect"
-import { httpsig_from, structured_to } from "hbsig"
 import { isEmpty, last, isNotNil, mergeLeft, clone } from "ramda"
 import { toAddr, buildTags, seed } from "./utils.js"
-import { rsaid, hmacid, sign, signer, send as _send, commit } from "hbsig"
+import {
+  httpsig_from,
+  structured_to,
+  rsaid,
+  hmacid,
+  sign,
+  signer,
+  send as _send,
+  commit,
+} from "hbsig"
 import hyper_aos from "./hyper-aos.js"
 import aos_wamr from "./aos_wamr.js"
 import { from } from "./httpsig-utils.js"
@@ -160,27 +168,30 @@ class HB {
     })
     return { slot: res.out.slot, res, pid }
   }
-  async post104({
-    path = "/~process@1.0/schedule",
-    tags = {},
-    data = "1984",
-    target,
-  }) {
-    const _tags = buildTags(mergeLeft(tags, { signingFormat: "ANS-104" }))
-    const signer = new ArweaveSigner(this.jwk)
-    const di = createData(data, signer, { tags: _tags, target })
-    await di.sign(signer)
+  async send104({ path = "/~process@1.0/schedule", item }) {
     let res = await fetch(`${this.url}${path}`, {
       method: "POST",
       headers: {
         "codec-device": "ans104@1.0",
         "Content-Type": "application/ans104",
       },
-      body: di.binary,
+      body: item.binary,
     })
     res.out = structured_to(httpsig_from(await toMsg(res)))
     return res
   }
+  async post104({
+    path = "/~process@1.0/schedule",
+    tags = {},
+    data = "1984",
+    target,
+  }) {
+    const _tags = buildTags(mergeLeft(tags, { signingFormat: "ANS-104" }))
+    const signer = new ArweaveSigner(this.jwk)
+    const item = createData(data, signer, { tags: _tags, target })
+    await item.sign(signer)
+    return await this.send104({ path, item })
+  }
 
   async schedule({ pid, tags = {}, data } = {}) {
     let res = null

package/package.json

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