WIP - Move to the new hyperdrive daemon

beakerbrowser · Aug 16, 2019 · e50431d · e50431d
1 parent e5e61e9
commit e50431d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 29 deletions.
diff --git a/app/background-process.js b/app/background-process.js
@@ -85,9 +85,6 @@ app.on('open-file', (e, filepath) => {
 })
 
 app.on('ready', async function () {
-  // start the daemon process
-  var datDaemonProcess = await childProcesses.spawn('dat-daemon', './dat-daemon.js')
-
   portForwarder.setup()
 
   // setup core
@@ -109,8 +106,7 @@ app.on('ready', async function () {
     },
     rpcAPI: rpc,
     downloadsWebAPI: downloads.WEBAPI,
-    browserWebAPI: beakerBrowser.WEBAPI,
-    datDaemonProcess
+    browserWebAPI: beakerBrowser.WEBAPI
   })
 
   // base

diff --git a/app/background-process/ui/permissions.js b/app/background-process/ui/permissions.js
@@ -76,7 +76,7 @@ export async function checkLabsPerm ({perm, labApi, apiDocsUrl, sender}) {
     let isOptedIn = false
     let archive = dat.library.getArchive(key)
     if (archive) {
-      let {checkoutFS} = dat.library.getArchiveCheckout(archive, urlp.version)
+      let {checkoutFS} = await dat.library.getArchiveCheckout(archive, urlp.version)
       let manifest = await pda.readManifest(checkoutFS).catch(_ => {})
       let apis = _get(manifest, 'experimental.apis')
       if (apis && Array.isArray(apis)) {

diff --git a/app/background-process/ui/view-manager.js b/app/background-process/ui/view-manager.js
@@ -489,19 +489,20 @@ class View {
   // live reloading
   // =
 
-  toggleLiveReloading (enable) {
+
+  async toggleLiveReloading (enable) {
     if (typeof enable === 'undefined') {
       enable = !this.liveReloadEvents
     }
-    if (!enable) {
+    if (this.liveReloadEvents) {
       this.liveReloadEvents.close()
       this.liveReloadEvents = false
     } else if (this.datInfo) {
       let archive = beakerCore.dat.library.getArchive(this.datInfo.key)
       if (!archive) return
 
       let {version} = parseDatURL(this.url)
-      let {checkoutFS} = beakerCore.dat.library.getArchiveCheckout(archive, version)
+      let {checkoutFS} = await beakerCore.dat.library.getArchiveCheckout(archive, version)
       this.liveReloadEvents = checkoutFS.pda.watch()
 
       let event = (this.datInfo.isOwner) ? 'changed' : 'invalidated'

diff --git a/app/dat-daemon.js b/app/dat-daemon.js