pterm 0.0.13 → 0.0.15

package/README.md

@@ -24,6 +24,7 @@ pterm version <type>
   - `terminal`: returns the pterm version
   - `pinokiod`: returns the pinokiod version
   - `pinokio`: returns the pinokio version
+  - `script`: returns the valid script version for the current client. used for including in `pinokio.js`
 
 ### example
 

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.13",
+  "version": "0.0.15",
   "description": "",
   "main": "index.js",
   "bin": {

package/util.js

@@ -3,6 +3,55 @@ 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 response = await axios.get("http://localhost:42000/apps/search", {
+      params: { q: query }
+    })
+    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 +153,9 @@ class Util {
           }
         })
       }
-      process.exit()
+      if (!argv.no_exit) {
+        process.exit()
+      }
     } else {
       console.error("required argument: <uri>")
     }