@unchainedshop/plugins 1.2.31 → 1.2.33

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 (11) hide show
  1. package/lib/files/gridfs/gridfs-adapter.js +11 -24
  2. package/lib/files/gridfs/gridfs-adapter.js.map +1 -1
  3. package/lib/files/gridfs/gridfs-webhook.js +4 -3
  4. package/lib/files/gridfs/gridfs-webhook.js.map +1 -1
  5. package/lib/payment/datatrans-v2/index.js +12 -14
  6. package/lib/payment/datatrans-v2/index.js.map +1 -1
  7. package/package.json +1 -1
  8. package/src/files/gridfs/gridfs-adapter.ts +10 -27
  9. package/src/files/gridfs/gridfs-webhook.ts +4 -3
  10. package/src/payment/datatrans-v2/index.ts +17 -14
  11. package/src/files/gridfs/promisePipe.ts +0 -19
package/lib/files/gridfs/gridfs-adapter.js CHANGED
@@ -1,11 +1,10 @@
1
1
  import { FileAdapter, FileDirector, buildHashedFilename } from '@unchainedshop/file-upload';
2
- import https from 'https';
3
- import http from 'http';
4
2
  import mimeType from 'mime-types';
5
3
  import { URL } from 'url';
6
4
  import { Readable } from 'stream';
5
+ import { pipeline } from 'stream/promises';
6
+ import fetch from 'node-fetch';
7
7
  import sign from './sign';
8
- import promisePipe from './promisePipe';
9
8
  const { UNCHAINED_PUT_URL_EXPIRY, ROOT_URL } = process.env;
10
9
  const getExpiryDate = () => new Date(new Date().getTime() + (parseInt(UNCHAINED_PUT_URL_EXPIRY, 10) || 24 * 60 * 60 * 1000));
