@zodic/shared 0.0.186 → 0.0.188

package/app/durable/ConceptNameDO.ts

@@ -88,23 +88,25 @@ export class ConceptNameDO {
     await this.loadCount();
     await this.loadTimestamps();
     await this.loadLastIndex(); // ✅ Ensure latest lastIndex is fetched
-
+  
     const now = Date.now();
     const oneMinuteAgo = now - 60 * 1000;
-
+  
     const recentTimestamps = this.timestamps.filter((ts) => ts >= oneMinuteAgo);
     const ratePerMinute = recentTimestamps.length;
-
-    const remainingNames = ConceptNameDO.TOTAL_NAMES - this.count;
+  
+    // 🔥 Only count the `en-us` names to reflect progress properly
+    const enUsCount = this.names['en-us'].length;
+  
+    const remainingNames = ConceptNameDO.TOTAL_NAMES - enUsCount;
     const estimatedTimeMinutes =
       ratePerMinute > 0 ? Math.round(remainingNames / ratePerMinute) : 'N/A';
-
+  
     return {
-      count: this.count,
-      total: ConceptNameDO.TOTAL_NAMES,
-      lastIndex: this.lastIndex, // ✅ Include lastIndex in response
-      progress:
-        ((this.count / ConceptNameDO.TOTAL_NAMES) * 100).toFixed(2) + '%',
+      count: this.count, // ✅ Keep full count (en-us + pt-br)
+      total: ConceptNameDO.TOTAL_NAMES, // ✅ Base progress on 1728
+      lastIndex: this.lastIndex,
+      progress: ((enUsCount / ConceptNameDO.TOTAL_NAMES) * 100).toFixed(2) + '%', // ✅ Use only en-us count
       ratePerMinute,
       estimatedTimeMinutes,
     };

package/app/services/ConceptService.ts

@@ -39,9 +39,39 @@ export class ConceptService {
     const id = this.context.env.CONCEPT_NAMES_DO.idFromName(conceptSlug);
     const stub = this.context.env.CONCEPT_NAMES_DO.get(id);
   
+    console.log(`📡 Fetching existing KV data for ${conceptSlug}...`);
+    const existingEN = await this.getKVConcept(kvKeyEN);
+    const existingPT = await this.getKVConcept(kvKeyPT);
+  
+    // ✅ IMMEDIATE SKIP if already exists and override is false
+    if (!override && existingEN.name && existingPT.name) {
+      console.log(`⚡ Basic info already exists for ${conceptSlug}, skipping.`);
+  
+      // ✅ **Backfill Durable Object** to register the names
+      console.log(`📡 Backfilling Durable Object for ${conceptSlug}...`);
+      try {
+        await Promise.all([
+          stub.fetch(`https://internal/add-name`, {
+            method: 'POST',
+            body: JSON.stringify({ language: 'en-us', name: existingEN.name }),
+            headers: { 'Content-Type': 'application/json' },
+          }),
+          stub.fetch(`https://internal/add-name`, {
+            method: 'POST',
+            body: JSON.stringify({ language: 'pt-br', name: existingPT.name }),
+            headers: { 'Content-Type': 'application/json' },
+          }),
+        ]);
+        console.log(`✅ Successfully backfilled Durable Object for ${conceptSlug}`);
+      } catch (error) {
+        console.error(`❌ Error backfilling Durable Object:`, error);
+      }
+  
+      return; // ✅ Exit early
+    }
+  
     let attempts = 0;
     const maxAttempts = 3;
-  
     while (attempts < maxAttempts) {
       let phase = 'generation';
       try {
@@ -63,37 +93,6 @@ export class ConceptService {
           console.log(`❌ Error fetching names from DO for ${conceptSlug}: ${await response.text()}`);
         }
   
-        // ✅ Fetch existing KV data to backfill Durable Object if necessary
-        console.log(`📡 Fetching existing KV data for ${conceptSlug}...`);
-        const existingEN = await this.getKVConcept(kvKeyEN);
-        const existingPT = await this.getKVConcept(kvKeyPT);
-  
-        console.log(`📝 Existing EN name: ${existingEN.name || 'None'}, PT name: ${existingPT.name || 'None'}`);
-  
-        // 🔥 If names exist in KV but not in DO, add them
-        if (existingEN.name && !allNamesEN.includes(existingEN.name)) {
-          console.log(`⚡ Backfilling existing EN name to DO: ${existingEN.name}`);
-          await stub.fetch(`https://internal/add-name`, {
-            method: 'POST',
-            body: JSON.stringify({ language: 'en-us', name: existingEN.name }),
-            headers: { 'Content-Type': 'application/json' },
-          });
-        }
-        if (existingPT.name && !allNamesPT.includes(existingPT.name)) {
-          console.log(`⚡ Backfilling existing PT name to DO: ${existingPT.name}`);
-          await stub.fetch(`https://internal/add-name`, {
-            method: 'POST',
-            body: JSON.stringify({ language: 'pt-br', name: existingPT.name }),
-            headers: { 'Content-Type': 'application/json' },
-          });
-        }
-  
-        // ✅ Skip generation if basic info already exists and override is false
-        if (!override && existingEN.name && existingPT.name) {
-          console.log(`⚡ Basic info already exists for ${conceptSlug}, skipping.`);
-          return;
-        }
-  
         console.log(`✏️ Generating new name...`);
         const recentNamesEN = allNamesEN.slice(-60);
         const messages = this.context
@@ -159,6 +158,12 @@ export class ConceptService {
         await kvStore.put(kvKeyPT, JSON.stringify(existingPT));
   
         console.log(`✅ Stored basic info for ${conceptSlug}, combination: ${combinationString}.`);
+  
+        // ✅ **Throttling for next request**
+        const delayMs = Math.floor(Math.random() * (500 - 200 + 1)) + 200; // 🔥 Random delay between 200-500ms
+        console.log(`⏳ Waiting ${delayMs}ms before processing next missing entry...`);
+        await new Promise((resolve) => setTimeout(resolve, delayMs));
+  
         return;
       } catch (error) {
         console.error(`❌ Attempt ${attempts} failed at phase: ${phase}`, (error as Error).message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zodic/shared",
-  "version": "0.0.186",
+  "version": "0.0.188",
   "module": "index.ts",
   "type": "module",
   "publishConfig": {