fix: enhance package route registration with protocol options

Author: hotlong

packages/rest/src/package-routes.ts

@@ -3,17 +3,33 @@
 import { IHttpServer } from '@objectstack/core';
 import type { PackageService } from '@objectstack/service-package';
 
+/**
+ * Options for package route registration.
+ */
+export interface PackageRoutesOptions {
+  /**
+   * Protocol service (ObjectStackProtocol) — provides access to in-memory
+   * SchemaRegistry packages loaded via defineStack()/AppPlugin at boot time.
+   */
+  protocol?: { getMetaItems?(req: { type: string }): Promise<{ items: any[] }> };
+}
+
 /**
  * Register package management API routes
  *
  * Provides endpoints for publishing, retrieving, and managing packages.
  * Routes:
  * - POST /api/v1/packages - Publish a package
- * - GET /api/v1/packages - List all packages
+ * - GET /api/v1/packages - List all packages (merges registry + database)
  * - GET /api/v1/packages/:id - Get a specific package
  * - DELETE /api/v1/packages/:id - Delete a package
  */
-export function registerPackageRoutes(server: IHttpServer, packageService: PackageService, basePath: string = '/api/v1') {
+export function registerPackageRoutes(
+  server: IHttpServer,
+  packageService: PackageService,
+  basePath: string = '/api/v1',
+  options: PackageRoutesOptions = {},
+) {
   const packagesPath = `${basePath}/packages`;
 
   // POST /api/v1/packages - Publish a package
@@ -51,11 +67,54 @@ export function registerPackageRoutes(server: IHttpServer, packageService: Packa
     }
   });
 
-  // GET /api/v1/packages - List all packages (latest versions)
+  // GET /api/v1/packages - List all packages (merges registry + database)
   server.get(packagesPath, async (_req, res) => {
     try {
-      const packages = await packageService.list();
-      res.json({ packages });
+      // Merge two sources:
+      // 1. Registry packages (in-memory, loaded at boot via defineStack/AppPlugin)
+      // 2. Database packages (published via POST /packages)
+      const packagesMap = new Map<string, any>();
+
+      // Registry packages (via protocol service → SchemaRegistry)
+      if (options.protocol && typeof options.protocol.getMetaItems === 'function') {
+        try {
+          const result = await options.protocol.getMetaItems({ type: 'package' });
+          if (result?.items) {
+            for (const item of result.items) {
+              const id = item.manifest?.id || item.id;
+              if (id) {
+                packagesMap.set(id, {
+                  ...item,
+                  source: 'registry',
+                });
+              }
+            }
+          }
+        } catch {
+          // Protocol unavailable — continue with database only
+        }
+      }
+
+      // Database packages (published artifacts)
+      try {
+        const dbPackages = await packageService.list();
+        for (const pkg of dbPackages) {
+          const id = pkg.manifest?.id || pkg.id;
+          if (id) {
+            // Database entry takes precedence (has richer metadata from publish)
+            packagesMap.set(id, {
+              ...packagesMap.get(id),
+              ...pkg,
+              source: packagesMap.has(id) ? 'both' : 'database',
+            });
+          }
+        }
+      } catch {
+        // Database query failed — continue with registry-only packages
+      }
+
+      const packages = Array.from(packagesMap.values());
+      res.json({ packages, total: packages.length });
     } catch (error) {
       res.status(500).json({ error: (error as Error).message });
     }
@@ -67,14 +126,30 @@ export function registerPackageRoutes(server: IHttpServer, packageService: Packa
       const packageId = req.params.id;
       const version = req.query?.version || 'latest';
 
+      // Try database first (richer data from publish)
       const pkg = await packageService.get(packageId, version);
-
-      if (!pkg) {
-        res.status(404).json({ error: 'Package not found' });
+      if (pkg) {
+        res.json({ package: { ...pkg, source: 'database' } });
         return;
       }
 
-      res.json({ package: pkg });
+      // Fall back to registry (in-memory loaded packages)
+      if (options.protocol && typeof options.protocol.getMetaItems === 'function') {
+        try {
+          const result = await options.protocol.getMetaItems({ type: 'package' });
+          const match = result?.items?.find((item: any) =>
+            (item.manifest?.id || item.id) === packageId
+          );
+          if (match) {
+            res.json({ package: { ...match, source: 'registry' } });
+            return;
+          }
+        } catch {
+          // Protocol unavailable
+        }
+      }
+
+      res.status(404).json({ error: 'Package not found' });
     } catch (error) {
       res.status(500).json({ error: (error as Error).message });
     }

packages/rest/src/rest-api-plugin.ts

@@ -76,7 +76,9 @@ export function createRestApiPlugin(config: RestApiPluginConfig = {}): Plugin {
                 if (packageService) {
                     const basePath = config.api?.api?.basePath || '/api';
                     const version = config.api?.api?.version || 'v1';
-                    registerPackageRoutes(server, packageService, `${basePath}/${version}`);
+                    registerPackageRoutes(server, packageService, `${basePath}/${version}`, {
+                        protocol,
+                    });
                     ctx.logger.info('Package management routes registered');
                 }
             } catch (e) {