@abtnode/models 1.17.8-beta-20260113-015027-32a1cec4 → 1.17.8-beta-20260115-054144-b207746c

package/lib/migrations/server/20241216000000-notification.js

@@ -37,52 +37,48 @@ const columnsToAdd = () => {
 };
 // eslint-disable-next-line import/prefer-default-export
 const up = async ({ context }) => {
-    await context.changeColumn('notifications', 'receiver', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'notifications', 'receiver', {
         type: sequelize_1.DataTypes.STRING(80),
         allowNull: true, // 修改为允许空值
     });
-    await context.changeColumn('notifications', 'action', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'notifications', 'action', {
         type: sequelize_1.DataTypes.STRING(255),
         allowNull: true, // 修改为允许空值
     });
-    await context.changeColumn('notifications', 'entityType', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'notifications', 'entityType', {
         type: sequelize_1.DataTypes.STRING(32),
         allowNull: true, // 修改为允许空值
     });
-    await context.changeColumn('notifications', 'entityId', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'notifications', 'entityId', {
         type: sequelize_1.DataTypes.STRING(80),
         allowNull: true, // 修改为允许空值
     });
     // 冗余字段
     await (0, migrate_1.removeColumnIfExists)(context, 'notifications', 'updatedAt');
-    const tableDescriptions = await context.describeTable('notifications');
-    const promises = [];
     for (const [columnName, columnDefinition] of Object.entries(columnsToAdd())) {
-        if (!tableDescriptions[columnName]) {
-            promises.push((0, migrate_1.addColumnIfNotExists)(context, 'notifications', columnName, columnDefinition));
-        }
+        // eslint-disable-next-line no-await-in-loop
+        await (0, migrate_1.addColumnIfNotExists)(context, 'notifications', columnName, columnDefinition);
     }
-    await Promise.all(promises);
 };
 exports.up = up;
 const down = async ({ context }) => {
-    await context.changeColumn('notifications', 'receiver', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'notifications', 'receiver', {
         type: sequelize_1.DataTypes.STRING(80),
         allowNull: false, // 修改为允许空值
     });
-    await context.changeColumn('notifications', 'action', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'notifications', 'action', {
         type: sequelize_1.DataTypes.STRING(255),
         allowNull: false, // 修改为允许空值
     });
-    await context.changeColumn('notifications', 'entityType', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'notifications', 'entityType', {
         type: sequelize_1.DataTypes.STRING(32),
         allowNull: false, // 修改为允许空值
     });
-    await context.changeColumn('notifications', 'entityId', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'notifications', 'entityId', {
         type: sequelize_1.DataTypes.STRING(80),
         allowNull: false, // 修改为允许空值
     });
-    await context.addColumn('notifications', 'updatedAt', {
+    await (0, migrate_1.addColumnIfNotExists)(context, 'notifications', 'updatedAt', {
         type: sequelize_1.DataTypes.DATE,
         defaultValue: sequelize_1.DataTypes.NOW,
     });

package/lib/migrations/server/20241224000001-notification.js

@@ -18,22 +18,18 @@ const columnsToAdd = () => {
 };
 // eslint-disable-next-line import/prefer-default-export
 const up = async ({ context }) => {
-    await context.changeColumn('notifications', 'description', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'notifications', 'description', {
         type: sequelize_1.DataTypes.TEXT,
         allowNull: true, // 修改为允许空值
     });
-    const tableDescriptions = await context.describeTable('notifications');
-    const promises = [];
     for (const [columnName, columnDefinition] of Object.entries(columnsToAdd())) {
-        if (!tableDescriptions[columnName]) {
-            promises.push((0, migrate_1.addColumnIfNotExists)(context, 'notifications', columnName, columnDefinition));
-        }
+        // eslint-disable-next-line no-await-in-loop
+        await (0, migrate_1.addColumnIfNotExists)(context, 'notifications', columnName, columnDefinition);
     }
-    await Promise.all(promises);
 };
 exports.up = up;
 const down = async ({ context }) => {
-    await context.changeColumn('notifications', 'description', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'notifications', 'description', {
         type: sequelize_1.DataTypes.TEXT,
         allowNull: false,
     });

package/lib/migrations/server/20241225000000-passkey.js

@@ -5,7 +5,7 @@ const sequelize_1 = require("sequelize");
 const migrate_1 = require("../../migrate");
 const up = async ({ context }) => {
     await (0, migrate_1.addColumnIfNotExists)(context, 'connected_accounts', 'counter', {
-        type: sequelize_1.DataTypes.INTEGER,
+        type: sequelize_1.DataTypes.BIGINT,
         defaultValue: 0,
     });
     await (0, migrate_1.addColumnIfNotExists)(context, 'sessions', 'challenge', {

package/lib/migrations/server/20250625000001-server-launcher.js

@@ -17,6 +17,6 @@ const up = async ({ context }) => {
 };
 exports.up = up;
 const down = async ({ context }) => {
-    await context.removeColumn('servers', 'registerInfo');
+    await (0, migrate_1.removeColumnIfExists)(context, 'servers', 'registerInfo');
 };
 exports.down = down;

package/lib/migrations/server/20250704000000-upgrade-session-id.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.up = up;
 exports.down = down;
 const sequelize_1 = require("sequelize");
+const migrate_1 = require("../../migrate");
 async function up({ context }) {
-    await context.changeColumn('servers', 'upgradeSessionId', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'servers', 'upgradeSessionId', {
         type: sequelize_1.DataTypes.STRING(128),
     });
 }
 async function down({ context }) {
-    await context.changeColumn('servers', 'upgradeSessionId', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'servers', 'upgradeSessionId', {
         type: sequelize_1.DataTypes.STRING(32),
     });
 }

package/lib/migrations/server/20250718000002-change-some-colume-length.js

@@ -3,19 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.up = up;
 exports.down = down;
 const sequelize_1 = require("sequelize");
+const migrate_1 = require("../../migrate");
 async function up({ context }) {
     const dialect = context.sequelize.getDialect();
     if (dialect !== 'postgres') {
         return;
     }
-    await context.changeColumn('audit_logs', 'ip', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'audit_logs', 'ip', {
         type: sequelize_1.DataTypes.STRING(128),
     });
-    await context.changeColumn('users', 'phone', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'users', 'phone', {
         type: sequelize_1.DataTypes.STRING(64),
         allowNull: true,
     });
-    await context.changeColumn('traffic_insights', 'date', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'traffic_insights', 'date', {
         type: sequelize_1.DataTypes.STRING(40),
         allowNull: false,
     });
@@ -25,14 +26,14 @@ async function down({ context }) {
     if (dialect !== 'postgres') {
         return;
     }
-    await context.changeColumn('audit_logs', 'ip', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'audit_logs', 'ip', {
         type: sequelize_1.DataTypes.STRING(32),
     });
-    await context.changeColumn('users', 'phone', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'users', 'phone', {
         type: sequelize_1.DataTypes.STRING(36),
         allowNull: true,
     });
-    await context.changeColumn('traffic_insights', 'date', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'traffic_insights', 'date', {
         type: sequelize_1.DataTypes.STRING(10),
         allowNull: false,
     });

package/lib/migrations/server/20250826000000-change-access-key-type.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
 const sequelize_1 = require("sequelize");
+const migrate_1 = require("../../migrate");
 const up = async ({ context }) => {
-    await context.changeColumn('access_keys', 'passport', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'access_keys', 'passport', {
         type: sequelize_1.DataTypes.STRING(80),
     });
 };
 exports.up = up;
 const down = async ({ context }) => {
-    await context.changeColumn('access_keys', 'passport', {
+    await (0, migrate_1.changeColumnIfExists)(context, 'access_keys', 'passport', {
         type: sequelize_1.DataTypes.STRING(16),
     });
 };

package/lib/migrations/server/20250911000000-job-processing.js

@@ -3,17 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.up = up;
 exports.down = down;
 const sequelize_1 = require("sequelize");
+const migrate_1 = require("../../migrate");
 async function up({ context }) {
-    await context.addColumn('jobs', 'processingBy', {
+    await (0, migrate_1.addColumnIfNotExists)(context, 'jobs', 'processingBy', {
         type: sequelize_1.DataTypes.STRING(80),
         allowNull: true,
     });
-    await context.addColumn('jobs', 'processingAt', {
+    await (0, migrate_1.addColumnIfNotExists)(context, 'jobs', 'processingAt', {
         type: sequelize_1.DataTypes.BIGINT,
         allowNull: true,
     });
 }
 async function down({ context }) {
-    await context.removeColumn('jobs', 'processingBy');
-    await context.removeColumn('jobs', 'processingAt');
+    await (0, migrate_1.removeColumnIfExists)(context, 'jobs', 'processingBy');
+    await (0, migrate_1.removeColumnIfExists)(context, 'jobs', 'processingAt');
 }

package/lib/migrations/server/20251220000000-job-entity-id.js

@@ -5,12 +5,12 @@ exports.down = down;
 const sequelize_1 = require("sequelize");
 const migrate_1 = require("../../migrate");
 async function up({ context }) {
-    await context.addColumn('jobs', 'entityId', {
+    await (0, migrate_1.addColumnIfNotExists)(context, 'jobs', 'entityId', {
         type: sequelize_1.DataTypes.STRING(80),
         allowNull: true,
     });
     await (0, migrate_1.safeAddIndex)(context, 'jobs', ['entityId']);
 }
 async function down({ context }) {
-    await context.removeColumn('jobs', 'entityId');
+    await (0, migrate_1.removeColumnIfExists)(context, 'jobs', 'entityId');
 }

package/lib/migrations/service/20250403000001-message.js

@@ -3,41 +3,22 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
 const sequelize_1 = require("sequelize");
-const models_1 = require("../../models");
+const migrate_1 = require("../../migrate");
 const createNotificationMigration = () => ({
     up: async ({ context }) => {
-        const transaction = await context.sequelize.transaction();
-        try {
-            if (!(await (0, models_1.existsColumn)(context, 'messages', 'expiredAt'))) {
-                await context.addColumn('messages', 'expiredAt', {
-                    type: sequelize_1.DataTypes.DATE,
-                    allowNull: true,
-                }, { transaction });
-                await context.addIndex('messages', ['expiredAt'], {
-                    name: 'messages_expiredAt_index',
-                    transaction,
-                });
-            }
-            await transaction.commit();
-        }
-        catch (error) {
-            await transaction.rollback();
-            throw error;
-        }
+        await (0, migrate_1.addColumnIfNotExists)(context, 'messages', 'expiredAt', {
+            type: sequelize_1.DataTypes.DATE,
+            allowNull: true,
+        });
+        await (0, migrate_1.safeAddIndex)(context, 'messages', ['expiredAt'], { name: 'messages_expiredAt_index' });
     },
     down: async ({ context }) => {
-        const transaction = await context.sequelize.transaction();
+        await (0, migrate_1.removeColumnIfExists)(context, 'messages', 'expiredAt');
         try {
-            if (await (0, models_1.existsColumn)(context, 'messages', 'expiredAt')) {
-                await context.removeColumn('messages', 'expiredAt', { transaction });
-                await context.removeIndex('messages', 'messages_expiredAt_index', { transaction });
-            }
-            await transaction.commit();
+            await context.removeIndex('messages', 'messages_expiredAt_index');
         }
         catch (error) {
-            await transaction.rollback();
-            console.error('Migration rollback failed:', error);
-            throw error;
+            // Index may not exist
         }
     },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/models",
-  "version": "1.17.8-beta-20260113-015027-32a1cec4",
+  "version": "1.17.8-beta-20260115-054144-b207746c",
   "description": "Sequelize models for blocklet server and blocklet service",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "publishConfig": {
@@ -33,13 +33,13 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.17.8-beta-20260113-015027-32a1cec4",
-    "@abtnode/db-cache": "1.17.8-beta-20260113-015027-32a1cec4",
-    "@abtnode/logger": "1.17.8-beta-20260113-015027-32a1cec4",
-    "@abtnode/types": "1.17.8-beta-20260113-015027-32a1cec4",
-    "@abtnode/util": "1.17.8-beta-20260113-015027-32a1cec4",
-    "@arcblock/did": "^1.28.4",
-    "@arcblock/validator": "^1.28.4",
+    "@abtnode/constant": "1.17.8-beta-20260115-054144-b207746c",
+    "@abtnode/db-cache": "1.17.8-beta-20260115-054144-b207746c",
+    "@abtnode/logger": "1.17.8-beta-20260115-054144-b207746c",
+    "@abtnode/types": "1.17.8-beta-20260115-054144-b207746c",
+    "@abtnode/util": "1.17.8-beta-20260115-054144-b207746c",
+    "@arcblock/did": "^1.28.5",
+    "@arcblock/validator": "^1.28.5",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isempty": "^4.4.0",
     "pg": "^8.16.3",
@@ -57,5 +57,5 @@
     "@typescript/native-preview": "^7.0.0-dev.20251230.1"
   },
   "resolutions": {},
-  "gitHead": "a2bdf6146c5c94d7348fc87d5ebd2e95e548df07"
+  "gitHead": "41ed680ba394b4a0fb1db898b6e64f6cfee4ac5c"
 }