@abtnode/models 1.16.19-beta-340de95d → 1.16.19-beta-7b2db880

package/lib/migrate.d.ts

@@ -1,13 +1 @@
 export declare function doSchemaMigration(dbFile: string, group: string): Promise<import("umzug").MigrationMeta[]>;
-type DataMigrationArgs = {
-    srcDir: string;
-    dbFile: string;
-    mapping: Record<string, string>;
-    models: Record<string, any>;
-    printInfo?: Function;
-    printError?: Function;
-    printSuccess?: Function;
-};
-export declare function doDataMigration({ srcDir, dbFile, mapping, models, printInfo, // eslint-disable-line no-console
-printError, printSuccess, }: DataMigrationArgs): Promise<void>;
-export {};

package/lib/migrate.js

@@ -3,20 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doDataMigration = exports.doSchemaMigration = void 0;
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-continue */
-const lodash_get_1 = __importDefault(require("lodash.get"));
-const fs_1 = require("fs");
-const path_1 = require("path");
-const core_1 = require("@nedb/core");
+exports.doSchemaMigration = void 0;
+/* eslint-disable import/prefer-default-export */
 const umzug_1 = require("umzug");
 const logger_1 = __importDefault(require("@abtnode/logger"));
-const constant_1 = require("@blocklet/constant");
-// @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';
 // eslint-disable-next-line require-await
@@ -35,112 +26,3 @@ async function doSchemaMigration(dbFile, group) {
     return umzug.up();
 }
 exports.doSchemaMigration = doSchemaMigration;
-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]) {
-            models[x].initialize(sequelize);
-        }
-    });
-    // Init hidden models
-    ['Passport', 'ConnectedAccount'].forEach((x) => {
-        if (models[x]) {
-            models[x].initialize(sequelize);
-        }
-    });
-    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];
-        if (!modelName) {
-            printInfo(`No mapping found for NeDB file: ${file}. Skipping.`);
-            continue;
-        }
-        const model = models[modelName];
-        if (!model) {
-            printInfo(`No Sequelize model found for NeDB file: ${file}. Skipping.`);
-            continue;
-        }
-        const filename = (0, path_1.join)(srcDir, file);
-        try {
-            const db = new core_1.DataStore({ filename, autoload: true });
-            const docs = await db.find({});
-            // Insert data into Sequelize database
-            for (const doc of docs) {
-                const newData = {
-                    ...doc,
-                    id: doc._id,
-                    createdAt: new Date(doc.createdAt || doc.created),
-                    updatedAt: new Date(doc.updatedAt || doc.updated),
-                };
-                if (!newData.id) {
-                    delete newData.id;
-                }
-                // Hack: 1-time-use data split to multiple tables
-                if (modelName === 'User') {
-                    // rename fields
-                    newData.sourceProvider =
-                        newData.sourceProvider || (0, lodash_get_1.default)(newData, 'extraConfigs.sourceProvider') || constant_1.LOGIN_PROVIDER.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') ||
-                        [
-                            {
-                                provider: constant_1.LOGIN_PROVIDER.WALLET,
-                                did: newData.did,
-                                pk: newData.pk,
-                                lastLoginAt: newData.lastLoginAt,
-                                firstLoginAt: newData.firstLoginAt,
-                            },
-                        ].filter((a) => a.provider && a.did);
-                    try {
-                        await model.create(newData);
-                        await Promise.all(passports.map((p) => models.Passport.create({ ...p, userDid: newData.did })));
-                        await Promise.all(connectedAccounts.map((a) => models.ConnectedAccount.create({ ...a, userDid: newData.did })));
-                        printInfo(`Import user into sqlite: ${newData.did}`);
-                    }
-                    catch (err) {
-                        printError('Error importing user into sqlite:', err, doc);
-                    }
-                }
-                else {
-                    // Hack: 1-time-use data transformation
-                    if (modelName === 'Site') {
-                        if (Array.isArray(doc.domainAliases)) {
-                            newData.domainAliases = doc.domainAliases.map((x) => {
-                                if (typeof x === 'string') {
-                                    return { value: x, isProtected: false };
-                                }
-                                return x;
-                            });
-                        }
-                    }
-                    try {
-                        await model.create(newData);
-                        printInfo(`Import data into sqlite ${modelName}:`, doc._id);
-                    }
-                    catch (err) {
-                        printError('Error importing data into sqlite:', err);
-                    }
-                }
-            }
-            printSuccess(`Migrated data from nedb ${filename} to sqlite ${modelName}.`);
-        }
-        catch (err) {
-            printError(`Error reading data from NeDB file ${filename}: ${err.message}`);
-        }
-    }
-}
-exports.doDataMigration = doDataMigration;

