@storyous/mongodb 1.0.10 → 1.1.0

package/lib/appData/index.d.ts

@@ -1,12 +1,12 @@
-import { Collection, InsertOneResult, WithId } from 'mongodb';
-import { Key } from '../mongoClient';
-declare const appData: {
-    readonly _collection: Collection<any>;
-    _failReads: number;
-    ensureDocumentExists(document: {
-        _id: Key;
-    }): Promise<Document | InsertOneResult | null>;
-    updateDocument(_id: Key, update: Object, upsert?: boolean): Promise<WithId<any | null>>;
-    getDocument(_id: Key): Promise<WithId<any | null>>;
-};
-export default appData;
+import { Collection, InsertOneResult, WithId } from 'mongodb';
+import { Key } from '../mongoClient';
+declare const appData: {
+    readonly _collection: Collection<any>;
+    _failReads: number;
+    ensureDocumentExists(document: {
+        _id: Key;
+    }): Promise<Document | InsertOneResult | null>;
+    updateDocument(_id: Key, update: Object, upsert?: boolean): Promise<WithId<any | null>>;
+    getDocument(_id: Key): Promise<WithId<any | null>>;
+};
+export default appData;

package/lib/appData/index.js

@@ -1,40 +1,40 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const getCollection_1 = __importDefault(require("../getCollection"));
-const mongoDuplicateKeyErrorCodes = [11000, 11001];
-const appData = {
-    get _collection() {
-        return (0, getCollection_1.default)('appData');
-    },
-    _failReads: 0,
-    ensureDocumentExists(document) {
-        return this._collection
-            .insertOne(document)
-            .catch((err) => (new Promise((resolve, reject) => {
-            if (!mongoDuplicateKeyErrorCodes.includes(err.code)) {
-                reject(err);
-                return;
-            }
-            resolve(null);
-        })));
-    },
-    updateDocument(_id, update, upsert = false) {
-        const query = { _id };
-        const options = {
-            returnOriginal: false,
-            upsert,
-        };
-        return this._collection
-            .findOneAndUpdate(query, update, options)
-            .then((result) => result.value);
-    },
-    getDocument(_id) {
-        const query = { _id };
-        return this._collection.findOne(query);
-    },
-};
-exports.default = appData;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const getCollection_1 = __importDefault(require("../getCollection"));
+const mongoDuplicateKeyErrorCodes = [11000, 11001];
+const appData = {
+    get _collection() {
+        return (0, getCollection_1.default)('appData');
+    },
+    _failReads: 0,
+    ensureDocumentExists(document) {
+        return this._collection
+            .insertOne(document)
+            .catch((err) => (new Promise((resolve, reject) => {
+            if (!mongoDuplicateKeyErrorCodes.includes(err.code)) {
+                reject(err);
+                return;
+            }
+            resolve(null);
+        })));
+    },
+    updateDocument(_id, update, upsert = false) {
+        const query = { _id };
+        const options = {
+            returnOriginal: false,
+            upsert,
+        };
+        return this._collection
+            .findOneAndUpdate(query, update, options)
+            .then((result) => result.value);
+    },
+    getDocument(_id) {
+        const query = { _id };
+        return this._collection.findOne(query);
+    },
+};
+exports.default = appData;
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUNBLHFFQUE2QztBQUc3QyxNQUFNLDJCQUEyQixHQUFHLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBRW5ELE1BQU0sT0FBTyxHQUFHO0lBRVosSUFBSSxXQUFXO1FBQ1gsT0FBTyxJQUFBLHVCQUFhLEVBQUMsU0FBUyxDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUVELFVBQVUsRUFBRSxDQUFDO0lBRWIsb0JBQW9CLENBQUUsUUFBc0I7UUFDeEMsT0FBTyxJQUFJLENBQUMsV0FBVzthQUNsQixTQUFTLENBQUMsUUFBZSxDQUFDO2FBQzFCLEtBQUssQ0FBQyxDQUFDLEdBQVEsRUFBRSxFQUFFLENBQUMsQ0FDakIsSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7WUFDNUIsSUFBSSxDQUFDLDJCQUEyQixDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUU7Z0JBQ2pELE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztnQkFFWixPQUFPO2FBQ1Y7WUFDRCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbEIsQ0FBQyxDQUFDLENBQ0wsQ0FBQyxDQUFDO0lBQ1gsQ0FBQztJQUVELGNBQWMsQ0FBRSxHQUFRLEVBQUUsTUFBYyxFQUFFLFNBQWtCLEtBQUs7UUFDN0QsTUFBTSxLQUFLLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQztRQUN0QixNQUFNLE9BQU8sR0FBRztZQUNaLGNBQWMsRUFBRSxLQUFLO1lBQ3JCLE1BQU07U0FDVCxDQUFDO1FBQ0YsT0FBTyxJQUFJLENBQUMsV0FBVzthQUNsQixnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLE9BQU8sQ0FBQzthQUN4QyxJQUFJLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUN4QyxDQUFDO0lBRUQsV0FBVyxDQUFFLEdBQVE7UUFDakIsTUFBTSxLQUFLLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQztRQUN0QixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzNDLENBQUM7Q0FFSixDQUFDO0FBRUYsa0JBQWUsT0FBTyxDQUFDIn0=

