wao 0.2.2 → 0.2.4

package/esm/aoconnect.js

@@ -3,9 +3,9 @@ import base64url from "base64url"
 import AoLoader from "@permaweb/ao-loader"
 import { readFileSync } from "fs"
 import { resolve } from "path"
-import { is, clone, fromPairs, map, mergeLeft } from "ramda"
+import { is, clone, fromPairs, map, mergeLeft, isNil } from "ramda"
 import accounts from "./accounts.js"
-
+import { tags, action, tag, buildTags } from "./utils.js"
 function isJSON(obj) {
   if (obj === null || obj === undefined) return false
   if (
@@ -35,19 +35,10 @@ const dirname = async () =>
     ? __dirname
     : (await import("./dirname.js")).default
 
-const tags = tags => fromPairs(map(v => [v.name, v.value])(tags))
-const action = value => tag("Action", value)
-const tag = (name, value) => ({ name, value: jsonToStr(value) })
-
-const buildTags = (act, tags) => {
-  let _tags = []
-  if (act) _tags.push(action(act))
-  for (const k in tags) {
-    if (is(Array)(tags[k])) for (const v of tags[k]) _tags.push(tag(k, v))
-    else _tags.push(tag(k, tags[k]))
-  }
-  return _tags
-}
+export const acc = accounts.users
+export const mu = accounts.mu
+const scheduler = "GQ33BkPtZrqxA84vM8Zk-N2aO0toNNu_C-l-rawrBA"
+let env = {}
 
 export const connect = () => {
   let wasms = {
@@ -65,13 +56,12 @@ export const connect = () => {
     },
   }
   let modules = {
-    aos_2_0_1: "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM",
-    aos_1: "cNlipBptaF9JeFAf4wUmpi43EojNanIBos3EfNrEOWo",
+    aos2_0_1: "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM",
+    aos1: "cNlipBptaF9JeFAf4wUmpi43EojNanIBos3EfNrEOWo",
     sqlite: "ghSkge2sIUD_F00ym5sEimC63BDBuBrq4b5OcwxOjiw",
   }
   let modmap = {}
-  let env = { msgs: {} }
-  let mu = accounts.mu
+  let msgs = {}
   const transform = input => {
     const output = { Tags: [] }
     if (input.Data) output.Data = input.Data
@@ -158,12 +148,148 @@ export const connect = () => {
     return id
   }
 
+  const spawn = async (opt = {}) => {
+    if (!opt.module) throw Error("module missing")
+    if (!opt.scheduler) throw Error("scheduler missing")
+    let mod = opt.module ?? modules["aos2_0_1"]
+    if (!modmap[mod] && wasms[mod]) {
+      const __dirname = await dirname()
+      const wasm = readFileSync(
+        resolve(__dirname, `lua/${wasms[mod].file}.wasm`),
+      )
+      const handle = await AoLoader(wasm, { format: wasms[mod].format })
+      modmap[mod] = { handle, id: mod }
+    }
+    if (!mod) throw Error("module not found")
+    const _module = modmap[mod]
+    let ex = false
+    opt.tags ??= []
+    for (let v of opt.tags) if (v.name === "Type") ex = true
+    if (!ex) opt.tags.push({ name: "Type", value: "Process" })
+    const { id, owner } = await parse(opt)
+    const _tags = tags(opt.tags)
+    let res = null
+    let memory = null
+    let p = {
+      id: id,
+      handle: _module.handle,
+      module: _module.id,
+      memory,
+      owner,
+      height: 0,
+      res: { [id]: res },
+      results: [id],
+      txs: [],
+      opt,
+    }
+    if (_tags["On-Boot"]) {
+      let data = ""
+      if (_tags["On-Boot"] === "Data") data = opt.data ?? ""
+      else data = msgs[_tags["On-Boot"]]?.data ?? ""
+      let msg = genMsg(p, data, opt.tags, owner, mu.addr, true)
+      const _env = genEnv({
+        pid: p.id,
+        owner: p.owner,
+        module: p.module,
+        auth: mu.addr,
+      })
+
+      const _t = tags(msg.Tags)
+      res = await _module.handle(null, msg, _env)
+      p.memory = res.Memory
+      delete res.Memory
+      p.res[id] = res
+    } else {
+      p.height += 1
+    }
+    msgs[id] = opt
+    env[id] = p
+    if (_tags["Cron-Interval"]) {
+      let [num, unit] = _tags["Cron-Interval"].split("-")
+      let int = 0
+      switch (unit.replace(/s$/, "")) {
+        case "millisecond":
+          int = num
+          break
+        case "second":
+          int = num * 1000
+          break
+        case "minute":
+          int = num * 1000 * 60
+          break
+        case "hour":
+          int = num * 1000 * 60 * 60
+          break
+        case "day":
+          int = num * 1000 * 60 * 60 * 24
+          break
+        case "month":
+          int = num * 1000 * 60 * 60 * 24 * 30
+          break
+        case "year":
+          int = num * 1000 * 60 * 60 * 24 * 365
+          break
+      }
+      let cronTags = []
+      for (const k in _tags) {
+        if (/^Cron-Tag-/.test(k)) {
+          cronTags.push({ name: k.replace(/Cron-Tag-/, ""), value: _tags[k] })
+        }
+      }
+      env[id].cronTags = cronTags
+      env[id].span = int
+    }
+    return id
+  }
+
+  const assign = async opt => {
+    const p = env[opt.process]
+    let _opt = clone(msgs[opt.message])
+    const { id, owner } = await parse(_opt)
+    try {
+      const msg = genMsg(
+        p,
+        _opt.data ?? "",
+        _opt.tags,
+        _opt.from ?? owner,
+        mu.addr,
+      )
+      const _env = genEnv({
+        pid: p.id,
+        owner: p.owner,
+        module: p.module,
+        auth: mu.addr,
+      })
+      const res = await p.handle(p.memory, msg, _env)
+      p.memory = res.Memory
+      delete res.Memory
+      p.res[id] = res
+      p.results.push(id)
+      p.txs.unshift({ id: id, ..._opt })
+      msgs[id] = _opt
+      for (const v of res.Messages ?? []) {
+        if (env[v.Target]) {
+          await message({
+            process: v.Target,
+            tags: v.Tags,
+            data: v.Data,
+            signer: mu.signer,
+            from: opt.process,
+          })
+        }
+      }
+      return id
+    } catch (e) {
+      console.log(e)
+    }
+    return null
+  }
+
   const message = async opt => {
     const p = env[opt.process]
     let ex = false
-    for (let v of opt.tags) {
-      if (v.name === "Type") ex = true
-    }
+    for (let v of opt.tags) if (v.name === "Type") ex = true
+
     if (!ex) opt.tags.push({ name: "Type", value: "Message" })
     const { id, owner } = await parse(opt)
     try {
@@ -186,7 +312,7 @@ export const connect = () => {
       p.res[id] = res
       p.results.push(id)
       p.txs.unshift({ id: id, ...opt })
-      env.msgs[id] = opt
+      msgs[id] = opt
       for (const v of res.Messages ?? []) {
         if (env[v.Target]) {
           await message({
@@ -198,98 +324,66 @@ export const connect = () => {
           })
         }
       }
+      for (const v of res.Spawns ?? []) {
+        const _tags = tags(v.Tags)
+        await spawn({
+          module: _tags.Module,
+          scheduler,
+          tags: v.Tags,
+          data: v.Data,
+          from: _tags["From-Process"],
+          signer: mu.signer,
+        })
+      }
+      for (const v of res.Assignments ?? []) {
+        for (const v2 of v.Processes) {
+          await assign({
+            message: v.Message,
+            process: v2,
+            from: opt.process,
+            signer: mu.signer,
+          })
+        }
+      }
       return id
     } catch (e) {
       console.log(e)
     }
     return null
   }
-
   return {
-    scheduler: "GQ33BkPtZrqxA84vM8Zk-N2aO0toNNu_C-l-rawrBA",
+    scheduler,
     modules,
-    accounts: accounts.users,
+    accounts: acc,
+    mu,
     message,
+    unmonitor: async opt => {
+      const p = env[opt.process]
+      try {
+        clearInterval(p.cron)
+        p.cron = null
+      } catch (e) {}
+    },
+    monitor: async opt => {
+      const p = env[opt.process]
+      if (isNil(p.cron)) {
+        p.cron = setInterval(async () => {
+          await message({
+            tags: p.cronTags,
+            process: opt.process,
+            signer: mu.signer,
+            from: mu.addr,
+          })
+        }, p.span)
+      }
+    },
     txs: async pid => {
       let _txs = []
       for (let v of env[pid].txs) _txs.push({ tags: v.tags, id: v.id })
       return _txs
     },
-    spawn: async (opt = {}) => {
-      if (!opt.module) throw Error("module.missing")
-      if (!opt.scheduler) throw Error("scheduler.missing")
-      let mod = opt.module ?? modules["aos_2_0_1"]
-      if (!modmap[mod] && wasms[mod]) {
-        const __dirname = await dirname()
-        const wasm = readFileSync(
-          resolve(__dirname, `lua/${wasms[mod].file}.wasm`),
-        )
-        const handle = await AoLoader(wasm, { format: wasms[mod].format })
-        modmap[mod] = { handle, id: mod }
-      }
-      if (!mod) throw Error("module not found")
-      const _module = modmap[mod]
-      let ex = false
-      opt.tags ??= []
-      for (let v of opt.tags) if (v.name === "Type") ex = true
-      if (!ex) opt.tags.push({ name: "Type", value: "Process" })
-      const { id, owner } = await parse(opt)
-      env.msgs[id] = opt
-      env[id] = {
-        id: id,
-        handle: _module.handle,
-        module: _module.id,
-        memory: null,
-        owner,
-        height: 1,
-        res: { id: null },
-        results: [id],
-        txs: [],
-      }
-      return id
-    },
-    assign: async opt => {
-      const p = env[opt.process]
-      let _opt = clone(env.msgs[opt.message])
-      const { id, owner } = await parse(_opt)
-      try {
-        const msg = genMsg(
-          p,
-          _opt.data ?? "",
-          _opt.tags,
-          _opt.from ?? owner,
-          mu.addr,
-        )
-        const _env = genEnv({
-          pid: p.id,
-          owner: p.owner,
-          module: p.module,
-          auth: mu.addr,
-        })
-        const res = await p.handle(p.memory, msg, _env)
-        p.memory = res.Memory
-        delete res.Memory
-        p.res[id] = res
-        p.results.push(id)
-        p.txs.unshift({ id: id, ..._opt })
-        env.msgs[id] = _opt
-        for (const v of res.Messages ?? []) {
-          if (env[v.Target]) {
-            await message({
-              process: v.Target,
-              tags: v.Tags,
-              data: v.Data,
-              signer: mu.signer,
-              from: opt.process,
-            })
-          }
-        }
-        return id
-      } catch (e) {
-        console.log(e)
-      }
-      return null
-    },
+    spawn,
+    assign,
     result: async opt => env[opt.process].res[opt.message],
     results: async opt => {
       const p = env[opt.process]
@@ -327,5 +421,6 @@ export const connect = () => {
       }
       return null
     },
+    getProcesses: () => env,
   }
 }

package/esm/ar.js

@@ -27,6 +27,7 @@ class AR {
     if (!jwk && typeof window === "object") jwk = window.arweaveWallet
     if (!jwk) isGen = true
     else {
+      jwk = typeof jwk?.jwk === "object" ? jwk.jwk : jwk
       this.jwk = jwk
       const isWallet = this.isArConnect(this.jwk)
       if (isWallet) {
@@ -60,6 +61,7 @@ class AR {
   }
 
   async checkWallet({ jwk } = {}) {
+    let start = Date.now()
     if (jwk) return { err: null, jwk }
     let [err, addr, pub] = [null, null, null]
     let existWallet = typeof window === "object" && window.arweaveWallet

package/esm/helpers.js

@@ -1,6 +1,4 @@
-import { connect as tconnect } from "./aoconnect.js"
 import { AR } from "./index.js"
-import AO from "./tao.js"
 import assert from "assert"
 import { createDataItemSigner, connect } from "@permaweb/aoconnect"
 import { dirname as _dirname, resolve } from "path"
@@ -110,6 +108,7 @@ export const setup = async ({
     url: "http://su",
     overwrite: true,
   })
+
   opt.ao = {
     module: module_sqlite,
     scheduler,
@@ -161,5 +160,3 @@ export const fail = obj => {
   assert.notEqual(obj.err, null)
   return obj
 }
-
-export { AO, AR, tconnect as connect }

package/esm/tao.js

@@ -16,9 +16,11 @@ class AO extends MAO {
       message,
       spawn,
       dryrun,
+      monitor,
+      unmonitor,
       txs,
     } = connect()
-    this.module = modules.aos_2_0_1
+    this.module = modules.aos2_0_1
     this.assign = assign
     this.result = result
     this.results = results
@@ -26,6 +28,8 @@ class AO extends MAO {
     this.spawn = spawn
     this.dryrun = dryrun
     this.ar.txs = txs
+    this.monitor = monitor
+    this.unmonitor = unmonitor
     this.accounts = accounts
   }
 

package/esm/test.js

@@ -0,0 +1,3 @@
+import { connect, acc, mu } from "./aoconnect.js"
+import AO from "./tao.js"
+export { AO, connect, acc, mu }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "",
   "main": "cjs/index.js",
   "module": "esm/index.js",