@unchainedshop/plugins 2.8.14 → 2.8.15

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.
Files changed (14) hide show
  1. package/lib/files/gridfs/gridfs-adapter.js +16 -15
  2. package/lib/files/gridfs/gridfs-adapter.js.map +1 -1
  3. package/lib/files/gridfs/gridfs-webhook.js +14 -9
  4. package/lib/files/gridfs/gridfs-webhook.js.map +1 -1
  5. package/lib/files/gridfs/index.d.ts +2 -1
  6. package/lib/files/gridfs/index.js +7 -2
  7. package/lib/files/gridfs/index.js.map +1 -1
  8. package/lib/files/minio/minio-adapter.js +6 -6
  9. package/lib/files/minio/minio-adapter.js.map +1 -1
  10. package/package.json +17 -17
  11. package/src/files/gridfs/gridfs-adapter.ts +27 -15
  12. package/src/files/gridfs/gridfs-webhook.ts +19 -13
  13. package/src/files/gridfs/index.ts +7 -2
  14. package/src/files/minio/minio-adapter.ts +6 -6
package/lib/files/gridfs/gridfs-adapter.js CHANGED
@@ -19,12 +19,12 @@ export const GridFSAdapter = {
19
19
  ...FileAdapter,
20
20
  async createSignedURL(directoryName, fileName) {
21
21
  const expiryDate = resolveExpirationDate();
22
- const _id = buildHashedFilename(directoryName, fileName, expiryDate);
23
- const signature = sign(directoryName, _id, expiryDate.getTime());
22
+ const hashedFilename = buildHashedFilename(directoryName, fileName, expiryDate);
23
+ const signature = sign(directoryName, hashedFilename, expiryDate.getTime());
24
24
  const putURL = new URL(`/gridfs/${directoryName}/${encodeURIComponent(fileName)}?e=${expiryDate.getTime()}&s=${signature}`, ROOT_URL).href;
25
- const url = `/gridfs/${directoryName}/${_id}`;
25
+ const url = `/gridfs/${directoryName}/${hashedFilename}`;
26
26
  return {
27
- _id,
27
+ _id: hashedFilename,
28
28
  directoryName,
29
29
  expiryDate,
30
30
  fileName,
@@ -46,36 +46,37 @@ export const GridFSAdapter = {
46
46
  stream = bufferToStream(Buffer.from(rawFile.buffer, 'base64'));
47
47
  }
48
48
  const expiryDate = resolveExpirationDate();
49
- const _id = buildHashedFilename(directoryName, fileName, expiryDate);
50
- const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, _id, fileName);
49
+ const hashedFilename = buildHashedFilename(directoryName, fileName, expiryDate);
50
+ const type = mimeType.lookup(fileName) || (await Promise.resolve(rawFile)).mimetype;
51
+ const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, hashedFilename, fileName, { 'content-type': type });
51
52
  await pipeline(stream, new PassThrough({ allowHalfOpen: true }), writeStream);
52
53
  const { length } = writeStream;
53
- const url = `/gridfs/${directoryName}/${encodeURIComponent(_id)}`;
54
+ const url = `/gridfs/${directoryName}/${encodeURIComponent(hashedFilename)}`;
54
55
  return {
55
- _id,
56
+ _id: hashedFilename,
56
57
  directoryName,
57
58
  expiryDate: null,
58
59
  fileName,
59
60
  size: length,
60
- type: mimeType.lookup(fileName) || (await Promise.resolve(rawFile)).mimetype,
61
+ type,
61
62
  url,
62
63
  };
63
64
  },
64
- async uploadFileFromURL(directoryName, { fileLink, fileName: fname, headers }, { modules }) {
65
+ async uploadFileFromURL(directoryName, { fileLink, fileName: fname, fileId, headers }, { modules }) {
65
66
  const { href } = new URL(fileLink);
66
67
  const fileName = decodeURIComponent(fname || href.split('/').pop());
67
68
  const expiryDate = resolveExpirationDate();
68
- const _id = buildHashedFilename(directoryName, fileName, expiryDate);
69
- const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, _id, fileName);
69
+ const hashedFilename = buildHashedFilename(directoryName, fileName, expiryDate);
70
70
  const response = await fetch(href, { headers });
71
71
  if (!response.ok)
72
72
  throw new Error(`Unexpected response for ${href}: ${response.statusText}`);
73
+ const type = mimeType.lookup(fileName) || response.headers.get('content-type');
74
+ const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, hashedFilename, fileName, { 'content-type': type });
73
75
  await pipeline(response.body, new PassThrough(), writeStream);
