factored out extensions into npm module

3 files changed, 8 insertions, 12 deletions

diff --git a/src/server/apis/google/GooglePhotosUploadUtils.ts b/src/server/apis/google/GooglePhotosUploadUtils.ts
index fc6772ffd..29575763c 100644
--- a/src/server/apis/google/GooglePhotosUploadUtils.ts
+++ b/src/server/apis/google/GooglePhotosUploadUtils.ts
@@ -7,7 +7,7 @@ import { Opt } from '../../../new_fields/Doc';
 import * as sharp from 'sharp';
 import { MediaItemCreationResult } from './SharedTypes';
 import { NewMediaItem } from "../../index";
-const { TimeUnit } = require("../../../extensions/ArrayExtensions");
+import { batchedMapInterval, FixedBatcher, TimeUnit, Interval } from "array-batcher";
 
 const uploadDirectory = path.join(__dirname, "../../public/files/");
 
@@ -81,10 +81,10 @@ export namespace GooglePhotosUploadUtils {
                 });
             })).newMediaItemResults;
         };
-        const batcher = { batchSize: 50 };
-        const interval = { magnitude: 100, unit: TimeUnit.Milliseconds };
+        const batcher: FixedBatcher = { batchSize: 50 };
+        const interval: Interval = { magnitude: 100, unit: TimeUnit.Milliseconds };
 
-        const newMediaItemResults = await newMediaItems.batchedMapInterval(batcher, createFromUploadTokens, interval);
+        const newMediaItemResults = await batchedMapInterval(newMediaItems, batcher, createFromUploadTokens, interval);
 
         return { newMediaItemResults };
     };
diff --git a/src/server/credentials/google_docs_token.json b/src/server/credentials/google_docs_token.json
index 7c49eed43..cdea139a3 100644
--- a/src/server/credentials/google_docs_token.json
+++ b/src/server/credentials/google_docs_token.json
@@ -1 +1 @@
-{"access_token":"ya29.ImCJB1Y8Z8vgUH4vyYA9xwqvLg281kOQKfA8_AGs_EqF1VKQVWfZsMoYkPJN3QwJmIUxlzTO1N-ehUGIxu0Jq3kKR-zzW7rQIMgeQu32OHogK4kvFxpM7l7RNYRw_9x22I0","refresh_token":"1/HTv_xFHszu2Nf3iiFrUTaeKzC_Vp2-6bpIB06xW_WHI","scope":"https://www.googleapis.com/auth/presentations.readonly https://www.googleapis.com/auth/documents.readonly https://www.googleapis.com/auth/drive.file https://www.googleapis.com/auth/documents https://www.googleapis.com/auth/photoslibrary https://www.googleapis.com/auth/photoslibrary.appendonly https://www.googleapis.com/auth/drive https://www.googleapis.com/auth/presentations https://www.googleapis.com/auth/photoslibrary.sharing","token_type":"Bearer","expiry_date":1568935635717}
\ No newline at end of file
+{"access_token":"ya29.ImCJB_jd-XlGcIHAHgN2Zl3BWQ6sMHdeMMuRxU6sPCbAYIT8hXws-WDmQf65ZY1f-0d3y7HcCcuOxtZJ_0IcBb1-yIBxiOf3VJWPmvjGiJQq_mANGVSSmsBHhqpIaYkeQN0","refresh_token":"1/HTv_xFHszu2Nf3iiFrUTaeKzC_Vp2-6bpIB06xW_WHI","scope":"https://www.googleapis.com/auth/presentations.readonly https://www.googleapis.com/auth/documents.readonly https://www.googleapis.com/auth/drive.file https://www.googleapis.com/auth/documents https://www.googleapis.com/auth/photoslibrary https://www.googleapis.com/auth/photoslibrary.appendonly https://www.googleapis.com/auth/drive https://www.googleapis.com/auth/presentations https://www.googleapis.com/auth/photoslibrary.sharing","token_type":"Bearer","expiry_date":1568973665276}
\ No newline at end of file
diff --git a/src/server/index.ts b/src/server/index.ts
index e3e4221cf..e03079d66 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -47,9 +47,7 @@ const mongoose = require('mongoose');
 const probe = require("probe-image-size");
 import * as qs from 'query-string';
 import { Opt } from '../new_fields/Doc';
-const Extensions = require("../extensions/Extensions");
-const ArrayExtensions = require("../extensions/ArrayExtensions");
-
+import { batchedMapInterval, TimeUnit } from "array-batcher";
 
 const download = (url: string, dest: fs.PathLike) => request.get(url).pipe(fs.createWriteStream(dest));
 let youtubeApiKey: string;
@@ -101,8 +99,6 @@ enum Method {
     POST
 }
 
-Extensions.AssignExtensions();
-
 /**
  * Please invoke this function when adding a new route to Dash's server.
  * It ensures that any requests leading to or containing user-sensitive information
@@ -861,9 +857,9 @@ app.post(RouteStore.googlePhotosMediaUpload, async (req, res) => {
         return newMediaItems;
     };
     const batcher = { batchSize: 25 };
-    const interval = { magnitude: 100, unit: ArrayExtensions.TimeUnit.Milliseconds };
+    const interval = { magnitude: 100, unit: TimeUnit.Milliseconds };
 
-    const newMediaItems = await mediaInput.batchedMapInterval(batcher, dispatchUpload, interval);
+    const newMediaItems = await batchedMapInterval(mediaInput, batcher, dispatchUpload, interval);
 
     if (failed) {
         return _error(res, tokenError);