@qwickapps/server 1.7.1 → 1.7.2

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

@@ -28,6 +28,9 @@ import {
   isTokenExpired,
   getTokenExpiration,
 } from './token-utils.js';
+import { hasPostgres, getPostgres } from '../postgres-plugin.js';
+import { postgresDeviceStore } from './stores/index.js';
+import { computeDeviceAdapter } from './adapters/index.js';
 
 // Store instances for helper access
 let currentStore: DeviceStore | null = null;
@@ -35,16 +38,18 @@ let currentAdapter: DeviceAdapter | null = null;
 let currentConfig: DevicesPluginConfig | null = null;
 
 /**
- * Create the Devices plugin
+ * Create the Devices 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 createDevicesPlugin(config: DevicesPluginConfig): Plugin {
-  const debug = config.debug || false;
-  const defaultTokenValidityDays = config.defaultTokenValidityDays || 90;
-  const apiPrefix = config.api?.prefix || '/'; // Framework adds /devices prefix automatically
-
-  function log(message: string, data?: Record<string, unknown>) {
-    if (debug) {
-      console.log(`[DevicesPlugin] ${message}`, data || '');
+export function createDevicesPlugin(config: Partial<DevicesPluginConfig> = {}): Plugin {
+  function log(message: string, data?: Record<string, unknown>, isError = false) {
+    const prefix = '[DevicesPlugin]';
+    if (isError) {
+      console.error(`${prefix} ${message}`, data || '');
+    } else if (config.debug) {
+      console.log(`${prefix} ${message}`, data || '');
     }
   }
 
@@ -54,16 +59,46 @@ export function createDevicesPlugin(config: DevicesPluginConfig): Plugin {
     version: '1.0.0',
 
     async onStart(_pluginConfig: PluginConfig, registry: PluginRegistry): Promise<void> {
-      log('Starting devices plugin', { adapter: config.adapter.name });
+      const logger = registry.getLogger('devices');
+
+      // Check for postgres in registry
+      if (!hasPostgres()) {
+        logger.warn('No Database! Devices plugin disabled.');
+        registry.registerHealthCheck({
+          name: 'devices-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 ?? postgresDeviceStore({
+        pool: () => getPostgres().getPool(),
+        autoCreateTables: true,
+      });
+
+      const adapter = config.adapter ?? computeDeviceAdapter();
+      const debug = config.debug ?? false;
+      const defaultTokenValidityDays = config.defaultTokenValidityDays ?? 90;
+      const apiPrefix = config.api?.prefix ?? '/devices';
+
+      log('Starting devices plugin', { adapter: adapter.name });
 
       // Initialize the store (creates tables if needed)
-      await config.store.initialize();
+      await store.initialize();
       log('Devices plugin migrations complete');
 
       // Store references for helper access
-      currentStore = config.store;
-      currentAdapter = config.adapter;
-      currentConfig = config;
+      currentStore = store;
+      currentAdapter = adapter;
+      currentConfig = { ...config, store, adapter, debug, defaultTokenValidityDays };
 
       // Register health check
       registry.registerHealthCheck({
@@ -71,12 +106,12 @@ export function createDevicesPlugin(config: DevicesPluginConfig): Plugin {
         type: 'custom',
         check: async () => {
           try {
-            await config.store.search({ limit: 1 });
+            await store.search({ limit: 1 });
             return {
               healthy: true,
               details: {
-                adapter: config.adapter.name,
-                tokenPrefix: config.adapter.tokenPrefix,
+                adapter: adapter.name,
+                tokenPrefix: adapter.tokenPrefix,
               },
             };
           } catch {
@@ -106,7 +141,7 @@ export function createDevicesPlugin(config: DevicesPluginConfig): Plugin {
                 sortOrder: (req.query.sortOrder as DeviceSearchParams['sortOrder']) || 'desc',
               };
 
-              const result = await config.store.search(params);
+              const result = await store.search(params);
               res.json(result);
             } catch (error) {
               console.error('[DevicesPlugin] Search error:', error);
@@ -122,7 +157,7 @@ export function createDevicesPlugin(config: DevicesPluginConfig): Plugin {
           pluginId: 'devices',
           handler: async (req: Request, res: Response) => {
             try {
-              const device = await config.store.getById(req.params.id);
+              const device = await store.getById(req.params.id);
               if (!device) {
                 return res.status(404).json({ error: 'Device not found' });
               }
@@ -150,7 +185,7 @@ export function createDevicesPlugin(config: DevicesPluginConfig): Plugin {
               };
 
               // Validate using adapter
-              const validation = config.adapter.validateDeviceInput(input);
+              const validation = adapter.validateDeviceInput(input);
               if (!validation.valid) {
                 return res.status(400).json({
                   error: 'Validation failed',
@@ -181,7 +216,7 @@ export function createDevicesPlugin(config: DevicesPluginConfig): Plugin {
                 metadata: req.body.metadata,
               };
 
-              const device = await config.store.update(req.params.id, input);
+              const device = await store.update(req.params.id, input);
               if (!device) {
                 return res.status(404).json({ error: 'Device not found' });
               }
@@ -200,19 +235,19 @@ export function createDevicesPlugin(config: DevicesPluginConfig): Plugin {
           pluginId: 'devices',
           handler: async (req: Request, res: Response) => {
             try {
-              const device = await config.store.getById(req.params.id);
+              const device = await store.getById(req.params.id);
               if (!device) {
                 return res.status(404).json({ error: 'Device not found' });
               }
 
-              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: 'Device not found' });
               }
 
               // Call adapter hook
-              if (config.adapter.onDeviceDeleted) {
-                await config.adapter.onDeviceDeleted(device);
+              if (adapter.onDeviceDeleted) {
+                await adapter.onDeviceDeleted(device);
               }
 
               res.status(204).send();
@@ -230,7 +265,7 @@ export function createDevicesPlugin(config: DevicesPluginConfig): Plugin {
           pluginId: 'devices',
           handler: async (req: Request, res: Response) => {
             try {
-              const device = await config.store.getById(req.params.id);
+              const device = await store.getById(req.params.id);
               if (!device) {
                 return res.status(404).json({ error: 'Device not found' });
               }
@@ -295,7 +330,7 @@ export function createDevicesPlugin(config: DevicesPluginConfig): Plugin {
 
     async onStop(): Promise<void> {
       log('Stopping devices plugin');
-      await config.store.shutdown();
+      if (currentStore) { await currentStore.shutdown(); };
       currentStore = null;
       currentAdapter = null;
       currentConfig = null;

package/src/plugins/devices/index.ts

@@ -68,8 +68,6 @@ export {
 } from './token-utils.js';
 export type { DeviceTokenPair } from './token-utils.js';
 
-// UI Components
-export { DevicesStatusWidget } from './DevicesStatusWidget.js';
-export type { DevicesStatusWidgetProps } from './DevicesStatusWidget.js';
-export { DevicesManagementPage } from './DevicesManagementPage.js';
-export type { DevicesManagementPageProps } from './DevicesManagementPage.js';
+// UI Components are exported from main package index (@qwickapps/server)
+// Do NOT export here to avoid loading UI dependencies when importing plugins
+

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

@@ -21,7 +21,9 @@ import type {
   EntitlementStats,
 } from './types.js';
 import type { AuthenticatedRequest } from '../auth/types.js';
-import { getCache, type CacheInstance } from '../cache-plugin.js';
+import { getCache, hasCache, type CacheInstance } from '../cache-plugin.js';
+import { hasPostgres, getPostgres } from '../postgres-plugin.js';
+import { postgresEntitlementSource } from './sources/index.js';
 
 // Plugin state
 let primarySource: EntitlementSource | null = null;
@@ -35,67 +37,103 @@ let cacheEnabled = true;
 let cacheVersion = 1;
 
 /**
- * Create the Entitlements plugin
+ * Create the Entitlements 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 createEntitlementsPlugin(config: EntitlementsPluginConfig): 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 /entitlements prefix automatically (empty string to avoid double slash)
-  const apiEnabled = config.api?.enabled !== false;
-  const enableWriteApi = config.api?.enableWrite !== false;
-
-  function log(message: string, data?: Record<string, unknown>) {
-    if (debug) {
-      console.log(`[EntitlementsPlugin] ${message}`, data || '');
+export function createEntitlementsPlugin(config: Partial<EntitlementsPluginConfig> = {}): Plugin {
+  function log(message: string, data?: Record<string, unknown>, isError = false) {
+    const prefix = '[EntitlementsPlugin]';
+    if (isError) {
+      console.error(`${prefix} ${message}`, data || '');
+    } else if (config.debug) {
+      console.log(`${prefix} ${message}`, data || '');
     }
   }
 
-  // Cache key helpers
-  const keys = {
-    entitlements: (email: string) => `${cacheKeyPrefix}user:${email.toLowerCase()}`,
-    mapping: (source: string, id: string) => `${cacheKeyPrefix}mapping:${source}:${id}`,
-  };
-
   return {
     id: 'entitlements',
     name: 'Entitlements',
     version: '1.0.0',
 
     async onStart(_pluginConfig: PluginConfig, registry: PluginRegistry): Promise<void> {
+      const logger = registry.getLogger('entitlements');
+
+      // Check for postgres in registry (needed for default source)
+      if (!hasPostgres()) {
+        logger.warn('No Database! Entitlements plugin disabled.');
+        registry.registerHealthCheck({
+          name: 'entitlements-source',
+          type: 'custom',
+          check: async () => ({
+            healthy: false,
+            details: {
+              error: 'PostgreSQL not available',
+              state: 'disabled',
+            },
+          }),
+        });
+        return;
+      }
+
+      // Smart defaults - get dependencies from registry
+      const source = config.source ?? postgresEntitlementSource({
+        pool: () => getPostgres().getPool(),
+        autoCreateTables: true,
+      });
+
+      const debug = config.debug ?? false;
+      const apiPrefix = config.api?.prefix ?? '/entitlements';
+      const apiEnabled = config.api?.enabled ?? true;
+      const enableWriteApi = config.api?.enableWrite ?? true;
+
       log('Starting entitlements plugin');
 
       // Initialize primary source
-      await config.source.initialize();
-      primarySource = config.source;
-      log('Primary source initialized', { source: config.source.name });
+      await source.initialize();
+      primarySource = source;
+      log('Primary source initialized', { source: source.name });
 
       // Initialize additional sources
       additionalSources = config.additionalSources || [];
-      for (const source of additionalSources) {
-        await source.initialize();
-        log('Additional source initialized', { source: source.name });
+      for (const additionalSource of additionalSources) {
+        await additionalSource.initialize();
+        log('Additional source initialized', { source: additionalSource.name });
       }
 
       // Store config
-      pluginConfig = config;
+      pluginConfig = { ...config, source, debug };
 
-      // Setup caching if enabled
+      // Setup caching if enabled and available
       cacheEnabled = config.cache?.enabled !== false;
       if (cacheEnabled) {
-        try {
-          const instanceName = config.cache?.instanceName || 'default';
-          cacheInstance = getCache(instanceName);
-          cacheKeyPrefix = config.cache?.keyPrefix || 'entitlements:';
-          cacheTtl = config.cache?.ttl || 300;
-          cacheMappingTtl = config.cache?.mappingTtl || cacheTtl * 2;
-          log('Cache configured', { instanceName, prefix: cacheKeyPrefix, ttl: cacheTtl });
-        } catch {
-          log('Cache not available, running without caching');
+        if (hasCache()) {
+          try {
+            const instanceName = config.cache?.instanceName || 'default';
+            cacheInstance = getCache(instanceName);
+            cacheKeyPrefix = config.cache?.keyPrefix || 'entitlements:';
+            cacheTtl = config.cache?.ttl || 300;
+            cacheMappingTtl = config.cache?.mappingTtl || cacheTtl * 2;
+            log('Cache configured', { instanceName, prefix: cacheKeyPrefix, ttl: cacheTtl });
+          } catch {
+            log('Cache instance not available, running without caching');
+            cacheEnabled = false;
+            cacheInstance = null;
+          }
+        } else {
+          log('Cache plugin not available, running without caching');
           cacheEnabled = false;
           cacheInstance = null;
         }
       }
 
+      // Cache key helpers
+      const keys = {
+        entitlements: (email: string) => `${cacheKeyPrefix}user:${email.toLowerCase()}`,
+        mapping: (sourceId: string, id: string) => `${cacheKeyPrefix}mapping:${sourceId}:${id}`,
+      };
+
       // Register health check
       registry.registerHealthCheck({
         name: 'entitlements-source',
@@ -104,8 +142,8 @@ export function createEntitlementsPlugin(config: EntitlementsPluginConfig): Plug
           try {
             // Use source's isHealthy() method if available (avoids API calls)
             // Otherwise just check that source is initialized
-            if (config.source.isHealthy) {
-              const healthy = await config.source.isHealthy();
+            if (source.isHealthy) {
+              const healthy = await source.isHealthy();
               return { healthy };
             }
             // Source is healthy if initialized (we got here means it started)
@@ -145,9 +183,9 @@ export function createEntitlementsPlugin(config: EntitlementsPluginConfig): Plug
             try {
               const sources = [
                 {
-                  name: config.source.name,
-                  description: config.source.description,
-                  readonly: config.source.readonly ?? false,
+                  name: source.name,
+                  description: source.description,
+                  readonly: source.readonly ?? false,
                   primary: true,
                 },
                 ...additionalSources.map((s) => ({
@@ -159,8 +197,8 @@ export function createEntitlementsPlugin(config: EntitlementsPluginConfig): Plug
               ];
 
               res.json({
-                readonly: config.source.readonly ?? false,
-                writeEnabled: enableWriteApi && !config.source.readonly,
+                readonly: source.readonly ?? false,
+                writeEnabled: enableWriteApi && !source.readonly,
                 cacheEnabled,
                 cacheTtl,
                 sources,
@@ -311,7 +349,7 @@ export function createEntitlementsPlugin(config: EntitlementsPluginConfig): Plug
         });
 
         // Write endpoints (grant/revoke) - only if enabled and source is writable
-        if (enableWriteApi && !config.source.readonly) {
+        if (enableWriteApi && !source.readonly) {
           // Grant entitlement
           registry.addRoute({
             method: 'post',

package/src/plugins/entitlements/index.ts

@@ -50,8 +50,6 @@ export type {
   EntitlementStats,
 } from './types.js';
 
-// UI Components
-export { EntitlementsStatusWidget } from './EntitlementsStatusWidget.js';
-export type { EntitlementsStatusWidgetProps } from './EntitlementsStatusWidget.js';
-export { EntitlementsManagementPage } from './EntitlementsManagementPage.js';
-export type { EntitlementsManagementPageProps } from './EntitlementsManagementPage.js';
+// UI Components are exported from main package index (@qwickapps/server)
+// Do NOT export here to avoid loading UI dependencies when importing plugins
+

package/src/plugins/entitlements/types.ts

@@ -200,10 +200,17 @@ export interface EntitlementsApiConfig {
 
 /**
  * Entitlements plugin configuration
+ *
+ * All properties are optional - plugin will use smart defaults:
+ * - source: Postgres entitlement source using registry's postgres instance
+ * - cache: Uses cache from registry if available
+ * - api.prefix: '/entitlements'
+ * - api.enabled: true
+ * - debug: false
  */
 export interface EntitlementsPluginConfig {
-  /** Primary entitlement source */
-  source: EntitlementSource;
+  /** Primary entitlement source (default: postgres source from registry) */
+  source?: EntitlementSource;
 
   /** Additional sources to query (results are merged) */
   additionalSources?: EntitlementSource[];

package/src/plugins/notifications/index.ts

@@ -90,8 +90,6 @@ export type {
   NotificationsManagerInterface,
 } from './types.js';
 
-// UI Components
-export { NotificationsStatusWidget } from './NotificationsStatusWidget.js';
-export { NotificationsManagementPage } from './NotificationsManagementPage.js';
-export type { NotificationsStatusWidgetProps } from './NotificationsStatusWidget.js';
-export type { NotificationsManagementPageProps } from './NotificationsManagementPage.js';
+// UI Components are exported from main package index (@qwickapps/server)
+// Do NOT export here to avoid loading UI dependencies when importing plugins
+

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

@@ -96,7 +96,10 @@ function validateId(id: string | undefined, paramName: string): { valid: boolean
 }
 
 /**
- * Create the Notifications plugin
+ * Create the Notifications plugin with smart defaults
+ *
+ * Config is optional - plugin will use defaults and get dependencies from registry.
+ * Gracefully handles missing dependencies with clear log messages.
  *
  * @param config Plugin configuration
  * @returns Plugin instance
@@ -112,11 +115,7 @@ function validateId(id: string | undefined, paramName: string): { valid: boolean
  * });
  * ```
  */
-export function createNotificationsPlugin(config: NotificationsPluginConfig): Plugin {
-  const apiPrefix = config.api?.prefix || '/'; // Framework adds /notifications prefix automatically
-  const streamEnabled = config.api?.stream !== false;
-  const statsEnabled = config.api?.stats !== false;
-
+export function createNotificationsPlugin(config: Partial<NotificationsPluginConfig> = {}): Plugin {
   let manager: NotificationsManager | null = null;
 
   return {
@@ -129,10 +128,19 @@ export function createNotificationsPlugin(config: NotificationsPluginConfig): Pl
 
       // Check for postgres plugin dependency
       if (!hasPostgres()) {
-        throw new Error(
-          'Notifications plugin requires postgres plugin. ' +
-          'Please add createPostgresPlugin() before createNotificationsPlugin().'
-        );
+        logger.warn('No Database! Notifications plugin disabled.');
+        registry.registerHealthCheck({
+          name: 'notifications',
+          type: 'custom',
+          check: async () => ({
+            healthy: false,
+            details: {
+              error: 'PostgreSQL not available',
+              state: 'disabled',
+            },
+          }),
+        });
+        return;
       }
 
       // Get database connection string from postgres plugin
@@ -150,22 +158,43 @@ export function createNotificationsPlugin(config: NotificationsPluginConfig): Pl
       }
 
       if (!connectionString) {
-        throw new Error(
-          'Could not determine PostgreSQL connection string. ' +
-          'Ensure DATABASE_URL is set or postgres plugin was configured with a URL.'
-        );
+        logger.warn('Could not determine PostgreSQL connection string. Notifications plugin disabled.');
+        registry.registerHealthCheck({
+          name: 'notifications',
+          type: 'custom',
+          check: async () => ({
+            healthy: false,
+            details: {
+              error: 'Connection string not available',
+              state: 'disabled',
+            },
+          }),
+        });
+        return;
       }
 
+      // Smart defaults
+      const channels = config.channels ?? [];
+      const apiPrefix = config.api?.prefix ?? '/'; // Framework adds /notifications prefix automatically
+      const streamEnabled = config.api?.stream ?? true;
+      const statsEnabled = config.api?.stats ?? true;
+
       logger.debug('Initializing notifications manager', {
-        channels: config.channels,
+        channels: channels,
         heartbeatInterval: config.heartbeat?.interval,
       });
 
+      // Create full config with defaults for required fields
+      const fullConfig: NotificationsPluginConfig = {
+        ...config,
+        channels, // Required field with default
+      };
+
       // Create and initialize manager
       manager = new NotificationsManager(
         connectionString,
-        config.channels,
-        config,
+        channels,
+        fullConfig,
         logger
       );
 
@@ -182,7 +211,7 @@ export function createNotificationsPlugin(config: NotificationsPluginConfig): Pl
             healthy: health?.isHealthy ?? false,
             details: {
               connected: health?.isConnected,
-              channels: config.channels,
+              channels: channels,
               activeClients: manager?.getStats().currentConnections ?? 0,
               lastEventAt: health?.lastEventAt?.toISOString(),
               isReconnecting: health?.isReconnecting,
@@ -273,7 +302,7 @@ export function createNotificationsPlugin(config: NotificationsPluginConfig): Pl
             const stats = manager.getStats();
             res.json({
               ...stats,
-              channels: config.channels,
+              channels: channels,
               lastEventAt: stats.connectionHealth.lastEventAt?.toISOString(),
               lastReconnectionAt: stats.lastReconnectionAt?.toISOString(),
             });

package/src/plugins/parental/index.ts

@@ -54,8 +54,6 @@ export { postgresParentalStore } from './stores/index.js';
 export { kidsAdapter } from './adapters/index.js';
 export type { KidsAdapterConfig } from './adapters/index.js';
 
-// UI Components
-export { ParentalStatusWidget } from './ParentalStatusWidget.js';
-export type { ParentalStatusWidgetProps } from './ParentalStatusWidget.js';
-export { ParentalManagementPage } from './ParentalManagementPage.js';
-export type { ParentalManagementPageProps } from './ParentalManagementPage.js';
+// UI Components are exported from main package index (@qwickapps/server)
+// Do NOT export here to avoid loading UI dependencies when importing plugins
+