creating promise for client

retog · retog · commit be04a50ddf8b · 2020-12-12T14:37:30.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 node_modules
-site/page-script.js
-site/page-script.js.map
+site/connect-ssb.js
+site/connect-ssb.js.map
 webext/content-script.js
 webext/content-script.js.LICENSE.txt
 webext/content-script.js.map
diff --git a/rollup.config.js b/rollup.config.js
@@ -73,12 +73,12 @@ export default [{
 		clearScreen: false
 	}
 }, {
-	input: 'src/page-script.js',
+	input: 'src/connect-ssb-page-script.js',
 	output: {
 		sourcemap: true,
 		format: 'iife',
 		name: 'app',
-		file: 'site/page-script.js',
+		file: 'site/connect-ssb.js',
 		intro: 'const global = window;'
 	},
 	plugins: [
diff --git a/site/page.html b/site/page.html
@@ -2,10 +2,42 @@
 <html>
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <style>
+      :not(.waited) .after_wait {
+        display: none
+      }
+      .waited .after_wait {
+        display: block
+      }
+    </style>
   </head>
   <body>
     <p>RPC connection with SSB via native messaging.</p> 
-    <div id="output"></div>
-    <script src="page-script.js"></script>
+    <div id="output">
+      <div style="background-color: yellow;" class="after_wait">
+        This Page needs to access Scuttlebut. Make sure that Scuttle Shell Browser is installed and that "SSB access" is
+        switched on for this page.
+      </div>
+    </div>
+    <script src="connect-ssb.js"></script>
+    <script>
+      const outElem = document.getElementById('output')
+
+      const opts = {
+        limit: 100,
+        reverse: true
+      }
+      connectSsb().then(ssb => {
+        outElem.innerHTML = ''
+        pull(
+          client.query.read(opts),
+          pull.drain(msg => {
+            outElem.innerHTML += `<pre>${JSON.stringify(msg, null, 2)}</pre>`
+            outElem.innerHTML += '<hr/>'
+          })
+        )
+      })
+      setTimeout(() => document.body.classList.add('waited'), 1000)
+    </script>
   </body>
 </html>
diff --git a/src/connect-ssb-page-script.js b/src/connect-ssb-page-script.js
@@ -0,0 +1,78 @@
+import MRPC from 'muxrpc'
+import { pull } from 'pull-stream'
+import { Buffer } from 'buffer'
+
+
+window.pull = pull
+
+window.connectSsb = function() {
+  return new Promise((resolve, reject) => {
+
+    let messageDataCallback = null
+    let messageDataBuffer = []
+
+    const fromWebExt = function read(abort, cb) {
+      if (messageDataBuffer.length > 0) {
+        const data = messageDataBuffer[0]
+        messageDataBuffer = messageDataBuffer.splice(1)
+        cb(null, data)
+      } else {
+        messageDataCallback = cb
+      }
+    }
+
+
+    window.addEventListener("message", (event) => {
+      if (event.source == window &&
+          event.data &&
+          event.data.direction == "from-content-script") {
+            const asBuffer = Buffer.from(event.data.message)
+            if (messageDataCallback) {
+              const _messageDataCallback = messageDataCallback
+              messageDataCallback = null
+              _messageDataCallback(null, asBuffer)
+            } else {
+              messageDataBuffer.push(asBuffer)
+            }
+      }
+    });
+
+    const toWebExt = function sink(done) {
+      return function (source) {
+        source(null, function more(end,data) {
+          if (end) return done()
+          window.postMessage({
+            direction: "from-page-script",
+            message: data
+          }, "*")
+          source(null, more)
+        })
+      }
+    }
+    const client = MRPC(function (err, manifest) {
+      if (err) reject(err)
+      else {
+    
+        //console.log(JSON.stringify(manifest,undefined, 2))
+      
+        console.log('adding client to window')
+        window.client = client
+        
+        resolve(client)
+      }
+    })()
+    
+    const onClose = () => {
+      console.log('connected to muxrpc server')
+    } 
+    
+    const clientStream = client.createStream(onClose)
+    pull(
+      fromWebExt,
+      clientStream,
+      toWebExt()
+    )
+  })
+}
+
+
diff --git a/src/page-script.js b/src/page-script.js
