wao 0.8.4 → 0.8.5

package/esm/ao.js

@@ -17,6 +17,7 @@ import {
 } from "@permaweb/aoconnect"
 
 import {
+  equals,
   concat,
   is,
   mergeLeft,
@@ -29,6 +30,7 @@ import {
 } from "ramda"
 
 import {
+  allChecked,
   searchTag,
   checkTag,
   wait,
@@ -379,11 +381,42 @@ class AO {
     tags = {},
     check = [],
     get,
-    timeout = 10000,
+    timeout = 0,
   }) {
     let err = null
     ;({ jwk, err } = await this.ar.checkWallet({ jwk }))
     if (err) return { err }
+    const getNewTxs = async (pid, _txs, _txmap) => {
+      const txs = await this.ar.gql.txs({
+        recipient: pid,
+        fields: ["id", "recipient", "tags", { owner: ["address"] }],
+      })
+      for (const v of txs) {
+        if (isNil(_txmap[v.id])) {
+          const t = ltags(v.tags)
+          if (t.type === "Message") {
+            v.from = t["from-process"] ?? v.owner?.address
+            _txs.unshift(v)
+            _txmap[v.id] = { checked: false, ref: t["x-reference"] }
+          }
+        }
+      }
+    }
+    const checkOut = async (get, _txs, _txmap) => {
+      let out = null
+      for (let v of _txs) {
+        if (isNil(_txmap[v.id].res)) {
+          const res = await this.result({ process: pid, message: v.id })
+          _txmap[v.id].res = res
+        }
+        if (!isNil(_txmap[v.id].res) && _txmap[v.id].out !== true) {
+          _txmap[v.id].out = true
+          out = getTagVal(get, _txmap[v.id].res, v.from)
+          if (out) break
+        }
+      }
+      return out
+    }
     let [res, out, mid, results] = [null, null, null, []]
     let _tags = buildTags(act, tags)
     let start = Date.now()
@@ -394,108 +427,51 @@ class AO {
         tags: _tags,
         data: jsonToStr(data),
       })
-
-      const exRef = (ref, txs) => {
-        for (const v2 of txs ?? []) {
-          const t = ltags(v2.tags)
-          if (t.type === "Message" && t["x-reference"] === ref) return true
-        }
-        return false
-      }
-
-      const getRef = async (ref, txs = []) => {
-        let ex = exRef(ref, txs)
-        if (!ex) {
-          if (!this.in_memory) await wait(1000)
-          txs = await this.ar.gql.txs({
-            recipient: pid,
-            fields: ["id", "recipient", "tags", { owner: ["address"] }],
-          })
-          ex = exRef(ref, txs)
-        }
-        if (ex) return txs
-        if (this.in_memory) await wait(1)
-        return Date.now() - start < timeout ? await getRef(ref) : []
-      }
-
-      let [cache, checks, isOK] = [[], [], false]
-      const getResult = async mid => {
-        const res = await this.result({ process: pid, message: mid })
-        results.push({ mid, res })
-        let err = null
-        if (res.Error) err = res.Error
-        else {
-          if (!is(Array, check)) check = [check]
-          let i = 0
-          for (const v of check) {
-            let _checks = checks[i] ?? null
-            if (isRegExp(v) || includes(typeof v)(["string", "boolean"])) {
-              _checks = mergeChecks(_checks, isData(v, res), v)
-            } else {
-              const checks2 = {}
-              for (const k in v ?? {}) {
-                checks2[k] = checkTag(res, k, v[k])
-              }
-              _checks = mergeChecks(_checks, checks2, v)
+      if (!is(Array, check)) check = [check]
+      let _txs = [{ id: mid, from: await this.ar.toAddr(jwk) }]
+      let _txmap = {}
+      const t = ltags(_tags)
+      let checked = false
+      _txmap[mid] = { checked: false, ref: t["x-reference"] }
+      do {
+        for (let v of _txs) {
+          if (!_txmap[v.id].checked) {
+            _txmap[v.id].checked = true
+            const _res = await this.result({ process: pid, message: v.id })
+            if (isNil(res)) {
+              res = _res
+              mid = v.id
+              results.push({ mid, res })
             }
-            checks[i] = _checks
-            i++
-          }
-          if (isCheckComplete(checks, check)) isOK = true
-          if (!isNil(get) && !isOutComplete(out, get)) {
-            out = mergeOut(out, getTagVal(get, res), get)
+            _txmap[v.id].res = _res
+            checked = allChecked(check, _res, v.from)
+            if (checked) break
           }
         }
-        if ((!isOutComplete(out, get) || !isOK) && !err) {
-          let refs = []
-          for (const v of res.Messages) {
-            const _ltags = ltags(v.Tags)
-            if (_ltags.type === "Message" && _ltags.reference) {
-              refs.push(_ltags.reference)
-            }
-          }
-
-          for (const v of res.Messages) {
-            const _ltags = ltags(v.Tags)
-            if (_ltags.type === "Message" && _ltags.reference) {
-              const txs = await getRef(_ltags.reference, cache)
-              cache = o(uniqBy(prop("id")), concat(cache))(txs)
-              for (const v2 of txs) {
-                const _ltags2 = ltags(v2.tags)
-                if (
-                  _ltags2.type === "Message" &&
-                  _ltags2["x-reference"] === _ltags.reference
-                ) {
-                  const {
-                    res: _res,
-                    out: _out,
-                    err: _err,
-                    ok: _ok,
-                  } = await getResult(v2.id)
-                  if (_err) {
-                    err = _err
-                    break
-                  }
-                  if (!isOutComplete(out, get) && _out)
-                    out = mergeOut(out, _out, get)
-                  if (isOutComplete(out, get) && isOK) break
-                }
-              }
-              if (isOutComplete(out, get) && isOK) break
-            }
+        if (checked) break
+        await wait(1000)
+        await getNewTxs(pid, _txs, _txmap)
+      } while (Date.now() - start < timeout)
+      if (!checked) {
+        err = "something went wrong!"
+      } else {
+        out = mergeOut(out, await checkOut(get, _txs, _txmap), get)
+        if (!isOutComplete(out, get) && !isNil(get)) {
+          while (Date.now() - start < timeout) {
+            await getNewTxs(pid, _txs, _txmap)
+            out = mergeOut(out, await checkOut(get, _txs, _txmap), get)
+            if (isOutComplete(out, get)) break
+            await wait(1000)
           }
         }
-        return { res, err }
       }
-      ;({ res, err } = await getResult(mid))
-      if (!isOK && !err) err = "something went wrong!"
     } catch (e) {
       err = e
     }
     return { mid, res, err, out, results }
   }
 
-  async asgn({ pid, mid, jwk, check, get }) {
+  async asgn({ pid, mid, jwk, check = [], get }) {
     let err = null
     ;({ jwk, err } = await this.ar.checkWallet({ jwk }))
     if (err) return { err }
@@ -509,28 +485,11 @@ class AO {
       })
       res = await this.result({ process: pid, message: mid })
       if (!res) err = "something went wrong"
-
       if (res.Error) err = res.Error
       else {
-        let checks = []
         if (!is(Array, check)) check = [check]
-        let i = 0
-        for (const v of check) {
-          let _checks = checks[i] ?? null
-          if (isRegExp(v) || includes(typeof v)(["string", "boolean"])) {
-            _checks = mergeChecks(_checks, isData(v, res), v)
-          } else {
-            const checks2 = {}
-            for (const k in v ?? {}) {
-              checks2[k] = checkTag(res, k, v[k])
-            }
-            _checks = mergeChecks(_checks, checks2, v)
-          }
-          checks[i] = _checks
-          i++
-        }
-        if (!isCheckComplete(checks, check)) err = "something went wrong"
-        if (!err && !isNil(get)) out = getTagVal(get, res)
+        if (!allChecked(check, res)) err = "something went wrong"
+        if (!err && !isNil(get)) out = getTagVal(get, res) // todo: from
       }
     } catch (e) {
       err = e
@@ -538,16 +497,7 @@ class AO {
     return { mid, res, err, out }
   }
 
-  async dry({
-    pid,
-    jwk,
-    data,
-    act = "Eval",
-    tags = {},
-    check,
-    get,
-    timeout = 10000,
-  }) {
+  async dry({ pid, jwk, data, act = "Eval", tags = {}, check = [], get }) {
     let err = null
     ;({ jwk, err } = await this.ar.checkWallet({ jwk }))
     if (err) return { err }
@@ -563,22 +513,7 @@ class AO {
       res = _res
       let checks = []
       if (!is(Array, check)) check = [check]
-      let i = 0
-      for (const v of check) {
-        let _checks = checks[i] ?? null
-        if (isRegExp(v) || includes(typeof v)(["string", "boolean"])) {
-          _checks = mergeChecks(_checks, isData(v, res), v)
-        } else {
-          const checks2 = {}
-          for (const k in v ?? {}) {
-            checks2[k] = checkTag(res, k, v[k])
-          }
-          _checks = mergeChecks(_checks, checks2, v)
-        }
-        checks[i] = _checks
-        i++
-      }
-      if (!isCheckComplete(checks, check)) err = "something went wrong"
+      if (!allChecked(check, res)) err = "something went wrong"
       if (!err && !isNil(get)) out = getTagVal(get, res)
     } catch (e) {
       err = e

package/esm/aoconnect.js

@@ -105,6 +105,7 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
     let ex = false
     for (let v of opt.tags) if (v.name === "Type") ex = true
     if (!ex) opt.tags.push({ name: "Type", value: "Process" })
+    if (opt.for) opt.tags.push({ name: "Pushed-For", value: opt.for })
     const {
       id,
       owner,
@@ -306,6 +307,7 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
       for (const v of res.Messages ?? []) {
         if (await mem.get("env", v.Target)) {
           await message({
+            for: opt.message,
             process: v.Target,
             tags: v.Tags,
             data: v.Data,
@@ -317,6 +319,7 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
       for (const v of res.Spawns ?? []) {
         const __tags = tags(v.Tags)
         await spawn({
+          for: opt.message,
           module: __tags.Module,
           scheduler,
           tags: v.Tags,
@@ -361,6 +364,14 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
           SDK: "aoconnect",
         }),
       )
+      if (opt.for) {
+        opt.tags.push({ name: "Pushed-For", value: opt.for })
+        opt.tags.push({ name: "From-Process", value: opt.from })
+        const pr = (await mem.get("txs", opt.from))?.tags ?? []
+        const module = tags(pr).Module
+        if (module) opt.tags.push({ name: "From-Module", value: module })
+      }
+
       ;({ item, id, owner } = await ar.dataitem({
         data: opt.data,
         signer: opt.signer,
@@ -404,7 +415,7 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
     spawn,
     assign,
     ar,
-    result: async opt => (await mem.get("env", opt.process)).res[opt.message],
+    result: async opt => (await mem.get("env", opt.process))?.res[opt.message],
     results: async opt => {
       const p = await mem.get("env", opt.process)
       let results = []

package/esm/utils.js

@@ -1,6 +1,6 @@
 import { graphql, parse, validate, buildSchema } from "graphql"
 
-import { clone, is, includes, fromPairs, map, isNil } from "ramda"
+import { clone, is, includes, fromPairs, map, isNil, equals } from "ramda"
 
 const allows = [
   { key: "allowed", val: "Allowed" },
@@ -86,6 +86,8 @@ const isData = (data, res) => {
       try {
         if (data.test(v.Data)) return true
       } catch (e) {}
+    } else if (typeof data === "function") {
+      return data(v.Data)
     } else {
       if (data === true || v.Data === data) return true
     }
@@ -149,6 +151,7 @@ const modGet = get => {
   } else if (
     is(Object, get) &&
     isNil(get.data) &&
+    isNil(get.from) &&
     isNil(get.json) &&
     isNil(get.name) &&
     isNil(get.obj)
@@ -158,23 +161,32 @@ const modGet = get => {
   return _get
 }
 
-const _getTagVal = (get, res) => {
+const _getTagVal = (get, res, from) => {
   let out = null
   const _get = modGet(get)
   if (typeof _get === "object" && _get.obj) {
     out = {}
-    for (const k in _get.obj ?? {}) out[k] = _getTagVal(_get.obj[k], res)
+    for (const k in _get.obj ?? {}) out[k] = _getTagVal(_get.obj[k], res, from)
   } else {
     for (const v of res.Messages ?? []) {
+      if (typeof _get === "object" && isNil(_get.name) && isNil(_get.data)) {
+        _get.data = true
+      }
       if (
         (typeof _get === "object" && _get.data) ||
         typeof _get === "boolean"
       ) {
+        let _from = null
+        if (is(Object, _get) && _get.from) _from = _get.from
+        if (_from && _from !== from) break
         if (v.Data) out = v.Data
         try {
           if (_get.json || _get === true) out = JSON.parse(out)
         } catch (e) {}
       } else if (typeof _get === "object" && typeof _get.name === "string") {
+        let _from = null
+        if (is(Object, _get) && _get.from) _from = _get.from
+        if (_from && _from !== from) break
         out = getTag(v.Tags ?? [], _get.name)
         try {
           if (_get.json) out = JSON.parse(out)
@@ -186,9 +198,9 @@ const _getTagVal = (get, res) => {
   return out
 }
 
-const getTagVal = (get, res) => {
+const getTagVal = (get, res, from) => {
   const _get = modGet(get)
-  return _getTagVal(_get, res)
+  return _getTagVal(_get, res, from)
 }
 
 const srcs = {
@@ -218,7 +230,7 @@ const buildTags = (act, tags) => {
 
 const mergeOut = (out, out2, get) => {
   const _get = modGet(get)
-  if (_get.obj) {
+  if (_get?.obj) {
     for (const k in out2 ?? {}) {
       if (isNil(out?.[k])) {
         if (!out) out = {}
@@ -243,27 +255,20 @@ const isOutComplete = (out, get) => {
   if (isNil(get)) return true
   if (isNil(out)) return false
   const _get = modGet(get)
-  if (_get.obj) {
-    for (const k in out ?? {}) {
-      if (isNil(out[k])) return false
-    }
-  }
+  if (_get.obj) for (const k in out ?? {}) if (isNil(out[k])) return false
   return true
 }
 
 const isCheckComplete = (checks, check) => {
   let i = 0
-  for (const v of checks) {
+  for (const v of checks || []) {
+    if (!v) return false
     if (
       isRegExp(check[i]) ||
       includes(typeof check[i])(["string", "boolean"])
     ) {
       if (!v) return false
-    } else {
-      for (const k in v) {
-        if (!v[k]) return false
-      }
-    }
+    } else for (const k in v) if (!v[k]) return false
     i++
   }
   return true
@@ -534,7 +539,91 @@ const optServer = port => {
   return { ar: port, mu: port + 2, su: port + 3, cu: port + 4 }
 }
 
+const allChecked = (check, res, from) => {
+  let checks = []
+  let i = 0
+  for (let v of check || []) {
+    let _checks = checks[i] ?? null
+    if (isRegExp(v) || includes(typeof v)(["string", "boolean", "function"])) {
+      _checks = isData(v, res)
+    } else {
+      const _checkVal = (val, data) => {
+        if (isRegExp(val)) {
+          try {
+            if (val.test(data)) return true
+          } catch (e) {}
+        } else if (typeof val === "function") {
+          return val(data)
+        } else if (typeof val === "object" && !isNil(val.json)) {
+          try {
+            data = JSON.parse(data)
+            if (typeof val.json === "function") {
+              return val.json(data)
+            } else if (typeof val.json === "object") {
+              if (val.eq) return equals(data, val.json)
+              let ok = true
+              for (let k in val.json) {
+                if (!_checkVal(val.json[k], data[k])) {
+                  ok = false
+                  break
+                }
+              }
+              return ok
+            } else if (val.json === true) {
+              return true
+            }
+          } catch (e) {
+            return false
+          }
+        } else {
+          if (val === true || data === val) return true
+        }
+        return false
+      }
+      const checkVal = (res, val, name) => {
+        for (let v of res.Messages || []) {
+          let data = v.Data
+          if (!isNil(name)) {
+            const t = tags(v.Tags || [])
+            data = t[name]
+          }
+          if (isNil(data)) return false
+          return _checkVal(val, data)
+        }
+        return false
+      }
+
+      if (typeof v === "object") {
+        if (!isNil(v.json)) {
+          const _from = v.from
+          v = { data: v, from: _from }
+        } else if (isNil(v.tags) && isNil(v.data) && isNil(v.from)) {
+          v = { tags: v }
+        }
+        const _from = v.from ?? null
+        let checks2 = {}
+        if (!isNil(v.from) && v.from !== from) {
+          _checks = false
+        } else {
+          let ok = true
+          if (!isNil(v.data)) {
+            if (!checkVal(res, v.data)) ok = false
+          }
+          for (const k in v.tags ?? {}) {
+            if (!checkVal(res, v.tags[k], k)) ok = false
+          }
+          _checks = ok
+        }
+      }
+    }
+    checks[i] = _checks
+    i++
+  }
+  return isCheckComplete(checks, check)
+}
+
 export {
+  allChecked,
   optAO,
   optServer,
   toGraphObj,

package/package.json

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