wiki-plugin-mech 0.1.2 → 0.1.3

package/client/mech.js

@@ -36,9 +36,9 @@
       for (part of more) {
         const key = `${unique}.${path.join('.')}`
         part.key = key
-        if(part.command)
+        if('command' in part)
           html.push(`<span id=${key}>${expand(part.command)}</span>`)
-        else if(typeof part == 'array')
+        else
           html.push(`<div id=${key} style="padding-left:15px">${block(part,[...path,0])}</div>  `)
         path[path.length-1]++
       }
@@ -53,47 +53,91 @@
       elem.outerHTML += `<span style="width:80%;color:gray;">${message}</span>` })
   }
 
-  function click_emit (elem) {
+  function click_emit ({elem,body,state}) {
     if(elem.innerHTML.match(/button/)) return
-    const body = this
-    if (!body.length) return trouble(elem,'CLICK expects indented blocks to follow.')
+    if (!body?.length) return trouble(elem,'CLICK expects indented blocks to follow.')
     elem.innerHTML += '<button style="border-width:0;">◉</button>'
-    elem.querySelector('button').addEventListener('click',event => run(this))
+    elem.querySelector('button').addEventListener('click',event => run(body,state))
   }
 
-  function click_bind (elem) {
-  }  
-
-  function hello_emit (elem,what) {
-    const want = what == 'world' ? ' 🌎' : ' 😀'
+  function hello_emit ({elem,args}) {
+    const want = args[0] == 'world' ? ' 🌎' : ' 😀'
     elem.innerHTML += want
   }
 
-  function hello_bind (elem) {
+  function from_emit ({elem,args,body,state}) {
+    const line = elem.innerHTML
+    elem.innerHTML = line + ' ⏳'
+    fetch(`//${args[0]}.json`)
+      .then(res => res.json())
+      .then(page => {
+        state.page = page
+        elem.innerHTML = line + ' ⌛'
+        run(body,state)
+      })
+  }
+
+  function sensor_emit ({elem,args,body,state}) {
+    const line = elem.innerHTML.replaceAll(/ ⌛/g,'')
+    if(!('page' in state)) return trouble(elem,`Expect "page" as with FROM.`)
+    const datalog = state.page.story.find(item => item.type == 'datalog')
+    if(!datalog) return trouble(elem, `Expect Datalog plugin in the page.`)
+    const want = args[0]
+    if(!want) return trouble(elem, 'SENSOR needs a sensor name.')
+    const sensor = datalog.text.split(/\n/)
+      .map(line => line.split(/ +/))
+      .filter(fields => fields[0] == 'SENSOR')
+      .find(fields => fields[1] == want)
+    if(!sensor) return trouble(elem, `Expect to find "${want}" in Datalog.`)
+    const url = sensor[2]
+
+    const f = c => 9/5*(c/16)+32
+    const avg = a => a.reduce((s,e)=>s+e,0)/a.length
+    elem.innerHTML = line + ' ⏳'
+    fetch(url)
+      .then (res => res.json())
+      .then (data => {
+        elem.innerHTML = line + ' ⌛'
+        const value = f(avg(Object.values(data)))
+        state.temperature = `${value.toFixed(2)}°F`
+        run(body,state)
+      })
+  }
+
+  function report_emit ({elem,command,state}) {
+    const value = state?.temperature
+    if (!value) return trouble(elem,`Expect data, as from SENSOR.`)
+    elem.innerHTML = command + `<br><font face=Arial size=32>${value}</font>`
   }
 
   const blocks = {
-    CLICK: {emit:click_emit, bind:click_bind},
-    HELLO: {emit:hello_emit, bind:hello_bind}
+    CLICK: {emit:click_emit, bind:null},
+    HELLO: {emit:hello_emit, bind:null},
+    FROM: {emit:from_emit, bind:null},
+    SENSOR:  {emit:sensor_emit, bind:null},
+    REPORT:  {emit:report_emit, bind:null}
   }
 
-  function run (nest) {
+  function run (nest,state={}) {
     const scope = nest.slice()
     while (scope.length) {
       const code = scope.shift()
-      if (code.command) {
+      if ('command' in code) {
+        const command = code.command
         const elem = document.getElementById(code.key)
         const [op, ...args] = code.command.split(/ +/)
-        const more = scope[0]?.command ? null : scope.shift()
+        const next = scope[0]
+        const body = next && ('command' in next) ? null : scope.shift()
+        const stuff = {command,op,args,body,elem,state}
         if (blocks[op])
-          blocks[op].emit.apply(more||[],[elem,...args])
+          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') {
-        run(code)
+        run(code,state)
       }
     }
   }

package/factory.json

@@ -1,5 +1,5 @@
 {
   "name": "Mech",
-  "title": "Mech Plugin",
+  "title": "Script Mechanisms",
   "category": "other"
 }

package/package.json

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