@hamak/smart-data-dico 1.0.1 → 1.0.4

package/backend/package.json

@@ -13,11 +13,11 @@
     "test:coverage": "jest --coverage"
   },
   "dependencies": {
-    "@hamak/filesystem-server-api": "^0.5.1",
-    "@hamak/filesystem-server-impl": "^0.5.1",
-    "@hamak/filesystem-server-spi": "^0.5.1",
-    "@hamak/shared-utils": "^0.5.1",
-    "@hamak/ui-remote-git-fs-backend": "file:../../app-framework/packages/ui-remote-git-fs/backend/ui-remote-git-fs-backend",
+    "@hamak/filesystem-server-api": "^0.5.2",
+    "@hamak/filesystem-server-impl": "^0.5.2",
+    "@hamak/filesystem-server-spi": "^0.5.2",
+    "@hamak/shared-utils": "^0.5.2",
+    "@hamak/ui-remote-git-fs-backend": "^0.5.2",
     "@types/jsonwebtoken": "^9.0.9",
     "cors": "^2.8.5",
     "dotenv": "^16.3.1",

package/backend/src/server.ts

@@ -1,4 +1,5 @@
 import express, { Request, Response } from 'express';
+import fs from 'fs';
 import path from 'path';
 import cors from 'cors';
 import dotenv from 'dotenv';
@@ -36,10 +37,12 @@ app.use((req: Request, res: Response, next) => {
 
 app.use(express.json());
 
-// Basic route
-app.get('/', (req: Request, res: Response) => {
-  res.json({ message: 'Welcome to the Data Dictionary Management System API' });
-});
+// API welcome route (only in dev — production serves frontend at /)
+if (!config.isProduction) {
+  app.get('/', (req: Request, res: Response) => {
+    res.json({ message: 'Welcome to the Data Dictionary Management System API' });
+  });
+}
 
 // Health check endpoint
 app.get('/health', (req: Request, res: Response) => {
@@ -104,8 +107,35 @@ mountFrameworkRoutes().catch((err) => {
 });
 
 
-// Error handling middleware
-app.use((err: any, req: Request, res: Response, next: any) => {
+// Serve frontend static files in production (BEFORE error handler)
+if (config.isProduction) {
+  // Check multiple possible frontend dist locations
+  const candidates = [
+    path.join(process.cwd(), 'public'),                    // Docker (copied to public/)
+    path.join(process.cwd(), '..', 'frontend', 'dist'),    // npm package / monorepo
+    path.join(process.cwd(), 'frontend', 'dist'),           // alt layout
+  ];
+  const publicDir = candidates.find(d => {
+    try { return fs.statSync(d).isDirectory(); } catch { return false; }
+  });
+
+  if (publicDir) {
+    app.use(express.static(publicDir));
+    // SPA fallback — only for navigation requests, not assets/API
+    app.get('*', (req, res, next) => {
+      if (req.path.startsWith('/api') || req.path.startsWith('/fs') || req.path.startsWith('/api-docs') || req.path.includes('.')) {
+        return next();
+      }
+      res.sendFile(path.join(publicDir, 'index.html'));
+    });
+    logger.info(`Serving frontend from ${publicDir}`);
+  } else {
+    logger.warn('Frontend dist not found. API-only mode.');
+  }
+}
+
+// Error handling middleware (after static files)
+app.use((err: any, req: Request, res: Response, _next: any) => {
   logger.error(`Unhandled error: ${err.message}`);
   res.status(500).json({
     message: 'Internal server error',
@@ -113,18 +143,6 @@ app.use((err: any, req: Request, res: Response, next: any) => {
   });
 });
 
-// Serve frontend static files in production
-if (config.isProduction) {
-  const publicDir = path.join(process.cwd(), 'public');
-  app.use(express.static(publicDir));
-  app.get('*', (req, res) => {
-    if (!req.path.startsWith('/api') && !req.path.startsWith('/fs') && !req.path.startsWith('/api-docs')) {
-      res.sendFile(path.join(publicDir, 'index.html'));
-    }
-  });
-  logger.info(`Serving frontend from ${publicDir}`);
-}
-
 // Start server only when run directly (not when imported by tests)
 const isMainModule = process.argv[1] && (
   process.argv[1].endsWith('server.ts') || process.argv[1].endsWith('server.js')

package/bin/cli.js

@@ -89,7 +89,7 @@ const child = spawn(tsxBin, tsxArgs, {
   env: {
     ...process.env,
     PORT: port,
-    NODE_ENV: existsSync(frontendDist) ? 'production' : 'development',
+    NODE_ENV: 'production',
     PROFILE: process.env.PROFILE || 'local',
     DATA_DIR: dataDir,
   },