anbaric-cloud-hosting 1.65.3 → 1.66.1

package/src/main.ts

@@ -160,7 +160,10 @@ if (buildLayer && process.env.ANBARIC_TENANT && process.env.ANBARIC_CLI_KEY_LOOK
         process.env.ANBARIC_CLI_KEY_LOOKUP_URL,
         process.env.ANBARIC_CLI_KEY_LOOKUP_SECRET ?? "",
         process.env.ANBARIC_TENANT,
-        () => buildLayer.list().filter(app => app.status === "running" || app.status === "draining").length,
+        () => {
+            const live = buildLayer.list().filter(app => app.status === "running" || app.status === "draining");
+            return { apps: live.length, large: live.filter(app => app.size === "large").length };
+        },
     ).start();
 }
 

package/src/usage/UsageReporter.ts

@@ -1,6 +1,7 @@
 type FetchFn = (url : string, init : RequestInit) => Promise<Response>;
 
-type CountApps = () => number;
+// How many apps are running, and how many of those are on a large instance.
+type CountApps = () => { apps : number, large : number };
 
 const REPORT_INTERVAL_MS = 60 * 60_000;
 
@@ -36,7 +37,7 @@ class UsageReporter {
             const response = await this.fetchFn(`${this.centralUrl}/usage`, {
                 method: "POST",
                 headers: { "content-type": "application/json", "x-anbaric-central-key": this.secret },
-                body: JSON.stringify({ slug: this.tenantSlug, apps: this.countApps(), day: this.today() }),
+                body: JSON.stringify({ slug: this.tenantSlug, ...this.counted(), day: this.today() }),
             });
             if (! response.ok) console.warn(`[usage] central answered ${response.status} to the app count`);
             return response.ok;
@@ -46,6 +47,11 @@ class UsageReporter {
         }
     }
 
+    private counted() : { apps : number, largeApps : number } {
+        const { apps, large } = this.countApps();
+        return { apps, largeApps: large };
+    }
+
     // The day in UTC, so every tenant's day starts at the same moment however
     // the platform's clock is set.
     private today() : string {