anote-server-libs 0.9.5 → 0.9.6

package/models/repository/BaseModelRepository.js

@@ -23,34 +23,34 @@ class BaseModelRepository {
         this.Migration = new Migration_1.MigrationRepository(db, dbMssql, logger);
         this.ApiCall = new ApiCall_1.ApiCallRepository(db, dbMssql, logger);
     }
-    migrate(migrationsPath, callback, onlyAboveOrEquals = 0) {
+    migrate(migrationsPath, callback, onlyAboveOrEquals = 0, onlyBelow) {
         (this.db ? Promise.all([
-            this.db.query(`CREATE TABLE IF NOT EXISTS migration (
-id integer PRIMARY KEY,
-hash text NOT NULL,
-"sqlUp" text NOT NULL,
-"sqlDown" text NOT NULL,
-state integer NOT NULL,
-skip boolean NOT NULL
+            this.db.query(`CREATE TABLE IF NOT EXISTS migration (
+id integer PRIMARY KEY,
+hash text NOT NULL,
+"sqlUp" text NOT NULL,
+"sqlDown" text NOT NULL,
+state integer NOT NULL,
+skip boolean NOT NULL
 )`),
             this.db.query(`ALTER TABLE migration ADD COLUMN IF NOT EXISTS skip BOOLEAN NOT NULL DEFAULT FALSE`)
         ]) : Promise.all([
-            this.dbMssql.query(`IF NOT EXISTS (SELECT * FROM sysobjects WHERE name=\'migration\' AND xtype=\'U\') CREATE TABLE migration (
-id int PRIMARY KEY,
-hash text NOT NULL,
-"sqlUp" text NOT NULL,
-"sqlDown" text NOT NULL,
-state int NOT NULL,
-skip bit NOT NULL
+            this.dbMssql.query(`IF NOT EXISTS (SELECT * FROM sysobjects WHERE name=\'migration\' AND xtype=\'U\') CREATE TABLE migration (
+id int PRIMARY KEY,
+hash text NOT NULL,
+"sqlUp" text NOT NULL,
+"sqlDown" text NOT NULL,
+state int NOT NULL,
+skip bit NOT NULL
 )`),
-            this.dbMssql.query(`IF NOT EXISTS (
-    SELECT * 
-    FROM INFORMATION_SCHEMA.COLUMNS 
-    WHERE TABLE_NAME = 'migration' 
-      AND COLUMN_NAME = 'skip'
-)
-BEGIN
-    ALTER TABLE migration ADD skip BIT NOT NULL DEFAULT 0;
+            this.dbMssql.query(`IF NOT EXISTS (
+    SELECT * 
+    FROM INFORMATION_SCHEMA.COLUMNS 
+    WHERE TABLE_NAME = 'migration' 
+      AND COLUMN_NAME = 'skip'
+)
+BEGIN
+    ALTER TABLE migration ADD skip BIT NOT NULL DEFAULT 0;
 END`)
         ])).then(() => {
             this.Migration.getAllBy('id').then((migrations) => {
@@ -70,16 +70,22 @@ END`)
                             hash: crypto.createHash('sha256').update(content).digest('hex')
                         };
                     });
-                    if (migrationsAvailable.length === 0
-                        || migrationsAvailable.length
-                            !== migrationsAvailable[migrationsAvailable.length - 1].id)
+                    migrations = migrations.filter(m => m.id >= onlyAboveOrEquals);
+                    if (onlyBelow)
+                        migrations = migrations.filter(m => m.id < onlyBelow);
+                    if (migrationsAvailable.length === 0 && migrations.length === 0)
                         process.exit(5);
-                    let highestCommon = onlyAboveOrEquals;
-                    while (highestCommon < migrations.length && highestCommon < migrationsAvailable.length
+                    if (migrationsAvailable.length && migrationsAvailable.length !== (migrationsAvailable[migrationsAvailable.length - 1].id - migrationsAvailable[0].id + 1))
+                        process.exit(5);
+                    let highestCommon = 0;
+                    while (highestCommon < migrations.length
+                        && highestCommon < migrationsAvailable.length
+                        && migrations[highestCommon]
+                        && migrationsAvailable[highestCommon]
                         && migrations[highestCommon].hash === migrationsAvailable[highestCommon].hash)
                         highestCommon++;
-                    this.applyDownUntil(migrations, migrations.length, highestCommon).then(highestCommon => {
-                        this.applyUpUntil(migrationsAvailable, Math.min(highestCommon, migrations.length), migrationsAvailable.length).then(callback, process.exit);
+                    this.applyDownUntil(migrations, migrations.length, highestCommon).then(appliedId => {
+                        this.applyUpUntil(migrationsAvailable, Math.min(appliedId, migrations.length), migrationsAvailable.length).then(callback, process.exit);
                     }, process.exit);
                 });
             }, () => process.exit(3));
@@ -91,8 +97,10 @@ END`)
         return Promise.all(tables.map(t => client.request().query('SELECT id FROM ' + t.table + ' WITH (UPDLOCK)')));
     }
     applyUpUntil(migrations, current, until) {
-        if (current < until)
+        if (current < until) {
+            console.log('Applying migration ' + migrations[current].id);
             return this.applyUp(migrations[current]).then(() => this.applyUpUntil(migrations, current + 1, until));
+        }
         return Promise.resolve();
     }
     applyUp(migration) {
@@ -126,6 +134,7 @@ END`)
     applyDownUntil(migrations, current, until) {
         if (current > until && !migrations[current - 1]?.skip) {
             current--;
+            console.log('Reverting migration ' + migrations[current].id);
             return this.applyDown(migrations[current]).then(() => this.applyDownUntil(migrations, current, until));
         }
         return Promise.resolve(current);

package/models/repository/BaseModelRepository.ts

@@ -1,168 +1,175 @@
-import * as crypto from 'crypto';
-import * as fs from 'fs';
-import * as Memcached from 'memcached';
-import {ConnectionPool, Transaction} from 'mssql';
-import {ClientBase, Pool} from 'pg';
-import {Logger} from 'winston';
-import { ApiCallRepository } from '../ApiCall';
-import { Migration, MigrationRepository } from '../Migration';
-import {ModelRepr} from './ModelDao';
-
-export class BaseModelRepository {
-    Migration: MigrationRepository;
-    ApiCall: ApiCallRepository;
-
-    constructor(public db: Pool, public dbSpare: Pool, public dbMssql: ConnectionPool, public logger: Logger, public cache: Memcached) {
-        if(db && dbSpare) {
-            const dbQuery = db.query.bind(db);
-            db.query = (function(text: any, values: any, cb: any) {
-                if((this.idleCount + this.waitingCount) >= this.totalCount && this.totalCount === this.options.max)
-                    return dbSpare.query(text, values, cb);
-                return dbQuery(text, values, cb);
-            }).bind(db);
-        }
-        this.Migration = new MigrationRepository(db, dbMssql, logger);
-        this.ApiCall = new ApiCallRepository(db, dbMssql, logger);
-    }
-
-    // TODO: alter table migration if exists without ok column
-    migrate(migrationsPath: string, callback: (() => void), onlyAboveOrEquals = 0) {
-        (this.db ? Promise.all([
-        this.db.query(`CREATE TABLE IF NOT EXISTS migration (
-id integer PRIMARY KEY,
-hash text NOT NULL,
-"sqlUp" text NOT NULL,
-"sqlDown" text NOT NULL,
-state integer NOT NULL,
-skip boolean NOT NULL
-)`),
-        this.db.query(`ALTER TABLE migration ADD COLUMN IF NOT EXISTS skip BOOLEAN NOT NULL DEFAULT FALSE`)]) : Promise.all([
-        this.dbMssql.query(`IF NOT EXISTS (SELECT * FROM sysobjects WHERE name=\'migration\' AND xtype=\'U\') CREATE TABLE migration (
-id int PRIMARY KEY,
-hash text NOT NULL,
-"sqlUp" text NOT NULL,
-"sqlDown" text NOT NULL,
-state int NOT NULL,
-skip bit NOT NULL
-)`),
-        this.dbMssql.query(`IF NOT EXISTS (
-    SELECT * 
-    FROM INFORMATION_SCHEMA.COLUMNS 
-    WHERE TABLE_NAME = 'migration' 
-      AND COLUMN_NAME = 'skip'
-)
-BEGIN
-    ALTER TABLE migration ADD skip BIT NOT NULL DEFAULT 0;
-END`)])).then(() => {
-            this.Migration.getAllBy('id').then((migrations: Migration[]) => {
-                if(migrations.find(migration => migration.state !== 0)) process.exit(4); // Have to fix manually
-                // Read the new ones
-                fs.readdir(migrationsPath, (_, files) => {
-                    const migrationsAvailable = files
-                        .filter(file => /[0-9]+\.sql/.test(file))
-                        .map(file => parseInt(file.split('.sql')[0], 10))
-                        .filter(file => file > 0)
-                        .sort((a, b) => a - b)
-                        .map(file => {
-                            const content = fs.readFileSync(migrationsPath + file + '.sql', 'utf-8');
-                            return {
-                                id: file,
-                                content: content,
-                                hash: crypto.createHash('sha256').update(content).digest('hex')
-                            };
-                        });
-                    if(migrationsAvailable.length === 0
-                        || migrationsAvailable.length
-                        !== migrationsAvailable[migrationsAvailable.length - 1].id) process.exit(5); // Did not use OK files
-                    let highestCommon = onlyAboveOrEquals;
-                    while(highestCommon < migrations.length && highestCommon < migrationsAvailable.length
-                    && migrations[highestCommon].hash === migrationsAvailable[highestCommon].hash)
-                        highestCommon++;
-                    this.applyDownUntil(migrations, migrations.length, highestCommon).then(highestCommon => {
-                        this.applyUpUntil(migrationsAvailable, Math.min(highestCommon, migrations.length), migrationsAvailable.length).then(callback, process.exit);
-                    }, process.exit);
-                });
-            }, () => process.exit(3));
-        }, () => process.exit(2));
-    }
-
-    lockTables(tables: ModelRepr[], client: ClientBase | Transaction): Promise<any> {
-        if(this.db)
-            return Promise.all(tables.map(t => (<ClientBase>client).query('LOCK TABLE ' + t.table + ' IN EXCLUSIVE MODE')));
-        return Promise.all(tables.map(t => (<Transaction>client).request().query('SELECT id FROM ' + t.table + ' WITH (UPDLOCK)')));
-    }
-
-    private applyUpUntil(migrations: {id: number, content: string, hash: string}[], current: number, until: number): Promise<void> {
-        if(current < until)
-            return this.applyUp(migrations[current]).then(() => this.applyUpUntil(migrations, current + 1, until));
-        return Promise.resolve();
-    }
-
-    private applyUp(migration: {id: number, content: string, hash: string}): Promise<void> {
-        return new Promise((resolve, reject) => {
-            const sqlParts = migration.content.split(/-{4,}/);
-            this.Migration.create({
-                id: migration.id,
-                hash: migration.hash,
-                sqlUp: sqlParts[0],
-                sqlDown: sqlParts[1],
-                state: 2,
-                skip: false
-            }).then(() => {
-                (<any>(this.db|| this.dbMssql)).query(sqlParts[0], (err: any) => {
-                    if(err) {
-                        console.error(err);
-                        reject(10);
-                    } else {
-                        (<any>(this.db|| this.dbMssql)).query('UPDATE "migration" SET "state"=0 WHERE "id"=' + migration.id, (err2: any) => {
-                            if(err2) reject(11); // No cleanup
-                            else resolve();
-                        });
-                    }
-                });
-            }, () => process.exit(9));
-        });
-    }
-
-    private applyDownUntil(migrations: Migration[], current: number, until: number): Promise<number> {
-        if(current > until && !migrations[current - 1]?.skip) {
-            current--;
-            return this.applyDown(migrations[current]).then(() => this.applyDownUntil(migrations, current, until));
-        }
-        return Promise.resolve(current);
-    }
-
-    private applyDown(migration: Migration): Promise<void> {
-        return new Promise((resolve, reject) => {
-            (<any>(this.db|| this.dbMssql)).query('UPDATE "migration" SET "state"=1 WHERE "id"=' + migration.id, (err: any) => {
-                if(err) reject(6); // No required change
-                else (<any>(this.db|| this.dbMssql)).query(migration.sqlDown, (err2: any) => {
-                    if(err2) {
-                        console.error(err2);
-                        reject(7);
-                    } // No apply down
-                    else (<any>(this.db|| this.dbMssql)).query('DELETE FROM "migration" WHERE "id"=' + migration.id, (err3: any) => {
-                        if(err3 && migration.id !== 1) reject(8); // No cleanup for not base migration
-                        else {
-                            if(migration.id === 1) {
-                                (this.db ? this.db.query('CREATE TABLE IF NOT EXISTS migration (' +
-                                    'id integer PRIMARY KEY,' +
-                                    'hash text NOT NULL,' +
-                                    '"sqlUp" text NOT NULL,' +
-                                    '"sqlDown" text NOT NULL,' +
-                                    'state integer NOT NULL' +
-                                    ')') : this.dbMssql.query('if not exists (select * from sysobjects where name=\'migration\' and xtype=\'U\') CREATE TABLE migration (' +
-                                    'id int PRIMARY KEY,' +
-                                    'hash text NOT NULL,' +
-                                    '"sqlUp" text NOT NULL,' +
-                                    '"sqlDown" text NOT NULL,' +
-                                    'state int NOT NULL' +
-                                    ')')).then(() => resolve(), reject);
-                            } else resolve();
-                        }
-                    });
-                });
-            });
-        });
-    }
-}
+import * as crypto from 'crypto';
+import * as fs from 'fs';
+import * as Memcached from 'memcached';
+import {ConnectionPool, Transaction} from 'mssql';
+import {ClientBase, Pool} from 'pg';
+import {Logger} from 'winston';
+import { ApiCallRepository } from '../ApiCall';
+import { Migration, MigrationRepository } from '../Migration';
+import {ModelRepr} from './ModelDao';
+
+export class BaseModelRepository {
+    Migration: MigrationRepository;
+    ApiCall: ApiCallRepository;
+
+    constructor(public db: Pool, public dbSpare: Pool, public dbMssql: ConnectionPool, public logger: Logger, public cache: Memcached) {
+        if(db && dbSpare) {
+            const dbQuery = db.query.bind(db);
+            db.query = (function(text: any, values: any, cb: any) {
+                if((this.idleCount + this.waitingCount) >= this.totalCount && this.totalCount === this.options.max)
+                    return dbSpare.query(text, values, cb);
+                return dbQuery(text, values, cb);
+            }).bind(db);
+        }
+        this.Migration = new MigrationRepository(db, dbMssql, logger);
+        this.ApiCall = new ApiCallRepository(db, dbMssql, logger);
+    }
+
+    // TODO: alter table migration if exists without ok column
+    migrate(migrationsPath: string, callback: (() => void), onlyAboveOrEquals = 0, onlyBelow?: number) {
+        (this.db ? Promise.all([
+        this.db.query(`CREATE TABLE IF NOT EXISTS migration (
+id integer PRIMARY KEY,
+hash text NOT NULL,
+"sqlUp" text NOT NULL,
+"sqlDown" text NOT NULL,
+state integer NOT NULL,
+skip boolean NOT NULL
+)`),
+        this.db.query(`ALTER TABLE migration ADD COLUMN IF NOT EXISTS skip BOOLEAN NOT NULL DEFAULT FALSE`)]) : Promise.all([
+        this.dbMssql.query(`IF NOT EXISTS (SELECT * FROM sysobjects WHERE name=\'migration\' AND xtype=\'U\') CREATE TABLE migration (
+id int PRIMARY KEY,
+hash text NOT NULL,
+"sqlUp" text NOT NULL,
+"sqlDown" text NOT NULL,
+state int NOT NULL,
+skip bit NOT NULL
+)`),
+        this.dbMssql.query(`IF NOT EXISTS (
+    SELECT * 
+    FROM INFORMATION_SCHEMA.COLUMNS 
+    WHERE TABLE_NAME = 'migration' 
+      AND COLUMN_NAME = 'skip'
+)
+BEGIN
+    ALTER TABLE migration ADD skip BIT NOT NULL DEFAULT 0;
+END`)])).then(() => {
+            this.Migration.getAllBy('id').then((migrations: Migration[]) => {
+                if(migrations.find(migration => migration.state !== 0)) process.exit(4); // Have to fix manually
+                // Read the new ones
+                fs.readdir(migrationsPath, (_, files) => {
+                    const migrationsAvailable = files
+                        .filter(file => /[0-9]+\.sql/.test(file))
+                        .map(file => parseInt(file.split('.sql')[0], 10))
+                        .filter(file => file > 0)
+                        .sort((a, b) => a - b)
+                        .map(file => {
+                            const content = fs.readFileSync(migrationsPath + file + '.sql', 'utf-8');
+                            return {
+                                id: file,
+                                content: content,
+                                hash: crypto.createHash('sha256').update(content).digest('hex')
+                            };
+                        });
+                    migrations = migrations.filter(m => m.id >= onlyAboveOrEquals);
+                    if(onlyBelow) migrations = migrations.filter(m => m.id < onlyBelow);
+                    if(migrationsAvailable.length === 0 && migrations.length === 0) process.exit(5);
+                    if(migrationsAvailable.length && migrationsAvailable.length !== (migrationsAvailable[migrationsAvailable.length - 1].id - migrationsAvailable[0].id + 1)) process.exit(5);
+                    let highestCommon = 0;
+                    while(highestCommon < migrations.length
+                        && highestCommon < migrationsAvailable.length
+                        && migrations[highestCommon] 
+                        && migrationsAvailable[highestCommon] 
+                        && migrations[highestCommon].hash === migrationsAvailable[highestCommon].hash)
+                        highestCommon++;
+                    this.applyDownUntil(migrations, migrations.length, highestCommon).then(appliedId => {
+                        this.applyUpUntil(migrationsAvailable, Math.min(appliedId, migrations.length), migrationsAvailable.length).then(callback, process.exit);
+                    }, process.exit);
+                });
+            }, () => process.exit(3));
+        }, () => process.exit(2));
+    }
+
+    lockTables(tables: ModelRepr[], client: ClientBase | Transaction): Promise<any> {
+        if(this.db)
+            return Promise.all(tables.map(t => (<ClientBase>client).query('LOCK TABLE ' + t.table + ' IN EXCLUSIVE MODE')));
+        return Promise.all(tables.map(t => (<Transaction>client).request().query('SELECT id FROM ' + t.table + ' WITH (UPDLOCK)')));
+    }
+
+    private applyUpUntil(migrations: {id: number, content: string, hash: string}[], current: number, until: number): Promise<void> {
+        if(current < until) {
+            console.log('Applying migration ' + migrations[current].id);
+            return this.applyUp(migrations[current]).then(() => this.applyUpUntil(migrations, current + 1, until));
+        }
+        return Promise.resolve();
+    }
+
+    private applyUp(migration: {id: number, content: string, hash: string}): Promise<void> {
+        return new Promise((resolve, reject) => {
+            const sqlParts = migration.content.split(/-{4,}/);
+            this.Migration.create({
+                id: migration.id,
+                hash: migration.hash,
+                sqlUp: sqlParts[0],
+                sqlDown: sqlParts[1],
+                state: 2,
+                skip: false
+            }).then(() => {
+                (<any>(this.db|| this.dbMssql)).query(sqlParts[0], (err: any) => {
+                    if(err) {
+                        console.error(err);
+                        reject(10);
+                    } else {
+                        (<any>(this.db|| this.dbMssql)).query('UPDATE "migration" SET "state"=0 WHERE "id"=' + migration.id, (err2: any) => {
+                            if(err2) reject(11); // No cleanup
+                            else resolve();
+                        });
+                    }
+                });
+            }, () => process.exit(9));
+        });
+    }
+
+    private applyDownUntil(migrations: Migration[], current: number, until: number): Promise<number> {
+        if(current > until && !migrations[current - 1]?.skip) {
+            current--;
+            console.log('Reverting migration ' + migrations[current].id);
+            return this.applyDown(migrations[current]).then(() => this.applyDownUntil(migrations, current, until));
+        }
+        return Promise.resolve(current);
+    }
+
+    private applyDown(migration: Migration): Promise<void> {
+        return new Promise((resolve, reject) => {
+            (<any>(this.db|| this.dbMssql)).query('UPDATE "migration" SET "state"=1 WHERE "id"=' + migration.id, (err: any) => {
+                if(err) reject(6); // No required change
+                else (<any>(this.db|| this.dbMssql)).query(migration.sqlDown, (err2: any) => {
+                    if(err2) {
+                        console.error(err2);
+                        reject(7);
+                    } // No apply down
+                    else (<any>(this.db|| this.dbMssql)).query('DELETE FROM "migration" WHERE "id"=' + migration.id, (err3: any) => {
+                        if(err3 && migration.id !== 1) reject(8); // No cleanup for not base migration
+                        else {
+                            if(migration.id === 1) {
+                                (this.db ? this.db.query('CREATE TABLE IF NOT EXISTS migration (' +
+                                    'id integer PRIMARY KEY,' +
+                                    'hash text NOT NULL,' +
+                                    '"sqlUp" text NOT NULL,' +
+                                    '"sqlDown" text NOT NULL,' +
+                                    'state integer NOT NULL' +
+                                    ')') : this.dbMssql.query('if not exists (select * from sysobjects where name=\'migration\' and xtype=\'U\') CREATE TABLE migration (' +
+                                    'id int PRIMARY KEY,' +
+                                    'hash text NOT NULL,' +
+                                    '"sqlUp" text NOT NULL,' +
+                                    '"sqlDown" text NOT NULL,' +
+                                    'state int NOT NULL' +
+                                    ')')).then(() => resolve(), reject);
+                            } else resolve();
+                        }
+                    });
+                });
+            });
+        });
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "description": "Helpers for express-TS servers",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",