pear-runtime-updater 0.0.13 → 1.0.0

package/index.js

@@ -8,9 +8,7 @@ const fsx = require('fs-native-extensions')
 const ReadyResource = require('ready-resource')
 const link = require('pear-link')
 const hid = require('hypercore-id-encoding')
-const MSIXManager = require('msix-manager')
-const { platform, arch, isWindows } = require('which-runtime')
-const isMobile = platform === 'ios' || platform === 'android'
+const { platform, arch } = require('which-runtime')
 const host = platform + '-' + arch
 
 module.exports = class PearRuntime extends ReadyResource {
@@ -23,7 +21,7 @@ module.exports = class PearRuntime extends ReadyResource {
     this.dir = opts.dir
     this.version = opts.version || 0
     this.app = opts.app
-    this.name = this.app && path.basename(this.app)
+    this.name = opts.name ?? (this.app && path.basename(this.app))
     this.bundled = opts.bundled || !!this.app
 
     if (this.updates) {
@@ -32,15 +30,17 @@ module.exports = class PearRuntime extends ReadyResource {
       this.length = upgrade.length || 0
       this.fork = upgrade.fork || 0
       this.link = link.serialize({ drive: { fork: this.fork, length: this.length, key: this.key } })
+      this.store = new Corestore(path.join(this.dir, 'pear-runtime/corestore'))
+      this.drive = new Hyperdrive(this.store, this.key)
     } else {
       this.key = null
       this.length = null
       this.fork = null
       this.link = null
+      this.store = null
+      this.drive = null
     }
 
-    this.store = null
-    this.drive = null
     this.swarm = null
     this.next = null
     this.checkout = null
@@ -52,10 +52,6 @@ module.exports = class PearRuntime extends ReadyResource {
 
   async _open() {
     if (!this.updates) return
-    if (this.store === null) {
-      this.store = new Corestore(path.join(this.dir, 'pear-runtime/corestore'))
-    }
-    if (this.drive === null) this.drive = new Hyperdrive(this.store, this.key)
     await this.drive.ready()
 
     if (this.bundled) {
@@ -92,15 +88,7 @@ module.exports = class PearRuntime extends ReadyResource {
     this.applied = true
 
     // mac only for now, linux similar, windows, more pain
-    const segments = [this.next, 'by-arch', host, 'app']
-    if (!isMobile && !isWindows) segments.push(this.name)
-    if (isWindows) {
-      const manager = new MSIXManager()
-      const msix = this.name.slice(0, -3) + 'msix'
-      await manager.addPackage(...segments, msix)
-    } else {
-      await fsx.swap(path.join(...segments), this.app)
-    }
+    await fsx.swap(path.join(this.next, 'by-arch', host, 'app', this.name), this.app)
     await fs.promises.rm(this.next, { recursive: true, force: true })
   }
 
@@ -130,11 +118,10 @@ module.exports = class PearRuntime extends ReadyResource {
     const local = new Localdrive(next)
 
     this.emit('updating')
-    const prefix = `/by-arch/${host}/app${isMobile ? '' : `/${this.name}`}`
+    const prefix = `/by-arch/${host}/app/${this.name}`
     for await (const data of co.mirror(local, { prefix })) {
       this.emit('updating-delta', data)
     }
-    if (isMobile) await local.put(`${prefix}/package.json`, manifest)
 
     await co.close()
     await local.close()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-runtime-updater",
-  "version": "0.0.13",
+  "version": "1.0.0",
   "description": "Listens for OTA Pear App updates",
   "license": "Apache-2.0",
   "author": "Holepunch Inc",
@@ -41,7 +41,6 @@
     "hyperdrive": "^13.2.1",
     "hyperswarm": "^4.16.0",
     "localdrive": "^2.2.0",
-    "msix-manager": "^0.1.1",
     "pear-link": "^4.2.1",
     "ready-resource": "^1.2.0",
     "which-runtime": "^1.3.2"