74
76
  const { length } = writeStream;
75
- const url = `/gridfs/${directoryName}/${encodeURIComponent(_id)}`;
76
- const type = mimeType.lookup(fileName) || response.headers.get('content-type');
77
+ const url = `/gridfs/${directoryName}/${encodeURIComponent(hashedFilename)}`;
77
78
  return {
78
- _id,
79
+ _id: fileId || hashedFilename,
79
80
  directoryName,
80
81
  expiryDate: null,
81
82
  fileName,
package/lib/files/gridfs/gridfs-adapter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"gridfs-adapter.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"gridfs-adapter.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-adapter.ts"],"names":[],"mappings":"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"}
package/lib/files/gridfs/gridfs-webhook.js CHANGED
@@ -32,15 +32,15 @@ export const gridfsHandler = async (req, res) => {
32
32
  res.end('File already linked');
33
33
  return;
34
34
  }
35
- const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, fileId, fileName);
36
- await pipeline(req, new PassThrough(), writeStream);
37
- const { length } = writeStream;
38
- res.statusCode = 200;
39
35
  // If the type is octet-stream, prefer mimetype lookup from the filename
40
36
  // Else prefer the content-type header
41
37
  const type = req.header('Content-Type') === 'application/octet-stream'
42
38
  ? file.type || req.header('Content-Type')
43
39
  : req.header('Content-Type') || file.type;
40
+ const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, fileId, fileName, { 'content-type': type });
41
+ await pipeline(req, new PassThrough(), writeStream);
42
+ const { length } = writeStream;
43
+ res.statusCode = 200;
44
44
  await services.files.linkFile({ fileId, size: length, type }, req.unchainedContext);
45
45
  res.end();
46
46
  return;
@@ -51,9 +51,13 @@ export const gridfsHandler = async (req, res) => {
51
51
  }
