@stemy/backend 2.9.2 → 2.9.5

package/bundles/stemy-backend.umd.js

@@ -1212,7 +1212,7 @@
         "application/font-woff", "application/font-woff2", "application/x-font-opentype", "application/x-font-truetype", "application/x-font-datafork",
         "font/woff", "font/woff2", "font/otf", "font/ttf", "font/datafork"
     ];
-    var imageTypes = ["image/jpeg", "image/jpg", "image/png"];
+    var imageTypes = ["image/jpeg", "image/jpg", "image/png", "image/svg+xml"];
     var fontProps = [
         "postscriptName", "fullName", "familyName", "subfamilyName",
         "copyright", "version", "unitsPerEm", "ascent", "descent", "lineGap",
@@ -1267,12 +1267,32 @@
         AssetProcessor.isImage = function (contentType) {
             return imageTypes.indexOf(contentType) >= 0;
         };
-        AssetProcessor.copyImageMeta = function (buffer, metadata) {
+        AssetProcessor.copyImageMeta = function (buffer, metadata, fileType) {
             return __awaiter$u(this, void 0, void 0, function () {
-                var output;
+                var match, attrs, parts, output;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
-                        case 0: return [4 /*yield*/, sharp$3(buffer).rotate().toBuffer({ resolveWithObject: true })];
+                        case 0:
+                            if (fileType.mime === "image/svg+xml") {
+                                match = /<svg(.+)>/gi.exec(buffer.toString("utf8"));
+                                if (match && match.length > 1) {
+                                    attrs = match[1].match(/([a-z]+)="([^"]+)"/gi);
+                                    attrs.forEach(function (attr) {
+                                        if (attr.length < 5)
+                                            return;
+                                        var _b = __read(attr.split("="), 2), name = _b[0], value = _b[1];
+                                        var val = value.replace(/"/gi, "");
+                                        metadata[name] = isNaN(val) ? val : Number(val);
+                                    });
+                                    if (metadata.viewBox && (isNaN(metadata.width) || isNaN(metadata.height))) {
+                                        parts = metadata.viewBox.split(" ");
+                                        metadata.width = Number(parts[0]) + Number(parts[2]);
+                                        metadata.height = Number(parts[1]) + Number(parts[3]);
+                                    }
+                                }
+                                return [2 /*return*/, buffer];
+                            }
+                            return [4 /*yield*/, sharp$3(buffer).rotate().toBuffer({ resolveWithObject: true })];
                         case 1:
                             output = _b.sent();
                             Object.assign(metadata, output.info);
@@ -1297,7 +1317,7 @@
                     switch (_b.label) {
                         case 0:
                             if (!AssetProcessor_1.isImage(fileType.mime)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, AssetProcessor_1.copyImageMeta(buffer, metadata)];
+                            return [4 /*yield*/, AssetProcessor_1.copyImageMeta(buffer, metadata, fileType)];
                         case 1:
                             buffer = _b.sent();
                             _b.label = 2;
@@ -1947,18 +1967,17 @@
         };
         Assets.prototype.upload = function (stream, fileType, metadata) {
             return __awaiter$q(this, void 0, void 0, function () {
-                var contentType, extension;
+                var contentType;
                 var _this = this;
                 return __generator(this, function (_b) {
                     contentType = fileType.mime.trim();
-                    extension = (fileType.ext || "").trim();
                     metadata = Object.assign({
-                        extension: extension,
                         downloadCount: 0,
                         firstDownload: null,
                         lastDownload: null
                     }, metadata || {});
                     metadata.filename = metadata.filename || new bson.ObjectId().toHexString();
+                    metadata.extension = (fileType.ext || "").trim();
                     return [2 /*return*/, new Promise((function (resolve, reject) {
                             var uploaderStream = _this.bucket.openUploadStream(metadata.filename);
                             stream.pipe(uploaderStream)
@@ -2890,7 +2909,7 @@
                             }
                             isFinished = progress.percent == 100;
                             if (!!isFinished) return [3 /*break*/, 4];
-                            return [4 /*yield*/, promiseTimeout(150)];
+                            return [4 /*yield*/, promiseTimeout(50)];
                         case 3:
                             _a.sent();
                             _a.label = 4;