@supalytics/cli 0.3.2 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supalytics/cli",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "CLI for Supalytics web analytics",
   "type": "module",
   "bin": {

package/src/api.ts

@@ -61,11 +61,11 @@ export async function query(
     const sites = await getSites();
     if (sites.length === 0) {
       throw new Error(
-        "No sites configured. Run `supalytics login <api-key>` to add a site."
+        "No sites configured. Run `supalytics login` to authenticate."
       );
     }
     throw new Error(
-      `No API key found for '${site}'. Available sites: ${sites.join(", ")}`
+      `Not authenticated or site '${site}' not found. Available sites: ${sites.join(", ")}`
     );
   }
 
@@ -75,7 +75,7 @@ export async function query(
       Authorization: `Bearer ${apiKey}`,
       "Content-Type": "application/json",
     },
-    body: JSON.stringify(request),
+    body: JSON.stringify({ ...request, domain: site }),
   });
 
   if (!response.ok) {
@@ -169,15 +169,15 @@ export async function listEvents(
     const sites = await getSites();
     if (sites.length === 0) {
       throw new Error(
-        "No sites configured. Run `supalytics login <api-key>` to add a site."
+        "No sites configured. Run `supalytics login` to authenticate."
       );
     }
     throw new Error(
-      `No API key found for '${site}'. Available sites: ${sites.join(", ")}`
+      `Not authenticated or site '${site}' not found. Available sites: ${sites.join(", ")}`
     );
   }
 
-  const params = new URLSearchParams({ period, limit: String(limit) });
+  const params = new URLSearchParams({ period, limit: String(limit), domain: site });
   if (isDev) {
     params.set("is_dev", "true");
   }
@@ -205,10 +205,10 @@ export async function getEventProperties(
   const apiKey = await getApiKeyForSite(site);
 
   if (!apiKey) {
-    throw new Error(`No API key found for '${site}'.`);
+    throw new Error(`Not authenticated. Run \`supalytics login\` first.`);
   }
 
-  const params = new URLSearchParams({ period });
+  const params = new URLSearchParams({ period, domain: site });
   if (isDev) {
     params.set("is_dev", "true");
   }
@@ -240,13 +240,14 @@ export async function getPropertyBreakdown(
   const apiKey = await getApiKeyForSite(site);
 
   if (!apiKey) {
-    throw new Error(`No API key found for '${site}'.`);
+    throw new Error(`Not authenticated. Run \`supalytics login\` first.`);
   }
 
   const params = new URLSearchParams({
     period,
     limit: String(limit),
     include_revenue: String(includeRevenue),
+    domain: site,
   });
   if (isDev) {
     params.set("is_dev", "true");
@@ -303,20 +304,19 @@ export async function getRealtime(site: string, isDev: boolean = false): Promise
     const sites = await getSites();
     if (sites.length === 0) {
       throw new Error(
-        "No sites configured. Run `supalytics login <api-key>` to add a site."
+        "No sites configured. Run `supalytics login` to authenticate."
       );
     }
     throw new Error(
-      `No API key found for '${site}'. Available sites: ${sites.join(", ")}`
+      `Not authenticated or site '${site}' not found. Available sites: ${sites.join(", ")}`
     );
   }
 
-  const params = new URLSearchParams();
+  const params = new URLSearchParams({ domain: site });
   if (isDev) {
     params.set("is_dev", "true");
   }
-  const url = params.toString() ? `${API_BASE}/v1/realtime?${params}` : `${API_BASE}/v1/realtime`;
-  const response = await fetch(url, {
+  const response = await fetch(`${API_BASE}/v1/realtime?${params}`, {
     headers: { Authorization: `Bearer ${apiKey}` },
   });
 

package/src/commands/init.ts

@@ -64,7 +64,7 @@ export const initCommand = new Command("init")
       console.log(chalk.dim("Creating site..."));
 
       const result = await createSiteViaApi(auth.accessToken, identifier);
-      await addSiteWithId(result.site.domain, result.apiKey.key, result.site.site_id, result.site.id);
+      await addSiteWithId(result.site.domain, result.site.site_id, result.site.id);
 
       console.log(chalk.green(`✓ Created ${result.site.domain}`));
 

package/src/commands/login.ts

@@ -19,7 +19,6 @@ interface DeviceCodeResponse {
 interface TokenResponse {
   access_token: string;
   token_type: string;
-  expires_in: number;
   user: {
     id: string;
     email: string;
@@ -100,10 +99,6 @@ interface SyncSite {
     domain: string;
     name: string | null;
   };
-  apiKey: {
-    key: string;
-    prefix: string;
-  };
 }
 
 async function syncSites(accessToken: string): Promise<SyncSite[]> {
@@ -133,7 +128,7 @@ export async function loginWithDeviceFlow(forceResync = false): Promise<void> {
   const existingAuth = await getAuth();
   if (existingAuth && !forceResync) {
     console.log(chalk.dim(`Already logged in as ${existingAuth.email}`));
-    console.log(chalk.dim(`Run 'supalytics login --resync' to refresh API keys, or 'supalytics logout' to log out.`));
+    console.log(chalk.dim(`Run 'supalytics login --resync' to refresh sites, or 'supalytics logout' to log out.`));
     return;
   }
 
@@ -143,15 +138,15 @@ export async function loginWithDeviceFlow(forceResync = false): Promise<void> {
     try {
       const sites = await syncSites(existingAuth.accessToken);
       if (sites.length > 0) {
-        for (const { site, apiKey } of sites) {
-          await addSiteWithId(site.domain, apiKey.key, site.site_id, site.id);
+        for (const { site } of sites) {
+          await addSiteWithId(site.domain, site.site_id, site.id);
         }
         console.log(chalk.green(`✓ Synced ${sites.length} site${sites.length > 1 ? "s" : ""}`));
       } else {
         console.log(chalk.dim("No sites found."));
       }
     } catch {
-      console.log(chalk.yellow("Could not sync. Your session may have expired. Run 'supalytics logout' then 'supalytics login'."));
+      console.log(chalk.yellow("Could not sync. Your token may have been revoked. Run 'supalytics logout' then 'supalytics login'."));
     }
     return;
   }
@@ -187,12 +182,11 @@ export async function loginWithDeviceFlow(forceResync = false): Promise<void> {
   // 5. Ensure config directory exists
   await mkdir(dirname(CONFIG_FILE), { recursive: true });
 
-  // 6. Save auth
+  // 6. Save auth (PAT doesn't expire by default)
   await saveAuth({
     accessToken: tokenResponse.access_token,
     email: tokenResponse.user.email,
     name: tokenResponse.user.name,
-    expiresAt: new Date(Date.now() + tokenResponse.expires_in * 1000).toISOString(),
   });
 
   console.log(chalk.green(`✓ Logged in as ${tokenResponse.user.email}`));
@@ -202,8 +196,8 @@ export async function loginWithDeviceFlow(forceResync = false): Promise<void> {
   try {
     const sites = await syncSites(tokenResponse.access_token);
     if (sites.length > 0) {
-      for (const { site, apiKey } of sites) {
-        await addSiteWithId(site.domain, apiKey.key, site.site_id, site.id);
+      for (const { site } of sites) {
+        await addSiteWithId(site.domain, site.site_id, site.id);
       }
       console.log(chalk.green(`✓ Synced ${sites.length} site${sites.length > 1 ? "s" : ""}`));
     } else {
@@ -216,7 +210,7 @@ export async function loginWithDeviceFlow(forceResync = false): Promise<void> {
 
 export const loginCommand = new Command("login")
   .description("Authenticate with Supalytics")
-  .option("--resync", "Refresh API keys for all sites")
+  .option("--resync", "Refresh the list of sites")
   .action(async (options: { resync?: boolean }) => {
     try {
       await loginWithDeviceFlow(options.resync || false);

package/src/commands/sites.ts

@@ -17,10 +17,6 @@ interface CreateSiteResponse {
     site_id: string;
     domain: string;
   };
-  apiKey: {
-    key: string;
-    prefix: string;
-  };
 }
 
 interface UpdateSiteResponse {
@@ -81,13 +77,12 @@ export const sitesCommand = new Command("sites")
 
     for (const site of sites) {
       const isDefault = config.defaultSite === site;
-      const apiKey = config.sites[site].apiKey;
-      const maskedKey = apiKey.slice(0, 8) + "..." + apiKey.slice(-4);
+      const siteId = config.sites[site].siteId;
 
       if (isDefault) {
-        console.log(`  ${chalk.green("●")} ${site} ${chalk.dim("(default)")} ${chalk.dim(maskedKey)}`);
+        console.log(`  ${chalk.green("●")} ${site} ${chalk.dim("(default)")}${siteId ? ` ${chalk.dim(siteId)}` : ""}`);
       } else {
-        console.log(`  ${chalk.dim("○")} ${site} ${chalk.dim(maskedKey)}`);
+        console.log(`  ${chalk.dim("○")} ${site}${siteId ? ` ${chalk.dim(siteId)}` : ""}`);
       }
     }
     console.log();
@@ -110,11 +105,10 @@ const addCommand = new Command("add")
       const result = await createSiteViaApi(auth.accessToken, identifier);
 
       // Store locally (including website UUID for updates)
-      await addSiteWithId(result.site.domain, result.apiKey.key, result.site.site_id, result.site.id);
+      await addSiteWithId(result.site.domain, result.site.site_id, result.site.id);
 
       console.log(chalk.green(`✓ Created ${result.site.domain}`));
       console.log(chalk.dim(`  Site ID: ${result.site.site_id}`));
-      console.log(chalk.dim(`  API key stored locally`));
       console.log();
       console.log(chalk.dim("Add this to your HTML <head>:"));
       console.log();
@@ -203,11 +197,11 @@ const updateCommand = new Command("update")
       const result: UpdateSiteResponse = await updateResponse.json();
 
       // Update local config (preserve all fields)
-      const { apiKey, siteId: existingSiteId, id: existingId } = siteConfig;
+      const { siteId: existingSiteId, id: existingId } = siteConfig;
       const siteId = existingSiteId || result.site.site_id;
       const id = existingId || websiteId;
       delete config.sites[identifier];
-      config.sites[options.domain] = { apiKey, siteId, id };
+      config.sites[options.domain] = { siteId, id };
       if (config.defaultSite === identifier) {
         config.defaultSite = options.domain;
       }

package/src/config.ts

@@ -5,22 +5,24 @@ const CONFIG_DIR = join(homedir(), ".supalytics");
 const CONFIG_FILE = join(CONFIG_DIR, "config.json");
 
 interface SiteConfig {
-  apiKey: string;
   siteId?: string; // The site_id for tracking snippet
   id?: string; // The website UUID for API operations
+  // Legacy: per-site API key (deprecated, kept for backward compatibility)
+  apiKey?: string;
 }
 
 interface AuthConfig {
-  accessToken: string;
+  accessToken: string; // PAT token (sly_pat_xxx)
   email: string;
   name: string;
+  // Legacy: expiresAt (PATs don't expire by default)
   expiresAt?: string;
 }
 
 interface Config {
-  // User authentication
+  // User authentication (PAT-based)
   auth?: AuthConfig;
-  // Map of domain -> API key
+  // Map of domain -> site config
   sites: Record<string, SiteConfig>;
   // Default site domain
   defaultSite?: string;
@@ -50,9 +52,9 @@ export async function saveConfig(config: Config): Promise<void> {
   await Bun.write(CONFIG_FILE, JSON.stringify(config, null, 2));
 }
 
-export async function addSite(domain: string, apiKey: string): Promise<void> {
+export async function addSite(domain: string, siteId?: string, id?: string): Promise<void> {
   const config = await getConfig();
-  config.sites[domain] = { apiKey };
+  config.sites[domain] = { siteId, id };
   // Set as default if it's the first site
   if (!config.defaultSite || Object.keys(config.sites).length === 1) {
     config.defaultSite = domain;
@@ -85,13 +87,14 @@ export async function setDefaultSite(domain: string): Promise<boolean> {
   return true;
 }
 
-export async function getApiKeyForSite(domain: string): Promise<string | undefined> {
+export async function getApiKeyForSite(_domain: string): Promise<string | undefined> {
   // Check env var first
   if (process.env.SUPALYTICS_API_KEY) {
     return process.env.SUPALYTICS_API_KEY;
   }
+  // Use the PAT from auth - it works for all sites
   const config = await getConfig();
-  return config.sites[domain]?.apiKey;
+  return config.auth?.accessToken;
 }
 
 export async function getDefaultSite(): Promise<string | undefined> {
@@ -135,12 +138,11 @@ export async function isAuthenticated(): Promise<boolean> {
 // Add site with siteId and optional website id
 export async function addSiteWithId(
   domain: string,
-  apiKey: string,
   siteId: string,
   id?: string
 ): Promise<void> {
   const config = await getConfig();
-  config.sites[domain] = { apiKey, siteId, id };
+  config.sites[domain] = { siteId, id };
   // Set as default if it's the first site
   if (!config.defaultSite || Object.keys(config.sites).length === 1) {
     config.defaultSite = domain;