pear-install 1.0.5 → 1.0.7

package/README.md

@@ -68,11 +68,11 @@ await corestore.close()
 ### Events
 
 - `installing` → `{ link, host }`
-- `app` → `{ app, name, version, upgrade, key, dest }`
+- `app` → `{ app, name, version, upgrade, verlink, key, dest }`
 - `stats` → `{ download, upload, peers }`
 - `final` → `{ success, installed, exists }`
 
-## CMD
+## Command Integration: `/cmd`
 
 For embedding in another CLI. Wraps `Install` as a `pear-opstream` of `{ tag, data }` records with stdout formatters.
 
@@ -86,12 +86,12 @@ await InstallCmd.output(json, stream)
 ### Tags
 
 - `installing` → `{ link, host }`
-- `app` → `{ app, name, version, upgrade, key, dest }`
+- `app` → `{ app, name, version, upgrade, verlink, key, dest }`
 - `stats` → `{ download, upload, peers }`
 - `error` → `{ code, message, stack, info, success: false }`
 - `final` → `{ success, installed, exists }`
 
-### `InstallCmd.output(json, stream)`
+### `await InstallCmd.output(json, stream)`
 
 Drains `stream` to STDOUT.
 
@@ -100,6 +100,12 @@ Drains `stream` to STDOUT.
 
 Returns the `final` record.
 
+### `await InstallCmd.runner(cmd)`
+
+Pass directly as a [paparam](https://github.com/holepunchto/paparam) command runner. Creates `InstallCmd` instance and passes it to `InstallCmd.output`
+
+- `cmd` is a [paparam](https://github.com/holepunchto/paparam) `cmd` instance
+
 ## License
 
 Apache-2.0

package/bin.js

@@ -2,26 +2,12 @@
 const pkg = require('./package.json')
 const { isWindows } = require('which-runtime')
 const { command, arg, bail } = require('paparam')
-const InstallCmd = require('./cmd')
+const { runner } = require('./cmd')
 
 const program = command(
   'install',
   arg('[link]', 'Pear link origin to install from'),
-  async (cmd) => {
-    const { json, only, to, dhtBootstrap } = cmd.flags
-    const timeout = (cmd.flags.timeout || 30) * 1000
-    const link = cmd.args.link ?? pkg.pear.platform.key
-    const bootstrap = dhtBootstrap
-      ? dhtBootstrap.split(',').map((tuple) => {
-          const [host, port] = tuple.split(':')
-          const int = +port
-          if (Number.isInteger(int) === false) throw new Error(`Invalid port: ${port}`)
-          return { host, port: int }
-        })
-      : undefined
-    const stream = new InstallCmd({ link, only, to, bootstrap, timeout })
-    await InstallCmd.output(json, stream)
-  },
+  runner,
   pkg.command,
   bail((info = {}) => {
     process.exitCode = 1

package/cmd.js

@@ -3,6 +3,7 @@ const process = require('process')
 const Opstream = require('pear-opstream')
 const byteSize = require('tiny-byte-size')
 const { isWindows } = require('which-runtime')
+const pkg = require('./package.json')
 const Install = require('.')
 
 const down = isWindows ? '↓' : '⬇'
@@ -10,8 +11,8 @@ const down = isWindows ? '↓' : '⬇'
 class InstallCmd extends Opstream {
   static outputs = {
     installing: ({ link }) => `Installing... ${link}`,
-    app: ({ app, version, upgrade, dest, key }) =>
-      `App: ${app}\nVersion: ${version}\nLink: ${upgrade}\nPathname: ${key}\nTarget: ${dest}`,
+    app: ({ app, version, upgrade, dest, key, verlink }) =>
+      `App: ${app}\nVersion: ${version}\nLink: ${upgrade}\nVerlink: ${verlink}\nPathname: ${key}\nTarget: ${dest}`,
     stats({ download, peers }) {
       const dl =
         download.bytes + download.speed === 0
@@ -46,6 +47,22 @@ class InstallCmd extends Opstream {
     }
   }
 
+  static async runner(cmd) {
+    const { json, only, to, dhtBootstrap } = cmd.flags
+    const timeout = (cmd.flags.timeout || 30) * 1000
+    const link = cmd.args.link ?? pkg.pear.platform.key
+    const bootstrap = dhtBootstrap
+      ? dhtBootstrap.split(',').map((tuple) => {
+          const [host, port] = tuple.split(':')
+          const int = +port
+          if (Number.isInteger(int) === false) throw new Error(`Invalid port: ${port}`)
+          return { host, port: int }
+        })
+      : undefined
+    const stream = new InstallCmd({ link, only, to, bootstrap, timeout })
+    await InstallCmd.output(json, stream)
+  }
+
   constructor(params) {
     super((...args) => this.#op(...args), params)
   }

package/index.js

@@ -192,7 +192,17 @@ class Install extends ReadyResource {
     let installed = 0
     for (const { filename, ext, dest, isBin } of installs) {
       const key = appPath + filename + ext
-      this.emit('app', { app: filename, name, version, upgrade, key, tmp, dest })
+      const verlink = plink.serialize({ drive: this.drive.core })
+      this.emit('app', {
+        app: filename,
+        name,
+        version,
+        upgrade,
+        verlink,
+        key,
+        tmp,
+        dest
+      })
 
       const from = path.join(tmp, 'by-arch', host, 'app', filename + ext)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-install",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "main": "index.js",
   "type": "commonjs",
   "description": "Install Pear and Pear Applications",
@@ -12,7 +12,8 @@
   "bin": "bin.js",
   "exports": {
     ".": "./index.js",
-    "./cmd": "./cmd.js"
+    "./cmd": "./cmd.js",
+    "./package.json": "./package.json"
   },
   "imports": {
     "process": {