@vendure/asset-server-plugin 1.9.4 → 2.0.0-beta.0
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.
- package/lib/index.js +5 -1
- package/lib/index.js.map +1 -1
- package/lib/src/common.js +2 -2
- package/lib/src/common.js.map +1 -1
- package/lib/src/default-asset-storage-strategy-factory.js +1 -1
- package/lib/src/default-asset-storage-strategy-factory.js.map +1 -1
- package/lib/src/hashed-asset-naming-strategy.js +1 -1
- package/lib/src/hashed-asset-naming-strategy.js.map +1 -1
- package/lib/src/local-asset-storage-strategy.d.ts +2 -0
- package/lib/src/plugin.d.ts +1 -1
- package/lib/src/plugin.js +26 -21
- package/lib/src/plugin.js.map +1 -1
- package/lib/src/s3-asset-storage-strategy.d.ts +3 -2
- package/lib/src/s3-asset-storage-strategy.js +9 -6
- package/lib/src/s3-asset-storage-strategy.js.map +1 -1
- package/lib/src/sharp-asset-preview-strategy.js +4 -5
- package/lib/src/sharp-asset-preview-strategy.js.map +1 -1
- package/lib/src/transform-image.d.ts +2 -2
- package/lib/src/transform-image.js +2 -2
- package/lib/src/transform-image.js.map +1 -1
- package/lib/src/types.d.ts +3 -3
- package/package.json +40 -39
package/lib/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,kEAAgD;AAChD,qEAAmD;AACnD,8CAA4B"}
|
package/lib/src/common.js
CHANGED
|
@@ -6,9 +6,9 @@ function getAssetUrlPrefixFn(options) {
|
|
|
6
6
|
const { assetUrlPrefix, route } = options;
|
|
7
7
|
if (assetUrlPrefix == null) {
|
|
8
8
|
return (request, identifier) => {
|
|
9
|
-
var _a;
|
|
9
|
+
var _a, _b;
|
|
10
10
|
const protocol = (_a = request.headers['x-forwarded-proto']) !== null && _a !== void 0 ? _a : request.protocol;
|
|
11
|
-
return `${protocol}://${request.get('host')}/${route}/`;
|
|
11
|
+
return `${Array.isArray(protocol) ? protocol[0] : protocol}://${(_b = request.get('host')) !== null && _b !== void 0 ? _b : 'could-not-determine-host'}/${route}/`;
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
14
|
if (typeof assetUrlPrefix === 'string') {
|
package/lib/src/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/common.ts"],"names":[],"mappings":";;;AAAA,mEAA0E;AAK1E,SAAgB,mBAAmB,CAAC,OAA2B;IAC3D,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC1C,IAAI,cAAc,IAAI,IAAI,EAAE;QACxB,OAAO,CAAC,OAAgB,EAAE,UAAkB,EAAE,EAAE;;YAC5C,MAAM,QAAQ,GAAG,MAAA,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,mCAAI,OAAO,CAAC,QAAQ,CAAC;YAC1E,OAAO,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/common.ts"],"names":[],"mappings":";;;AAAA,mEAA0E;AAK1E,SAAgB,mBAAmB,CAAC,OAA2B;IAC3D,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC1C,IAAI,cAAc,IAAI,IAAI,EAAE;QACxB,OAAO,CAAC,OAAgB,EAAE,UAAkB,EAAE,EAAE;;YAC5C,MAAM,QAAQ,GAAG,MAAA,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,mCAAI,OAAO,CAAC,QAAQ,CAAC;YAC1E,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,MACtD,MAAA,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,mCAAI,0BAC3B,IAAI,KAAK,GAAG,CAAC;QACjB,CAAC,CAAC;KACL;IACD,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;QACpC,OAAO,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,cAAc,CAAC;KAC7C;IACD,IAAI,OAAO,cAAc,KAAK,UAAU,EAAE;QACtC,OAAO,CAAC,OAAgB,EAAE,UAAkB,EAAE,EAAE;YAC5C,MAAM,GAAG,GAAI,OAAe,CAAC,+BAAmB,CAAC,CAAC;YAClD,OAAO,cAAc,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC3C,CAAC,CAAC;KACL;IACD,MAAM,IAAI,KAAK,CAAC,wDAAwD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;AAC9G,CAAC;AApBD,kDAoBC;AAED,SAAgB,cAAc,CAAC,MAAgB;IAC3C,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC5B,OAAO,SAAS,CAAC;KACpB;IACD,QAAQ,MAAM,EAAE;QACZ,KAAK,KAAK,CAAC;QACX,KAAK,MAAM,CAAC;QACZ,KAAK,KAAK,CAAC;QACX,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM;YACP,OAAO,MAAM,CAAC;QAClB;YACI,OAAO,SAAS,CAAC;KACxB;AACL,CAAC;AAdD,wCAcC"}
|
|
@@ -8,7 +8,7 @@ const local_asset_storage_strategy_1 = require("./local-asset-storage-strategy")
|
|
|
8
8
|
*/
|
|
9
9
|
function defaultAssetStorageStrategyFactory(options) {
|
|
10
10
|
const { assetUrlPrefix, assetUploadDir, route } = options;
|
|
11
|
-
const prefixFn = common_1.getAssetUrlPrefixFn(options);
|
|
11
|
+
const prefixFn = (0, common_1.getAssetUrlPrefixFn)(options);
|
|
12
12
|
const toAbsoluteUrlFn = (request, identifier) => {
|
|
13
13
|
if (!identifier) {
|
|
14
14
|
return '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-asset-storage-strategy-factory.js","sourceRoot":"","sources":["../../src/default-asset-storage-strategy-factory.ts"],"names":[],"mappings":";;;AAEA,qCAA+C;AAC/C,iFAA2E;AAG3E;;GAEG;AACH,SAAgB,kCAAkC,CAAC,OAA2B;IAC1E,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC1D,MAAM,QAAQ,GAAG,4BAAmB,
|
|
1
|
+
{"version":3,"file":"default-asset-storage-strategy-factory.js","sourceRoot":"","sources":["../../src/default-asset-storage-strategy-factory.ts"],"names":[],"mappings":";;;AAEA,qCAA+C;AAC/C,iFAA2E;AAG3E;;GAEG;AACH,SAAgB,kCAAkC,CAAC,OAA2B;IAC1E,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC1D,MAAM,QAAQ,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,CAAC,OAAgB,EAAE,UAAkB,EAAU,EAAE;QACrE,IAAI,CAAC,UAAU,EAAE;YACb,OAAO,EAAE,CAAC;SACb;QACD,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC7C,OAAO,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,UAAU,EAAE,CAAC;IACjF,CAAC,CAAC;IACF,OAAO,IAAI,wDAAyB,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;AAC1E,CAAC;AAXD,gFAWC"}
|
|
@@ -32,7 +32,7 @@ class HashedAssetNamingStrategy extends core_1.DefaultAssetNamingStrategy {
|
|
|
32
32
|
return path_1.default.join('preview', this.getHashedDir(filename), filename);
|
|
33
33
|
}
|
|
34
34
|
getHashedDir(filename) {
|
|
35
|
-
return crypto_1.createHash('md5').update(filename).digest('hex').slice(0, 2);
|
|
35
|
+
return (0, crypto_1.createHash)('md5').update(filename).digest('hex').slice(0, 2);
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
exports.HashedAssetNamingStrategy = HashedAssetNamingStrategy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hashed-asset-naming-strategy.js","sourceRoot":"","sources":["../../src/hashed-asset-naming-strategy.ts"],"names":[],"mappings":";;;;;;AAAA,wCAA2E;AAC3E,mCAAoC;AACpC,gDAAwB;AAExB;;;;;;;;;;;;;;GAcG;AACH,MAAa,yBAA0B,SAAQ,iCAA0B;IACrE,sBAAsB,CAAC,GAAmB,EAAE,gBAAwB,EAAE,gBAAyB;QAC3F,MAAM,QAAQ,GAAG,KAAK,CAAC,sBAAsB,CAAC,GAAG,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;QACvF,OAAO,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;IACtE,CAAC;IACD,uBAAuB,CACnB,GAAmB,EACnB,gBAAwB,EACxB,gBAAyB;QAEzB,MAAM,QAAQ,GAAG,KAAK,CAAC,uBAAuB,CAAC,GAAG,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;QACxF,OAAO,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;IACvE,CAAC;IAEO,YAAY,CAAC,QAAgB;QACjC,OAAO,mBAAU,
|
|
1
|
+
{"version":3,"file":"hashed-asset-naming-strategy.js","sourceRoot":"","sources":["../../src/hashed-asset-naming-strategy.ts"],"names":[],"mappings":";;;;;;AAAA,wCAA2E;AAC3E,mCAAoC;AACpC,gDAAwB;AAExB;;;;;;;;;;;;;;GAcG;AACH,MAAa,yBAA0B,SAAQ,iCAA0B;IACrE,sBAAsB,CAAC,GAAmB,EAAE,gBAAwB,EAAE,gBAAyB;QAC3F,MAAM,QAAQ,GAAG,KAAK,CAAC,sBAAsB,CAAC,GAAG,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;QACvF,OAAO,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;IACtE,CAAC;IACD,uBAAuB,CACnB,GAAmB,EACnB,gBAAwB,EACxB,gBAAyB;QAEzB,MAAM,QAAQ,GAAG,KAAK,CAAC,uBAAuB,CAAC,GAAG,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;QACxF,OAAO,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;IACvE,CAAC;IAEO,YAAY,CAAC,QAAgB;QACjC,OAAO,IAAA,mBAAU,EAAC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;CACJ;AAjBD,8DAiBC"}
|
package/lib/src/plugin.d.ts
CHANGED
|
@@ -131,7 +131,7 @@ export declare class AssetServerPlugin implements NestModule, OnApplicationBoots
|
|
|
131
131
|
static configure(config: RuntimeVendureConfig): Promise<RuntimeVendureConfig>;
|
|
132
132
|
constructor(processContext: ProcessContext);
|
|
133
133
|
/** @internal */
|
|
134
|
-
onApplicationBootstrap(): void
|
|
134
|
+
onApplicationBootstrap(): void;
|
|
135
135
|
configure(consumer: MiddlewareConsumer): void;
|
|
136
136
|
/**
|
|
137
137
|
* Creates the image server instance
|
package/lib/src/plugin.js
CHANGED
|
@@ -140,17 +140,6 @@ const transform_image_1 = require("./transform-image");
|
|
|
140
140
|
* @docsCategory AssetServerPlugin
|
|
141
141
|
*/
|
|
142
142
|
let AssetServerPlugin = AssetServerPlugin_1 = class AssetServerPlugin {
|
|
143
|
-
constructor(processContext) {
|
|
144
|
-
this.processContext = processContext;
|
|
145
|
-
this.cacheDir = 'cache';
|
|
146
|
-
this.presets = [
|
|
147
|
-
{ name: 'tiny', width: 50, height: 50, mode: 'crop' },
|
|
148
|
-
{ name: 'thumb', width: 150, height: 150, mode: 'crop' },
|
|
149
|
-
{ name: 'small', width: 300, height: 300, mode: 'resize' },
|
|
150
|
-
{ name: 'medium', width: 500, height: 500, mode: 'resize' },
|
|
151
|
-
{ name: 'large', width: 800, height: 800, mode: 'resize' },
|
|
152
|
-
];
|
|
153
|
-
}
|
|
154
143
|
/**
|
|
155
144
|
* @description
|
|
156
145
|
* Set the plugin options.
|
|
@@ -174,6 +163,17 @@ let AssetServerPlugin = AssetServerPlugin_1 = class AssetServerPlugin {
|
|
|
174
163
|
this.options.namingStrategy || new hashed_asset_naming_strategy_1.HashedAssetNamingStrategy();
|
|
175
164
|
return config;
|
|
176
165
|
}
|
|
166
|
+
constructor(processContext) {
|
|
167
|
+
this.processContext = processContext;
|
|
168
|
+
this.cacheDir = 'cache';
|
|
169
|
+
this.presets = [
|
|
170
|
+
{ name: 'tiny', width: 50, height: 50, mode: 'crop' },
|
|
171
|
+
{ name: 'thumb', width: 150, height: 150, mode: 'crop' },
|
|
172
|
+
{ name: 'small', width: 300, height: 300, mode: 'resize' },
|
|
173
|
+
{ name: 'medium', width: 500, height: 500, mode: 'resize' },
|
|
174
|
+
{ name: 'large', width: 800, height: 800, mode: 'resize' },
|
|
175
|
+
];
|
|
176
|
+
}
|
|
177
177
|
/** @internal */
|
|
178
178
|
onApplicationBootstrap() {
|
|
179
179
|
if (this.processContext.isWorker) {
|
|
@@ -214,7 +214,7 @@ let AssetServerPlugin = AssetServerPlugin_1 = class AssetServerPlugin {
|
|
|
214
214
|
}
|
|
215
215
|
core_1.Logger.info('Creating asset server middleware', constants_1.loggerCtx);
|
|
216
216
|
consumer.apply(this.createAssetServer()).forRoutes(AssetServerPlugin_1.options.route);
|
|
217
|
-
core_1.registerPluginStartupMessage('Asset server', AssetServerPlugin_1.options.route);
|
|
217
|
+
(0, core_1.registerPluginStartupMessage)('Asset server', AssetServerPlugin_1.options.route);
|
|
218
218
|
}
|
|
219
219
|
/**
|
|
220
220
|
* Creates the image server instance
|
|
@@ -235,10 +235,10 @@ let AssetServerPlugin = AssetServerPlugin_1 = class AssetServerPlugin {
|
|
|
235
235
|
const file = await AssetServerPlugin_1.assetStorage.readFileToBuffer(key);
|
|
236
236
|
let mimeType = this.getMimeType(key);
|
|
237
237
|
if (!mimeType) {
|
|
238
|
-
mimeType = ((_a = (await file_type_1.fromBuffer(file))) === null || _a === void 0 ? void 0 : _a.mime) || 'application/octet-stream';
|
|
238
|
+
mimeType = ((_a = (await (0, file_type_1.fromBuffer)(file))) === null || _a === void 0 ? void 0 : _a.mime) || 'application/octet-stream';
|
|
239
239
|
}
|
|
240
240
|
res.contentType(mimeType);
|
|
241
|
-
res.setHeader('content-security-policy',
|
|
241
|
+
res.setHeader('content-security-policy', 'default-src \'self\'');
|
|
242
242
|
res.setHeader('Cache-Control', this.cacheHeader);
|
|
243
243
|
res.send(file);
|
|
244
244
|
}
|
|
@@ -265,11 +265,11 @@ let AssetServerPlugin = AssetServerPlugin_1 = class AssetServerPlugin {
|
|
|
265
265
|
try {
|
|
266
266
|
file = await AssetServerPlugin_1.assetStorage.readFileToBuffer(decodedReqPath);
|
|
267
267
|
}
|
|
268
|
-
catch (
|
|
268
|
+
catch (_err) {
|
|
269
269
|
res.status(404).send('Resource not found');
|
|
270
270
|
return;
|
|
271
271
|
}
|
|
272
|
-
const image = await transform_image_1.transformImage(file, req.query, this.presets || []);
|
|
272
|
+
const image = await (0, transform_image_1.transformImage)(file, req.query, this.presets || []);
|
|
273
273
|
try {
|
|
274
274
|
const imageBuffer = await image.toBuffer();
|
|
275
275
|
const cachedFileName = this.getFileNameFromRequest(req);
|
|
@@ -279,10 +279,10 @@ let AssetServerPlugin = AssetServerPlugin_1 = class AssetServerPlugin {
|
|
|
279
279
|
}
|
|
280
280
|
let mimeType = this.getMimeType(cachedFileName);
|
|
281
281
|
if (!mimeType) {
|
|
282
|
-
mimeType = ((_a = (await file_type_1.fromBuffer(imageBuffer))) === null || _a === void 0 ? void 0 : _a.mime) || 'image/jpeg';
|
|
282
|
+
mimeType = ((_a = (await (0, file_type_1.fromBuffer)(imageBuffer))) === null || _a === void 0 ? void 0 : _a.mime) || 'image/jpeg';
|
|
283
283
|
}
|
|
284
284
|
res.set('Content-Type', mimeType);
|
|
285
|
-
res.setHeader('content-security-policy',
|
|
285
|
+
res.setHeader('content-security-policy', 'default-src \'self\'');
|
|
286
286
|
res.send(imageBuffer);
|
|
287
287
|
return;
|
|
288
288
|
}
|
|
@@ -298,8 +298,9 @@ let AssetServerPlugin = AssetServerPlugin_1 = class AssetServerPlugin {
|
|
|
298
298
|
}
|
|
299
299
|
getFileNameFromRequest(req) {
|
|
300
300
|
const { w, h, mode, preset, fpx, fpy, format } = req.query;
|
|
301
|
+
/* eslint-disable @typescript-eslint/restrict-template-expressions */
|
|
301
302
|
const focalPoint = fpx && fpy ? `_fpx${fpx}_fpy${fpy}` : '';
|
|
302
|
-
const imageFormat = common_1.getValidFormat(format);
|
|
303
|
+
const imageFormat = (0, common_1.getValidFormat)(format);
|
|
303
304
|
let imageParamHash = null;
|
|
304
305
|
if (w || h) {
|
|
305
306
|
const width = w || '';
|
|
@@ -311,6 +312,10 @@ let AssetServerPlugin = AssetServerPlugin_1 = class AssetServerPlugin {
|
|
|
311
312
|
imageParamHash = this.md5(`_transform_pre_${preset}${focalPoint}${imageFormat}`);
|
|
312
313
|
}
|
|
313
314
|
}
|
|
315
|
+
else if (imageFormat) {
|
|
316
|
+
imageParamHash = this.md5(`_transform_${imageFormat}`);
|
|
317
|
+
}
|
|
318
|
+
/* eslint-enable @typescript-eslint/restrict-template-expressions */
|
|
314
319
|
const decodedReqPath = decodeURIComponent(req.path);
|
|
315
320
|
if (imageParamHash) {
|
|
316
321
|
return path_1.default.join(this.cacheDir, this.addSuffix(decodedReqPath, imageParamHash, imageFormat));
|
|
@@ -320,7 +325,7 @@ let AssetServerPlugin = AssetServerPlugin_1 = class AssetServerPlugin {
|
|
|
320
325
|
}
|
|
321
326
|
}
|
|
322
327
|
md5(input) {
|
|
323
|
-
return crypto_1.createHash('md5').update(input).digest('hex');
|
|
328
|
+
return (0, crypto_1.createHash)('md5').update(input).digest('hex');
|
|
324
329
|
}
|
|
325
330
|
addSuffix(fileName, suffix, ext) {
|
|
326
331
|
const originalExt = path_1.default.extname(fileName);
|
|
@@ -352,7 +357,7 @@ let AssetServerPlugin = AssetServerPlugin_1 = class AssetServerPlugin {
|
|
|
352
357
|
}
|
|
353
358
|
};
|
|
354
359
|
AssetServerPlugin = AssetServerPlugin_1 = __decorate([
|
|
355
|
-
core_1.VendurePlugin({
|
|
360
|
+
(0, core_1.VendurePlugin)({
|
|
356
361
|
imports: [core_1.PluginCommonModule],
|
|
357
362
|
configuration: config => AssetServerPlugin_1.configure(config),
|
|
358
363
|
}),
|
package/lib/src/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,wCAQuB;AACvB,mCAAoC;AACpC,sDAAmE;AACnE,yCAAuC;AACvC,wDAA0B;AAC1B,gDAAwB;AAExB,qCAA0C;AAC1C,2CAA8D;AAC9D,qGAA8F;AAC9F,iFAA2E;AAC3E,iFAA2E;AAC3E,uDAAmD;AAGnD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgHG;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
/// <reference types="node" />
|
|
2
3
|
import { AssetStorageStrategy } from '@vendure/core';
|
|
3
4
|
import { Request } from 'express';
|
|
4
5
|
import { Stream } from 'stream';
|
|
5
6
|
import { AssetServerOptions } from './types';
|
|
6
|
-
export
|
|
7
|
+
export type S3Credentials = {
|
|
7
8
|
accessKeyId: string;
|
|
8
9
|
secretAccessKey: string;
|
|
9
10
|
};
|
|
10
|
-
export
|
|
11
|
+
export type S3CredentialsProfile = {
|
|
11
12
|
profile: string;
|
|
12
13
|
};
|
|
13
14
|
/**
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -94,7 +98,7 @@ const constants_1 = require("./constants");
|
|
|
94
98
|
function configureS3AssetStorage(s3Config) {
|
|
95
99
|
return (options) => {
|
|
96
100
|
const { assetUrlPrefix, route } = options;
|
|
97
|
-
const prefixFn = common_1.getAssetUrlPrefixFn(options);
|
|
101
|
+
const prefixFn = (0, common_1.getAssetUrlPrefixFn)(options);
|
|
98
102
|
const toAbsoluteUrlFn = (request, identifier) => {
|
|
99
103
|
if (!identifier) {
|
|
100
104
|
return '';
|
|
@@ -138,7 +142,7 @@ class S3AssetStorageStrategy {
|
|
|
138
142
|
this.AWS = await Promise.resolve().then(() => __importStar(require('aws-sdk')));
|
|
139
143
|
}
|
|
140
144
|
catch (e) {
|
|
141
|
-
core_1.Logger.error(
|
|
145
|
+
core_1.Logger.error('Could not find the "aws-sdk" package. Make sure it is installed', constants_1.loggerCtx, e.stack);
|
|
142
146
|
}
|
|
143
147
|
const config = Object.assign({ credentials: this.getS3Credentials() }, this.s3Config.nativeS3Configuration);
|
|
144
148
|
this.s3 = new this.AWS.S3(config);
|
|
@@ -233,7 +237,6 @@ class S3AssetStorageStrategy {
|
|
|
233
237
|
return new this.AWS.Credentials(credentials);
|
|
234
238
|
}
|
|
235
239
|
async ensureBucket(bucket) {
|
|
236
|
-
var _a, _b;
|
|
237
240
|
let bucketExists = false;
|
|
238
241
|
try {
|
|
239
242
|
await this.s3.headBucket({ Bucket: this.s3Config.bucket }).promise();
|
|
@@ -241,7 +244,7 @@ class S3AssetStorageStrategy {
|
|
|
241
244
|
core_1.Logger.verbose(`Found S3 bucket "${bucket}"`, constants_1.loggerCtx);
|
|
242
245
|
}
|
|
243
246
|
catch (e) {
|
|
244
|
-
core_1.Logger.verbose(`Could not find bucket "${bucket}: ${(
|
|
247
|
+
core_1.Logger.verbose(`Could not find bucket "${bucket}: ${JSON.stringify(e.message)}". Attempting to create...`);
|
|
245
248
|
}
|
|
246
249
|
if (!bucketExists) {
|
|
247
250
|
try {
|
|
@@ -249,7 +252,7 @@ class S3AssetStorageStrategy {
|
|
|
249
252
|
core_1.Logger.verbose(`Created S3 bucket "${bucket}"`, constants_1.loggerCtx);
|
|
250
253
|
}
|
|
251
254
|
catch (e) {
|
|
252
|
-
core_1.Logger.error(`Could not find nor create the S3 bucket "${bucket}: ${(
|
|
255
|
+
core_1.Logger.error(`Could not find nor create the S3 bucket "${bucket}: ${JSON.stringify(e.message)}"`, constants_1.loggerCtx, e.stack);
|
|
253
256
|
}
|
|
254
257
|
}
|
|
255
258
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s3-asset-storage-strategy.js","sourceRoot":"","sources":["../../src/s3-asset-storage-strategy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"s3-asset-storage-strategy.js","sourceRoot":"","sources":["../../src/s3-asset-storage-strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA6D;AAE7D,2CAA6B;AAC7B,mCAA0C;AAE1C,qCAA+C;AAC/C,2CAAwC;AAiDxC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiEG;AACH,SAAgB,uBAAuB,CAAC,QAAkB;IACtD,OAAO,CAAC,OAA2B,EAAE,EAAE;QACnC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAC1C,MAAM,QAAQ,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,eAAe,GAAG,CAAC,OAAgB,EAAE,UAAkB,EAAU,EAAE;YACrE,IAAI,CAAC,UAAU,EAAE;gBACb,OAAO,EAAE,CAAC;aACb;YACD,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAC7C,OAAO,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,UAAU,EAAE,CAAC;QACjF,CAAC,CAAC;QACF,OAAO,IAAI,sBAAsB,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IACjE,CAAC,CAAC;AACN,CAAC;AAbD,0DAaC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAa,sBAAsB;IAG/B,YACY,QAAkB,EACV,aAA+D;QADvE,aAAQ,GAAR,QAAQ,CAAU;QACV,kBAAa,GAAb,aAAa,CAAkD;IAChF,CAAC;IAEJ,KAAK,CAAC,IAAI;QACN,IAAI;YACA,IAAI,CAAC,GAAG,GAAG,wDAAa,SAAS,GAAC,CAAC;SACtC;QAAC,OAAO,CAAM,EAAE;YACb,aAAM,CAAC,KAAK,CACR,iEAAiE,EACjE,qBAAS,EACT,CAAC,CAAC,KAAK,CACV,CAAC;SACL;QAED,MAAM,MAAM,mBACR,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAAE,IACjC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CACzC,CAAC;QACF,IAAI,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAID,KAAK,CAAC,mBAAmB,CAAC,QAAgB,EAAE,IAAY;QACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE;aACvB,MAAM,CACH;YACI,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAC5B,GAAG,EAAE,QAAQ;YACb,IAAI,EAAE,IAAI;SACb,EACD,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAC5C;aACA,OAAO,EAAE,CAAC;QACf,OAAO,MAAM,CAAC,GAAG,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,QAAgB,EAAE,IAAY;QACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE;aACvB,MAAM,CACH;YACI,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAC5B,GAAG,EAAE,QAAQ;YACb,IAAI,EAAE,IAAI;SACb,EACD,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAC5C;aACA,OAAO,EAAE,CAAC;QACf,OAAO,MAAM,CAAC,GAAG,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QACnF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,IAAI,EAAE;YACP,aAAM,CAAC,KAAK,CAAC,0BAA0B,UAAU,EAAE,EAAE,qBAAS,CAAC,CAAC;YAChE,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC1B;QACD,IAAI,IAAI,YAAY,MAAM,EAAE;YACxB,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAI,YAAY,UAAU,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YACxD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC5B;QACD,IAAI,IAAI,YAAY,iBAAQ,EAAE;YAC1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,MAAM,GAAG,GAAU,EAAE,CAAC;gBACtB,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACxC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACrC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBAChB,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACtC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACvC,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;QACD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAW,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QACnF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,CAAC,IAAI,YAAY,eAAM,CAAC,EAAE;YAC3B,MAAM,QAAQ,GAAG,IAAI,iBAAQ,EAAE,CAAC;YAChC,QAAQ,CAAC,KAAK,GAAG,GAAG,EAAE;gBAClB,UAAU;YACd,CAAC,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpB,OAAO,QAAQ,CAAC;SACnB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,UAAkB;QAC/B,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,QAAgB;QAC7B,IAAI;YACA,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YACnE,OAAO,IAAI,CAAC;SACf;QAAC,OAAO,CAAM,EAAE;YACb,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAEO,eAAe,CAAC,UAAkB;QACtC,OAAO;YACH,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAC5B,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;SAChD,CAAC;IACN,CAAC;IAEO,gBAAgB;QACpB,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QACtC,IAAI,WAAW,IAAI,IAAI,EAAE;YACrB,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE;YAC/C,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC;SAC7D;QACD,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,MAAc;QACrC,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,IAAI;YACA,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YACrE,YAAY,GAAG,IAAI,CAAC;YACpB,aAAM,CAAC,OAAO,CAAC,oBAAoB,MAAM,GAAG,EAAE,qBAAS,CAAC,CAAC;SAC5D;QAAC,OAAO,CAAM,EAAE;YACb,aAAM,CAAC,OAAO,CACV,0BAA0B,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAC7F,CAAC;SACL;QACD,IAAI,CAAC,YAAY,EAAE;YACf,IAAI;gBACA,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;gBACzE,aAAM,CAAC,OAAO,CAAC,sBAAsB,MAAM,GAAG,EAAE,qBAAS,CAAC,CAAC;aAC9D;YAAC,OAAO,CAAM,EAAE;gBACb,aAAM,CAAC,KAAK,CACR,4CAA4C,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EACnF,qBAAS,EACT,CAAC,CAAC,KAAK,CACV,CAAC;aACL;SACJ;IACL,CAAC;IAEO,oBAAoB,CACxB,WAAiD;QAEjD,OAAO,WAAW,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;CACJ;AA/JD,wDA+JC"}
|
|
@@ -49,12 +49,11 @@ class SharpAssetPreviewStrategy {
|
|
|
49
49
|
this.config = Object.assign(Object.assign({}, this.defaultConfig), (config !== null && config !== void 0 ? config : {}));
|
|
50
50
|
}
|
|
51
51
|
async generatePreviewImage(ctx, mimeType, data) {
|
|
52
|
-
|
|
53
|
-
const assetType = core_1.getAssetType(mimeType);
|
|
52
|
+
const assetType = (0, core_1.getAssetType)(mimeType);
|
|
54
53
|
const { maxWidth, maxHeight } = this.config;
|
|
55
54
|
if (assetType === generated_types_1.AssetType.IMAGE) {
|
|
56
55
|
try {
|
|
57
|
-
const image = sharp_1.default(data).rotate();
|
|
56
|
+
const image = (0, sharp_1.default)(data).rotate();
|
|
58
57
|
const metadata = await image.metadata();
|
|
59
58
|
const width = metadata.width || 0;
|
|
60
59
|
const height = metadata.height || 0;
|
|
@@ -84,7 +83,7 @@ class SharpAssetPreviewStrategy {
|
|
|
84
83
|
}
|
|
85
84
|
}
|
|
86
85
|
catch (err) {
|
|
87
|
-
core_1.Logger.error(`An error occurred when generating preview for image with mimeType ${mimeType}: ${(
|
|
86
|
+
core_1.Logger.error(`An error occurred when generating preview for image with mimeType ${mimeType}: ${JSON.stringify(err.message)}`, constants_1.loggerCtx);
|
|
88
87
|
return this.generateBinaryFilePreview(mimeType);
|
|
89
88
|
}
|
|
90
89
|
}
|
|
@@ -107,7 +106,7 @@ class SharpAssetPreviewStrategy {
|
|
|
107
106
|
</svg>`);
|
|
108
107
|
}
|
|
109
108
|
generateBinaryFilePreview(mimeType) {
|
|
110
|
-
return sharp_1.default(path_1.default.join(__dirname, 'file-icon.png'))
|
|
109
|
+
return (0, sharp_1.default)(path_1.default.join(__dirname, 'file-icon.png'))
|
|
111
110
|
.resize(800, 800, { fit: 'outside' })
|
|
112
111
|
.composite([
|
|
113
112
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sharp-asset-preview-strategy.js","sourceRoot":"","sources":["../../src/sharp-asset-preview-strategy.ts"],"names":[],"mappings":";;;;;;AAAA,yEAAgE;AAChE,wCAA2F;AAC3F,gDAAwB;AACxB,kDAA0B;AAE1B,2CAAwC;AA+DxC;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAa,yBAAyB;IAYlC,YAAY,MAAgC;QAX3B,kBAAa,GAAsC;YAChE,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,EAAE;YACf,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,EAAE;YACf,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,EAAE;SAClB,CAAC;QAIE,IAAI,CAAC,MAAM,mCACJ,IAAI,CAAC,aAAa,GAClB,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,CACpB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,GAAmB,EAAE,QAAgB,EAAE,IAAY
|
|
1
|
+
{"version":3,"file":"sharp-asset-preview-strategy.js","sourceRoot":"","sources":["../../src/sharp-asset-preview-strategy.ts"],"names":[],"mappings":";;;;;;AAAA,yEAAgE;AAChE,wCAA2F;AAC3F,gDAAwB;AACxB,kDAA0B;AAE1B,2CAAwC;AA+DxC;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAa,yBAAyB;IAYlC,YAAY,MAAgC;QAX3B,kBAAa,GAAsC;YAChE,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,EAAE;YACf,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,EAAE;YACf,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,EAAE;SAClB,CAAC;QAIE,IAAI,CAAC,MAAM,mCACJ,IAAI,CAAC,aAAa,GAClB,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,CACpB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,GAAmB,EAAE,QAAgB,EAAE,IAAY;QAC1E,MAAM,SAAS,GAAG,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC;QAEzC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAE5C,IAAI,SAAS,KAAK,2BAAS,CAAC,KAAK,EAAE;YAC/B,IAAI;gBACA,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;gBACnC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,CAAC,CAAC;gBAClC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC;gBACpC,IAAI,QAAQ,GAAG,KAAK,IAAI,SAAS,GAAG,MAAM,EAAE;oBACxC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;iBACxD;gBACD,IAAI,QAAQ,KAAK,eAAe,EAAE;oBAC9B,8CAA8C;oBAC9C,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;iBAC3B;qBAAM;oBACH,QAAQ,QAAQ,CAAC,MAAM,EAAE;wBACrB,KAAK,MAAM,CAAC;wBACZ,KAAK,KAAK;4BACN,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;wBAC1D,KAAK,KAAK;4BACN,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;wBACxD,KAAK,MAAM;4BACP,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;wBAC1D,KAAK,KAAK;4BACN,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;wBACzD,KAAK,MAAM;4BACP,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;wBAC1D;4BACI,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;qBAC/B;iBACJ;aACJ;YAAC,OAAO,GAAQ,EAAE;gBACf,aAAM,CAAC,KAAK,CACR,qEAAqE,QAAQ,KAAK,IAAI,CAAC,SAAS,CAC5F,GAAG,CAAC,OAAO,CACd,EAAE,EACH,qBAAS,CACZ,CAAC;gBACF,OAAO,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;aACnD;SACJ;aAAM;YACH,OAAO,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;SACnD;IACL,CAAC;IAEO,uBAAuB,CAAC,QAAgB;QAC5C,OAAO,MAAM,CAAC,IAAI,CAAC;;;;;;;;;;wEAU6C,QAAQ;mBAC7D,CAAC,CAAC;IACjB,CAAC;IAEO,yBAAyB,CAAC,QAAgB;QAC9C,OAAO,IAAA,eAAK,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;aAC9C,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;aACpC,SAAS,CAAC;YACP;gBACI,KAAK,EAAE,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC;gBAC7C,OAAO,EAAE,eAAK,CAAC,OAAO,CAAC,MAAM;aAChC;SACJ,CAAC;aACD,QAAQ,EAAE,CAAC;IACpB,CAAC;CACJ;AA7FD,8DA6FC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import sharp, { Region } from 'sharp';
|
|
3
3
|
import { ImageTransformPreset } from './types';
|
|
4
|
-
export
|
|
4
|
+
export type Dimensions = {
|
|
5
5
|
w: number;
|
|
6
6
|
h: number;
|
|
7
7
|
};
|
|
8
|
-
export
|
|
8
|
+
export type Point = {
|
|
9
9
|
x: number;
|
|
10
10
|
y: number;
|
|
11
11
|
};
|
|
@@ -15,7 +15,7 @@ async function transformImage(originalImage, queryParams, presets) {
|
|
|
15
15
|
let mode = queryParams.mode || 'crop';
|
|
16
16
|
const fpx = +queryParams.fpx || undefined;
|
|
17
17
|
const fpy = +queryParams.fpy || undefined;
|
|
18
|
-
const imageFormat = common_1.getValidFormat(queryParams.format);
|
|
18
|
+
const imageFormat = (0, common_1.getValidFormat)(queryParams.format);
|
|
19
19
|
if (queryParams.preset) {
|
|
20
20
|
const matchingPreset = presets.find(p => p.name === queryParams.preset);
|
|
21
21
|
if (matchingPreset) {
|
|
@@ -31,7 +31,7 @@ async function transformImage(originalImage, queryParams, presets) {
|
|
|
31
31
|
else {
|
|
32
32
|
options.fit = 'inside';
|
|
33
33
|
}
|
|
34
|
-
const image = sharp_1.default(originalImage);
|
|
34
|
+
const image = (0, sharp_1.default)(originalImage);
|
|
35
35
|
applyFormat(image, imageFormat);
|
|
36
36
|
if (fpx && fpy && targetWidth && targetHeight && mode === 'crop') {
|
|
37
37
|
const metadata = await image.metadata();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-image.js","sourceRoot":"","sources":["../../src/transform-image.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqD;AAErD,qCAA0C;AAM1C;;GAEG;AACI,KAAK,UAAU,cAAc,CAChC,aAAqB,EACrB,WAAmC,EACnC,OAA+B;IAE/B,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;IAC1D,IAAI,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;IAC3D,IAAI,IAAI,GAAG,WAAW,CAAC,IAAI,IAAI,MAAM,CAAC;IACtC,MAAM,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,SAAS,CAAC;IAC1C,MAAM,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,SAAS,CAAC;IAC1C,MAAM,WAAW,GAAG,uBAAc,
|
|
1
|
+
{"version":3,"file":"transform-image.js","sourceRoot":"","sources":["../../src/transform-image.ts"],"names":[],"mappings":"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"}
|
package/lib/src/types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AssetNamingStrategy, AssetPreviewStrategy, AssetStorageStrategy, RequestContext } from '@vendure/core';
|
|
2
|
-
export
|
|
2
|
+
export type ImageTransformFormat = 'jpg' | 'jpeg' | 'png' | 'webp' | 'avif';
|
|
3
3
|
/**
|
|
4
4
|
* @description
|
|
5
5
|
* Specifies the way in which an asset preview image will be resized to fit in the
|
|
@@ -11,7 +11,7 @@ export declare type ImageTransformFormat = 'jpg' | 'jpeg' | 'png' | 'webp' | 'av
|
|
|
11
11
|
*
|
|
12
12
|
* @docsCategory AssetServerPlugin
|
|
13
13
|
*/
|
|
14
|
-
export
|
|
14
|
+
export type ImageTransformMode = 'crop' | 'resize';
|
|
15
15
|
/**
|
|
16
16
|
* @description
|
|
17
17
|
* A configuration option for an image size preset for the AssetServerPlugin.
|
|
@@ -40,7 +40,7 @@ export interface ImageTransformPreset {
|
|
|
40
40
|
*
|
|
41
41
|
* @docsCategory AssetServerPlugin
|
|
42
42
|
*/
|
|
43
|
-
export
|
|
43
|
+
export type CacheConfig = {
|
|
44
44
|
/**
|
|
45
45
|
* @description
|
|
46
46
|
* The max-age=N response directive indicates that the response remains fresh until N seconds after the response is generated.
|
package/package.json
CHANGED
|
@@ -1,41 +1,42 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
"
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
"
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
"
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
2
|
+
"name": "@vendure/asset-server-plugin",
|
|
3
|
+
"version": "2.0.0-beta.0",
|
|
4
|
+
"main": "lib/index.js",
|
|
5
|
+
"types": "lib/index.d.ts",
|
|
6
|
+
"files": [
|
|
7
|
+
"lib/**/*"
|
|
8
|
+
],
|
|
9
|
+
"license": "MIT",
|
|
10
|
+
"scripts": {
|
|
11
|
+
"watch": "tsc -p ./tsconfig.build.json --watch",
|
|
12
|
+
"build": "rimraf lib && tsc -p ./tsconfig.build.json && node build.js",
|
|
13
|
+
"lint": "eslint --fix .",
|
|
14
|
+
"test": "vitest --run",
|
|
15
|
+
"e2e": "cross-env PACKAGE=asset-server-plugin vitest --config ../../e2e-common/vitest.config.ts --run",
|
|
16
|
+
"e2e:watch": "cross-env PACKAGE=asset-server-plugin vitest --config ../../e2e-common/vitest.config.ts"
|
|
17
|
+
},
|
|
18
|
+
"homepage": "https://www.vendure.io/",
|
|
19
|
+
"funding": "https://github.com/sponsors/michaelbromley",
|
|
20
|
+
"publishConfig": {
|
|
21
|
+
"access": "public"
|
|
22
|
+
},
|
|
23
|
+
"devDependencies": {
|
|
24
|
+
"@types/express": "^4.17.8",
|
|
25
|
+
"@types/fs-extra": "^9.0.8",
|
|
26
|
+
"@types/node-fetch": "^2.5.8",
|
|
27
|
+
"@types/sharp": "^0.30.4",
|
|
28
|
+
"@vendure/common": "^2.0.0-beta.0",
|
|
29
|
+
"@vendure/core": "^2.0.0-beta.0",
|
|
30
|
+
"aws-sdk": "^2.856.0",
|
|
31
|
+
"express": "^4.17.1",
|
|
32
|
+
"node-fetch": "^2.6.7",
|
|
33
|
+
"rimraf": "^3.0.2",
|
|
34
|
+
"typescript": "4.9.5"
|
|
35
|
+
},
|
|
36
|
+
"dependencies": {
|
|
37
|
+
"file-type": "^16.5.3",
|
|
38
|
+
"fs-extra": "^10.0.0",
|
|
39
|
+
"sharp": "~0.31.2"
|
|
40
|
+
},
|
|
41
|
+
"gitHead": "041394503af30fbfcf98905e1a7ed0d58a30232f"
|
|
41
42
|
}
|