Merge pull request #840 from veliovgroup/dev

📦 v2.1.1

.versions

@@ -21,7 +21,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-local-test:ostrio:[email protected].0
+local-test:ostrio:[email protected].1
 [email protected]
 [email protected]
 [email protected]
@@ -35,7 +35,7 @@ [email protected]
 [email protected]
 [email protected]
 ostrio:[email protected]
-ostrio:[email protected].0
+ostrio:[email protected].1
 [email protected]
 [email protected]
 [email protected]

package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ostrio:files',
-  version: '2.1.0',
+  version: '2.1.1',
   summary: 'Upload files to Meteor application, with 3rd party storage support: AWS:S3, GridFS and other',
   git: 'https://github.com/veliovgroup/Meteor-Files',
   documentation: 'README.md'

server.js

@@ -22,6 +22,53 @@ import nodePath from 'path';
 const bound = Meteor.bindEnvironment(callback => callback());
 const noop = function noop () {};
 
+/**
+ * Create (ensure) index on MongoDB collection, catch and log exception if thrown
+ * @function createIndex
+ * @param {Mongo.Collection} collection - Mongo.Collection instance
+ * @param {object} keys - Field and value pairs where the field is the index key and the value describes the type of index for that field
+ * @param {object} opts - Set of options that controls the creation of the index
+ * @returns {void 0}
+ */
+const createIndex = async (collection, keys, opts) => {
+  try {
+    await collection.rawCollection().createIndex(keys, opts);
+  } catch (e) {
+    if (e.code === 85) {
+      let indexName;
+      const indexes = await collection.rawCollection().indexes();
+      for (const index of indexes) {
+        let allMatch = true;
+        for (const indexKey of Object.keys(keys)) {
+          if (typeof index.key[indexKey] === 'undefined') {
+            allMatch = false;
+            break;
+          }
+        }
+
+        for (const indexKey of Object.keys(index.key)) {
+          if (typeof keys[indexKey] === 'undefined') {
+            allMatch = false;
+            break;
+          }
+        }
+
+        if (allMatch) {
+          indexName = index.name;
+          break;
+        }
+      }
+
+      if (indexName) {
+        await collection.rawCollection().dropIndex(indexName);
+        await collection.rawCollection().createIndex(keys, opts);
+      }
+    } else {
+      Meteor._debug(`Can not set ${Object.keys(keys).join(' + ')} index on "${collection._name}" collection`, { keys, opts, details: e });
+    }
+  }
+};
+
 /**
  * @locus Anywhere
  * @class FilesCollection
@@ -336,7 +383,7 @@ export class FilesCollection extends FilesCollectionCore {
       }
       check(this._preCollectionName, String);
 
-      this._preCollection.createIndex({ createdAt: 1 }, { expireAfterSeconds: this.continueUploadTTL, background: true });
+      createIndex(this._preCollection, { createdAt: 1 }, { expireAfterSeconds: this.continueUploadTTL, background: true });
       const _preCollectionCursor = this._preCollection.find({}, {
         fields: {
           _id: 1,