@abtnode/core 1.17.5-beta-20251209-090953-3a59e7ac → 1.17.5-beta-20251214-122206-29056e8c

package/lib/util/migration-sqlite-to-postgres.js

@@ -14,6 +14,105 @@ const notCheckPrimaryKeyTableNames = new Set(['tagging']);
 
 const needBreakErrors = [];
 
+/**
+ * Generate a unique ID for blocklet_children records
+ */
+function generateChildId() {
+  return `${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+}
+
+/**
+ * 因为删除了表字段，所以需要单独处理，不然 migrate 有旧的 children 数据会失败
+ * @param {object} params - Parameters
+ * @param {Sequelize} params.pgDb - PostgreSQL database connection
+ * @param {string} params.blockletId - Parent blocklet ID
+ * @param {string} params.parentBlockletDid - Parent blocklet DID
+ * @param {Array} params.children - Children array to migrate
+ */
+async function migrateBlockletChildrenToTable({ pgDb, blockletId, parentBlockletDid, children }) {
+  if (!Array.isArray(children) || children.length === 0) {
+    return;
+  }
+
+  for (const child of children) {
+    const childMeta = child?.meta || {};
+    const childDid = childMeta?.did;
+
+    if (!childDid) {
+      console.warn(`   ⚠️ Child in blocklet ${blockletId} has no meta.did, skipping`);
+      continue;
+    }
+
+    try {
+      // Check if child already exists
+      const [existing] = await pgDb.query(
+        'SELECT id FROM blocklet_children WHERE "parentBlockletId" = $1 AND "childDid" = $2 LIMIT 1',
+        { bind: [blockletId, childDid], type: QueryTypes.SELECT }
+      );
+
+      if (existing) {
+        console.log(`   ℹ️ Child ${childDid} already exists for blocklet ${blockletId}, skipping`);
+        continue;
+      }
+
+      // Insert child record
+      const insertSQL = `
+        INSERT INTO blocklet_children (
+          id, "parentBlockletId", "parentBlockletDid", "childDid", "mountPoint",
+          meta, "bundleSource", source, "deployedFrom", mode, status,
+          ports, environments, "installedAt", "startedAt",
+          "stoppedAt", "pausedAt", operator, "inProgressStart", "greenStatus",
+          "greenPorts", "createdAt", "updatedAt"
+        ) VALUES (
+          $1, $2, $3, $4, $5,
+          $6::jsonb, $7::jsonb, $8, $9, $10, $11,
+          $12::jsonb, $13::jsonb, $14, $15,
+          $16, $17, $18, $19, $20,
+          $21::jsonb, $22, $23
+        )
+        ON CONFLICT DO NOTHING
+      `;
+
+      const now = new Date();
+      const bindValues = [
+        generateChildId(), // id
+        blockletId, // parentBlockletId
+        parentBlockletDid, // parentBlockletDid
+        childDid, // childDid
+        child.mountPoint || null, // mountPoint
+        JSON.stringify(child.meta || {}), // meta
+        JSON.stringify(child.bundleSource || {}), // bundleSource
+        child.source || 0, // source
+        child.deployedFrom || '', // deployedFrom
+        child.mode || 'production', // mode
+        child.status || 0, // status
+        JSON.stringify(child.ports || {}), // ports
+        JSON.stringify(child.environments || []), // environments
+        child.installedAt || null, // installedAt
+        child.startedAt || null, // startedAt
+        child.stoppedAt || null, // stoppedAt
+        child.pausedAt || null, // pausedAt
+        child.operator || null, // operator
+        child.inProgressStart || null, // inProgressStart
+        child.greenStatus || null, // greenStatus
+        child.greenPorts ? JSON.stringify(child.greenPorts) : null, // greenPorts
+        now, // createdAt
+        now, // updatedAt
+      ];
+
+      await pgDb.query(insertSQL, { bind: bindValues });
+      console.log(`   ✅ Migrated child ${childDid} to blocklet_children table`);
+    } catch (err) {
+      // Ignore unique constraint errors
+      if (err.name === 'SequelizeUniqueConstraintError' || err.message?.includes('UNIQUE constraint')) {
+        console.log(`   ℹ️ Child ${childDid} already exists (unique constraint), skipping`);
+        continue;
+      }
+      console.error(`   ❌ Failed to migrate child ${childDid}:`, err.message);
+    }
+  }
+}
+
 function sortTableNames(tableNames, sort) {
   return [...tableNames].sort((a, b) => {
     const indexA = sort.indexOf(a);
@@ -50,7 +149,8 @@ async function migrateAllTablesNoModels(dbPath) {
     .filter((name) => !/^(sqlite|sequelize)/.test(name.toLowerCase()) && name !== 'runtime_insights');
 
   // 把 tableNames 排序, 把被依赖的表放前面
-  tableNames = sortTableNames(tableNames, ['users', 'notification_receivers']);
+  // blocklet_children 需要在 blocklets 之前处理，因为 blocklets 的 children 字段需要迁移到 blocklet_children 表
+  tableNames = sortTableNames(tableNames, ['users', 'notification_receivers', 'blocklet_children', 'blocklets']);
 
   for (const tableName of tableNames) {
     console.log(`\n➡️ Starting migration for table: ${dbPath} ${tableName}`);
@@ -71,6 +171,14 @@ async function migrateAllTablesNoModels(dbPath) {
     if (dbPath.includes('server.db') && tableName === 'blocklets') {
       allCols = allCols.filter((c) => c !== 'controller');
     }
+
+    // 删除 blocklets 表中的 children 列, 因为 children 已经拆分到 blocklet_children 表
+    // children 数据会在迁移过程中单独处理
+    const hasChildrenColumn = tableName === 'blocklets' && sqliteSchema.children;
+    if (hasChildrenColumn) {
+      allCols = allCols.filter((c) => c !== 'children');
+      console.log('   ℹ️ Detected children column in blocklets table, will migrate to blocklet_children table');
+    }
     let pkCols = allCols.filter((c) => sqliteSchema[c].primaryKey);
     if (!pkCols.length) {
       pkCols = [allCols[0]];
@@ -94,6 +202,14 @@ async function migrateAllTablesNoModels(dbPath) {
       .filter(([, def]) => def.type && ['JSON', 'JSONB'].includes(def.type.toUpperCase()))
       .map(([col, def]) => ({ name: col, type: def.type.toUpperCase() }));
 
+    // find DATE/TIMESTAMP columns (need to validate and fix invalid dates)
+    const dateCols = Object.entries(pgSchema)
+      .filter(([, def]) => {
+        const type = def.type?.toUpperCase() || '';
+        return type.includes('DATE') || type.includes('TIMESTAMP') || type === 'DATE' || type.startsWith('TIMESTAMP');
+      })
+      .map(([col]) => col);
+
     // find auto-increment columns (nextval default)
     const autoIncCols = Object.entries(pgSchema)
       .filter(([, def]) => typeof def.defaultValue === 'string' && def.defaultValue.startsWith('nextval('))
@@ -159,12 +275,90 @@ async function migrateAllTablesNoModels(dbPath) {
       console.log(`   Migrating rows ${offset + 1}-${offset + rows.length}`);
 
       for (const row of rows) {
-        // 如果有 createdAt 或 updatedAt 列, 并且值是不合法的 Date, 就改成当前时间
-        if (row.createdAt && Number.isNaN(new Date(row.createdAt).getTime())) {
-          row.createdAt = new Date();
+        // Handle children migration for blocklets table
+        if (hasChildrenColumn && row.children) {
+          try {
+            let children = row.children;
+            if (typeof children === 'string') {
+              try {
+                children = JSON.parse(children);
+              } catch {
+                children = null;
+              }
+            } else if (Buffer.isBuffer(children)) {
+              try {
+                children = JSON.parse(children.toString('utf8'));
+              } catch {
+                children = null;
+              }
+            }
+
+            if (Array.isArray(children) && children.length > 0) {
+              // Get parent blocklet DID from meta
+              let meta = row.meta;
+              if (typeof meta === 'string') {
+                try {
+                  meta = JSON.parse(meta);
+                } catch {
+                  meta = {};
+                }
+              } else if (Buffer.isBuffer(meta)) {
+                try {
+                  meta = JSON.parse(meta.toString('utf8'));
+                } catch {
+                  meta = {};
+                }
+              }
+
+              const parentBlockletDid = meta?.did;
+              if (parentBlockletDid) {
+                console.log(`   🔄 Migrating ${children.length} children for blocklet ${row.id}`);
+                await migrateBlockletChildrenToTable({
+                  pgDb,
+                  blockletId: row.id,
+                  parentBlockletDid,
+                  children,
+                });
+              } else {
+                console.warn(`   ⚠️ Blocklet ${row.id} has no meta.did, skipping children migration`);
+              }
+            }
+          } catch (err) {
+            console.error(`   ❌ Failed to migrate children for blocklet ${row.id}:`, err.message);
+          }
         }
-        if (row.updatedAt && Number.isNaN(new Date(row.updatedAt).getTime())) {
-          row.updatedAt = new Date();
+
+        // Fix invalid date values for all DATE/TIMESTAMP columns
+        for (const dateCol of dateCols) {
+          if (row[dateCol] != null) {
+            const dateVal = row[dateCol];
+            // Check if it's an invalid date (NaN, "Invalid date" string, or invalid Date object)
+            let isValid = false;
+            if (dateVal instanceof Date) {
+              isValid = !Number.isNaN(dateVal.getTime());
+            } else if (typeof dateVal === 'string') {
+              // Check for "Invalid date" string or empty string
+              if (dateVal === 'Invalid date' || dateVal === '' || dateVal === 'null') {
+                isValid = false;
+              } else {
+                const parsed = new Date(dateVal);
+                isValid = !Number.isNaN(parsed.getTime());
+              }
+            } else if (typeof dateVal === 'number') {
+              // Check if it's a valid timestamp
+              const parsed = new Date(dateVal);
+              isValid = !Number.isNaN(parsed.getTime());
+            } else {
+              // null or undefined are valid (will be handled by allowNull)
+              isValid = true;
+            }
+
+            if (!isValid) {
+              console.warn(`   ⚠️ ${tableName}: Invalid date in column "${dateCol}", fixing to current time`);
+              console.log(`      Old value: ${dateVal} (type: ${typeof dateVal})`);
+              row[dateCol] = new Date();
+            }
+          }
         }
 
         // 修复不合格的旧数据
@@ -266,6 +460,46 @@ async function migrateAllTablesNoModels(dbPath) {
             console.error(`   ❌ ${tableName}: string too long for VARCHAR columns:`, badCols);
             continue;
           }
+          // Handle invalid timestamp/date errors - should have been fixed above, but log if still occurs
+          const timestampErr = err.message.match(/invalid input syntax for type timestamp/i);
+          if (timestampErr) {
+            console.error(`   ❌ ${tableName}: Invalid timestamp error (should have been fixed):`, err.message);
+            console.log('      Row data:', JSON.stringify(row, null, 2));
+            // Try to fix and retry once
+            let fixed = false;
+            for (const dateCol of dateCols) {
+              if (row[dateCol] != null) {
+                const dateVal = row[dateCol];
+                if (
+                  dateVal === 'Invalid date' ||
+                  dateVal === '' ||
+                  (typeof dateVal === 'string' && dateVal.toLowerCase() === 'null')
+                ) {
+                  row[dateCol] = new Date();
+                  fixed = true;
+                } else {
+                  const parsed = new Date(dateVal);
+                  if (Number.isNaN(parsed.getTime())) {
+                    row[dateCol] = new Date();
+                    fixed = true;
+                  }
+                }
+              }
+            }
+            if (fixed) {
+              console.log('   🔧 Fixed invalid dates, retrying insert...');
+              const retryBindVals = insertCols.map((c) => row[c]);
+              try {
+                await pgDb.query(upsertSQL, { bind: retryBindVals });
+                continue;
+              } catch (retryErr) {
+                console.error('   ❌ Retry failed:', retryErr.message);
+              }
+            }
+            // If still failing, skip this row
+            console.warn('   ⚠️ Skipping row due to timestamp error');
+            continue;
+          }
           console.error(`   ❌ Upsert failed for ${tableName} : ${err.message}, SQL:${upsertSQL} value: ${bindVals}`);
           if (ignoreErrorTableNames.has(tableName)) {
             console.log(`   ❌ Ignore error for ${tableName}`);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.5-beta-20251209-090953-3a59e7ac",
+  "version": "1.17.5-beta-20251214-122206-29056e8c",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -17,46 +17,46 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/auth": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/certificate-manager": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/constant": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/cron": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/db-cache": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/docker-utils": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/logger": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/models": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/queue": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/rbac": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/router-provider": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/static-server": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/timemachine": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@abtnode/util": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@aigne/aigne-hub": "^0.10.10",
-    "@arcblock/did": "^1.27.12",
-    "@arcblock/did-connect-js": "^1.27.12",
-    "@arcblock/did-ext": "^1.27.12",
+    "@abtnode/analytics": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/auth": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/certificate-manager": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/constant": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/cron": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/db-cache": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/docker-utils": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/logger": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/models": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/queue": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/rbac": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/router-provider": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/static-server": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/timemachine": "1.17.5-beta-20251214-122206-29056e8c",
+    "@abtnode/util": "1.17.5-beta-20251214-122206-29056e8c",
+    "@aigne/aigne-hub": "^0.10.14",
+    "@arcblock/did": "^1.27.14",
+    "@arcblock/did-connect-js": "^1.27.14",
+    "@arcblock/did-ext": "^1.27.14",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/did-util": "^1.27.12",
-    "@arcblock/event-hub": "^1.27.12",
-    "@arcblock/jwt": "^1.27.12",
+    "@arcblock/did-util": "^1.27.14",
+    "@arcblock/event-hub": "^1.27.14",
+    "@arcblock/jwt": "^1.27.14",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.27.12",
-    "@arcblock/vc": "^1.27.12",
-    "@blocklet/constant": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@blocklet/did-space-js": "^1.2.6",
-    "@blocklet/env": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@blocklet/error": "^0.3.3",
-    "@blocklet/meta": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@blocklet/resolver": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@blocklet/sdk": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@blocklet/server-js": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@blocklet/store": "1.17.5-beta-20251209-090953-3a59e7ac",
-    "@blocklet/theme": "^3.2.11",
+    "@arcblock/validator": "^1.27.14",
+    "@arcblock/vc": "^1.27.14",
+    "@blocklet/constant": "1.17.5-beta-20251214-122206-29056e8c",
+    "@blocklet/did-space-js": "^1.2.9",
+    "@blocklet/env": "1.17.5-beta-20251214-122206-29056e8c",
+    "@blocklet/error": "^0.3.4",
+    "@blocklet/meta": "1.17.5-beta-20251214-122206-29056e8c",
+    "@blocklet/resolver": "1.17.5-beta-20251214-122206-29056e8c",
+    "@blocklet/sdk": "1.17.5-beta-20251214-122206-29056e8c",
+    "@blocklet/server-js": "1.17.5-beta-20251214-122206-29056e8c",
+    "@blocklet/store": "1.17.5-beta-20251214-122206-29056e8c",
+    "@blocklet/theme": "^3.2.13",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "^1.27.12",
-    "@ocap/util": "^1.27.12",
-    "@ocap/wallet": "^1.27.12",
+    "@ocap/mcrypto": "^1.27.14",
+    "@ocap/util": "^1.27.14",
+    "@ocap/wallet": "^1.27.14",
     "@slack/webhook": "^7.0.6",
     "archiver": "^7.0.1",
     "axios": "^1.7.9",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "514964082a28e8c6658d9a62cf283811dd6a8baf"
+  "gitHead": "6839aebc2fdccbfbe7448f1e38f90be300ee4051"
 }

package/lib/blocklet/manager/helper/blue-green-update-blocklet-status.js

@@ -1,18 +0,0 @@
-const blueGreenUpdateBlockletStatus = async ({ states, did, status, blueGreenComponentIds }) => {
-  const outputBlocklet = {};
-  await Promise.all(
-    blueGreenComponentIds.map(async (item) => {
-      if (!item.componentDids.length) {
-        return;
-      }
-      const res = await states.blocklet.setBlockletStatus(did, status, {
-        componentDids: item.componentDids,
-        isGreen: item.changeToGreen,
-      });
-      Object.assign(outputBlocklet, res);
-    })
-  );
-  return outputBlocklet;
-};
-
-module.exports = { blueGreenUpdateBlockletStatus };