anote-server-libs 0.9.4 → 0.9.6

package/models/ApiCall.ts

@@ -1,40 +1,40 @@
-import { ConnectionPool, DateTimeOffset, Request } from 'mssql';
-import {Pool} from 'pg';
-import {Logger} from 'winston';
-import {Model, ModelDao} from './repository/ModelDao';
-
-export interface ApiCall extends Model<string> {
-    responseCode: number;
-    responseJson: string;
-    expiresAt: Date;
-}
-
-export class ApiCallRepository extends ModelDao<string, ApiCall> {
-    constructor(protected pool: Pool, protected poolMssql: ConnectionPool, protected logger: Logger) {
-        super(pool, poolMssql, logger, 'api_call', 5, pool ? 'id=$1,"updatedOn"=$2,"responseCode"=$3,"responseJson"=$4,"expiresAt"=$5' :
-            'id=@1,"updatedOn"=@2,"responseCode"=@3,"responseJson"=@4,"expiresAt"=@5');
-    }
-
-    buildObject(q: any): ApiCall {
-        if(!q) return undefined;
-        q.id = q.id.trim();
-        q.updatedOn = q.updatedOn && new Date(q.updatedOn);
-        q.responseCode = parseInt(q.responseCode, 10);
-        q.expiresAt = q.expiresAt && new Date(q.expiresAt);
-        return q;
-    }
-
-    serialize(instance: ApiCall, request?: Request) {
-        if(request) {
-            request.input('1', instance.id);
-            request.input('2', DateTimeOffset, instance.updatedOn);
-            request.input('3', instance.responseCode);
-            request.input('4', instance.responseJson);
-            request.input('5', DateTimeOffset, instance.expiresAt);
-            return undefined;
-        } else {
-            return [instance.id, instance.updatedOn, instance.responseCode, instance.responseJson, instance.expiresAt];
-        }
-    }
-
-}
+import { ConnectionPool, DateTimeOffset, Request } from 'mssql';
+import {Pool} from 'pg';
+import {Logger} from 'winston';
+import {Model, ModelDao} from './repository/ModelDao';
+
+export interface ApiCall extends Model<string> {
+    responseCode: number;
+    responseJson: string;
+    expiresAt: Date;
+}
+
+export class ApiCallRepository extends ModelDao<string, ApiCall> {
+    constructor(protected pool: Pool, protected poolMssql: ConnectionPool, protected logger: Logger) {
+        super(pool, poolMssql, logger, 'api_call', 5, pool ? 'id=$1,"updatedOn"=$2,"responseCode"=$3,"responseJson"=$4,"expiresAt"=$5' :
+            'id=@1,"updatedOn"=@2,"responseCode"=@3,"responseJson"=@4,"expiresAt"=@5');
+    }
+
+    buildObject(q: any): ApiCall {
+        if(!q) return undefined;
+        q.id = q.id.trim();
+        q.updatedOn = q.updatedOn && new Date(q.updatedOn);
+        q.responseCode = parseInt(q.responseCode, 10);
+        q.expiresAt = q.expiresAt && new Date(q.expiresAt);
+        return q;
+    }
+
+    serialize(instance: ApiCall, request?: Request) {
+        if(request) {
+            request.input('1', instance.id);
+            request.input('2', DateTimeOffset, instance.updatedOn);
+            request.input('3', instance.responseCode);
+            request.input('4', instance.responseJson);
+            request.input('5', DateTimeOffset, instance.expiresAt);
+            return undefined;
+        } else {
+            return [instance.id, instance.updatedOn, instance.responseCode, instance.responseJson, instance.expiresAt];
+        }
+    }
+
+}

package/models/Migration.ts

