@abtnode/models 1.16.11-beta-0ae58a71 → 1.16.11-beta-f9719c31

package/lib/migrate.js

@@ -18,6 +18,7 @@ const models_1 = require("./models");
 const util_1 = require("./util");
 const logger = (0, logger_1.default)('@abtnode/models:migration');
 const MIGRATION_SCRIPT_EXTENSION = process.env.MIGRATION_SCRIPT_EXTENSION || 'js';
+// eslint-disable-next-line require-await
 async function doSchemaMigration(dbFile, group) {
     const sequelize = (0, models_1.createSequelize)(dbFile);
     if (['server', 'blocklet', 'service', 'certificate-manager', 'connect'].includes(group) === false) {

package/lib/migrations/blocklet/20230605000000-cleanup.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const up = async ({ context }) => {
+    await context.bulkDelete('passports', { id: null });
+    await context.bulkDelete('connected_accounts', { did: null });
+};
+exports.up = up;
+const down = async () => {
+    // Do nothing
+};
+exports.down = down;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
 const sequelize_1 = require("sequelize");
+// Add missing fields for servers from launcher
 const up = async ({ context }) => {
     await context.addColumn('servers', 'launcher', { type: sequelize_1.DataTypes.JSON });
 };

package/lib/migrations/server/20230604000000-tokens.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const sequelize_1 = require("sequelize");
+// Add missing fields for paid blocklets
+const up = async ({ context }) => {
+    await context.addColumn('blocklets', 'tokens', { type: sequelize_1.DataTypes.JSON });
+};
+exports.up = up;
+const down = async ({ context }) => {
+    await context.removeColumn('blocklets', 'tokens');
+};
+exports.down = down;

package/lib/migrations/server/20230612000000-backup.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const sequelize_1 = require("sequelize");
+const up = async ({ context }) => {
+    await context.addColumn('backups', 'targetName', { type: sequelize_1.DataTypes.STRING(256), defaultValue: '' });
+};
+exports.up = up;
+const down = async ({ context }) => {
+    await context.removeColumn('backups', 'targetName');
+};
+exports.down = down;

package/lib/models/backup.js

@@ -9,12 +9,17 @@ function createBackupModel() {
             static initialize(sequelize) {
                 this.init({
                     ...this.GENESIS_ATTRIBUTES,
+                    targetName: {
+                        type: sequelize_1.DataTypes.STRING(256),
+                        defaultValue: '',
+                    },
                 }, {
                     sequelize,
                     modelName: 'Backup',
                     tableName: 'backups',
                     indexes: [{ fields: ['appPid'] }],
-                    timestamps: true,
+                    // note: 备份的过程中，updatedAt 不需要填充默认值
+                    timestamps: false,
                 });
             }
         },

package/lib/models/blocklet.d.ts

@@ -1,6 +1,7 @@
 import { TBlockletState } from '@abtnode/types';
 import { DynamicModel } from '../types';
-export type BlockletState = Omit<TBlockletState, 'port' | 'configs' | 'trustedFactories' | 'trustedPassports' | 'enablePassportIssuance' | 'dynamic' | 'mountPoint'> & {
+export type BlockletState = Omit<TBlockletState, 'port' | 'configs' | 'trustedFactories' | 'trustedPassports' | 'enablePassportIssuance' | 'dynamic' | 'mountPoint' | 'controller'> & {
     updatedAt: Date;
+    tokens: Record<string, any>;
 };
 export declare function createBlockletModel(): DynamicModel<BlockletState>;

package/lib/models/blocklet.js

@@ -7,7 +7,12 @@ function createBlockletModel() {
     var _a;
     return _a = class Blocklet extends sequelize_1.Model {
             static initialize(sequelize) {
-                this.init({ ...this.GENESIS_ATTRIBUTES }, {
+                this.init({
+                    ...this.GENESIS_ATTRIBUTES,
+                    tokens: {
+                        type: sequelize_1.DataTypes.JSON,
+                    },
+                }, {
                     sequelize,
                     modelName: 'Blocklet',
                     tableName: 'blocklets',
@@ -38,9 +43,6 @@ function createBlockletModel() {
             meta: {
                 type: sequelize_1.DataTypes.JSON,
             },
-            controller: {
-                type: sequelize_1.DataTypes.JSON,
-            },
             status: {
                 type: sequelize_1.DataTypes.INTEGER,
             },

package/lib/models/connected-account.js

@@ -27,6 +27,7 @@ function createConnectedAccountModel() {
             did: {
                 type: sequelize_1.DataTypes.STRING(40),
                 primaryKey: true,
+                allowNull: false,
             },
             pk: {
                 type: sequelize_1.DataTypes.STRING(256),
@@ -41,6 +42,7 @@ function createConnectedAccountModel() {
             },
             provider: {
                 type: sequelize_1.DataTypes.STRING(32),
+                allowNull: false,
             },
             id: {
                 type: sequelize_1.DataTypes.STRING(64),

package/lib/models/index.js

@@ -62,7 +62,8 @@ __exportStar(require("./connection"), exports);
 __exportStar(require("./backup"), exports);
 const instances = new Map();
 function createSequelize(dbPath, config = {
-    logging: !!process.env.DEBUG || ['production', 'test'].includes(process.env.NODE_ENV) === false,
+    logging: !process.env.DISABLE_SQLITE_LOG &&
+        (!!process.env.DEBUG || ['production', 'test'].includes(process.env.NODE_ENV) === false),
 }) {
     if (instances.has(dbPath)) {
         return instances.get(dbPath);

package/lib/models/passport.js

@@ -27,6 +27,7 @@ function createPassportModel() {
             id: {
                 type: sequelize_1.DataTypes.STRING(40),
                 primaryKey: true,
+                allowNull: false,
             },
             userDid: {
                 type: sequelize_1.DataTypes.STRING(40),

package/lib/states/base.js

@@ -8,6 +8,7 @@ const events_1 = __importDefault(require("events"));
 const sequelize_1 = require("sequelize");
 const lodash_clonedeep_1 = __importDefault(require("lodash.clonedeep"));
 const util_1 = require("../util");
+// eslint-disable-next-line import/prefer-default-export
 class BaseState extends events_1.default {
     constructor(model, config = {}) {
         super();
@@ -23,7 +24,7 @@ class BaseState extends events_1.default {
             }
         });
     }
-    async find(condition = {}, selection = {}, sort = {}) {
+    find(condition = {}, selection = {}, sort = {}) {
         const params = (0, util_1.formatParams)({
             attributes: (0, util_1.formatSelection)(selection),
             order: (0, util_1.formatOrder)(sort),
@@ -32,7 +33,7 @@ class BaseState extends events_1.default {
         });
         return this.model.findAll(params).then((x) => x.map((y) => y.toJSON()));
     }
-    async findOne(condition = {}, selection = {}, sort = {}) {
+    findOne(condition = {}, selection = {}, sort = {}) {
         const params = (0, util_1.formatParams)({
             attributes: (0, util_1.formatSelection)(selection),
             order: (0, util_1.formatOrder)(sort),
@@ -40,7 +41,7 @@ class BaseState extends events_1.default {
         });
         return this.model.findOne(params).then((x) => x?.toJSON());
     }
-    async count(condition = {}) {
+    count(condition = {}) {
         return this.model.count({ ...(0, util_1.formatConditions)(condition) });
     }
     async insert(doc) {
@@ -65,7 +66,7 @@ class BaseState extends events_1.default {
         const docs = options.returnUpdatedDocs ? await this.find(condition) : [];
         return [affectedRows, docs];
     }
-    async updateById(id, updates, options = {}) {
+    updateById(id, updates, options = {}) {
         return this.update({ id }, updates, options);
     }
     async upsert(condition, updates) {

package/lib/states/factory.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStateFactory = void 0;
+// eslint-disable-next-line import/prefer-default-export
 function createStateFactory(initializer, models) {
     const states = {};
     return new Proxy({}, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/models",
-  "version": "1.16.11-beta-0ae58a71",
+  "version": "1.16.11-beta-f9719c31",
   "description": "Sequelize models for blocklet server and blocklet service",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "publishConfig": {
@@ -32,8 +32,8 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/logger": "1.16.11-beta-0ae58a71",
-    "@abtnode/types": "1.16.11-beta-0ae58a71",
+    "@abtnode/logger": "1.16.11-beta-f9719c31",
+    "@abtnode/types": "1.16.11-beta-f9719c31",
     "@nedb/core": "^2.1.5",
     "lodash.clonedeep": "^4.5.0",
     "lodash.get": "^4.4.2",
@@ -44,7 +44,7 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@arcblock/eslint-config-ts": "^0.2.3",
+    "@arcblock/eslint-config-ts": "^0.2.4",
     "@types/jest": "^29.2.0",
     "@types/node": "^18.11.0",
     "@typescript-eslint/eslint-plugin": "^5.40.1",
@@ -54,5 +54,5 @@
     "typescript": "^5.0.4"
   },
   "resolutions": {},
-  "gitHead": "5d044a08b4399eb855563e670af7cbd0d3851e94"
+  "gitHead": "2d88c5df1a414e5b6a8d575984e1940de7573976"
 }