wiki-plugin-mech 0.1.15 → 0.1.17

package/client/mech.js

@@ -237,8 +237,8 @@
         story.push(...state.items)
         break
       case 'synopsis':
-        {const text = `This page has been generated by the Mech plugin. We want to tell you where. That's coming soon.`
-        story.push({type:'paragraph',text})}
+        {const text = `This page created with Mech command: "${command}". See [[${state.context.title}]].`
+        story.push({type:'paragraph',text,id:state.context.itemId})}
         break
       default:
         return trouble(elem,`"${type}" doesn't name an item we can preview`)
@@ -246,6 +246,10 @@
     }
     const title = "Mech Preview" + (state.tick ? ` ${state.tick}` : '')
     const page = {title,story}
+    for (const item of page.story) item.id ||= (Math.random()*10**20).toFixed(0)
+    const item = JSON.parse(JSON.stringify(page))
+    const date = Date.now()
+    page.journal = [{type:'create', date, item}]
     const options = {$page:$(elem.closest('.page'))}
     wiki.showResult(wiki.newPage(page), options)
   }
@@ -495,6 +499,32 @@
     return Promise.all(children)
   }
 
+  // http://localhost:3000/plugin/mech/run/testing-mechs-synchronization/5e269010fc81aebe?args=WyJoZWxsbyIsIndvcmxkIl0
+  async function get_emit({elem,command,args,body,state}) {
+    if (!body) return trouble(elem,`GET expects indented commands to run on the server.`)
+    const site = state.context.site
+    const slug = state.context.slug
+    const itemId = state.context.itemId
+    const query = `args=${btoa(JSON.stringify(body))}`
+    const url = `//${site}/plugin/mech/run/${slug}/${itemId}?${query}`
+    elem.innerHTML = command + ` ⇒ in progress`
+    const start = Date.now()
+    let result
+    try {
+      result = await fetch(url).then(res => res.ok ? res.json() : res.status)
+    } 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`
+  }
+
 
 // C A T A L O G
 
@@ -517,7 +547,8 @@
     SHOW:    {emit:show_emit},
     RANDOM:  {emit:random_emit},
     SLEEP:   {emit:sleep_emit},
-    TOGETHER:{emit:together_emit}
+    TOGETHER:{emit:together_emit},
+    GET:     {emit:get_emit}
   }
 
 
@@ -527,7 +558,19 @@
     const lines = item.text.split(/\n/)
     const nest = tree(lines,[],0)
     const html = format(nest)
-    const state = {}
+    const $page = $item.parents('.page')
+    const pageKey = $page.data("key")
+    const context = {
+      item,
+      itemId: item.id,
+      pageKey,
+      page: wiki.lineup.atKey(pageKey).getRawPage(),
+      origin: window.origin,
+      site: $page.data("site") || window.location.host,
+      slug: $page.attr("id"),
+      title: $page.data("data").title,
+    }
+    const state = {context}
     $item.append(`<div style="background-color:#eee;padding:15px;border-top:8px;">${html}</div>`)
     run(nest,state)
   }

package/package.json

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

package/server/server.js

@@ -1,17 +1,99 @@
 // mech plugin, server-side component
 // These handlers are launched with the wiki server.
 
+
 (function() {
+
+  const fs = require('fs')
+  const process = require('process')
+
   function startServer(params) {
     var app = params.app,
         argv = params.argv
 
-    return app.get('/plugin/mech/:thing', (req, res) => {
-      var thing = req.params.thing;
-      return res.json({thing});
+    return app.get('/plugin/mech/run/:slug([a-z-]+)/:itemId', async (req, res) => {
+      console.log(req.params)
+      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,item,args});
+        // })
+        const context = {path}
+        const state = {context}
+        run(args,state)
+        return res.json({args,state})
+
+      } catch(err) {
+        return res.json({err:err.message})
+      }
     })
   }
 
+
+  // 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])
+          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)
+  }
+
+
+  // C A T A L O G
+
+  const blocks = {
+    HELLO:   {emit:hello_emit},
+    UPTIME:  {emit:uptime_emit}
+  }
+
+
   module.exports = {startServer}
 
 }).call(this)