@osaas/cli 4.27.2 → 4.29.0

package/dist/cli.js

@@ -50,7 +50,8 @@ const packageJson = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(__dirname
 cli.version(packageJson.version, '-v, --version', 'Output the current version');
 cli
     .configureHelp({ showGlobalOptions: true })
-    .option('--env <environment>', 'Environment to use (overrides ENVIRONMENT env var)', process.env.ENVIRONMENT || 'prod');
+    .option('--env <environment>', 'Environment to use (overrides ENVIRONMENT env var)', process.env.ENVIRONMENT || 'prod')
+    .option('--json', 'Output as structured JSON (human-readable output goes to stderr)');
 cli.addCommand((0, login_1.cmdLogin)());
 cli.hook('preAction', async (thisCommand) => {
     const commandName = thisCommand.args?.[0] || thisCommand.name();

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/user/cmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/user/cmd.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,wBAAgB,OAAO,YA0BtB;AAED,wBAAgB,SAAS,YAkCxB;AAED,wBAAgB,WAAW,YA6D1B;AAED,wBAAgB,SAAS,YAyBxB;AAED,wBAAgB,UAAU,YA+BzB;AAED,wBAAgB,OAAO,YA0BtB;AAED,wBAAgB,sBAAsB,YA2BrC;AAED,wBAAgB,sBAAsB,YA6BrC;AAED,wBAAgB,gBAAgB,YAyB/B;AAED,wBAAgB,qBAAqB,YAkBpC;AAED,wBAAgB,UAAU,YAyHzB"}
+{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/user/cmd.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,wBAAgB,OAAO,YAsCtB;AAED,wBAAgB,SAAS,YA8CxB;AAED,wBAAgB,WAAW,YAsF1B;AAED,wBAAgB,SAAS,YAqCxB;AAED,wBAAgB,UAAU,YA2CzB;AAED,wBAAgB,OAAO,YAsCtB;AAED,wBAAgB,sBAAsB,YA2BrC;AAED,wBAAgB,sBAAsB,YA6BrC;AAED,wBAAgB,gBAAgB,YAyB/B;AAED,wBAAgB,qBAAqB,YAkBpC;AAED,wBAAgB,UAAU,YAyHzB"}

package/dist/user/cmd.js

@@ -16,10 +16,22 @@ function cmdList() {
             const ctx = new client_core_1.Context({ environment });
             const serviceAccessToken = await ctx.getServiceAccessToken(serviceId);
             const instances = await (0, client_core_1.listInstances)(ctx, serviceId, serviceAccessToken);
-            return instances.map((instance) => console.log(instance.name));
+            const isJson = command.optsWithGlobals().json;
+            if (isJson) {
+                process.stdout.write(JSON.stringify(instances) + '\n');
+            }
+            else {
+                instances.map((instance) => console.log(instance.name));
+            }
         }
         catch (err) {
-            console.log(err.message);
+            const isJson = command.optsWithGlobals().json;
+            if (isJson) {
+                process.stderr.write(JSON.stringify({ error: err.message }) + '\n');
+            }
+            else {
+                console.log(err.message);
+            }
         }
     });
     return list;
@@ -42,11 +54,23 @@ function cmdCreate() {
             const ctx = new client_core_1.Context({ environment });
             const serviceAccessToken = await ctx.getServiceAccessToken(serviceId);
             const instance = await (0, client_core_1.createInstance)(ctx, serviceId, serviceAccessToken, payload);
-            console.log('Instance created:');
-            console.log(instance);
+            const isJson = command.optsWithGlobals().json;
+            if (isJson) {
+                process.stdout.write(JSON.stringify(instance) + '\n');
+            }
+            else {
+                console.log('Instance created:');
+                console.log(instance);
+            }
         }
         catch (err) {
-            console.log(err.message);
+            const isJson = command.optsWithGlobals().json;
+            if (isJson) {
+                process.stderr.write(JSON.stringify({ error: err.message }) + '\n');
+            }
+            else {
+                console.log(err.message);
+            }
         }
     });
     return create;
