@objectstack/runtime 3.2.5 → 3.2.7

package/src/http-dispatcher.ts

@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { ObjectKernel, getEnv } from '@objectstack/core';
+import { ObjectKernel, getEnv, resolveLocale } from '@objectstack/core';
 import { CoreServiceName } from '@objectstack/spec/system';
 
 /** Browser-safe UUID generator — prefers Web Crypto, falls back to RFC 4122 v4 */
@@ -67,27 +67,52 @@ export class HttpDispatcher {
     }
 
     /**
-     * Generates the discovery JSON response for the API root
+     * Generates the discovery JSON response for the API root.
+     *
+     * Uses the same async `resolveService()` fallback chain that request
+     * handlers use, so the reported service status is always consistent
+     * with the actual runtime availability.
      */
-    getDiscoveryInfo(prefix: string) {
-        const services = this.getServicesMap();
-        
-        // All services are plugin-provided — check if a plugin has registered them
-        const hasAuth         = !!services[CoreServiceName.enum.auth];
-        const hasGraphQL      = !!(services[CoreServiceName.enum.graphql] || this.kernel.graphql);
-        const hasSearch       = !!services[CoreServiceName.enum.search];
-        const hasWebSockets   = !!services[CoreServiceName.enum.realtime];
-        const hasFiles        = !!(services[CoreServiceName.enum['file-storage']] || services['storage']?.supportsFiles);
-        const hasAnalytics    = !!services[CoreServiceName.enum.analytics];
-        const hasWorkflow     = !!services[CoreServiceName.enum.workflow];
-        const hasAi           = !!services[CoreServiceName.enum.ai];
-        const hasNotification = !!services[CoreServiceName.enum.notification];
-        const hasI18n         = !!services[CoreServiceName.enum.i18n];
-        const hasUi           = !!services[CoreServiceName.enum.ui];
-        const hasAutomation   = !!services[CoreServiceName.enum.automation];
-        const hasCache        = !!services[CoreServiceName.enum.cache];
-        const hasQueue        = !!services[CoreServiceName.enum.queue];
-        const hasJob          = !!services[CoreServiceName.enum.job];
+    async getDiscoveryInfo(prefix: string) {
+        // Resolve all services through the same async fallback chain
+        // that request handlers (handleI18n, handleAuth, …) use.
+        const [
+            authSvc, graphqlSvc, searchSvc, realtimeSvc, filesSvc,
+            analyticsSvc, workflowSvc, aiSvc, notificationSvc, i18nSvc,
+            uiSvc, automationSvc, cacheSvc, queueSvc, jobSvc,
+        ] = await Promise.all([
+            this.resolveService(CoreServiceName.enum.auth),
+            this.resolveService(CoreServiceName.enum.graphql),
+            this.resolveService(CoreServiceName.enum.search),
+            this.resolveService(CoreServiceName.enum.realtime),
+            this.resolveService(CoreServiceName.enum['file-storage']),
+            this.resolveService(CoreServiceName.enum.analytics),
+            this.resolveService(CoreServiceName.enum.workflow),
+            this.resolveService(CoreServiceName.enum.ai),
+            this.resolveService(CoreServiceName.enum.notification),
+            this.resolveService(CoreServiceName.enum.i18n),
+            this.resolveService(CoreServiceName.enum.ui),
+            this.resolveService(CoreServiceName.enum.automation),
+            this.resolveService(CoreServiceName.enum.cache),
+            this.resolveService(CoreServiceName.enum.queue),
+            this.resolveService(CoreServiceName.enum.job),
+        ]);
+
+        const hasAuth         = !!authSvc;
+        const hasGraphQL      = !!(graphqlSvc || this.kernel.graphql);
+        const hasSearch       = !!searchSvc;
+        const hasWebSockets   = !!realtimeSvc;
+        const hasFiles        = !!filesSvc;
+        const hasAnalytics    = !!analyticsSvc;
+        const hasWorkflow     = !!workflowSvc;
+        const hasAi           = !!aiSvc;
+        const hasNotification = !!notificationSvc;
+        const hasI18n         = !!i18nSvc;
+        const hasUi           = !!uiSvc;
+        const hasAutomation   = !!automationSvc;
+        const hasCache        = !!cacheSvc;
+        const hasQueue        = !!queueSvc;
+        const hasJob          = !!jobSvc;
 
         // Routes are only exposed when a plugin provides the service
         const routes = {
@@ -116,6 +141,20 @@ export class HttpDispatcher {
             message: `Install a ${name} plugin to enable`,
         });
 
+        // Derive locale info from actual i18n service when available
+        let locale = { default: 'en', supported: ['en'], timezone: 'UTC' };
+        if (hasI18n && i18nSvc) {
+            const defaultLocale = typeof i18nSvc.getDefaultLocale === 'function'
+                ? i18nSvc.getDefaultLocale() : 'en';
+            const locales = typeof i18nSvc.getLocales === 'function'
+                ? i18nSvc.getLocales() : [];
+            locale = {
+                default: defaultLocale,
+                supported: locales.length > 0 ? locales : [defaultLocale],
+                timezone: 'UTC',
+            };
+        }
+
         return {
             name: 'ObjectOS',
             version: '1.0.0',
@@ -154,11 +193,7 @@ export class HttpDispatcher {
                 'file-storage': hasFiles ? svcAvailable(routes.storage) : svcUnavailable('file-storage'),
                 search:         hasSearch ? svcAvailable() : svcUnavailable('search'),
             },
-            locale: {
-                default: 'en',
-                supported: ['en', 'zh-CN'],
-                timezone: 'UTC'
-            }
+            locale,
         };
     }
 
@@ -585,15 +620,36 @@ export class HttpDispatcher {
         if (parts[0] === 'translations') {
             const locale = parts[1] ? decodeURIComponent(parts[1]) : query?.locale;
             if (!locale) return { handled: true, response: this.error('Missing locale parameter', 400) };
-            const translations = i18nService.getTranslations(locale);
+
+            let translations = i18nService.getTranslations(locale);
+
+            // Locale fallback: try resolving to an available locale when
+            // the exact code yields empty translations (e.g. zh → zh-CN).
+            if (Object.keys(translations).length === 0) {
+                const availableLocales = typeof i18nService.getLocales === 'function'
+                    ? i18nService.getLocales() : [];
+                const resolved = resolveLocale(locale, availableLocales);
+                if (resolved && resolved !== locale) {
+                    translations = i18nService.getTranslations(resolved);
+                    return { handled: true, response: this.success({ locale: resolved, requestedLocale: locale, translations }) };
+                }
+            }
+
             return { handled: true, response: this.success({ locale, translations }) };
         }
 
         // GET /i18n/labels/:object/:locale  OR  /i18n/labels/:object?locale=xx
         if (parts[0] === 'labels' && parts.length >= 2) {
             const objectName = decodeURIComponent(parts[1]);
-            const locale = parts[2] ? decodeURIComponent(parts[2]) : query?.locale;
+            let locale = parts[2] ? decodeURIComponent(parts[2]) : query?.locale;
             if (!locale) return { handled: true, response: this.error('Missing locale parameter', 400) };
+
+            // Locale fallback for labels endpoint
+            const availableLocales = typeof i18nService.getLocales === 'function'
+                ? i18nService.getLocales() : [];
+            const resolved = resolveLocale(locale, availableLocales);
+            if (resolved) locale = resolved;
+
             if (typeof i18nService.getFieldLabels === 'function') {
                 const labels = i18nService.getFieldLabels(objectName, locale);
                 return { handled: true, response: this.success({ object: objectName, locale, labels }) };
@@ -1056,7 +1112,7 @@ export class HttpDispatcher {
         // Handles request to base URL (e.g. /api/v1) which MSW strips to empty string
         if (cleanPath === '' && method === 'GET') {
              // We use '' as prefix since we are internal dispatcher
-             const info = this.getDiscoveryInfo('');
+             const info = await this.getDiscoveryInfo('');
              return { 
                  handled: true, 
                  response: this.success(info) 

package/src/seed-loader.ts

@@ -13,6 +13,7 @@ import type {
   DatasetLoadResult,
   Dataset,
 } from '@objectstack/spec/data';
+import { SeedLoaderConfigSchema } from '@objectstack/spec/data';
 
 interface Logger {
   info(message: string, meta?: Record<string, any>): void;
@@ -152,7 +153,6 @@ export class SeedLoaderService implements ISeedLoaderService {
   }
 
   async validate(datasets: Dataset[], config?: SeedLoaderConfigInput): Promise<SeedLoaderResult> {
-    const { SeedLoaderConfigSchema } = await import('@objectstack/spec/data');
     const parsedConfig = SeedLoaderConfigSchema.parse({ ...config, dryRun: true });
     return this.load({ datasets, config: parsedConfig });
   }