blixify-server 0.2.20 → 0.2.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongoWrapper.d.ts","sourceRoot":"","sources":["../../src/apis/mongoWrapper.ts"],"names":[],"mappings":"AASA,OAAO,cAAc,MAAM,yBAAyB,CAAC;AAGrD,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAgJD;;;;GAIG;AACH,qBAAa,YAAY;IACvB,OAAO,EAAE,GAAG,CAAM;IAClB,UAAU,SAAM;IAChB,MAAM,UAAS;IACf,MAAM,EAAE,cAAc,CAQpB;IACF,GAAG,EAAE,UAAU,CAAC;IAChB,OAAO,SAAM;IACb,KAAK,SAAM;IACX,WAAW,EAAE,GAAG,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC;IAEX,YAAY,QAAS,GAAG,aAEtB;gBAGA,OAAO,EAAE,GAAG,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,cAAc,EACtB,YAAY,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,EACrD,GAAG,EAAE,UAAU,EACf,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EACzC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI;IAe3D,UAAU,SAAU,GAAG,SAIrB;IAEF,aAAa,YACF,GAAG,QACN,QAAQ,GAAG,QAAQ,GAAG,QAAQ,OAC/B,GAAG,UACA;QACN,GAAG,CAAC,EAAE,GAAG,CAAC;QACV,GAAG,CAAC,EAAE,GAAG,CAAC;KACX,mBA8CD;IAEF,eAAe,QACR,GAAG,OACH,GAAG,yBACc,GAAG,EAAE,KAAK,QAAQ,GAAG,CAAC;;mBAyE5C;IAEF,UAAU,QACH,GAAG,OACH,GAAG,qBACU,GAAG,KAAK,QAAQ,GAAG,CAAC;;mBAkDtC;IAEF,OAAO,QAAe,GAAG,OAAO,GAAG;;mBAuCjC;IAEF,eAAe,QACR,GAAG,OACH,GAAG,qBACU,GAAG,KAAK,QAAQ,GAAG,CAAC;;mBAgKtC;IAEF,UAAU,QACH,GAAG,OACH,GAAG,qBACU,GAAG,KAAK,QAAQ,GAAG,CAAC;;mBAqGtC;IAEF,eAAe,QACR,GAAG,OACH,GAAG,yBACc,GAAG,EAAE,KAAK,QAAQ,GAAG,CAAC;;mBA0I5C;IAEF,UAAU,QACH,GAAG,OACH,GAAG,qBACU,GAAG,KAAK,QAAQ,GAAG,CAAC;;mBAwCtC;IAEF,mBAAmB,CAAC,GAAG,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"mongoWrapper.d.ts","sourceRoot":"","sources":["../../src/apis/mongoWrapper.ts"],"names":[],"mappings":"AASA,OAAO,cAAc,MAAM,yBAAyB,CAAC;AAGrD,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAgJD;;;;GAIG;AACH,qBAAa,YAAY;IACvB,OAAO,EAAE,GAAG,CAAM;IAClB,UAAU,SAAM;IAChB,MAAM,UAAS;IACf,MAAM,EAAE,cAAc,CAQpB;IACF,GAAG,EAAE,UAAU,CAAC;IAChB,OAAO,SAAM;IACb,KAAK,SAAM;IACX,WAAW,EAAE,GAAG,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC;IAEX,YAAY,QAAS,GAAG,aAEtB;gBAGA,OAAO,EAAE,GAAG,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,cAAc,EACtB,YAAY,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,EACrD,GAAG,EAAE,UAAU,EACf,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EACzC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI;IAe3D,UAAU,SAAU,GAAG,SAIrB;IAEF,aAAa,YACF,GAAG,QACN,QAAQ,GAAG,QAAQ,GAAG,QAAQ,OAC/B,GAAG,UACA;QACN,GAAG,CAAC,EAAE,GAAG,CAAC;QACV,GAAG,CAAC,EAAE,GAAG,CAAC;KACX,mBA8CD;IAEF,eAAe,QACR,GAAG,OACH,GAAG,yBACc,GAAG,EAAE,KAAK,QAAQ,GAAG,CAAC;;mBAyE5C;IAEF,UAAU,QACH,GAAG,OACH,GAAG,qBACU,GAAG,KAAK,QAAQ,GAAG,CAAC;;mBAkDtC;IAEF,OAAO,QAAe,GAAG,OAAO,GAAG;;mBAuCjC;IAEF,eAAe,QACR,GAAG,OACH,GAAG,qBACU,GAAG,KAAK,QAAQ,GAAG,CAAC;;mBAgKtC;IAEF,UAAU,QACH,GAAG,OACH,GAAG,qBACU,GAAG,KAAK,QAAQ,GAAG,CAAC;;mBAqGtC;IAEF,eAAe,QACR,GAAG,OACH,GAAG,yBACc,GAAG,EAAE,KAAK,QAAQ,GAAG,CAAC;;mBA0I5C;IAEF,UAAU,QACH,GAAG,OACH,GAAG,qBACU,GAAG,KAAK,QAAQ,GAAG,CAAC;;mBAwCtC;IAEF,mBAAmB,CAAC,GAAG,EAAE,GAAG;IAiN5B,QAAQ,QAAe,GAAG,OAAO,GAAG;;;;;mBAgQlC;IAEF,IAAI,YA+EF;CACH"}
|
|
@@ -1053,7 +1053,7 @@ class MongoWrapper {
|
|
|
1053
1053
|
* query - Query interface (Optional)
|
|
1054
1054
|
* cursor - any (Optional)
|
|
1055
1055
|
* limit - number (Optional)
|
|
1056
|
-
* sort - Sort interface (Optional)
|
|
1056
|
+
* sort - Array Sort or Sort interface (Optional)
|
|
1057
1057
|
* stopLimit - boolean to retreive all data (Optional)
|
|
1058
1058
|
*/
|
|
1059
1059
|
router.post("/list", (req, res) => {
|
|
@@ -1213,10 +1213,19 @@ class MongoWrapper {
|
|
|
1213
1213
|
const filter = handleParseQueryFilter(query);
|
|
1214
1214
|
pipelineList.push({ $match: filter });
|
|
1215
1215
|
}
|
|
1216
|
-
if (sort
|
|
1217
|
-
|
|
1218
|
-
|
|
1216
|
+
if (sort) {
|
|
1217
|
+
const sortStage = { $sort: {} };
|
|
1218
|
+
const sortItems = Array.isArray(JSON.parse(JSON.stringify(sort)))
|
|
1219
|
+
? sort
|
|
1220
|
+
: [sort];
|
|
1221
|
+
sortItems.forEach((sortItem) => {
|
|
1222
|
+
if (sortItem.sortId) {
|
|
1223
|
+
sortStage.$sort[sortItem.sortId] = sortItem.type === "asc" ? 1 : -1;
|
|
1224
|
+
}
|
|
1219
1225
|
});
|
|
1226
|
+
if (Object.keys(sortStage.$sort).length > 0) {
|
|
1227
|
+
pipelineList.push(sortStage);
|
|
1228
|
+
}
|
|
1220
1229
|
}
|
|
1221
1230
|
if (cursor) {
|
|
1222
1231
|
pipelineList.push({ $skip: Number.parseInt(cursor) });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadWrapper.d.ts","sourceRoot":"","sources":["../../src/apis/uploadWrapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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"}
|
|
@@ -13,9 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.UploadWrapper = void 0;
|
|
16
|
-
const QueryModel_1 = require("../model/QueryModel");
|
|
17
16
|
const axios_1 = __importDefault(require("axios"));
|
|
18
17
|
const mime_1 = __importDefault(require("mime"));
|
|
18
|
+
const QueryModel_1 = require("../model/QueryModel");
|
|
19
19
|
/**
|
|
20
20
|
* @Wrapper
|
|
21
21
|
*
|
|
@@ -294,12 +294,16 @@ class UploadWrapper {
|
|
|
294
294
|
this.initGet = (req, res) => __awaiter(this, void 0, void 0, function* () {
|
|
295
295
|
//TODO: add FB initGet
|
|
296
296
|
try {
|
|
297
|
-
const { bucketName, assetCollectionName, assetParentId
|
|
297
|
+
const { bucketName, assetCollectionName, assetParentId } = req.params;
|
|
298
|
+
const fullPath = req.path;
|
|
299
|
+
const basePath = `/get/${bucketName}/${assetCollectionName}/${assetParentId}/`;
|
|
300
|
+
const nestedPath = fullPath.replace(basePath, "");
|
|
298
301
|
if (this.storageType === "aws") {
|
|
299
302
|
const s3 = new this.uploadAdmin.S3();
|
|
303
|
+
const key = `${assetCollectionName}/${assetParentId}/${nestedPath}`;
|
|
300
304
|
const params = {
|
|
301
305
|
Bucket: bucketName,
|
|
302
|
-
Key:
|
|
306
|
+
Key: key,
|
|
303
307
|
};
|
|
304
308
|
s3.headObject(params, (err) => __awaiter(this, void 0, void 0, function* () {
|
|
305
309
|
if (err && err.code === "NotFound") {
|
|
@@ -307,7 +311,7 @@ class UploadWrapper {
|
|
|
307
311
|
}
|
|
308
312
|
else {
|
|
309
313
|
const resp = yield s3.getObject(params).promise();
|
|
310
|
-
const extension =
|
|
314
|
+
const extension = nestedPath.split(".").pop();
|
|
311
315
|
let contentType;
|
|
312
316
|
if (extension === "mbtiles") {
|
|
313
317
|
contentType = "application/vnd.mapbox-vector-tile";
|
|
@@ -381,9 +385,9 @@ class UploadWrapper {
|
|
|
381
385
|
* bucketName - string
|
|
382
386
|
* assetCollectionName - string
|
|
383
387
|
* assetParentId - string
|
|
384
|
-
*
|
|
388
|
+
* * - string - Any number of nested paths and the final filename
|
|
385
389
|
*/
|
|
386
|
-
router.get("/get/:bucketName/:assetCollectionName/:assetParentId
|
|
390
|
+
router.get("/get/:bucketName/:assetCollectionName/:assetParentId/*", this.initGet);
|
|
387
391
|
return router;
|
|
388
392
|
};
|
|
389
393
|
this.uploadAdmin = uploadAdmin;
|