anote-server-libs 0.3.2 → 0.3.4

package/models/repository/BaseModelRepository.ts

@@ -1,152 +1,152 @@
-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);
-    }
-
-    migrate(migrationsPath: string, callback: (() => void), onlyAboveOrEquals = 0) {
-        (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(() => {
-            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(() => {
-                        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('----');
-            this.Migration.create({
-                id: migration.id,
-                hash: migration.hash,
-                sqlUp: sqlParts[0],
-                sqlDown: sqlParts[1],
-                state: 2
-            }).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<void> {
-        if(current > until) {
-            current--;
-            return this.applyDown(migrations[current]).then(() => this.applyDownUntil(migrations, current, until));
-        }
-        return Promise.resolve();
-    }
-
-    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);
+    }
+
+    migrate(migrationsPath: string, callback: (() => void), onlyAboveOrEquals = 0) {
+        (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(() => {
+            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(() => {
+                        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('----');
+            this.Migration.create({
+                id: migration.id,
+                hash: migration.hash,
+                sqlUp: sqlParts[0],
+                sqlDown: sqlParts[1],
+                state: 2
+            }).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<void> {
+        if(current > until) {
+            current--;
+            return this.applyDown(migrations[current]).then(() => this.applyDownUntil(migrations, current, until));
+        }
+        return Promise.resolve();
+    }
+
+    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/models/repository/MemoryCache.js

@@ -1,92 +1,92 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MemoryCache = void 0;
-class MemoryCache {
-    constructor(localKey, cache) {
-        this.localKey = localKey;
-        this.cache = cache;
-        this.localCache = {};
-    }
-    list() {
-        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 = 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) {
-        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, val) {
-        if (this.cache)
-            return new Promise(resolve => this.cache.add(this.localKey + key, JSON.stringify(val), 15 * 60, resolve));
-        else {
-            this.localCache[key] = val;
-            return Promise.resolve();
-        }
-    }
-    delete(key) {
-        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 = {};
-    }
-}
-exports.MemoryCache = MemoryCache;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MemoryCache = void 0;
+class MemoryCache {
+    constructor(localKey, cache) {
+        this.localKey = localKey;
+        this.cache = cache;
+        this.localCache = {};
+    }
+    list() {
+        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 = 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) {
+        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, val) {
+        if (this.cache)
+            return new Promise(resolve => this.cache.add(this.localKey + key, JSON.stringify(val), 15 * 60, resolve));
+        else {
+            this.localCache[key] = val;
+            return Promise.resolve();
+        }
+    }
+    delete(key) {
+        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 = {};
+    }
+}
+exports.MemoryCache = MemoryCache;