@@ -65,39 +89,60 @@ function cmdDescribe() {
             const ctx = new client_core_1.Context({ environment });
             const serviceAccessToken = await ctx.getServiceAccessToken(serviceId);
             const instance = await (0, client_core_1.getInstance)(ctx, serviceId, name, serviceAccessToken);
-            delete instance['resources'];
-            delete instance['_links'];
-            Object.keys(instance).forEach((key) => {
-                if (typeof instance[key] !== 'object') {
-                    console.log(`${key}: ${instance[key]}`);
+            const isJson = command.optsWithGlobals().json;
+            if (isJson) {
+                delete instance['resources'];
+                delete instance['_links'];
+                try {
+                    const ports = await (0, client_core_1.getPortsForInstance)(ctx, serviceId, name, serviceAccessToken);
+                    instance['ports'] = ports;
                 }
-                else {
-                    console.log(`${key}:`);
-                    Object.keys(instance[key]).forEach((subKey) => {
-                        if (typeof instance[key][subKey] !== 'object') {
-                            console.log(`  ${subKey}: ${instance[key][subKey]}`);
-                        }
-                        else {
-                            console.log(`  ${subKey}:`);
-                            Object.keys(instance[key][subKey]).forEach((subSubKey) => {
-                                console.log(`    ${subSubKey}: ${instance[key][subKey][subSubKey]}`);
-                            });
-                        }
-                    });
+                catch (err) {
+                    // No ports for this service
                 }
-            });
-            try {
-                const ports = await (0, client_core_1.getPortsForInstance)(ctx, serviceId, name, serviceAccessToken);
-                ports.forEach((port) => {
-                    console.log(`${port.externalIp}:${port.externalPort} => ${port.internalPort}`);
-                });
+                process.stdout.write(JSON.stringify(instance) + '\n');
             }
-            catch (err) {
-                // No ports for this service
+            else {
+                delete instance['resources'];
+                delete instance['_links'];
+                Object.keys(instance).forEach((key) => {
+                    if (typeof instance[key] !== 'object') {
+                        console.log(`${key}: ${instance[key]}`);
+                    }
+                    else {
+                        console.log(`${key}:`);
+                        Object.keys(instance[key]).forEach((subKey) => {
+                            if (typeof instance[key][subKey] !== 'object') {
+                                console.log(`  ${subKey}: ${instance[key][subKey]}`);
+                            }
+                            else {
+                                console.log(`  ${subKey}:`);
+                                Object.keys(instance[key][subKey]).forEach((subSubKey) => {
+                                    console.log(`    ${subSubKey}: ${instance[key][subKey][subSubKey]}`);
+                                });
+                            }
+                        });
+                    }
+                });
+                try {
+                    const ports = await (0, client_core_1.getPortsForInstance)(ctx, serviceId, name, serviceAccessToken);
+                    ports.forEach((port) => {
+                        console.log(`${port.externalIp}:${port.externalPort} => ${port.internalPort}`);
+                    });
+                }
+                catch (err) {
+                    // No ports for this service
+                }
             }
         }
         catch (err) {
-            console.log(err.message);
+            const isJson = command.optsWithGlobals().json;
+            if (isJson) {
+                process.stderr.write(JSON.stringify({ error: err.message }) + '\n');
+            }
+            else {
+                console.log(err.message);
+            }
         }
     });
     return describe;
@@ -116,14 +161,26 @@ function cmdRemove() {
             const environment = globalOpts?.env || 'prod';
             const ctx = new client_core_1.Context({ environment });
             const serviceAccessToken = await ctx.getServiceAccessToken(serviceId);
-            if (!options.yes) {
+            const isJson = command.optsWithGlobals().json;
+            if (!options.yes && !isJson) {
                 await (0, util_1.confirm)(`Are you sure you want to remove ${name}? (yes/no) `);
             }
             await (0, client_core_1.removeInstance)(ctx, serviceId, name, serviceAccessToken);
-            console.log('Instance removed');
+            if (isJson) {
+                process.stdout.write(JSON.stringify({ removed: true }) + '\n');
+            }
+            else {
+                console.log('Instance removed');
+            }
         }
         catch (err) {
-            console.log(err.message);
+            const isJson = command.optsWithGlobals().json;
+            if (isJson) {
+                process.stderr.write(JSON.stringify({ error: err.message }) + '\n');
+            }
+            else {
+                console.log(err.message);
+            }
         }
     });
     return remove;
@@ -146,11 +203,23 @@ function cmdRestart() {
                 throw new Error(`Instance ${name} of service ${serviceId} not found`);
             }
             await (0, client_core_1.restartInstance)(ctx, serviceId, name, serviceAccessToken);
-            console.log(`Instance ${name} of service ${serviceId} restarted`);
+            const isJson = command.optsWithGlobals().json;
+            if (isJson) {
+                process.stdout.write(JSON.stringify({ restarted: true }) + '\n');
+            }
+            else {
+                console.log(`Instance ${name} of service ${serviceId} restarted`);
+            }
         }
         catch (err) {
-            console.log('Error restarting instance:');
-            console.log(err.message);
+            const isJson = command.optsWithGlobals().json;
+            if (isJson) {
+                process.stderr.write(JSON.stringify({ error: err.message }) + '\n');
+            }
+            else {
+                console.log('Error restarting instance:');
+                console.log(err.message);
+            }
         }
     });
     return restart;
