@zodic/shared 0.0.176 → 0.0.178

package/app/durable/ConceptNameDO.ts

@@ -1,14 +1,21 @@
 import { DurableObjectState } from '@cloudflare/workers-types';
+import { BackendBindings, ConceptProgress } from '../../types';
 
 export class ConceptNameDO {
   state: DurableObjectState;
-  env: any;
+  env: BackendBindings;
   names: { 'en-us': string[]; 'pt-br': string[] };
+  count: number;
+  timestamps: number[];
 
-  constructor(state: DurableObjectState, env: any) {
+  static TOTAL_NAMES = 1728; // Maximum total names to be generated
+
+  constructor(state: DurableObjectState, env: BackendBindings) {
     this.state = state;
     this.env = env;
     this.names = { 'en-us': [], 'pt-br': [] };
+    this.count = 0;
+    this.timestamps = [];
   }
 
   async fetch(request: Request): Promise<Response> {
@@ -16,8 +23,13 @@ export class ConceptNameDO {
     const method = request.method;
 
     if (method === 'GET' && url.pathname === '/names') {
-      await this.loadNames();
-      return new Response(JSON.stringify(this.names), {
+      return new Response(JSON.stringify(await this.getNames()), {
+        headers: { 'Content-Type': 'application/json' },
+      });
+    }
+
+    if (method === 'GET' && url.pathname === '/progress') {
+      return new Response(JSON.stringify(await this.getProgress()), {
         headers: { 'Content-Type': 'application/json' },
       });
     }
@@ -28,7 +40,6 @@ export class ConceptNameDO {
         name: string;
       };
 
-      // ✅ Normalize language codes to match `generateBasicInfo`
       if (!['en-us', 'pt-br'].includes(language)) {
         return new Response('Invalid language', { status: 400 });
       }
@@ -40,20 +51,69 @@ export class ConceptNameDO {
     return new Response('Not Found', { status: 404 });
   }
 
-  async loadNames(): Promise<void> {
-    const stored = await this.state.storage.get<{
-      'en-us': string[];
-      'pt-br': string[];
-    }>('names');
-    if (stored) {
-      this.names = stored;
+  async getNames(): Promise<{ 'en-us': string[]; 'pt-br': string[] }> {
+    if (!this.names['en-us'].length && !this.names['pt-br'].length) {
+      this.names = (await this.state.storage.get('names')) || {
+        'en-us': [],
+        'pt-br': [],
+      };
     }
+    return this.names;
+  }
+
+  async getProgress(): Promise<ConceptProgress> {
+    if (this.count === 0) {
+      this.count = (await this.state.storage.get<number>('count')) || 0;
+    }
+    if (this.timestamps.length === 0) {
+      this.timestamps =
+        (await this.state.storage.get<number[]>('timestamps')) || [];
+    }
+
+    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;
+    const estimatedTimeMinutes =
+      ratePerMinute > 0 ? Math.round(remainingNames / ratePerMinute) : 'N/A';
+
+    return {
+      count: this.count,
+      total: ConceptNameDO.TOTAL_NAMES,
+      progress:
+        ((this.count / ConceptNameDO.TOTAL_NAMES) * 100).toFixed(2) + '%',
+      ratePerMinute,
+      estimatedTimeMinutes,
+    };
   }
 
   async addName(language: 'en-us' | 'pt-br', name: string): Promise<void> {
+    await this.getNames(); // Ensure latest state
+
     if (!this.names[language].includes(name)) {
       this.names[language].push(name);
-      await this.state.storage.put('names', this.names);
+      this.count++;
+      this.recordTimestamp();
+
+      // ✅ **Batch storage writes** instead of multiple separate `put()` calls
+      await this.state.storage.put({
+        names: this.names,
+        count: this.count,
+        timestamps: this.timestamps,
+      });
+    }
+  }
+
+  recordTimestamp(): void {
+    const now = Date.now();
+
+    // Keep only the last 60 timestamps
+    if (this.timestamps.length >= 60) {
+      this.timestamps.splice(0, this.timestamps.length - 59);
     }
+    this.timestamps.push(now);
   }
 }

package/app/services/ConceptService.ts

@@ -2,7 +2,7 @@ import { and, eq } from 'drizzle-orm';
 import { inject, injectable } from 'inversify';
 import 'reflect-metadata';
 import { v4 as uuidv4 } from 'uuid';
-import { ConceptNameDO, schema } from '../..';
+import { schema } from '../..';
 import { Concept, ControlNetConfig, Languages } from '../../types';
 import {
   KVConcept,
@@ -51,7 +51,9 @@ export class ConceptService {
         // ✅ Fetch the latest name list from Durable Object
         let allNamesEN: string[] = [];
         let allNamesPT: string[] = [];
-        const response = await stub.fetch('https://internal/names');
+        const response = await stub.fetch(
+          `https://internal/names`
+        );
         if (response.ok) {
           const data = (await response.json()) as {
             'en-us': string[];
@@ -60,7 +62,7 @@ export class ConceptService {
           allNamesEN = data['en-us'] || [];
           allNamesPT = data['pt-br'] || [];
         } else {
-          console.log('!-- Error fetching names from Durable Object');
+          console.log(`!-- Error fetching names from DO for ${conceptSlug}`);
           console.log('!-- Response:', await response.text());
         }
 
@@ -71,7 +73,7 @@ export class ConceptService {
         // 🔥 If names already exist in KV but not in DO, add them
         if (existingEN.name && !allNamesEN.includes(existingEN.name)) {
           console.log(`⚡ Backfilling existing name to DO: ${existingEN.name}`);
-          await stub.fetch('https://internal/add-name', {
+          await stub.fetch(`https://internal/add-name`, {
             method: 'POST',
             body: JSON.stringify({ language: 'en-us', name: existingEN.name }),
             headers: { 'Content-Type': 'application/json' },
@@ -79,7 +81,7 @@ export class ConceptService {
         }
         if (existingPT.name && !allNamesPT.includes(existingPT.name)) {
           console.log(`⚡ Backfilling existing name to DO: ${existingPT.name}`);
-          await stub.fetch('https://internal/add-name', {
+          await stub.fetch(`https://internal/add-name`, {
             method: 'POST',
             body: JSON.stringify({ language: 'pt-br', name: existingPT.name }),
             headers: { 'Content-Type': 'application/json' },
@@ -127,13 +129,13 @@ export class ConceptService {
         }
 
         // ✅ **Immediately update Durable Object with the new name**
-        await stub.fetch('https://internal/add-name', {
+        await stub.fetch(`https://internal/add-name`, {
           method: 'POST',
           body: JSON.stringify({ language: 'en-us', name: nameEN }),
           headers: { 'Content-Type': 'application/json' },
         });
 
-        await stub.fetch('https://internal/add-name', {
+        await stub.fetch(`https://internal/add-name`, {
           method: 'POST',
           body: JSON.stringify({ language: 'pt-br', name: namePT }),
           headers: { 'Content-Type': 'application/json' },

package/package.json

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

package/types/scopes/generic.ts

@@ -398,3 +398,11 @@ export type AstroKVData = {
     diff: number;
   }[];
 };
+
+export type ConceptProgress = {
+  count: number;
+  total: number;
+  progress: string; // Percentage as string (e.g., "75.32%")
+  ratePerMinute: number;
+  estimatedTimeMinutes: number | 'N/A';
+};