baraqex 1.0.67 → 1.0.69

package/templates/fullstack-template/src/server.ts

@@ -1,8 +1,3 @@
-import { createServer, AuthService, Database } from 'baraqex/server';
-import helmet from 'helmet';
-import compression from 'compression';
-import rateLimit from 'express-rate-limit';
-import morgan from 'morgan';
 import dotenv from 'dotenv';
 
 // Load environment variables
@@ -31,70 +26,170 @@ const config = {
   }
 };
 
-// Create server instance
-const server = createServer(config);
+// Wait for baraqex to be ready
+async function waitForBaraqex() {
+  const maxWait = 10000;
+  const interval = 100;
+  let waited = 0;
+  
+  while (waited < maxWait) {
+    try {
+      const baraqex = await import('baraqex');
+      if (baraqex.createServer && typeof baraqex.createServer === 'function') {
+        return baraqex;
+      }
+    } catch (error) {
+      // Continue waiting
+    }
+    
+    await new Promise(resolve => setTimeout(resolve, interval));
+    waited += interval;
+  }
+  
+  throw new Error('Baraqex failed to initialize within timeout period');
+}
 
-// Get Express app for additional middleware
-const app = server.getExpressApp();
+// Async function to start server
+async function startServer() {
+  try {
+    console.log('🔄 Waiting for Baraqex to initialize...');
+    
+    // Wait for baraqex to be ready
+    const baraqex = await waitForBaraqex();
+    const { createServer } = baraqex;
+    
+    console.log('✅ Baraqex initialized successfully');
+    
+    if (!createServer || typeof createServer !== 'function') {
+      throw new Error('createServer function not available from baraqex package');
+    }
 
-// Security middleware
-app.use(helmet({
-  contentSecurityPolicy: {
-    directives: {
-      defaultSrc: ["'self'"],
-      styleSrc: ["'self'", "'unsafe-inline'"],
-      scriptSrc: ["'self'"],
-      imgSrc: ["'self'", "data:", "https:"],
-    },
-  },
-}));
+    // Create server instance
+    const server = createServer(config);
+    
+    // Wait for server initialization
+    await new Promise(resolve => setTimeout(resolve, 1000));
 
-// Compression middleware
-app.use(compression());
+    // Start the server first
+    console.log('🚀 Starting server...');
+    await server.start();
+    
+    // Then try to set up additional endpoints after server is running
+    try {
+      if (typeof server.getExpressApp === 'function') {
+        const app = server.getExpressApp();
+        
+        if (app) {
+          // Health check endpoint
+          app.get('/health', (req, res) => {
+            res.json({ 
+              status: 'ok', 
+              timestamp: new Date().toISOString(),
+              version: process.env.npm_package_version || '1.0.0',
+              environment: process.env.NODE_ENV || 'development'
+            });
+          });
+
+          // API status endpoint
+          app.get('/api/status', (req, res) => {
+            let db = null;
+            let auth = null;
+            
+            try {
+              if (typeof server.getDatabase === 'function') {
+                db = server.getDatabase();
+              }
+            } catch (e) {
+              // Database method not available
+            }
+            
+            try {
+              if (typeof server.getAuth === 'function') {
+                auth = server.getAuth();
+              }
+            } catch (e) {
+              // Auth method not available
+            }
+            
+            res.json({
+              api: 'online',
+              database: db ? 'connected' : 'not configured',
+              authentication: auth ? 'enabled' : 'disabled',
+              timestamp: new Date().toISOString()
+            });
+          });
+        }
+      }
+    } catch (setupError) {
+      console.warn('⚠️ Could not set up additional endpoints:', setupError.message);
+    }
 
-// Request logging
-if (process.env.NODE_ENV !== 'test') {
-  app.use(morgan(process.env.NODE_ENV === 'production' ? 'combined' : 'dev'));
+    // Database connection (if configured)
+    await connectDatabase(server);
+    
+    console.log(`🚀 Fullstack server running on http://localhost:${config.port}`);
+    console.log(`📊 Environment: ${process.env.NODE_ENV || 'development'}`);
+    
+    // Safely check auth status
+    let authStatus = 'disabled';
+    try {
+      if (typeof server.getAuth === 'function') {
+        authStatus = server.getAuth() ? 'enabled' : 'disabled';
+      }
+    } catch (e) {
+      // Auth check failed
+    }
+    console.log(`🔑 Auth: ${authStatus}`);
+    
+    // Safely check database status
+    let dbStatus = 'not configured';
+    try {
+      if (typeof server.getDatabase === 'function') {
+        dbStatus = server.getDatabase() ? 'connected' : 'not configured';
+      }
+    } catch (e) {
+      // Database check failed
+    }
+    console.log(`💾 Database: ${dbStatus}`);
+    
+    console.log(`🌐 API docs: http://localhost:${config.port}/api-docs`);
+    console.log(`❤️  Health check: http://localhost:${config.port}/health`);
+    
+    return server;
+    
+  } catch (error) {
+    console.error('❌ Failed to start server:', error);
+    
+    if (error.message.includes('Express not installed')) {
+      console.log('\n💡 To fix this, run:');
+      console.log('  npm install express @types/express');
+    } else if (error.message.includes('createServer function not available')) {
+      console.log('\n💡 To fix this, make sure baraqex is properly installed:');
+      console.log('  npm install baraqex');
+      console.log('  npm install express @types/express');
+    } else if (error.message.includes('timeout')) {
+      console.log('\n💡 Baraqex is taking longer than expected to initialize.');
+      console.log('  This might be due to missing dependencies.');
+      console.log('  Try installing: npm install express @types/express');
+    }
+    
+    process.exit(1);
+  }
 }
 
-// Rate limiting
-const limiter = rateLimit({
-  windowMs: 15 * 60 * 1000, // 15 minutes
-  max: process.env.NODE_ENV === 'production' ? 100 : 1000, // limit each IP to 100 requests per windowMs in production
-  message: {
-    error: 'Too many requests from this IP, please try again later.'
+// Database connection helper
+async function connectDatabase(server) {
+  let db = null;
+  try {
+    if (typeof server.getDatabase === 'function') {
+      db = server.getDatabase();
+    }
+  } catch (e) {
+    console.log('⚠️  Database functionality not available');
+    return;
   }
-});
-app.use('/api', limiter);
-
-// Health check endpoint
-app.get('/health', (req, res) => {
-  res.json({ 
-    status: 'ok', 
-    timestamp: new Date().toISOString(),
-    version: process.env.npm_package_version || '1.0.0',
-    environment: process.env.NODE_ENV || 'development'
-  });
-});
-
-// API status endpoint
-app.get('/api/status', (req, res) => {
-  const db = server.getDatabase();
-  res.json({
-    api: 'online',
-    database: db ? 'connected' : 'not configured',
-    authentication: server.getAuth() ? 'enabled' : 'disabled',
-    timestamp: new Date().toISOString()
-  });
-});
-
-// Enable SSR with hydration
-server.enableSSR({ hydratable: true });
-
-// Database connection
-async function connectDatabase() {
-  const db = server.getDatabase();
-  if (db) {
+  
+  if (db && typeof db.connect === 'function') {
     try {
       await db.connect();
       console.log('✅ Database connected successfully');
@@ -112,42 +207,13 @@ async function connectDatabase() {
 // Graceful shutdown
 process.on('SIGTERM', async () => {
   console.log('🔄 SIGTERM received, shutting down gracefully...');
-  
-  try {
-    await server.stop();
-    const db = server.getDatabase();
-    if (db) {
-      await db.disconnect();
-    }
-    console.log('✅ Server shut down complete');
-    process.exit(0);
-  } catch (error) {
-    console.error('❌ Error during shutdown:', error);
-    process.exit(1);
-  }
+  process.exit(0);
 });
 
-// Start server
-async function startServer() {
-  try {
-    // Connect to database first
-    await connectDatabase();
-    
-    // Start the server
-    await server.start();
-    
-    console.log(`🚀 Fullstack server running on http://localhost:${config.port}`);
-    console.log(`📊 Environment: ${process.env.NODE_ENV || 'development'}`);
-    console.log(`🔑 Auth: ${server.getAuth() ? 'enabled' : 'disabled'}`);
-    console.log(`💾 Database: ${server.getDatabase() ? 'connected' : 'not configured'}`);
-    console.log(`🌐 API docs: http://localhost:${config.port}/api-docs`);
-    console.log(`❤️  Health check: http://localhost:${config.port}/health`);
-    
-  } catch (error) {
-    console.error('❌ Failed to start server:', error);
-    process.exit(1);
-  }
-}
+process.on('SIGINT', async () => {
+  console.log('🔄 SIGINT received, shutting down gracefully...');
+  process.exit(0);
+});
 
 // Handle unhandled promise rejections
 process.on('unhandledRejection', (reason, promise) => {
@@ -163,5 +229,3 @@ process.on('uncaughtException', (error) => {
 
 // Start the server
 startServer();
-
-export default server;

package/templates/fullstack-template/tsconfig.json

@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "declaration": true,
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": false,
+    "jsx": "react-jsx",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"]
+  },
+  "include": [
+    "src/**/*"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist",
+    "**/*.test.ts",
+    "**/*.spec.ts"
+  ]
+}