pear-electron 1.2.1 → 1.3.0

package/{bin/index.js → bin.js}

@@ -4,9 +4,6 @@ if (!global.Pear && global.process) {
   const { status } = require('child_process').spawnSync('pear', process.argv.slice(1), { stdio: 'inherit', shell: true })
   process.exit(status)
 }
-const installed = Pear.config.entrypoint.startsWith('/node_modules/.bin/')
 if (Pear.pipe === undefined) throw new Error('Incompatible with current Pear version (must be v2+)')
-const bin = Pear.pipe === null
-  ? (installed ? require('../pear-electron/bin/bootstrap') : require('./bootstrap'))
-  : require('../pear-electron/bin/configure')
-bin().catch(console.error)
+if (Pear.pipe === null) throw new Error('This is a via bin: must have Pear.pipe')
+require('../pear-electron/via')

package/package.json

@@ -1,30 +1,29 @@
 {
   "name": "pear-electron",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Pear User-Interface Library for Electron",
   "main": "index.js",
-  "bin": "bin/index.js",
+  "bin": "bin.js",
   "scripts": {
-    "bootstrap": "pear run bin/index.js",
+    "bootstrap": "pear run scripts/bootstrap.js",
     "decal": "pear run scripts/decal.js",
     "bundle": "pear run scripts/bundle.js",
-    "prepare": "npm --ignore-scripts i && npm run decal && npm run bundle",
-    "prestage": "npm run bootstrap && npm run bundle",
+    "prestage": "npm run bootstrap && npm run decal && npm run bundle",
     "lint": "standard"
   },
   "files": [
-    "bin/",
-    "boot.bundle",
     "bootstrap.js",
     "index.js",
-    "runtime.js"
+    "runtime.js",
+    "via.js"
   ],
   "pear": {
     "name": "pear-electron",
-    "bootstrap": "pear://0.949.yceb7sjhgfzsnza7oc38hy3oxu9dhnywi3mzxdm9ubc48kjnxqgo",
+    "bootstrap": "pear://0.2585.yceb7sjhgfzsnza7oc38hy3oxu9dhnywi3mzxdm9ubc48kjnxqgo",
     "stage": {
       "skipWarmup": "true",
       "only": [
+        "boot.bundle",
         "by-arch",
         "prebuilds"
       ]
@@ -52,8 +51,8 @@
     "iambus": "^1.0.3",
     "localdrive": "^1.12.1",
     "paparam": "^1.6.1",
-    "pear-api": "^1.6.20",
-    "pear-ipc": "^3.2.0",
+    "pear-api": "^1.9.0",
+    "pear-ipc": "^6.1.0",
     "script-linker": "^2.5.3",
     "streamx": "^2.20.2",
     "url-file-url": "^1.0.4",

package/runtime.js

@@ -12,24 +12,29 @@ const constants = require('pear-api/constants')
 const parseLink = require('pear-api/parse-link')
 const Logger = require('pear-api/logger')
 const { ERR_INVALID_INPUT, ERR_INVALID_APPLING } = require('pear-api/errors')
-const { ansi, byteSize } = require('pear-api/terminal')
+const { ansi, byteSize, byteDiff, outputter } = require('pear-api/terminal')
 const run = require('pear-api/cmd/run')
 const pear = require('pear-api/cmd')
-const bootstrap = require('./bootstrap')
-const EXEC = isWindows
-  ? 'pear-runtime-app\\Pear Runtime.exe'
-  : isLinux
-    ? 'pear-runtime-app/pear-runtime'
-    : 'Pear Runtime.app/Contents/MacOS/Pear Runtime'
+const pkg = require('./package.json')
+
+const bin = () => {
+  const name = Pear.config.name[0].toUpperCase() + Pear.config.name.slice(1)
+  const app = isMac ? name + ' Runtime.app' : Pear.config.name + '-runtime-app'
+  const exe = isWindows ? name + 'Runtime.exe' : (isMac ? 'Contents/MacOS/' + name + ' Runtime' : Pear.config.name + '-runtime')
+  return isWindows ? 'bin\\' + app + '\\' + exe : (isMac ? 'bin/' + app + '/' + exe : 'bin/' + app + '/' + exe)
+}
+
+const BIN = isWindows
+  ? 'bin\\pear-runtime-app\\Pear Runtime.exe'
+  : isMac
+    ? 'bin/Pear Runtime.app/Contents/MacOS/Pear Runtime'
+    : 'bin/pear-runtime-app/pear-runtime'
 
 class PearElectron {
   constructor () {
     this.ipc = Pear[Pear.constructor.IPC]
-    this.arch = '/node_modules/pear-electron/by-arch/' + require.addon.host
-    this.prebuilds = '/node_modules/pear-electron/prebuilds/' + require.addon.host
-    this.boot = '/node_modules/pear-electron/boot.bundle'
     this.applink = new URL(Pear.config.applink)
-    this.LOG = new Logger({ labels: ['runtime-bootstrap'] })
+    this.LOG = new Logger({ labels: [pkg.name] })
     Pear.teardown(() => this.ipc.close())
   }
 
@@ -41,34 +46,42 @@ class PearElectron {
           const ul = upload.total + upload.speed === 0 ? '' : `[${ansi.up} ${byteSize(upload.total)} - ${byteSize(upload.speed)}/s ] `
           return {
             output: 'status',
-            message: `Bootstrapping Runtime [ Peers: ${peers} ] ${dl}${ul}`
+            message: `Syncing Runtime [ Peers: ${peers} ] ${dl}${ul}`
           }
+        },
+        final (asset) {
+          if (asset.forced === false && asset.inserted === false) return {}
+          return 'Sync Complete'
         }
       }
     }
     return {
-      dumping: ({ link, dir, list }) => list > -1 ? '' : { message: ['Bootstrapping runtime from peers', 'from: ' + link, 'into: ' + dir] },
+      dumping: ({ link, dir }) => 'Syncing runtime from peers\nfrom: ' + link + '\ninto: ' + dir + '\n',
+      byteDiff,
       file: ({ key }) => key,
-      complete: () => 'Bootstrap complete',
-      error: (err) => `Bootstrap Failure (code: ${err.code || 'none'}) ${err.stack}`
+      complete: () => 'Asset fetch complete',
+      error: (err) => `Asset fetch Failure (code: ${err.code || 'none'}) ${err.stack}`
     }
   }
 
+  async #asset (opts, force = false) {
+    const output = outputter('asset', this.#outs())
+    const json = false
+    const bootstrap = opts.bootstrap ?? pkg.pear.bootstrap
+    const executable = opts.bootstrap ? bin() : BIN
+    const stream = Pear.asset(bootstrap, {
+      only: ['/boot.bundle', '/by-arch/' + require.addon.host, '/prebuilds/' + require.addon.host],
+      force
+    })
+    const asset = await output(json, stream)
+    if (asset === null) throw new Error('Failed to determine runtime asset from sidecar')
+    return path.join(asset.path, 'by-arch', require.addon.host, executable)
+  }
+
   async start (opts = {}) {
-    if (this.applink.protocol === 'pear:') {
-      const base = path.join(Pear.config.storage, 'pear-runtimes')
-      await bootstrap({
-        id: Pear.id,
-        link: Pear.config.applink,
-        only: [this.arch, this.prebuilds, this.boot],
-        dir: base,
-        force: true,
-        log: (msg) => this.LOG.info('runtime-bootstrap', msg)
-      }, this.#outs())
-      this.bin = path.join(base, 'node_modules', 'pear-electron', 'by-arch', require.addon.host, 'bin', EXEC)
-    } else {
-      this.bin = path.join(this.applink.pathname, 'node_modules', 'pear-electron', 'by-arch', require.addon.host, 'bin', EXEC)
-    }
+    this.bin = await this.#asset(opts)
+    // if disk tampered then resync:
+    if (fs.existsSync(this.bin) === false) this.bin = await this.#asset(opts, true)
     const parsed = pear(Pear.argv.slice(1))
     const cmd = command('run', ...run)
     let argv = parsed.rest
@@ -108,7 +121,7 @@ class PearElectron {
       dir
     })
 
-    argv = [require.resolve('./boot.bundle'), '--rti', info, ...argv]
+    argv = ['boot.bundle', '--rti', info, ...argv]
     const stdio = args.detach ? ['ignore', 'ignore', 'ignore', 'overlapped'] : ['ignore', 'inherit', 'pipe', 'overlapped']
     const options = {
       stdio,
@@ -129,7 +142,9 @@ class PearElectron {
       if (isMac) spawn('open', [applingApp, '--args', ...argv], options).unref()
       else spawn(applingApp, argv, options).unref()
     }
-    sp.on('exit', (code) => { Pear.exit(code) })
+
+    // TODO: teardown flow
+
     const pipe = sp.stdio[3]
     if (args.detach) return pipe
 

package/{bin/configure.js → via.js}

@@ -10,12 +10,10 @@ function srcs (html) {
 
 async function configure (options) {
   const { stage = {} } = options
-  const ignore = ['/node_modules/**/prebuilds', '!/node_modules/pear-electron/prebuilds']
   const { pathname } = new URL(global.Pear.config.applink + '/')
   const drive = new Localdrive(pathname)
   const html = (await drive.get(options.gui.main)).toString()
   const entrypoints = srcs(html)
-  stage.ignore = Array.isArray(stage.ignore) ? [...stage.ignore, ...ignore] : ignore
   stage.entrypoints = Array.isArray(stage.entrypoints) ? [...stage.entrypoints, ...entrypoints] : entrypoints
 
   options.via = undefined
@@ -24,15 +22,13 @@ async function configure (options) {
   return options
 }
 
-module.exports = () => new Promise((resolve, reject) => {
-  Pear.pipe.on('end', () => {
-    Pear.pipe.end()
-    resolve()
-  })
-  Pear.pipe.once('data', (options) => {
-    configure(JSON.parse(options)).then((config) => {
-      Pear.pipe.end(JSON.stringify(config))
-      resolve()
-    }, reject)
+Pear.pipe.on('end', () => { Pear.pipe.end() })
+
+Pear.pipe.once('data', (options) => {
+  configure(JSON.parse(options)).then((config) => {
+    Pear.pipe.end(JSON.stringify(config))
+  }, (err) => {
+    Pear.pipe.destroy()
+    console.error(err)
   })
 })

package/bin/bootstrap.js

@@ -1,19 +0,0 @@
-'use strict'
-/* global Pear */
-const path = require('bare-path')
-const installed = Pear.config.entrypoint.startsWith('/node_modules/.bin/')
-const { pear } = installed ? require('../../pear-electron/package.json') : require('../package.json')
-const { isTTY } = require('pear-api/terminal')
-const bootstrap = installed ? require('../../pear-electron/bootstrap') : require('../bootstrap')
-
-const { pathname } = new URL(Pear.config.applink)
-const opts = {
-  id: Pear.pid,
-  dir: installed ? path.join(pathname, 'node_modules', 'pear-electron') : pathname,
-  link: pear.bootstrap,
-  only: installed ? ['/by-arch', '/prebuilds'] : ['/by-arch'],
-  json: !isTTY,
-  force: true
-}
-
-module.exports = () => bootstrap(opts)