@@ -169,10 +238,22 @@ function cmdLogs() {
             const ctx = new client_core_1.Context({ environment });
             const serviceAccessToken = await ctx.getServiceAccessToken(serviceId);
             const logs = await (0, client_core_1.getLogsForInstance)(ctx, serviceId, name, serviceAccessToken);
-            console.log(logs);
+            const isJson = command.optsWithGlobals().json;
+            if (isJson) {
+                process.stdout.write(JSON.stringify({ logs }) + '\n');
+            }
+            else {
+                console.log(logs);
+            }
         }
         catch (err) {
-            console.log(err.message);
+            const isJson = command.optsWithGlobals().json;
+            if (isJson) {
+                process.stderr.write(JSON.stringify({ error: err.message }) + '\n');
+            }
+            else {
+                console.log(err.message);
+            }
         }
     });
     return logs;

package/dist/user/cmd.js.map

@@ -1 +1 @@
-{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../src/user/cmd.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../src/user/cmd.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osaas/cli",
-  "version": "4.27.2",
+  "version": "4.29.0",
   "description": "Open Source Cloud CLI",
   "author": "Eyevinn Open Source Cloud <osc@eyevinn.se>",
   "homepage": "https://www.osaas.io",
@@ -21,12 +21,12 @@
     "test": "jest --pass-with-no-tests"
   },
   "dependencies": {
-    "@osaas/client-ai": "^0.4.12",
-    "@osaas/client-core": "^0.22.0",
-    "@osaas/client-db": "^0.6.11",
-    "@osaas/client-intercom": "^0.3.7",
-    "@osaas/client-transcode": "^0.27.4",
-    "@osaas/client-web": "^0.5.15",
+    "@osaas/client-ai": "^0.5.0",
+    "@osaas/client-core": "^0.23.0",
+    "@osaas/client-db": "^0.7.0",
+    "@osaas/client-intercom": "^0.4.0",
+    "@osaas/client-transcode": "^0.28.0",
+    "@osaas/client-web": "^0.6.0",
     "@types/promptly": "^3.0.5",
     "chalk": "4.1.2",
     "commander": "^12.1.0",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "95e06fc41d97c621992e984e921530eb72ef98a6"
+  "gitHead": "fef2059e35c5b53476859b47c9e371c38aa79305"
 }

