@abtnode/models 1.16.8-next-199ae4cb → 1.16.8-next-bcc85536

package/lib/migrate.js

@@ -11,7 +11,12 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const core_1 = require("@nedb/core");
 const umzug_1 = require("umzug");
+const logger_1 = __importDefault(require("@abtnode/logger"));
+// @ts-ignore
+const user_1 = require("@abtnode/util/lib/user"); // eslint-disable-line
 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';
 async function doSchemaMigration(dbFile, group) {
     const sequelize = (0, models_1.createSequelize)(dbFile);
@@ -22,14 +27,18 @@ async function doSchemaMigration(dbFile, group) {
         migrations: { glob: [`migrations/${group}/*.${MIGRATION_SCRIPT_EXTENSION}`, { cwd: __dirname }] },
         context: sequelize.getQueryInterface(),
         storage: new umzug_1.SequelizeStorage({ sequelize }),
-        logger: process.env.NODE_ENV === 'test' ? undefined : console,
+        logger,
     });
     return umzug.up();
 }
 exports.doSchemaMigration = doSchemaMigration;
-async function doDataMigration({ srcDir, dbFile, mapping, models, printInfo = console.info, // eslint-disable-line no-console
-printError = console.error, printSuccess = console.info, // eslint-disable-line no-console
+async function doDataMigration({ srcDir, dbFile, mapping, models, printInfo = logger.info, // eslint-disable-line no-console
+printError = logger.error, printSuccess = logger.info, // eslint-disable-line no-console
  }) {
+    if ((0, fs_1.existsSync)(srcDir) === false) {
+        printError(`Can not scan srcDir ${srcDir}`);
+        return;
+    }
     const sequelize = (0, models_1.createSequelize)(dbFile);
     Object.values(mapping).forEach((x) => {
         if (models[x]) {
@@ -43,6 +52,7 @@ printError = console.error, printSuccess = console.info, // eslint-disable-line
         }
     });
     const files = (0, fs_1.readdirSync)(srcDir).filter((file) => file.endsWith('.db'));
+    const dataDir = (0, util_1.getAvatarDir)(srcDir);
     for (const file of files) {
         const tableName = file.slice(0, -3);
         const modelName = mapping[tableName];
@@ -74,6 +84,11 @@ printError = console.error, printSuccess = console.info, // eslint-disable-line
                 if (modelName === 'User') {
                     // rename fields
                     newData.sourceProvider = newData.sourceProvider || (0, lodash_get_1.default)(newData, 'extraConfigs.sourceProvider') || 'wallet';
+                    // extra avatar
+                    if (doc.avatar && doc.avatar.startsWith('data:image')) {
+                        newData.avatar = await (0, user_1.extractUserAvatar)(doc.avatar, { dataDir });
+                        printInfo('Convert avatar for user', doc.did, newData.avatar);
+                    }
                     // split fields
                     const passports = (newData.passports || []).filter((p) => p.id);
                     const connectedAccounts = (0, lodash_get_1.default)(newData, 'extraConfigs.connectedAccounts') ||

package/lib/migrations/blocklet/20230522000000-genesis.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const up = async ({ context }) => {
+    await context.addIndex('users', ['approved']);
+    await context.addIndex('users', ['fullName']);
+    await context.addIndex('users', ['email']);
+    await context.addIndex('connected_accounts', ['userDid']);
+    await context.addIndex('passports', ['userDid']);
+    await context.addIndex('passports', ['name', 'status', 'userDid']);
+    await context.addIndex('permissions', ['name']);
+    await context.addIndex('permissions', ['type']);
+    await context.addIndex('sessions', ['type']);
+    await context.addIndex('sessions', ['key']);
+};
+exports.up = up;
+// eslint-disable-next-line
+const down = async ({ context }) => { };
+exports.down = down;

package/lib/migrations/server/20230422000000-genesis.js

@@ -6,6 +6,7 @@ const models = (0, models_1.getServerModels)();
 const up = async ({ context }) => {
     await context.createTable('access_keys', models.AccessKey.GENESIS_ATTRIBUTES);
     await context.createTable('audit_logs', models.AuditLog.GENESIS_ATTRIBUTES);
+    await context.createTable('backups', models.Backup.GENESIS_ATTRIBUTES);
     await context.createTable('blocklet_extras', models.BlockletExtra.GENESIS_ATTRIBUTES);
     await context.createTable('blocklets', models.Blocklet.GENESIS_ATTRIBUTES);
     await context.createTable('caches', models.Cache.GENESIS_ATTRIBUTES);
@@ -20,7 +21,6 @@ const up = async ({ context }) => {
     await context.createTable('passports', models.Passport.GENESIS_ATTRIBUTES);
     await context.createTable('connected_accounts', models.ConnectedAccount.GENESIS_ATTRIBUTES);
     await context.createTable('webhooks', models.WebHook.GENESIS_ATTRIBUTES);
-    await context.createTable('backups', models.Backup.GENESIS_ATTRIBUTES);
 };
 exports.up = up;
 const down = async ({ context }) => {

package/lib/migrations/server/20230522000000-genesis.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const up = async ({ context }) => {
+    await context.addIndex('audit_logs', ['scope', 'category']);
+    await context.addIndex('audit_logs', ['scope', 'actor']);
+    await context.addIndex('audit_logs', ['category']);
+    await context.addIndex('backups', ['appPid']);
+    await context.addIndex('blocklets', ['appDid']);
+    await context.addIndex('blocklets', ['appPid']);
+    await context.addIndex('jobs', ['queue']);
+    await context.addIndex('notifications', ['sender']);
+    await context.addIndex('notifications', ['receiver']);
+    await context.addIndex('users', ['approved']);
+    await context.addIndex('users', ['fullName']);
+    await context.addIndex('users', ['email']);
+    await context.addIndex('connected_accounts', ['userDid']);
+    await context.addIndex('passports', ['userDid']);
+    await context.addIndex('passports', ['name', 'status', 'userDid']);
+    await context.addIndex('permissions', ['name']);
+    await context.addIndex('permissions', ['type']);
+    await context.addIndex('sessions', ['type']);
+    await context.addIndex('sessions', ['key']);
+};
+exports.up = up;
+// eslint-disable-next-line
+const down = async ({ context }) => { };
+exports.down = down;

package/lib/migrations/service/20230522000000-genesis.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const up = async ({ context }) => {
+    await context.addIndex('messages', ['did']);
+};
+exports.up = up;
+// eslint-disable-next-line
+const down = async ({ context }) => { };
+exports.down = down;

package/lib/models/audit-log.js

@@ -13,7 +13,7 @@ function createAuditLogModel() {
                     sequelize,
                     modelName: 'AuditLog',
                     tableName: 'audit_logs',
-                    indexes: [{ fields: ['scope', 'category', 'id'] }, { fields: ['scope', 'actor', 'id'] }],
+                    indexes: [{ fields: ['scope', 'category'] }, { fields: ['scope', 'actor'] }, { fields: ['category'] }],
                     timestamps: true,
                 });
             }

package/lib/models/backup.js

@@ -13,7 +13,7 @@ function createBackupModel() {
                     sequelize,
                     modelName: 'Backup',
                     tableName: 'backups',
-                    indexes: [{ fields: ['appPid', 'id'] }],
+                    indexes: [{ fields: ['appPid'] }],
                     timestamps: true,
                 });
             }

package/lib/models/blocklet.js

@@ -11,7 +11,7 @@ function createBlockletModel() {
                     sequelize,
                     modelName: 'Blocklet',
                     tableName: 'blocklets',
-                    indexes: [{ fields: ['appDid', 'id'] }, { fields: ['appPid', 'id'] }],
+                    indexes: [{ fields: ['appDid'] }, { fields: ['appPid'] }],
                     timestamps: true,
                 });
             }

package/lib/models/connected-account.js

@@ -12,7 +12,7 @@ function createConnectedAccountModel() {
                     sequelize,
                     modelName: 'ConnectedAccount',
                     tableName: 'connected_accounts',
-                    indexes: [{ fields: ['userDid', 'did'] }],
+                    indexes: [{ fields: ['userDid'] }],
                     timestamps: false,
                 });
             }