package/lib/concurrentTask.d.ts

@@ -1,9 +1,9 @@
-/**
- * noLaterThan = In what time by now should be the latest attempt executed
- * startAttemptsDelay = Starting attempts delay
- */
-declare const concurrentTask: <T>(task: () => Promise<T>, { noLaterThan, startAttemptsDelay }?: {
-    noLaterThan?: number | undefined;
-    startAttemptsDelay?: number | undefined;
-}) => Promise<any>;
-export default concurrentTask;
+/**
+ * noLaterThan = In what time by now should be the latest attempt executed
+ * startAttemptsDelay = Starting attempts delay
+ */
+declare const concurrentTask: <T>(task: () => Promise<T>, { noLaterThan, startAttemptsDelay }?: {
+    noLaterThan?: number | undefined;
+    startAttemptsDelay?: number | undefined;
+}) => Promise<any>;
+export default concurrentTask;

package/lib/concurrentTask.js

@@ -1,20 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const errors_1 = require("@storyous/errors");
-const attemptRecursive = async (task, startAttemptsDelay, latestTime, callNumber) => (task().catch(async (err) => {
-    if (errors_1.AppError.isConcurrentRequestError(err)) {
-        const nextCallDelay = startAttemptsDelay * (callNumber ** 2);
-        if ((Date.now() + nextCallDelay) < latestTime) {
-            await new Promise((resolve) => { setTimeout(resolve, nextCallDelay); });
-            return attemptRecursive(task, startAttemptsDelay, latestTime, ++callNumber);
-        }
-    }
-    throw err;
-}));
-/**
- * noLaterThan = In what time by now should be the latest attempt executed
- * startAttemptsDelay = Starting attempts delay
- */
-const concurrentTask = async (task, { noLaterThan = 2000, startAttemptsDelay = 50 } = {}) => (attemptRecursive(task, startAttemptsDelay, Date.now() + noLaterThan, 1));
-exports.default = concurrentTask;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const errors_1 = require("@storyous/errors");
+const attemptRecursive = async (task, startAttemptsDelay, latestTime, callNumber) => (task().catch(async (err) => {
+    if (errors_1.AppError.isConcurrentRequestError(err)) {
+        const nextCallDelay = startAttemptsDelay * (callNumber ** 2);
+        if ((Date.now() + nextCallDelay) < latestTime) {
+            await new Promise((resolve) => { setTimeout(resolve, nextCallDelay); });
+            return attemptRecursive(task, startAttemptsDelay, latestTime, ++callNumber);
+        }
+    }
+    throw err;
+}));
+/**
+ * noLaterThan = In what time by now should be the latest attempt executed
+ * startAttemptsDelay = Starting attempts delay
+ */
+const concurrentTask = async (task, { noLaterThan = 2000, startAttemptsDelay = 50 } = {}) => (attemptRecursive(task, startAttemptsDelay, Date.now() + noLaterThan, 1));
+exports.default = concurrentTask;
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uY3VycmVudFRhc2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjb25jdXJyZW50VGFzay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDZDQUE0QztBQUU1QyxNQUFNLGdCQUFnQixHQUFHLEtBQUssRUFDMUIsSUFBc0IsRUFDdEIsa0JBQTBCLEVBQzFCLFVBQWtCLEVBQ2xCLFVBQWtCLEVBQ04sRUFBRSxDQUFDLENBQ2YsSUFBSSxFQUFFLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxHQUFVLEVBQUUsRUFBRTtJQUM5QixJQUFJLGlCQUFRLENBQUMsd0JBQXdCLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDeEMsTUFBTSxhQUFhLEdBQUcsa0JBQWtCLEdBQUcsQ0FBQyxVQUFVLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDN0QsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxhQUFhLENBQUMsR0FBRyxVQUFVLEVBQUU7WUFDM0MsTUFBTSxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsVUFBVSxDQUFDLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3hFLE9BQU8sZ0JBQWdCLENBQUMsSUFBSSxFQUFFLGtCQUFrQixFQUFFLFVBQVUsRUFBRSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1NBQy9FO0tBQ0o7SUFFRCxNQUFNLEdBQUcsQ0FBQztBQUNkLENBQUMsQ0FBQyxDQUNMLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxNQUFNLGNBQWMsR0FBRyxLQUFLLEVBQU0sSUFBc0IsRUFBRSxFQUFFLFdBQVcsR0FBRyxJQUFJLEVBQUUsa0JBQWtCLEdBQUcsRUFBRSxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUMvRyxnQkFBZ0IsQ0FBQyxJQUFJLEVBQUUsa0JBQWtCLEVBQUUsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLFdBQVcsRUFBRSxDQUFDLENBQUMsQ0FDMUUsQ0FBQztBQUVGLGtCQUFlLGNBQWMsQ0FBQyJ9

