From d17f117408317bf4e3504cc42d99ae0ed6de35f0 Mon Sep 17 00:00:00 2001
From: Siddharth Singh <me@shantaram.xyz>
Date: Thu, 3 Apr 2025 17:23:43 +0530
Subject: [PATCH] modified instancev1 controller sometimes returns string
 instead of number

---
 packages/ditto/controllers/api/instance.ts | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/ditto/controllers/api/instance.ts b/packages/ditto/controllers/api/instance.ts
index 8397780e..201aef0d 100644
--- a/packages/ditto/controllers/api/instance.ts
+++ b/packages/ditto/controllers/api/instance.ts
@@ -2,6 +2,7 @@ import denoJson from 'deno.json' with { type: 'json' };
 
 import { AppController } from '@/app.ts';
 import { getInstanceMetadata } from '@/utils/instance.ts';
+import { logi } from '@soapbox/logi';
 
 const version = `3.0.0 (compatible; Ditto ${denoJson.version})`;
 
@@ -15,17 +16,26 @@ const features = [
   'v2_suggestions',
 ];
 
-const cache = (f: () => (number | undefined) | Promise<number | undefined>, interval: number) => {
-  let lastCheck = Date.now();
-  let value: number | undefined = undefined;
+const cache = (f: () => Promise<number | undefined>, interval: number) => {
+  let lastCheck = 0;
+  let value: number | undefined;
 
   return async () => {
     const now = Date.now();
-    if (value === null || now - lastCheck > interval) {
+    if (value === undefined || now - lastCheck > interval) {
       lastCheck = now;
-      value = await f();
+      try {
+        value = await f();
+      } catch (error) {
+        logi({
+          level: 'error',
+          ns: 'ditto.routes.instanceV1',
+          message: `Error fetching cached value: ${error}`
+        });
+        value = undefined; // Ensure we retry next time
+      }
     }
-    return Number(value || 0);
+    return value ?? 0; // Prevent returning undefined
   };
 };
 
@@ -96,9 +106,9 @@ const instanceV1Controller: AppController = async (c) => {
     },
     languages: ['en'],
     stats: {
-      domain_count: await domainCount(),
-      status_count: await statusCount(),
-      user_count: await userCount(),
+      domain_count: Number(await domainCount()),
+      status_count: Number(await statusCount()),
+      user_count: Number(await userCount()),
     },
     urls: {
       streaming_api: `${wsProtocol}//${host}`,