@platformatic/control 1.33.0 → 1.35.1

package/control.js

@@ -47,7 +47,7 @@ async function runControl (argv) {
     strict: false
   }).values
 
-  if (args.version) {
+  if (args.version && argv[0] !== 'inject') {
     const packageJson = require(join(__dirname, 'package.json'))
     console.log(packageJson.version)
     process.exit(0)

package/help/inject.txt

@@ -16,6 +16,7 @@ Options:
 * `-H, --header <string>` - The request header. Can be used multiple times.
 * `-d, --data <string>` - The request data.
 * `-i, --include <boolean>` - Include the response headers in the output. Default is `false`.
+* `-v, --verbose <boolean>` - Make the operation more talkative. Default is `false`.
 * `-o, --output <file>` - Write the response to the specified file.
 
 The `inject` command sends a request to the runtime service and prints the

package/lib/inject.js

@@ -16,6 +16,7 @@ async function injectRuntimeCommand (argv) {
       header: { type: 'string', short: 'H', multiple: true },
       data: { type: 'string', short: 'd' },
       include: { type: 'boolean', short: 'i', default: false },
+      verbose: { type: 'boolean', short: 'v', default: false },
       output: { type: 'string', short: 'o' }
     },
     strict: false
@@ -34,30 +35,59 @@ async function injectRuntimeCommand (argv) {
     throw errors.MissingRequestURL()
   }
 
+  let result = ''
+
   const fullUrl = new URL(positionals[0], runtime.url)
   const injectPath = fullUrl.href.slice(runtime.url.length)
 
   const method = args.request
   const body = args.data
 
+  if (args.verbose) {
+    result += `> ${method} ${injectPath} HTTP/1.1\n`
+  }
+
   const headers = {}
   for (const header of args.header || []) {
     const [name, value] = header.split(':')
     headers[name] = value
+
+    if (args.verbose) {
+      result += `> ${name}: ${value}\n`
+    }
+  }
+
+  if (args.verbose && args.header.length > 0) {
+    result += '> \n'
   }
 
   const injectOptions = { url: injectPath, method, headers, body }
 
   const response = await client.injectRuntime(runtime.pid, serviceId, injectOptions)
 
-  let result = ''
+  if (args.verbose) {
+    result += `< HTTP/1.1 ${response.statusCode}\n`
+  }
   if (args.include) {
     result += `HTTP/1.1 ${response.statusCode}\n`
-    for (const header in response.headers) {
+  }
+
+  for (const header in response.headers) {
+    if (args.verbose) {
+      result += `< ${header}: ${response.headers[header]}\n`
+    }
+    if (args.include) {
       result += `${header}: ${response.headers[header]}\n`
     }
+  }
+
+  if (args.verbose) {
+    result += '< \n'
+  }
+  if (args.include) {
     result += '\n'
   }
+
   result += await response.body.text()
 
   if (args.output) {

package/lib/runtime-api-client.js

@@ -204,12 +204,14 @@ class RuntimeApiClient {
     return webSocketStream
   }
 
-  async getRuntimeLogsStream (pid, logsId) {
+  async getRuntimeLogsStream (pid, logsId, options = {}) {
+    const runtimePID = options.runtimePID ?? pid
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
       path: '/api/v1/logs/' + logsId,
-      method: 'GET'
+      method: 'GET',
+      query: { pid: runtimePID }
     })
 
     if (statusCode !== 200) {
@@ -220,12 +222,14 @@ class RuntimeApiClient {
     return body
   }
 
-  async getRuntimeAllLogsStream (pid) {
+  async getRuntimeAllLogsStream (pid, options = {}) {
+    const runtimePID = options.runtimePID ?? pid
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
       path: '/api/v1/logs/all',
-      method: 'GET'
+      method: 'GET',
+      query: { pid: runtimePID }
     })
 
     if (statusCode !== 200) {
@@ -236,12 +240,14 @@ class RuntimeApiClient {
     return body
   }
 
-  async getRuntimeLogIndexes (pid) {
+  async getRuntimeLogIndexes (pid, options = {}) {
+    const all = options.all ?? false
     const client = this.#getUndiciClient(pid)
 
     const { statusCode, body } = await client.request({
       path: '/api/v1/logs/indexes',
-      method: 'GET'
+      method: 'GET',
+      query: { all }
     })
 
     if (statusCode !== 200) {
@@ -249,8 +255,10 @@ class RuntimeApiClient {
       throw new errors.FailedToGetRuntimeLogIndexes(error)
     }
 
-    const { indexes } = await body.json()
-    return indexes
+    const result = await body.json()
+    if (all) return result
+
+    return result.indexes
   }
 
   async injectRuntime (pid, serviceId, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/control",
-  "version": "1.33.0",
+  "version": "1.35.1",
   "description": "Platformatic Control",
   "main": "index.js",
   "bin": {
@@ -17,14 +17,14 @@
   },
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
-    "borp": "^0.10.0",
+    "borp": "^0.11.0",
     "desm": "^1.3.1",
     "execa": "^8.0.1",
     "snazzy": "^9.0.0",
     "split2": "^4.2.0",
     "standard": "^17.1.0",
     "tsd": "^0.31.0",
-    "@platformatic/runtime": "1.33.0"
+    "@platformatic/runtime": "1.35.1"
   },
   "dependencies": {
     "@fastify/error": "^3.4.1",