pear-runtime-updater 3.0.6 → 3.0.8

package/index.js

@@ -8,6 +8,7 @@ const link = require('pear-link')
 const hid = require('hypercore-id-encoding')
 const { platform, arch, isWindows } = require('which-runtime')
 const semver = require('bare-semver')
+const debounceify = require('debounceify')
 const host = platform + '-' + arch
 
 module.exports = class PearRuntimeUpdater extends ReadyResource {
@@ -39,6 +40,8 @@ module.exports = class PearRuntimeUpdater extends ReadyResource {
     this.updating = false
     this.updated = false
 
+    this._debouncedUpdate = debounceify(this._update.bind(this))
+
     this.ready().catch(noop)
   }
 
@@ -52,8 +55,10 @@ module.exports = class PearRuntimeUpdater extends ReadyResource {
         force: true
       })
 
-      this._updateBackground()
-      this.drive.core.on('append', () => this._updateBackground())
+      this._debouncedUpdate().catch((err) => this.emit('error', err))
+      this.drive.core.on('append', () =>
+        this._debouncedUpdate().catch((err) => this.emit('error', err))
+      )
     }
   }
 
@@ -79,12 +84,8 @@ module.exports = class PearRuntimeUpdater extends ReadyResource {
     await fs.promises.rm(this.next, { recursive: true, force: true })
   }
 
-  _updateBackground() {
-    this._update().catch((err) => this.emit('error', err))
-  }
-
   async _update() {
-    if (this.updating || !this.updates) return
+    if (!this.updates) return
 
     await this.drive.update()
 
@@ -111,15 +112,22 @@ module.exports = class PearRuntimeUpdater extends ReadyResource {
     if (!remote || current.compare(remote) >= 0) {
       this.checkout = null
       await co.close()
-      if (this.drive.core.length > length) this._updateBackground()
       return
     }
 
     const local = new Localdrive(next)
 
     const prefix = prefixFor(host, this.name)
-    const exists = await co.get(prefix)
-    if (!exists) throw new Error('update not found')
+    // Binary may be a file or a directory bundle
+    // Entries exist only for files, so try exact path first, then iterate under it
+    let hasContent = (await co.entry(prefix)) !== null
+    if (!hasContent) {
+      for await (const _entry of co.list(prefix)) {
+        hasContent = true
+        break
+      }
+    }
+    if (!hasContent) throw new Error('update not found')
     this.updating = true
     this.emit('updating')
     for await (const data of co.mirror(local, { prefix })) {
@@ -136,8 +144,6 @@ module.exports = class PearRuntimeUpdater extends ReadyResource {
     this.updating = false
     this.updated = true
     this.emit('updated')
-
-    if (this.drive.core.length > length) this._updateBackground()
   }
 
   async _prefetchLatest() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-runtime-updater",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "description": "Listens for OTA Pear App updates",
   "license": "Apache-2.0",
   "author": "Holepunch Inc",
@@ -20,8 +20,8 @@
   "scripts": {
     "format": "prettier . --write",
     "test": "npm run test:node && npm run test:bare",
-    "test:node": "brittle-node test/index.test.js",
-    "test:bare": "brittle-bare test/index.test.js",
+    "test:node": "brittle-node test/index.test.js test/e2e.test.js",
+    "test:bare": "brittle-bare test/index.test.js test/e2e.test.js",
     "lint": "prettier --check . && lunte"
   },
   "imports": {
@@ -46,6 +46,7 @@
     "bare-fs": "^4.5.3",
     "bare-path": "^3.0.0",
     "bare-semver": "^1.0.2",
+    "debounceify": "^1.1.0",
     "fs-native-extensions": "^1.4.5",
     "hypercore-id-encoding": "^1.3.0",
     "hyperdrive": "^13.2.1",