securenow 5.3.2 → 5.3.4

package/cli/apps.js

@@ -4,32 +4,74 @@ const { api, requireAuth } = require('./client');
 const config = require('./config');
 const ui = require('./ui');
 
+const FREE_TRIAL_URL = 'https://freetrial.securenow.ai:4318';
+
+function instanceUrl(inst) {
+  if (!inst) return FREE_TRIAL_URL;
+  return `${inst.protocol || 'https'}://${inst.host}:4318`;
+}
+
+async function fetchInstanceMap() {
+  try {
+    const data = await api.get('/instances');
+    const instances = data.instances || [];
+    const map = {};
+    for (const inst of instances) {
+      map[inst._id] = inst;
+    }
+    return map;
+  } catch {
+    return {};
+  }
+}
+
 async function list(args, flags) {
   requireAuth();
   const s = ui.spinner('Fetching applications');
 
   try {
-    const data = await api.get('/applications');
-    const apps = data.applications || [];
+    const [appData, instMap] = await Promise.all([
+      api.get('/applications'),
+      fetchInstanceMap(),
+    ]);
+    const apps = appData.applications || [];
     s.stop(`Found ${apps.length} application${apps.length !== 1 ? 's' : ''}`);
     console.log('');
 
     if (flags.json) {
-      ui.json(apps);
+      const enriched = apps.map(app => ({
+        ...app,
+        instanceUrl: instanceUrl(app.instanceId ? instMap[app.instanceId] : null),
+      }));
+      ui.json(enriched);
       return;
     }
 
     const defaultApp = config.getDefaultApp();
-    const rows = apps.map(app => [
-      app.name + (app.key === defaultApp ? ui.c.cyan(' (default)') : ''),
-      ui.c.dim(app.key),
-      app.hosts?.length ? app.hosts.join(', ') : ui.c.dim('—'),
-      ui.timeAgo(app.createdAt),
-    ]);
+    const rows = apps.map(app => {
+      const inst = app.instanceId ? instMap[app.instanceId] : null;
+      const url = instanceUrl(inst);
+      const instLabel = inst ? `${inst.name} ${ui.c.dim(url)}` : `${ui.c.green('Free Trial')} ${ui.c.dim(url)}`;
+      return [
+        app.name + (app.key === defaultApp ? ui.c.cyan(' (default)') : ''),
+        ui.c.dim(app.key),
+        instLabel,
+        ui.timeAgo(app.createdAt),
+      ];
+    });
 
-    ui.table(['Name', 'Key', 'Hosts', 'Created'], rows);
+    ui.table(['Name', 'Key', 'Instance', 'Created'], rows);
     console.log('');
 
+    if (apps.length > 0) {
+      console.log(`  ${ui.c.bold('Add to your .env:')}`);
+      const first = apps.find(a => a.key === defaultApp) || apps[0];
+      const firstInst = first.instanceId ? instMap[first.instanceId] : null;
+      console.log(`    SECURENOW_APPID=${first.key}`);
+      console.log(`    SECURENOW_INSTANCE=${instanceUrl(firstInst)}`);
+      console.log('');
+    }
+
     if (!defaultApp && apps.length > 0) {
       ui.info(`Tip: Set a default app with ${ui.c.bold('securenow config set defaultApp <key>')}`);
       console.log('');
@@ -56,21 +98,36 @@ async function create(args, flags) {
   if (flags.hosts) {
     body.hosts = flags.hosts.split(',').map(h => h.trim());
   }
+
   if (flags.instance) {
     body.instanceId = flags.instance;
+  } else if (process.stdin.isTTY) {
+    body.instanceId = await pickInstance();
   }
 
+  const selectedInstanceId = body.instanceId;
+
   const s = ui.spinner(`Creating application "${name}"`);
   try {
     const result = await api.post('/applications', body);
     const app = result.application || result;
     s.stop(`Application created`);
 
+    let inst = null;
+    if (selectedInstanceId) {
+      try {
+        const instData = await api.get(`/instances/${selectedInstanceId}`);
+        inst = instData.instance || null;
+      } catch {}
+    }
+    const envUrl = instanceUrl(inst);
+
     console.log('');
     ui.keyValue([
       ['Name', app.name],
       ['Key', ui.c.green(ui.c.bold(app.key))],
       ['ID', ui.c.dim(app._id)],
+      ['Instance', inst ? `${inst.name} ${ui.c.dim(`(${envUrl})`)}` : `${ui.c.green('Free Trial')} ${ui.c.dim(`(${envUrl})`)}`],
       ['Hosts', app.hosts?.length ? app.hosts.join(', ') : ui.c.dim('none')],
     ]);
 
@@ -78,12 +135,13 @@ async function create(args, flags) {
     console.log(`  ${ui.c.bold('Add to your .env.local:')}`);
     console.log('');
     console.log(`    SECURENOW_APPID=${app.key}`);
+    console.log(`    SECURENOW_INSTANCE=${envUrl}`);
     console.log('');
     ui.info(`Set as default: ${ui.c.bold(`securenow config set defaultApp ${app.key}`)}`);
     console.log('');
 
     if (flags.json) {
-      ui.json(app);
+      ui.json({ ...app, instanceUrl: envUrl });
     }
   } catch (err) {
     s.fail('Failed to create application');
@@ -91,6 +149,61 @@ async function create(args, flags) {
   }
 }
 
+async function pickInstance() {
+  const s = ui.spinner('Loading instances');
+  let instances = [];
+  try {
+    const data = await api.get('/instances');
+    instances = data.instances || [];
+    s.stop('Instances loaded');
+  } catch {
+    s.stop('Could not load instances');
+    return null;
+  }
+
+  const FREE_TRIAL_LABEL = `${ui.c.green('Free Trial')} ${ui.c.dim('— SecureNow managed instance (no setup needed)')}`;
+
+  const choices = [{ label: FREE_TRIAL_LABEL, value: null }];
+
+  for (const inst of instances) {
+    const status = inst.status === 'active' ? ui.c.green('●') : ui.c.red('●');
+    const apps = inst.linkedApps ? ui.c.dim(` (${inst.linkedApps} app${inst.linkedApps !== 1 ? 's' : ''})`) : '';
+    choices.push({
+      label: `${status} ${inst.name}${apps} ${ui.c.dim(`[${inst._id}]`)}`,
+      value: inst._id,
+    });
+  }
+
+  const appUrl = config.getAppUrl();
+  choices.push({
+    label: `${ui.c.cyan('+')} Create a new instance ${ui.c.dim('(opens browser)')}`,
+    value: '__new__',
+  });
+
+  const selected = await ui.select('Which instance should this app use?', choices);
+
+  if (selected === '__new__') {
+    const url = `${appUrl}/dashboard/settings/instances`;
+    ui.info(`Opening ${ui.c.underline(url)}`);
+    openBrowser(url);
+    ui.info('Create your instance in the browser, then run this command again.');
+    process.exit(0);
+  }
+
+  return selected;
+}
+
+function openBrowser(url) {
+  const { execSync } = require('child_process');
+  try {
+    if (process.platform === 'darwin') execSync(`open "${url}"`);
+    else if (process.platform === 'win32') execSync(`start "" "${url}"`);
+    else execSync(`xdg-open "${url}"`);
+  } catch {
+    ui.warn(`Could not open browser. Visit: ${url}`);
+  }
+}
+
 async function info(args, flags) {
   requireAuth();
 
@@ -104,10 +217,19 @@ async function info(args, flags) {
   try {
     const data = await api.get(`/applications/${id}`);
     const app = data.application || data;
+
+    let inst = null;
+    if (app.instanceId) {
+      try {
+        const instData = await api.get(`/instances/${app.instanceId}`);
+        inst = instData.instance || null;
+      } catch {}
+    }
+    const envUrl = instanceUrl(inst);
     s.stop('Application details loaded');
 
     if (flags.json) {
-      ui.json(app);
+      ui.json({ ...app, instanceUrl: envUrl });
       return;
     }
 
@@ -117,11 +239,16 @@ async function info(args, flags) {
     ui.keyValue([
       ['Key', ui.c.bold(app.key)],
       ['ID', ui.c.dim(app._id)],
+      ['Instance', inst ? `${inst.name} ${ui.c.dim(`(${envUrl})`)}` : `${ui.c.green('Free Trial')} ${ui.c.dim(`(${envUrl})`)}`],
       ['Hosts', app.hosts?.length ? app.hosts.join(', ') : ui.c.dim('none')],
-      ['Instance', app.instanceId || ui.c.dim('default')],
       ['Created', app.createdAt ? new Date(app.createdAt).toLocaleString() : '—'],
       ['Updated', app.updatedAt ? new Date(app.updatedAt).toLocaleString() : '—'],
     ]);
+
+    console.log('');
+    console.log(`  ${ui.c.bold('Environment variables:')}`);
+    console.log(`    SECURENOW_APPID=${app.key}`);
+    console.log(`    SECURENOW_INSTANCE=${envUrl}`);
     console.log('');
   } catch (err) {
     s.fail('Failed to fetch application');

package/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 'use strict';
 
 const ui = require('./cli/ui');
@@ -60,7 +60,7 @@ const COMMANDS = {
     usage: 'securenow apps <subcommand> [options]',
     sub: {
       list: { desc: 'List all applications', run: (a, f) => require('./cli/apps').list(a, f) },
-      create: { desc: 'Create a new application', usage: 'securenow apps create <name> [--hosts host1,host2] [--instance <id>]', run: (a, f) => require('./cli/apps').create(a, f) },
+      create: { desc: 'Create a new application (interactive instance picker)', usage: 'securenow apps create <name> [--hosts host1,host2] [--instance <id>]', run: (a, f) => require('./cli/apps').create(a, f) },
       info: { desc: 'Show application details', usage: 'securenow apps info <id>', run: (a, f) => require('./cli/apps').info(a, f) },
       delete: { desc: 'Delete an application', usage: 'securenow apps delete <id> [--force]', run: (a, f) => require('./cli/apps').remove(a, f) },
       default: { desc: 'Set default application', usage: 'securenow apps default <key>', run: (a, f) => require('./cli/apps').setDefault(a, f) },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securenow",
-  "version": "5.3.2",
+  "version": "5.3.4",
   "description": "OpenTelemetry instrumentation for Node.js and Next.js - Send traces and logs to any OTLP-compatible backend",
   "type": "commonjs",
   "main": "register.js",