Enable adding multiple storages to proxy ✨

Author: MiroDojkic

server/app.js

@@ -17,11 +17,12 @@ const config = require('../config/server');
 const logger = require('./shared/logger')();
 const storage = require('./shared/storage')(config.storage);
 serviceProvider.set('storage', storage);
-const storageProxy = require('./shared/storage/proxy')(config.storage.proxy, storage);
+const storageProxy = require('./shared/storage/proxy')(config.storage.proxy);
 serviceProvider.set('storageProxy', storageProxy);
 const router = require('./router');
 /* eslint-enable */
 
+storageProxy.addStorage('repository', storage);
 const { STORAGE_PATH } = process.env;
 
 const app = express();

server/shared/storage/proxy/index.js

@@ -6,8 +6,8 @@ const path = require('path');
 const uniq = require('lodash/uniq');
 
 class Proxy {
-  constructor(config, storage) {
-    this.storage = storage;
+  constructor(config) {
+    this.storages = {};
     this.provider = Proxy.createProvider(config);
     this.accessManagers = [this.provider.accessManager];
     autobind(this);
@@ -30,12 +30,27 @@ class Proxy {
     return this.isSelfHosted && this.provider.path;
   }
 
+  addStorage(path, storage) {
+    const existing = this.storages[path];
+    if (existing) throw new Error(`Storage is already mounted on ${path} path.`);
+    this.storages[path] = storage;
+  }
+
   registerAccessManager(manager) {
     this.accessManagers.push(manager);
   }
 
+  getStorage(key) {
+    const path = Object.keys(this.storages)
+      .sort(compareStringsByLengthDesc)
+      .find(path => key.startsWith(path));
+
+    return path && this.storages[path];
+  }
+
   createReadStream(key) {
-    return this.storage.createReadStream(key);
+    const storage = this.getStorage(key);
+    return storage.createReadStream(key);
   }
 
   getFileUrl(key) {
@@ -65,3 +80,7 @@ function loadProvider(name) {
     throw err;
   }
 }
+
+function compareStringsByLengthDesc(fst, sec) {
+  return sec.length - fst.length;
+}