11
10
  const bufferToStream = (buffer) => {
@@ -14,22 +13,6 @@ const bufferToStream = (buffer) => {
14
13
  stream.push(null);
15
14
  return stream;
16
15
  };
17
- const createDownloadStream = async (fileUrl, headers) => {
18
- const { href, protocol } = new URL(fileUrl);
19
- return new Promise((resolve, reject) => {
20
- try {
21
- if (protocol === 'http:') {
22
- http.get(href, { headers }, resolve);
23
- }
24
- else {
25
- https.get(href, { headers }, resolve);
26
- }
27
- }
28
- catch (e) {
29
- reject(e);
30
- }
31
- });
32
- };
33
16
  export const GridFSAdapter = {
34
17
  key: 'shop.unchained.file-upload-plugin.gridfs',
35
18
  label: 'Uploads files to Database using GridFS',
@@ -66,14 +49,15 @@ export const GridFSAdapter = {
66
49
  const expiryDate = getExpiryDate();
67
50
  const _id = buildHashedFilename(directoryName, fileName, expiryDate);
68
51
  const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, _id, fileName);
69
- const file = await promisePipe(stream, writeStream);
52
+ await pipeline(stream, writeStream);
53
+ const { length } = writeStream;
70
54
  const url = `/gridfs/${directoryName}/${_id}`;
71
55
  return {
72
56
  _id,
73
57
  directoryName,
74
58
  expiryDate: null,
75
59
  fileName,
76
- size: file.length,
60
+ size: length,
77
61
  type: mimeType.lookup(fileName) || (await Promise.resolve(rawFile)).mimetype,
78
62
  url,
79
63
  };
@@ -83,16 +67,19 @@ export const GridFSAdapter = {
83
67
  const fileName = fname || href.split('/').pop();
84
68
  const expiryDate = getExpiryDate();
85
69
  const _id = buildHashedFilename(directoryName, fileName, expiryDate);
86
- const downloadStream = await createDownloadStream(href, headers);
87
70
  const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, _id, fileName);
88
- const file = await promisePipe(downloadStream, writeStream);
71
+ const response = await fetch(href, { headers });
72
+ if (!response.ok)
73
+ throw new Error(`Unexpected response for ${href}: ${response.statusText}`);
74
+ await pipeline(response.body, writeStream);
75
+ const { length } = writeStream;
89
76
  const url = `/gridfs/${directoryName}/${_id}`;
90
77
  return {
91
78
  _id,
92
79
  directoryName,
93
80
  expiryDate: null,
94
81
  fileName,
95
- size: file.length,
82
+ size: length,
96
83
  type: mimeType.lookup(fileName),
97
84
  url,
98
85
  };
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
@@ -1,8 +1,8 @@
1
1
  import { useMiddlewareWithCurrentContext } from '@unchainedshop/api';
2
2
  import { log, LogLevel } from '@unchainedshop/logger';
3
3
  import { buildHashedFilename } from '@unchainedshop/file-upload';
4
+ import { pipeline } from 'stream/promises';
4
5
  import sign from './sign';
5
- import promisePipe from './promisePipe';
6
6
  const { ROOT_URL } = process.env;
7
7
  /*
8
8
  curl -vvv -X PUT -T /Users/pozylon/Downloads/grafik.png http://localhost:4010/gridfs/user-avatars/hans.png?e=1653059591506&s=df8626a1c9b9006249d7f1928fd530579fed57216f1bdcb83c28a8322cdc90b1
@@ -25,7 +25,8 @@ export default (app) => useMiddlewareWithCurrentContext(app, '/gridfs', async (r
25
25
  }
26
26
  const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, fileId, fileName);
27
27
  res.writeHead(200);
28
- const { length } = (await promisePipe(req, writeStream));
28
+ await pipeline(req, writeStream);
29
+ const { length } = writeStream;
29
30
  await services.files.linkFile({ fileId, size: length }, req.unchainedContext);
30
31
  res.end();
31
32
  return;
@@ -38,7 +39,7 @@ export default (app) => useMiddlewareWithCurrentContext(app, '/gridfs', async (r
38
39
  const fileId = fileName;
39
40
  const readStream = await modules.gridfsFileUploads.createReadStream(directoryName, fileId);
40
41
  res.writeHead(200);
41
- await promisePipe(readStream, res);
42
+ await pipeline(readStream, res);
42
43
  res.end();
43
44
  return;
44
45
  }
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":"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"}
1
+ {"version":3,"file":"gridfs-webhook.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-webhook.ts"],"names":[],"mappings":"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"}
package/lib/payment/datatrans-v2/index.js CHANGED
@@ -72,7 +72,7 @@ const Datatrans = {
72
72
  };
73
73
  }));
74
74
  };
75
- const authorize = async ({ paymentCredentials, extensions }) => {
75
+ const authorize = async ({ paymentCredentials, ...arbitraryFields }) => {
76
76
  const { order, orderPayment } = params.paymentContext;
77
77
  const userId = order?.userId || params.context.userId;
78
78
  const refno = Buffer.from(orderPayment._id, 'hex').toString('base64');
@@ -80,7 +80,7 @@ const Datatrans = {
80
80
  const { currency, amount } = roundedAmountFromOrder(order, params.context);
81
81
  const splits = await getMarketplaceSplits();
82
82
  const result = await api().authorize({
83
- ...extensions,
83
+ ...arbitraryFields,
84
84
  amount,
85
85
  currency,
86
86
  refno,
@@ -99,11 +99,11 @@ const Datatrans = {
99
99
  throwIfResponseError(result);
100
100
  return result.transactionId;
101
101
  };
102
- const authorizeAuth = async ({ transactionId, refno, refno2, extensions }) => {
102
+ const authorizeAuth = async ({ transactionId, refno, refno2, ...arbitraryFields }) => {
103
103
  const { order } = params.paymentContext;
104
104
  const { currency, amount } = roundedAmountFromOrder(order, params.context);
105
105
  const result = await api().authorizeAuthenticated({
106
- ...extensions,
106
+ ...arbitraryFields,
107
107
  transactionId,
108
108
  amount,
109
109
  currency,
@@ -178,7 +178,7 @@ const Datatrans = {
178
178
  return false;
179
179
  },
180
180
  async sign(transactionContext = {}) {
181
- const { useSecureFields = false, ...additionalInitPayload } = transactionContext || {};
181
+ const { useSecureFields = false, ...arbitraryFields } = transactionContext || {};
182
182
  const { orderPayment, paymentProviderId, order } = params.paymentContext;
183
183
  const userId = order?.userId || params.context?.userId;
184
184
  const refno = Buffer.from(orderPayment ? orderPayment._id : paymentProviderId, 'hex').toString('base64');
@@ -188,7 +188,7 @@ const Datatrans = {
188
188
  : {};
189
189
  if (useSecureFields) {
190
190
  const result = await api().secureFields({
191
- ...additionalInitPayload,
191
+ ...arbitraryFields,
192
192
  currency: price.currency || 'CHF',
193
193
  refno,
194
194
  refno2,
@@ -201,7 +201,7 @@ const Datatrans = {
201
201
  return JSON.stringify(result);
202
202
  }
203
203
  const result = await api().init({
204
- ...additionalInitPayload,
204
+ ...arbitraryFields,
205
205
  currency: price.currency || 'CHF',
206
206
  refno,
207
207
  refno2,
@@ -239,9 +239,7 @@ const Datatrans = {
239
239
  return false;
240
240
  const { orderPayment, transactionContext } = params.paymentContext;
241
241
  const { transactionId } = orderPayment;
242
- // Remove the transactionId from the transactionContext
243
- const extensions = { ...transactionContext };
244
- delete extensions.transactionId;
242
+ const { extensions } = transactionContext || {};
245
243
  if (!transactionId) {
246
244
  return false;
247
245
  }
@@ -287,15 +285,15 @@ const Datatrans = {
287
285
  }
288
286
  return true;
289
287
  },
290
- async charge({ transactionId: rawTransactionId, paymentCredentials, authorizeAuthenticated, ...extensions }) {
288
+ async charge({ transactionId: rawTransactionId, paymentCredentials, authorizeAuthenticated, ...arbitraryFields }) {
291
289
  if (!rawTransactionId && !paymentCredentials) {
292
290
  logger.warn('Not trying to charge because of missing payment authorization response, return false to provide later');
293
291
  return false;
294
292
  }
295
293
  const transactionId = rawTransactionId ||
296
294
  (await authorize({
295
+ ...arbitraryFields,
297
296
  paymentCredentials,
298
- extensions,
299
297
  }));
300
298
  const transaction = (await api().status({
301
299
  transactionId,
@@ -319,10 +317,10 @@ const Datatrans = {
319
317
  if (authorizeAuthenticated) {
320
318
  checkIfTransactionAmountValid(transactionId, transaction);
321
319
  await authorizeAuth({
320
+ ...(authorizeAuthenticated || {}),
322
321
  transactionId,
323
322
  refno: transaction.refno,
324
323
  refno2: transaction.refno2,
325
- extensions: authorizeAuthenticated,
326
324
  });
327
325
  status = 'authorized';
328
326
  }
@@ -364,7 +362,7 @@ const Datatrans = {
364
362
  return {
365
363
  transactionId,
366
364
  settledTransaction,
367
- extensions,
365
+ arbitraryFields,
368
366
  credentials,
369
367
  };
370
368
  }
package/lib/payment/datatrans-v2/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/payment/datatrans-v2/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/plugins",
3
- "version": "1.2.31",
3
+ "version": "1.2.33",
4
4
  "main": "lib/plugins-index.js",
5
5
  "types": "lib/plugins-index.d.ts",
6
6
  "exports": {
package/src/files/gridfs/gridfs-adapter.ts CHANGED
@@ -1,12 +1,11 @@
1
1
  import { IFileAdapter, UploadFileData } from '@unchainedshop/types/files';
2
2
  import { FileAdapter, FileDirector, buildHashedFilename } from '@unchainedshop/file-upload';
3
- import https from 'https';
4
- import http, { OutgoingHttpHeaders } from 'http';
5
3
  import mimeType from 'mime-types';
6
4
  import { URL } from 'url';
7
5
  import { Readable } from 'stream';
6
+ import { pipeline } from 'stream/promises';
7
+ import fetch from 'node-fetch';
8
8
  import sign from './sign';
9
- import promisePipe from './promisePipe';
10
9
 
11
10
  const { UNCHAINED_PUT_URL_EXPIRY, ROOT_URL } = process.env;
12
11
 
@@ -21,24 +20,6 @@ const bufferToStream = (buffer: any) => {
21
20
  return stream;
22
21
  };
23
22
 
24
- const createDownloadStream = async (
25
- fileUrl: string,
26
- headers: OutgoingHttpHeaders,
27
- ): Promise<Readable> => {
28
- const { href, protocol } = new URL(fileUrl);
29
- return new Promise((resolve, reject) => {
30
- try {
31
- if (protocol === 'http:') {
32
- http.get(href, { headers }, resolve);
33
- } else {
34
- https.get(href, { headers }, resolve);
35
- }
36
- } catch (e) {
37
- reject(e);
38
- }
39
- });
40
- };
41
-
42
23
  export const GridFSAdapter: IFileAdapter = {
43
24
  key: 'shop.unchained.file-upload-plugin.gridfs',
44
25
  label: 'Uploads files to Database using GridFS',
@@ -86,8 +67,8 @@ export const GridFSAdapter: IFileAdapter = {
86
67
  const _id = buildHashedFilename(directoryName, fileName, expiryDate);
87
68
 
88
69
  const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, _id, fileName);
89
-
90
- const file: any = await promisePipe(stream, writeStream);
70
+ await pipeline(stream, writeStream);
71
+ const { length } = writeStream;
91
72
  const url = `/gridfs/${directoryName}/${_id}`;
92
73
 
93
74
  return {
@@ -95,7 +76,7 @@ export const GridFSAdapter: IFileAdapter = {
95
76
  directoryName,
96
77
  expiryDate: null,
97
78
  fileName,
98
- size: file.length,
79
+ size: length,
99
80
  type: mimeType.lookup(fileName) || (await Promise.resolve(rawFile)).mimetype,
100
81
  url,
101
82
  } as UploadFileData;
@@ -112,9 +93,11 @@ export const GridFSAdapter: IFileAdapter = {
112
93
  const expiryDate = getExpiryDate();
113
94
  const _id = buildHashedFilename(directoryName, fileName, expiryDate);
114
95
 
115
- const downloadStream = await createDownloadStream(href, headers);
116
96
  const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, _id, fileName);
117
- const file: any = await promisePipe(downloadStream, writeStream);
97
+ const response = await fetch(href, { headers });
98
+ if (!response.ok) throw new Error(`Unexpected response for ${href}: ${response.statusText}`);
99
+ await pipeline(response.body, writeStream);
100
+ const { length } = writeStream;
118
101
  const url = `/gridfs/${directoryName}/${_id}`;
119
102
 
120
103
  return {
@@ -122,7 +105,7 @@ export const GridFSAdapter: IFileAdapter = {
122
105
  directoryName,
123
106
  expiryDate: null,
124
107
  fileName,
125
- size: file.length,
108
+ size: length,
126
109
  type: mimeType.lookup(fileName),
127
110
  url,
128
111
  } as UploadFileData;
package/src/files/gridfs/gridfs-webhook.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  import { useMiddlewareWithCurrentContext } from '@unchainedshop/api';
2
2
  import { log, LogLevel } from '@unchainedshop/logger';
3
3
  import { buildHashedFilename } from '@unchainedshop/file-upload';
4
+ import { pipeline } from 'stream/promises';
4
5
  import sign from './sign';
5
- import promisePipe from './promisePipe';
6
6
 
7
7
  const { ROOT_URL } = process.env;
8
8
 
@@ -34,7 +34,8 @@ export default (app) =>
34
34
  fileName,
35
35
  );
36
36
  res.writeHead(200);
37
- const { length } = (await promisePipe(req, writeStream)) as any;
37
+ await pipeline(req, writeStream);
38
+ const { length } = writeStream;
38
39
  await services.files.linkFile({ fileId, size: length }, req.unchainedContext);
39
40
  res.end();
40
41
  return;
@@ -47,7 +48,7 @@ export default (app) =>
47
48
  const fileId = fileName;
48
49
  const readStream = await modules.gridfsFileUploads.createReadStream(directoryName, fileId);
49
50
  res.writeHead(200);
50
- await promisePipe(readStream, res);
51
+ await pipeline(readStream, res);
51
52
  res.end();
52
53
  return;
53
54
  }
package/src/payment/datatrans-v2/index.ts CHANGED
@@ -115,7 +115,7 @@ const Datatrans: IPaymentAdapter = {
115
115
  );
116
116
  };
117
117
 
118
- const authorize = async ({ paymentCredentials, extensions }): Promise<string> => {
118
+ const authorize = async ({ paymentCredentials, ...arbitraryFields }): Promise<string> => {
119
119
  const { order, orderPayment } = params.paymentContext;
120
120
  const userId = order?.userId || params.context.userId;
121
121
  const refno = Buffer.from(orderPayment._id, 'hex').toString('base64');
@@ -123,7 +123,7 @@ const Datatrans: IPaymentAdapter = {
123
123
  const { currency, amount } = roundedAmountFromOrder(order, params.context);
124
124
  const splits = await getMarketplaceSplits();
125
125
  const result = await api().authorize({
126
- ...extensions,
126
+ ...arbitraryFields,
127
127
  amount,
128
128
  currency,
129
129
  refno,
@@ -143,11 +143,16 @@ const Datatrans: IPaymentAdapter = {
143
143
  return (result as AuthorizeResponseSuccess).transactionId;
144
144
  };
145
145
 
146
- const authorizeAuth = async ({ transactionId, refno, refno2, extensions }): Promise<string> => {
146
+ const authorizeAuth = async ({
147
+ transactionId,
148
+ refno,
149
+ refno2,
150
+ ...arbitraryFields
151
+ }): Promise<string> => {
147
152
  const { order } = params.paymentContext;
148
153
  const { currency, amount } = roundedAmountFromOrder(order, params.context);
149
154
  const result = await api().authorizeAuthenticated({
150
- ...extensions,
155
+ ...arbitraryFields,
151
156
  transactionId,
152
157
  amount,
153
158
  currency,
@@ -243,7 +248,7 @@ const Datatrans: IPaymentAdapter = {
243
248
  },
244
249
 
245
250
  async sign(transactionContext: any = {}) {
246
- const { useSecureFields = false, ...additionalInitPayload } = transactionContext || {};
251
+ const { useSecureFields = false, ...arbitraryFields } = transactionContext || {};
247
252
  const { orderPayment, paymentProviderId, order } = params.paymentContext;
248
253
 
249
254
  const userId = order?.userId || params.context?.userId;
@@ -258,7 +263,7 @@ const Datatrans: IPaymentAdapter = {
258
263
 
259
264
  if (useSecureFields) {
260
265
  const result = await api().secureFields({
261
- ...additionalInitPayload,
266
+ ...arbitraryFields,
262
267
  currency: price.currency || 'CHF',
263
268
  refno,
264
269
  refno2,
@@ -271,7 +276,7 @@ const Datatrans: IPaymentAdapter = {
271
276
  return JSON.stringify(result as InitResponseSuccess);
272
277
  }
273
278
  const result = await api().init({
274
- ...additionalInitPayload,
279
+ ...arbitraryFields,
275
280
  currency: price.currency || 'CHF',
276
281
  refno,
277
282
  refno2,
@@ -311,9 +316,7 @@ const Datatrans: IPaymentAdapter = {
311
316
  const { orderPayment, transactionContext } = params.paymentContext;
312
317
  const { transactionId } = orderPayment;
313
318
 
314
- // Remove the transactionId from the transactionContext
315
- const extensions = { ...transactionContext };
316
- delete extensions.transactionId;
319
+ const { extensions } = transactionContext || {};
317
320
 
318
321
  if (!transactionId) {
319
322
  return false;
@@ -367,7 +370,7 @@ const Datatrans: IPaymentAdapter = {
367
370
  transactionId: rawTransactionId,
368
371
  paymentCredentials,
369
372
  authorizeAuthenticated,
370
- ...extensions
373
+ ...arbitraryFields
371
374
  }) {
372
375
  if (!rawTransactionId && !paymentCredentials) {
373
376
  logger.warn(
@@ -379,8 +382,8 @@ const Datatrans: IPaymentAdapter = {
379
382
  const transactionId =
380
383
  rawTransactionId ||
381
384
  (await authorize({
385
+ ...arbitraryFields,
382
386
  paymentCredentials,
383
- extensions,
384
387
  }));
385
388
 
386
389
  const transaction: StatusResponseSuccess = (await api().status({
@@ -410,10 +413,10 @@ const Datatrans: IPaymentAdapter = {
410
413
  if (authorizeAuthenticated) {
411
414
  checkIfTransactionAmountValid(transactionId, transaction);
412
415
  await authorizeAuth({
416
+ ...(authorizeAuthenticated || {}),
413
417
  transactionId,
414
418
  refno: transaction.refno,
415
419
  refno2: transaction.refno2,
416
- extensions: authorizeAuthenticated,
417
420
  });
418
421
  status = 'authorized';
419
422
  } else {
@@ -455,7 +458,7 @@ const Datatrans: IPaymentAdapter = {
455
458
  return {
456
459
  transactionId,
457
460
  settledTransaction,
458
- extensions,
461
+ arbitraryFields,
459
462
  credentials,
460
463
  };
461
464
  }
package/src/files/gridfs/promisePipe.ts DELETED
@@ -1,19 +0,0 @@
1
- export default async (readStream, writeStream) => {
2
- return new Promise((resolve, reject) => {
3
- try {
4
- readStream
5
- .on('error', (e) => {
6
- reject(e);
7
- })
8
- .pipe(writeStream)
9
- .on('error', (e) => {
10
- reject(e);
11
- })
12
- .on('finish', async (file) => {
13
- resolve(file);
14
- });
15
- } catch (e) {
16
- reject(e);
17
- }
18
- });
19
- };