ccgather 2.0.30 → 2.0.32

package/dist/index.js

@@ -107,19 +107,15 @@ function createProfessionalHeader() {
   );
   return lines;
 }
-async function printAnimatedBox(lines, width = 47, lineDelay = 60) {
-  const top = colors.dim(`  ${box.topLeft}${box.horizontal.repeat(width)}${box.topRight}`);
-  const bottom = colors.dim(`  ${box.bottomLeft}${box.horizontal.repeat(width)}${box.bottomRight}`);
-  console.log(top);
-  await sleep(lineDelay / 2);
-  for (const line of lines) {
+function createBox(lines, width = 47) {
+  const paddedLines = lines.map((line) => {
     const visibleLength = getDisplayWidth(line);
     const padding = width - 2 - visibleLength;
-    const paddedLine = `${box.vertical} ${line}${" ".repeat(Math.max(0, padding))} ${box.vertical}`;
-    console.log(colors.dim("  ") + paddedLine);
-    await sleep(lineDelay);
-  }
-  console.log(bottom);
+    return `${box.vertical} ${line}${" ".repeat(Math.max(0, padding))} ${box.vertical}`;
+  });
+  const top = colors.dim(`  ${box.topLeft}${box.horizontal.repeat(width)}${box.topRight}`);
+  const bottom = colors.dim(`  ${box.bottomLeft}${box.horizontal.repeat(width)}${box.bottomRight}`);
+  return [top, ...paddedLines.map((l) => colors.dim("  ") + l), bottom].join("\n");
 }
 function _stripAnsi(str) {
   return str.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "");
@@ -247,57 +243,6 @@ async function printAnimatedHeader() {
   }
   console.log();
 }