52
52
  if (req.method === 'GET') {
53
53
  const fileId = fileName;
54
- // Todo: Get Content-Type from meta data of GridFS file
55
- // res.setHeader('Content-Type', file.type);
56
- // res.setHeader('Content-Length', file.size);
54
+ const file = await modules.gridfsFileUploads.getFileInfo(directoryName, fileId);
55
+ if (file?.metadata?.['content-type']) {
56
+ res.setHeader('Content-Type', file.metadata['content-type']);
57
+ }
58
+ if (file?.length) {
59
+ res.setHeader('Content-Length', file?.length.toString());
60
+ }
57
61
  const readStream = await modules.gridfsFileUploads.createReadStream(directoryName, fileId);
58
62
  res.statusCode = 200;
59
63
  readStream.pipe(res, { end: false });
@@ -65,12 +69,13 @@ export const gridfsHandler = async (req, res) => {
65
69
  res.end();
66
70
  }
67
71
  catch (e) {
68
- log(e.message, { level: LogLevel.Error });
69
72
  if (e.code === 'ENOENT') {
73
+ log(e.message, { level: LogLevel.Warning });
70
74
  res.statusCode = 404;
71
- res.end();
75
+ res.end(e.message);
72
76
  }
73
77
  else {
78
+ log(e.message, { level: LogLevel.Error });
74
79
  res.statusCode = 503;
75
80
  res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
76
81
  }
package/lib/files/gridfs/gridfs-webhook.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"gridfs-webhook.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-webhook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGjE,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,GAIC,EACD,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,gBAAgB,CAAC;QACnD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvC,MAAM,CAAC,EAAE,gBAAgB,EAAE,WAAW,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClE,MAAM,aAAa,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAEjD;yEACiE;QACjE,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,UAAU,CAAC,CAAC;QAC1D,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,cAAc,CAAC,CAAC;QAC9D,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;QAElD,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC7B,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,GAAG,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACzB,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;YACvD,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,eAAyB,EAAE,EAAE,CAAC,CAAC,CAAC;YACrE,MAAM,MAAM,GAAG,mBAAmB,CAAC,aAAa,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;YACxE,IAAI,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,KAAK,SAAS,EAAE,CAAC;gBACpE,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;gBACtD,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;oBAC1B,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;oBACrB,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;oBAC/B,OAAO;gBACT,CAAC;gBACD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,iBAAiB,CACnE,aAAa,EACb,MAAM,EACN,QAAQ,CACT,CAAC;gBACF,MAAM,QAAQ,CAAC,GAAG,EAAE,IAAI,WAAW,EAAE,EAAE,WAAW,CAAC,CAAC;gBAEpD,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;gBAC/B,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;gBAErB,wEAAwE;gBACxE,sCAAsC;gBACtC,MAAM,IAAI,GACR,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,0BAA0B;oBACvD,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC;oBACzC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC;gBAE9C,MAAM,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBACpF,GAAG,CAAC,GAAG,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;YACD,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,GAAG,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,QAAQ,CAAC;YAExB,uDAAuD;YACvD,4CAA4C;YAC5C,8CAA8C;YAC9C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAC3F,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;YACrC,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC3B,GAAG,CAAC,GAAG,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QACD,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;QACrB,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxB,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"gridfs-webhook.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-webhook.ts"],"names":[],"mappings":"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"}
package/lib/files/gridfs/index.d.ts CHANGED
@@ -2,7 +2,8 @@ import { mongodb } from '@unchainedshop/mongodb';
2
2
  export declare const configureGridFSFileUploadModule: ({ db }: {
3
3
  db: any;
4
4
  }) => {
5
- createWriteStream: (directoryName: any, fileId: any, fileName: any) => Promise<mongodb.GridFSBucketWriteStream>;
5
+ createWriteStream: (directoryName: any, fileId: any, fileName: any, metadata: any) => Promise<mongodb.GridFSBucketWriteStream>;
6
+ getFileInfo: (directoryName: any, fileId: any) => Promise<mongodb.GridFSFile>;
6
7
  createReadStream: (directoryName: any, fileId: any) => Promise<mongodb.GridFSBucketReadStream>;
7
8
  removeFileFromBucket: (directoryName: any, fileId: any) => Promise<void>;
8
9
  };
package/lib/files/gridfs/index.js CHANGED
@@ -3,10 +3,15 @@ export const configureGridFSFileUploadModule = ({ db }) => {
3
3
  // eslint-disable-next-line
4
4
  let { GridFSBucket } = mongodb;
5
5
  return {
6
- createWriteStream: async (directoryName, fileId, fileName) => {
6
+ createWriteStream: async (directoryName, fileId, fileName, metadata) => {
7
7
  const options = { bucketName: `file_uploads_${directoryName}` };
8
8
  const bucket = new GridFSBucket(db, options);
9
- return bucket.openUploadStreamWithId(fileId, fileName);
9
+ return bucket.openUploadStreamWithId(fileId, fileName, { metadata });
10
+ },
11
+ getFileInfo: async (directoryName, fileId) => {
12
+ const options = { bucketName: `file_uploads_${directoryName}` };
13
+ const bucket = new GridFSBucket(db, options);
14
+ return bucket.find({ _id: fileId }).next();
10
15
  },
11
16
  createReadStream: async (directoryName, fileId) => {
12
17
  const options = { bucketName: `file_uploads_${directoryName}` };
package/lib/files/gridfs/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/files/gridfs/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;IACxD,2BAA2B;IAC3B,IAAI,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAE/B,OAAO;QACL,iBAAiB,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE;YAC3D,MAAM,OAAO,GAAG,EAAE,UAAU,EAAE,gBAAgB,aAAa,EAAE,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAC7C,OAAO,MAAM,CAAC,sBAAsB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACzD,CAAC;QACD,gBAAgB,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE;YAChD,MAAM,OAAO,GAAG,EAAE,UAAU,EAAE,gBAAgB,aAAa,EAAE,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAC7C,OAAO,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC;QACD,oBAAoB,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE;YACpD,MAAM,OAAO,GAAG,EAAE,UAAU,EAAE,gBAAgB,aAAa,EAAE,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAC7C,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/files/gridfs/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;IACxD,2BAA2B;IAC3B,IAAI,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAE/B,OAAO;QACL,iBAAiB,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;YACrE,MAAM,OAAO,GAAG,EAAE,UAAU,EAAE,gBAAgB,aAAa,EAAE,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAC7C,OAAO,MAAM,CAAC,sBAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,OAAO,GAAG,EAAE,UAAU,EAAE,gBAAgB,aAAa,EAAE,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAC7C,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,CAAC;QACD,gBAAgB,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE;YAChD,MAAM,OAAO,GAAG,EAAE,UAAU,EAAE,gBAAgB,aAAa,EAAE,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAC7C,OAAO,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC;QACD,oBAAoB,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE;YACpD,MAAM,OAAO,GAAG,EAAE,UAAU,EAAE,gBAAgB,aAAa,EAAE,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAC7C,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
package/lib/files/minio/minio-adapter.js CHANGED
@@ -146,27 +146,27 @@ export const MinioAdapter = {
146
146
  url: generateMinioUrl(directoryName, _id),
147
147
  };
148
148
  },
149
- async uploadFileFromURL(directoryName, { fileLink, fileName: fname, headers }) {
149
+ async uploadFileFromURL(directoryName, { fileLink, fileName: fname, fileId, headers }) {
150
150
  if (!client)
151
151
  throw new Error('Minio not connected, check env variables');
152
152
  const { href } = new URL(fileLink);
153
153
  const fileName = fname || href.split('/').pop();
154
- const _id = buildHashedFilename(directoryName, fileName, new Date());
154
+ const hashedFilename = buildHashedFilename(directoryName, fileName, new Date());
155
155
  const stream = await createHttpDownloadStream(fileLink, headers);
156
156
  const type = mimeType.lookup(fileName) || stream.headers['content-type'];
157
157
  const metaData = {
158
158
  'Content-Type': type,
159
159
  };
160
- await client.putObject(MINIO_BUCKET_NAME, generateMinioPath(directoryName, _id), stream, undefined, metaData);
161
- const { size } = await getObjectStats(generateMinioPath(directoryName, _id));
160
+ await client.putObject(MINIO_BUCKET_NAME, generateMinioPath(directoryName, hashedFilename), stream, undefined, metaData);
161
+ const { size } = await getObjectStats(generateMinioPath(directoryName, hashedFilename));
162
162
  return {
163
- _id,
163
+ _id: fileId || hashedFilename,
164
164
  directoryName,
165
165
  expiryDate: null,
166
166
  fileName,
167
167
  size,
168
168
  type,
169
- url: generateMinioUrl(directoryName, _id),
169
+ url: generateMinioUrl(directoryName, hashedFilename),
170
170
  };
171
171
  },
172
172
  async createDownloadStream(file) {
package/lib/files/minio/minio-adapter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"minio-adapter.js","sourceRoot":"","sources":["../../../src/files/minio/minio-adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"minio-adapter.js","sourceRoot":"","sources":["../../../src/files/minio/minio-adapter.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/plugins",
3
- "version": "2.8.14",
3
+ "version": "2.8.15",
4
4
  "main": "lib/plugins-index.js",
5
5
  "types": "lib/plugins-index.d.ts",
6
6
  "exports": {
@@ -88,22 +88,22 @@
88
88
  "devDependencies": {
89
89
  "@redis/client": "^1.5.14",
90
90
  "@types/node": "^20.12.7",
91
- "@unchainedshop/api": "^2.8.14",
92
- "@unchainedshop/core-delivery": "^2.8.14",
93
- "@unchainedshop/core-enrollments": "^2.8.14",
94
- "@unchainedshop/core-filters": "^2.8.14",
95
- "@unchainedshop/core-messaging": "^2.8.14",
96
- "@unchainedshop/core-orders": "^2.8.14",
97
- "@unchainedshop/core-payment": "^2.8.14",
98
- "@unchainedshop/core-products": "^2.8.14",
99
- "@unchainedshop/core-quotations": "^2.8.14",
100
- "@unchainedshop/core-warehousing": "^2.8.14",
101
- "@unchainedshop/core-worker": "^2.8.14",
102
- "@unchainedshop/events": "^2.8.14",
103
- "@unchainedshop/file-upload": "^2.8.14",
104
- "@unchainedshop/logger": "^2.8.14",
105
- "@unchainedshop/types": "^2.8.14",
106
- "@unchainedshop/utils": "^2.8.14",
91
+ "@unchainedshop/api": "^2.8.15",
92
+ "@unchainedshop/core-delivery": "^2.8.15",
93
+ "@unchainedshop/core-enrollments": "^2.8.15",
94
+ "@unchainedshop/core-filters": "^2.8.15",
95
+ "@unchainedshop/core-messaging": "^2.8.15",
96
+ "@unchainedshop/core-orders": "^2.8.15",
97
+ "@unchainedshop/core-payment": "^2.8.15",
98
+ "@unchainedshop/core-products": "^2.8.15",
99
+ "@unchainedshop/core-quotations": "^2.8.15",
100
+ "@unchainedshop/core-warehousing": "^2.8.15",
101
+ "@unchainedshop/core-worker": "^2.8.15",
102
+ "@unchainedshop/events": "^2.8.15",
103
+ "@unchainedshop/file-upload": "^2.8.15",
104
+ "@unchainedshop/logger": "^2.8.15",
105
+ "@unchainedshop/types": "^2.8.15",
106
+ "@unchainedshop/utils": "^2.8.15",
107
107
  "bluebird": "^3.7.2",
108
108
  "event-iterator": "^2.0.0",
109
109
  "express": "^4.19.2",
package/src/files/gridfs/gridfs-adapter.ts CHANGED
@@ -32,8 +32,8 @@ export const GridFSAdapter: IFileAdapter = {
32
32
 
33
33
  async createSignedURL(directoryName, fileName) {
34
34
  const expiryDate = resolveExpirationDate();
35
- const _id = buildHashedFilename(directoryName, fileName, expiryDate);
36
- const signature = sign(directoryName, _id, expiryDate.getTime());
35
+ const hashedFilename = buildHashedFilename(directoryName, fileName, expiryDate);
36
+ const signature = sign(directoryName, hashedFilename, expiryDate.getTime());
37
37
 
38
38
  const putURL = new URL(
39
39
  `/gridfs/${directoryName}/${encodeURIComponent(
@@ -41,10 +41,10 @@ export const GridFSAdapter: IFileAdapter = {
41
41
  )}?e=${expiryDate.getTime()}&s=${signature}`,
42
42
  ROOT_URL,
43
43
  ).href;
44
- const url = `/gridfs/${directoryName}/${_id}`;
44
+ const url = `/gridfs/${directoryName}/${hashedFilename}`;
45
45
 
46
46
  return {
47
- _id,
47
+ _id: hashedFilename,
48
48
  directoryName,
49
49
  expiryDate,
50
50
  fileName,
@@ -67,45 +67,57 @@ export const GridFSAdapter: IFileAdapter = {
67
67
  }
68
68
 
69
69
  const expiryDate = resolveExpirationDate();
70
- const _id = buildHashedFilename(directoryName, fileName, expiryDate);
70
+ const hashedFilename = buildHashedFilename(directoryName, fileName, expiryDate);
71
+ const type = mimeType.lookup(fileName) || (await Promise.resolve(rawFile)).mimetype;
71
72
 
72
- const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, _id, fileName);
73
+ const writeStream = await modules.gridfsFileUploads.createWriteStream(
74
+ directoryName,
75
+ hashedFilename,
76
+ fileName,
77
+ { 'content-type': type },
78
+ );
73
79
  await pipeline(stream, new PassThrough({ allowHalfOpen: true }), writeStream);
74
80
  const { length } = writeStream;
75
- const url = `/gridfs/${directoryName}/${encodeURIComponent(_id)}`;
81
+ const url = `/gridfs/${directoryName}/${encodeURIComponent(hashedFilename)}`;
76
82
 
77
83
  return {
78
- _id,
84
+ _id: hashedFilename,
79
85
  directoryName,
80
86
  expiryDate: null,
81
87
  fileName,
82
88
  size: length,
83
- type: mimeType.lookup(fileName) || (await Promise.resolve(rawFile)).mimetype,
89
+ type,
84
90
  url,
85
91
  } as UploadFileData;
86
92
  },
87
93
 
88
94
  async uploadFileFromURL(
89
95
  directoryName: string,
90
- { fileLink, fileName: fname, headers }: any,
96
+ { fileLink, fileName: fname, fileId, headers }: any,
91
97
  { modules }: any,
92
98
  ) {
93
99
  const { href } = new URL(fileLink);
94
100
  const fileName = decodeURIComponent(fname || href.split('/').pop());
95
101
 
96
102
  const expiryDate = resolveExpirationDate();
97
- const _id = buildHashedFilename(directoryName, fileName, expiryDate);
103
+ const hashedFilename = buildHashedFilename(directoryName, fileName, expiryDate);
98
104
 
99
- const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, _id, fileName);
100
105
  const response = await fetch(href, { headers });
101
106
  if (!response.ok) throw new Error(`Unexpected response for ${href}: ${response.statusText}`);
107
+ const type = mimeType.lookup(fileName) || response.headers.get('content-type');
108
+
109
+ const writeStream = await modules.gridfsFileUploads.createWriteStream(
110
+ directoryName,
111
+ hashedFilename,
112
+ fileName,
113
+ { 'content-type': type },
114
+ );
102
115
  await pipeline(response.body as unknown as Readable, new PassThrough(), writeStream);
103
116
  const { length } = writeStream;
104
- const url = `/gridfs/${directoryName}/${encodeURIComponent(_id)}`;
105
- const type = mimeType.lookup(fileName) || response.headers.get('content-type');
117
+ const url = `/gridfs/${directoryName}/${encodeURIComponent(hashedFilename)}`;
106
118
 
107
119
  return {
108
- _id,
120
+ _id: fileId || hashedFilename,
109
121
  directoryName,
110
122
  expiryDate: null,
111
123
  fileName,
package/src/files/gridfs/gridfs-webhook.ts CHANGED
@@ -47,23 +47,24 @@ export const gridfsHandler = async (
47
47
  res.end('File already linked');
48
48
  return;
49
49
  }
50
+
51
+ // If the type is octet-stream, prefer mimetype lookup from the filename
52
+ // Else prefer the content-type header
53
+ const type =
54
+ req.header('Content-Type') === 'application/octet-stream'
55
+ ? file.type || req.header('Content-Type')
56
+ : req.header('Content-Type') || file.type;
57
+
50
58
  const writeStream = await modules.gridfsFileUploads.createWriteStream(
51
59
  directoryName,
52
60
  fileId,
53
61
  fileName,
62
+ { 'content-type': type },
54
63
  );
55
64
  await pipeline(req, new PassThrough(), writeStream);
56
65
 
57
66
  const { length } = writeStream;
58
67
  res.statusCode = 200;
59
-
60
- // If the type is octet-stream, prefer mimetype lookup from the filename
61
- // Else prefer the content-type header
62
- const type =
63
- req.header('Content-Type') === 'application/octet-stream'
64
- ? file.type || req.header('Content-Type')
65
- : req.header('Content-Type') || file.type;
66
-
67
68
  await services.files.linkFile({ fileId, size: length, type }, req.unchainedContext);
68
69
  res.end();
69
70
  return;
@@ -76,9 +77,13 @@ export const gridfsHandler = async (
76
77
  if (req.method === 'GET') {
77
78
  const fileId = fileName;
78
79
 
79
- // Todo: Get Content-Type from meta data of GridFS file
80
- // res.setHeader('Content-Type', file.type);
81
- // res.setHeader('Content-Length', file.size);
80
+ const file = await modules.gridfsFileUploads.getFileInfo(directoryName, fileId);
81
+ if (file?.metadata?.['content-type']) {
82
+ res.setHeader('Content-Type', file.metadata['content-type']);
83
+ }
84
+ if (file?.length) {
85
+ res.setHeader('Content-Length', file?.length.toString());
86
+ }
82
87
  const readStream = await modules.gridfsFileUploads.createReadStream(directoryName, fileId);
83
88
  res.statusCode = 200;
84
89
  readStream.pipe(res, { end: false });
@@ -89,11 +94,12 @@ export const gridfsHandler = async (
89
94
  res.statusCode = 404;
90
95
  res.end();
91
96
  } catch (e) {
92
- log(e.message, { level: LogLevel.Error });
93
97
  if (e.code === 'ENOENT') {
98
+ log(e.message, { level: LogLevel.Warning });
94
99
  res.statusCode = 404;
95
- res.end();
100
+ res.end(e.message);
96
101
  } else {
102
+ log(e.message, { level: LogLevel.Error });
97
103
  res.statusCode = 503;
98
104
  res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
99
105
  }
package/src/files/gridfs/index.ts CHANGED
@@ -5,10 +5,15 @@ export const configureGridFSFileUploadModule = ({ db }) => {
5
5
  let { GridFSBucket } = mongodb;
6
6
 
7
7
  return {
8
- createWriteStream: async (directoryName, fileId, fileName) => {
8
+ createWriteStream: async (directoryName, fileId, fileName, metadata) => {
9
9
  const options = { bucketName: `file_uploads_${directoryName}` };
10
10
  const bucket = new GridFSBucket(db, options);
11
- return bucket.openUploadStreamWithId(fileId, fileName);
11
+ return bucket.openUploadStreamWithId(fileId, fileName, { metadata });
12
+ },
13
+ getFileInfo: async (directoryName, fileId) => {
14
+ const options = { bucketName: `file_uploads_${directoryName}` };
15
+ const bucket = new GridFSBucket(db, options);
16
+ return bucket.find({ _id: fileId }).next();
12
17
  },
13
18
  createReadStream: async (directoryName, fileId) => {
14
19
  const options = { bucketName: `file_uploads_${directoryName}` };
package/src/files/minio/minio-adapter.ts CHANGED
@@ -201,12 +201,12 @@ export const MinioAdapter: IFileAdapter = {
201
201
  } as UploadFileData;
202
202
  },
203
203
 
204
- async uploadFileFromURL(directoryName: string, { fileLink, fileName: fname, headers }: any) {
204
+ async uploadFileFromURL(directoryName: string, { fileLink, fileName: fname, fileId, headers }: any) {
205
205
  if (!client) throw new Error('Minio not connected, check env variables');
206
206
 
207
207
  const { href } = new URL(fileLink);
208
208
  const fileName = fname || href.split('/').pop();
209
- const _id = buildHashedFilename(directoryName, fileName, new Date());
209
+ const hashedFilename = buildHashedFilename(directoryName, fileName, new Date());
210
210
 
211
211
  const stream = await createHttpDownloadStream(fileLink, headers);
212
212
  const type = mimeType.lookup(fileName) || stream.headers['content-type'];
@@ -217,21 +217,21 @@ export const MinioAdapter: IFileAdapter = {
217
217
 
218
218
  await client.putObject(
219
219
  MINIO_BUCKET_NAME,
220
- generateMinioPath(directoryName, _id),
220
+ generateMinioPath(directoryName, hashedFilename),
221
221
  stream,
222
222
  undefined,
223
223
  metaData,
224
224
  );
225
- const { size } = await getObjectStats(generateMinioPath(directoryName, _id));
225
+ const { size } = await getObjectStats(generateMinioPath(directoryName, hashedFilename));
226
226
 
227
227
  return {
228
- _id,
228
+ _id: fileId || hashedFilename,
229
229
  directoryName,
230
230
  expiryDate: null,
231
231
  fileName,
232
232
  size,
233
233
  type,
234
- url: generateMinioUrl(directoryName, _id),
234
+ url: generateMinioUrl(directoryName, hashedFilename),
235
235
  } as UploadFileData;
236
236
  },
237
237