@unchainedshop/plugins 2.3.4 → 2.3.6
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/files/gridfs/gridfs-adapter.js +7 -7
- package/lib/files/gridfs/gridfs-adapter.js.map +1 -1
- package/lib/files/gridfs/gridfs-webhook.js +1 -1
- package/lib/files/gridfs/gridfs-webhook.js.map +1 -1
- package/lib/files/minio/minio-adapter.js +16 -13
- package/lib/files/minio/minio-adapter.js.map +1 -1
- package/lib/worker/bulk-import.js +1 -1
- package/lib/worker/bulk-import.js.map +1 -1
- package/lib/worker/email.js +2 -2
- package/lib/worker/email.js.map +1 -1
- package/lib/worker/update-ecb-rates.js.map +1 -1
- package/package.json +17 -17
- package/src/files/gridfs/gridfs-adapter.ts +12 -10
- package/src/files/gridfs/gridfs-webhook.ts +1 -1
- package/src/files/minio/minio-adapter.ts +37 -16
- package/src/worker/bulk-import.ts +1 -1
- package/src/worker/email.ts +3 -3
- package/src/worker/update-ecb-rates.ts +5 -4
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
import mimeType from 'mime-types';
|
|
1
|
+
/// <reference lib="dom" />
|
|
3
2
|
import { URL } from 'url';
|
|
4
3
|
import { Readable, pipeline as rawPipeline } from 'stream';
|
|
5
4
|
import { promisify } from 'util';
|
|
5
|
+
import mimeType from 'mime-types';
|
|
6
|
+
import { FileAdapter, FileDirector, buildHashedFilename, resolveExpirationDate, } from '@unchainedshop/file-upload';
|
|
6
7
|
import sign from './sign.js';
|
|
7
8
|
const pipeline = promisify(rawPipeline);
|
|
8
|
-
const {
|
|
9
|
-
const getExpiryDate = () => new Date(new Date().getTime() + (parseInt(UNCHAINED_PUT_URL_EXPIRY, 10) || 24 * 60 * 60 * 1000));
|
|
9
|
+
const { ROOT_URL } = process.env;
|
|
10
10
|
const bufferToStream = (buffer) => {
|
|
11
11
|
const stream = new Readable();
|
|
12
12
|
stream.push(buffer);
|
|
@@ -19,7 +19,7 @@ export const GridFSAdapter = {
|
|
|
19
19
|
version: '1.0.0',
|
|
20
20
|
...FileAdapter,
|
|
21
21
|
async createSignedURL(directoryName, fileName) {
|
|
22
|
-
const expiryDate =
|
|
22
|
+
const expiryDate = resolveExpirationDate();
|
|
23
23
|
const _id = buildHashedFilename(directoryName, fileName, expiryDate);
|
|
24
24
|
const signature = sign(directoryName, _id, expiryDate.getTime());
|
|
25
25
|
const putURL = new URL(`/gridfs/${directoryName}/${encodeURIComponent(fileName)}?e=${expiryDate.getTime()}&s=${signature}`, ROOT_URL).href;
|
|
@@ -46,7 +46,7 @@ export const GridFSAdapter = {
|
|
|
46
46
|
fileName = rawFile.filename;
|
|
47
47
|
stream = bufferToStream(Buffer.from(rawFile.buffer, 'base64'));
|
|
48
48
|
}
|
|
49
|
-
const expiryDate =
|
|
49
|
+
const expiryDate = resolveExpirationDate();
|
|
50
50
|
const _id = buildHashedFilename(directoryName, fileName, expiryDate);
|
|
51
51
|
const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, _id, fileName);
|
|
52
52
|
await pipeline(stream, writeStream);
|
|
@@ -65,7 +65,7 @@ export const GridFSAdapter = {
|
|
|
65
65
|
async uploadFileFromURL(directoryName, { fileLink, fileName: fname, headers }, { modules }) {
|
|
66
66
|
const { href } = new URL(fileLink);
|
|
67
67
|
const fileName = fname || href.split('/').pop();
|
|
68
|
-
const expiryDate =
|
|
68
|
+
const expiryDate = resolveExpirationDate();
|
|
69
69
|
const _id = buildHashedFilename(directoryName, fileName, expiryDate);
|
|
70
70
|
const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, _id, fileName);
|
|
71
71
|
const response = await fetch(href, { headers });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gridfs-adapter.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gridfs-adapter.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { pipeline, finished } from 'stream/promises';
|
|
1
2
|
import { log, LogLevel } from '@unchainedshop/logger';
|
|
2
3
|
import { buildHashedFilename } from '@unchainedshop/file-upload';
|
|
3
|
-
import { pipeline, finished } from 'stream/promises';
|
|
4
4
|
import sign from './sign.js';
|
|
5
5
|
const { ROOT_URL } = process.env;
|
|
6
6
|
export const gridfsHandler = async (req, res) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gridfs-webhook.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-webhook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"gridfs-webhook.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-webhook.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { FileAdapter, FileDirector, buildHashedFilename } from '@unchainedshop/file-upload';
|
|
2
1
|
import https from 'https';
|
|
3
2
|
import http from 'http';
|
|
3
|
+
import { Readable } from 'stream';
|
|
4
|
+
import { URL } from 'url';
|
|
5
|
+
import { FileAdapter, FileDirector, buildHashedFilename, resolveExpirationDate, } from '@unchainedshop/file-upload';
|
|
4
6
|
import { log, LogLevel } from '@unchainedshop/logger';
|
|
5
7
|
import mimeType from 'mime-types';
|
|
6
8
|
import Minio from 'minio';
|
|
7
9
|
import { AssumeRoleProvider } from 'minio/dist/main/AssumeRoleProvider.js';
|
|
8
|
-
import {
|
|
9
|
-
|
|
10
|
-
const { MINIO_ACCESS_KEY, MINIO_REGION, MINIO_STS_ENDPOINT, MINIO_SECRET_KEY, MINIO_ENDPOINT, MINIO_BUCKET_NAME, NODE_ENV, AMAZON_S3_SESSION_TOKEN, } = process.env;
|
|
11
|
-
const PUT_URL_EXPIRY = 24 * 60 * 60;
|
|
10
|
+
import { expiryOffsetInMs } from '@unchainedshop/file-upload/put-expiration.js';
|
|
11
|
+
const { MINIO_ACCESS_KEY, MINIO_REGION, MINIO_STS_ENDPOINT, MINIO_SECRET_KEY, MINIO_ENDPOINT, MINIO_BUCKET_NAME, MINIO_UPLOAD_PREFIX, NODE_ENV, AMAZON_S3_SESSION_TOKEN, } = process.env;
|
|
12
12
|
let client;
|
|
13
13
|
export async function connectToMinio() {
|
|
14
14
|
if (!MINIO_ENDPOINT || !MINIO_BUCKET_NAME) {
|
|
@@ -49,8 +49,12 @@ export async function connectToMinio() {
|
|
|
49
49
|
}
|
|
50
50
|
return null;
|
|
51
51
|
}
|
|
52
|
+
const generateMinioPath = (directoryName, fileName) => {
|
|
53
|
+
const prefix = MINIO_UPLOAD_PREFIX || '';
|
|
54
|
+
return [prefix, directoryName, fileName].filter(Boolean).join('/');
|
|
55
|
+
};
|
|
52
56
|
const generateMinioUrl = (directoryName, hashedFilename) => {
|
|
53
|
-
return `${MINIO_ENDPOINT}/${MINIO_BUCKET_NAME}/${directoryName
|
|
57
|
+
return `${MINIO_ENDPOINT}/${MINIO_BUCKET_NAME}/${generateMinioPath(directoryName, hashedFilename)}`;
|
|
54
58
|
};
|
|
55
59
|
const getMimeType = (extension) => {
|
|
56
60
|
return mimeType.lookup(extension);
|
|
@@ -85,7 +89,6 @@ const bufferToStream = (buffer) => {
|
|
|
85
89
|
stream.push(null);
|
|
86
90
|
return stream;
|
|
87
91
|
};
|
|
88
|
-
const getExpiryDate = () => new Date(new Date().getTime() + PUT_URL_EXPIRY);
|
|
89
92
|
export const MinioAdapter = {
|
|
90
93
|
key: 'shop.unchained.file-upload-plugin.minio',
|
|
91
94
|
label: 'Uploads files into an S3 bucket using minio',
|
|
@@ -94,9 +97,9 @@ export const MinioAdapter = {
|
|
|
94
97
|
async createSignedURL(directoryName, fileName) {
|
|
95
98
|
if (!client)
|
|
96
99
|
throw new Error('Minio not connected, check env variables');
|
|
97
|
-
const expiryDate =
|
|
100
|
+
const expiryDate = resolveExpirationDate();
|
|
98
101
|
const _id = buildHashedFilename(directoryName, fileName, expiryDate);
|
|
99
|
-
const url = await client.presignedPutObject(MINIO_BUCKET_NAME,
|
|
102
|
+
const url = await client.presignedPutObject(MINIO_BUCKET_NAME, generateMinioPath(directoryName, _id), expiryOffsetInMs() / 1000);
|
|
100
103
|
return {
|
|
101
104
|
_id,
|
|
102
105
|
directoryName,
|
|
@@ -134,8 +137,8 @@ export const MinioAdapter = {
|
|
|
134
137
|
const metaData = {
|
|
135
138
|
'Content-Type': type,
|
|
136
139
|
};
|
|
137
|
-
await client.putObject(MINIO_BUCKET_NAME,
|
|
138
|
-
const { size } = await getObjectStats(
|
|
140
|
+
await client.putObject(MINIO_BUCKET_NAME, generateMinioPath(directoryName, _id), stream, undefined, metaData);
|
|
141
|
+
const { size } = await getObjectStats(generateMinioPath(directoryName, _id));
|
|
139
142
|
return {
|
|
140
143
|
_id,
|
|
141
144
|
directoryName,
|
|
@@ -157,8 +160,8 @@ export const MinioAdapter = {
|
|
|
157
160
|
const metaData = {
|
|
158
161
|
'Content-Type': type,
|
|
159
162
|
};
|
|
160
|
-
await client.putObject(MINIO_BUCKET_NAME,
|
|
161
|
-
const { size } = await getObjectStats(
|
|
163
|
+
await client.putObject(MINIO_BUCKET_NAME, generateMinioPath(directoryName, _id), stream, undefined, metaData);
|
|
164
|
+
const { size } = await getObjectStats(generateMinioPath(directoryName, _id));
|
|
162
165
|
return {
|
|
163
166
|
_id,
|
|
164
167
|
directoryName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minio-adapter.js","sourceRoot":"","sources":["../../../src/files/minio/minio-adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"minio-adapter.js","sourceRoot":"","sources":["../../../src/files/minio/minio-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAA6B,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EACL,WAAW,EACX,YAAY,EACZ,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAEhF,MAAM,EACJ,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,iBAAiB,EACjB,mBAAmB,EACnB,QAAQ,EACR,uBAAuB,GACxB,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,IAAI,MAAoB,CAAC;AAEzB,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,IAAI,CAAC,cAAc,IAAI,CAAC,iBAAiB,EAAE;QACzC,GAAG,CACD,kGAAkG,EAClG,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAC1B,CAAC;QACF,OAAO,IAAI,CAAC;KACb;IAED,IAAI;QACF,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC;YACnC,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,MAAM,EAAE,WAAW,CAAC,QAAQ,KAAK,QAAQ;YACzC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,SAAS;YACjD,MAAM,EAAE,YAAY;YACpB,YAAY,EAAE,uBAAuB;YACrC,SAAS,EAAE,gBAAgB;YAC3B,SAAS,EAAE,gBAAgB;SAC5B,CAAC,CAAC;QAEH,2BAA2B;QAC3B,aAAa;QACb,IAAI,QAAQ,KAAK,aAAa;YAAE,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrE,IAAI,kBAAkB,EAAE;YACtB,MAAM,EAAE,GAAG,IAAI,kBAAkB,CAAC;gBAChC,WAAW,EAAE,kBAAkB;gBAC/B,SAAS,EAAE,gBAAgB;gBAC3B,SAAS,EAAE,gBAAgB;aAC5B,CAAC,CAAC;YACH,2BAA2B;YAC3B,aAAa;YACb,MAAM,WAAW,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;SAC9C;QACD,OAAO,WAAW,CAAC;KACpB;IAAC,OAAO,KAAK,EAAE;QACd,GAAG,CAAC,0CAA0C,KAAK,CAAC,OAAO,EAAE,EAAE;YAC7D,KAAK,EAAE,QAAQ,CAAC,KAAK;SACtB,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,iBAAiB,GAAG,CAAC,aAAqB,EAAE,QAAgB,EAAE,EAAE;IACpE,MAAM,MAAM,GAAG,mBAAmB,IAAI,EAAE,CAAC;IACzC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,aAAqB,EAAE,cAAsB,EAAE,EAAE;IACzE,OAAO,GAAG,cAAc,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,aAAa,EAAE,cAAc,CAAC,EAAE,CAAC;AACtG,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,SAAS,EAAE,EAAE;IAChC,OAAO,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AACpC,CAAC,CAAC;AAEF,cAAc,EAAE,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,CAAC;IACxC,MAAM,GAAG,CAAC,CAAC;AACb,CAAC,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,KAAK,EAChC,OAAe,EACf,OAA4B,EACG,EAAE;IACjC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAC5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI;YACF,IAAI,QAAQ,KAAK,OAAO,EAAE;gBACxB,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;aACtC;iBAAM;gBACL,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;aACvC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAC,CAAC,CAAC;SACX;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;IAChD,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAEzE,OAAO,MAAM,CAAC,UAAU,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,MAAW,EAAE,EAAE;IACrC,MAAM,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC9B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,GAAG,EAAE,yCAAyC;IAC9C,KAAK,EAAE,6CAA6C;IACpD,OAAO,EAAE,OAAO;IAEhB,GAAG,WAAW;IAEd,KAAK,CAAC,eAAe,CAAC,aAAa,EAAE,QAAQ;QAC3C,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAEzE,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAC;QAC3C,MAAM,GAAG,GAAG,mBAAmB,CAAC,aAAa,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAErE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,kBAAkB,CACzC,iBAAiB,EACjB,iBAAiB,CAAC,aAAa,EAAE,GAAG,CAAC,EACrC,gBAAgB,EAAE,GAAG,IAAI,CAC1B,CAAC;QAEF,OAAO;YACL,GAAG;YACH,aAAa;YACb,UAAU;YACV,QAAQ;YACR,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC;YAC3B,MAAM,EAAE,GAAG;YACX,GAAG,EAAE,gBAAgB,CAAC,aAAa,EAAE,GAAG,CAAC;SACH,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAK;QACrB,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAEzE,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC1C,OAAO,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,aAAa,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,aAAqB,EAAE,OAAY;QAC5D,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAEzE,IAAI,MAAM,CAAC;QACX,IAAI,QAAQ,CAAC;QACb,IAAI,OAAO,YAAY,OAAO,EAAE;YAC9B,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,MAAM,OAAO,CAAC;YAC5D,QAAQ,GAAG,KAAK,CAAC;YACjB,MAAM,GAAG,gBAAgB,EAAE,CAAC;SAC7B;aAAM;YACL,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;YAC5B,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;SAChE;QAED,MAAM,GAAG,GAAG,mBAAmB,CAAC,aAAa,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,OAAO,EAAE,QAAQ,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG;YACf,cAAc,EAAE,IAAI;SACrB,CAAC;QAEF,MAAM,MAAM,CAAC,SAAS,CACpB,iBAAiB,EACjB,iBAAiB,CAAC,aAAa,EAAE,GAAG,CAAC,EACrC,MAAM,EACN,SAAS,EACT,QAAQ,CACT,CAAC;QAEF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC;QAE7E,OAAO;YACL,GAAG;YACH,aAAa;YACb,UAAU,EAAE,IAAI;YAChB,QAAQ;YACR,IAAI;YACJ,IAAI;YACJ,GAAG,EAAE,gBAAgB,CAAC,aAAa,EAAE,GAAG,CAAC;SACxB,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,aAAqB,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAO;QACxF,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAEzE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAChD,MAAM,GAAG,GAAG,mBAAmB,CAAC,aAAa,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;QAErE,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC,cAAc,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;QAExE,MAAM,QAAQ,GAAG;YACf,cAAc,EAAE,IAAI;SACrB,CAAC;QAEF,MAAM,MAAM,CAAC,SAAS,CACpB,iBAAiB,EACjB,iBAAiB,CAAC,aAAa,EAAE,GAAG,CAAC,EACrC,MAAM,EACN,SAAS,EACT,QAAQ,CACT,CAAC;QACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC;QAE7E,OAAO;YACL,GAAG;YACH,aAAa;YACb,UAAU,EAAE,IAAI;YAChB,QAAQ;YACR,IAAI;YACJ,IAAI;YACJ,GAAG,EAAE,gBAAgB,CAAC,aAAa,EAAE,GAAG,CAAC;SACxB,CAAC;IACtB,CAAC;CACF,CAAC;AAEF,YAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;AAE3C,eAAe,YAAY,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
1
2
|
import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
|
|
2
3
|
import { createLogger, LogLevel } from '@unchainedshop/logger';
|
|
3
|
-
import fs from 'fs';
|
|
4
4
|
import JSONStream from 'JSONStream';
|
|
5
5
|
import { EventIterator } from 'event-iterator';
|
|
6
6
|
const logger = createLogger('unchained:platform:bulk-import');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk-import.js","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bulk-import.js","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"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"}
|
package/lib/worker/email.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
|
|
2
|
-
import { createLogger } from '@unchainedshop/logger';
|
|
3
1
|
import fs from 'fs';
|
|
4
2
|
import { join, isAbsolute } from 'path';
|
|
5
3
|
import os from 'os';
|
|
4
|
+
import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
|
|
5
|
+
import { createLogger } from '@unchainedshop/logger';
|
|
6
6
|
import open from 'open';
|
|
7
7
|
import nodemailer from 'nodemailer';
|
|
8
8
|
const logger = createLogger('unchained:plugins:worker:email');
|
package/lib/worker/email.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.js","sourceRoot":"","sources":["../../src/worker/email.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"email.js","sourceRoot":"","sources":["../../src/worker/email.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ecb-rates.js","sourceRoot":"","sources":["../../src/worker/update-ecb-rates.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,KAAK,MAAM,eAAe,CAAC;AAClC,OAAO,KAAK,MAAM,QAAQ,CAAC;AAG3B,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IAClC,OAAO,KAAK,CAAC,+DAA+D,EAAE;QAC5E,MAAM,EAAE,KAAK;KACd,CAAC;SACC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;SACzB,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;SAChD,IAAI,
|
|
1
|
+
{"version":3,"file":"update-ecb-rates.js","sourceRoot":"","sources":["../../src/worker/update-ecb-rates.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,KAAK,MAAM,eAAe,CAAC;AAClC,OAAO,KAAK,MAAM,QAAQ,CAAC;AAG3B,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IAClC,OAAO,KAAK,CAAC,+DAA+D,EAAE;QAC5E,MAAM,EAAE,KAAK;KACd,CAAC;SACC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;SACzB,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;SAChD,IAAI,CACH,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ;SACzB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC;QAClD,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CACjE,CAAC;AACN,CAAC,CAAC;AAEF,6GAA6G;AAC7G,gBAAgB;AAChB,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAEtD,MAAM,YAAY,GAAG,KAAK,CAAC;AAE3B,MAAM,cAAc,GAA6B;IAC/C,GAAG,aAAa;IAEhB,GAAG,EAAE,wCAAwC;IAC7C,KAAK,EAAE,kBAAkB;IACzB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,kBAAkB;IAExB,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;QACpC,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QAEjC,IAAI;YACF,MAAM,IAAI,GAA8C,MAAM,gBAAgB,EAAE,CAAC;YACjF,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;YAC7B,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YAEvE,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;YACtF,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAErE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC;gBACvC,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,MAAM,EAAE;wBACN,YAAY,EAAE,CAAC;wBACf,IAAI,EAAE,iBAAiB;qBACxB;iBACF,CAAC;YAEJ,MAAM,KAAK,GAA4B,IAAI;iBACxC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,OAAO;oBACL,YAAY;oBACZ,aAAa,EAAE,CAAC,CAAC,QAAQ;oBACzB,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;oBACxB,SAAS;oBACT,SAAS;iBACV,CAAC;YACJ,CAAC,CAAC;iBACD,MAAM,CACL,CAAC,IAAI,EAAE,EAAE,CACP,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,YAAY,CACzF,CAAC;YAEJ,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACvE,OAAO;gBACL,OAAO;gBACP,MAAM,EAAE;oBACN,YAAY,EAAE,KAAK,CAAC,MAAM;iBAC3B;aACF,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,yBAAyB;oBAC/B,OAAO,EAAE,2BAA2B;iBACrC;aACF,CAAC;SACH;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;AAE/C,cAAc,CAAC,uBAAuB,CAAC,cAAc,EAAE;IACrD,QAAQ,EAAE,cAAc;IACxB,OAAO,EAAE,CAAC;CACX,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/plugins",
|
|
3
|
-
"version": "2.3.
|
|
3
|
+
"version": "2.3.6",
|
|
4
4
|
"main": "lib/plugins-index.js",
|
|
5
5
|
"types": "lib/plugins-index.d.ts",
|
|
6
6
|
"exports": {
|
|
@@ -85,22 +85,22 @@
|
|
|
85
85
|
"devDependencies": {
|
|
86
86
|
"@redis/client": "^1.5.8",
|
|
87
87
|
"@types/node": "^18.17.1",
|
|
88
|
-
"@unchainedshop/api": "^2.3.
|
|
89
|
-
"@unchainedshop/core-delivery": "^2.3.
|
|
90
|
-
"@unchainedshop/core-enrollments": "^2.3.
|
|
91
|
-
"@unchainedshop/core-filters": "^2.3.
|
|
92
|
-
"@unchainedshop/core-messaging": "^2.3.
|
|
93
|
-
"@unchainedshop/core-orders": "^2.3.
|
|
94
|
-
"@unchainedshop/core-payment": "^2.3.
|
|
95
|
-
"@unchainedshop/core-products": "^2.3.
|
|
96
|
-
"@unchainedshop/core-quotations": "^2.3.
|
|
97
|
-
"@unchainedshop/core-warehousing": "^2.3.
|
|
98
|
-
"@unchainedshop/core-worker": "^2.3.
|
|
99
|
-
"@unchainedshop/events": "^2.3.
|
|
100
|
-
"@unchainedshop/file-upload": "^2.3.
|
|
101
|
-
"@unchainedshop/logger": "^2.3.
|
|
102
|
-
"@unchainedshop/types": "^2.3.
|
|
103
|
-
"@unchainedshop/utils": "^2.3.
|
|
88
|
+
"@unchainedshop/api": "^2.3.6",
|
|
89
|
+
"@unchainedshop/core-delivery": "^2.3.6",
|
|
90
|
+
"@unchainedshop/core-enrollments": "^2.3.6",
|
|
91
|
+
"@unchainedshop/core-filters": "^2.3.6",
|
|
92
|
+
"@unchainedshop/core-messaging": "^2.3.6",
|
|
93
|
+
"@unchainedshop/core-orders": "^2.3.6",
|
|
94
|
+
"@unchainedshop/core-payment": "^2.3.6",
|
|
95
|
+
"@unchainedshop/core-products": "^2.3.6",
|
|
96
|
+
"@unchainedshop/core-quotations": "^2.3.6",
|
|
97
|
+
"@unchainedshop/core-warehousing": "^2.3.6",
|
|
98
|
+
"@unchainedshop/core-worker": "^2.3.6",
|
|
99
|
+
"@unchainedshop/events": "^2.3.6",
|
|
100
|
+
"@unchainedshop/file-upload": "^2.3.6",
|
|
101
|
+
"@unchainedshop/logger": "^2.3.6",
|
|
102
|
+
"@unchainedshop/types": "^2.3.6",
|
|
103
|
+
"@unchainedshop/utils": "^2.3.6",
|
|
104
104
|
"bluebird": "^3.7.2",
|
|
105
105
|
"event-iterator": "^2.0.0",
|
|
106
106
|
"express": "^4.18.2",
|
|
@@ -1,19 +1,21 @@
|
|
|
1
1
|
/// <reference lib="dom" />
|
|
2
|
-
import { IFileAdapter, UploadFileData } from '@unchainedshop/types/files.js';
|
|
3
|
-
import { FileAdapter, FileDirector, buildHashedFilename } from '@unchainedshop/file-upload';
|
|
4
|
-
import mimeType from 'mime-types';
|
|
5
2
|
import { URL } from 'url';
|
|
6
3
|
import { Readable, pipeline as rawPipeline } from 'stream';
|
|
7
4
|
import { promisify } from 'util';
|
|
8
5
|
import { ReadableStream } from 'node:stream/web';
|
|
6
|
+
import mimeType from 'mime-types';
|
|
7
|
+
import {
|
|
8
|
+
FileAdapter,
|
|
9
|
+
FileDirector,
|
|
10
|
+
buildHashedFilename,
|
|
11
|
+
resolveExpirationDate,
|
|
12
|
+
} from '@unchainedshop/file-upload';
|
|
13
|
+
import { IFileAdapter, UploadFileData } from '@unchainedshop/types/files.js';
|
|
9
14
|
import sign from './sign.js';
|
|
10
15
|
|
|
11
16
|
const pipeline = promisify(rawPipeline);
|
|
12
17
|
|
|
13
|
-
const {
|
|
14
|
-
|
|
15
|
-
const getExpiryDate = () =>
|
|
16
|
-
new Date(new Date().getTime() + (parseInt(UNCHAINED_PUT_URL_EXPIRY, 10) || 24 * 60 * 60 * 1000));
|
|
18
|
+
const { ROOT_URL } = process.env;
|
|
17
19
|
|
|
18
20
|
const bufferToStream = (buffer: any) => {
|
|
19
21
|
const stream = new Readable();
|
|
@@ -31,7 +33,7 @@ export const GridFSAdapter: IFileAdapter = {
|
|
|
31
33
|
...FileAdapter,
|
|
32
34
|
|
|
33
35
|
async createSignedURL(directoryName, fileName) {
|
|
34
|
-
const expiryDate =
|
|
36
|
+
const expiryDate = resolveExpirationDate();
|
|
35
37
|
const _id = buildHashedFilename(directoryName, fileName, expiryDate);
|
|
36
38
|
const signature = sign(directoryName, _id, expiryDate.getTime());
|
|
37
39
|
|
|
@@ -66,7 +68,7 @@ export const GridFSAdapter: IFileAdapter = {
|
|
|
66
68
|
stream = bufferToStream(Buffer.from(rawFile.buffer, 'base64'));
|
|
67
69
|
}
|
|
68
70
|
|
|
69
|
-
const expiryDate =
|
|
71
|
+
const expiryDate = resolveExpirationDate();
|
|
70
72
|
const _id = buildHashedFilename(directoryName, fileName, expiryDate);
|
|
71
73
|
|
|
72
74
|
const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, _id, fileName);
|
|
@@ -93,7 +95,7 @@ export const GridFSAdapter: IFileAdapter = {
|
|
|
93
95
|
const { href } = new URL(fileLink);
|
|
94
96
|
const fileName = fname || href.split('/').pop();
|
|
95
97
|
|
|
96
|
-
const expiryDate =
|
|
98
|
+
const expiryDate = resolveExpirationDate();
|
|
97
99
|
const _id = buildHashedFilename(directoryName, fileName, expiryDate);
|
|
98
100
|
|
|
99
101
|
const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, _id, fileName);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { pipeline, finished } from 'stream/promises';
|
|
1
2
|
import { log, LogLevel } from '@unchainedshop/logger';
|
|
2
3
|
import { buildHashedFilename } from '@unchainedshop/file-upload';
|
|
3
|
-
import { pipeline, finished } from 'stream/promises';
|
|
4
4
|
import { Context } from '@unchainedshop/types/api.js';
|
|
5
5
|
import express from 'express';
|
|
6
6
|
import sign from './sign.js';
|
|
@@ -1,14 +1,20 @@
|
|
|
1
|
-
import { IFileAdapter, UploadFileData } from '@unchainedshop/types/files.js';
|
|
2
|
-
import { FileAdapter, FileDirector, buildHashedFilename } from '@unchainedshop/file-upload';
|
|
3
|
-
|
|
4
1
|
import https from 'https';
|
|
5
2
|
import http, { OutgoingHttpHeaders } from 'http';
|
|
3
|
+
import { Readable } from 'stream';
|
|
4
|
+
import { URL } from 'url';
|
|
5
|
+
import { IFileAdapter, UploadFileData } from '@unchainedshop/types/files.js';
|
|
6
|
+
import {
|
|
7
|
+
FileAdapter,
|
|
8
|
+
FileDirector,
|
|
9
|
+
buildHashedFilename,
|
|
10
|
+
resolveExpirationDate,
|
|
11
|
+
} from '@unchainedshop/file-upload';
|
|
12
|
+
|
|
6
13
|
import { log, LogLevel } from '@unchainedshop/logger';
|
|
7
14
|
import mimeType from 'mime-types';
|
|
8
15
|
import Minio from 'minio';
|
|
9
16
|
import { AssumeRoleProvider } from 'minio/dist/main/AssumeRoleProvider.js';
|
|
10
|
-
import {
|
|
11
|
-
import { URL } from 'url';
|
|
17
|
+
import { expiryOffsetInMs } from '@unchainedshop/file-upload/put-expiration.js';
|
|
12
18
|
|
|
13
19
|
const {
|
|
14
20
|
MINIO_ACCESS_KEY,
|
|
@@ -17,10 +23,10 @@ const {
|
|
|
17
23
|
MINIO_SECRET_KEY,
|
|
18
24
|
MINIO_ENDPOINT,
|
|
19
25
|
MINIO_BUCKET_NAME,
|
|
26
|
+
MINIO_UPLOAD_PREFIX,
|
|
20
27
|
NODE_ENV,
|
|
21
28
|
AMAZON_S3_SESSION_TOKEN,
|
|
22
29
|
} = process.env;
|
|
23
|
-
const PUT_URL_EXPIRY = 24 * 60 * 60;
|
|
24
30
|
|
|
25
31
|
let client: Minio.Client;
|
|
26
32
|
|
|
@@ -67,8 +73,13 @@ export async function connectToMinio() {
|
|
|
67
73
|
return null;
|
|
68
74
|
}
|
|
69
75
|
|
|
76
|
+
const generateMinioPath = (directoryName: string, fileName: string) => {
|
|
77
|
+
const prefix = MINIO_UPLOAD_PREFIX || '';
|
|
78
|
+
return [prefix, directoryName, fileName].filter(Boolean).join('/');
|
|
79
|
+
};
|
|
80
|
+
|
|
70
81
|
const generateMinioUrl = (directoryName: string, hashedFilename: string) => {
|
|
71
|
-
return `${MINIO_ENDPOINT}/${MINIO_BUCKET_NAME}/${directoryName
|
|
82
|
+
return `${MINIO_ENDPOINT}/${MINIO_BUCKET_NAME}/${generateMinioPath(directoryName, hashedFilename)}`;
|
|
72
83
|
};
|
|
73
84
|
|
|
74
85
|
const getMimeType = (extension) => {
|
|
@@ -111,8 +122,6 @@ const bufferToStream = (buffer: any) => {
|
|
|
111
122
|
return stream;
|
|
112
123
|
};
|
|
113
124
|
|
|
114
|
-
const getExpiryDate = () => new Date(new Date().getTime() + PUT_URL_EXPIRY);
|
|
115
|
-
|
|
116
125
|
export const MinioAdapter: IFileAdapter = {
|
|
117
126
|
key: 'shop.unchained.file-upload-plugin.minio',
|
|
118
127
|
label: 'Uploads files into an S3 bucket using minio',
|
|
@@ -123,13 +132,13 @@ export const MinioAdapter: IFileAdapter = {
|
|
|
123
132
|
async createSignedURL(directoryName, fileName) {
|
|
124
133
|
if (!client) throw new Error('Minio not connected, check env variables');
|
|
125
134
|
|
|
126
|
-
const expiryDate =
|
|
135
|
+
const expiryDate = resolveExpirationDate();
|
|
127
136
|
const _id = buildHashedFilename(directoryName, fileName, expiryDate);
|
|
128
137
|
|
|
129
138
|
const url = await client.presignedPutObject(
|
|
130
139
|
MINIO_BUCKET_NAME,
|
|
131
|
-
|
|
132
|
-
|
|
140
|
+
generateMinioPath(directoryName, _id),
|
|
141
|
+
expiryOffsetInMs() / 1000,
|
|
133
142
|
);
|
|
134
143
|
|
|
135
144
|
return {
|
|
@@ -174,9 +183,15 @@ export const MinioAdapter: IFileAdapter = {
|
|
|
174
183
|
'Content-Type': type,
|
|
175
184
|
};
|
|
176
185
|
|
|
177
|
-
await client.putObject(
|
|
186
|
+
await client.putObject(
|
|
187
|
+
MINIO_BUCKET_NAME,
|
|
188
|
+
generateMinioPath(directoryName, _id),
|
|
189
|
+
stream,
|
|
190
|
+
undefined,
|
|
191
|
+
metaData,
|
|
192
|
+
);
|
|
178
193
|
|
|
179
|
-
const { size } = await getObjectStats(
|
|
194
|
+
const { size } = await getObjectStats(generateMinioPath(directoryName, _id));
|
|
180
195
|
|
|
181
196
|
return {
|
|
182
197
|
_id,
|
|
@@ -203,8 +218,14 @@ export const MinioAdapter: IFileAdapter = {
|
|
|
203
218
|
'Content-Type': type,
|
|
204
219
|
};
|
|
205
220
|
|
|
206
|
-
await client.putObject(
|
|
207
|
-
|
|
221
|
+
await client.putObject(
|
|
222
|
+
MINIO_BUCKET_NAME,
|
|
223
|
+
generateMinioPath(directoryName, _id),
|
|
224
|
+
stream,
|
|
225
|
+
undefined,
|
|
226
|
+
metaData,
|
|
227
|
+
);
|
|
228
|
+
const { size } = await getObjectStats(generateMinioPath(directoryName, _id));
|
|
208
229
|
|
|
209
230
|
return {
|
|
210
231
|
_id,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
1
2
|
import { IWorkerAdapter } from '@unchainedshop/types/worker.js';
|
|
2
3
|
import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
|
|
3
4
|
import { createLogger, LogLevel } from '@unchainedshop/logger';
|
|
4
|
-
import fs from 'fs';
|
|
5
5
|
import JSONStream from 'JSONStream';
|
|
6
6
|
import { EventIterator } from 'event-iterator';
|
|
7
7
|
import { UnchainedCore } from '@unchainedshop/types/core.js';
|
package/src/worker/email.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
|
|
2
|
-
import { createLogger } from '@unchainedshop/logger';
|
|
3
|
-
import { IWorkerAdapter } from '@unchainedshop/types/worker.js';
|
|
4
1
|
import fs from 'fs';
|
|
5
2
|
import { join, isAbsolute } from 'path';
|
|
6
3
|
import os from 'os';
|
|
4
|
+
import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
|
|
5
|
+
import { createLogger } from '@unchainedshop/logger';
|
|
6
|
+
import { IWorkerAdapter } from '@unchainedshop/types/worker.js';
|
|
7
7
|
import open from 'open';
|
|
8
8
|
import nodemailer from 'nodemailer';
|
|
9
9
|
|
|
@@ -11,10 +11,11 @@ const getExchangeRates = async () => {
|
|
|
11
11
|
})
|
|
12
12
|
.then((res) => res.text())
|
|
13
13
|
.then((text) => JSON.parse(xmlJs.xml2json(text)))
|
|
14
|
-
.then(
|
|
15
|
-
json
|
|
16
|
-
.
|
|
17
|
-
|
|
14
|
+
.then(
|
|
15
|
+
(json) =>
|
|
16
|
+
json.elements?.[0]?.elements
|
|
17
|
+
.filter((e) => e.name.toLowerCase() === 'cube')[0]
|
|
18
|
+
?.elements[0]?.elements.map((element) => element.attributes),
|
|
18
19
|
);
|
|
19
20
|
};
|
|
20
21
|
|