package/lib/models/http-challenge.js

@@ -11,7 +11,6 @@ function createHttpChallengeModel() {
                     ...this.GENESIS_ATTRIBUTES,
                 }, {
                     sequelize,
-                    indexes: [{ fields: ['key', 'id'] }],
                     modelName: 'HttpChallenge',
                     tableName: 'http_challenges',
                     timestamps: true,

package/lib/models/job.js

@@ -12,7 +12,7 @@ function createJobModel() {
                     ...this.GENESIS_ATTRIBUTES,
                 }, {
                     sequelize,
-                    indexes: [{ fields: ['queue', 'id'] }],
+                    indexes: [{ fields: ['queue'] }],
                     modelName: 'Job',
                     tableName: 'jobs',
                     timestamps: true,

package/lib/models/message.js

@@ -13,7 +13,7 @@ function createMessageModel() {
                 }, {
                     sequelize,
                     modelName: 'Message',
-                    indexes: [{ fields: ['did', 'id'] }],
+                    indexes: [{ fields: ['did'] }],
                     tableName: 'messages',
                     timestamps: true,
                 });

package/lib/models/notification.js

@@ -12,7 +12,7 @@ function createNotificationModel() {
                 }, {
                     sequelize,
                     modelName: 'Notification',
-                    indexes: [{ fields: ['sender', 'id'] }, { fields: ['receiver', 'id'] }],
+                    indexes: [{ fields: ['sender'] }, { fields: ['receiver'] }],
                     tableName: 'notifications',
                     timestamps: true,
                 });