package/lib/fixtures.d.ts

@@ -1,5 +1,5 @@
-import { Collection, Document } from 'mongodb';
-declare const fixtures: {
-    ensureInCollection(_fixtures: Document[], collection: Collection): Promise<any>;
-};
-export default fixtures;
+import { Collection, Document } from 'mongodb';
+declare const fixtures: {
+    ensureInCollection(_fixtures: Document[], collection: Collection): Promise<any>;
+};
+export default fixtures;

package/lib/fixtures.js

@@ -1,28 +1,28 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_1 = require("lodash");
-const fixtures = {
-    ensureInCollection(_fixtures, collection) {
-        const fixtureIds = [];
-        const objectMap = {};
-        _fixtures.forEach((object) => {
-            fixtureIds.push(object._id);
-            objectMap[object._id.toString()] = object;
-        });
-        return collection.find({ _id: { $in: fixtureIds } })
-            .toArray()
-            .then((existing) => {
-            existing.forEach((object) => {
-                const stringId = object._id.toString();
-                delete objectMap[stringId];
-            });
-            const filteredObjects = (0, lodash_1.toArray)(objectMap);
-            if (filteredObjects.length) {
-                return collection.insertMany(filteredObjects);
-            }
-            return Promise.resolve(null);
-        });
-    },
-};
-exports.default = fixtures;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_1 = require("lodash");
+const fixtures = {
+    ensureInCollection(_fixtures, collection) {
+        const fixtureIds = [];
+        const objectMap = {};
+        _fixtures.forEach((object) => {
+            fixtureIds.push(object._id);
+            objectMap[object._id.toString()] = object;
+        });
+        return collection.find({ _id: { $in: fixtureIds } })
+            .toArray()
+            .then((existing) => {
+            existing.forEach((object) => {
+                const stringId = object._id.toString();
+                delete objectMap[stringId];
+            });
+            const filteredObjects = (0, lodash_1.toArray)(objectMap);
+            if (filteredObjects.length) {
+                return collection.insertMany(filteredObjects);
+            }
+            return Promise.resolve(null);
+        });
+    },
+};
+exports.default = fixtures;
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmaXh0dXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLG1DQUFpQztBQUdqQyxNQUFNLFFBQVEsR0FBRztJQUNiLGtCQUFrQixDQUFFLFNBQXFCLEVBQUUsVUFBc0I7UUFDN0QsTUFBTSxVQUFVLEdBQWUsRUFBRSxDQUFDO1FBQ2xDLE1BQU0sU0FBUyxHQUE2QixFQUFFLENBQUM7UUFFL0MsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFO1lBQ3pCLFVBQVUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQzVCLFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDLEdBQUcsTUFBTSxDQUFDO1FBQzlDLENBQUMsQ0FBQyxDQUFDO1FBRUgsT0FBTyxVQUFVLENBQUMsSUFBSSxDQUNsQixFQUFFLEdBQUcsRUFBRSxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUUsRUFBRSxDQUMvQjthQUNJLE9BQU8sRUFBRTthQUNULElBQUksQ0FDRCxDQUFDLFFBQVEsRUFBRSxFQUFFO1lBQ1QsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFO2dCQUN4QixNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDO2dCQUN2QyxPQUFPLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUMvQixDQUFDLENBQUMsQ0FBQztZQUVILE1BQU0sZUFBZSxHQUFlLElBQUEsZ0JBQU8sRUFBQyxTQUFTLENBQUMsQ0FBQztZQUV2RCxJQUFJLGVBQWUsQ0FBQyxNQUFNLEVBQUU7Z0JBQ3hCLE9BQU8sVUFBVSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUMsQ0FBQzthQUNqRDtZQUVELE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNqQyxDQUFDLENBQUMsQ0FBQztJQUNmLENBQUM7Q0FDSixDQUFDO0FBRUYsa0JBQWUsUUFBUSxDQUFDIn0=

package/lib/getCollection.d.ts

@@ -1,3 +1,3 @@
-import { Collection } from 'mongodb';
-declare const _default: <T extends Document = Document>(name: string) => Collection<T>;
-export default _default;
+import { Collection } from 'mongodb';
+declare const _default: <T extends Document = Document>(name: string) => Collection<T>;
+export default _default;

package/lib/getCollection.js

