@objectstack/metadata 5.1.0 → 6.0.0

package/dist/node.js

@@ -502,7 +502,7 @@ var LRUCache = class {
 // src/migrations/add-sys-metadata-overlay-index.ts
 var INDEX_NAME = "idx_sys_metadata_overlay_active";
 var TABLE = "sys_metadata";
-var COLUMNS = "(type, name, organization_id, project_id, scope)";
+var COLUMNS = "(type, name, organization_id, environment_id, scope)";
 var WHERE = "state = 'active'";
 async function addSysMetadataOverlayIndex(driver) {
   const driverAny = driver;
@@ -541,6 +541,59 @@ async function addSysMetadataOverlayIndex(driver) {
   }
 }
 
+// src/migrations/migrate-project-id-to-environment-id.ts
+var AFFECTED_TABLES = [
+  "sys_metadata",
+  "sys_metadata_history"
+];
+async function migrateProjectIdToEnvironmentId(driver) {
+  const driverAny = driver;
+  if (typeof driverAny.raw !== "function") {
+    throw new Error(
+      "migrateProjectIdToEnvironmentId: driver must expose a .raw(sql, bindings?) method. SqlDriver (better-sqlite3/knex) and TursoDriver both support this."
+    );
+  }
+  const results = [];
+  for (const table of AFFECTED_TABLES) {
+    try {
+      const hasColumn = await _columnExists(driverAny, table, "project_id");
+      const alreadyMigrated = await _columnExists(driverAny, table, "environment_id");
+      if (alreadyMigrated && !hasColumn) {
+        results.push({ table, status: "already_done" });
+        continue;
+      }
+      if (!hasColumn) {
+        results.push({ table, status: "table_missing" });
+        continue;
+      }
+      await driverAny.raw(
+        `ALTER TABLE "${table}" RENAME COLUMN project_id TO environment_id`
+      );
+      results.push({ table, status: "renamed" });
+    } catch (err) {
+      results.push({ table, status: "error", error: err?.message ?? String(err) });
+    }
+  }
+  return results;
+}
+async function _columnExists(driver, table, column) {
+  try {
+    const rows = await driver.raw(`PRAGMA table_info("${table}")`);
+    if (Array.isArray(rows) && rows.length > 0) {
+      const list2 = Array.isArray(rows[0]) ? rows[0] : rows;
+      return list2.some((r) => r?.name === column);
+    }
+    const result = await driver.raw(
+      `SELECT column_name FROM information_schema.columns WHERE table_name = ? AND column_name = ?`,
+      [table, column]
+    );
+    const list = Array.isArray(result[0]) ? result[0] : result;
+    return list.length > 0;
+  } catch {
+    return false;
+  }
+}
+
 // src/loaders/database-loader.ts
 var DatabaseLoader = class {
   constructor(options) {
@@ -564,7 +617,7 @@ var DatabaseLoader = class {
     this.tableName = options.tableName ?? "sys_metadata";
     this.historyTableName = options.historyTableName ?? "sys_metadata_history";
     this.organizationId = options.organizationId;
-    void options.projectId;
+    void options.environmentId;
     this.trackHistory = options.trackHistory !== false;
     const cacheOpts = options.cache;
     const cacheEnabled = cacheOpts?.enabled !== false;
@@ -696,6 +749,7 @@ var DatabaseLoader = class {
           }
         }
         if (driver) {
+          await migrateProjectIdToEnvironmentId(driver).catch(() => void 0);
           await addSysMetadataOverlayIndex(driver);
         }
       } catch {
@@ -708,6 +762,10 @@ var DatabaseLoader = class {
         name: this.tableName
       });
       this.schemaReady = true;
+      try {
+        await migrateProjectIdToEnvironmentId(this.driver);
+      } catch {
+      }
       try {
         await addSysMetadataOverlayIndex(this.driver);
       } catch {
@@ -738,7 +796,7 @@ var DatabaseLoader = class {
   }
   /**
    * Build base filter conditions for queries.
-   * Filters by organizationId when configured. `projectId` is accepted
+   * Filters by organizationId when configured. `environmentId` is accepted
    * for back-compat but no longer constrains the query — see
    * ADR-0008 §0 (branch/project removal).
    */
@@ -837,7 +895,7 @@ var DatabaseLoader = class {
       owner: row.owner,
       state: row.state ?? "active",
       organizationId: row.organization_id,
-      projectId: row.project_id,
+      environmentId: row.environment_id,
       version: row.version ?? 1,
       checksum: row.checksum,
       source: row.source,
@@ -1271,13 +1329,13 @@ var _MetadataManager = class _MetadataManager {
    *
    * @param driver - An IDataDriver instance for database operations
    * @param organizationId - Organization ID for multi-tenant isolation
-   * @param projectId - Project ID (undefined = platform-global)
+   * @param environmentId - Project ID (undefined = platform-global)
    */
-  setDatabaseDriver(driver, organizationId, projectId) {
-    if (projectId !== void 0) {
+  setDatabaseDriver(driver, organizationId, environmentId) {
+    if (environmentId !== void 0) {
       this.logger.info("Project kernel \u2014 skipping DatabaseLoader for sys_metadata (control-plane only)", {
         organizationId,
-        projectId
+        environmentId
       });
       return;
     }
@@ -1286,7 +1344,7 @@ var _MetadataManager = class _MetadataManager {
       driver,
       tableName,
       organizationId,
-      projectId,
+      environmentId,
       cache: this.config.cache?.databaseLoader
     });
     this.registerLoader(dbLoader);
@@ -1300,13 +1358,13 @@ var _MetadataManager = class _MetadataManager {
    *
    * @param engine - An IDataEngine instance (typically the ObjectQL service)
    * @param organizationId - Organization ID for multi-tenant isolation
-   * @param projectId - Project ID (undefined = platform-global)
+   * @param environmentId - Project ID (undefined = platform-global)
    */
-  setDataEngine(engine, organizationId, projectId) {
-    if (projectId !== void 0) {
+  setDataEngine(engine, organizationId, environmentId) {
+    if (environmentId !== void 0) {
       this.logger.info("Project kernel \u2014 skipping DatabaseLoader for sys_metadata (control-plane only)", {
         organizationId,
-        projectId
+        environmentId
       });
       return;
     }
@@ -1315,7 +1373,7 @@ var _MetadataManager = class _MetadataManager {
       engine,
       tableName,
       organizationId,
-      projectId,
+      environmentId,
       cache: this.config.cache?.databaseLoader
     });
     this.registerLoader(dbLoader);
@@ -2348,6 +2406,23 @@ var _MetadataManager = class _MetadataManager {
     this.notifyWatchers(type, legacyEvent);
   }
   notifyWatchers(type, event) {
+    this.notifyWatchersLocal(type, event);
+    if (this.clusterPubSub) {
+      const payload = {
+        originNode: this.clusterNodeId,
+        type,
+        event
+      };
+      const key = `${type}:${event.name ?? ""}`;
+      void this.clusterPubSub.publish(_MetadataManager.CLUSTER_CHANNEL, payload, { partitionKey: key }).catch((err) => {
+        this.logger.error("Cluster metadata publish failed", void 0, {
+          type,
+          error: err instanceof Error ? err.message : String(err)
+        });
+      });
+    }
+  }
+  notifyWatchersLocal(type, event) {
     const callbacks = this.watchCallbacks.get(type);
     if (!callbacks) return;
     for (const callback of callbacks) {
@@ -2361,6 +2436,63 @@ var _MetadataManager = class _MetadataManager {
       }
     }
   }
+  /**
+   * Attach a cluster pub/sub transport so metadata-change events fan
+   * out to peer nodes and remote events replay into local watchers.
+   *
+   * The bridge plugin in @objectstack/service-cluster calls this once
+   * per kernel boot after both cluster and metadata services are
+   * registered. Passing the same MetadataManager twice no-ops; passing
+   * a different transport replaces the prior subscription.
+   *
+   * Pass `nodeId` matching the local cluster's nodeId so loopback
+   * suppression works.
+   *
+   * @returns disposer that unsubscribes from cluster events.
+   */
+  attachClusterPubSub(pubsub, nodeId) {
+    if (this.clusterPubSub === pubsub && this.clusterNodeId === nodeId) {
+      return () => this.detachClusterPubSub();
+    }
+    this.detachClusterPubSub();
+    this.clusterPubSub = pubsub;
+    this.clusterNodeId = nodeId;
+    this.clusterUnsubscribe = pubsub.subscribe(
+      _MetadataManager.CLUSTER_CHANNEL,
+      (msg) => {
+        const p = msg.payload;
+        if (p?.originNode && p.originNode === this.clusterNodeId) return;
+        if (!p?.type || !p.event) return;
+        setImmediate(() => {
+          try {
+            this.notifyWatchersLocal(p.type, p.event);
+          } catch (err) {
+            this.logger.error("Cluster remote replay failed", void 0, {
+              type: p.type,
+              error: err instanceof Error ? err.message : String(err)
+            });
+          }
+        });
+      }
+    );
+    this.logger.info("MetadataManager attached to cluster pubsub", {
+      nodeId,
+      channel: _MetadataManager.CLUSTER_CHANNEL
+    });
+    return () => this.detachClusterPubSub();
+  }
+  /** Tear down cluster wiring. Safe to call multiple times. */
+  detachClusterPubSub() {
+    if (this.clusterUnsubscribe) {
+      try {
+        this.clusterUnsubscribe();
+      } catch {
+      }
+      this.clusterUnsubscribe = void 0;
+    }
+    this.clusterPubSub = void 0;
+    this.clusterNodeId = void 0;
+  }
   // ==========================================
   // Version History & Rollback
   // ==========================================
@@ -2461,6 +2593,7 @@ var _MetadataManager = class _MetadataManager {
   }
 };
 _MetadataManager.LIST_CACHE_TTL_MS = 3e4;
+_MetadataManager.CLUSTER_CHANNEL = "metadata.changed";
 var MetadataManager = _MetadataManager;
 
 // src/plugin.ts
@@ -3242,24 +3375,24 @@ var MetadataPlugin = class {
    * metadata items into the MetadataManager.
    */
   async _parseAndRegisterArtifact(ctx, raw, label) {
-    const { ProjectArtifactSchema } = await import("@objectstack/spec/cloud");
+    const { EnvironmentArtifactSchema } = await import("@objectstack/spec/cloud");
     const { ObjectStackDefinitionSchema } = await import("@objectstack/spec");
     let metadata;
     const obj = raw;
     if (obj?.schemaVersion && obj?.commitId && obj?.metadata !== void 0) {
-      const artifact = ProjectArtifactSchema.parse(obj);
+      const artifact = EnvironmentArtifactSchema.parse(obj);
       metadata = artifact.metadata;
     } else if (obj?.success && obj?.data?.metadata) {
-      const artifact = ProjectArtifactSchema.parse(obj.data);
+      const artifact = EnvironmentArtifactSchema.parse(obj.data);
       metadata = artifact.metadata;
     } else {
       const def = ObjectStackDefinitionSchema.parse(obj);
       const canonical = JSON.stringify(def, Object.keys(def).sort());
       const checksum = createHash2("sha256").update(canonical).digest("hex");
-      const projectId = this.options.projectId ?? "proj_local";
-      ProjectArtifactSchema.parse({
+      const environmentId = this.options.environmentId ?? "proj_local";
+      EnvironmentArtifactSchema.parse({
         schemaVersion: "0.1",
-        projectId,
+        environmentId,
         commitId: "local-dev",
         checksum,
         metadata: def
@@ -3315,13 +3448,13 @@ var MetadataPlugin = class {
    * P2: Load metadata from the cloud artifact API endpoint.
    */
   async _loadFromArtifactApi(ctx, src) {
-    const projectId = this.options.projectId;
-    if (!projectId) {
-      throw new Error("[MetadataPlugin] artifact-api source requires options.projectId to be set");
+    const environmentId = this.options.environmentId;
+    if (!environmentId) {
+      throw new Error("[MetadataPlugin] artifact-api source requires options.environmentId to be set");
     }
     let artifactUrl = src.url.replace(/\/+$/, "");
     if (!/\/api\/v\d+\/cloud\/projects\//i.test(artifactUrl)) {
-      artifactUrl = `${artifactUrl}/api/v1/cloud/projects/${projectId}/artifact`;
+      artifactUrl = `${artifactUrl}/api/v1/cloud/environments/${environmentId}/artifact`;
     }
     if (src.commitId) {
       artifactUrl += `${artifactUrl.includes("?") ? "&" : "?"}commit=${encodeURIComponent(src.commitId)}`;