@zodic/shared 0.0.183 → 0.0.185

package/app/durable/ConceptNameDO.ts

@@ -1,5 +1,4 @@
 import { DurableObjectState } from '@cloudflare/workers-types';
-import { ConceptProgress } from '../../types';
 
 export class ConceptNameDO {
   state: DurableObjectState;
@@ -7,7 +6,7 @@ export class ConceptNameDO {
   names: { 'en-us': string[]; 'pt-br': string[] };
   count: number;
   timestamps: number[];
-  lastIndex: number; // ✅ Stores last processed index for batch processing
+  lastIndex: number; // ✅ Tracks last processed index
 
   static TOTAL_NAMES = 1728; // Maximum total names to be generated
 
@@ -24,6 +23,8 @@ export class ConceptNameDO {
     const url = new URL(request.url);
     const method = request.method;
 
+    console.log(`📥 DO Received Request: ${method} ${url.pathname}`);
+
     if (method === 'GET' && url.pathname === '/names') {
       return new Response(JSON.stringify(await this.getNames()), {
         headers: { 'Content-Type': 'application/json' },
@@ -43,16 +44,17 @@ export class ConceptNameDO {
     }
 
     if (method === 'POST' && url.pathname === '/add-name') {
-      const { language, name } = (await request.json()) as {
+      const { language, name, index } = (await request.json()) as {
         language: 'en-us' | 'pt-br';
         name: string;
+        index: number;
       };
 
       if (!['en-us', 'pt-br'].includes(language)) {
         return new Response('Invalid language', { status: 400 });
       }
 
-      await this.addName(language, name);
+      await this.addName(language, name, index);
       return new Response('OK', { status: 200 });
     }
 
@@ -75,9 +77,17 @@ export class ConceptNameDO {
     return this.names;
   }
 
-  async getProgress(): Promise<ConceptProgress> {
+  async getProgress(): Promise<{
+    count: number;
+    total: number;
+    lastIndex: number;
+    progress: string;
+    ratePerMinute: number;
+    estimatedTimeMinutes: number | 'N/A';
+  }> {
     await this.loadCount();
     await this.loadTimestamps();
+    await this.loadLastIndex(); // ✅ Ensure latest lastIndex is fetched
 
     const now = Date.now();
     const oneMinuteAgo = now - 60 * 1000;
@@ -92,7 +102,7 @@ export class ConceptNameDO {
     return {
       count: this.count,
       total: ConceptNameDO.TOTAL_NAMES,
-      lastIndex: this.lastIndex,
+      lastIndex: this.lastIndex, // ✅ Include lastIndex in response
       progress:
         ((this.count / ConceptNameDO.TOTAL_NAMES) * 100).toFixed(2) + '%',
       ratePerMinute,
@@ -101,29 +111,40 @@ export class ConceptNameDO {
   }
 
   async getLastIndex(): Promise<number> {
-    if (this.lastIndex === 0) {
-      this.lastIndex = (await this.state.storage.get<number>('lastIndex')) || 0;
-    }
+    await this.loadLastIndex(); // ✅ Fetch lastIndex from storage
     return this.lastIndex;
   }
 
-  async addName(language: 'en-us' | 'pt-br', name: string): Promise<void> {
+  async addName(
+    language: 'en-us' | 'pt-br',
+    name: string,
+    index: number
+  ): Promise<void> {
     await this.getNames();
     await this.loadCount();
+    await this.loadLastIndex(); // ✅ Ensure lastIndex is loaded before modifying
 
     if (!this.names[language].includes(name)) {
       this.names[language].push(name);
       this.count += 1;
+
       this.recordTimestamp();
 
+      // 🔥 **Ensure lastIndex is updated**
+      if (index > this.lastIndex) {
+        this.lastIndex = index;
+      }
+
+      // 🔥 **Store all updated values in a single put() call**
       await this.state.storage.put({
         names: this.names,
         count: this.count,
         timestamps: this.timestamps,
+        lastIndex: this.lastIndex, // ✅ Store the last processed index
       });
 
       console.log(
-        `✅ Added name "${name}" to ${language}, count is now ${this.count}`
+        `✅ Added name "${name}" to ${language}, count: ${this.count}, lastIndex: ${this.lastIndex}`
       );
     }
   }
@@ -131,12 +152,22 @@ export class ConceptNameDO {
   async setLastIndex(lastIndex: number): Promise<void> {
     this.lastIndex = lastIndex;
     await this.state.storage.put('lastIndex', this.lastIndex);
+    console.log(`📌 Updated lastIndex to ${this.lastIndex}`);
   }
 
   async loadCount(): Promise<void> {
     this.count = (await this.state.storage.get<number>('count')) || 0;
   }
 
+  async loadLastIndex(): Promise<void> {
+    const storedIndex = await this.state.storage.get<number>('lastIndex');
+    if (typeof storedIndex === 'number') {
+      this.lastIndex = storedIndex;
+    } else {
+      this.lastIndex = 0; // ✅ Ensure it starts from 0
+    }
+  }
+
   async loadTimestamps(): Promise<void> {
     this.timestamps =
       (await this.state.storage.get<number[]>('timestamps')) || [];

package/app/workflow/ConceptWorkflow.ts

@@ -76,7 +76,7 @@ export class ConceptWorkflow {
       `🚀 Processing batch for concept: ${conceptSlug}, Phase: ${phase}, Total Combinations: ${combinations.length}`
     );
 
-    const concurrency = 20;
+    const concurrency = 5;
     const failedCombinations: string[] = [];
 
     // ✅ Get Durable Object stub for progress tracking

package/package.json

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

package/types/scopes/cloudflare.ts

@@ -9,7 +9,6 @@ import {
 import { DrizzleD1Database } from 'drizzle-orm/d1';
 import { Context, Env } from 'hono';
 import type { Container } from 'inversify';
-import { ConceptNameDO } from '../../app';
 
 export type CentralBindings = {
   TEST_IMAGES_BUCKET: R2Bucket;
@@ -27,6 +26,7 @@ export type CentralBindings = {
   KV_CONCEPT_NAMES: KVNamespace;
   CONCEPT_GENERATION_QUEUE: Queue;
   CONCEPT_NAMES_DO: DurableObjectNamespace;
+  CROWN_QUEUE: Queue;
 
   PROMPT_IMAGE_DESCRIBER: string;
   PROMPT_GENERATE_ARCHETYPE_BASIC_INFO: string;
@@ -117,6 +117,7 @@ export type BackendBindings = Env &
     | 'TOGETHER_API_KEY'
     | 'CONCEPT_NAMES_DO'
     | 'API_BASE_URL'
+    | 'CROWN_QUEUE'
   >;
 
 export type BackendCtx = Context<