package/lib/models/passport.js

@@ -12,7 +12,7 @@ function createPassportModel() {
                     sequelize,
                     modelName: 'Passport',
                     tableName: 'passports',
-                    indexes: [{ fields: ['name', 'status', 'userDid'] }],
+                    indexes: [{ fields: ['name', 'status', 'userDid'] }, { fields: ['userDid'] }],
                     timestamps: false,
                 });
             }

package/lib/models/rbac.js

@@ -11,7 +11,7 @@ function createRbacModel() {
                     ...this.GENESIS_ATTRIBUTES,
                 }, {
                     sequelize,
-                    indexes: [{ fields: ['name', 'id'] }],
+                    indexes: [{ fields: ['name'] }],
                     modelName: 'Rbac',
                     tableName: 'permissions',
                     timestamps: true,

package/lib/models/session.js

@@ -12,7 +12,7 @@ function createSessionModel() {
                     ...this.GENESIS_ATTRIBUTES,
                 }, {
                     sequelize,
-                    indexes: [{ fields: ['type', 'id'] }, { fields: ['key', 'id'] }],
+                    indexes: [{ fields: ['type'] }, { fields: ['key'] }],
                     modelName: 'Session',
                     tableName: 'sessions',
                     timestamps: true,

package/lib/models/user.js

@@ -13,7 +13,7 @@ function createUserModel() {
                     modelName: 'User',
                     tableName: 'users',
                     timestamps: true,
-                    indexes: [{ fields: ['approved', 'did'] }, { fields: ['email', 'did'] }, { fields: ['fullName', 'did'] }],
+                    indexes: [{ fields: ['approved'] }, { fields: ['email'] }, { fields: ['fullName'] }],
                 });
             }
             static associate(models) {
@@ -46,8 +46,7 @@ function createUserModel() {
                 type: sequelize_1.DataTypes.STRING(128),
             },
             avatar: {
-                // FIXME: make this a shorter string?
-                type: sequelize_1.DataTypes.TEXT,
+                type: sequelize_1.DataTypes.STRING(128),
             },
             role: {
                 type: sequelize_1.DataTypes.STRING(64),

package/lib/types.d.ts

@@ -5,10 +5,6 @@ export type DynamicModel<T> = ModelDefined<T, T> & {
         [key: string]: any;
     };
 };
-export type QueryInterface = {
-    createTable: Function;
-    dropTable: Function;
-};
 export type UpdateOptions = {
     returnUpdatedDocs?: boolean;
 };

package/lib/util.d.ts

@@ -4,3 +4,4 @@ export declare function formatConditions(conditions: Record<string, any>): Inclu
 export declare function formatOrder(sort: Record<string, any>): Order;
 export declare function formatSelection(selection: Record<string, any>): string[];
 export declare function formatParams(params: FindOptions): FindOptions;
+export declare function getAvatarDir(srcDir: any): any;

package/lib/util.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatParams = exports.formatSelection = exports.formatOrder = exports.formatConditions = exports.generateId = void 0;
+exports.getAvatarDir = exports.formatParams = exports.formatSelection = exports.formatOrder = exports.formatConditions = exports.generateId = void 0;
 const uuid_1 = require("uuid");
+const path_1 = require("path");
 const sequelize_1 = require("sequelize");
 const lodash_isempty_1 = __importDefault(require("lodash.isempty"));
 function generateId() {
@@ -106,3 +107,7 @@ function formatParams(params) {
     return params;
 }
 exports.formatParams = formatParams;
+function getAvatarDir(srcDir) {
+    return srcDir.endsWith('/core') ? (0, path_1.join)((0, path_1.dirname)(srcDir), 'data/_abtnode') : srcDir;
+}
+exports.getAvatarDir = getAvatarDir;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/models",
-  "version": "1.16.8-next-199ae4cb",
+  "version": "1.16.8-next-bcc85536",
   "description": "Sequelize models for blocklet server and blocklet service",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "publishConfig": {
@@ -32,7 +32,8 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/types": "1.16.8-next-199ae4cb",
+    "@abtnode/logger": "1.16.8-next-bcc85536",
+    "@abtnode/types": "1.16.8-next-bcc85536",
     "@nedb/core": "^2.1.5",
     "lodash.clonedeep": "^4.5.0",
     "lodash.get": "^4.4.2",
@@ -54,5 +55,5 @@
     "typescript": "^4.8.4"
   },
   "resolutions": {},
-  "gitHead": "a3c52c2929d25254f33a08eca0261fbf4dbc7b4c"
+  "gitHead": "27f3858f8138d08c68420a78f3cd4c9437e10170"
 }