@globio/cli 0.1.2 → 0.1.4

package/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@globio/cli",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "license": "MIT",
   "exports": "./src/index.ts"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globio/cli",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "The official CLI for Globio — game backend as a service",
   "type": "module",
   "license": "MIT",

package/src/auth/login.ts

@@ -1,72 +1,179 @@
 import * as p from '@clack/prompts';
+import { exec } from 'child_process';
 import chalk from 'chalk';
 import { config } from '../lib/config.js';
+import { getConsoleCliAuthUrl, manageRequest, type ManageAccount } from '../lib/manage.js';
 import { getCliVersion, muted, orange, printBanner } from '../lib/banner.js';
 
-const DEFAULT_BASE_URL = 'https://api.globio.stanlink.online';
 const version = getCliVersion();
 
-export async function login() {
-  printBanner(version);
+function openBrowser(url: string) {
+  const command = process.platform === 'win32'
+    ? `start "" "${url}"`
+    : process.platform === 'darwin'
+      ? `open "${url}"`
+      : `xdg-open "${url}"`;
+
+  exec(command);
+}
 
-  const values = await p.group(
-    {
-      apiKey: () =>
-        p.text({
-          message: 'Paste your Globio API key',
-          placeholder: 'gk_live_...',
-          validate: (value) => (!value ? 'API key is required' : undefined),
-        }),
-      projectId: () =>
-        p.text({
-          message: 'Paste your Project ID',
-          placeholder: 'proj_...',
-          validate: (value) => (!value ? 'Project ID is required' : undefined),
-        }),
+function sleep(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function savePat(token: string) {
+  const account = await manageRequest<ManageAccount>('/account', { token });
+  return account;
+}
+
+async function runTokenLogin(profileName: string) {
+  const hadProfiles = config.listProfiles().length > 0;
+  const token = await p.text({
+    message: 'Paste your personal access token',
+    placeholder: 'glo_pat_...',
+    validate: (value) => {
+      if (!value) return 'Personal access token is required';
+      if (!value.startsWith('glo_pat_')) return 'Token must start with glo_pat_';
+      return undefined;
     },
-    {
-      onCancel: () => {
-        p.cancel('Login cancelled.');
-        process.exit(0);
-      },
-    }
-  );
+  });
 
-  const spinner = p.spinner();
-  spinner.start('Validating credentials...');
+  if (p.isCancel(token)) {
+    p.cancel('Login cancelled.');
+    process.exit(0);
+  }
 
+  const spinner = p.spinner();
+  spinner.start('Validating personal access token...');
   try {
-    const response = await fetch(`${DEFAULT_BASE_URL}/id/health`, {
-      headers: {
-        'X-Globio-Key': values.apiKey as string,
-      },
+    const account = await savePat(token);
+    config.setProfile(profileName, {
+      pat: token,
+      account_email: account.email,
+      account_name: account.display_name ?? account.email,
+      created_at: Date.now(),
     });
+    if (profileName === 'default' || !hadProfiles) {
+      config.setActiveProfile(profileName);
+    }
+    spinner.stop('Token validated.');
+    p.outro(`Logged in as ${account.email}\nProfile: ${profileName}`);
+  } catch (error) {
+    spinner.stop('Validation failed.');
+    p.outro(chalk.red(error instanceof Error ? error.message : 'Could not validate token'));
+    process.exit(1);
+  }
+}
+
+async function runBrowserLogin(profileName: string) {
+  const state = crypto.randomUUID();
+  const spinner = p.spinner();
+  const hadProfiles = config.listProfiles().length > 0;
+
+  await manageRequest('/cli-auth/request', {
+    method: 'POST',
+    body: { state },
+  });
+
+  const url = getConsoleCliAuthUrl(state);
+  openBrowser(url);
+  console.log('  ' + muted('Browser URL: ') + orange(url));
+  console.log('');
+
+  spinner.start('Waiting for browser approval...');
+  const deadline = Date.now() + 5 * 60 * 1000;
+
+  while (Date.now() < deadline) {
+    try {
+      const status = await manageRequest<{ status: 'pending' | 'approved' | 'expired'; code?: string }>(
+        `/cli-auth/poll?state=${encodeURIComponent(state)}`
+      );
 
-    if (!response.ok) {
-      spinner.stop('Validation failed.');
-      p.outro(chalk.red('Invalid API key or project ID.'));
-      process.exit(1);
+      if (status.status === 'expired') {
+        spinner.stop('Approval window expired.');
+        p.outro(chalk.red('CLI auth request expired. Try again or use globio login --token.'));
+        process.exit(1);
+      }
+
+      if (status.status === 'approved' && status.code) {
+        const exchange = await manageRequest<{
+          token: string;
+          account: { email: string; display_name: string | null };
+        }>('/cli-auth/exchange', {
+          method: 'POST',
+          body: { code: status.code },
+        });
+
+        config.setProfile(profileName, {
+          pat: exchange.token,
+          account_email: exchange.account.email,
+          account_name: exchange.account.display_name ?? exchange.account.email,
+          created_at: Date.now(),
+        });
+        if (profileName === 'default' || !hadProfiles) {
+          config.setActiveProfile(profileName);
+        }
+
+        spinner.stop('Browser approval received.');
+        p.outro(`Logged in as ${exchange.account.email}\nProfile: ${profileName}`);
+        return;
+      }
+    } catch {
+      // Keep polling until timeout.
     }
 
-    config.set({
-      apiKey: values.apiKey as string,
-      projectId: values.projectId as string,
+    await sleep(2000);
+  }
+
+  spinner.stop('Approval timed out.');
+  p.outro(chalk.red('Timed out waiting for browser approval. Try again or use globio login --token.'));
+  process.exit(1);
+}
+
+export async function login(options: { token?: boolean; profile?: string } = {}) {
+  printBanner(version);
+  const profileName = options.profile ?? 'default';
+  const existing = config.getProfile(profileName);
+
+  if (existing) {
+    const proceed = await p.confirm({
+      message: `Already logged in as ${existing.account_email} on profile "${profileName}". Replace?`,
+      initialValue: false,
     });
 
-    spinner.stop('Credentials validated.');
-    p.outro(
-      '  Logged in.\n\n' +
-        '  ' +
-        muted('API Key:  ') +
-        orange(values.apiKey as string) +
-        '\n' +
-        '  ' +
-        muted('Project:  ') +
-        orange(values.projectId as string)
-    );
-  } catch {
-    spinner.stop('');
-    p.outro(chalk.red('Could not connect to Globio. Check your credentials.'));
+    if (p.isCancel(proceed) || !proceed) {
+      p.outro('Login cancelled.');
+      return;
+    }
+  }
+
+  if (options.token) {
+    await runTokenLogin(profileName);
+    return;
+  }
+
+  const choice = await p.select({
+    message: 'Choose a login method',
+    options: [
+      { value: 'browser', label: 'Browser', hint: 'Open console and approve access' },
+      { value: 'token', label: 'Token', hint: 'Paste a personal access token' },
+    ],
+  });
+
+  if (p.isCancel(choice)) {
+    p.cancel('Login cancelled.');
+    process.exit(0);
+  }
+
+  if (choice === 'token') {
+    await runTokenLogin(profileName);
+    return;
+  }
+
+  try {
+    await runBrowserLogin(profileName);
+  } catch (error) {
+    p.outro(chalk.red(error instanceof Error ? error.message : 'Could not connect to Globio.'));
     process.exit(1);
   }
 }

package/src/auth/logout.ts

@@ -1,8 +1,30 @@
-import * as p from '@clack/prompts';
 import chalk from 'chalk';
 import { config } from '../lib/config.js';
 
-export async function logout() {
-  config.clear();
-  p.outro(chalk.green('Logged out.'));
+export async function logout(options: { profile?: string } = {}) {
+  const activeProfile = config.getActiveProfile();
+  const profileName = options.profile ?? activeProfile;
+  const profile = profileName ? config.getProfile(profileName) : null;
+
+  if (!profileName || !profile) {
+    console.log(chalk.yellow(`No active session on profile "${profileName || 'default'}".`));
+    return;
+  }
+
+  config.deleteProfile(profileName);
+
+  if (profileName === activeProfile) {
+    const remaining = config.listProfiles();
+    if (remaining.length > 0) {
+      config.setActiveProfile(remaining[0]);
+      console.log(chalk.green(`Logged out. Switched to profile: ${remaining[0]}`));
+      return;
+    }
+
+    config.setActiveProfile('');
+    console.log(chalk.green('Logged out.'));
+    return;
+  }
+
+  console.log(chalk.green(`Logged out profile: ${profileName}`));
 }

package/src/auth/useProfile.ts

@@ -0,0 +1,20 @@
+import chalk from 'chalk';
+import { orange } from '../lib/banner.js';
+import { config } from '../lib/config.js';
+
+export async function useProfile(profileName: string) {
+  const profile = config.getProfile(profileName);
+  if (!profile) {
+    console.log(
+      chalk.red(
+        `Profile "${profileName}" not found. Run: globio login --profile ${profileName}`
+      )
+    );
+    process.exit(1);
+  }
+
+  config.setActiveProfile(profileName);
+  console.log(
+    chalk.green('Switched to profile: ') + orange(profileName) + ` (${profile.account_email})`
+  );
+}

package/src/auth/whoami.ts

@@ -1,15 +1,37 @@
 import chalk from 'chalk';
 import { config } from '../lib/config.js';
+import { muted, orange } from '../lib/banner.js';
 
-export async function whoami() {
-  const cfg = config.get();
-  if (!cfg.apiKey) {
-    console.log(chalk.red('Not logged in.'));
+export async function whoami(options: { profile?: string } = {}) {
+  const profileName = options.profile ?? config.getActiveProfile() ?? 'default';
+  const profile = config.getProfile(profileName);
+
+  if (!profile) {
+    console.log(chalk.red('Not logged in. Run: globio login'));
     return;
   }
 
+  const allProfiles = config.listProfiles();
+  const activeProfile = config.getActiveProfile();
+
   console.log('');
-  console.log(chalk.cyan('API Key:   ') + cfg.apiKey);
-  console.log(chalk.cyan('Project:   ') + (cfg.projectId ?? 'none'));
+  console.log(
+    muted('Profile:  ') + orange(profileName) + (profileName === activeProfile ? muted(' (active)') : '')
+  );
+  console.log(muted('Account:  ') + profile.account_email);
+  console.log(muted('Name:     ') + (profile.account_name || '—'));
+  console.log(
+    muted('Project:  ') +
+      (profile.active_project_id
+        ? orange(profile.active_project_name || 'unnamed') + muted(` (${profile.active_project_id})`)
+        : chalk.gray('none — run: globio projects use <id>'))
+  );
+
+  if (allProfiles.length > 1) {
+    console.log('');
+    console.log(
+      muted('Other profiles: ') + allProfiles.filter((name) => name !== profileName).join(', ')
+    );
+  }
   console.log('');
 }

package/src/commands/functions.ts

@@ -2,11 +2,17 @@ import chalk from 'chalk';
 import type { CodeFunction, CodeInvocation } from '@globio/sdk';
 import ora from 'ora';
 import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { config } from '../lib/config.js';
 import { gold, muted, orange } from '../lib/banner.js';
 import { getClient } from '../lib/sdk.js';
 
-export async function functionsList() {
-  const client = getClient();
+function resolveProfileName(profile?: string) {
+  return profile ?? config.getActiveProfile() ?? 'default';
+}
+
+export async function functionsList(options: { profile?: string } = {}) {
+  const profileName = resolveProfileName(options.profile);
+  const client = getClient(profileName);
   const spinner = ora('Fetching functions...').start();
   const result = await client.code.listFunctions();
   spinner.stop();
@@ -29,7 +35,7 @@ export async function functionsList() {
   console.log('');
 }
 
-export async function functionsCreate(slug: string) {
+export async function functionsCreate(slug: string, _options: { profile?: string } = {}) {
   const filename = `${slug}.js`;
   if (existsSync(filename)) {
     console.log(chalk.yellow(`${filename} already exists.`));
@@ -60,7 +66,7 @@ async function handler(input, globio) {
 
 export async function functionsDeploy(
   slug: string,
-  options: { file?: string; name?: string }
+  options: { file?: string; name?: string; profile?: string }
 ) {
   const filename = options.file ?? `${slug}.js`;
   if (!existsSync(filename)) {
@@ -73,7 +79,8 @@ export async function functionsDeploy(
   }
 
   const code = readFileSync(filename, 'utf-8');
-  const client = getClient();
+  const profileName = resolveProfileName(options.profile);
+  const client = getClient(profileName);
   const spinner = ora(`Deploying ${slug}...`).start();
   const existing = await client.code.getFunction(slug);
 
@@ -103,7 +110,7 @@ export async function functionsDeploy(
 
 export async function functionsInvoke(
   slug: string,
-  options: { input?: string }
+  options: { input?: string; profile?: string }
 ) {
   let input: Record<string, unknown> = {};
   if (options.input) {
@@ -115,7 +122,8 @@ export async function functionsInvoke(
     }
   }
 
-  const client = getClient();
+  const profileName = resolveProfileName(options.profile);
+  const client = getClient(profileName);
   const spinner = ora(`Invoking ${slug}...`).start();
   const result = await client.code.invoke(slug, input);
   spinner.stop();
@@ -134,10 +142,11 @@ export async function functionsInvoke(
 
 export async function functionsLogs(
   slug: string,
-  options: { limit?: string }
+  options: { limit?: string; profile?: string }
 ) {
   const limit = options.limit ? parseInt(options.limit, 10) : 20;
-  const client = getClient();
+  const profileName = resolveProfileName(options.profile);
+  const client = getClient(profileName);
   const spinner = ora('Fetching invocations...').start();
   const result = await client.code.getInvocations(slug, limit);
   spinner.stop();
@@ -163,8 +172,9 @@ export async function functionsLogs(
   console.log('');
 }
 
-export async function functionsDelete(slug: string) {
-  const client = getClient();
+export async function functionsDelete(slug: string, options: { profile?: string } = {}) {
+  const profileName = resolveProfileName(options.profile);
+  const client = getClient(profileName);
   const spinner = ora(`Deleting ${slug}...`).start();
   const result = await client.code.deleteFunction(slug);
   if (!result.success) {
@@ -175,8 +185,13 @@ export async function functionsDelete(slug: string) {
   spinner.succeed(`Deleted ${slug}`);
 }
 
-export async function functionsToggle(slug: string, active: boolean) {
-  const client = getClient();
+export async function functionsToggle(
+  slug: string,
+  active: boolean,
+  options: { profile?: string } = {}
+) {
+  const profileName = resolveProfileName(options.profile);
+  const client = getClient(profileName);
   const spinner = ora(
     `${active ? 'Enabling' : 'Disabling'} ${slug}...`
   ).start();

package/src/commands/init.ts

@@ -10,26 +10,43 @@ import {
 } from '../lib/banner.js';
 import { promptInit } from '../prompts/init.js';
 import { migrateFirestore, migrateFirebaseStorage } from './migrate.js';
+import { projectsCreate, projectsUse } from './projects.js';
 
 const version = getCliVersion();
 
-export async function init() {
+export async function init(options: { profile?: string } = {}) {
   printBanner(version);
   p.intro(orange('⇒⇒') + '  Initialize your Globio project');
 
+  const profileName = options.profile ?? config.getActiveProfile() ?? 'default';
+  const profile = config.getProfile(profileName);
+  if (!profile) {
+    console.log('Run: npx @globio/cli login --profile ' + profileName);
+    process.exit(1);
+  }
+
+  if (!profile.active_project_id) {
+    await projectsCreate({ profile: profileName });
+  } else {
+    await projectsUse(profile.active_project_id, { profile: profileName });
+  }
+
   const values = await promptInit();
+  const activeProfile = config.getProfile(profileName);
+  const activeProjectKey = activeProfile?.project_api_key;
+  const { projectId: activeProjectId } = config.requireProject(profileName);
 
-  config.set({
-    apiKey: values.apiKey as string,
-    projectId: values.projectId as string,
-  });
+  if (!activeProjectKey) {
+    console.log('No project API key cached. Run: npx @globio/cli projects use ' + activeProjectId);
+    process.exit(1);
+  }
 
   if (!existsSync('globio.config.ts')) {
     writeFileSync(
       'globio.config.ts',
-      `import { GlobioClient } from '@globio/sdk';
+      `import { Globio } from '@globio/sdk';
 
-export const globio = new GlobioClient({
+export const globio = new Globio({
   apiKey: process.env.GLOBIO_API_KEY!,
 });
 `
@@ -38,7 +55,7 @@ export const globio = new GlobioClient({
   }
 
   if (!existsSync('.env')) {
-    writeFileSync('.env', `GLOBIO_API_KEY=${values.apiKey}\n`);
+    writeFileSync('.env', `GLOBIO_API_KEY=${activeProjectKey}\n`);
     printSuccess('Created .env');
   }
 
@@ -49,6 +66,7 @@ export const globio = new GlobioClient({
     await migrateFirestore({
       from: values.serviceAccountPath as string,
       all: true,
+      profile: profileName,
     });
 
     const serviceAccount = JSON.parse(
@@ -59,6 +77,7 @@ export const globio = new GlobioClient({
       from: values.serviceAccountPath as string,
       bucket: `${serviceAccount.project_id}.appspot.com`,
       all: true,
+      profile: profileName,
     });
   }
 
@@ -70,6 +89,7 @@ export const globio = new GlobioClient({
       muted('Next steps:') +
       '\n\n' +
       '  npm install @globio/sdk\n' +
+      `  # active project: ${activeProjectId}\n` +
       '  npx @globio/cli functions create my-first-function'
   );
 }

package/src/commands/migrate.ts

@@ -11,6 +11,7 @@ import {
 import { initFirebase } from '../lib/firebase.js';
 import { createProgressBar } from '../lib/progress.js';
 import { getClient } from '../lib/sdk.js';
+import { config } from '../lib/config.js';
 
 const version = getCliVersion();
 
@@ -18,6 +19,7 @@ interface MigrateFirestoreOptions {
   from: string;
   collection?: string;
   all?: boolean;
+  profile?: string;
 }
 
 interface MigrateStorageOptions {
@@ -25,6 +27,11 @@ interface MigrateStorageOptions {
   bucket: string;
   folder?: string;
   all?: boolean;
+  profile?: string;
+}
+
+function resolveProfileName(profile?: string) {
+  return profile ?? config.getActiveProfile() ?? 'default';
 }
 
 export async function migrateFirestore(options: MigrateFirestoreOptions) {
@@ -32,7 +39,7 @@ export async function migrateFirestore(options: MigrateFirestoreOptions) {
   p.intro(gold('⇒⇒') + '  Firebase → Globio Migration');
 
   const { firestore } = await initFirebase(options.from);
-  const client = getClient();
+  const client = getClient(resolveProfileName(options.profile));
 
   let collections: string[] = [];
 
@@ -139,7 +146,7 @@ export async function migrateFirebaseStorage(options: MigrateStorageOptions) {
   p.intro(gold('⇒⇒') + '  Firebase → Globio Migration');
 
   const { storage } = await initFirebase(options.from);
-  const client = getClient();
+  const client = getClient(resolveProfileName(options.profile));
 
   const bucketName = options.bucket.replace(/^gs:\/\//, '');
   const bucket = storage.bucket(bucketName);