platform reload

Author: davidmarkclements

constants.js

@@ -70,7 +70,7 @@ exports.WAKEUP = toPath(new URL(BIN + WAKEUP_EXEC, swapURL))
 exports.RUNTIME = toPath(new URL(BIN + RUNTIME_EXEC, swapURL))
 exports.DESKTOP_RUNTIME = toPath(new URL(BIN + DESKTOP_EXEC, swapURL))
 
-exports.BARE_RESTART_EXIT_CODE = 75
+exports.RESTART_EXIT_CODE = 75
 
 function electronModuleURL () {
   const u = pathToFileURL(process.execPath)

electron-main.js

@@ -50,8 +50,8 @@ async function electronMain (cmd) {
   electron.ipcMain.on('send-to', (e, id, channel, message) => { electron.webContents.fromId(id)?.send(channel, message) })
 
   const app = await gui.app()
-  app.unloading().then(async () => {
-    await app.close()
+  app.unloading().then(async ({ type }) => {
+    if (type === 'close') await app.close()
   }) // note: would be unhandled rejection on failure, but should never fail
 }
 

gui/preload.js

@@ -45,6 +45,12 @@ module.exports = class PearGUI extends ReadyResource {
           desktopSources: (options = {}) => ipc.desktopSources(options)
         }
 
+        ipc.messages({ type: 'pear/reload' }).once('data', async ({ hard }) => {
+          await ipc.close()
+          if (hard === true) await ipc.waitForLock()
+          location.reload()
+        })
+
         const kGuiCtrl = Symbol('gui:ctrl')
 
         class Parent extends EventEmitter {
@@ -213,6 +219,11 @@ module.exports = class PearGUI extends ReadyResource {
         this.View = View
       }
 
+      reload = (opts) => {
+        if (opts?.platform) return super.reload()
+        location.reload()
+      }
+
       exit = (code) => {
         process.exitCode = code
         electron.ipcRenderer.sendSync('exit', code)

lib/api.js

@@ -1,6 +1,6 @@
 'use strict'
 const Worker = require('./worker')
-const { BARE_RESTART_EXIT_CODE } = require('../constants')
+const { RESTART_EXIT_CODE } = require('../constants')
 const noop = () => {}
 const teardown = global.Bare ? require('./teardown') : noop
 const program = global.Bare || global.process
@@ -102,15 +102,8 @@ class API {
   }
 
   reload = async (opts = {}) => {
-    if (!opts.platform) {
-      // TODO: use Pear.shutdown when it lands instead
-      if (this.#state.type === 'terminal') Bare.exit(BARE_RESTART_EXIT_CODE)
-      else global.location.reload()
-
-      return
-    }
-
-    return this.#reftrack(this.#ipc.restart({ ...opts, hard: false }))
+    if (opts.platform) return this.#reftrack(this.#ipc.restart({ ...opts, hard: false }))
+    this.exit(RESTART_EXIT_CODE)
   }
 
   updates = (listener) => this.messages({ type: 'pear/updates' }, listener)

package.json

@@ -94,7 +94,7 @@
     "paparam": "^1.4.0",
     "pear-changelog": "^1.0.1",
     "pear-interface": "^1.0.0",
-    "pear-ipc": "^1.0.17",
+    "pear-ipc": "^1.1.0",
     "pear-link": "^2.0.1",
     "pear-updater": "^3.1.0",
     "protomux": "^3.6.0",

run/index.js

@@ -19,8 +19,7 @@ const {
 } = require('../errors')
 const parseLink = require('../lib/parse-link')
 const teardown = require('../lib/teardown')
-const { PLATFORM_LOCK } = require('../constants')
-const fsext = require('fs-native-extensions')
+const { isWindows } = require('which-runtime')
 
 module.exports = async function run ({ ipc, args, cmdArgs, link, storage, detached, flags, appArgs, indices }) {
   const { drive, pathname } = parseLink(link)
@@ -116,15 +115,10 @@ module.exports = async function run ({ ipc, args, cmdArgs, link, storage, detach
 
     global.Pear = pear
 
-    const reloadSubscriber = ipc.messages({ type: 'pear/reload' })
-    reloadSubscriber.on('data', async () => {
-      ipc.stream.destroy()
-
-      const fd = await new Promise((resolve, reject) => fs.open(PLATFORM_LOCK, 'r+', (err, fd) => err ? reject(err) : resolve(fd)))
-      await fsext.waitForLock(fd)
-      await new Promise((resolve, reject) => fs.close(fd, (err) => err ? reject(err) : resolve(fd)))
-
-      await global.Pear.restart()
+    ipc.messages({ type: 'pear/reload' }).once('data', async ({ hard }) => {
+      await ipc.close()
+      if (hard === true) await ipc.waitForLock()
+      await global.Pear.reload()
     })
 
     const protocol = new Module.Protocol({

subsystems/sidecar/index.js

@@ -515,7 +515,7 @@ class Sidecar extends ReadyResource {
 
   async restart ({ platform = false, hard = true } = {}, client) {
     if (this.verbose) console.log(`${hard ? 'Hard' : 'Soft'} restarting ${platform ? 'platform' : 'client'}`)
-    if (platform === false) {
+    if (hard === true && platform === false) {
       const { dir, cwd, cmdArgs, env } = client.userData.state
       const appling = client.userData.state.appling
       const opts = { cwd, env, detached: true, stdio: 'ignore' }
@@ -553,24 +553,19 @@ class Sidecar extends ReadyResource {
       return
     }
 
-    if (!hard && this.hasClients) {
-      const seen = new Set()
-      for (const { userData: app } of this.clients) {
-        if (!app.state || seen.has(app.state.id)) continue
-        seen.add(app.state.id)
-        app.message({ type: 'pear/reload' })
-      }
-    }
+    for (const { userData: app } of this.clients) app.message({ type: 'pear/reload', hard })
 
     const sidecarClosed = new Promise((resolve) => this.corestore.once('close', resolve))
     let restarts = await this.#shutdown(client)
+
     // ample time for any OS cleanup operations:
     await new Promise((resolve) => setTimeout(resolve, 1500))
+
+    if (hard === false) return
+
     // shutdown successful, reset death clock
     this.deathClock()
 
-    if (!hard) return
-
     restarts = restarts.filter(({ run }) => run)
     if (restarts.length === 0) return
     if (this.verbose) console.log('Restarting', restarts.length, 'apps')