@abtnode/core 1.17.5-beta-20251208-123021-e8c53f96 → 1.17.5-beta-20251211-104355-426d7eb6

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

@@ -94,6 +94,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 +167,37 @@ 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();
-        }
-        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 +299,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-20251208-123021-e8c53f96",
+  "version": "1.17.5-beta-20251211-104355-426d7eb6",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -17,21 +17,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/auth": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/certificate-manager": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/constant": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/cron": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/db-cache": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/docker-utils": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/logger": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/models": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/queue": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/rbac": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/router-provider": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/static-server": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/timemachine": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@abtnode/util": "1.17.5-beta-20251208-123021-e8c53f96",
+    "@abtnode/analytics": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/auth": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/certificate-manager": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/constant": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/cron": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/db-cache": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/docker-utils": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/logger": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/models": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/queue": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/rbac": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/router-provider": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/static-server": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/timemachine": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@abtnode/util": "1.17.5-beta-20251211-104355-426d7eb6",
     "@aigne/aigne-hub": "^0.10.10",
     "@arcblock/did": "^1.27.12",
     "@arcblock/did-connect-js": "^1.27.12",
@@ -43,15 +43,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.27.12",
     "@arcblock/vc": "^1.27.12",
-    "@blocklet/constant": "1.17.5-beta-20251208-123021-e8c53f96",
+    "@blocklet/constant": "1.17.5-beta-20251211-104355-426d7eb6",
     "@blocklet/did-space-js": "^1.2.6",
-    "@blocklet/env": "1.17.5-beta-20251208-123021-e8c53f96",
+    "@blocklet/env": "1.17.5-beta-20251211-104355-426d7eb6",
     "@blocklet/error": "^0.3.3",
-    "@blocklet/meta": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@blocklet/resolver": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@blocklet/sdk": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@blocklet/server-js": "1.17.5-beta-20251208-123021-e8c53f96",
-    "@blocklet/store": "1.17.5-beta-20251208-123021-e8c53f96",
+    "@blocklet/meta": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@blocklet/resolver": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@blocklet/sdk": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@blocklet/server-js": "1.17.5-beta-20251211-104355-426d7eb6",
+    "@blocklet/store": "1.17.5-beta-20251211-104355-426d7eb6",
     "@blocklet/theme": "^3.2.11",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "^1.27.12",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "ed63bdced5fa8df09ba7fd282b38751007df2216"
+  "gitHead": "9ea2a8077a8edbf5021281e823719758eb9fe02c"
 }