@@ -1,43 +1,43 @@
-import { ConnectionPool, Request } from 'mssql';
-import {Pool} from 'pg';
-import {Logger} from 'winston';
-import {ModelDao} from './repository/ModelDao';
-
-export interface Migration {
-    id: number;
-    hash: string;
-    sqlUp: string;
-    sqlDown: string;
-    state: number;
-    skip: boolean;
-}
-
-export class MigrationRepository extends ModelDao<number, Migration> {
-    constructor(protected pool: Pool, protected poolMssql: ConnectionPool, protected logger: Logger) {
-        super(pool, poolMssql, logger, 'migration', 6, pool ? 'id=$1,hash=$2,"sqlUp"=$3,"sqlDown"=$4,state=$5,skip=$6' :
-            'id=@1,hash=@2,"sqlUp"=@3,"sqlDown"=@4,state=@5,skip=@6');
-    }
-
-    buildObject(q: any): Migration {
-        if(!q) return undefined;
-        q.id = parseInt(q.id, 10);
-        q.hash = q.hash.trim();
-        q.state = parseInt(q.state, 10);
-        q.skip = q.skip ? true : false;
-        return q;
-    }
-
-    serialize(instance: Migration, request?: Request) {
-        if(request) {
-            request.input('1', instance.id);
-            request.input('2', instance.hash);
-            request.input('3', instance.sqlUp);
-            request.input('4', instance.sqlDown);
-            request.input('5', instance.state);
-            request.input('6', instance.skip ? 1 : 0);
-            return undefined;
-        } else {
-            return [instance.id, instance.hash, instance.sqlUp, instance.sqlDown, instance.state, instance.skip];
-        }
-    }
-}
+import { ConnectionPool, Request } from 'mssql';
+import {Pool} from 'pg';
+import {Logger} from 'winston';
+import {ModelDao} from './repository/ModelDao';
+
+export interface Migration {
+    id: number;
+    hash: string;
+    sqlUp: string;
+    sqlDown: string;
+    state: number;
+    skip: boolean;
+}
+
+export class MigrationRepository extends ModelDao<number, Migration> {
+    constructor(protected pool: Pool, protected poolMssql: ConnectionPool, protected logger: Logger) {
+        super(pool, poolMssql, logger, 'migration', 6, pool ? 'id=$1,hash=$2,"sqlUp"=$3,"sqlDown"=$4,state=$5,skip=$6' :
+            'id=@1,hash=@2,"sqlUp"=@3,"sqlDown"=@4,state=@5,skip=@6');
+    }
+
+    buildObject(q: any): Migration {
+        if(!q) return undefined;
+        q.id = parseInt(q.id, 10);
+        q.hash = q.hash.trim();
+        q.state = parseInt(q.state, 10);
+        q.skip = q.skip ? true : false;
+        return q;
+    }
+
+    serialize(instance: Migration, request?: Request) {
+        if(request) {
+            request.input('1', instance.id);
+            request.input('2', instance.hash);
+            request.input('3', instance.sqlUp);
+            request.input('4', instance.sqlDown);
+            request.input('5', instance.state);
+            request.input('6', instance.skip ? 1 : 0);
+            return undefined;
+        } else {
+            return [instance.id, instance.hash, instance.sqlUp, instance.sqlDown, instance.state, instance.skip];
+        }
+    }
+}

package/models/repository/BaseModelRepository.js