package/src/cli.ts

@@ -33,6 +33,10 @@ cli
     '--env <environment>',
     'Environment to use (overrides ENVIRONMENT env var)',
     process.env.ENVIRONMENT || 'prod'
+  )
+  .option(
+    '--json',
+    'Output as structured JSON (human-readable output goes to stderr)'
   );
 
 cli.addCommand(cmdLogin());

package/src/user/cmd.ts

@@ -33,11 +33,23 @@ export function cmdList() {
           serviceId,
           serviceAccessToken
         );
-        return instances.map((instance: { name: string }) =>
-          console.log(instance.name)
-        );
+        const isJson = command.optsWithGlobals().json;
+        if (isJson) {
+          process.stdout.write(JSON.stringify(instances) + '\n');
+        } else {
+          instances.map((instance: { name: string }) =>
+            console.log(instance.name)
+          );
+        }
       } catch (err) {
-        console.log((err as Error).message);
+        const isJson = command.optsWithGlobals().json;
+        if (isJson) {
+          process.stderr.write(
+            JSON.stringify({ error: (err as Error).message }) + '\n'
+          );
+        } else {
+          console.log((err as Error).message);
+        }
       }
     });
   return list;
@@ -70,10 +82,22 @@ export function cmdCreate() {
           serviceAccessToken,
           payload
         );
-        console.log('Instance created:');
-        console.log(instance);
+        const isJson = command.optsWithGlobals().json;
+        if (isJson) {
+          process.stdout.write(JSON.stringify(instance) + '\n');
+        } else {
+          console.log('Instance created:');
+          console.log(instance);
+        }
       } catch (err) {
-        console.log((err as Error).message);
+        const isJson = command.optsWithGlobals().json;
+        if (isJson) {
+          process.stderr.write(
+            JSON.stringify({ error: (err as Error).message }) + '\n'
+          );
+        } else {
+          console.log((err as Error).message);
+        }
       }
     });
   return create;
@@ -99,44 +123,69 @@ export function cmdDescribe() {
           name,
           serviceAccessToken
         );
