@zodic/shared 0.0.174 → 0.0.175

package/app/durable/ConceptNameDO.ts

@@ -1,11 +1,12 @@
 import { DurableObjectState } from '@cloudflare/workers-types';
 
-export class ConceptNameDO {
+export class ConceptNameDO extends DurableObject {
   state: DurableObjectState;
   env: any;
   names: { 'en-us': string[]; 'pt-br': string[] };
 
   constructor(state: DurableObjectState, env: any) {
+    super(state, env); // ✅ Call super() for DurableObject
     this.state = state;
     this.env = env;
     this.names = { 'en-us': [], 'pt-br': [] };
@@ -23,18 +24,22 @@ export class ConceptNameDO {
     }
 
     if (method === 'POST' && url.pathname === '/add-name') {
-      const { language, name } = (await request.json()) as {
-        language: 'en-us' | 'pt-br';
-        name: string;
-      };
-
-      // ✅ Normalize language codes to match `generateBasicInfo`
-      if (!['en-us', 'pt-br'].includes(language)) {
-        return new Response('Invalid language', { status: 400 });
-      }
+      try {
+        const { language, name } = (await request.json()) as {
+          language: 'en-us' | 'pt-br';
+          name: string;
+        };
+
+        if (!['en-us', 'pt-br'].includes(language)) {
+          return new Response('Invalid language', { status: 400 });
+        }
 
-      await this.addName(language, name);
-      return new Response('OK', { status: 200 });
+        await this.addName(language, name);
+        return new Response('OK', { status: 200 });
+      } catch (error) {
+        console.error('❌ Error processing request:', error);
+        return new Response('Bad Request', { status: 400 });
+      }
     }
 
     return new Response('Not Found', { status: 404 });
@@ -45,14 +50,19 @@ export class ConceptNameDO {
       'en-us': string[];
       'pt-br': string[];
     }>('names');
+
     if (stored) {
       this.names = stored;
     }
   }
 
   async addName(language: 'en-us' | 'pt-br', name: string): Promise<void> {
+    await this.loadNames(); // Ensure we have the latest names
+
     if (!this.names[language].includes(name)) {
       this.names[language].push(name);
+
+      // ✅ Ensure concurrent writes do not overwrite existing stored data
       await this.state.storage.put('names', this.names);
     }
   }

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 { schema } from '../..';
+import { ConceptNameDO, schema } from '../..';
 import { Concept, ControlNetConfig, Languages } from '../../types';
 import {
   KVConcept,
@@ -35,9 +35,9 @@ export class ConceptService {
     const kvKeyPT = buildConceptKVKey('pt-br', conceptSlug, combinationString);
     const failureKey = `failures:basic-info:${conceptSlug}:${combinationString}`;
 
-    const doUrl = `${this.context.env.API_BASE_URL}/api/concept-names/${conceptSlug}`;
-
-    console.log('!-- doUrl: ', doUrl);
+    // ✅ Use Durable Object stub
+    const id = this.context.env.CONCEPT_NAMES_DO.idFromName(conceptSlug);
+    const stub = this.context.env.CONCEPT_NAMES_DO.get(id);
 
     let attempts = 0;
     const maxAttempts = 3;
@@ -51,7 +51,7 @@ export class ConceptService {
         // ✅ Fetch the latest name list from Durable Object
         let allNamesEN: string[] = [];
         let allNamesPT: string[] = [];
-        const response = await fetch(doUrl);
+        const response = await stub.fetch('https://internal/names');
         if (response.ok) {
           const data = (await response.json()) as {
             'en-us': string[];
@@ -60,8 +60,8 @@ export class ConceptService {
           allNamesEN = data['en-us'] || [];
           allNamesPT = data['pt-br'] || [];
         } else {
-          console.log('!-- Error on fetching url: ', doUrl);
-          console.log('!-- Response: ', JSON.stringify(response, null, 2));
+          console.log('!-- Error fetching names from Durable Object');
+          console.log('!-- Response:', await response.text());
         }
 
         // ✅ Fetch existing KV data to backfill Durable Object if necessary
@@ -71,37 +71,19 @@ 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}`);
-          try {
-            await fetch(`${doUrl}/add`, {
-              method: 'POST',
-              body: JSON.stringify({
-                language: 'en-us',
-                name: existingEN.name,
-              }),
-              headers: { 'Content-Type': 'application/json' },
-            });
-          } catch (e) {
-            console.log(
-              `!-- Error on fetch ConceptNames ${(e as Error).message}`
-            );
-          }
+          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 name to DO: ${existingPT.name}`);
-          try {
-            await fetch(`${doUrl}/add`, {
-              method: 'POST',
-              body: JSON.stringify({
-                language: 'pt-br',
-                name: existingPT.name,
-              }),
-              headers: { 'Content-Type': 'application/json' },
-            });
-          } catch (e) {
-            console.log(
-              `!-- Error on fetch ConceptNames ${(e as Error).message}`
-            );
-          }
+          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
@@ -145,13 +127,13 @@ export class ConceptService {
         }
 
         // ✅ **Immediately update Durable Object with the new name**
-        await fetch(`${doUrl}/add`, {
+        await stub.fetch('https://internal/add-name', {
           method: 'POST',
           body: JSON.stringify({ language: 'en-us', name: nameEN }),
           headers: { 'Content-Type': 'application/json' },
         });
 
-        await fetch(`${doUrl}/add`, {
+        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.174",
+  "version": "0.0.175",
   "module": "index.ts",
   "type": "module",
   "publishConfig": {

package/types/scopes/cloudflare.ts

@@ -9,6 +9,7 @@ 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;
@@ -25,7 +26,7 @@ export type CentralBindings = {
   KV_CONCEPT_FAILURES: KVNamespace;
   KV_CONCEPT_NAMES: KVNamespace;
   CONCEPT_GENERATION_QUEUE: Queue;
-  CONCEPT_NAMES_DO: DurableObjectNamespace;
+  CONCEPT_NAMES_DO: DurableObjectNamespace<ConceptNameDO>;
 
   PROMPT_IMAGE_DESCRIBER: string;
   PROMPT_GENERATE_ARCHETYPE_BASIC_INFO: string;