@abtnode/models 1.16.19-beta-e93c5bf3 → 1.16.19-beta-e6aac665

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/models",
-  "version": "1.16.19-beta-e93c5bf3",
+  "version": "1.16.19-beta-e6aac665",
   "description": "Sequelize models for blocklet server and blocklet service",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "publishConfig": {
@@ -32,9 +32,9 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/logger": "1.16.19-beta-e93c5bf3",
-    "@abtnode/types": "1.16.19-beta-e93c5bf3",
-    "@blocklet/constant": "1.16.19-beta-e93c5bf3",
+    "@abtnode/logger": "1.16.19-beta-e6aac665",
+    "@abtnode/types": "1.16.19-beta-e6aac665",
+    "@blocklet/constant": "1.16.19-beta-e6aac665",
     "@nedb/core": "^2.1.5",
     "lodash.clonedeep": "^4.5.0",
     "lodash.get": "^4.4.2",
@@ -55,5 +55,5 @@
     "typescript": "^5.0.4"
   },
   "resolutions": {},
-  "gitHead": "c98ddc97776f05c267398b18010710afd7082409"
+  "gitHead": "09b0172831521ef73f7879940b977c2696b5b247"
 }