-async function slotMachineRank(finalRank, label, medal, iterations = 12, previousRank) {
-  const maxRank = Math.max(finalRank * 3, 100);
-  for (let i = 0; i < iterations; i++) {
-    const fakeRank = Math.floor(Math.random() * maxRank) + 1;
-    const speed = Math.min(30 + i * 15, 150);
-    process.stdout.write(
-      `\r     ${medal} ${colors.muted(label)} ${colors.dim(`#${fakeRank}`)}    `
-    );
-    await sleep(speed);
-  }
-  let changeText = "";
-  if (previousRank && previousRank !== finalRank) {
-    const change = previousRank - finalRank;
-    if (change > 0) {
-      changeText = ` ${colors.success(`\u2191${change}`)}`;
-    } else if (change < 0) {
-      changeText = ` ${colors.error(`\u2193${Math.abs(change)}`)}`;
-    }
-  }
-  process.stdout.write(
-    `\r     ${medal} ${colors.muted(label)} ${colors.primary.bold(`#${finalRank}`)}${changeText}    
-`
-  );
-}
-async function animatedProgressBar(targetPercent, barWidth = 20, stepDelay = 25) {
-  const steps = Math.min(targetPercent, 20);
-  const stepSize = targetPercent / steps;
-  for (let i = 0; i <= steps; i++) {
-    const currentPercent = Math.round(i * stepSize);
-    const filled = Math.round(currentPercent / 100 * barWidth);
-    const empty = barWidth - filled;
-    const bar = colors.primary("\u2588".repeat(filled)) + colors.dim("\u2591".repeat(empty));
-    process.stdout.write(`\r     [${bar}] ${colors.white(`${currentPercent}%`)}  `);
-    await sleep(stepDelay);
-  }
-  const finalFilled = Math.round(targetPercent / 100 * barWidth);
-  const finalEmpty = barWidth - finalFilled;
-  return colors.primary("\u2588".repeat(finalFilled)) + colors.dim("\u2591".repeat(finalEmpty));
-}
-async function suspenseDots(message, durationMs = 600) {
-  const frames = ["", ".", "..", "..."];
-  const frameDelay = 100;
-  const iterations = Math.ceil(durationMs / (frames.length * frameDelay));
-  for (let i = 0; i < iterations; i++) {
-    for (const frame of frames) {
-      process.stdout.write(`\r     ${colors.muted(message)}${colors.primary(frame)}     `);
-      await sleep(frameDelay);
-    }
-  }
-  process.stdout.write("\r" + " ".repeat(50) + "\r");
-}
 async function printAnimatedWelcomeBox(user) {
   console.log(`  \u{1F44B} ${colors.white.bold(`Welcome back, ${user.username}!`)}`);
   await sleep(50);
@@ -308,7 +253,7 @@ var init_ui = __esm({
     "use strict";
     import_chalk = __toESM(require("chalk"));
     import_string_width = __toESM(require("string-width"));
-    VERSION = true ? "2.0.30" : "0.0.0";
+    VERSION = true ? "2.0.32" : "0.0.0";
     colors = {
       primary: import_chalk.default.hex("#DA7756"),
       // Claude coral
@@ -893,9 +838,6 @@ function scanAllProjects(options = {}) {
   const { onProgress } = options;
   for (let i = 0; i < allJsonlFiles.length; i++) {
     const filePath = allJsonlFiles[i];
-    if (onProgress) {
-      onProgress(i + 1, allJsonlFiles.length);
-    }
     const projectName = extractProjectName(filePath);
     if (!projects[projectName]) {
       projects[projectName] = {
@@ -975,6 +917,9 @@ function scanAllProjects(options = {}) {
       }
     } catch {
     }
+    if (onProgress) {
+      onProgress(i + 1, allJsonlFiles.length);
+    }
   }
   const totalTokens = totalInputTokens + totalOutputTokens + totalCacheWrite + totalCacheRead;
   if (totalTokens === 0) {
@@ -1144,30 +1089,21 @@ function formatBadgeDate(dateStr) {
   if (!dateStr) return (/* @__PURE__ */ new Date()).toISOString().split("T")[0].replace(/-/g, ".");
   return dateStr.split("T")[0].replace(/-/g, ".");
 }
-async function displayNewBadges(badges) {
+function displayNewBadges(badges) {
   if (badges.length === 0) return;
   console.log();
-  await suspenseDots("Checking achievements", 800);
-  for (let i = 0; i < badges.length; i++) {
-    const badge = badges[i];
+  for (const badge of badges) {
     const rarityColor = getRarityColor(badge.rarity);
     const rarityLabel = badge.rarity.toUpperCase();
-    if (i > 0) {
-      await sleep(300);
-    }
     console.log(
       `     \u2728 ${badge.icon} ${colors.white.bold(badge.name)} ${rarityColor(`[${rarityLabel}]`)}`
     );
-    await sleep(100);
     console.log(`        ${colors.muted(badge.description)}`);
-    await sleep(80);
     if (badge.praise) {
       console.log(`        ${colors.cyan(`"${badge.praise}"`)}`);
-      await sleep(80);
     }
     if (badge.category === "rank") {
       console.log(`        ${colors.dim(`\u{1F4C5} Achieved: ${formatBadgeDate(badge.earnedAt)}`)}`);
-      await sleep(80);
     }
   }
 }
@@ -1280,15 +1216,21 @@ async function submit(options) {
   if (lastProgress > 0) {
     process.stdout.write("\r" + " ".repeat(60) + "\r");
   }
+  process.stdout.write(`  ${colors.muted("Processing...")}`);
   if (!scannedData) {
+    process.stdout.write("\r" + " ".repeat(40) + "\r");
     console.log(`  ${colors.error("\u2717")} ${colors.error("No usage data found.")}`);
     console.log(`  ${colors.muted("Make sure you have used Claude Code at least once.")}
 `);
     process.exit(1);
   }
   const usageData = ccgatherToUsageData(scannedData);
-  console.log(`  ${colors.success("\u2714")} ${colors.success("Scan complete!")}`);
-  console.log();
+  process.stdout.write("\r" + " ".repeat(40) + "\r");
+  const submitSpinner = (0, import_ora2.default)({
+    text: "Submitting to CCgather...",
+    color: "cyan"
+  }).start();
+  const result = await submitToServer(usageData);
   const formatDate = (dateStr) => {
     if (!dateStr) return "------";
     const d = new Date(dateStr);
@@ -1299,13 +1241,10 @@ async function submit(options) {
   };
   const dateRange = usageData.firstUsed && usageData.lastUsed ? `${formatDate(usageData.firstUsed)} ~ ${formatDate(usageData.lastUsed)}` : "";
   const daysTrackedDisplay = dateRange ? `${usageData.daysTracked} days ${colors.dim(`(${dateRange})`)}` : usageData.daysTracked.toString();
-  const levelProgress = getLevelProgress(usageData.totalTokens);
-  const currentLevel = levelProgress.current;
   const summaryLines = [
     `${colors.muted("Total Cost")}     \u{1F4B0} ${colors.warning(formatCost(usageData.totalCost))}`,
     `${colors.muted("Total Tokens")}   \u26A1 ${colors.primary(formatNumber(usageData.totalTokens))}`,
-    `${colors.muted("Period")}         \u{1F4C5} ${colors.white(daysTrackedDisplay)}`,
-    `${colors.muted("Level")}          ${currentLevel.icon} ${currentLevel.color(`${currentLevel.name}`)}`
+    `${colors.muted("Period")}         \u{1F4C5} ${colors.white(daysTrackedDisplay)}`
   ];
   if (usageData.ccplan) {
     const planColor = getPlanColor(usageData.ccplan);
@@ -1317,18 +1256,7 @@ async function submit(options) {
   if (usageData.hasOpusUsage) {
     summaryLines.push(`${colors.muted("Models")}         ${colors.max("\u2726 Opus User")}`);
   }
-  await printAnimatedBox(summaryLines, 52, 60);
-  console.log();
   const projectCount = Object.keys(scannedData.projects).length;
-  console.log(
-    `  ${colors.dim(`Scanned ${projectCount} project(s), ${usageData.dailyUsage.length} day(s) of data`)}`
-  );
-  console.log();
-  const submitSpinner = (0, import_ora2.default)({
-    text: "Submitting to CCgather...",
-    color: "cyan"
-  }).start();
-  const result = await submitToServer(usageData);
   if (result.success) {
     submitSpinner.succeed(colors.success("Successfully submitted!"));
     console.log();
@@ -1337,75 +1265,26 @@ async function submit(options) {
       const lineLength = 40 - text.length;
       return `  ${colors.white.bold(text)}${colors.dim("\u2500".repeat(Math.max(0, lineLength)))}`;
     };
+    const accumulatedTokens = result.previous?.totalTokens || usageData.totalTokens;
+    const levelProgress = getLevelProgress(accumulatedTokens);
+    const currentLevel = levelProgress.current;
+    summaryLines.push(
+      `${colors.muted("Level")}          ${currentLevel.icon} ${currentLevel.color(`${currentLevel.name}`)}`
+    );
+    console.log(createBox(summaryLines, 52));
+    console.log(
+      `  ${colors.dim(`Scanned ${projectCount} project(s), ${usageData.dailyUsage.length} day(s) of data`)}`
+    );
     if (result.previous) {
       const prev = result.previous;
-      const previousDates = new Set(prev.previousDates || []);
-      const previousDailyMap = /* @__PURE__ */ new Map();
-      prev.previousDaily?.forEach((d) => {
-        previousDailyMap.set(d.date, { tokens: d.tokens, cost: d.cost });
-      });
-      const currentDates = new Set(usageData.dailyUsage.map((d) => d.date));
-      const newDates = usageData.dailyUsage.filter((d) => !previousDates.has(d.date));
-      const expiredDates = Array.from(previousDates).filter((d) => !currentDates.has(d));
-      const updatedDates = usageData.dailyUsage.filter((d) => {
-        const prevData = previousDailyMap.get(d.date);
-        return prevData && d.tokens > prevData.tokens;
-      });
-      let newTokens = 0;
-      let newCost = 0;
-      newDates.forEach((d) => {
-        newTokens += d.tokens;
-        newCost += d.cost;
-      });
-      updatedDates.forEach((d) => {
-        const prevData = previousDailyMap.get(d.date);
-        if (prevData) {
-          newTokens += d.tokens - prevData.tokens;
-          newCost += d.cost - prevData.cost;
-        }
-      });
-      let expiredTokens = 0;
-      let expiredCost = 0;
-      expiredDates.forEach((date) => {
-        const prevData = previousDailyMap.get(date);
-        if (prevData) {
-          expiredTokens += prevData.tokens;
-          expiredCost += prevData.cost;
-        }
-      });
-      console.log(sectionHeader("\u{1F4C8}", "Since Last Submit"));
-      await sleep(40);
+      console.log();
+      console.log(sectionHeader("\u{1F4E6}", "Server Records"));
       console.log();
       const prevTokens = prev.totalTokens || 0;
       const prevCost = prev.totalCost || 0;
       console.log(
-        `     ${colors.dim(`All : \u26A1 ${formatNumber(prevTokens)} \u2502 \u{1F4B0} ${formatCost(prevCost)}`)}`
+        `     ${colors.muted("Accumulated")} \u26A1 ${colors.primary(formatNumber(prevTokens))} ${colors.dim("\u2502")} \u{1F4B0} ${colors.warning(formatCost(prevCost))}`
       );
-      await sleep(50);
-      if (newTokens > 0 || newCost > 0) {
-        console.log(
-          `     ${colors.muted("New :")} \u26A1 ${colors.primary(`+${formatNumber(newTokens)}`)} ${colors.dim("\u2502")} \u{1F4B0} ${colors.warning(`+${formatCost(newCost)}`)}`
-        );
-      } else {
-        console.log(
-          `     ${colors.dim("New : No new data")}`
-        );
-      }
-      await sleep(50);
-      if (expiredDates.length > 0) {
-        console.log(
-          `     ${colors.warning("\u26A0")} ${colors.dim(`${expiredDates.length} day${expiredDates.length > 1 ? "s" : ""} expired (30-day window)`)}`
-        );
-        await sleep(40);
-      }
-      console.log();
-      await sleep(60);
-      const rankSpinner = (0, import_ora2.default)({
-        text: colors.dim("Calculating ranking..."),
-        color: "cyan"
-      }).start();
-      await sleep(400);
-      rankSpinner.stop();
     }
     if (result.rank || result.countryRank) {
       console.log();
@@ -1413,37 +1292,47 @@ async function submit(options) {
       console.log();
       const prevGlobalRank = result.previous?.previousGlobalRank;
       const prevCountryRank = result.previous?.previousCountryRank;
+      const formatRankChange = (current, previous) => {
+        if (!previous || previous === current) return "";
+        const change = previous - current;
+        if (change > 0) return ` ${colors.success(`\u2191${change}`)}`;
+        return ` ${colors.error(`\u2193${Math.abs(change)}`)}`;
+      };
       if (result.rank) {
         const medal = result.rank === 1 ? "\u{1F947}" : result.rank === 2 ? "\u{1F948}" : result.rank === 3 ? "\u{1F949}" : result.rank <= 10 ? "\u{1F3C5}" : "\u{1F30D}";
-        await slotMachineRank(result.rank, "Global:", medal, 12, prevGlobalRank);
+        console.log(
+          `     ${medal} ${colors.muted("Global:")} ${colors.primary.bold(`#${result.rank}`)}${formatRankChange(result.rank, prevGlobalRank)}`
+        );
       }
       if (result.countryRank) {
         const countryMedal = result.countryRank === 1 ? "\u{1F947}" : result.countryRank <= 3 ? "\u{1F3C6}" : "\u{1F3E0}";
-        await slotMachineRank(result.countryRank, "Country:", countryMedal, 10, prevCountryRank);
+        console.log(
+          `     ${countryMedal} ${colors.muted("Country:")} ${colors.primary.bold(`#${result.countryRank}`)}${formatRankChange(result.countryRank, prevCountryRank)}`
+        );
       }
     }
     console.log();
     console.log(sectionHeader("\u2B06\uFE0F", "Level Progress"));
     console.log();
-    await sleep(200);
     console.log(
       `     ${colors.muted("Lv.")}${colors.white(String(currentLevel.level))} ${currentLevel.icon} ${currentLevel.color(currentLevel.name)}`
     );
     if (!levelProgress.isMaxLevel && levelProgress.next) {
-      await animatedProgressBar(levelProgress.progress, 20, 30);
-      console.log();
-      await sleep(150);
+      const barWidth = 20;
+      const filled = Math.round(levelProgress.progress / 100 * barWidth);
+      const empty = barWidth - filled;
+      const bar = colors.primary("\u2588".repeat(filled)) + colors.dim("\u2591".repeat(empty));
+      console.log(`     [${bar}] ${colors.white(`${levelProgress.progress}%`)}`);
       console.log(
         `     ${colors.dim("\u2192")} ${levelProgress.next.icon} ${colors.white(levelProgress.next.name)} ${colors.muted("in")} ${colors.primary(formatNumber(levelProgress.tokensToNext))}`
       );
     } else {
-      await sleep(300);
       console.log(`     ${colors.max("\u2605")} ${colors.max("MAX LEVEL ACHIEVED!")}`);
     }
     if (result.newBadges && result.newBadges.length > 0) {
       console.log();
       console.log(sectionHeader("\u{1F389}", "New Badge Unlocked"));
-      await displayNewBadges(result.newBadges);
+      displayNewBadges(result.newBadges);
     }
     console.log();
     const leaderboardUrl = `https://ccgather.com/leaderboard?u=${username}`;
@@ -1456,14 +1345,23 @@ async function submit(options) {
     console.log(`     ${colors.muted("Submit regularly to preserve your full history!")}`);
     console.log();
   } else {
-    submitSpinner.fail(colors.error("Failed to submit"));
-    console.log(`
-  ${error(result.error || "Unknown error")}`);
     if (result.retryAfterMinutes) {
+      submitSpinner.fail(colors.warning("Submission limit reached"));
       console.log();
       console.log(
-        `  ${colors.warning("\u23F3")} ${colors.muted("Try again in")} ${colors.white(`${result.retryAfterMinutes} minute${result.retryAfterMinutes !== 1 ? "s" : ""}`)}`
+        `  ${colors.muted("To keep our service stable, you can submit up to 2 times per hour.")}`
       );
+      console.log(
+        `  ${colors.muted("Your data is safely stored locally - submit anytime later!")}`
+      );
+      console.log();
+      console.log(
+        `  ${colors.warning("\u23F3")} ${colors.white("Ready to submit again in")} ${colors.primary(`${result.retryAfterMinutes} minute${result.retryAfterMinutes !== 1 ? "s" : ""}`)}`
+      );
+    } else {
+      submitSpinner.fail(colors.error("Failed to submit"));
+      console.log(`
+  ${error(result.error || "Unknown error")}`);
     }
     console.log();
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccgather",
-  "version": "2.0.30",
+  "version": "2.0.32",
   "description": "CLI tool for syncing Claude Code usage data to CCgather leaderboard",
   "bin": {
     "ccgather": "dist/index.js",
@@ -25,7 +25,7 @@
     "cli"
   ],
   "author": "",
-  "license": "MIT",
+  "license": "Apache-2.0",
   "dependencies": {
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
@@ -50,6 +50,6 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/DHxYoon/CCgather.git"
+    "url": "git+https://github.com/DHxWhy/CCgather.git"
   }
 }