wiki-plugin-mech 0.1.25 → 0.1.27

package/client/mech.js

@@ -2,6 +2,7 @@
 (function() {
   "use strict"
   const uniq = (value, index, self) => self.indexOf(value) === index
+  const delay = time => new Promise(res => setTimeout(res,time))
 
   function expand(text) {
     return text
@@ -274,8 +275,9 @@
   function walk_emit ({elem,command,args,state}) {
     if(!('neighborhood' in state)) return trouble(elem,`WALK expects state.neighborhood, like from NEIGHBORS.`)
     inspect(elem,'neighborhood',state)
-    const way = (command.match(/\b(steps|days|weeks|months|hubs)\b/) || ['steps'])[0]
-    const steps = walks(way,state.neighborhood)
+    const [,count,way] = command.match(/\b(\d+)? *(steps|days|weeks|months|hubs)\b/) || []
+    if(!way && command != 'WALK') return trouble(elem, `WALK can't understand rest of this block.`)
+    const steps = walks(count,way,state.neighborhood)
     const aspects = steps.filter(({graph})=>graph)
     if(state.debug) console.log({steps})
     elem.innerHTML = command
@@ -283,10 +285,16 @@
     elem.innerHTML += ` ⇒ ${aspects.length} aspects, ${nodes.length} nodes`
     if(steps.find(({graph}) => !graph)) trouble(elem,`WALK skipped sites with no links in sitemaps`)
     const item = elem.closest('.item')
-    item.classList.add('aspect-source')
-    item.aspectData = () => aspects
-    if (aspects.length)
-      state.aspect = [...(state.aspect||[]), {id:item.dataset.id,result:aspects}]
+    if (aspects.length) {
+      state.aspect = state.aspect || []
+      const obj = state.aspect.find(obj => obj.id == elem.id)
+      if(obj) obj.result = aspects
+      else state.aspect.push({id:elem.id, result:aspects, source:command})
+      item.classList.add('aspect-source')
+      item.aspectData = () => state.aspect.map(obj => obj.result).flat()
+      if(state.debug) console.log({command,state:state.aspect,item:item.aspectData()})
+
+    }
   }
 
   function tick_emit ({elem,command,args,body,state}) {
@@ -668,6 +676,43 @@
     elem.innerHTML = command + ` ⇒ sent`
   }
 
+  async function solo_emit({elem,command,state}) {
+    if(!('aspect' in state)) return trouble(elem,`"SOLO" expects "aspect" state, like from "WALK".`)
+    inspect(elem,'aspect',state)
+    elem.innerHTML = command
+    const todo = state.aspect.map(each => ({
+      source:each.source || each.id,
+      aspects:each.result
+    }))
+    const aspects = todo.reduce((sum,each) => sum+each.aspects.length, 0)
+    elem.innerHTML += ` ⇒ ${todo.length} sources, ${aspects} aspects`
+
+    // from Solo plugin, client/solo.js
+    const pageKey = elem.closest('.page').dataset.key
+    const doing = {type:'batch', sources:todo, pageKey}
+    console.log({pageKey,doing})
+
+    if (typeof window.soloListener == "undefined" || window.soloListener == null) {
+      console.log('**** Adding solo listener')
+      window.soloListener = soloListener
+      window.addEventListener("message", soloListener)
+    }
+
+    await delay(750)
+    const popup = window.open('/plugins/solo/dialog/#','solo','popup,height=720,width=1280')
+    if (popup.location.pathname != '/plugins/solo/dialog/'){
+      console.log('launching new dialog')
+      popup.addEventListener('load', event => {
+        console.log('launched and loaded')
+        popup.postMessage(doing, window.origin)
+      })
+    }
+    else {
+      console.log('reusing existing dialog')
+      popup.postMessage(doing, window.origin)
+    }
+  }
+
 
 // C A T A L O G
 
@@ -696,7 +741,8 @@
     ROSTER:  {emit:roster_emit},
     LINEUP:  {emit:lineup_emit},
     LISTEN:  {emit:listen_emit},
-    MESSAGE: {emit:message_emit}
+    MESSAGE: {emit:message_emit},
+    SOLO:    {emit:solo_emit}
   }
 
 
@@ -779,21 +825,25 @@
   }
 
   // inspired by aspects-of-recent-changes/roster-graphs.html
-  function walks(way,neighborhood) {
+  function walks(count,way='steps',neighborhood) {
+    const find = slug => neighborhood.find(info => info.slug == slug)
     const prob = n => Math.floor(n * Math.abs(Math.random()-Math.random()))
     const rand = a => a[prob(a.length)]
+    const good = info => info.links && Object.keys(info.links).length < 10
+    const back = slug => neighborhood.filter(info => good(info) && slug in info.links)
+    const newr = infos => infos.toSorted((a,b)=>b.date-a.date).slice(0,3)
     const domains = neighborhood
       .map(info => info.domain)
       .filter(uniq)
     switch(way) {
-      case 'steps': return steps()
-      case 'days': return periods(1)
-      case 'weeks': return periods(7)
-      case 'months': return periods(30)
-      case 'hubs': return hubs()
+      case 'steps': return steps(count)
+      case 'days': return periods(way,1,count)
+      case 'weeks': return periods(way,7,count)
+      case 'months': return periods(way,30,count)
+      case 'hubs': return hubs(count)
     }
 
-    function steps() {
+    function steps(count=5) {
       return domains.map(domain => {
         const name = domain.split('.').slice(0,3).join('.')
         const done = new Set()
@@ -802,7 +852,6 @@
         const here = neighborhood
           .filter(info => info.domain==domain && ('links' in info))
         if(!here.length) return {name,graph:null}
-        const find = slug => neighborhood.find(info => info.slug == slug)
         const node = info => {
           nid = graph.addNode('',{
             name:info.title.replaceAll(/ /g,"\n"),
@@ -829,58 +878,74 @@
       })
     }
 
-    function periods(days) {
+    function periods(way,days,count=12) {
       const interval = days*24*60*60*1000
-      const iota = [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14]
+      const iota = [...Array(Number(count)).keys()]
       const dates = iota.map(n => Date.now()-n*interval)
       const aspects = []
       for(const stop of dates) {
         const start = stop-interval
-        const name = new Date(stop).toLocaleDateString()
-        // const done = new Set()
-        const graph = new Graph()
-        const find = slug => neighborhood.find(info => info.slug == slug)
-        const node = info => {
-          return graph.addUniqNode('',{
-            name:info.title.replaceAll(/ /g,"\n"),
-            title:info.title,
-            site:info.domain
-          })
-        }
+        const name = `${way.replace(/s$/,'')} ${new Date(start).toLocaleDateString()}`
         const here = neighborhood
           .filter(info => info.date < stop && info.date >= start)
           .filter(info => !(info.links && Object.keys(info.links).length > 5))
         if(here.length) {
-          for (const info of here) {
-            const nid = node(info)
-            for (const link in (info.links||{})) {
-              const linked = find(link)
-              if(linked)
-                graph.addRel('',nid,node(linked))
+          const domains = here.reduce((set,info) => {set.add(info.domain); return set}, new Set())
+          for (const domain of domains) {
+            const graph = new Graph()
+            const node = info => {
+              return graph.addUniqNode('',{
+                name:info.title.replaceAll(/ /g,"\n"),
+                title:info.title,
+                site:info.domain,
+                date:info.date
+              })
+            }
+            const author = domain.split(/\.|\:/)[0]
+            for (const info of here.filter(info => info.domain == domain)) {
+              const nid = node(info)
+              for (const link in (info.links||{})) {
+                const linked = find(link)
+                if(linked)
+                  graph.addRel('',nid,node(linked))
+              }
             }
+            aspects.push({name:`${name} ${author}`,graph})
           }
-          aspects.push({name,graph})
         }
       }
       return aspects
     }
 
-    function hubs() {
+    function hubs(count=12) {
       const aspects = []
+      const ignored = new Set()
       const hits = {}
       for (const info of neighborhood)
         if(info.links)
-          for(const link in info.links)
-            hits[link] = (hits[link]||0) + 1
+          if(Object.keys(info.links).length <= 15) {
+            for(const link in info.links)
+              if(find(link))
+                hits[link] = (hits[link]||0) + 1
+          } else {
+            ignored.add(info.slug)
+          }
+      if(ignored.size > 0)
+        console.log('hub links ignored for large pages:',[...ignored])
       const hubs = Object.entries(hits)
         .sort((a,b) => b[1]-a[1])
-        .slice(0,10)
+        .slice(0,count)
       console.log({hits,hubs})
 
+      // hub[0] => slug
+      // find(slug) => info
+      // node(info) => nid
+      // back(slug) => infos
+      // newr(infos) => infos
+
       for(const hub of hubs) {
-        const name = `${hub[1]}-${hub[0]}`
+        const name = `hub ${hub[1]} ${hub[0]}`
         const graph = new Graph()
-        const find = slug => neighborhood.find(info => info.slug == slug)
         const node = info => {
           return graph.addUniqNode('',{
             name:info.title.replaceAll(/ /g,"\n"),
@@ -888,18 +953,68 @@
             site:info.domain
           })
         }
+        // hub
         const info = find(hub[0])
         const nid = node(info)
+
+        // parents of hub
+        for(const parent of newr(back(info.slug))) {
+          graph.addRel('',node(parent),nid)
+        }
+
+        // hub children
         for(const link in (info.links||{})) {
-          const linked = find(link)
-          if(linked)
-            graph.addRel('',nid,node(linked))
+          const child = find(link)
+          if(child) {
+            const cid = node(child)
+            graph.addRel('',nid,cid)
+
+            // parents of children
+            for(const parent of newr(back(child.slug))) {
+              graph.addRel('',node(parent),cid)
+            }
+          }
         }
+
+
         aspects.push({name,graph})
       }
       return aspects
     }
 
+
+/*
+
+    for (const name of newest(Object.keys(info.links||{}))){
+      const kid = node(name)
+      graph.addRel('',nid,kid)
+
+      const parents = neighborhood.find(info => info.slug==name)?.cites || []
+      for (const parent of newest(parents))
+        graph.addRel('',node(parent),kid)
+    }
+
+    for (const name of newest(info.cites))
+      graph.addRel('',node(name),nid)
+    return graph
+  }
+
+  function newest(slugs) {
+    const recent = slug => neighborhood
+      .filter(info => info.slug == slug)
+    return slugs
+      .map(slug => [slug,recent(slug)])
+      .filter(pair => pair[1].length)
+      .map(pair => [pair[0],pair[1].sort((a,b) => b.date - a.date)[0]])
+      .sort((a,b) => b[1].date - a[1].date)
+      .map(pair => pair[0])
+      .slice(0,3)
+  }
+
+*/
+
+
+
   }
 
 
@@ -1077,6 +1192,50 @@
     page.journal.push(action);
   }
 
+
+  // adapted from Solo client
+
+  function soloListener(event) {
+
+    if (!event.data) return
+    const { data } = event
+    if (data?.action == "publishSourceData" && data?.name == "aspect") {
+      if (wiki.debug) console.log('soloListener - source update', {event,data})
+      return
+    }
+
+    // only continue if event is from a solo popup.
+    // events from a popup window will have an opener
+    // ensure that the popup window is one of ours
+
+    if (!event.source.opener || event.source.location.pathname !== '/plugins/solo/dialog/') {
+      if (wiki.debug) {console.log('soloListener - not for us', {event})}
+      return
+    }
+    if (wiki.debug) {console.log('soloListener - ours', {event})}
+
+    const { action, keepLineup=false, pageKey=null, title=null, context=null, page=null} = data;
+
+    let $page = null
+    if (pageKey != null) {
+      $page = keepLineup ? null : $('.page').filter((i, el) => $(el).data('key') == pageKey)
+    }
+
+    switch (action) {
+      case 'doInternalLink':
+        wiki.pageHandler.context = context
+        wiki.doInternalLink(title, $page)
+        break
+      case 'showResult':
+        const options = keepLineup ? {} : {$page}
+        wiki.showResult(wiki.newPage(page), options)
+        break
+      default:
+        console.error({ where:'soloListener', message: "unknown action", data })
+    }
+  }
+
+
   function create(revIndex, data) {
     revIndex = +revIndex;
     const revJournal = data.journal.slice(0, revIndex + 1);

package/package.json

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