blixify-server 0.2.21 → 0.2.22

package/dist/apis/uploadWrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadWrapper.d.ts","sourceRoot":"","sources":["../../src/apis/uploadWrapper.ts"],"names":[],"mappings":"AACA,OAAO,cAAc,MAAM,yBAAyB,CAAC;AAIrD,UAAU,SAAS;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,EAAE,GAAG,CAAC;IAChB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED;;;GAGG;AACH,qBAAa,aAAa;IACxB,WAAW,EAAE,GAAG,CAAM;IACtB,MAAM,UAAS;IACf,MAAM,EAAE,cAAc,CAQpB;IACF,GAAG,EAAE,SAAS,CAAC;IACf,WAAW,SAAc;IAEzB,YAAY,QAAS,GAAG,sBAAsB,OAAO,aAUnD;gBAGA,WAAW,EAAE,GAAG,EAChB,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,SAAS,EACd,WAAW,CAAC,EAAE,UAAU,GAAG,KAAK;IASlC,UAAU,QAAe,GAAG,OAAO,GAAG,QAAQ,QAAQ,GAAG,QAAQ,mBAkG/D;IAEF,UAAU,QAAe,GAAG,OAAO,GAAG,mBAuCpC;IAEF,0BAA0B,cAAqB,GAAG,mBAwBhD;IAEF,sBAAsB,eACR,MAAM,mBACD,MAAM,mBAiBvB;IAEF,mBAAmB,QAAe,GAAG,OAAO,GAAG,mBAqC7C;IAEF,wBAAwB,QAAe,GAAG,OAAO,GAAG,mBA2ClD;IAEF,OAAO,QAAe,GAAG,OAAO,GAAG,mBAgCjC;IAEF,IAAI,YA6EF;CACH"}
+{"version":3,"file":"uploadWrapper.d.ts","sourceRoot":"","sources":["../../src/apis/uploadWrapper.ts"],"names":[],"mappings":"AAGA,OAAO,cAAc,MAAM,yBAAyB,CAAC;AAErD,UAAU,SAAS;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,EAAE,GAAG,CAAC;IAChB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED;;;GAGG;AACH,qBAAa,aAAa;IACxB,WAAW,EAAE,GAAG,CAAM;IACtB,MAAM,UAAS;IACf,MAAM,EAAE,cAAc,CAQpB;IACF,GAAG,EAAE,SAAS,CAAC;IACf,WAAW,SAAc;IAEzB,YAAY,QAAS,GAAG,sBAAsB,OAAO,aAUnD;gBAGA,WAAW,EAAE,GAAG,EAChB,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,SAAS,EACd,WAAW,CAAC,EAAE,UAAU,GAAG,KAAK;IASlC,UAAU,QAAe,GAAG,OAAO,GAAG,QAAQ,QAAQ,GAAG,QAAQ,mBAkG/D;IAEF,UAAU,QAAe,GAAG,OAAO,GAAG,mBAuCpC;IAEF,0BAA0B,cAAqB,GAAG,mBAwBhD;IAEF,sBAAsB,eACR,MAAM,mBACD,MAAM,mBAiBvB;IAEF,mBAAmB,QAAe,GAAG,OAAO,GAAG,mBAqC7C;IAEF,wBAAwB,QAAe,GAAG,OAAO,GAAG,mBA2ClD;IAEF,OAAO,QAAe,GAAG,OAAO,GAAG,mBAqCjC;IAEF,IAAI,YA6EF;CACH"}

package/dist/apis/uploadWrapper.js

@@ -13,9 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UploadWrapper = void 0;
-const QueryModel_1 = require("../model/QueryModel");
 const axios_1 = __importDefault(require("axios"));
 const mime_1 = __importDefault(require("mime"));
+const QueryModel_1 = require("../model/QueryModel");
 /**
  * @Wrapper
  *
@@ -294,12 +294,16 @@ class UploadWrapper {
         this.initGet = (req, res) => __awaiter(this, void 0, void 0, function* () {
             //TODO: add FB initGet
             try {
-                const { bucketName, assetCollectionName, assetParentId, fileName } = req.params;
+                const { bucketName, assetCollectionName, assetParentId } = req.params;
+                const fullPath = req.path;
+                const basePath = `/get/${bucketName}/${assetCollectionName}/${assetParentId}/`;
+                const nestedPath = fullPath.replace(basePath, "");
                 if (this.storageType === "aws") {
                     const s3 = new this.uploadAdmin.S3();
+                    const key = `${assetCollectionName}/${assetParentId}/${nestedPath}`;
                     const params = {
                         Bucket: bucketName,
-                        Key: `${assetCollectionName}/${assetParentId}/${fileName}`,
+                        Key: key,
                     };
                     s3.headObject(params, (err) => __awaiter(this, void 0, void 0, function* () {
                         if (err && err.code === "NotFound") {
@@ -307,7 +311,7 @@ class UploadWrapper {
                         }
                         else {
                             const resp = yield s3.getObject(params).promise();
-                            const extension = fileName.split(".").pop();
+                            const extension = nestedPath.split(".").pop();
                             let contentType;
                             if (extension === "mbtiles") {
                                 contentType = "application/vnd.mapbox-vector-tile";
@@ -381,9 +385,9 @@ class UploadWrapper {
              * bucketName - string
              * assetCollectionName - string
              * assetParentId - string
-             * fileName - string
+             * * - string - Any number of nested paths and the final filename
              */
-            router.get("/get/:bucketName/:assetCollectionName/:assetParentId/:fileName", this.initGet);
+            router.get("/get/:bucketName/:assetCollectionName/:assetParentId/*", this.initGet);
             return router;
         };
         this.uploadAdmin = uploadAdmin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blixify-server",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "license": "MIT",
   "main": "dist/apis/index.js",
   "private": false,