pear-electron 1.0.2 → 1.0.4

package/bin.js

@@ -1,28 +1,44 @@
 #!/usr/bin/env pear
-/* global Pear, Bare */
+/* global Pear */
 
 if (!global.Pear && global.process) {
-  const { status } = require('child_process').spawnSync('pear', process.argv.slice(1), { stdio: 'inherit' })
+  const { status } = require('child_process').spawnSync('pear', process.argv.slice(1), { stdio: 'inherit', shell: true })
   process.exit(status)
 }
 
 const path = require('path')
-const { runtimes } = global.Pear.config.entrypoint.startsWith('/node_modules/.bin/')
-  ? require('../pear-electron/package.json').pear
-  : require('./package.json').pear
+const inDotBin = global.Pear.config.entrypoint.startsWith('/node_modules/.bin/')
+const { runtimes } = inDotBin ? require('../pear-electron/package.json').pear : require('./package.json').pear
 const IPC = require('pear-ipc')
 const { encode } = require('hypercore-id-encoding')
 const { PLATFORM_LOCK, SOCKET_PATH, CONNECT_TIMEOUT } = require('pear-api/constants')
 const tryboot = require('pear-api/tryboot')
 const link = require('pear-link')()
+const byteSize = require('tiny-byte-size')
+const { outputter, ansi } = require('pear-api/terminal')
+
+const output = outputter('dump', {
+  dumping: ({ link, dir, list }) => list > -1 ? '' : `\n${ansi.pear} Bootstrapping pear-electron runtimes from peers\n\nfrom: ${link}\ninto: ${dir}\n`,
+  file: ({ key, value }) => `${key}${value ? '\n' + value : ''}`,
+  complete: () => '\x1b[1A\nBootstrap complete\n',
+  stats ({ upload, download, peers }) {
+    const dl = download.total + download.speed === 0 ? '' : `[⬇ ${byteSize(download.total)} - ${byteSize(download.speed)}/s ]`
+    const ul = upload.total + upload.speed === 0 ? '' : `[⬆ ${byteSize(upload.total)} - ${byteSize(upload.speed)}/s ]`
+    return {
+      output: 'status',
+      message: `${dl} ${ul} [ Peers: ${peers} ]`
+    }
+  },
+  error: (err) => `Bootstrap Failure (code: ${err.code || 'none'}) ${err.stack}`
+})
 
 async function pearElectron () {
   const { protocol, drive } = link(runtimes)
-
+  const root = new URL(Pear.config.applink).pathname
   const opts = {
-    id: Bare.pid,
+    id: Pear.pid,
     link: protocol + '//' + encode(drive.key) + '/by-arch/',
-    dir: path.join(new URL(Pear.config.applink).pathname, 'node_modules', 'pear-electron'),
+    dir: inDotBin ? path.join(root, 'node_modules', 'pear-electron') : root,
     // checkout: drive.length,
     force: true
 
@@ -34,8 +50,7 @@ async function pearElectron () {
     connect: tryboot
   })
   await ipc.ready()
-  const stream = ipc.dump(opts)
-  for await (const output of stream) console.log(output)
+  await output(false, ipc.dump(opts))
   await ipc.close()
 }
 

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "pear-electron",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Pear User-Interface Library for Electron",
   "main": "index.js",
   "bin": "bin.js",
   "scripts": {
-    "archdump": "node scripts/bootstrap.js --archdump",
-    "bootstrap": "node scripts/bootstrap.js",
+    "bootstrap": "pear run bin.js",
     "decal": "node scripts/decal.js",
     "bundle": "node scripts/bundle.js",
     "generate": "npm run decal && npm run bundle",
@@ -81,7 +80,7 @@
     "node-bare-bundle": "^1.4.2",
     "paparam": "^1.6.1",
     "path": "npm:bare-node-path@^1.0.1",
-    "pear-api": "^1.1.1",
+    "pear-api": "^1.2.2",
     "pear-interface": "^1.0.3",
     "pear-ipc": "^3.2.0",
     "pear-link": "^2.0.6",