@undefineds.co/xpod 0.3.31 → 0.3.32

package/dist/identity/drizzle/EdgeNodeRepository.js

@@ -6,10 +6,14 @@ const drizzle_orm_1 = require("drizzle-orm");
 const db_1 = require("./db");
 const schema_1 = require("./schema");
 class EdgeNodeRepository {
-    constructor(db) {
+    constructor(db, options = {}) {
         this.db = db;
+        this.ready = options.ensureClusterTables === false
+            ? Promise.resolve()
+            : (0, db_1.ensureCloudClusterTables)(db);
     }
     async listNodes() {
+        await this.ready;
         const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
       SELECT en.id,
              en.display_name,
@@ -18,24 +22,20 @@ class EdgeNodeRepository {
              en.updated_at,
              en.last_seen,
              en.metadata,
-             COALESCE(pods.count, 0) AS pod_count
-      FROM identity_edge_node en
-      LEFT JOIN (
-        SELECT node_id, COUNT(*) AS count
-        FROM identity_edge_node_pod
-        GROUP BY node_id
-      ) pods ON pods.node_id = en.id
+             en.pod_base_urls
+      FROM cluster_node en
       ORDER BY en.created_at ASC
     `);
         return result.rows.map((row) => {
             const createdAt = (0, db_1.fromDbTimestamp)(row.created_at);
             const updatedAt = (0, db_1.fromDbTimestamp)(row.updated_at);
             const lastSeen = (0, db_1.fromDbTimestamp)(row.last_seen);
+            const podBaseUrls = parsePodBaseUrls(row.pod_base_urls);
             return {
                 nodeId: String(row.id),
                 displayName: row.display_name == null ? undefined : String(row.display_name),
                 nodeType: (['center', 'edge', 'sp'].includes(row.node_type) ? row.node_type : 'edge'),
-                podCount: Number(row.pod_count ?? 0),
+                podCount: podBaseUrls.length,
                 createdAt: createdAt?.toISOString(),
                 updatedAt: updatedAt?.toISOString(),
                 lastSeen: lastSeen?.toISOString(),
@@ -43,14 +43,15 @@ class EdgeNodeRepository {
             };
         });
     }
-    async createNode(displayName, _accountId) {
+    async createNode(displayName) {
+        await this.ready;
         const nodeId = (0, node_crypto_1.randomUUID)();
         const token = (0, node_crypto_1.randomBytes)(32).toString('base64url');
         const tokenHash = (0, node_crypto_1.createHash)('sha256').update(token).digest('hex');
         const now = new Date();
         const ts = (0, db_1.toDbTimestamp)(this.db, now);
         await (0, db_1.executeStatement)(this.db, (0, drizzle_orm_1.sql) `
-      INSERT INTO identity_edge_node (id, display_name, token_hash, created_at, updated_at)
+      INSERT INTO cluster_node (id, display_name, token_hash, created_at, updated_at)
       VALUES (${nodeId}, ${displayName ?? null}, ${tokenHash}, ${ts}, ${ts})
     `);
         return {
@@ -59,16 +60,11 @@ class EdgeNodeRepository {
             createdAt: now.toISOString(),
         };
     }
-    /**
-     * Node/account 关系待产品化后单独建模；当前阶段不再在节点表上持久化账号归属。
-     */
-    async getNodeOwner(_nodeId) {
-        return undefined;
-    }
     async getNodeSecret(nodeId) {
+        await this.ready;
         const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
       SELECT id, display_name, token_hash, node_type, metadata
-      FROM identity_edge_node
+      FROM cluster_node
       WHERE id = ${nodeId}
       LIMIT 1
     `);
@@ -85,10 +81,11 @@ class EdgeNodeRepository {
         };
     }
     async updateNodeHeartbeat(nodeId, metadata, timestamp) {
+        await this.ready;
         const payload = metadata == null ? null : JSON.stringify(metadata);
         const ts = (0, db_1.toDbTimestamp)(this.db, timestamp);
         await (0, db_1.executeStatement)(this.db, (0, drizzle_orm_1.sql) `
-      UPDATE identity_edge_node
+      UPDATE cluster_node
       SET metadata = ${payload},
           last_seen = ${ts},
           updated_at = ${ts}
@@ -96,11 +93,12 @@ class EdgeNodeRepository {
     `);
     }
     async updateNodeMode(nodeId, options) {
+        await this.ready;
         const capabilitiesPayload = options.capabilities ? JSON.stringify(options.capabilities) : null;
         const now = new Date();
         const ts = (0, db_1.toDbTimestamp)(this.db, now);
         await (0, db_1.executeStatement)(this.db, (0, drizzle_orm_1.sql) `
-      UPDATE identity_edge_node
+      UPDATE cluster_node
       SET access_mode = ${options.accessMode},
           ipv4 = ${options.ipv4 ?? null},
           public_port = ${options.publicPort ?? null},
@@ -113,10 +111,11 @@ class EdgeNodeRepository {
     `);
     }
     async getNodeConnectivityInfo(nodeId) {
+        await this.ready;
         const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
-      SELECT id, access_mode, ipv4, public_port, subdomain,
+      SELECT id, access_mode, ipv4, public_port, public_url, subdomain,
              connectivity_status, last_connectivity_check
-      FROM identity_edge_node
+      FROM cluster_node
       WHERE id = ${nodeId}
       LIMIT 1
     `);
@@ -129,12 +128,14 @@ class EdgeNodeRepository {
             accessMode: row.access_mode ? String(row.access_mode) : undefined,
             ipv4: row.ipv4 ? String(row.ipv4) : undefined,
             publicPort: row.public_port ? Number(row.public_port) : undefined,
+            publicUrl: row.public_url ? String(row.public_url) : undefined,
             subdomain: row.subdomain ? String(row.subdomain) : undefined,
             connectivityStatus: row.connectivity_status ? String(row.connectivity_status) : undefined,
             lastConnectivityCheck: (0, db_1.fromDbTimestamp)(row.last_connectivity_check),
         };
     }
     async mergeNodeMetadata(nodeId, patch) {
+        await this.ready;
         // Read current metadata
         const current = await this.getNodeMetadata(nodeId);
         if (!current) {
@@ -145,16 +146,17 @@ class EdgeNodeRepository {
         const payload = JSON.stringify(merged);
         const ts = (0, db_1.toDbTimestamp)(this.db, new Date());
         await (0, db_1.executeStatement)(this.db, (0, drizzle_orm_1.sql) `
-      UPDATE identity_edge_node
+      UPDATE cluster_node
       SET metadata = ${payload},
           updated_at = ${ts}
       WHERE id = ${nodeId}
     `);
     }
     async getNodeMetadata(nodeId) {
+        await this.ready;
         const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
       SELECT id, metadata, last_seen
-      FROM identity_edge_node
+      FROM cluster_node
       WHERE id = ${nodeId}
       LIMIT 1
     `);
@@ -169,49 +171,63 @@ class EdgeNodeRepository {
         };
     }
     async replaceNodePods(nodeId, pods) {
-        await this.db.transaction(async (tx) => {
-            await tx.execute((0, drizzle_orm_1.sql) `DELETE FROM identity_edge_node_pod WHERE node_id = ${nodeId}`);
-            if (pods.length > 0) {
-                const values = pods.map((baseUrl) => (0, drizzle_orm_1.sql) `(${nodeId}, ${baseUrl})`);
-                await tx.execute((0, drizzle_orm_1.sql) `
-          INSERT INTO identity_edge_node_pod (node_id, base_url)
-          VALUES ${drizzle_orm_1.sql.join(values, (0, drizzle_orm_1.sql) `, `)}
-          ON CONFLICT DO NOTHING
-        `);
+        await this.ready;
+        const targetPods = uniquePodBaseUrls(pods);
+        await this.updateNodePodBaseUrls(nodeId, targetPods);
+        await this.removePodBaseUrlsFromOtherNodes(nodeId, targetPods);
+    }
+    async assignPodToNode(nodeId, baseUrl) {
+        await this.ready;
+        const normalizedBaseUrl = normalizePodBaseUrl(baseUrl);
+        if (!normalizedBaseUrl) {
+            return;
+        }
+        const rows = await this.getNodePodRows();
+        for (const row of rows) {
+            const current = parsePodBaseUrls(row.pod_base_urls);
+            const next = row.id === nodeId
+                ? uniquePodBaseUrls([...current, normalizedBaseUrl])
+                : current.filter((value) => value !== normalizedBaseUrl);
+            if (!arraysEqual(current, next)) {
+                await this.updateNodePodBaseUrls(row.id, next);
             }
-        });
+        }
     }
     async findNodeByResourcePath(path) {
+        await this.ready;
         const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
-      SELECT en.id,
-             en.access_mode,
-             en.metadata,
-             pods.base_url
-      FROM identity_edge_node_pod pods
-      JOIN identity_edge_node en ON en.id = pods.node_id
-      WHERE ${path} LIKE pods.base_url || '%'
-      ORDER BY length(pods.base_url) DESC
-      LIMIT 1
+      SELECT id, access_mode, public_url, metadata, pod_base_urls
+      FROM cluster_node
+      WHERE pod_base_urls IS NOT NULL AND pod_base_urls <> ''
     `);
-        if (result.rows.length === 0) {
+        let bestMatch;
+        for (const row of result.rows) {
+            for (const baseUrl of parsePodBaseUrls(row.pod_base_urls)) {
+                if (path.startsWith(baseUrl) && baseUrl.length > (bestMatch?.baseUrl.length ?? 0)) {
+                    bestMatch = { row, baseUrl };
+                }
+            }
+        }
+        if (!bestMatch) {
             return undefined;
         }
-        const row = result.rows[0];
         return {
-            nodeId: String(row.id),
-            baseUrl: String(row.base_url),
-            accessMode: row.access_mode ? String(row.access_mode) : undefined,
-            metadata: row.metadata ?? null,
+            nodeId: String(bestMatch.row.id),
+            baseUrl: bestMatch.baseUrl,
+            accessMode: bestMatch.row.access_mode ? String(bestMatch.row.access_mode) : undefined,
+            publicUrl: bestMatch.row.public_url ? String(bestMatch.row.public_url) : undefined,
+            metadata: parseJsonRecord(bestMatch.row.metadata),
         };
     }
     async findNodeBySubdomain(hostname) {
+        await this.ready;
         const normalized = hostname.trim().toLowerCase();
         if (normalized.length === 0) {
             return undefined;
         }
         const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
-      SELECT id, access_mode, metadata, subdomain
-      FROM identity_edge_node
+      SELECT id, access_mode, public_url, metadata, subdomain
+      FROM cluster_node
       WHERE subdomain = ${normalized}
       LIMIT 1
     `);
@@ -222,6 +238,7 @@ class EdgeNodeRepository {
         return {
             nodeId: String(row.id),
             accessMode: row.access_mode ? String(row.access_mode) : undefined,
+            publicUrl: row.public_url ? String(row.public_url) : undefined,
             metadata: row.metadata ?? null,
             subdomain: row.subdomain ? String(row.subdomain) : undefined,
         };
@@ -246,6 +263,7 @@ class EdgeNodeRepository {
      * Get node capabilities and related information for admin queries
      */
     async getNodeCapabilities(nodeId) {
+        await this.ready;
         const row = await this.db
             .select({
             id: schema_1.edgeNodes.id,
@@ -276,6 +294,7 @@ class EdgeNodeRepository {
      * List all nodes with their capability information
      */
     async listNodeCapabilities() {
+        await this.ready;
         const rows = await this.db
             .select({
             id: schema_1.edgeNodes.id,
@@ -305,12 +324,13 @@ class EdgeNodeRepository {
      * Center nodes use the same table as edge nodes but with nodeType='center'.
      */
     async registerCenterNode(options) {
+        await this.ready;
         const token = (0, node_crypto_1.randomBytes)(32).toString('base64url');
         const tokenHash = (0, node_crypto_1.createHash)('sha256').update(token).digest('hex');
         const now = Math.floor(Date.now() / 1000); // Unix timestamp for SQLite compatibility
         // Use upsert pattern: INSERT ... ON CONFLICT UPDATE
         await (0, db_1.executeStatement)(this.db, (0, drizzle_orm_1.sql) `
-      INSERT INTO identity_edge_node (
+      INSERT INTO cluster_node (
         id, display_name, token_hash, node_type, internal_ip, internal_port,
         connectivity_status, created_at, updated_at, last_seen
       )
@@ -331,9 +351,10 @@ class EdgeNodeRepository {
      * Update center node heartbeat with internal endpoint info.
      */
     async updateCenterNodeHeartbeat(nodeId, internalIp, internalPort, timestamp) {
+        await this.ready;
         const ts = Math.floor(timestamp.getTime() / 1000); // Unix timestamp for SQLite compatibility
         await (0, db_1.executeStatement)(this.db, (0, drizzle_orm_1.sql) `
-      UPDATE identity_edge_node
+      UPDATE cluster_node
       SET internal_ip = ${internalIp},
           internal_port = ${internalPort},
           last_seen = ${ts},
@@ -346,9 +367,10 @@ class EdgeNodeRepository {
      * List all center nodes in the cluster.
      */
     async listCenterNodes() {
+        await this.ready;
         const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
       SELECT id, display_name, internal_ip, internal_port, connectivity_status, last_seen
-      FROM identity_edge_node
+      FROM cluster_node
       WHERE node_type = 'center'
       ORDER BY created_at ASC
     `);
@@ -365,9 +387,10 @@ class EdgeNodeRepository {
      * Get a specific center node by ID.
      */
     async getCenterNode(nodeId) {
+        await this.ready;
         const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
       SELECT id, display_name, internal_ip, internal_port, connectivity_status, last_seen
-      FROM identity_edge_node
+      FROM cluster_node
       WHERE id = ${nodeId} AND node_type = 'center'
       LIMIT 1
     `);
@@ -388,9 +411,10 @@ class EdgeNodeRepository {
      * Find a center node by its internal endpoint (for routing).
      */
     async findCenterNodeByEndpoint(internalIp, internalPort) {
+        await this.ready;
         const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
       SELECT id, display_name, internal_ip, internal_port, connectivity_status, last_seen
-      FROM identity_edge_node
+      FROM cluster_node
       WHERE node_type = 'center' AND internal_ip = ${internalIp} AND internal_port = ${internalPort}
       LIMIT 1
     `);
@@ -411,9 +435,10 @@ class EdgeNodeRepository {
      * Mark a center node as unreachable (for health checks).
      */
     async markCenterNodeUnreachable(nodeId) {
+        await this.ready;
         const ts = (0, db_1.toDbTimestamp)(this.db, new Date());
         await (0, db_1.executeStatement)(this.db, (0, drizzle_orm_1.sql) `
-      UPDATE identity_edge_node
+      UPDATE cluster_node
       SET connectivity_status = 'unreachable',
           updated_at = ${ts}
       WHERE id = ${nodeId} AND node_type = 'center'
@@ -423,9 +448,10 @@ class EdgeNodeRepository {
      * Remove a center node from the cluster.
      */
     async removeCenterNode(nodeId) {
+        await this.ready;
         // Note: For SQLite, we can't easily get affected row count, so just execute and return true
         await (0, db_1.executeStatement)(this.db, (0, drizzle_orm_1.sql) `
-      DELETE FROM identity_edge_node
+      DELETE FROM cluster_node
       WHERE id = ${nodeId} AND node_type = 'center'
     `);
         return true;
@@ -435,6 +461,7 @@ class EdgeNodeRepository {
      * List nodes owned by a specific account
      */
     async listNodesByAccount(accountId) {
+        await this.ready;
         void accountId;
         return [];
     }
@@ -442,18 +469,51 @@ class EdgeNodeRepository {
      * Delete a node
      */
     async deleteNode(nodeId) {
-        // First delete associated pods
-        await (0, db_1.executeStatement)(this.db, (0, drizzle_orm_1.sql) `
-      DELETE FROM identity_edge_node_pod WHERE node_id = ${nodeId}
-    `);
-        // Then delete the node
+        await this.ready;
         const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
-      DELETE FROM identity_edge_node
+      DELETE FROM cluster_node
       WHERE id = ${nodeId}
       RETURNING id
     `);
         return result.rows.length > 0;
     }
+    async getNodePodRows() {
+        const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
+      SELECT id, pod_base_urls
+      FROM cluster_node
+    `);
+        return result.rows.map((row) => ({
+            id: String(row.id),
+            pod_base_urls: row.pod_base_urls,
+        }));
+    }
+    async updateNodePodBaseUrls(nodeId, pods) {
+        const payload = pods.length > 0 ? JSON.stringify(pods) : null;
+        const ts = (0, db_1.toDbTimestamp)(this.db, new Date());
+        await (0, db_1.executeStatement)(this.db, (0, drizzle_orm_1.sql) `
+      UPDATE cluster_node
+      SET pod_base_urls = ${payload},
+          updated_at = ${ts}
+      WHERE id = ${nodeId}
+    `);
+    }
+    async removePodBaseUrlsFromOtherNodes(nodeId, pods) {
+        if (pods.length === 0) {
+            return;
+        }
+        const podSet = new Set(pods);
+        const rows = await this.getNodePodRows();
+        for (const row of rows) {
+            if (row.id === nodeId) {
+                continue;
+            }
+            const current = parsePodBaseUrls(row.pod_base_urls);
+            const next = current.filter((value) => !podSet.has(value));
+            if (!arraysEqual(current, next)) {
+                await this.updateNodePodBaseUrls(row.id, next);
+            }
+        }
+    }
     // ============ SP (Storage Provider) Node Methods ============
     /**
      * Register or update an SP node (UPSERT by nodeId).
@@ -463,6 +523,7 @@ class EdgeNodeRepository {
      * 不传 nodeId 则 Cloud 随机分配。
      */
     async registerSpNode(options) {
+        await this.ready;
         const nodeId = options.nodeId || (0, node_crypto_1.randomUUID)();
         const nodeToken = options.nodeToken || (0, node_crypto_1.randomBytes)(32).toString('base64url');
         const nodeTokenHash = (0, node_crypto_1.createHash)('sha256').update(nodeToken).digest('hex');
@@ -470,7 +531,7 @@ class EdgeNodeRepository {
         const now = new Date();
         const ts = (0, db_1.toDbTimestamp)(this.db, now);
         await (0, db_1.executeStatement)(this.db, (0, drizzle_orm_1.sql) `
-      INSERT INTO identity_edge_node (
+      INSERT INTO cluster_node (
         id, display_name, token_hash, service_token_hash,
         node_type, public_url,
         connectivity_status, created_at, updated_at
@@ -497,9 +558,10 @@ class EdgeNodeRepository {
      * Get SP node info by nodeId.
      */
     async getSpNode(nodeId) {
+        await this.ready;
         const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
       SELECT id, display_name, public_url, service_token_hash, last_seen
-      FROM identity_edge_node
+      FROM cluster_node
       WHERE id = ${nodeId} AND node_type = 'sp'
       LIMIT 1
     `);
@@ -517,4 +579,43 @@ class EdgeNodeRepository {
     }
 }
 exports.EdgeNodeRepository = EdgeNodeRepository;
+function parsePodBaseUrls(value) {
+    if (Array.isArray(value)) {
+        return uniquePodBaseUrls(value);
+    }
+    if (typeof value !== 'string' || value.length === 0) {
+        return [];
+    }
+    try {
+        const parsed = JSON.parse(value);
+        return Array.isArray(parsed) ? uniquePodBaseUrls(parsed) : [];
+    }
+    catch {
+        return [];
+    }
+}
+function normalizePodBaseUrl(value) {
+    return typeof value === 'string' && value.length > 0 ? value : undefined;
+}
+function uniquePodBaseUrls(values) {
+    return [...new Set(values.map(normalizePodBaseUrl).filter((value) => Boolean(value)))];
+}
+function arraysEqual(left, right) {
+    return left.length === right.length && left.every((value, index) => value === right[index]);
+}
+function parseJsonRecord(value) {
+    if (!value) {
+        return null;
+    }
+    if (typeof value === 'string') {
+        try {
+            const parsed = JSON.parse(value);
+            return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : null;
+        }
+        catch {
+            return null;
+        }
+    }
+    return typeof value === 'object' && !Array.isArray(value) ? value : null;
+}
 //# sourceMappingURL=EdgeNodeRepository.js.map