diff --git a/infra/stacks/cloud-storage-service/index.ts b/infra/stacks/cloud-storage-service/index.ts index fd34c3ee2..b95c927a7 100644 --- a/infra/stacks/cloud-storage-service/index.ts +++ b/infra/stacks/cloud-storage-service/index.ts @@ -346,7 +346,7 @@ const cloudStorageService = new CloudStorageService( }, { name: 'SYNC_SERVICE_URL', - value: `https://sync-service-${stack}.macroverse.workers.dev`, + value: `https://sync-service-${stack === 'dev' ? 'dev2' : stack}.macroverse.workers.dev`, }, { name: 'MACRO_API_TOKEN_ISSUER', diff --git a/infra/stacks/delete-document-worker/index.ts b/infra/stacks/delete-document-worker/index.ts index de1c0b736..e46c3dd7e 100644 --- a/infra/stacks/delete-document-worker/index.ts +++ b/infra/stacks/delete-document-worker/index.ts @@ -120,7 +120,7 @@ const deleteDocumentWorker = new Worker(`delete-document-worker-${stack}`, { { name: 'SYNC_SERVICE_URL', value: `https://sync-service${ - stack === 'prod' ? '' : `-${stack}` + stack === 'prod' ? '' : `-${stack === 'dev' ? 'dev2' : stack}` }.macroverse.workers.dev`, }, { diff --git a/infra/stacks/document-cognition-service/index.ts b/infra/stacks/document-cognition-service/index.ts index 6f8babee7..ba569d48e 100644 --- a/infra/stacks/document-cognition-service/index.ts +++ b/infra/stacks/document-cognition-service/index.ts @@ -304,7 +304,7 @@ const documentCognitionService = new DocumentCognitionService( }, { name: 'SYNC_SERVICE_URL', - value: `https://sync-service-${stack}.macroverse.workers.dev`, + value: `https://sync-service-${stack === 'dev' ? 'dev2' : stack}.macroverse.workers.dev`, }, { name: 'MACRO_API_TOKEN_ISSUER', diff --git a/infra/stacks/insight-service/index.ts b/infra/stacks/insight-service/index.ts index e06c90e3d..1be4729ca 100644 --- a/infra/stacks/insight-service/index.ts +++ b/infra/stacks/insight-service/index.ts @@ -106,7 +106,7 @@ const vars: InsightServiceEnvVars = { DOCUMENT_STORAGE_SERVICE_URL, DOCUMENT_COGNITION_SERVICE_URL, SYNC_SERVICE_AUTH_KEY: pulumi.interpolate`${SYNC_SERVICE_AUTH_KEY}`, - SYNC_SERVICE_URL: `https://sync-service${stack === 'prod' ? '' : `-${stack}`}.macroverse.workers.dev`, + SYNC_SERVICE_URL: `https://sync-service${stack === 'prod' ? '' : `-${stack === 'dev' ? 'dev2' : stack}`}.macroverse.workers.dev`, EMAIL_SERVICE_URL: pulumi.interpolate`${emailServiceUrl}`, MACRO_API_TOKEN_ISSUER: pulumi.interpolate`${MACRO_API_TOKENS.macroApiTokenIssuer}`, MACRO_API_TOKEN_PUBLIC_KEY: pulumi.interpolate`${MACRO_API_TOKENS.macroApiTokenPublicKey}`, diff --git a/js/app/packages/core/constant/servers.ts b/js/app/packages/core/constant/servers.ts index de71ebc3c..499f4f38e 100644 --- a/js/app/packages/core/constant/servers.ts +++ b/js/app/packages/core/constant/servers.ts @@ -68,7 +68,7 @@ function selectLocalServers(): Servers { } const syncServiceSuffix = - import.meta.env.MODE === 'development' ? '-dev' : '-prod'; + import.meta.env.MODE === 'development' ? '-dev2' : '-prod'; export const SYNC_SERVICE_HOSTS = { worker: `https://sync-service${syncServiceSuffix}.macroverse.workers.dev`, diff --git a/js/lexical-service/src/lib/sync-service.ts b/js/lexical-service/src/lib/sync-service.ts index 83b17a60a..0992882eb 100644 --- a/js/lexical-service/src/lib/sync-service.ts +++ b/js/lexical-service/src/lib/sync-service.ts @@ -29,6 +29,7 @@ export class SyncServiceClient { let response: Response; if (this.config.serviceFetcher) { + // How can this be correct??? the url would be https://sync-service/document//raw ????? response = await this.config.serviceFetcher.fetch(`https://sync-service${path}`, { method: 'GET', headers: { diff --git a/js/lexical-service/worker-configuration.d.ts b/js/lexical-service/worker-configuration.d.ts index 462301940..3826633b0 100644 --- a/js/lexical-service/worker-configuration.d.ts +++ b/js/lexical-service/worker-configuration.d.ts @@ -3,7 +3,7 @@ // Runtime types generated with workerd@1.20250712.0 2025-07-22 declare namespace Cloudflare { interface Env { - SYNC_SERVICE_URL: "https://sync-service-prod.macroverse.workers.dev" | "https://sync-service-dev.macroverse.workers.dev"; + SYNC_SERVICE_URL: "https://sync-service-prod.macroverse.workers.dev" | "https://sync-service-dev2.macroverse.workers.dev"; SYNC_SERVICE: Fetcher /* sync-service-prod */; } } diff --git a/js/lexical-service/wrangler.jsonc b/js/lexical-service/wrangler.jsonc index c1a36627a..652646e59 100644 --- a/js/lexical-service/wrangler.jsonc +++ b/js/lexical-service/wrangler.jsonc @@ -22,18 +22,18 @@ "env": { "local": { "vars": { - "SYNC_SERVICE_URL": "https://sync-service-dev.macroverse.workers.dev", + "SYNC_SERVICE_URL": "https://sync-service-dev2.macroverse.workers.dev", } }, "dev": { "services": [ { "binding": "SYNC_SERVICE", - "service": "sync-service-dev" + "service": "sync-service-dev2" } ], "vars": { - "SYNC_SERVICE_URL": "https://sync-service-dev.macroverse.workers.dev", + "SYNC_SERVICE_URL": "https://sync-service-dev2.macroverse.workers.dev", } }, "prod": {