@unchainedshop/plugins 2.0.4 → 2.0.5
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.
|
@@ -1 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
import { Context } from '@unchainedshop/types/api.js';
|
|
2
|
+
import express from 'express';
|
|
3
|
+
import { configureGridFSFileUploadModule } from './index.js';
|
|
4
|
+
export declare const gridfsHandler: (req: express.Request & {
|
|
5
|
+
unchainedContext: Context & {
|
|
6
|
+
modules: {
|
|
7
|
+
gridfsFileUploads: ReturnType<typeof configureGridFSFileUploadModule>;
|
|
8
|
+
};
|
|
9
|
+
};
|
|
10
|
+
}, res: express.Response) => Promise<void>;
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { log, LogLevel } from '@unchainedshop/logger';
|
|
2
2
|
import { buildHashedFilename } from '@unchainedshop/file-upload';
|
|
3
|
-
import { pipeline
|
|
4
|
-
import { promisify } from 'util';
|
|
3
|
+
import { pipeline, finished } from 'stream/promises';
|
|
5
4
|
import sign from './sign.js';
|
|
6
|
-
const pipeline = promisify(rawPipeline);
|
|
7
5
|
const { ROOT_URL } = process.env;
|
|
8
6
|
export const gridfsHandler = async (req, res) => {
|
|
9
7
|
try {
|
|
@@ -17,38 +15,45 @@ export const gridfsHandler = async (req, res) => {
|
|
|
17
15
|
if (sign(directoryName, fileId, expiryDate.getTime()) === signature) {
|
|
18
16
|
const file = await modules.files.findFile({ fileId });
|
|
19
17
|
if (file.expires === null) {
|
|
20
|
-
res.
|
|
18
|
+
res.statusCode = 400;
|
|
21
19
|
res.end('File already linked');
|
|
22
20
|
return;
|
|
23
21
|
}
|
|
24
22
|
const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, fileId, fileName);
|
|
25
|
-
res.writeHead(200);
|
|
26
23
|
await pipeline(req, writeStream);
|
|
27
24
|
const { length } = writeStream;
|
|
28
|
-
|
|
25
|
+
res.statusCode = 200;
|
|
26
|
+
await services.files.linkFile({ fileId, size: length, type: req.header('Content-Type') }, req.unchainedContext);
|
|
29
27
|
res.end();
|
|
30
28
|
return;
|
|
31
29
|
}
|
|
32
|
-
res.
|
|
30
|
+
res.statusCode = 403;
|
|
33
31
|
res.end();
|
|
34
32
|
return;
|
|
35
33
|
}
|
|
36
34
|
if (req.method === 'GET') {
|
|
37
35
|
const fileId = fileName;
|
|
38
36
|
const readStream = await modules.gridfsFileUploads.createReadStream(directoryName, fileId);
|
|
39
|
-
res.
|
|
40
|
-
|
|
37
|
+
res.statusCode = 200;
|
|
38
|
+
readStream.pipe(res, { end: false });
|
|
39
|
+
await finished(readStream);
|
|
41
40
|
res.end();
|
|
42
41
|
return;
|
|
43
42
|
}
|
|
44
|
-
res.
|
|
43
|
+
res.statusCode = 404;
|
|
45
44
|
res.end();
|
|
46
45
|
return;
|
|
47
46
|
}
|
|
48
47
|
catch (e) {
|
|
49
48
|
log(e.message, { level: LogLevel.Error });
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
if (e.code === 'ENOENT') {
|
|
50
|
+
res.statusCode = 404;
|
|
51
|
+
res.end();
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
res.statusCode = 503;
|
|
55
|
+
res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
|
|
56
|
+
}
|
|
52
57
|
}
|
|
53
58
|
};
|
|
54
59
|
//# sourceMappingURL=gridfs-webhook.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gridfs-webhook.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-webhook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"gridfs-webhook.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-webhook.ts"],"names":[],"mappings":"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"}
|
package/lib/worker/message.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IWorkerAdapter, Work } from '@unchainedshop/types/worker.js';
|
|
2
|
-
export declare const messagingLogger:
|
|
2
|
+
export declare const messagingLogger: any;
|
|
3
3
|
export declare const MessageWorker: IWorkerAdapter<{
|
|
4
4
|
template: string;
|
|
5
5
|
_id?: string;
|
package/package.json
CHANGED
|
@@ -1,14 +1,21 @@
|
|
|
1
1
|
import { log, LogLevel } from '@unchainedshop/logger';
|
|
2
2
|
import { buildHashedFilename } from '@unchainedshop/file-upload';
|
|
3
|
-
import { pipeline
|
|
4
|
-
import {
|
|
3
|
+
import { pipeline, finished } from 'stream/promises';
|
|
4
|
+
import { Context } from '@unchainedshop/types/api.js';
|
|
5
|
+
import express from 'express';
|
|
5
6
|
import sign from './sign.js';
|
|
6
|
-
|
|
7
|
-
const pipeline = promisify(rawPipeline);
|
|
7
|
+
import { configureGridFSFileUploadModule } from './index.js';
|
|
8
8
|
|
|
9
9
|
const { ROOT_URL } = process.env;
|
|
10
10
|
|
|
11
|
-
export const gridfsHandler = async (
|
|
11
|
+
export const gridfsHandler = async (
|
|
12
|
+
req: express.Request & {
|
|
13
|
+
unchainedContext: Context & {
|
|
14
|
+
modules: { gridfsFileUploads: ReturnType<typeof configureGridFSFileUploadModule> };
|
|
15
|
+
};
|
|
16
|
+
},
|
|
17
|
+
res: express.Response,
|
|
18
|
+
) => {
|
|
12
19
|
try {
|
|
13
20
|
const { services, modules } = req.unchainedContext;
|
|
14
21
|
const url = new URL(req.url, ROOT_URL);
|
|
@@ -16,12 +23,12 @@ export const gridfsHandler = async (req, res) => {
|
|
|
16
23
|
|
|
17
24
|
if (req.method === 'PUT') {
|
|
18
25
|
const { s: signature, e: expiryTimestamp } = req.query;
|
|
19
|
-
const expiryDate = new Date(parseInt(expiryTimestamp, 10));
|
|
26
|
+
const expiryDate = new Date(parseInt(expiryTimestamp as string, 10));
|
|
20
27
|
const fileId = buildHashedFilename(directoryName, fileName, expiryDate);
|
|
21
28
|
if (sign(directoryName, fileId, expiryDate.getTime()) === signature) {
|
|
22
29
|
const file = await modules.files.findFile({ fileId });
|
|
23
30
|
if (file.expires === null) {
|
|
24
|
-
res.
|
|
31
|
+
res.statusCode = 400;
|
|
25
32
|
res.end('File already linked');
|
|
26
33
|
return;
|
|
27
34
|
}
|
|
@@ -30,31 +37,41 @@ export const gridfsHandler = async (req, res) => {
|
|
|
30
37
|
fileId,
|
|
31
38
|
fileName,
|
|
32
39
|
);
|
|
33
|
-
res.writeHead(200);
|
|
34
40
|
await pipeline(req, writeStream);
|
|
35
41
|
const { length } = writeStream;
|
|
36
|
-
|
|
42
|
+
res.statusCode = 200;
|
|
43
|
+
await services.files.linkFile(
|
|
44
|
+
{ fileId, size: length, type: req.header('Content-Type') },
|
|
45
|
+
req.unchainedContext,
|
|
46
|
+
);
|
|
37
47
|
res.end();
|
|
38
48
|
return;
|
|
39
49
|
}
|
|
40
|
-
res.
|
|
50
|
+
res.statusCode = 403;
|
|
41
51
|
res.end();
|
|
42
52
|
return;
|
|
43
53
|
}
|
|
54
|
+
|
|
44
55
|
if (req.method === 'GET') {
|
|
45
56
|
const fileId = fileName;
|
|
46
57
|
const readStream = await modules.gridfsFileUploads.createReadStream(directoryName, fileId);
|
|
47
|
-
res.
|
|
48
|
-
|
|
58
|
+
res.statusCode = 200;
|
|
59
|
+
readStream.pipe(res, { end: false });
|
|
60
|
+
await finished(readStream);
|
|
49
61
|
res.end();
|
|
50
62
|
return;
|
|
51
63
|
}
|
|
52
|
-
res.
|
|
64
|
+
res.statusCode = 404;
|
|
53
65
|
res.end();
|
|
54
66
|
return;
|
|
55
67
|
} catch (e) {
|
|
56
68
|
log(e.message, { level: LogLevel.Error });
|
|
57
|
-
|
|
58
|
-
|
|
69
|
+
if (e.code === 'ENOENT') {
|
|
70
|
+
res.statusCode = 404;
|
|
71
|
+
res.end();
|
|
72
|
+
} else {
|
|
73
|
+
res.statusCode = 503;
|
|
74
|
+
res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
|
|
75
|
+
}
|
|
59
76
|
}
|
|
60
77
|
};
|