Added CLI to the script app

Author: pajama-coder

agent/apps/ztm/proxy/cli.js

@@ -17,7 +17,7 @@ export default function ({ api, utils }) {
     }
 
     function flush() {
-      return [buffer, new StreamEnd]
+      return Promise.resolve([buffer, new StreamEnd])
     }
 
     try {
@@ -87,7 +87,7 @@ export default function ({ api, utils }) {
 
     } catch (err) {
       error(err)
-      return Promise.resolve(flush())
+      return flush()
     }
   }
 }

agent/apps/ztm/script/cli.js

@@ -2,31 +2,60 @@ export default function ({ app, api, utils }) {
   var $handler
 
   return pipeline($=>$
-    .onStart(ctx => main(ctx).then(h => void ($handler = h)))
-    .pipe(() => $handler)
+    .onStart(ctx => main(ctx))
   )
 
-  function main({ argv, endpoint }) {
+  function main({ argv, cwd, endpoint }) {
     var buffer = new Data
 
     function output(str) {
       buffer.push(str)
     }
 
+    function flush() {
+      return Promise.resolve([buffer, new StreamEnd])
+    }
+
     function error(err) {
       output('ztm: ')
       output(err.message || err.toString())
       output('\n')
+      return flush()
     }
 
-    function flush() {
-      return Promise.resolve(
-        pipeline($=>$
-          .replaceStreamStart([buffer, new StreamEnd])
-        )
-      )
-    }
+    try {
+      return utils.parseArgv(['ztm proxy', ...argv], {
+        help: text => Promise.resolve(output(text + '\n')),
+        commands: [
+          {
+            title: 'Execute a script on a remote endpoint',
+            usage: '<filename>',
+            options: `
+              --, --args  ...   Pass all options afterwards to the script
+            `,
+            action: (args) => {
+              var pathname = os.path.resolve(cwd, args['<filename>'])
+              var script = os.read(pathname)
+              var argv = args['--args'] || []
+              return pipeline($=>$
+                .onStart(new Message(
+                  {
+                    method: 'POST',
+                    path: `/api/script?argv=${URL.encodeComponent(JSON.stringify(argv))}`
+                  },
+                  script
+                ))
+                .pipe(api.executeScriptRemote, () => endpoint.id)
+                .replaceMessage(res => {
+                  output(res?.body || new Data)
+                  return new StreamEnd
+                })
+              ).spawn()
+            }
+          }
+        ]
+      }).then(flush).catch(error)
 
-    return flush()
+    } catch (err) { return error(err) }
   }
 }

agent/cmdline.js

@@ -131,7 +131,8 @@ function parseOptions(format, argv) {
           if (t.endsWith(',')) t = t.substring(0, t.length - 1)
           aliases.push(t)
         } else {
-          if (t.endsWith('...]') || t.endsWith('...>')) type = 'array'
+          if (t === '...') type = 'remainder array'
+          else if (t.endsWith('...]') || t.endsWith('...>')) type = 'array'
           else if (t.startsWith('[')) type = 'optional string'
           else if (t.startsWith('<')) type = 'string'
           else type = 'boolean'
@@ -147,6 +148,10 @@ function parseOptions(format, argv) {
 
   argv.forEach(arg => {
     if (currentOption) {
+      if (options[currentOption]?.type === 'remainder array') {
+        addOption(currentOption, arg)
+        return
+      }
       if (arg.startsWith('-')) {
         endOption(currentOption)
         currentOption = undefined
@@ -182,6 +187,7 @@ function parseOptions(format, argv) {
         option.value = value
         break
       case 'array':
+      case 'remainder array':
         option.value ??= []
         option.value.push(value)
         break

agent/main.js

@@ -463,15 +463,15 @@ pipy.listen(listen, $=>$
           }
         ),
         'app': ($=>$
-          .muxHTTP(() => {
-            $appPipeline = api.connectApp(
-              $params.mesh,
-              $params.provider,
-              $params.app,
-            ) || appNotFound
-            return $appPipeline
-          }, { version: 2 }).to($=>$
-            .pipe(() => $appPipeline, () => ({ source: 'user' }))
+          .muxHTTP().to($=>$
+            .pipe(
+              () => api.connectApp(
+                $params.mesh,
+                $params.provider,
+                $params.app,
+              ) || appNotFound,
+              () => ({ source: 'user' })
+            )
           )
         ),
         'gui': $=>$.replaceMessage(

agent/service.js

@@ -43,6 +43,7 @@ export function cliResponder(p) {
       var url = new URL(req.head.path)
       $cliCtx = {
         argv: JSON.parse(URL.decodeComponent(url.searchParams.get('argv'))),
+        cwd: URL.decodeComponent(url.searchParams.get('cwd')),
         endpoint: {
           id: url.searchParams.get('ep_id'),
           name: URL.decodeComponent(url.searchParams.get('ep_name')),

cli/main.js

@@ -1056,6 +1056,7 @@ function callApp(argv, mesh, ep) {
 
     var url = `/api/meshes/${mesh.name}/apps/${app.provider}/${tagname}/cli`
     url += '?argv=' + URL.encodeComponent(JSON.stringify(argv))
+    url += '&cwd=' + URL.encodeComponent(os.path.resolve())
     url += '&ep_id=' + ep.id
     url += '&ep_name=' + URL.encodeComponent(ep.name)