wiki-plugin-mech 0.1.16 → 0.1.18

package/client/mech.js

@@ -236,6 +236,11 @@
         inspect(elem,'items',state)
         story.push(...state.items)
         break
+      case 'page':
+        if(!('page' in state)) return trouble(elem,`"page" preview expects "page" state, like from "FROM".`)
+        inspect(elem,'page',state)
+        story.push(...state.page.story)
+        break
       case 'synopsis':
         {const text = `This page created with Mech command: "${command}". See [[${state.context.title}]].`
         story.push({type:'paragraph',text,id:state.context.itemId})}
@@ -282,30 +287,42 @@
     state.aspect = [{id:item.dataset.id,result:aspects}]
   }
 
-  function tick_emit ({elem,args,body,state}) {
+  function tick_emit ({elem,command,args,body,state}) {
     if(elem.innerHTML.match(/button/)) return
     if (!body?.length) return trouble(elem,`TICK expects indented blocks to follow.`)
     const count = args[0] || '1'
     if (!count.match(/^[1-9][0-9]?$/)) return trouble(elem,`TICK expects a count from 1 to 99`)
     let clock = null
-    elem.innerHTML += '<button style="border-width:0;">▶</button>'
-    elem.querySelector('button').addEventListener('click',event => {
+    ready()
+    function ready () {
+      elem.innerHTML = command+'<button style="border-width:0;">▶</button>'
+      elem.querySelector('button').addEventListener('click',start)
+    }
+    function start (event) {
       state.debug = event.shiftKey
+      const status = ticks => {elem.innerHTML = command + ` ⇒ ${ticks} remaining`}
       if(clock){
         clock = clearInterval(clock)
         delete state.tick
       } else {
+        let working
         state.tick = +count
-        run(body,state)
+        status(state.tick)
+        working = true; run(body,state).then(() => working = false)
         clock = setInterval(()=>{
+          if(working) return
           if(state.debug) console.log({tick:state.tick})
-          if(('tick' in state) && --state.tick > 0)
-            run(body,state)
-          else
+          if(('tick' in state) && --state.tick > 0) {
+            status(state.tick)
+            working = true; run(body,state).then(() => working = false)
+          }
+          else {
             clock = clearInterval(clock)
+            ready()
+          }
         },1000)
       }
-    })
+    }
   }
 
   function until_emit ({elem,command,args,body,state}) {
@@ -450,7 +467,7 @@
         return trouble(elem,`SHOW expects a slug or site/slug to open in the lineup.`)
       }
     } else {
-      const info = args[0]
+      const info = args[0];
       [site,slug] = info.includes('/')
         ? info.split(/\//)
         : [null,info]
@@ -509,11 +526,19 @@
     const url = `//${site}/plugin/mech/run/${slug}/${itemId}?${query}`
     elem.innerHTML = command + ` ⇒ in progress`
     const start = Date.now()
+    let result
     try {
-      state.result = await fetch(url).then(res => res.ok ? res.json() : res.status)
+      result = await fetch(url).then(res => res.ok ? res.json() : res.status)
+      if('err' in result) return trouble(elem,`RUN received error "${result.err}"`)
     } catch(err) {
       return trouble(elem,`RUN failed with "${err.message}"`)
     }
+    state.result = result
+    for(const arg of result.args.flat(9)){
+      const elem = document.getElementById(arg.key)
+      if('status' in arg) elem.innerHTML = arg.command + ` ⇒ ${arg.status}`
+      if('trouble' in arg) trouble(elem,arg.trouble)
+    }
     const elapsed = ((Date.now() - start)/1000).toFixed(3)
     elem.innerHTML = command + ` ⇒ ${elapsed} seconds`
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-plugin-mech",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Federated Wiki - Mechanism Scripting Plugin",
   "keywords": [
     "mech",

package/server/server.js

@@ -11,26 +11,103 @@
     var app = params.app,
         argv = params.argv
 
-    return app.get('/plugin/mech/run/:slug([a-z-]+)/:itemId', (req, res) => {
+    return app.get('/plugin/mech/run/:slug([a-z-]+)/:itemId', (req, res, next) => {
       console.log(req.params)
-      const uptime = process.uptime()
       try {
         const slug = req.params.slug
         const itemId = req.params.itemId
         const args = JSON.parse(atob(req.query.args || 'W10='))
         const path = `${argv.db}/${slug}`
-        fs.readFile(path,(err,data) => {
-          const page = JSON.parse(data)
-          const item = page.story.find(item => item.id == itemId) || null
-          return res.json({err,uptime,item,args});
-        })
+        // fs.readFile(path,(err,data) => {
+        //   const page = JSON.parse(data)
+        //   const item = page.story.find(item => item.id == itemId) || null
+        //   return res.json({err,item,args});
+        // })
+        const context = {path}
+        const state = {context,debug:true}
+        run(args,state)
+          .then(() => {return res.json({args,state})})
+          .catch(err => {console.log(err); return res.json({err:err.message+' from promise'})})
       } catch(err) {
-        return res.json({err:err.message,uptime})
+        return res.json({err:err.message+' from try'})
       }
     })
+  }
+
+
+  // I N T E R P R E T E R
+
+  function status(elem,message) {
+    elem.status = message
+  }
+
+  function trouble(elem,message) {
+    elem.trouble = message
+  }
+
+  async function run (nest,state={},mock) {
+    // const scope = nest.slice()
+    // while (scope.length) {
+    for (let here = 0; here < nest.length; here++) {
+      // const code = scope.shift()
+      const code = nest[here]
+      if ('command' in code) {
+        const command = code.command
+        const elem = code
+        const [op, ...args] = code.command.split(/ +/)
+        const next = nest[here+1]
+        const body = next && ('command' in next) ? null : nest[++here]
+        const stuff = {command,op,args,body,elem,state}
+        if(state.debug) console.log(stuff)
+        if (blocks[op])
+          await blocks[op].emit.apply(null,[stuff])
+        else
+          if (op.match(/^[A-Z]+$/))
+            trouble(elem,`${op} doesn't name a block we know.`)
+          else if (code.command.match(/\S/))
+            trouble(elem, `Expected line to begin with all-caps keyword.`)
+      } else if(typeof code == 'array') {
+        console.warn(`this can't happen.`)
+        run(code,state) // when does this even happen?
+      }
+    }
+  }
+
+  // B L O C K S
 
+  function hello_emit ({elem,args,state}) {
+    const world = args[0] == 'world' ? ' 🌎' : ' 😀'
+    status(elem,world)
   }
 
+  function uptime_emit ({elem,args,state}) {
+    const uptime = process.uptime()
+    status(elem,uptime)
+  }
+
+  function sleep_emit ({elem,command,args,body,state}) {
+    let count = args[0] || '1'
+    if (!count.match(/^[1-9][0-9]?$/)) return trouble(elem,`SLEEP expects seconds from 1 to 99`)
+    return new Promise(resolve => {
+      if(body)
+        run(body,state)
+          .then(result => {if(state.debug) console.log(command,'children', result)})
+      setTimeout(() => {
+        resolve()
+      },1000*count)
+    })
+  }
+
+
+  // C A T A L O G
+
+  const blocks = {
+    HELLO:   {emit:hello_emit},
+    UPTIME:  {emit:uptime_emit},
+    SLEEP:   {emit:sleep_emit}
+  }
+
+
   module.exports = {startServer}
 
 }).call(this)