@qwickapps/server 1.7.1 → 1.8.0

package/src/plugins/usage/usage-plugin.ts

@@ -17,6 +17,8 @@ import type {
   UsageStatus,
   UsageSummary,
 } from './types.js';
+import { hasPostgres, getPostgres } from '../postgres-plugin.js';
+import { postgresUsageStore } from './stores/index.js';
 
 // Import subscription helpers if available
 let getFeatureLimitFn: ((userId: string, featureCode: string) => Promise<number | null>) | null = null;
@@ -44,15 +46,18 @@ function getTomorrowMidnight(): Date {
 }
 
 /**
- * Create the Usage plugin
+ * Create the Usage plugin with smart defaults
+ *
+ * Config is optional - plugin will use defaults and get dependencies from registry.
+ * Gracefully handles missing dependencies with clear log messages.
  */
-export function createUsagePlugin(config: UsagePluginConfig): Plugin {
-  const debug = config.debug || false;
-  const apiPrefix = config.api?.prefix || '/'; // Framework adds /usage prefix automatically
-
-  function log(message: string, data?: Record<string, unknown>) {
-    if (debug) {
-      console.log(`[UsagePlugin] ${message}`, data || '');
+export function createUsagePlugin(config: Partial<UsagePluginConfig> = {}): Plugin {
+  function log(message: string, data?: Record<string, unknown>, isError = false) {
+    const prefix = '[UsagePlugin]';
+    if (isError) {
+      console.error(`${prefix} ${message}`, data || '');
+    } else if (config.debug) {
+      console.log(`${prefix} ${message}`, data || '');
     }
   }
 
@@ -62,15 +67,48 @@ export function createUsagePlugin(config: UsagePluginConfig): Plugin {
     version: '1.0.0',
 
     async onStart(_pluginConfig: PluginConfig, registry: PluginRegistry): Promise<void> {
+      const logger = registry.getLogger('usage');
+
+      // Check for postgres in registry
+      if (!hasPostgres()) {
+        logger.warn('No Database! Usage plugin disabled.');
+        registry.registerHealthCheck({
+          name: 'usage-store',
+          type: 'custom',
+          check: async () => ({
+            healthy: false,
+            details: {
+              error: 'PostgreSQL not available',
+              state: 'disabled',
+            },
+          }),
+        });
+        return;
+      }
+
+      // Smart defaults - get dependencies from registry
+      const store = config.store ?? postgresUsageStore({
+        pool: () => getPostgres().getPool(),
+        autoCreateTables: true,
+      });
+
+      const debug = config.debug ?? false;
+      const apiPrefix = config.api?.prefix ?? '/'; // Framework adds /usage prefix automatically
+      const apiEnabled = config.api?.enabled ?? true;
+      const dailyRetentionDays = config.cleanup?.dailyRetentionDays ?? 90;
+      const monthlyRetentionMonths = config.cleanup?.monthlyRetentionMonths ?? 24;
+      const runOnStartup = config.cleanup?.runOnStartup ?? false;
+      const cleanupIntervalHours = config.cleanup?.cleanupIntervalHours ?? 0;
+
       log('Starting usage plugin');
 
       // Initialize the store (creates tables if needed)
-      await config.store.initialize();
+      await store.initialize();
       log('Usage plugin migrations complete');
 
       // Store references for helper access
-      currentStore = config.store;
-      currentConfig = config;
+      currentStore = store;
+      currentConfig = { ...config, store, debug };
 
       // Try to get the feature limit function from subscriptions plugin
       try {
@@ -96,25 +134,19 @@ export function createUsagePlugin(config: UsagePluginConfig): Plugin {
       });
 
       // Run cleanup on startup if configured
-      if (config.cleanup?.runOnStartup) {
-        const dailyDays = config.cleanup.dailyRetentionDays || 90;
-        const monthlyMonths = config.cleanup.monthlyRetentionMonths || 24;
-
-        const dailyDeleted = await config.store.cleanupOldDaily(dailyDays);
-        const monthlyDeleted = await config.store.cleanupOldMonthly(monthlyMonths);
+      if (runOnStartup) {
+        const dailyDeleted = await store.cleanupOldDaily(dailyRetentionDays);
+        const monthlyDeleted = await store.cleanupOldMonthly(monthlyRetentionMonths);
         log('Startup cleanup complete', { dailyDeleted, monthlyDeleted });
       }
 
       // Set up periodic cleanup if configured
-      if (config.cleanup?.cleanupIntervalHours && config.cleanup.cleanupIntervalHours > 0) {
-        const intervalMs = config.cleanup.cleanupIntervalHours * 60 * 60 * 1000;
+      if (cleanupIntervalHours > 0) {
+        const intervalMs = cleanupIntervalHours * 60 * 60 * 1000;
         cleanupIntervalId = setInterval(async () => {
           try {
-            const dailyDays = config.cleanup?.dailyRetentionDays || 90;
-            const monthlyMonths = config.cleanup?.monthlyRetentionMonths || 24;
-
-            const dailyDeleted = await config.store.cleanupOldDaily(dailyDays);
-            const monthlyDeleted = await config.store.cleanupOldMonthly(monthlyMonths);
+            const dailyDeleted = await store.cleanupOldDaily(dailyRetentionDays);
+            const monthlyDeleted = await store.cleanupOldMonthly(monthlyRetentionMonths);
             log('Periodic cleanup complete', { dailyDeleted, monthlyDeleted });
           } catch (error) {
             console.error('[UsagePlugin] Cleanup error:', error);
@@ -123,7 +155,7 @@ export function createUsagePlugin(config: UsagePluginConfig): Plugin {
       }
 
       // Add API routes if enabled
-      if (config.api?.enabled !== false) {
+      if (apiEnabled) {
         // Get daily usage summary
         registry.addRoute({
           method: 'get',
@@ -211,7 +243,9 @@ export function createUsagePlugin(config: UsagePluginConfig): Plugin {
         cleanupIntervalId = null;
       }
 
-      await config.store.shutdown();
+      if (currentStore) {
+        await currentStore.shutdown();
+      }
       currentStore = null;
       currentConfig = null;
       log('Usage plugin stopped');

package/src/plugins/users/types.ts

@@ -269,10 +269,15 @@ export interface UsersUiConfig {
 
 /**
  * Users plugin configuration
+ *
+ * All properties are optional - plugin will use smart defaults:
+ * - store: Postgres user store using registry's postgres instance
+ * - api.prefix: '/users'
+ * - debug: false
  */
 export interface UsersPluginConfig {
-  /** User storage backend */
-  store: UserStore;
+  /** User storage backend (default: postgres user store from registry) */
+  store?: UserStore;
   /** Sync configuration (optional) */
   sync?: UserSyncConfig;
   /** API configuration */

package/src/plugins/users/users-plugin.ts

@@ -30,22 +30,26 @@ import { getEntitlements } from '../entitlements/entitlements-plugin.js';
 import { getPreferences } from '../preferences/preferences-plugin.js';
 import { getActiveBan } from '../bans/bans-plugin.js';
 import { autoCreateUserTenant } from '../tenants/index.js';
+import { hasPostgres, getPostgres } from '../postgres-plugin.js';
+import { postgresUserStore } from './stores/index.js';
 
 // Store instance for helper access
 let currentStore: UserStore | null = null;
 let currentRegistry: PluginRegistry | null = null;
 
 /**
- * Create the Users plugin
+ * Create the Users plugin with smart defaults
+ *
+ * Config is optional - plugin will use defaults and get dependencies from registry.
+ * Gracefully handles missing dependencies with clear log messages.
  */
-export function createUsersPlugin(config: UsersPluginConfig): Plugin {
-  const debug = config.debug || false;
-  // Routes are mounted under /api by the control panel, so don't include /api in prefix
-  const apiPrefix = config.api?.prefix || '/'; // Framework adds /users prefix automatically
-
-  function log(message: string, data?: Record<string, unknown>) {
-    if (debug) {
-      console.log(`[UsersPlugin] ${message}`, data || '');
+export function createUsersPlugin(config: Partial<UsersPluginConfig> = {}): Plugin {
+  function log(message: string, data?: Record<string, unknown>, isError = false) {
+    const prefix = '[UsersPlugin]';
+    if (isError) {
+      console.error(`${prefix} ${message}`, data || '');
+    } else if (config.debug) {
+      console.log(`${prefix} ${message}`, data || '');
     }
   }
 
@@ -55,14 +59,42 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
     version: '1.0.0',
 
     async onStart(_pluginConfig: PluginConfig, registry: PluginRegistry): Promise<void> {
+      const logger = registry.getLogger('users');
+
+      // Check for postgres in registry
+      if (!hasPostgres()) {
+        logger.warn('No Database! Users plugin disabled.');
+        registry.registerHealthCheck({
+          name: 'users-store',
+          type: 'custom',
+          check: async () => ({
+            healthy: false,
+            details: {
+              error: 'PostgreSQL not available',
+              state: 'disabled',
+            },
+          }),
+        });
+        return;
+      }
+
+      // Smart defaults - get dependencies from registry
+      const store = config.store ?? postgresUserStore({
+        pool: () => getPostgres().getPool(),
+        autoCreateTables: true,
+      });
+
+      const debug = config.debug ?? false;
+      const apiPrefix = config.api?.prefix ?? '/users';
+
       log('Starting users plugin');
 
       // Initialize the store (creates tables if needed)
-      await config.store.initialize();
+      await store.initialize();
       log('Users plugin migrations complete');
 
       // Store references for helper access
-      currentStore = config.store;
+      currentStore = store;
       currentRegistry = registry;
 
       // Register health check
@@ -72,7 +104,7 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
         check: async () => {
           try {
             // Simple health check - try to search with limit 1
-            await config.store.search({ limit: 1 });
+            await store.search({ limit: 1 });
             return { healthy: true };
           } catch {
             return { healthy: false };
@@ -98,7 +130,7 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
                 sortOrder: (req.query.sortOrder as UserSearchParams['sortOrder']) || 'desc',
               };
 
-              const result = await config.store.search(params);
+              const result = await store.search(params);
               res.json(result);
             } catch (error) {
               console.error('[UsersPlugin] Search error:', error);
@@ -114,7 +146,7 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
           pluginId: 'users',
           handler: async (req: Request, res: Response) => {
             try {
-              const user = await config.store.getById(req.params.id);
+              const user = await store.getById(req.params.id);
               if (!user) {
                 return res.status(404).json({ error: 'User not found' });
               }
@@ -147,12 +179,12 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
               }
 
               // Check if user already exists
-              const existing = await config.store.getByEmail(input.email);
+              const existing = await store.getByEmail(input.email);
               if (existing) {
                 return res.status(409).json({ error: 'User with this email already exists' });
               }
 
-              const user = await config.store.create(input);
+              const user = await store.create(input);
 
               // Auto-create personal tenant if tenants plugin available
               if (registry.hasPlugin('tenants')) {
@@ -187,7 +219,7 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
               }
 
               // Check if user already exists
-              const existing = await config.store.getByEmail(email);
+              const existing = await store.getByEmail(email);
               if (existing) {
                 return res.status(409).json({ error: 'User with this email already exists' });
               }
@@ -200,7 +232,7 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
               expiresAt.setDate(expiresAt.getDate() + 7);
 
               // Create user with invited status
-              const user = await config.store.create({
+              const user = await store.create({
                 email,
                 name,
                 metadata: role ? { role } : undefined,
@@ -251,7 +283,7 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
                 return res.status(400).json({ error: 'Invitation token is required' });
               }
 
-              const user = await config.store.acceptInvitation(token);
+              const user = await store.acceptInvitation(token);
 
               if (!user) {
                 return res.status(404).json({
@@ -290,7 +322,7 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
                 metadata: req.body.metadata,
               };
 
-              const user = await config.store.update(req.params.id, input);
+              const user = await store.update(req.params.id, input);
               if (!user) {
                 return res.status(404).json({ error: 'User not found' });
               }
@@ -309,7 +341,7 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
           pluginId: 'users',
           handler: async (req: Request, res: Response) => {
             try {
-              const deleted = await config.store.delete(req.params.id);
+              const deleted = await store.delete(req.params.id);
               if (!deleted) {
                 return res.status(404).json({ error: 'User not found' });
               }
@@ -328,7 +360,7 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
           pluginId: 'users',
           handler: async (req: Request, res: Response) => {
             try {
-              const user = await config.store.getById(req.params.id);
+              const user = await store.getById(req.params.id);
               if (!user) {
                 return res.status(404).json({ error: 'User not found' });
               }
@@ -391,7 +423,7 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
           pluginId: 'users',
           handler: async (_req: Request, res: Response) => {
             try {
-              const allUsers = await config.store.search({ limit: 10000 });
+              const allUsers = await store.search({ limit: 10000 });
               const now = Date.now();
               const sevenDaysAgo = now - 7 * 24 * 60 * 60 * 1000;
 
@@ -419,7 +451,7 @@ export function createUsersPlugin(config: UsersPluginConfig): Plugin {
 
     async onStop(): Promise<void> {
       log('Stopping users plugin');
-      await config.store.shutdown();
+      if (currentStore) { await currentStore.shutdown(); };
       currentStore = null;
       currentRegistry = null;
       log('Users plugin stopped');

package/ui/src/App.tsx

@@ -71,9 +71,9 @@ declare global {
  */
 const basePath = window.__APP_BASE_PATH__ ?? '';
 
-// API routes are always at '/api' regardless of control panel mount path
-// The control panel might be mounted at /cpanel, but API is always at /api
-api.setBaseUrl('');
+// Set API base URL to match the control panel mount path
+// When proxied through a gateway at /cpanel, API calls need to go to /cpanel/api
+api.setBaseUrl(basePath);
 
 // Footer content with QwickApps Server branding
 const footerContent = (

package/ui/src/components/ControlPanelApp.tsx

@@ -147,9 +147,10 @@ export function ControlPanelApp({
   // Combine built-in widget components with custom ones
   const allWidgetComponents = [...getBuiltInWidgetComponents(), ...widgetComponents];
 
-  // Configure API base URL - API routes are always at '/api' regardless of control panel mount path
-  // The control panel might be mounted at /cpanel, but API is always at /api (not /cpanel/api)
-  const apiBasePath = '';
+  // Configure API base URL - read from injected __APP_BASE_PATH__ if available
+  // Server injects window.__APP_BASE_PATH__ when control panel is mounted at a base path
+  // Example: mounted at /cpanel → API calls go to /cpanel/api (not /api)
+  const apiBasePath = (window as any).__APP_BASE_PATH__ || '';
   api.setBaseUrl(apiBasePath);
 
   // Fetch version from API

package/ui/src/dashboard/builtInWidgets.tsx

@@ -21,6 +21,7 @@ import {
   ServiceControlWidget,
   EnvironmentConfigWidget,
   DatabaseOpsWidget,
+  DatabaseOperationsWidget,
   LogsMaintenanceWidget,
   CacheMaintenanceWidget,
 } from './widgets';
@@ -42,6 +43,7 @@ export const builtInWidgetComponents: Record<string, React.ComponentType> = {
   ServiceControlWidget: ServiceControlWidget,
   EnvironmentConfigWidget: EnvironmentConfigWidget,
   DatabaseOpsWidget: DatabaseOpsWidget,
+  DatabaseOperationsWidget: DatabaseOperationsWidget,
   LogsMaintenanceWidget: LogsMaintenanceWidget,
   CacheMaintenanceWidget: CacheMaintenanceWidget,
   PreferencesPage: PreferencesPage,
@@ -66,6 +68,7 @@ export function getBuiltInWidgetComponents(): WidgetComponent[] {
     { name: 'ServiceControlWidget', component: ServiceControlWidget },
     { name: 'EnvironmentConfigWidget', component: EnvironmentConfigWidget },
     { name: 'DatabaseOpsWidget', component: DatabaseOpsWidget },
+    { name: 'DatabaseOperationsWidget', component: DatabaseOperationsWidget },
     { name: 'LogsMaintenanceWidget', component: LogsMaintenanceWidget },
     { name: 'CacheMaintenanceWidget', component: CacheMaintenanceWidget },
     { name: 'PreferencesPage', component: PreferencesPage },

package/ui/src/dashboard/widgets/CMSMaintenanceWidget.tsx

@@ -49,7 +49,11 @@ export function CMSMaintenanceWidget() {
 
   const fetchStatus = async () => {
     try {
-      const response = await fetch('/api/cms/status');
+      const basePath = (window as any).__APP_BASE_PATH__ || '';
+      const response = await fetch(`${basePath}/api/cms/status`);
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+      }
       const data = await response.json();
       setStatus(data);
     } catch (err) {
@@ -59,7 +63,11 @@ export function CMSMaintenanceWidget() {
 
   const fetchSeeds = async () => {
     try {
-      const response = await fetch('/api/cms/seeds');
+      const basePath = (window as any).__APP_BASE_PATH__ || '';
+      const response = await fetch(`${basePath}/api/cms/seeds`);
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+      }
       const data = await response.json();
       setSeeds(data.seeds || []);
     } catch (err) {
@@ -80,7 +88,8 @@ export function CMSMaintenanceWidget() {
     setError(null);
     setSuccess(null);
     try {
-      const response = await fetch('/api/cms/restart', { method: 'POST' });
+      const basePath = (window as any).__APP_BASE_PATH__ || '';
+      const response = await fetch(`${basePath}/api/cms/restart`, { method: 'POST' });
       const data = await response.json();
 
       if (response.ok) {
@@ -100,9 +109,13 @@ export function CMSMaintenanceWidget() {
     setSuccess(null);
 
     try {
-      const response = await fetch(`/api/cms/seeds/${seedName}/execute`, {
+      const basePath = (window as any).__APP_BASE_PATH__ || '';
+      const response = await fetch(`${basePath}/api/cms/seeds/${seedName}/execute`, {
         method: 'POST',
       });
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+      }
       const data = await response.json();
 
       if (data.success) {

package/ui/src/dashboard/widgets/CMSStatusWidget.tsx

@@ -35,7 +35,11 @@ export function CMSStatusWidget() {
 
   const fetchStatus = async () => {
     try {
-      const response = await fetch('/api/cms/status');
+      const basePath = (window as any).__APP_BASE_PATH__ || '';
+      const response = await fetch(`${basePath}/api/cms/status`);
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+      }
       const data = await response.json();
       setStatus(data);
       setError(null);

package/ui/src/dashboard/widgets/CacheMaintenanceWidget.tsx

@@ -47,7 +47,8 @@ export function CacheMaintenanceWidget() {
     setLoading(true);
     setError(null);
     try {
-      const response = await fetch('/api/cache:default/stats');
+      const basePath = (window as any).__APP_BASE_PATH__ || '';
+      const response = await fetch(`${basePath}/api/cache:default/stats`);
       if (!response.ok) {
         if (response.status === 404) {
           throw new Error('Cache plugin not configured');
@@ -75,7 +76,8 @@ export function CacheMaintenanceWidget() {
     setSuccess(null);
 
     try {
-      const response = await fetch('/api/cache:default/flush', {
+      const basePath = (window as any).__APP_BASE_PATH__ || '';
+      const response = await fetch(`${basePath}/api/cache:default/flush`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
       });