@@ -1,9 +1,9 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const mongoClient_1 = __importDefault(require("./mongoClient"));
-exports.default = (name) => mongoClient_1.default
-    .getClient().db().collection(name);
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const mongoClient_1 = __importDefault(require("./mongoClient"));
+exports.default = (name) => mongoClient_1.default
+    .getClient().db().collection(name);
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0Q29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImdldENvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFDQSxnRUFBd0M7QUFFeEMsa0JBQWUsQ0FBZ0MsSUFBWSxFQUFpQixFQUFFLENBQUMscUJBQVc7S0FDckYsU0FBUyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDIn0=

package/lib/getMongoLocker.d.ts

@@ -1,10 +1,10 @@
-import { Collection } from 'mongodb';
-import { Key } from './mongoClient';
-export declare type LockCallback<T> = () => Promise<T>;
-export declare type LockerOptions = {
-    noLaterThan?: number;
-    startAttemptsDelay?: number;
-    expireIn?: number;
-};
-declare const _default: (collection: Collection) => Promise<(<T>(key: Key, callback: LockCallback<T>, { noLaterThan, startAttemptsDelay, expireIn }?: LockerOptions) => Promise<T>)>;
-export default _default;
+import { Collection } from 'mongodb';
+import { Key } from './mongoClient';
+export declare type LockCallback<T> = () => Promise<T>;
+export declare type LockerOptions = {
+    noLaterThan?: number;
+    startAttemptsDelay?: number;
+    expireIn?: number;
+};
+declare const _default: (collection: Collection) => Promise<(<T>(key: Key, callback: LockCallback<T>, { noLaterThan, startAttemptsDelay, expireIn }?: LockerOptions) => Promise<T>)>;
+export default _default;

package/lib/getMongoLocker.js