-        delete instance['resources'];
-        delete instance['_links'];
-        Object.keys(instance).forEach((key) => {
-          if (typeof instance[key] !== 'object') {
-            console.log(`${key}: ${instance[key]}`);
-          } else {
-            console.log(`${key}:`);
-            Object.keys(instance[key]).forEach((subKey) => {
-              if (typeof instance[key][subKey] !== 'object') {
-                console.log(`  ${subKey}: ${instance[key][subKey]}`);
-              } else {
-                console.log(`  ${subKey}:`);
-                Object.keys(instance[key][subKey]).forEach((subSubKey) => {
-                  console.log(
-                    `    ${subSubKey}: ${instance[key][subKey][subSubKey]}`
-                  );
-                });
-              }
-            });
-          }
-        });
-        try {
-          const ports = await getPortsForInstance(
-            ctx,
-            serviceId,
-            name,
-            serviceAccessToken
-          );
-          ports.forEach((port) => {
-            console.log(
-              `${port.externalIp}:${port.externalPort} => ${port.internalPort}`
+        const isJson = command.optsWithGlobals().json;
+        if (isJson) {
+          delete instance['resources'];
+          delete instance['_links'];
+          try {
+            const ports = await getPortsForInstance(
+              ctx,
+              serviceId,
+              name,
+              serviceAccessToken
             );
+            instance['ports'] = ports;
+          } catch (err) {
+            // No ports for this service
+          }
+          process.stdout.write(JSON.stringify(instance) + '\n');
+        } else {
+          delete instance['resources'];
+          delete instance['_links'];
+          Object.keys(instance).forEach((key) => {
+            if (typeof instance[key] !== 'object') {
+              console.log(`${key}: ${instance[key]}`);
+            } else {
+              console.log(`${key}:`);
+              Object.keys(instance[key]).forEach((subKey) => {
+                if (typeof instance[key][subKey] !== 'object') {
+                  console.log(`  ${subKey}: ${instance[key][subKey]}`);
+                } else {
+                  console.log(`  ${subKey}:`);
+                  Object.keys(instance[key][subKey]).forEach((subSubKey) => {
+                    console.log(
+                      `    ${subSubKey}: ${instance[key][subKey][subSubKey]}`
+                    );
+                  });
+                }
+              });
+            }
           });
-        } catch (err) {
-          // No ports for this service
+          try {
+            const ports = await getPortsForInstance(
+              ctx,
+              serviceId,
+              name,
+              serviceAccessToken
+            );
+            ports.forEach((port) => {
+              console.log(
+                `${port.externalIp}:${port.externalPort} => ${port.internalPort}`
+              );
+            });
+          } catch (err) {
+            // No ports for this service
+          }
         }
       } catch (err) {
-        console.log((err as Error).message);
+        const isJson = command.optsWithGlobals().json;
+        if (isJson) {
+          process.stderr.write(
+            JSON.stringify({ error: (err as Error).message }) + '\n'
+          );
+        } else {
+          console.log((err as Error).message);
+        }
       }
     });
   return describe;
@@ -157,13 +206,25 @@ export function cmdRemove() {
         const ctx = new Context({ environment });
         const serviceAccessToken = await ctx.getServiceAccessToken(serviceId);
 
-        if (!options.yes) {
+        const isJson = command.optsWithGlobals().json;
+        if (!options.yes && !isJson) {
           await confirm(`Are you sure you want to remove ${name}? (yes/no) `);
         }
         await removeInstance(ctx, serviceId, name, serviceAccessToken);
-        console.log('Instance removed');
+        if (isJson) {
+          process.stdout.write(JSON.stringify({ removed: true }) + '\n');
+        } else {
+          console.log('Instance removed');
+        }
       } catch (err) {
-        console.log((err as Error).message);
+        const isJson = command.optsWithGlobals().json;
+        if (isJson) {
+          process.stderr.write(
+            JSON.stringify({ error: (err as Error).message }) + '\n'
+          );
+        } else {
+          console.log((err as Error).message);
+        }
       }
     });
   return remove;
@@ -193,10 +254,22 @@ export function cmdRestart() {
           throw new Error(`Instance ${name} of service ${serviceId} not found`);
         }
         await restartInstance(ctx, serviceId, name, serviceAccessToken);
-        console.log(`Instance ${name} of service ${serviceId} restarted`);
+        const isJson = command.optsWithGlobals().json;
+        if (isJson) {
+          process.stdout.write(JSON.stringify({ restarted: true }) + '\n');
+        } else {
+          console.log(`Instance ${name} of service ${serviceId} restarted`);
+        }
       } catch (err) {
-        console.log('Error restarting instance:');
-        console.log((err as Error).message);
+        const isJson = command.optsWithGlobals().json;
+        if (isJson) {
+          process.stderr.write(
+            JSON.stringify({ error: (err as Error).message }) + '\n'
+          );
+        } else {
+          console.log('Error restarting instance:');
+          console.log((err as Error).message);
+        }
       }
     });
   return restart;
@@ -222,9 +295,21 @@ export function cmdLogs() {
           name,
           serviceAccessToken
         );
-        console.log(logs);
+        const isJson = command.optsWithGlobals().json;
+        if (isJson) {
+          process.stdout.write(JSON.stringify({ logs }) + '\n');
+        } else {
+          console.log(logs);
+        }
       } catch (err) {
-        console.log((err as Error).message);
+        const isJson = command.optsWithGlobals().json;
+        if (isJson) {
+          process.stderr.write(
+            JSON.stringify({ error: (err as Error).message }) + '\n'
+          );
+        } else {
+          console.log((err as Error).message);
+        }
       }
     });
   return logs;