tokenmax-collector 0.3.0 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenmax-collector",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Report local ccusage token usage to a tokenmax instance",
   "type": "module",
   "bin": {

package/src/collect.ts

@@ -55,6 +55,9 @@ const messageOf = (error: unknown): string =>
 const reportUrl = (baseUrl: string): string =>
   `${baseUrl.replace(/\/+$/, "")}/api/report`;
 
+const providerDay = (day: UsageDay): string =>
+  `${day.date}\u0000${day.provider}`;
+
 function acceptedCount(body: string): number | null {
   let payload: unknown;
   try {
@@ -212,7 +215,12 @@ export async function collect(options: CollectOptions): Promise<CollectResult> {
   };
   const antigravity = await localDays(antigravitySource, window);
   const devin = await localDays(devinSource, window);
-  days.push(...antigravity.days, ...devin.days);
+  const covered = new Set(days.map(providerDay));
+  days.push(
+    ...[...antigravity.days, ...devin.days].filter(
+      (day) => !covered.has(providerDay(day)),
+    ),
+  );
   const warnings = [...antigravity.warnings, ...devin.warnings];
   if (days.length === 0) {
     return { kind: "empty", warnings };

package/src/machine.ts

@@ -11,12 +11,13 @@ const disallowed = /[^A-Za-z0-9._-]/g;
 
 const platformUuidPattern = /"IOPlatformUUID"\s*=\s*"([^"]+)"/;
 
+/** The hostname changes with the network, and every spelling of it used to open
+ * a new machine on the server, so the platform identifier travels alone. */
 export function machineId(
   hostnameValue: string,
   platformUuid: string | null,
 ): string {
-  const raw =
-    platformUuid === null ? hostnameValue : `${hostnameValue}-${platformUuid}`;
+  const raw = platformUuid ?? hostnameValue;
   return raw.replace(disallowed, "-").slice(0, 64);
 }