@@ -1,53 +1,53 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const errors_1 = require("@storyous/errors");
-const mongodb_1 = require("mongodb");
-const concurrentTask_1 = __importDefault(require("./concurrentTask"));
-const mongoErrorCodes_1 = __importDefault(require("./mongoErrorCodes"));
-const _removeDeprecatedIndex = async (collection) => {
-    const collectionStats = await collection.stats();
-    if (collectionStats.indexDetails.acquiredAt_1) {
-        await collection.dropIndex('acquiredAt_1');
-    }
-};
-exports.default = async (collection) => {
-    await _removeDeprecatedIndex(collection);
-    await collection.createIndex({ expiresAt: 1 }, { expireAfterSeconds: 0 });
-    return async (key, callback, { noLaterThan = 1000, startAttemptsDelay = 50, expireIn = 120000 } = {}) => {
-        const lockId = new mongodb_1.ObjectId();
-        const releaseLock = () => collection.deleteOne({ _id: key, lockId });
-        const acquireLock = async () => {
-            try {
-                const now = new Date();
-                /**
-                 * 3 possible situations
-                 * a) There is no lock -> upsert will create the document
-                 * b) There is an expired lock -> expiresAt: { $lte: now } will match and the document will be replaced
-                 * c) There is an unexpired lock -> expiresAt: { $lte: now } will not match,
-                 * database will try to insert the new one, but it will fail on duplicate key (_id) error
-                 */
-                await collection.replaceOne({ _id: key, expiresAt: { $lte: now } }, 
-                // replaceOne will use the _id from filter parameter when inserting new document
-                { lockId, expiresAt: new Date(now.getTime() + expireIn) }, { upsert: true });
-            }
-            catch (err) {
-                if (mongoErrorCodes_1.default.DUPLICATE_KEY.includes(err.code)) {
-                    throw errors_1.AppError.concurrentRequest('The lock is already acquired.');
-                }
-                await releaseLock(); // the lock could be possible acquired
-                throw err;
-            }
-        };
-        await (0, concurrentTask_1.default)(acquireLock, { noLaterThan, startAttemptsDelay });
-        try {
-            return await callback();
-        }
-        finally {
-            await releaseLock();
-        }
-    };
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0TW9uZ29Mb2NrZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJnZXRNb25nb0xvY2tlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUM1QyxxQ0FBK0M7QUFDL0Msc0VBQThDO0FBRTlDLHdFQUFnRDtBQVVoRCxNQUFNLHNCQUFzQixHQUFHLEtBQUssRUFBRSxVQUFzQixFQUFFLEVBQUU7SUFDNUQsTUFBTSxlQUFlLEdBQUcsTUFBTSxVQUFVLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDakQsSUFBSSxlQUFlLENBQUMsWUFBWSxDQUFDLFlBQVksRUFBRTtRQUMzQyxNQUFNLFVBQVUsQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLENBQUM7S0FDOUM7QUFDTCxDQUFDLENBQUM7QUFFRixrQkFBZSxLQUFLLEVBQUUsVUFBc0IsRUFBRSxFQUFFO0lBRTVDLE1BQU0sc0JBQXNCLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDekMsTUFBTSxVQUFVLENBQUMsV0FBVyxDQUFDLEVBQUUsU0FBUyxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUUxRSxPQUFPLEtBQUssRUFDUixHQUFRLEVBQ1IsUUFBeUIsRUFDekIsRUFBRSxXQUFXLEdBQUcsSUFBSSxFQUFFLGtCQUFrQixHQUFHLEVBQUUsRUFBRSxRQUFRLEdBQUcsTUFBTSxLQUFvQixFQUFFLEVBQzVFLEVBQUU7UUFFWixNQUFNLE1BQU0sR0FBRyxJQUFJLGtCQUFRLEVBQUUsQ0FBQztRQUU5QixNQUFNLFdBQVcsR0FBRyxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUUsR0FBRyxFQUFFLEdBQVUsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBRTVFLE1BQU0sV0FBVyxHQUFHLEtBQUssSUFBSSxFQUFFO1lBQzNCLElBQUk7Z0JBQ0EsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztnQkFDdkI7Ozs7OzttQkFNRztnQkFDSCxNQUFNLFVBQVUsQ0FBQyxVQUFVLENBQ3ZCLEVBQUUsR0FBRyxFQUFFLEdBQVUsRUFBRSxTQUFTLEVBQUUsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUU7Z0JBQzdDLGdGQUFnRjtnQkFDaEYsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsR0FBRyxRQUFRLENBQUMsRUFBRSxFQUN6RCxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FDbkIsQ0FBQzthQUNMO1lBQUMsT0FBTyxHQUFPLEVBQUU7Z0JBQ2QsSUFBSSx5QkFBZSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFO29CQUNsRCxNQUFNLGlCQUFRLENBQUMsaUJBQWlCLENBQUMsK0JBQStCLENBQUMsQ0FBQztpQkFDckU7Z0JBQ0QsTUFBTSxXQUFXLEVBQUUsQ0FBQyxDQUFDLHNDQUFzQztnQkFDM0QsTUFBTSxHQUFHLENBQUM7YUFDYjtRQUNMLENBQUMsQ0FBQztRQUVGLE1BQU0sSUFBQSx3QkFBYyxFQUFDLFdBQVcsRUFBRSxFQUFFLFdBQVcsRUFBRSxrQkFBa0IsRUFBRSxDQUFDLENBQUM7UUFFdkUsSUFBSTtZQUNBLE9BQU8sTUFBTSxRQUFRLEVBQUUsQ0FBQztTQUUzQjtnQkFBUztZQUNOLE1BQU0sV0FBVyxFQUFFLENBQUM7U0FDdkI7SUFDTCxDQUFDLENBQUM7QUFDTixDQUFDLENBQUMifQ==
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const errors_1 = require("@storyous/errors");
+const mongodb_1 = require("mongodb");
+const concurrentTask_1 = __importDefault(require("./concurrentTask"));
+const mongoErrorCodes_1 = __importDefault(require("./mongoErrorCodes"));
+const _removeDeprecatedIndex = async (collection) => {
+    const collectionStats = await collection.stats();
+    if (collectionStats.indexDetails?.acquiredAt_1) {
+        await collection.dropIndex('acquiredAt_1');
+    }
+};
+exports.default = async (collection) => {
+    await _removeDeprecatedIndex(collection);
+    await collection.createIndex({ expiresAt: 1 }, { expireAfterSeconds: 0 });
+    return async (key, callback, { noLaterThan = 1000, startAttemptsDelay = 50, expireIn = 120000 } = {}) => {
+        const lockId = new mongodb_1.ObjectId();
+        const releaseLock = () => collection.deleteOne({ _id: key, lockId });
+        const acquireLock = async () => {
+            try {
+                const now = new Date();
+                /**
+                 * 3 possible situations
+                 * a) There is no lock -> upsert will create the document
+                 * b) There is an expired lock -> expiresAt: { $lte: now } will match and the document will be replaced
+                 * c) There is an unexpired lock -> expiresAt: { $lte: now } will not match,
+                 * database will try to insert the new one, but it will fail on duplicate key (_id) error
+                 */
+                await collection.replaceOne({ _id: key, expiresAt: { $lte: now } }, 
+                // replaceOne will use the _id from filter parameter when inserting new document
+                { lockId, expiresAt: new Date(now.getTime() + expireIn) }, { upsert: true });
+            }
+            catch (err) {
+                if (mongoErrorCodes_1.default.DUPLICATE_KEY.includes(err.code)) {
+                    throw errors_1.AppError.concurrentRequest('The lock is already acquired.');
+                }
+                await releaseLock(); // the lock could be possible acquired
+                throw err;
+            }
+        };
+        await (0, concurrentTask_1.default)(acquireLock, { noLaterThan, startAttemptsDelay });
+        try {
+            return await callback();
+        }
+        finally {
+            await releaseLock();
+        }
+    };
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0TW9uZ29Mb2NrZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJnZXRNb25nb0xvY2tlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUM1QyxxQ0FBK0M7QUFDL0Msc0VBQThDO0FBRTlDLHdFQUFnRDtBQVVoRCxNQUFNLHNCQUFzQixHQUFHLEtBQUssRUFBRSxVQUFzQixFQUFFLEVBQUU7SUFDNUQsTUFBTSxlQUFlLEdBQUcsTUFBTSxVQUFVLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDakQsSUFBSSxlQUFlLENBQUMsWUFBWSxFQUFFLFlBQVksRUFBRTtRQUM1QyxNQUFNLFVBQVUsQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLENBQUM7S0FDOUM7QUFDTCxDQUFDLENBQUM7QUFFRixrQkFBZSxLQUFLLEVBQUUsVUFBc0IsRUFBRSxFQUFFO0lBRTVDLE1BQU0sc0JBQXNCLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDekMsTUFBTSxVQUFVLENBQUMsV0FBVyxDQUFDLEVBQUUsU0FBUyxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUUxRSxPQUFPLEtBQUssRUFDUixHQUFRLEVBQ1IsUUFBeUIsRUFDekIsRUFBRSxXQUFXLEdBQUcsSUFBSSxFQUFFLGtCQUFrQixHQUFHLEVBQUUsRUFBRSxRQUFRLEdBQUcsTUFBTSxLQUFvQixFQUFFLEVBQzVFLEVBQUU7UUFFWixNQUFNLE1BQU0sR0FBRyxJQUFJLGtCQUFRLEVBQUUsQ0FBQztRQUU5QixNQUFNLFdBQVcsR0FBRyxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUUsR0FBRyxFQUFFLEdBQVUsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBRTVFLE1BQU0sV0FBVyxHQUFHLEtBQUssSUFBSSxFQUFFO1lBQzNCLElBQUk7Z0JBQ0EsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztnQkFDdkI7Ozs7OzttQkFNRztnQkFDSCxNQUFNLFVBQVUsQ0FBQyxVQUFVLENBQ3ZCLEVBQUUsR0FBRyxFQUFFLEdBQVUsRUFBRSxTQUFTLEVBQUUsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUU7Z0JBQzdDLGdGQUFnRjtnQkFDaEYsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsR0FBRyxRQUFRLENBQUMsRUFBRSxFQUN6RCxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FDbkIsQ0FBQzthQUNMO1lBQUMsT0FBTyxHQUFPLEVBQUU7Z0JBQ2QsSUFBSSx5QkFBZSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFO29CQUNsRCxNQUFNLGlCQUFRLENBQUMsaUJBQWlCLENBQUMsK0JBQStCLENBQUMsQ0FBQztpQkFDckU7Z0JBQ0QsTUFBTSxXQUFXLEVBQUUsQ0FBQyxDQUFDLHNDQUFzQztnQkFDM0QsTUFBTSxHQUFHLENBQUM7YUFDYjtRQUNMLENBQUMsQ0FBQztRQUVGLE1BQU0sSUFBQSx3QkFBYyxFQUFDLFdBQVcsRUFBRSxFQUFFLFdBQVcsRUFBRSxrQkFBa0IsRUFBRSxDQUFDLENBQUM7UUFFdkUsSUFBSTtZQUNBLE9BQU8sTUFBTSxRQUFRLEVBQUUsQ0FBQztTQUUzQjtnQkFBUztZQUNOLE1BQU0sV0FBVyxFQUFFLENBQUM7U0FDdkI7SUFDTCxDQUFDLENBQUM7QUFDTixDQUFDLENBQUMifQ==

package/lib/getMongoLocker.ts

@@ -14,7 +14,7 @@ export type LockerOptions = {
 
 const _removeDeprecatedIndex = async (collection: Collection) => {
     const collectionStats = await collection.stats();
-    if (collectionStats.indexDetails.acquiredAt_1) {
+    if (collectionStats.indexDetails?.acquiredAt_1) {
         await collection.dropIndex('acquiredAt_1');
     }
 };

package/lib/index.d.ts

@@ -1,11 +1,12 @@
-import appData from './appData';
-import fixtures from './fixtures';
-import getCollection from './getCollection';
-import getMongoLocker, { LockCallback, LockerOptions } from './getMongoLocker';
-import Migration from './migrations/Migration';
-import MigrationsStore from './migrations/MigrationsStore';
-import runMigrations from './migrations/runMigrations';
-import mongoClient from './mongoClient';
-import mongoLocker from './mongoLocker';
-import withTransaction from './withTransaction';
-export { appData, fixtures, getCollection, getMongoLocker, LockCallback, LockerOptions, Migration, MigrationsStore, mongoClient, mongoLocker, runMigrations, withTransaction, };
+import { ObjectId } from 'mongodb';
+import appData from './appData';
+import fixtures from './fixtures';
+import getCollection from './getCollection';
+import getMongoLocker, { LockCallback, LockerOptions } from './getMongoLocker';
+import Migration from './migrations/Migration';
+import MigrationsStore from './migrations/MigrationsStore';
+import runMigrations from './migrations/runMigrations';
+import mongoClient from './mongoClient';
+import mongoLocker from './mongoLocker';
+import withTransaction from './withTransaction';
+export { appData, fixtures, getCollection, getMongoLocker, LockCallback, LockerOptions, Migration, MigrationsStore, mongoClient, mongoLocker, runMigrations, withTransaction, ObjectId, };

package/lib/index.js

@@ -1,27 +1,29 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withTransaction = exports.runMigrations = exports.mongoLocker = exports.mongoClient = exports.MigrationsStore = exports.Migration = exports.getMongoLocker = exports.getCollection = exports.fixtures = exports.appData = void 0;
-const appData_1 = __importDefault(require("./appData"));
-exports.appData = appData_1.default;
-const fixtures_1 = __importDefault(require("./fixtures"));
-exports.fixtures = fixtures_1.default;
-const getCollection_1 = __importDefault(require("./getCollection"));
-exports.getCollection = getCollection_1.default;
-const getMongoLocker_1 = __importDefault(require("./getMongoLocker"));
-exports.getMongoLocker = getMongoLocker_1.default;
-const Migration_1 = __importDefault(require("./migrations/Migration"));
-exports.Migration = Migration_1.default;
-const MigrationsStore_1 = __importDefault(require("./migrations/MigrationsStore"));
-exports.MigrationsStore = MigrationsStore_1.default;
-const runMigrations_1 = __importDefault(require("./migrations/runMigrations"));
-exports.runMigrations = runMigrations_1.default;
-const mongoClient_1 = __importDefault(require("./mongoClient"));
-exports.mongoClient = mongoClient_1.default;
-const mongoLocker_1 = __importDefault(require("./mongoLocker"));
-exports.mongoLocker = mongoLocker_1.default;
-const withTransaction_1 = __importDefault(require("./withTransaction"));
-exports.withTransaction = withTransaction_1.default;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx3REFBZ0M7QUFZNUIsa0JBWkcsaUJBQU8sQ0FZSDtBQVhYLDBEQUFrQztBQVk5QixtQkFaRyxrQkFBUSxDQVlIO0FBWFosb0VBQTRDO0FBWXhDLHdCQVpHLHVCQUFhLENBWUg7QUFYakIsc0VBQStFO0FBWTNFLHlCQVpHLHdCQUFjLENBWUg7QUFYbEIsdUVBQStDO0FBYzNDLG9CQWRHLG1CQUFTLENBY0g7QUFiYixtRkFBMkQ7QUFjdkQsMEJBZEcseUJBQWUsQ0FjSDtBQWJuQiwrRUFBdUQ7QUFnQm5ELHdCQWhCRyx1QkFBYSxDQWdCSDtBQWZqQixnRUFBd0M7QUFhcEMsc0JBYkcscUJBQVcsQ0FhSDtBQVpmLGdFQUF3QztBQWFwQyxzQkFiRyxxQkFBVyxDQWFIO0FBWmYsd0VBQWdEO0FBYzVDLDBCQWRHLHlCQUFlLENBY0gifQ==
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ObjectId = exports.withTransaction = exports.runMigrations = exports.mongoLocker = exports.mongoClient = exports.MigrationsStore = exports.Migration = exports.getMongoLocker = exports.getCollection = exports.fixtures = exports.appData = void 0;
+const mongodb_1 = require("mongodb");
+Object.defineProperty(exports, "ObjectId", { enumerable: true, get: function () { return mongodb_1.ObjectId; } });
+const appData_1 = __importDefault(require("./appData"));
+exports.appData = appData_1.default;
+const fixtures_1 = __importDefault(require("./fixtures"));
+exports.fixtures = fixtures_1.default;
+const getCollection_1 = __importDefault(require("./getCollection"));
+exports.getCollection = getCollection_1.default;
+const getMongoLocker_1 = __importDefault(require("./getMongoLocker"));
+exports.getMongoLocker = getMongoLocker_1.default;
+const Migration_1 = __importDefault(require("./migrations/Migration"));
+exports.Migration = Migration_1.default;
+const MigrationsStore_1 = __importDefault(require("./migrations/MigrationsStore"));
+exports.MigrationsStore = MigrationsStore_1.default;
+const runMigrations_1 = __importDefault(require("./migrations/runMigrations"));
+exports.runMigrations = runMigrations_1.default;
+const mongoClient_1 = __importDefault(require("./mongoClient"));
+exports.mongoClient = mongoClient_1.default;
+const mongoLocker_1 = __importDefault(require("./mongoLocker"));
+exports.mongoLocker = mongoLocker_1.default;
+const withTransaction_1 = __importDefault(require("./withTransaction"));
+exports.withTransaction = withTransaction_1.default;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxxQ0FBbUM7QUF5Qi9CLHlGQXpCSyxrQkFBUSxPQXlCTDtBQXhCWix3REFBZ0M7QUFZNUIsa0JBWkcsaUJBQU8sQ0FZSDtBQVhYLDBEQUFrQztBQVk5QixtQkFaRyxrQkFBUSxDQVlIO0FBWFosb0VBQTRDO0FBWXhDLHdCQVpHLHVCQUFhLENBWUg7QUFYakIsc0VBQStFO0FBWTNFLHlCQVpHLHdCQUFjLENBWUg7QUFYbEIsdUVBQStDO0FBYzNDLG9CQWRHLG1CQUFTLENBY0g7QUFiYixtRkFBMkQ7QUFjdkQsMEJBZEcseUJBQWUsQ0FjSDtBQWJuQiwrRUFBdUQ7QUFnQm5ELHdCQWhCRyx1QkFBYSxDQWdCSDtBQWZqQixnRUFBd0M7QUFhcEMsc0JBYkcscUJBQVcsQ0FhSDtBQVpmLGdFQUF3QztBQWFwQyxzQkFiRyxxQkFBVyxDQWFIO0FBWmYsd0VBQWdEO0FBYzVDLDBCQWRHLHlCQUFlLENBY0gifQ==

package/lib/migrations/Migration.d.ts

@@ -1,6 +1,6 @@
-export default class Migration {
-    description: string;
-    up: Function;
-    down: Function;
-    constructor(description: string, up: Function, down?: () => null);
-}
+export default class Migration {
+    description: string;
+    up: Function;
+    down: Function;
+    constructor(description: string, up: Function, down?: () => null);
+}

package/lib/migrations/Migration.js

@@ -1,22 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class Migration {
-    constructor(description, up, down = () => null) {
-        this.description = description;
-        // NOTE 'up' and 'down' has to be as properties because of 'migrate' package
-        this.up = (next) => {
-            (async () => {
-                await up();
-                next();
-            })().catch(next);
-        };
-        this.down = (next) => {
-            (async () => {
-                await down();
-                next();
-            })().catch(next);
-        };
-    }
-}
-exports.default = Migration;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Migration {
+    constructor(description, up, down = () => null) {
+        this.description = description;
+        // NOTE 'up' and 'down' has to be as properties because of 'migrate' package
+        this.up = (next) => {
+            (async () => {
+                await up();
+                next();
+            })().catch(next);
+        };
+        this.down = (next) => {
+            (async () => {
+                await down();
+                next();
+            })().catch(next);
+        };
+    }
+}
+exports.default = Migration;
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWlncmF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiTWlncmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsTUFBcUIsU0FBUztJQVExQixZQUFhLFdBQW1CLEVBQUUsRUFBWSxFQUFFLElBQUksR0FBRyxHQUFHLEVBQUUsQ0FBQyxJQUFJO1FBQzdELElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO1FBRS9CLDRFQUE0RTtRQUM1RSxJQUFJLENBQUMsRUFBRSxHQUFHLENBQUMsSUFBa0IsRUFBRSxFQUFFO1lBQzdCLENBQUMsS0FBSyxJQUFJLEVBQUU7Z0JBQ1IsTUFBTSxFQUFFLEVBQUUsQ0FBQztnQkFDWCxJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3JCLENBQUMsQ0FBQztRQUVGLElBQUksQ0FBQyxJQUFJLEdBQUcsQ0FBQyxJQUFrQixFQUFFLEVBQUU7WUFDL0IsQ0FBQyxLQUFLLElBQUksRUFBRTtnQkFDUixNQUFNLElBQUksRUFBRSxDQUFDO2dCQUNiLElBQUksRUFBRSxDQUFDO1lBQ1gsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDckIsQ0FBQyxDQUFDO0lBQ04sQ0FBQztDQUNKO0FBMUJELDRCQTBCQyJ9

package/lib/migrations/MigrationsStore.d.ts

@@ -1,13 +1,13 @@
-import { CallbackError, Migration } from 'migrate';
-import { Logger } from 'winston';
-export default class MigrationsStore {
-    private _logger;
-    private _safeMigration;
-    constructor(_logger: Logger, path: string, _safeMigration: boolean);
-    save(set: Object, cb: CallbackError): void;
-    load(cb: (err: any, store: {
-        lastRun?: string;
-        migrations: Pick<Migration, 'title' | 'description' | 'timestamp'>[];
-    }) => void): void;
-    private _checkValidMigrations;
-}
+import { CallbackError, Migration } from 'migrate';
+import { Logger } from 'winston';
+export default class MigrationsStore {
+    private _logger;
+    private _safeMigration;
+    constructor(_logger: Logger, path: string, _safeMigration: boolean);
+    save(set: Object, cb: CallbackError): void;
+    load(cb: (err: any, store: {
+        lastRun?: string;
+        migrations: Pick<Migration, 'title' | 'description' | 'timestamp'>[];
+    }) => void): void;
+    private _checkValidMigrations;
+}