wiki-plugin-mech 0.1.17 → 0.1.19

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]
@@ -505,18 +522,19 @@
     const site = state.context.site
     const slug = state.context.slug
     const itemId = state.context.itemId
-    const query = `args=${btoa(JSON.stringify(body))}`
+    const query = `mech=${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)
+      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)){
+    for(const arg of result.mech.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)

package/package.json

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

package/server/server.js

@@ -5,31 +5,31 @@
 (function() {
 
   const fs = require('fs')
+  const path = require('path')
   const process = require('process')
 
   function startServer(params) {
     var app = params.app,
         argv = params.argv
 
-    return app.get('/plugin/mech/run/:slug([a-z-]+)/:itemId', async (req, res) => {
+    return app.get('/plugin/mech/run/:slug([a-z-]+)/:itemId', (req, res, next) => {
       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}`
+        const mech = JSON.parse(atob(req.query.mech || 'W10='))
         // 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});
+        //   return res.json({err,item,mech});
         // })
-        const context = {path}
+        const context = {argv,slug}
         const state = {context}
-        run(args,state)
-        return res.json({args,state})
-
+        run(mech,state)
+          .then(() => {delete state.context; return res.json({mech,state})})
+          .catch(err => {console.log(err); return res.json({err:err.message+' from promise'})})
       } catch(err) {
-        return res.json({err:err.message})
+        return res.json({err:err.message+' from try'})
       }
     })
   }
@@ -60,7 +60,7 @@
         const stuff = {command,op,args,body,elem,state}
         if(state.debug) console.log(stuff)
         if (blocks[op])
-          blocks[op].emit.apply(null,[stuff])
+          await blocks[op].emit.apply(null,[stuff])
         else
           if (op.match(/^[A-Z]+$/))
             trouble(elem,`${op} doesn't name a block we know.`)
@@ -85,12 +85,52 @@
     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)
+    })
+  }
+
+  async function commons_emit ({elem,args,state}) {
+    const readdir = dir => new Promise((res,rej) =>
+      fs.readdir(dir,(e,v) => e ? rej(e) : res(v)));
+    const stat = file => new Promise((res,rej) =>
+      fs.stat(file,(e,v) => e ? rej(e) : res(v)));
+    const tally = async dir => {
+      const count = {files:0,bytes:0}
+      const items = await readdir(dir)
+      for(const item of items) {
+        const itemPath = path.join(dir, item)
+        const stats = await stat(itemPath)
+        if (state.debug) console.log({itemPath,stats})
+        if (stats.isFile()) {
+          count.files++
+          count.bytes+=stats.size
+        }
+      }
+      return count
+    }
+    const all = await tally(state.context.argv.commons)
+    const here = await tally(path.join(state.context.argv.data,'assets','plugins','image'))
+    state.commons = {all,here}
+    status(elem,`${(all.bytes/1000000).toFixed(3)} mb in ${all.files} files`)
+  }
+
 
   // C A T A L O G
 
   const blocks = {
     HELLO:   {emit:hello_emit},
-    UPTIME:  {emit:uptime_emit}
+    UPTIME:  {emit:uptime_emit},
+    SLEEP:   {emit:sleep_emit},
+    COMMONS: {emit:commons_emit}
   }