pterm 0.0.14 → 0.0.16

package/README.md

@@ -108,9 +108,11 @@ Run a launcher. Equivalent to the user visiting a launcher page. Will run whiche
 ### syntax
 
 ```
-pterm run <launcher_path>
+pterm run <launcher_path_or_uri> [--open]
 ```
 
+- `--open`: (optional) open URL results in the browser. Default behavior is to print the URL to stdout without opening a browser.
+
 ### examples
 
 Launch the launcher in the current path
@@ -125,6 +127,88 @@ Launch from absolute path
 pterm run /pinokio/api/test
 ```
 
+Run from a launcher URI and auto-open the resulting URL in browser
+
+```
+pterm run https://github.com/example/my-launcher --open
+```
+
+## search
+
+Search installed or available apps.
+
+### syntax
+
+```
+pterm search [query words...]
+pterm search --q="<query>"
+pterm search "<query>" [--mode=balanced|broad|strict] [--min-match=<n>] [--limit=<n>]
+```
+
+- `--mode`: (optional) search strategy. `broad` (default), `balanced`, or `strict`.
+- `--min-match`: (optional) minimum number of query terms an app should match.
+- `--limit`: (optional) max number of app results to return.
+
+### examples
+
+```
+pterm search comfyui
+```
+
+```
+pterm search --q="text generation"
+```
+
+```
+pterm search "tts speech synthesis" --mode=balanced --min-match=2 --limit=8
+```
+
+## status
+
+Get app status by app id.
+
+### syntax
+
+```
+pterm status <app_id> [--probe] [--timeout=<ms>]
+```
+
+- `--probe`: (optional) actively probe app health.
+- `--timeout`: (optional) probe timeout in milliseconds.
+
+### examples
+
+```
+pterm status comfyanonymous-comfyui
+```
+
+```
+pterm status comfyanonymous-comfyui --probe --timeout=5000
+```
+
+## logs
+
+Get app logs by app id.
+
+### syntax
+
+```
+pterm logs <app_id> [--script=<name>] [--tail=<lines>]
+```
+
+- `--script`: (optional) filter to a script.
+- `--tail`: (optional) return only the last N lines.
+
+### examples
+
+```
+pterm logs comfyanonymous-comfyui
+```
+
+```
+pterm logs comfyanonymous-comfyui --script=start --tail=200
+```
+
 ## filepicker
 
 Display a file picker dialog, which lets the user select one or more file or folder paths, powered by tkinter.
@@ -268,4 +352,3 @@ pterm push 'this is a notification' --sound
 ```
 pterm push 'this is an image notification' --image=icon.png
 ```
-

package/index.js

@@ -2,11 +2,12 @@
 const path = require('path')
 const yargs = require('yargs/yargs')
 const { hideBin } = require('yargs/helpers')
+const argv = yargs(hideBin(process.argv)).parse();
 const Script = require('./script')
 const Util = require('./util')
-const argv = yargs(hideBin(process.argv)).parse();
 const script = new Script();
 const util = new Util();
+const isHttpUri = (value) => typeof value === "string" && /^https?:\/\//i.test(value);
 (async () => {
   if (argv._.length > 0) {
     let cmd = argv._[0].toLowerCase()
@@ -53,6 +54,12 @@ const util = new Util();
       await util.filepicker(argv)
     } else if (cmd === "download") {
       await util.download(argv)
+    } else if (cmd === "search") {
+      await util.search(argv)
+    } else if (cmd === "status") {
+      await util.status(argv)
+    } else if (cmd === "logs") {
+      await util.logs(argv)
     } else if (cmd === "stop") {
       await script.stop(argv)
     } else if (cmd === "start") {
@@ -65,12 +72,13 @@ const util = new Util();
     } else if (cmd === "run") {
       if (argv._.length > 1) {
         let _uri = argv._[1]
-        const uri = path.resolve(process.cwd(), _uri)
+        const uri = isHttpUri(_uri) ? _uri : path.resolve(process.cwd(), _uri)
         // try downloading first
-        if (path.isAbsolute(uri)) {
-        } else {
-          // url
-          await util.download(argv)
+        if (isHttpUri(uri)) {
+          await util.download({
+            ...argv,
+            no_exit: true
+          })
         }
         while(true) {
           let default_uri = await script.default_script(uri)
@@ -87,9 +95,13 @@ const util = new Util();
                 break
               }
             } else {
-              // open in browser
-              let response = await util.open_url(default_uri)  
-              console.log({ response })
+              // default behavior is no browser side effect.
+              if (argv.open) {
+                let response = await util.open_url(default_uri)
+                console.log({ response })
+              } else {
+                console.log(default_uri)
+              }
               break
             }
           } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pterm",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "",
   "main": "index.js",
   "bin": {

package/util.js

@@ -3,6 +3,74 @@ const axios = require('axios')
 const path = require('path')
 const RPC = require('./rpc')
 class Util {
+  printJson(payload) {
+    process.stdout.write(JSON.stringify(payload, null, 2))
+    process.stdout.write("\n")
+  }
+  async search(argv) {
+    const query = (argv._.slice(1).join(" ") || argv.q || "").trim()
+    const params = { q: query }
+    const mode = typeof argv.mode === "string" ? argv.mode.trim().toLowerCase() : ""
+    const minMatchRaw = argv.minMatch ?? argv["min-match"] ?? argv.min_match
+    const limitRaw = argv.limit
+    if (mode === "broad" || mode === "balanced" || mode === "strict") {
+      params.mode = mode
+    }
+    if (minMatchRaw !== undefined && minMatchRaw !== null && minMatchRaw !== "") {
+      const minMatch = Number.parseInt(String(minMatchRaw), 10)
+      if (Number.isFinite(minMatch) && minMatch > 0) {
+        params.min_match = String(minMatch)
+      }
+    }
+    if (limitRaw !== undefined && limitRaw !== null && limitRaw !== "") {
+      const limit = Number.parseInt(String(limitRaw), 10)
+      if (Number.isFinite(limit) && limit > 0) {
+        params.limit = String(limit)
+      }
+    }
+    const response = await axios.get("http://localhost:42000/apps/search", {
+      params
+    })
+    this.printJson(response.data)
+  }
+  async status(argv) {
+    if (argv._.length <= 1) {
+      console.error("required argument: <app_id>")
+      return
+    }
+    const appId = argv._[1]
+    const probe = argv.probe ? "1" : "0"
+    const timeout = argv.timeout ? Number.parseInt(String(argv.timeout), 10) : null
+    const params = new URLSearchParams()
+    params.set("probe", probe)
+    if (Number.isFinite(timeout) && timeout > 0) {
+      params.set("timeout", String(timeout))
+    }
+    const url = `http://localhost:42000/apps/status/${encodeURIComponent(appId)}?${params.toString()}`
+    const response = await axios.get(url)
+    this.printJson(response.data)
+  }
+  async logs(argv) {
+    if (argv._.length <= 1) {
+      console.error("required argument: <app_id>")
+      return
+    }
+    const appId = argv._[1]
+    const params = new URLSearchParams()
+    if (argv.script) {
+      params.set("script", String(argv.script))
+    }
+    if (argv.tail) {
+      const tail = Number.parseInt(String(argv.tail), 10)
+      if (Number.isFinite(tail) && tail > 0) {
+        params.set("tail", String(tail))
+      }
+    }
+    const suffix = params.toString() ? `?${params.toString()}` : ""
+    const url = `http://localhost:42000/apps/logs/${encodeURIComponent(appId)}${suffix}`
+    const response = await axios.get(url)
+    this.printJson(response.data)
+  }
   async filepicker(argv) {
     const rpc = new RPC("ws://localhost:42000")
     if (argv.path) {
@@ -104,7 +172,9 @@ class Util {
           }
         })
       }
-      process.exit()
+      if (!argv.no_exit) {
+        process.exit()
+      }
     } else {
       console.error("required argument: <uri>")
     }