package/lib/migrations/blocklet/{20231012000000-user-session copy.js → 20231012000000-user-session.js}

@@ -4,7 +4,6 @@ exports.down = exports.up = void 0;
 const models_1 = require("../../models");
 const models = (0, models_1.getBlockletModels)();
 const up = async ({ context }) => {
-    await context.dropTable('user_sessions');
     await context.createTable('user_sessions', models.UserSession.GENESIS_ATTRIBUTES);
 };
 exports.up = up;

package/lib/migrations/blocklet/20231031000000-project.js

@@ -4,10 +4,14 @@ exports.down = exports.up = void 0;
 const sequelize_1 = require("sequelize");
 const up = async ({ context }) => {
     try {
-        await context.addColumn('projects', 'componentDid', {
-            type: sequelize_1.DataTypes.STRING(40),
-            allowNull: true,
-        });
+        const queryInterface = context;
+        const tableDescriptions = await queryInterface.describeTable('projects');
+        if (!tableDescriptions?.componentDid) {
+            await queryInterface.addColumn('projects', 'componentDid', {
+                type: sequelize_1.DataTypes.STRING(40),
+                allowNull: true,
+            });
+        }
     }
     catch (err) {
         if (process.env.NODE_ENV === 'test' && err.message.startsWith('SQLITE_ERROR: duplicate column name')) {

package/lib/migrations/connect/20231115000000-v2.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const models_1 = require("../../models");
+const models = (0, models_1.getConnectModels)();
+const up = async ({ context }) => {
+    await context.createTable('connections_v2', models.ConnectionV2.GENESIS_ATTRIBUTES);
+};
+exports.up = up;
+const down = async ({ context }) => {
+    await context.dropTable('connections_v2');
+};
+exports.down = down;

package/lib/models/connection-v2.d.ts

@@ -0,0 +1,38 @@
+import { DynamicModel } from '../types';
+export type ConnectionV2State = {
+    appInfo: any;
+    approveResults: any[];
+    approveUrl?: string;
+    authUrl: string;
+    autoConnect: boolean;
+    challenge: string;
+    connectUrl?: string;
+    currentConnected?: {
+        didwallet: any;
+        userDid: string;
+        userPk: string;
+    } | null;
+    currentStep: number;
+    error?: string;
+    forceConnected: boolean;
+    onlyConnect: boolean;
+    previousConnected?: {
+        didwallet: 'ios' | 'android' | 'web' | '';
+        userDid: string;
+        userPk: string;
+    } | null;
+    requestedClaims: any;
+    responseClaims: any;
+    sessionId: string;
+    status: string;
+    strategy: string | 'default' | 'smart';
+    timeout: {
+        app: number;
+        relay: number;
+        wallet: number;
+    };
+    updaterPk: string;
+    withinSession: boolean;
+    [key: string]: any;
+};
+export declare function createConnectionV2Model(): DynamicModel<ConnectionV2State>;

package/lib/models/connection-v2.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createConnectionV2Model = void 0;
+// Storage for did-connect sessions
+const sequelize_1 = require("sequelize");
+function createConnectionV2Model() {
+    var _a;
+    return _a = class ConnectionV2 extends sequelize_1.Model {
+            static initialize(sequelize) {
+                this.init({
+                    ...this.GENESIS_ATTRIBUTES,
+                }, {
+                    sequelize,
+                    modelName: 'ConnectionV2',
+                    tableName: 'connections_v2',
+                    timestamps: true,
+                });
+            }
+        },
+        _a.GENESIS_ATTRIBUTES = {
+            appInfo: {
+                type: sequelize_1.DataTypes.JSON,
+            },
+            approvedResults: {
+                type: sequelize_1.DataTypes.JSON,
+            },
+            approveUrl: {
+                type: sequelize_1.DataTypes.TEXT,
+                defaultValue: '',
+            },
+            authUrl: {
+                type: sequelize_1.DataTypes.TEXT,
+                defaultValue: '',
+            },
+            autoConnect: {
+                type: sequelize_1.DataTypes.BOOLEAN,
+                default: false,
+            },
+            challenge: {
+                type: sequelize_1.DataTypes.STRING(32),
+            },
+            connectUrl: {
+                type: sequelize_1.DataTypes.TEXT,
+                defaultValue: '',
+            },
+            currentConnected: {
+                type: sequelize_1.DataTypes.JSON,
+            },
+            currentStep: {
+                type: sequelize_1.DataTypes.INTEGER,
+            },
+            error: {
+                type: sequelize_1.DataTypes.TEXT,
+                defaultValue: '',
+            },
+            forceConnected: {
+                type: sequelize_1.DataTypes.BOOLEAN,
+                default: false,
+            },
+            onlyConnect: {
+                type: sequelize_1.DataTypes.BOOLEAN,
+                default: false,
+            },
+            previousConnected: {
+                type: sequelize_1.DataTypes.JSON,
+            },
+            requestedClaims: {
+                type: sequelize_1.DataTypes.JSON,
+            },
+            responseClaims: {
+                type: sequelize_1.DataTypes.JSON,
+            },
+            sessionId: {
+                type: sequelize_1.DataTypes.STRING(40),
+                primaryKey: true,
+            },
+            status: {
+                type: sequelize_1.DataTypes.STRING(16),
+                index: true,
+            },
+            strategy: {
+                type: sequelize_1.DataTypes.STRING(16),
+            },
+            timeout: {
+                type: sequelize_1.DataTypes.JSON,
+            },
+            updaterPk: {
+                type: sequelize_1.DataTypes.STRING(255),
+            },
+            withinSession: {
+                type: sequelize_1.DataTypes.BOOLEAN,
+                default: false,
+            },
+            __extra: {
+                type: sequelize_1.DataTypes.JSON,
+                defaultValue: {},
+            },
+            createdAt: {
+                type: sequelize_1.DataTypes.DATE,
+                defaultValue: sequelize_1.DataTypes.NOW,
+                index: true,
+            },
+            updatedAt: {
+                type: sequelize_1.DataTypes.DATE,
+                defaultValue: sequelize_1.DataTypes.NOW,
+                index: true,
+            },
+        },
+        _a;
+}
+exports.createConnectionV2Model = createConnectionV2Model;

package/lib/models/index.d.ts

@@ -21,6 +21,7 @@ export * from './server';
 export * from './site';
 export * from './webhook';
 export * from './connection';
+export * from './connection-v2';
 export * from './backup';
 export * from './traffic-insight';
 export * from './runtime-insight';
@@ -75,5 +76,6 @@ export declare function getServerModels(): {
 };
 export declare function getConnectModels(): {
     Connection: import("../types").DynamicModel<import("./connection").ConnectionState>;
+    ConnectionV2: import("../types").DynamicModel<import("./connection-v2").ConnectionV2State>;
 };
 export declare function setupModels(models: any, sequelize: Sequelize): void;

package/lib/models/index.js

@@ -45,6 +45,7 @@ const tagging_1 = require("./tagging");
 const project_1 = require("./project");
 const release_1 = require("./release");
 const user_session_1 = require("./user-session");
+const connection_v2_1 = require("./connection-v2");
 __exportStar(require("./message"), exports);
 __exportStar(require("./account"), exports);
 __exportStar(require("./certificate"), exports);
@@ -67,6 +68,7 @@ __exportStar(require("./server"), exports);
 __exportStar(require("./site"), exports);
 __exportStar(require("./webhook"), exports);
 __exportStar(require("./connection"), exports);
+__exportStar(require("./connection-v2"), exports);
 __exportStar(require("./backup"), exports);
 __exportStar(require("./traffic-insight"), exports);
 __exportStar(require("./runtime-insight"), exports);
@@ -162,6 +164,7 @@ exports.getServerModels = getServerModels;
 function getConnectModels() {
     const models = {
         Connection: (0, connection_1.createConnectionModel)(),
+        ConnectionV2: (0, connection_v2_1.createConnectionV2Model)(),
     };
     return models;
 }

package/lib/types.d.ts

@@ -21,11 +21,6 @@ export type PagingOptions = {
     pageSize?: number;
     page?: number;
 };
-export type ApplyBasicQueryCasting<T> = T | T[] | (T extends (infer U)[] ? U : any) | any;
-export type Condition<T> = ApplyBasicQueryCasting<T> | QuerySelector<ApplyBasicQueryCasting<T>>;
-export type ConditionOptions<T> = {
-    [P in keyof T]?: Condition<T[P]>;
-} & RootQuerySelector<T>;
 export type QuerySelector<T> = {
     $lt?: T;
     $lte?: T;
@@ -37,6 +32,11 @@ export type QuerySelector<T> = {
     $exists?: boolean;
     $regex?: T extends string ? RegExp | string : never;
 };
+export type ApplyBasicQueryCasting<T> = T | T[] | (T extends (infer U)[] ? U : any) | any;
+export type Condition<T> = ApplyBasicQueryCasting<T> | QuerySelector<ApplyBasicQueryCasting<T>>;
+export type ConditionOptions<T> = {
+    [P in keyof T]?: Condition<T[P]>;
+} & RootQuerySelector<T>;
 export type RootQuerySelector<T> = {
     $and?: Array<ConditionOptions<T>>;
     $or?: Array<ConditionOptions<T>>;

package/lib/util.d.ts

@@ -5,4 +5,3 @@ 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,9 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAvatarDir = exports.formatParams = exports.formatSelection = exports.formatOrder = exports.formatConditions = exports.generateRandomString = exports.generateId = void 0;
+exports.formatParams = exports.formatSelection = exports.formatOrder = exports.formatConditions = exports.generateRandomString = 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() {
@@ -116,8 +115,3 @@ function formatParams(params) {
     return params;
 }
 exports.formatParams = formatParams;
-// eslint-disable-next-line import/prefer-default-export
-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.19-beta-340de95d",
+  "version": "1.16.19-beta-7b2db880",
   "description": "Sequelize models for blocklet server and blocklet service",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "publishConfig": {
@@ -32,16 +32,13 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/logger": "1.16.19-beta-340de95d",
-    "@abtnode/types": "1.16.19-beta-340de95d",
-    "@blocklet/constant": "1.16.19-beta-340de95d",
-    "@nedb/core": "^2.1.5",
+    "@abtnode/logger": "1.16.19-beta-7b2db880",
+    "@abtnode/types": "1.16.19-beta-7b2db880",
     "lodash.clonedeep": "^4.5.0",
-    "lodash.get": "^4.4.2",
     "lodash.isempty": "^4.4.0",
-    "sequelize": "^6.31.0",
+    "sequelize": "^6.35.0",
     "sqlite3": "^5.1.6",
-    "umzug": "3.2.1",
+    "umzug": "3.4.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
@@ -55,5 +52,5 @@
     "typescript": "^5.0.4"
   },
   "resolutions": {},
-  "gitHead": "cc7afa5fe28ef4b0304f97b7e0b9ad8194427ae7"
+  "gitHead": "598b576b97dd7accbfa1bb509b75e423ad27e5e2"
 }