wao 0.5.3 → 0.5.5

package/cjs/tar.js

@@ -149,7 +149,10 @@ var AR = /*#__PURE__*/function (_MAR) {
               return this.arweave.wallets.jwkToAddress(jwk);
             case 9:
               owner = _context2.sent;
-              this.mem.addrmap[owner] = jwk.n;
+              this.mem.addrmap[owner] = {
+                address: owner,
+                key: jwk.n
+              };
               _context2.next = 13;
               return this.postTx(tx, jwk, {
                 recipient: "",
@@ -207,7 +210,10 @@ var AR = /*#__PURE__*/function (_MAR) {
               _context3.t1 = _context3.sent;
               hashBuffer = _context3.t0.from.call(_context3.t0, _context3.t1);
               owner = _base64url["default"].encode(hashBuffer);
-              this.mem.addrmap[owner] = di.owner;
+              this.mem.addrmap[owner] = {
+                key: di.owner,
+                address: owner
+              };
               data = di.data;
               try {
                 data = _base64url["default"].decode(di.data);
@@ -282,77 +288,91 @@ var AR = /*#__PURE__*/function (_MAR) {
                 height: this.mem.height,
                 previous: (_last = (0, _ramda.last)(this.mem.blocks)) !== null && _last !== void 0 ? _last : ""
               };
-              if (item) {
-                if (!item.id) {
-                  item.id = tx.id;
-                  this.mem.txs[tx.id] = item;
-                  this.mem.txs[tx.id].parent = null;
-                  this.mem.txs[tx.id].signature = tx.signature;
-                  this.mem.txs[tx.id].anchor = tx.last_tx;
-                  data_type = "";
-                  _iterator3 = _createForOfIteratorHelper(tx.tags);
-                  try {
-                    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                      v = _step3.value;
-                      if (v.get("name", {
+              if (!item) {
+                _context4.next = 12;
+                break;
+              }
+              if (!item.id) {
+                item.id = tx.id;
+                this.mem.txs[tx.id] = item;
+                this.mem.txs[tx.id].parent = null;
+                this.mem.txs[tx.id].signature = tx.signature;
+                this.mem.txs[tx.id].anchor = tx.last_tx;
+                data_type = "";
+                _iterator3 = _createForOfIteratorHelper(tx.tags);
+                try {
+                  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    v = _step3.value;
+                    if (v.get("name", {
+                      decode: true,
+                      string: true
+                    }) === "Content-Type") {
+                      data_type = v.get("value", {
                         decode: true,
                         string: true
-                      }) === "Content-Type") {
-                        data_type = v.get("value", {
-                          decode: true,
-                          string: true
-                        });
-                      }
+                      });
                     }
-                  } catch (err) {
-                    _iterator3.e(err);
-                  } finally {
-                    _iterator3.f();
-                  }
-                  this.mem.txs[tx.id]._data = {
-                    size: tx.data_size,
-                    type: data_type
-                  };
-                } else {
-                  this.mem.txs[item.id].parent = {
-                    id: block.id
-                  };
-                }
-                block.txs = [item.id];
-                this.mem.txs[item.id].block = block.id;
-              } else {
-                _tags = [];
-                _iterator4 = _createForOfIteratorHelper(tx.tags);
-                try {
-                  for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                    _v = _step4.value;
-                    _tags.push({
-                      name: _base64url["default"].decode(_v.name),
-                      value: _base64url["default"].decode(_v.value)
-                    });
                   }
                 } catch (err) {
-                  _iterator4.e(err);
+                  _iterator3.e(err);
                 } finally {
-                  _iterator4.f();
+                  _iterator3.f();
                 }
-                tx.tags = _tags;
-                this.mem.txs[tx.id] = tx;
-                block.txs = [tx.id];
-                this.mem.txs[tx.id].block = block.id;
+                this.mem.txs[tx.id]._data = {
+                  size: tx.data_size,
+                  type: data_type
+                };
+              } else {
+                this.mem.txs[item.id].parent = {
+                  id: block.id
+                };
               }
+              block.txs = [item.id];
+              this.mem.txs[item.id].block = block.id;
+              _context4.next = 22;
+              break;
+            case 12:
+              _tags = [];
+              _iterator4 = _createForOfIteratorHelper(tx.tags);
+              try {
+                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                  _v = _step4.value;
+                  _tags.push({
+                    name: _base64url["default"].decode(_v.name),
+                    value: _base64url["default"].decode(_v.value)
+                  });
+                }
+              } catch (err) {
+                _iterator4.e(err);
+              } finally {
+                _iterator4.f();
+              }
+              tx.tags = _tags;
+              _context4.next = 18;
+              return this.arweave.wallets.jwkToAddress({
+                n: tx.owner
+              });
+            case 18:
+              tx.owner = _context4.sent;
+              this.mem.txs[tx.id] = tx;
+              block.txs = [tx.id];
+              this.mem.txs[tx.id].block = block.id;
+            case 22:
               this.mem.blocks.push(block.id);
               this.mem.blockmap[block.id] = block;
               if (!jwk) {
-                _context4.next = 14;
+                _context4.next = 29;
                 break;
               }
-              _context4.next = 12;
+              _context4.next = 27;
               return this.arweave.wallets.jwkToAddress(jwk);
-            case 12:
+            case 27:
               owner = _context4.sent;
-              this.mem.addrmap[owner] = jwk.n;
-            case 14:
+              this.mem.addrmap[owner] = {
+                address: owner,
+                key: jwk.n
+              };
+            case 29:
               res = {
                 id: tx.id,
                 status: 200,
@@ -363,7 +383,7 @@ var AR = /*#__PURE__*/function (_MAR) {
                 err: err,
                 id: tx.id
               });
-            case 16:
+            case 31:
             case "end":
               return _context4.stop();
           }
@@ -404,9 +424,15 @@ var AR = /*#__PURE__*/function (_MAR) {
             case 0:
               tx = this.mem.txs[id];
               _data = (_this$mem$txs$id$data = (_this$mem$txs$id = this.mem.txs[id]) === null || _this$mem$txs$id === void 0 ? void 0 : _this$mem$txs$id.data) !== null && _this$mem$txs$id$data !== void 0 ? _this$mem$txs$id$data : null;
-              if (tx.format === 2 && _data && string) _data = _base64url["default"].decode(_data);
+              try {
+                JSON.parse(_data);
+                _data = Buffer.from(_data).toString("base64");
+              } catch (e) {}
+              if (tx.format === 2 && _data && string) {
+                _data = _base64url["default"].decode(_data);
+              }
               return _context6.abrupt("return", _data);
-            case 4:
+            case 5:
             case "end":
               return _context6.stop();
           }

package/esm/ao.js

@@ -393,9 +393,7 @@ class AO {
         }
         if (ex) return txs
         if (this.in_memory) await wait(1)
-        return Date.now() - start < (this.local ? timeout / 1000 : timeout)
-          ? await getRef(ref)
-          : []
+        return Date.now() - start < timeout ? await getRef(ref) : []
       }
 
       let [cache, checks, isOK] = [[], [], false]

package/esm/aoconnect.js

@@ -116,11 +116,13 @@ export const connect = mem => {
       format = mem.wasms[mod].format
     }
     format ??= "wasm64-unknown-emscripten-draft_2024_02_15"
+    const now = Date.now
     const handle = await AoLoader(wasm, {
       format,
       mode: "test",
       WeaveDrive,
     })
+    Date.now = now
     _module = { handle, id: mod }
     if (!mod) throw Error("module not found")
     opt.tags = buildTags(
@@ -241,6 +243,7 @@ export const connect = mem => {
 
   const assign = async opt => {
     const p = mem.env[opt.process]
+    if (!p) return null
     let _opt = mem.msgs[opt.message]
     let hash = genHashChain(p.hash, opt.message)
     p.hash = hash
@@ -300,7 +303,7 @@ export const connect = mem => {
       delete res.Memory
       p.res[opt.message] = res
       p.results.push(opt.message)
-      p.txs.unshift({ id: opt.message, ...opt })
+      p.txs.unshift({ id, ...opt })
       mem.msgs[opt.message] = _opt
       for (const v of res.Messages ?? []) {
         if (mem.env[v.Target]) {
@@ -344,6 +347,7 @@ export const connect = mem => {
 
   const message = async opt => {
     const p = mem.env[opt.process]
+    if (!p) return null
     let ex = false
     let id = opt?.item?.id ?? ""
     let owner = opt.owner ?? ""
@@ -422,6 +426,7 @@ export const connect = mem => {
     },
     dryrun: async opt => {
       const p = mem.env[opt.process]
+      if (!p) return null
       let id = opt.id ?? ""
       let owner = opt.owner ?? ""
       if (!opt.id && opt.signer) {

package/esm/helpers.js

@@ -20,7 +20,7 @@ export class Src {
   constructor({ ar, dir } = {}) {
     this.ar = ar
     this.dir = dir
-    if (!dir) dirname().then(v => (this.dir = v))
+    if (!dir) dirname().then(v => (this.dir = resolve(v, "lua")))
   }
   data(file, ext = "lua") {
     return readFileSync(

package/esm/server.js

@@ -1,4 +1,5 @@
 import express from "express"
+import cors from "cors"
 import base64url from "base64url"
 import { DataItem } from "arbundles"
 import { tags } from "./utils.js"
@@ -6,7 +7,7 @@ import { connect } from "./aoconnect.js"
 import { GQL, cu, su, mu } from "./test.js"
 import bodyParser from "body-parser"
 import { graphql, parse, validate, buildSchema } from "graphql"
-import { map } from "ramda"
+import { keys, map, reverse } from "ramda"
 const schema = buildSchema(`
   schema {
     query: Query
@@ -201,7 +202,10 @@ class Server {
   }
   ar() {
     const app = express()
+    app.use(cors())
     app.use(bodyParser.json({ limit: "100mb" }))
+    app.get("/wallet/:id/balance", (req, res) => res.send("0"))
+    app.get("/mint/:id/:amount", (req, res) => res.json({ id: "0" }))
     app.get("/tx/:id/offset", async (req, res) => {
       res.status(500)
       res.send(null)
@@ -232,6 +236,11 @@ class Server {
       const tar = parsed.rootFieldName
       const fields = parsed.fields[0].edges[0].node
       const args = parsed.args
+      if (args.tags) {
+        let _tags = {}
+        for (const v of args.tags) _tags[v.name] = v.values
+        args.tags = _tags
+      }
       let res2 = null
       if (tar === "transactions") {
         res2 = await this.gql.txs({ ...args })
@@ -241,9 +250,9 @@ class Server {
       const edges = map(v => ({ node: v, cursor: v.cursor }), res2)
       res.json({ data: { transactions: { edges } } })
     })
-
     let data = {}
     app.post("/:id", async (req, res) => {
+      // id = "tx" | "chunk"
       if (req.body.chunk) {
         if (data[req.body.data_root]) {
           data[req.body.data_root].data += req.body.chunk
@@ -277,10 +286,7 @@ class Server {
         res.json({ id: req.body.id })
       }
     })
-    app.post("/tx", async (req, res) => {
-      await this._ar.postTx(req.body)
-      res.json({ id: req.body.id })
-    })
+
     const server = app.listen(this.ports.ar, () => {
       console.log(`AR on port ${this.ports.ar}`)
     })
@@ -288,6 +294,7 @@ class Server {
   }
   mu() {
     const app = express()
+    app.use(cors())
     app.use(express.raw({ type: "*/*" }))
     app.get("/", (req, res) => res.send("ao messenger unit"))
     app.post("/monitor/:id", async (req, res) => {
@@ -317,8 +324,12 @@ class Server {
       } else {
         err = true
       }
-      if (err) res.status(500)
-      res.send({ id: item.id })
+      if (err) {
+        res.status(500)
+        res.send({ err })
+      } else {
+        res.send({ id: item.id })
+      }
     })
     const server = app.listen(this.ports.mu, () =>
       console.log(`MU on port ${this.ports.mu}`),
@@ -327,8 +338,51 @@ class Server {
   }
   su() {
     const app = express()
+    app.use(cors())
     app.use(bodyParser.json())
-    app.get("/", (req, res) => res.json({ timestamp: Date.now() }))
+    app.get("/", (req, res) => {
+      res.json({
+        Unit: "Scheduler",
+        Timestamp: Date.now(),
+        Address: su.addr,
+        Processes: keys(this.mem.env),
+      })
+    })
+    app.get("/timestamp", (req, res) =>
+      res.json({ timestamp: Date.now(), block_height: this.mem.height }),
+    )
+    app.get("/:pid", (req, res) => {
+      const pid = req.params.pid
+      const edges = map(v => {
+        const tx = this.mem.txs[v.id]
+        const _tags = tags(v.tags)
+        const mid = _tags.Message
+        const mtx = this.mem.txs[mid]
+        return {
+          cursor: v.id,
+          node: {
+            message: {
+              id: mtx.id,
+              tags: mtx.tags,
+              owner: this.mem.addrmap[mtx.owner],
+              anchor: mtx.anchor ?? null,
+              target: pid,
+              signature: mtx.signature,
+              data: tx.data,
+            },
+            assignment: {
+              id: tx.id,
+              tags: tx.tags,
+              owner: this.mem.addrmap[tx.owner],
+              anchor: tx.anchor ?? null,
+              target: null,
+              signature: tx.signature,
+            },
+          },
+        }
+      })(reverse(this.mem.env[pid].txs))
+      res.json({ page_info: { has_next_page: false }, edges })
+    })
     const server = app.listen(this.ports.su, () =>
       console.log(`SU on port ${this.ports.su}`),
     )
@@ -336,8 +390,11 @@ class Server {
   }
   cu() {
     const app = express()
+    app.use(cors())
     app.use(bodyParser.json())
-    app.get("/", (req, res) => res.json({ timestamp: Date.now() }))
+    app.get("/", (req, res) =>
+      res.json({ timestamp: Date.now(), address: cu.addr }),
+    )
     app.get("/result/:mid", async (req, res) => {
       const res2 = await this.result({
         message: req.params.mid,
@@ -349,8 +406,13 @@ class Server {
       const process = req.query["process-id"]
       const { Id: id, Owner: owner, Tags: tags, Data: data } = req.body
       const res2 = await this.dryrun({ id, owner, tags, data, process })
-      delete res2.Memory
-      res.json(res2)
+      if (!res2) {
+        res.status(500)
+        res.json({ err: true })
+      } else {
+        delete res2.Memory
+        res.json(res2)
+      }
     })
     const server = app.listen(this.ports.cu, () =>
       console.log(`CU on port ${this.ports.cu}`),

package/esm/tar.js

@@ -39,7 +39,7 @@ class AR extends MAR {
     let _tags = buildTags(null, tags)
     for (const v of _tags) tx.addTag(v.name, v.value)
     const owner = await this.arweave.wallets.jwkToAddress(jwk)
-    this.mem.addrmap[owner] = jwk.n
+    this.mem.addrmap[owner] = { address: owner, key: jwk.n }
     return await this.postTx(tx, jwk, {
       recipient: "",
       tags: _tags,
@@ -63,7 +63,7 @@ class AR extends MAR {
       await crypto.subtle.digest("SHA-256", rowner),
     )
     const owner = base64url.encode(hashBuffer)
-    this.mem.addrmap[owner] = di.owner
+    this.mem.addrmap[owner] = { key: di.owner, address: owner }
     let data = di.data
     try {
       data = base64url.decode(di.data)
@@ -123,6 +123,7 @@ class AR extends MAR {
         })
       }
       tx.tags = _tags
+      tx.owner = await this.arweave.wallets.jwkToAddress({ n: tx.owner })
       this.mem.txs[tx.id] = tx
       block.txs = [tx.id]
       this.mem.txs[tx.id].block = block.id
@@ -132,7 +133,7 @@ class AR extends MAR {
 
     if (jwk) {
       const owner = await this.arweave.wallets.jwkToAddress(jwk)
-      this.mem.addrmap[owner] = jwk.n
+      this.mem.addrmap[owner] = { address: owner, key: jwk.n }
     }
     res = { id: tx.id, status: 200, statusText: "200" }
     return { res, err, id: tx.id }
@@ -145,7 +146,13 @@ class AR extends MAR {
   async data(id, string) {
     let tx = this.mem.txs[id]
     let _data = this.mem.txs[id]?.data ?? null
-    if (tx.format === 2 && _data && string) _data = base64url.decode(_data)
+    try {
+      JSON.parse(_data)
+      _data = Buffer.from(_data).toString("base64")
+    } catch (e) {}
+    if (tx.format === 2 && _data && string) {
+      _data = base64url.decode(_data)
+    }
     return _data
   }
 }

package/esm/tgql.js

@@ -98,6 +98,7 @@ export default class GQL {
         }
         if (!isNil(opt.after) && count === 0 && !after) continue
         let tx = this.mem.txs[v2]
+
         if (!isNil(ids) && ids.length > 0) {
           if (!includes(tx.id, ids)) continue
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -28,6 +28,7 @@
     "arweave": "^1.15.1",
     "base64url": "^3.0.1",
     "body-parser": "^1.20.3",
+    "cors": "^2.8.5",
     "express": "^4.21.2",
     "graphql": "^16.10.0",
     "ramda": "^0.30.1",