pear-runtime-updater 3.0.2 → 3.0.4

package/index.js

@@ -7,6 +7,7 @@ const ReadyResource = require('ready-resource')
 const link = require('pear-link')
 const hid = require('hypercore-id-encoding')
 const { platform, arch, isWindows } = require('which-runtime')
+const semver = require('bare-semver')
 const host = platform + '-' + arch
 
 module.exports = class PearRuntimeUpdater extends ReadyResource {
@@ -20,7 +21,7 @@ module.exports = class PearRuntimeUpdater extends ReadyResource {
 
     this.dir = opts.dir
     this.store = opts.store
-    this.version = opts.version || 0
+    this.version = opts.version || '0.0.0-0'
     this.app = opts.app
     this.name = opts.name
     this.bundled = opts.bundled || !!this.app
@@ -34,6 +35,7 @@ module.exports = class PearRuntimeUpdater extends ReadyResource {
 
     this.next = null
     this.checkout = null
+    this.prefetched = false
     this.updating = false
     this.updated = false
 
@@ -70,7 +72,7 @@ module.exports = class PearRuntimeUpdater extends ReadyResource {
     if (isWindows) {
       const MSIXManager = require('msix-manager') // require must be here for platform compatibility
       const manager = new MSIXManager()
-      await manager.addPackage(nextApp)
+      await manager.addPackage(nextApp, { forceUpdateFromAnyVersion: true })
     } else {
       await fsx.swap(nextApp, this.app)
     }
@@ -85,6 +87,8 @@ module.exports = class PearRuntimeUpdater extends ReadyResource {
     if (this.updating || !this.updates) return
     this.updating = true
 
+    await this.drive.update()
+
     const length = this.drive.core.length
     const id = length + '.' + this.drive.core.fork
     const next = path.join(this.dir, 'pear-runtime/next', id)
@@ -93,17 +97,30 @@ module.exports = class PearRuntimeUpdater extends ReadyResource {
     this.checkout = co
 
     const manifest = await co.get('/package.json')
-    if (!manifest || JSON.parse(manifest).version === this.version) {
+
+    const current = semver.Version.parse(this.version)
+    const remote = manifest ? semver.Version.parse(JSON.parse(manifest).version) : null
+
+    if (remote && current.compare(remote) === 0 && this.bundled && !this.prefetched) {
+      try {
+        await this._prefetchLatest()
+      } catch (err) {
+        this.emit('error', err)
+      }
+    }
+
+    if (!remote || current.compare(remote) >= 0) {
       this.updating = false
       this.checkout = null
       await co.close()
+      if (this.drive.core.length > length) this._updateBackground()
       return
     }
 
     const local = new Localdrive(next)
 
     this.emit('updating')
-    const prefix = `/by-arch/${host}/app/${this.name}`
+    const prefix = prefixFor(host, this.name)
     for await (const data of co.mirror(local, { prefix })) {
       this.emit('updating-delta', data)
     }
@@ -121,6 +138,28 @@ module.exports = class PearRuntimeUpdater extends ReadyResource {
 
     if (this.drive.core.length > length) this._updateBackground()
   }
+
+  async _prefetchLatest() {
+    const length = this.drive.core.length
+    if (!length) return
+
+    const co = this.drive.checkout(length)
+    const prefix = prefixFor(host, this.name)
+
+    try {
+      if (!(await co.has(prefix))) {
+        await co.download(prefix).done()
+      }
+    } finally {
+      await co.close()
+    }
+
+    this.prefetched = true
+  }
+}
+
+function prefixFor(host, name) {
+  return `/by-arch/${host}/app/${name}`
 }
 
 function noop() {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-runtime-updater",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "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/updates.test.js",
-    "test:bare": "brittle-bare test/updates.test.js",
+    "test:node": "brittle-node test/index.test.js",
+    "test:bare": "brittle-bare test/index.test.js",
     "lint": "prettier --check . && lunte"
   },
   "imports": {
@@ -45,11 +45,12 @@
   "dependencies": {
     "bare-fs": "^4.5.3",
     "bare-path": "^3.0.0",
+    "bare-semver": "^1.0.2",
     "fs-native-extensions": "^1.4.5",
     "hypercore-id-encoding": "^1.3.0",
     "hyperdrive": "^13.2.1",
     "localdrive": "^2.2.0",
-    "msix-manager": "^0.2.1",
+    "msix-manager": "^0.2.4",
     "pear-link": "^4.2.1",
     "ready-resource": "^1.2.0",
     "which-runtime": "^1.3.2"
@@ -63,7 +64,7 @@
     "corestore": "^7.9.1",
     "hyperswarm": "^4.17.0",
     "lunte": "^1.6.0",
-    "pear-build": "^0.2.0",
+    "pear-build": "^1.1.0",
     "prettier": "^3.8.1",
     "prettier-config-holepunch": "^2.0.0",
     "test-tmp": "^1.4.0"