@@ -23,7 +23,7 @@ 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,
@@ -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,13 +97,15 @@ 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) {
         return new Promise((resolve, reject) => {
-            const sqlParts = migration.content.split('----');
+            const sqlParts = migration.content.split(/-{4,}/);
             this.Migration.create({
                 id: migration.id,
                 hash: migration.hash,
@@ -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

@@ -26,7 +26,7 @@ export class BaseModelRepository {
     }
 
     // TODO: alter table migration if exists without ok column
-    migrate(migrationsPath: string, callback: (() => void), onlyAboveOrEquals = 0) {
+    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,
@@ -71,15 +71,19 @@ END`)])).then(() => {
                                 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)
+                    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(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));
@@ -93,14 +97,16 @@ END`)])).then(() => {
     }
 
     private applyUpUntil(migrations: {id: number, content: string, hash: string}[], current: number, until: number): Promise<void> {
-        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();
     }
 
     private applyUp(migration: {id: number, content: string, hash: string}): Promise<void> {
         return new Promise((resolve, reject) => {
-            const sqlParts = migration.content.split('----');
+            const sqlParts = migration.content.split(/-{4,}/);
             this.Migration.create({
                 id: migration.id,
                 hash: migration.hash,
@@ -127,6 +133,7 @@ END`)])).then(() => {
     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);

package/models/repository/MemoryCache.ts

@@ -1,87 +1,87 @@
-import * as Memcached from 'memcached';
-
-export class MemoryCache<T> {
-
-    private localCache: {[id: string]: any} = {};
-
-    constructor(private localKey: string, private cache?: Memcached) {
-    }
-
-    list(): Promise<T[]> {
-        if(this.cache) return new Promise(resolve => {
-            let pending = true;
-            setTimeout(() => {
-                if(pending) {
-                    pending = false;
-                    resolve([]);
-                }
-            }, 250);
-            this.cache.items((_, data) => {
-                if(pending) {
-                    pending = false;
-                    resolve(data.map(s => {
-                        const value = <string>s[Object.getOwnPropertyNames(s).find(sname => sname.startsWith(this.localKey))];
-                        return value && JSON.parse(value);
-                    }).filter(x => x));
-                }
-            });
-        });
-        else return Promise.resolve(Object.getOwnPropertyNames(this.localCache).map(key => this.localCache[key]));
-    }
-
-    get(key: string | number): Promise<T> {
-        if(this.cache) return new Promise(resolve => {
-            let pending = true;
-            setTimeout(() => {
-                if(pending) {
-                    pending = false;
-                    resolve(undefined);
-                }
-            }, 250);
-            this.cache.get(this.localKey + key, (_, data) => {
-                if(pending) {
-                    pending = false;
-                    resolve(data && JSON.parse(data));
-                }
-            });
-        });
-        else return Promise.resolve(this.localCache[key]);
-    }
-
-    set(key: string | number, val: T, time = 15 * 60): Promise<void> {
-        if(this.cache) return new Promise(resolve => this.cache.set(this.localKey + key, JSON.stringify(val), time, resolve));
-        else {
-            this.localCache[key] = val;
-            return Promise.resolve();
-        }
-    }
-
-    delete(key: string | number): Promise<void> {
-        if(this.cache) {
-            return new Promise(resolve => {
-                let fired = false;
-                const handler = setTimeout(() => {
-                    fired = true;
-                    resolve();
-                }, 50);
-                this.cache.del(this.localKey + key, () => {
-                    if(!fired) {
-                        clearTimeout(handler);
-                        resolve();
-                    }
-                });
-            });
-        } else {
-            this.localCache[key] = undefined;
-            return Promise.resolve();
-        }
-    }
-
-    clear() {
-        if(this.cache) {
-            this.localKey = this.localKey + '_';
-            if(this.localKey.length > 40)
-                this.localKey = this.localKey.replace(/_+$/, '');
-        } else this.localCache = {};
-    }
-}
+import * as Memcached from 'memcached';
+
+export class MemoryCache<T> {
+
+    private localCache: {[id: string]: any} = {};
+
+    constructor(private localKey: string, private cache?: Memcached) {
+    }
+
+    list(): Promise<T[]> {
+        if(this.cache) return new Promise(resolve => {
+            let pending = true;
+            setTimeout(() => {
+                if(pending) {
+                    pending = false;
+                    resolve([]);
+                }
+            }, 250);
+            this.cache.items((_, data) => {
+                if(pending) {
+                    pending = false;
+                    resolve(data.map(s => {
+                        const value = <string>s[Object.getOwnPropertyNames(s).find(sname => sname.startsWith(this.localKey))];
+                        return value && JSON.parse(value);
+                    }).filter(x => x));
+                }
+            });
+        });
+        else return Promise.resolve(Object.getOwnPropertyNames(this.localCache).map(key => this.localCache[key]));
+    }
+
+    get(key: string | number): Promise<T> {
+        if(this.cache) return new Promise(resolve => {
+            let pending = true;
+            setTimeout(() => {
+                if(pending) {
+                    pending = false;
+                    resolve(undefined);
+                }
+            }, 250);
+            this.cache.get(this.localKey + key, (_, data) => {
+                if(pending) {
+                    pending = false;
+                    resolve(data && JSON.parse(data));
+                }
+            });
+        });
+        else return Promise.resolve(this.localCache[key]);
+    }
+
+    set(key: string | number, val: T, time = 15 * 60): Promise<void> {
+        if(this.cache) return new Promise(resolve => this.cache.set(this.localKey + key, JSON.stringify(val), time, resolve));
+        else {
+            this.localCache[key] = val;
+            return Promise.resolve();
+        }
+    }
+
+    delete(key: string | number): Promise<void> {
+        if(this.cache) {
+            return new Promise(resolve => {
+                let fired = false;
+                const handler = setTimeout(() => {
+                    fired = true;
+                    resolve();
+                }, 50);
+                this.cache.del(this.localKey + key, () => {
+                    if(!fired) {
+                        clearTimeout(handler);
+                        resolve();
+                    }
+                });
+            });
+        } else {
+            this.localCache[key] = undefined;
+            return Promise.resolve();
+        }
+    }
+
+    clear() {
+        if(this.cache) {
+            this.localKey = this.localKey + '_';
+            if(this.localKey.length > 40)
+                this.localKey = this.localKey.replace(/_+$/, '');
+        } else this.localCache = {};
+    }
+}