ueberdb2 4.1.8 → 4.1.10

package/dist/databases/redis_db.js

@@ -1,122 +1,120 @@
-"use strict";
-/**
- * 2011 Peter 'Pita' Martischka
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS-IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Database = void 0;
-const AbstractDatabase_1 = __importDefault(require("../lib/AbstractDatabase"));
-const redis_1 = require("redis");
-const Database = class RedisDB extends AbstractDatabase_1.default {
-    _client;
-    constructor(settings) {
-        super();
-        this._client = null;
-        this.settings = settings || {};
-    }
-    get isAsync() { return true; }
-    async init() {
-        if (this.settings.url) {
-            this._client = (0, redis_1.createClient)({ url: this.settings.url });
-        }
-        else if (this.settings.host) {
-            const options = {
-                socket: {
-                    host: this.settings.host,
-                    port: Number(this.settings.port),
-                }
-            };
-            if (this.settings.password) {
-                options.password = this.settings.password;
-            }
-            if (this.settings.user) {
-                options.username = this.settings.user;
-            }
-            this._client = (0, redis_1.createClient)(options);
-        }
-        if (this._client) {
-            await this._client.connect();
-            await this._client.ping();
-        }
-    }
-    async get(key) {
-        if (this._client == null)
-            return null;
-        return await this._client.get(key);
-    }
-    async findKeys(key, notKey) {
-        if (this._client == null)
-            return null;
-        const [type] = /^([^:*]+):\*$/.exec(key) || [];
-        if (type != null && ['*:*:*', `${key}:*`].includes(notKey)) {
-            // Performance optimization for a common Etherpad case.
-            return await this._client.sMembers(`ueberDB:keys:${type}`);
-        }
-        let keys = await this._client.keys(key.replace(/[?[\]\\]/g, '\\$&'));
-        if (notKey != null) {
-            const regex = this.createFindRegex(key, notKey);
-            keys = keys.filter((k) => regex.test(k));
-        }
-        return keys;
-    }
-    async set(key, value) {
-        if (this._client == null)
-            return null;
-        const matches = /^([^:]+):([^:]+)$/.exec(key);
-        await Promise.all([
-            matches && this._client.sAdd(`ueberDB:keys:${matches[1]}`, matches[0]),
-            this._client.set(key, value),
-        ]);
-    }
-    async remove(key) {
-        if (this._client == null)
-            return null;
-        const matches = /^([^:]+):([^:]+)$/.exec(key);
-        await Promise.all([
-            matches && this._client.sRem(`ueberDB:keys:${matches[1]}`, matches[0]),
-            this._client.del(key),
-        ]);
-    }
-    async doBulk(bulk) {
-        if (this._client == null)
-            return null;
-        const multi = this._client.multi();
-        for (const { key, type, value } of bulk) {
-            const matches = /^([^:]+):([^:]+)$/.exec(key);
-            if (type === 'set') {
-                if (matches) {
-                    multi.sAdd(`ueberDB:keys:${matches[1]}`, matches[0]);
-                }
-                multi.set(key, value);
-            }
-            else if (type === 'remove') {
-                if (matches) {
-                    multi.sRem(`ueberDB:keys:${matches[1]}`, matches[0]);
-                }
-                multi.del(key);
-            }
-        }
-        await multi.exec();
-    }
-    async close() {
-        if (this._client == null)
-            return null;
-        await this._client.quit();
-        this._client = null;
-    }
+'use strict';
+
+var AbstractDatabase = require('../lib/AbstractDatabase.js');
+var redis = require('redis');
+
+/**
+ * 2011 Peter 'Pita' Martischka
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const Database = class RedisDB extends AbstractDatabase {
+    _client;
+    constructor(settings) {
+        super();
+        this._client = null;
+        this.settings = settings || {};
+    }
+    get isAsync() { return true; }
+    async init() {
+        if (this.settings.url) {
+            this._client = redis.createClient({ url: this.settings.url });
+        }
+        else if (this.settings.host) {
+            const options = {
+                socket: {
+                    host: this.settings.host,
+                    port: Number(this.settings.port),
+                }
+            };
+            if (this.settings.password) {
+                options.password = this.settings.password;
+            }
+            if (this.settings.user) {
+                options.username = this.settings.user;
+            }
+            this._client = redis.createClient(options);
+        }
+        if (this._client) {
+            await this._client.connect();
+            await this._client.ping();
+        }
+    }
+    async get(key) {
+        if (this._client == null)
+            return null;
+        return await this._client.get(key);
+    }
+    async findKeys(key, notKey) {
+        if (this._client == null)
+            return null;
+        const [type] = /^([^:*]+):\*$/.exec(key) || [];
+        if (type != null && ['*:*:*', `${key}:*`].includes(notKey)) {
+            // Performance optimization for a common Etherpad case.
+            return await this._client.sMembers(`ueberDB:keys:${type}`);
+        }
+        let keys = await this._client.keys(key.replace(/[?[\]\\]/g, '\\$&'));
+        if (notKey != null) {
+            const regex = this.createFindRegex(key, notKey);
+            keys = keys.filter((k) => regex.test(k));
+        }
+        return keys;
+    }
+    async set(key, value) {
+        if (this._client == null)
+            return null;
+        const matches = /^([^:]+):([^:]+)$/.exec(key);
+        await Promise.all([
+            matches && this._client.sAdd(`ueberDB:keys:${matches[1]}`, matches[0]),
+            this._client.set(key, value),
+        ]);
+    }
+    async remove(key) {
+        if (this._client == null)
+            return null;
+        const matches = /^([^:]+):([^:]+)$/.exec(key);
+        await Promise.all([
+            matches && this._client.sRem(`ueberDB:keys:${matches[1]}`, matches[0]),
+            this._client.del(key),
+        ]);
+    }
+    async doBulk(bulk) {
+        if (this._client == null)
+            return null;
+        const multi = this._client.multi();
+        for (const { key, type, value } of bulk) {
+            const matches = /^([^:]+):([^:]+)$/.exec(key);
+            if (type === 'set') {
+                if (matches) {
+                    multi.sAdd(`ueberDB:keys:${matches[1]}`, matches[0]);
+                }
+                multi.set(key, value);
+            }
+            else if (type === 'remove') {
+                if (matches) {
+                    multi.sRem(`ueberDB:keys:${matches[1]}`, matches[0]);
+                }
+                multi.del(key);
+            }
+        }
+        await multi.exec();
+    }
+    async close() {
+        if (this._client == null)
+            return null;
+        await this._client.quit();
+        this._client = null;
+    }
 };
+
 exports.Database = Database;

package/dist/databases/rethink_db.js

@@ -1,123 +1,121 @@
-"use strict";
-/**
- * 2016 Remi Arnaud
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS-IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Database = void 0;
-const AbstractDatabase_1 = __importDefault(require("../lib/AbstractDatabase"));
-const rethinkdb_1 = __importDefault(require("rethinkdb"));
-const async_1 = __importDefault(require("async"));
-const Database = class extends AbstractDatabase_1.default {
-    host;
-    db;
-    port;
-    table;
-    connection;
-    constructor(settings) {
-        super();
-        if (!settings)
-            settings = {};
-        if (!settings.host) {
-            settings.host = 'localhost';
-        }
-        if (!settings.port) {
-            settings.port = 28015;
-        }
-        if (!settings.db) {
-            settings.db = 'test';
-        }
-        if (!settings.table) {
-            settings.table = 'test';
-        }
-        this.host = settings.host;
-        this.db = settings.db;
-        this.port = settings.port;
-        this.table = settings.table;
-        this.connection = null;
-    }
-    init(callback) {
-        // @ts-ignore
-        rethinkdb_1.default.connect(this, (err, conn) => {
-            if (err)
-                throw err;
-            this.connection = conn;
-            rethinkdb_1.default.table(this.table).run(this.connection, (err, cursor) => {
-                if (err) {
-                    // assuming table does not exists
-                    // @ts-ignore
-                    rethinkdb_1.default.tableCreate(this.table).run(this.connection, callback);
-                }
-                else if (callback) {
-                    callback(null, cursor);
-                }
-            });
-        });
-    }
-    get(key, callback) {
-        // @ts-ignore
-        rethinkdb_1.default.table(this.table).get(key).run(this.connection, (err, item) => {
-            // @ts-ignore
-            callback(err, (item ? item.content : item));
-        });
-    }
-    findKeys(key, notKey, callback) {
-        const keys = [];
-        const regex = this.createFindRegex(key, notKey);
-        // @ts-ignore
-        rethinkdb_1.default.filter((item) => {
-            if (item.id.search(regex) !== -1) {
-                keys.push(item.id);
-            }
-        }).run(this.connection, callback);
-    }
-    set(key, value, callback) {
-        rethinkdb_1.default.table(this.table)
-            .insert({ id: key, content: value }, { conflict: 'replace' })
-            .run(this.connection, callback);
-    }
-    doBulk(bulk, callback) {
-        const _in = [];
-        const _out = [];
-        for (const i in bulk) {
-            if (bulk[i].type === 'set') {
-                _in.push({ id: bulk[i].key, content: bulk[i].value });
-            }
-            else if (bulk[i].type === 'remove') {
-                _out.push(bulk[i].key);
-            }
-        }
-        async_1.default.parallel([
-            (cb) => {
-                rethinkdb_1.default.table(this.table).insert(_in, { conflict: 'replace' }).run(this.connection, cb);
-            },
-            (cb) => {
-                rethinkdb_1.default.table(this.table).getAll(_out).delete().run(this.connection, cb);
-            },
-        ], callback);
-    }
-    remove(key, callback) {
-        // @ts-ignore
-        rethinkdb_1.default.table(this.table).get(key).delete().run(this.connection, callback);
-    }
-    close(callback) {
-        if (this.connection) {
-            this.connection.close(callback);
-        }
-    }
+'use strict';
+
+var AbstractDatabase = require('../lib/AbstractDatabase.js');
+var r = require('rethinkdb');
+var async = require('async');
+
+/**
+ * 2016 Remi Arnaud
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const Database = class extends AbstractDatabase {
+    host;
+    db;
+    port;
+    table;
+    connection;
+    constructor(settings) {
+        super();
+        if (!settings)
+            settings = {};
+        if (!settings.host) {
+            settings.host = 'localhost';
+        }
+        if (!settings.port) {
+            settings.port = 28015;
+        }
+        if (!settings.db) {
+            settings.db = 'test';
+        }
+        if (!settings.table) {
+            settings.table = 'test';
+        }
+        this.host = settings.host;
+        this.db = settings.db;
+        this.port = settings.port;
+        this.table = settings.table;
+        this.connection = null;
+    }
+    init(callback) {
+        // @ts-ignore
+        r.connect(this, (err, conn) => {
+            if (err)
+                throw err;
+            this.connection = conn;
+            r.table(this.table).run(this.connection, (err, cursor) => {
+                if (err) {
+                    // assuming table does not exists
+                    // @ts-ignore
+                    r.tableCreate(this.table).run(this.connection, callback);
+                }
+                else if (callback) {
+                    callback(null, cursor);
+                }
+            });
+        });
+    }
+    get(key, callback) {
+        // @ts-ignore
+        r.table(this.table).get(key).run(this.connection, (err, item) => {
+            // @ts-ignore
+            callback(err, (item ? item.content : item));
+        });
+    }
+    findKeys(key, notKey, callback) {
+        const keys = [];
+        const regex = this.createFindRegex(key, notKey);
+        // @ts-ignore
+        r.filter((item) => {
+            if (item.id.search(regex) !== -1) {
+                keys.push(item.id);
+            }
+        }).run(this.connection, callback);
+    }
+    set(key, value, callback) {
+        r.table(this.table)
+            .insert({ id: key, content: value }, { conflict: 'replace' })
+            .run(this.connection, callback);
+    }
+    doBulk(bulk, callback) {
+        const _in = [];
+        const _out = [];
+        for (const i in bulk) {
+            if (bulk[i].type === 'set') {
+                _in.push({ id: bulk[i].key, content: bulk[i].value });
+            }
+            else if (bulk[i].type === 'remove') {
+                _out.push(bulk[i].key);
+            }
+        }
+        async.parallel([
+            (cb) => {
+                r.table(this.table).insert(_in, { conflict: 'replace' }).run(this.connection, cb);
+            },
+            (cb) => {
+                r.table(this.table).getAll(_out).delete().run(this.connection, cb);
+            },
+        ], callback);
+    }
+    remove(key, callback) {
+        // @ts-ignore
+        r.table(this.table).get(key).delete().run(this.connection, callback);
+    }
+    close(callback) {
+        if (this.connection) {
+            this.connection.close(callback);
+        }
+    }
 };
+
 exports.Database = Database;