@uxf/resizer 1.1.2 → 1.2.0

package/index.js

@@ -60,6 +60,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createApp = void 0;
 var express_1 = __importDefault(require("express"));
+var node_fetch_1 = __importDefault(require("node-fetch"));
 var fs_1 = require("fs");
 var fs = __importStar(require("fs"));
 var sharp_1 = __importDefault(require("sharp"));
@@ -86,7 +87,7 @@ var POSITION_OPTIONS = {
 };
 var isTrim = function (value) { return value !== "nt"; };
 var getTrimValue = function (value) { return (isTrim(value) ? Number(value) : 0); };
-var createApp = function (sourcePath, generatePath, sourceFolderDepth, generatedFolderDepth, filenameRegexp, disableNamespace) {
+var createApp = function (sourcePathOrUrl, generatePath, sourceFolderDepth, generatedFolderDepth, filenameRegexp, disableNamespace) {
     if (filenameRegexp === void 0) { filenameRegexp = ":originalFilename([a-f0-9\\-]+)_:width(\\d+)_:height(\\d+)_:fit([a-z]+)_:position([a-z]+)_:background([a-z]+)_:trim([a-z]+)_:originalExtension.:toFormat"; }
     var parseFilename = path_to_regexp_1.match(filenameRegexp, { decode: decodeURIComponent });
     var generatedPxArray = Array.from({ length: generatedFolderDepth }, function (_, i) { return ":p" + (i + 1); });
@@ -117,29 +118,36 @@ var createApp = function (sourcePath, generatePath, sourceFolderDepth, generated
                         ? generatedDirectoryPart + "/" + generatedPxDirectories.join("/")
                         : generatedDirectoryPart;
                     generatedFilePath = generatedDirectory + "/" + filename;
-                    sourcePxDirectories = sourcePxArray.map(function (_, index) { return originalFilename.charAt(index); });
-                    sourceDirectoryPart = disableNamespace ? sourcePath : sourcePath + "/" + namespace;
-                    sourceDirectory = sourcePxDirectories.length > 0
-                        ? sourceDirectoryPart + "/" + sourcePxDirectories.join("/")
-                        : sourceDirectoryPart;
-                    sourceFilename = originalFilename + "." + originalExtension;
-                    sourceFilePath = sourceDirectory + "/" + sourceFilename;
+                    // try load from disk
                     if (fs.existsSync(generatedFilePath)) {
                         return [2 /*return*/, res.sendFile(generatedFilePath)];
                     }
                     if (!fs_1.existsSync(generatedDirectory)) {
                         fs_1.mkdirSync(generatedDirectory, { recursive: true });
                     }
-                    return [4 /*yield*/, sharp_1.default(sourceFilePath)
-                            .rotate()
-                            .resize(width ? Number(width) : undefined, height ? Number(height) : undefined, {
-                            background: background === "t" ? "transparent" : "#" + background,
-                            fastShrinkOnLoad: false,
-                            fit: FIT_OPTIONS[fit] || "cover",
-                            position: POSITION_OPTIONS[position] || "centre",
-                            withoutEnlargement: originalExtension !== "svg",
-                        })];
-                case 1:
+                    sourcePxDirectories = sourcePxArray.map(function (_, index) { return originalFilename.charAt(index); });
+                    sourceDirectoryPart = disableNamespace ? sourcePathOrUrl : sourcePathOrUrl + "/" + namespace;
+                    sourceDirectory = sourcePxDirectories.length > 0
+                        ? sourceDirectoryPart + "/" + sourcePxDirectories.join("/")
+                        : sourceDirectoryPart;
+                    sourceFilename = originalFilename + "." + originalExtension;
+                    sourceFilePath = sourceDirectory + "/" + sourceFilename;
+                    if (!sourcePathOrUrl.startsWith("https://")) return [3 /*break*/, 3];
+                    return [4 /*yield*/, node_fetch_1.default(sourceFilePath)];
+                case 1: return [4 /*yield*/, (_c.sent()).buffer()];
+                case 2:
+                    sourceFilePath = _c.sent();
+                    _c.label = 3;
+                case 3: return [4 /*yield*/, sharp_1.default(sourceFilePath)
+                        .rotate()
+                        .resize(width ? Number(width) : undefined, height ? Number(height) : undefined, {
+                        background: background === "t" ? "transparent" : "#" + background,
+                        fastShrinkOnLoad: false,
+                        fit: FIT_OPTIONS[fit] || "cover",
+                        position: POSITION_OPTIONS[position] || "centre",
+                        withoutEnlargement: originalExtension !== "svg",
+                    })];
+                case 4:
                     pipeline = _c.sent();
                     if (isTrim(trim)) {
                         pipeline.trim(getTrimValue(trim));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/resizer",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "main": "index.js",
   "description": "UXF Resizer",
   "author": "UXFans <dev@uxf.cz>",