pear-runtime-updater 0.0.14 → 1.0.1

package/index.js

@@ -8,8 +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 { platform, arch } = require('which-runtime')
-const isMobile = platform === 'ios' || platform === 'android'
+const { platform, arch, isWindows } = require('which-runtime')
 const host = platform + '-' + arch
 
 module.exports = class PearRuntime extends ReadyResource {
@@ -22,7 +21,8 @@ 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))
+    if (isWindows) this.name = path.basename(this.name, path.extname(this.name)) + '.msix'
     this.bundled = opts.bundled || !!this.app
 
     if (this.updates) {
@@ -78,20 +78,26 @@ module.exports = class PearRuntime extends ReadyResource {
   }
 
   async _close() {
-    await this.drive?.close()
-    await this.checkout?.close()
-    await this.store?.destroy()
-    await this.swarm?.destroy()
+    if (!this.updates) return
+
+    await this.drive.close()
+    if (this.checkout !== null) await this.checkout.close()
+    await this.store.close()
+    await this.swarm.destroy()
   }
 
   async applyUpdate() {
     if (!this.updated || this.applied || !this.bundled) return
     this.applied = true
 
-    // mac only for now, linux similar, windows, more pain
-    const segments = [this.next, 'by-arch', host, 'app']
-    if (!isMobile) segments.push(this.name)
-    await fsx.swap(path.join(...segments), this.app)
+    const nextApp = path.join(this.next, 'by-arch', host, 'app', this.name)
+    if (isWindows) {
+      const MSIXManager = require('msix-manager') // require must be here for platform compatibility
+      const manager = new MSIXManager()
+      await manager.addPackage(nextApp)
+    } else {
+      await fsx.swap(nextApp, this.app)
+    }
     await fs.promises.rm(this.next, { recursive: true, force: true })
   }
 
@@ -121,11 +127,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.14",
+  "version": "1.0.1",
   "description": "Listens for OTA Pear App updates",
   "license": "Apache-2.0",
   "author": "Holepunch Inc",
@@ -41,6 +41,7 @@
     "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"