pear-runtime-updater 1.0.0 → 1.1.0

package/index.js

@@ -8,7 +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 { platform, arch, isWindows } = require('which-runtime')
 const host = platform + '-' + arch
 
 module.exports = class PearRuntime extends ReadyResource {
@@ -22,7 +22,10 @@ module.exports = class PearRuntime extends ReadyResource {
     this.version = opts.version || 0
     this.app = opts.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.bootstrap = opts.bootstrap
     this.bundled = opts.bundled || !!this.app
+    this.win32RestartAfterUpdate = opts.win32 && opts.win32.restart
 
     if (this.updates) {
       const { drive: upgrade } = link.parse(opts.upgrade)
@@ -62,7 +65,7 @@ module.exports = class PearRuntime extends ReadyResource {
 
       if (!this.swarm) {
         const keyPair = await this.store.createKeyPair('pear-container')
-        this.swarm = new Hyperswarm({ keyPair })
+        this.swarm = new Hyperswarm({ keyPair, bootstrap: this.bootstrap })
       }
 
       this.swarm.on('connection', (connection) => this.store.replicate(connection))
@@ -77,18 +80,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
-    await fsx.swap(path.join(this.next, 'by-arch', host, 'app', this.name), 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, { restartOnUpdate: this.win32RestartAfterUpdate })
+    } else {
+      await fsx.swap(nextApp, this.app)
+    }
     await fs.promises.rm(this.next, { recursive: true, force: true })
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-runtime-updater",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Listens for OTA Pear App updates",
   "license": "Apache-2.0",
   "author": "Holepunch Inc",
@@ -19,8 +19,10 @@
   ],
   "scripts": {
     "format": "prettier . --write",
-    "test": "prettier . --check && lunte",
-    "lint": "lunte"
+    "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",
+    "lint": "prettier --check . && lunte"
   },
   "imports": {
     "fs": {
@@ -30,6 +32,14 @@
     "path": {
       "bare": "bare-path",
       "default": "path"
+    },
+    "os": {
+      "bare": "bare-os",
+      "default": "os"
+    },
+    "child_process": {
+      "bare": "bare-subprocess",
+      "default": "child_process"
     }
   },
   "dependencies": {
@@ -41,13 +51,21 @@
     "hyperdrive": "^13.2.1",
     "hyperswarm": "^4.16.0",
     "localdrive": "^2.2.0",
+    "msix-manager": "^0.1.2",
     "pear-link": "^4.2.1",
     "ready-resource": "^1.2.0",
     "which-runtime": "^1.3.2"
   },
   "devDependencies": {
+    "@hyperswarm/testnet": "^3.1.4",
+    "bare-env": "^3.0.0",
+    "bare-os": "^3.7.0",
+    "bare-subprocess": "^5.2.2",
+    "brittle": "^3.19.1",
     "lunte": "^1.6.0",
+    "pear-build": "^0.2.0",
     "prettier": "^3.8.1",
-    "prettier-config-holepunch": "^2.0.0"
+    "prettier-config-holepunch": "^2.0.0",
+    "test-tmp": "^1.4.0"
   }
 }