@stemy/backend 2.8.3 → 2.9.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/bundles/stemy-backend.umd.js +129 -96
- package/bundles/stemy-backend.umd.js.map +1 -1
- package/bundles/stemy-backend.umd.min.js +1 -1
- package/bundles/stemy-backend.umd.min.js.map +1 -1
- package/common-types.d.ts +5 -0
- package/esm2015/common-types.js +1 -1
- package/esm2015/public_api.js +1 -1
- package/esm2015/rest-controllers/assets.controller.js +4 -1
- package/esm2015/services/asset-processor.js +20 -14
- package/esm2015/services/assets.js +55 -43
- package/esm2015/services/entities/lazy-asset.js +10 -10
- package/esm2015/services/lazy-assets.js +2 -2
- package/esm2015/services/progresses.js +2 -2
- package/fesm2015/stemy-backend.js +87 -65
- package/fesm2015/stemy-backend.js.map +1 -1
- package/package.json +1 -6
- package/public_api.d.ts +1 -1
- package/services/asset-processor.d.ts +5 -3
- package/services/assets.d.ts +2 -1
- package/stemy-backend.metadata.json +1 -1
|
@@ -17,10 +17,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
17
17
|
});
|
|
18
18
|
};
|
|
19
19
|
import { injectable, Lifecycle, scoped } from "tsyringe";
|
|
20
|
-
import { fromStream } from "file-type";
|
|
21
20
|
import { ObjectId } from "bson";
|
|
22
21
|
import axios from "axios";
|
|
23
|
-
import { bufferToStream, copyStream } from "../utils";
|
|
22
|
+
import { bufferToStream, copyStream, streamToBuffer } from "../utils";
|
|
24
23
|
import { MongoConnector } from "./mongo-connector";
|
|
25
24
|
import { AssetProcessor } from "./asset-processor";
|
|
26
25
|
import { Asset } from "./entities/asset";
|
|
@@ -34,56 +33,37 @@ let Assets = class Assets {
|
|
|
34
33
|
}
|
|
35
34
|
write(stream, contentType = null, metadata = null) {
|
|
36
35
|
return __awaiter(this, void 0, void 0, function* () {
|
|
37
|
-
let extension = null;
|
|
38
|
-
const fileTypeStream = copyStream(stream);
|
|
39
36
|
const uploadStream = copyStream(stream);
|
|
37
|
+
const buffer = yield streamToBuffer(stream);
|
|
38
|
+
let fileType = { ext: "", mime: contentType };
|
|
40
39
|
try {
|
|
41
|
-
|
|
42
|
-
contentType = fileType.mime;
|
|
43
|
-
extension = fileType.ext;
|
|
40
|
+
fileType = yield AssetProcessor.fileTypeFromBuffer(buffer);
|
|
44
41
|
}
|
|
45
42
|
catch (e) {
|
|
46
|
-
if (!
|
|
47
|
-
throw `Can't determine
|
|
43
|
+
if (!fileType.mime) {
|
|
44
|
+
throw `Can't determine mime type`;
|
|
48
45
|
}
|
|
49
|
-
console.log(`Can't determine
|
|
46
|
+
console.log(`Can't determine mime type`, e);
|
|
50
47
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
metadata = Object.assign({
|
|
54
|
-
extension,
|
|
55
|
-
downloadCount: 0,
|
|
56
|
-
firstDownload: null,
|
|
57
|
-
lastDownload: null
|
|
58
|
-
}, metadata || {});
|
|
59
|
-
metadata.filename = metadata.filename || new ObjectId().toHexString();
|
|
60
|
-
return new Promise(((resolve, reject) => {
|
|
61
|
-
const uploaderStream = this.bucket.openUploadStream(metadata.filename);
|
|
62
|
-
uploadStream.pipe(uploaderStream)
|
|
63
|
-
.on("error", error => {
|
|
64
|
-
reject(error.message || error);
|
|
65
|
-
})
|
|
66
|
-
.on("finish", () => {
|
|
67
|
-
const asset = new Asset(uploaderStream.id, {
|
|
68
|
-
filename: metadata.filename,
|
|
69
|
-
contentType,
|
|
70
|
-
metadata
|
|
71
|
-
}, this.collection, this.bucket);
|
|
72
|
-
asset.save().then(() => {
|
|
73
|
-
resolve(asset);
|
|
74
|
-
}, error => {
|
|
75
|
-
reject(error.message || error);
|
|
76
|
-
});
|
|
77
|
-
});
|
|
78
|
-
}));
|
|
48
|
+
metadata = metadata || {};
|
|
49
|
+
return this.upload(uploadStream, fileType, metadata);
|
|
79
50
|
});
|
|
80
51
|
}
|
|
81
52
|
writeBuffer(buffer, metadata = null, contentType = null) {
|
|
82
53
|
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
-
|
|
54
|
+
let fileType = { ext: "", mime: contentType };
|
|
55
|
+
try {
|
|
56
|
+
fileType = yield AssetProcessor.fileTypeFromBuffer(buffer);
|
|
57
|
+
}
|
|
58
|
+
catch (e) {
|
|
59
|
+
if (!fileType.mime) {
|
|
60
|
+
throw `Can't determine mime type`;
|
|
61
|
+
}
|
|
62
|
+
console.log(`Can't determine mime type`, e);
|
|
63
|
+
}
|
|
84
64
|
metadata = metadata || {};
|
|
85
|
-
buffer = yield this.assetProcessor.process(buffer, metadata,
|
|
86
|
-
return this.
|
|
65
|
+
buffer = yield this.assetProcessor.process(buffer, metadata, fileType);
|
|
66
|
+
return this.upload(bufferToStream(buffer), fileType, metadata);
|
|
87
67
|
});
|
|
88
68
|
}
|
|
89
69
|
writeUrl(url, metadata = null) {
|
|
@@ -94,7 +74,7 @@ let Assets = class Assets {
|
|
|
94
74
|
}
|
|
95
75
|
read(id) {
|
|
96
76
|
return __awaiter(this, void 0, void 0, function* () {
|
|
97
|
-
return this.find({ _id: new ObjectId(id) });
|
|
77
|
+
return !id ? null : this.find({ _id: new ObjectId(id) });
|
|
98
78
|
});
|
|
99
79
|
}
|
|
100
80
|
find(where) {
|
|
@@ -124,6 +104,38 @@ let Assets = class Assets {
|
|
|
124
104
|
return asset.unlink();
|
|
125
105
|
});
|
|
126
106
|
}
|
|
107
|
+
upload(stream, fileType, metadata) {
|
|
108
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
109
|
+
const contentType = fileType.mime.trim();
|
|
110
|
+
const extension = (fileType.ext || "").trim();
|
|
111
|
+
metadata = Object.assign({
|
|
112
|
+
extension,
|
|
113
|
+
downloadCount: 0,
|
|
114
|
+
firstDownload: null,
|
|
115
|
+
lastDownload: null
|
|
116
|
+
}, metadata || {});
|
|
117
|
+
metadata.filename = metadata.filename || new ObjectId().toHexString();
|
|
118
|
+
return new Promise(((resolve, reject) => {
|
|
119
|
+
const uploaderStream = this.bucket.openUploadStream(metadata.filename);
|
|
120
|
+
stream.pipe(uploaderStream)
|
|
121
|
+
.on("error", error => {
|
|
122
|
+
reject(error.message || error);
|
|
123
|
+
})
|
|
124
|
+
.on("finish", () => {
|
|
125
|
+
const asset = new Asset(uploaderStream.id, {
|
|
126
|
+
filename: metadata.filename,
|
|
127
|
+
contentType,
|
|
128
|
+
metadata
|
|
129
|
+
}, this.collection, this.bucket);
|
|
130
|
+
asset.save().then(() => {
|
|
131
|
+
resolve(asset);
|
|
132
|
+
}, error => {
|
|
133
|
+
reject(error.message || error);
|
|
134
|
+
});
|
|
135
|
+
});
|
|
136
|
+
}));
|
|
137
|
+
});
|
|
138
|
+
}
|
|
127
139
|
};
|
|
128
140
|
Assets = __decorate([
|
|
129
141
|
injectable(),
|
|
@@ -131,4 +143,4 @@ Assets = __decorate([
|
|
|
131
143
|
__metadata("design:paramtypes", [MongoConnector, AssetProcessor])
|
|
132
144
|
], Assets);
|
|
133
145
|
export { Assets };
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/services/assets.ts"],"names":[],"mappings":"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","sourcesContent":["import {injectable, Lifecycle, scoped} from \"tsyringe\";\r\nimport {fromStream} from \"file-type\";\r\nimport {Readable} from \"stream\";\r\nimport {ObjectId} from \"bson\";\r\nimport {Collection, GridFSBucket} from \"mongodb\";\r\nimport {FilterQuery} from \"mongoose\";\r\nimport axios from \"axios\";\r\n\r\nimport {bufferToStream, copyStream} from \"../utils\";\r\nimport {IAsset, IAssetMeta} from \"../common-types\";\r\nimport {MongoConnector} from \"./mongo-connector\";\r\nimport {AssetProcessor} from \"./asset-processor\";\r\nimport {Asset} from \"./entities/asset\";\r\n\r\n@injectable()\r\n@scoped(Lifecycle.ContainerScoped)\r\nexport class Assets {\r\n\r\n    readonly bucket: GridFSBucket;\r\n    readonly collection: Collection;\r\n\r\n    constructor(readonly connector: MongoConnector, readonly assetProcessor: AssetProcessor) {\r\n        this.bucket = connector.bucket;\r\n        this.collection = connector.database?.collection(\"assets.files\");\r\n    }\r\n\r\n    async write(stream: Readable, contentType: string = null, metadata: IAssetMeta = null): Promise<IAsset> {\r\n        let extension: string = null;\r\n        const fileTypeStream = copyStream(stream);\r\n        const uploadStream = copyStream(stream);\r\n        try {\r\n            const fileType = await fromStream(fileTypeStream);\r\n            contentType = fileType.mime;\r\n            extension = fileType.ext;\r\n        } catch (e) {\r\n            if (!contentType) {\r\n                throw `Can't determine content type`;\r\n            }\r\n            console.log(`Can't determine content type`, e);\r\n        }\r\n        contentType = contentType.trim();\r\n        extension = (extension || \"\").trim();\r\n        metadata = Object.assign({\r\n            extension,\r\n            downloadCount: 0,\r\n            firstDownload: null,\r\n            lastDownload: null\r\n        }, metadata || {});\r\n        metadata.filename = metadata.filename || new ObjectId().toHexString();\r\n        return new Promise<IAsset>(((resolve, reject) => {\r\n            const uploaderStream = this.bucket.openUploadStream(metadata.filename);\r\n            uploadStream.pipe(uploaderStream)\r\n                .on(\"error\", error => {\r\n                    reject(error.message || error);\r\n                })\r\n                .on(\"finish\", () => {\r\n                    const asset = new Asset(uploaderStream.id as ObjectId, {\r\n                        filename: metadata.filename,\r\n                        contentType,\r\n                        metadata\r\n                    }, this.collection, this.bucket);\r\n                    asset.save().then(() => {\r\n                        resolve(asset);\r\n                    }, error => {\r\n                        reject(error.message || error);\r\n                    });\r\n                });\r\n        }));\r\n    }\r\n\r\n    async writeBuffer(buffer: Buffer, metadata: IAssetMeta = null, contentType: string = null): Promise<IAsset> {\r\n        contentType = await AssetProcessor.getMimeType(buffer, contentType);\r\n        metadata = metadata || {};\r\n        buffer = await this.assetProcessor.process(buffer, metadata, contentType);\r\n        return this.write(bufferToStream(buffer), contentType, metadata);\r\n    }\r\n\r\n    async writeUrl(url: string, metadata: IAssetMeta = null): Promise<IAsset> {\r\n        const buffer = (await axios({ url, responseType: \"arraybuffer\" })).data as Buffer;\r\n        return this.writeBuffer(buffer, metadata);\r\n    }\r\n\r\n    async read(id: string): Promise<IAsset> {\r\n        return this.find({_id: new ObjectId(id)});\r\n    }\r\n\r\n    async find(where: FilterQuery<IAsset>): Promise<IAsset> {\r\n        const data = await this.collection.findOne(where);\r\n        return !data ? null : new Asset(data._id, data, this.collection, this.bucket);\r\n    }\r\n\r\n    async findMany(where: FilterQuery<IAsset>): Promise<ReadonlyArray<IAsset>> {\r\n        const cursor = this.collection.find(where);\r\n        const items = await cursor.toArray() || [];\r\n        const result: IAsset[] = [];\r\n        for (let item of items) {\r\n            if (!item) continue;\r\n            result.push(new Asset(item._id, item, this.collection, this.bucket));\r\n        }\r\n        return result;\r\n    }\r\n\r\n    async unlink(id: string): Promise<any> {\r\n        const asset = await this.read(id);\r\n        if (!asset) return null;\r\n        return asset.unlink();\r\n    }\r\n}\r\n"]}
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/services/assets.ts"],"names":[],"mappings":"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","sourcesContent":["import {injectable, Lifecycle, scoped} from \"tsyringe\";\r\nimport {Readable} from \"stream\";\r\nimport {ObjectId} from \"bson\";\r\nimport {Collection, GridFSBucket} from \"mongodb\";\r\nimport {FilterQuery} from \"mongoose\";\r\nimport axios from \"axios\";\r\n\r\nimport {bufferToStream, copyStream, streamToBuffer} from \"../utils\";\r\nimport {IAsset, IAssetMeta, IFileType} from \"../common-types\";\r\nimport {MongoConnector} from \"./mongo-connector\";\r\nimport {AssetProcessor} from \"./asset-processor\";\r\nimport {Asset} from \"./entities/asset\";\r\n\r\n@injectable()\r\n@scoped(Lifecycle.ContainerScoped)\r\nexport class Assets {\r\n\r\n    readonly bucket: GridFSBucket;\r\n    readonly collection: Collection;\r\n\r\n    constructor(readonly connector: MongoConnector, readonly assetProcessor: AssetProcessor) {\r\n        this.bucket = connector.bucket;\r\n        this.collection = connector.database?.collection(\"assets.files\");\r\n    }\r\n\r\n    async write(stream: Readable, contentType: string = null, metadata: IAssetMeta = null): Promise<IAsset> {\r\n        const uploadStream = copyStream(stream);\r\n        const buffer = await streamToBuffer(stream);\r\n        let fileType = {ext: \"\", mime: contentType} as IFileType;\r\n        try {\r\n            fileType = await AssetProcessor.fileTypeFromBuffer(buffer);\r\n        } catch (e) {\r\n            if (!fileType.mime) {\r\n                throw `Can't determine mime type`;\r\n            }\r\n            console.log(`Can't determine mime type`, e);\r\n        }\r\n        metadata = metadata || {};\r\n        return this.upload(uploadStream, fileType, metadata);\r\n    }\r\n\r\n    async writeBuffer(buffer: Buffer, metadata: IAssetMeta = null, contentType: string = null): Promise<IAsset> {\r\n        let fileType = {ext: \"\", mime: contentType} as IFileType;\r\n        try {\r\n            fileType = await AssetProcessor.fileTypeFromBuffer(buffer);\r\n        } catch (e) {\r\n            if (!fileType.mime) {\r\n                throw `Can't determine mime type`;\r\n            }\r\n            console.log(`Can't determine mime type`, e);\r\n        }\r\n        metadata = metadata || {};\r\n        buffer = await this.assetProcessor.process(buffer, metadata, fileType);\r\n        return this.upload(bufferToStream(buffer), fileType, metadata);\r\n    }\r\n\r\n    async writeUrl(url: string, metadata: IAssetMeta = null): Promise<IAsset> {\r\n        const buffer = (await axios({ url, responseType: \"arraybuffer\" })).data as Buffer;\r\n        return this.writeBuffer(buffer, metadata);\r\n    }\r\n\r\n    async read(id: string): Promise<IAsset> {\r\n        return !id ? null : this.find({_id: new ObjectId(id)});\r\n    }\r\n\r\n    async find(where: FilterQuery<IAsset>): Promise<IAsset> {\r\n        const data = await this.collection.findOne(where);\r\n        return !data ? null : new Asset(data._id, data, this.collection, this.bucket);\r\n    }\r\n\r\n    async findMany(where: FilterQuery<IAsset>): Promise<ReadonlyArray<IAsset>> {\r\n        const cursor = this.collection.find(where);\r\n        const items = await cursor.toArray() || [];\r\n        const result: IAsset[] = [];\r\n        for (let item of items) {\r\n            if (!item) continue;\r\n            result.push(new Asset(item._id, item, this.collection, this.bucket));\r\n        }\r\n        return result;\r\n    }\r\n\r\n    async unlink(id: string): Promise<any> {\r\n        const asset = await this.read(id);\r\n        if (!asset) return null;\r\n        return asset.unlink();\r\n    }\r\n\r\n    protected async upload(stream: Readable, fileType: IFileType, metadata: IAssetMeta): Promise<IAsset> {\r\n        const contentType = fileType.mime.trim();\r\n        const extension = (fileType.ext || \"\").trim();\r\n        metadata = Object.assign({\r\n            extension,\r\n            downloadCount: 0,\r\n            firstDownload: null,\r\n            lastDownload: null\r\n        }, metadata || {});\r\n        metadata.filename = metadata.filename || new ObjectId().toHexString();\r\n        return new Promise<IAsset>(((resolve, reject) => {\r\n            const uploaderStream = this.bucket.openUploadStream(metadata.filename);\r\n            stream.pipe(uploaderStream)\r\n                .on(\"error\", error => {\r\n                    reject(error.message || error);\r\n                })\r\n                .on(\"finish\", () => {\r\n                    const asset = new Asset(uploaderStream.id as ObjectId, {\r\n                        filename: metadata.filename,\r\n                        contentType,\r\n                        metadata\r\n                    }, this.collection, this.bucket);\r\n                    asset.save().then(() => {\r\n                        resolve(asset);\r\n                    }, error => {\r\n                        reject(error.message || error);\r\n                    });\r\n                });\r\n        }));\r\n    }\r\n}\r\n"]}
|
|
@@ -45,13 +45,13 @@ export class LazyAsset extends BaseEntity {
|
|
|
45
45
|
this.load().then(() => {
|
|
46
46
|
if (this.deleted)
|
|
47
47
|
return;
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
});
|
|
48
|
+
this.progresses.get(this.progressId).then(p => {
|
|
49
|
+
p === null || p === void 0 ? void 0 : p.cancel();
|
|
50
|
+
});
|
|
51
|
+
this.startWorkingOnAsset().then(() => {
|
|
52
|
+
console.log(`Started working on lazy asset: ${this.id}`);
|
|
53
|
+
}).catch(reason => {
|
|
54
|
+
console.log(`Can't start working on lazy asset: ${this.id}\nReason: ${reason}`);
|
|
55
55
|
});
|
|
56
56
|
});
|
|
57
57
|
}
|
|
@@ -80,11 +80,11 @@ export class LazyAsset extends BaseEntity {
|
|
|
80
80
|
}
|
|
81
81
|
startWorkingOnAsset() {
|
|
82
82
|
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
-
|
|
84
|
-
this.data.
|
|
83
|
+
this.data.progressId = (yield this.progresses.create()).id;
|
|
84
|
+
this.data.assetId = null;
|
|
85
85
|
yield this.save();
|
|
86
86
|
yield this.jobMan.enqueueWithName(this.data.jobName, Object.assign(Object.assign({}, this.data.jobParams), { lazyId: this.id }));
|
|
87
87
|
});
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS1hc3NldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9lbnRpdGllcy9sYXp5LWFzc2V0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUNBLE9BQU8sRUFBQyxRQUFRLEVBQUMsTUFBTSxNQUFNLENBQUM7QUFHOUIsT0FBTyxFQUFDLGdCQUFnQixFQUFDLE1BQU0sYUFBYSxDQUFDO0FBSTdDLE9BQU8sRUFBQyxVQUFVLEVBQUMsTUFBTSxlQUFlLENBQUM7QUFFekMsTUFBTSxPQUFPLFNBQVUsU0FBUSxVQUFzQjtJQXNCakQsWUFBWSxFQUFZLEVBQ1osSUFBeUIsRUFDekIsVUFBc0IsRUFDWixNQUFjLEVBQ2QsVUFBc0IsRUFDdEIsTUFBa0I7UUFDcEMsS0FBSyxDQUFDLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFIVixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2QsZUFBVSxHQUFWLFVBQVUsQ0FBWTtRQUN0QixXQUFNLEdBQU4sTUFBTSxDQUFZO0lBRXhDLENBQUM7SUEzQkQsSUFBSSxPQUFPO1FBQ1AsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUM3QixDQUFDO0lBRUQsSUFBSSxTQUFTO1FBQ1QsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQztJQUMvQixDQUFDO0lBRUQsSUFBSSxNQUFNO1FBQ04sT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQztJQUM1QixDQUFDO0lBRUQsSUFBSSxVQUFVO1FBQ1YsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQztJQUNoQyxDQUFDO0lBRUQsSUFBSSxPQUFPO1FBQ1AsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUM3QixDQUFDO0lBV0ssTUFBTTs7WUFDUixNQUFNLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNsQixJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRTtnQkFDbEIsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxFQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRyxFQUFDLENBQUMsQ0FBQzthQUNwRDtZQUNELE9BQU8sZ0JBQWdCLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsSUFBSSxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDNUUsQ0FBQztLQUFBO0lBRUQsWUFBWTtRQUNSLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFO1lBQ2xCLElBQUksSUFBSSxDQUFDLE9BQU87Z0JBQUUsT0FBTztZQUN6QixJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFO2dCQUMxQyxDQUFDLGFBQUQsQ0FBQyx1QkFBRCxDQUFDLENBQUUsTUFBTSxHQUFHO1lBQ2hCLENBQUMsQ0FBQyxDQUFDO1lBQ0gsSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRTtnQkFDakMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrQ0FBa0MsSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDN0QsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFO2dCQUNkLE9BQU8sQ0FBQyxHQUFHLENBQUMsc0NBQXNDLElBQUksQ0FBQyxFQUFFLGFBQWEsTUFBTSxFQUFFLENBQUMsQ0FBQztZQUNwRixDQUFDLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUVLLFNBQVM7O1lBQ1gsTUFBTSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDbEIsSUFBSSxJQUFJLENBQUMsT0FBTztnQkFBRSxPQUFPLElBQUksQ0FBQztZQUM5QixJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUU7Z0JBQ2QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7YUFDekM7WUFDRCxJQUFJLElBQUksQ0FBQyxVQUFVLEVBQUU7Z0JBQ2pCLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO2dCQUNwRCxPQUFPLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQzthQUMzQjtZQUNELE1BQU0sSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7WUFDakMsT0FBTyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDNUIsQ0FBQztLQUFBO0lBRUssVUFBVSxDQUFDLEtBQWE7O1lBQzFCLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxHQUFHLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDN0IsTUFBTSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDbEIsT0FBTyxLQUFLLENBQUM7UUFDakIsQ0FBQztLQUFBO0lBRWUsbUJBQW1COztZQUMvQixJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsR0FBRyxDQUFDLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUMzRCxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUM7WUFDekIsTUFBTSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDbEIsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sa0NBQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEtBQUUsTUFBTSxFQUFFLElBQUksQ0FBQyxFQUFFLElBQUUsQ0FBQztRQUNwRyxDQUFDO0tBQUE7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7Q29sbGVjdGlvbn0gZnJvbSBcIm1vbmdvZGJcIjtcclxuaW1wb3J0IHtPYmplY3RJZH0gZnJvbSBcImJzb25cIjtcclxuXHJcbmltcG9ydCB7SUFzc2V0LCBJTGF6eUFzc2V0fSBmcm9tIFwiLi4vLi4vY29tbW9uLXR5cGVzXCI7XHJcbmltcG9ydCB7ZGVsZXRlRnJvbUJ1Y2tldH0gZnJvbSBcIi4uLy4uL3V0aWxzXCI7XHJcbmltcG9ydCB7QXNzZXRzfSBmcm9tIFwiLi4vYXNzZXRzXCI7XHJcbmltcG9ydCB7Sm9iTWFuYWdlcn0gZnJvbSBcIi4uL2pvYi1tYW5hZ2VyXCI7XHJcbmltcG9ydCB7UHJvZ3Jlc3Nlc30gZnJvbSBcIi4uL3Byb2dyZXNzZXNcIjtcclxuaW1wb3J0IHtCYXNlRW50aXR5fSBmcm9tIFwiLi9iYXNlLWVudGl0eVwiO1xyXG5cclxuZXhwb3J0IGNsYXNzIExhenlBc3NldCBleHRlbmRzIEJhc2VFbnRpdHk8SUxhenlBc3NldD4gaW1wbGVtZW50cyBJTGF6eUFzc2V0IHtcclxuXHJcbiAgICBnZXQgam9iTmFtZSgpOiBzdHJpbmcge1xyXG4gICAgICAgIHJldHVybiB0aGlzLmRhdGEuam9iTmFtZTtcclxuICAgIH1cclxuXHJcbiAgICBnZXQgam9iUGFyYW1zKCk6IGFueSB7XHJcbiAgICAgICAgcmV0dXJuIHRoaXMuZGF0YS5qb2JQYXJhbXM7XHJcbiAgICB9XHJcblxyXG4gICAgZ2V0IGpvYlF1ZSgpOiBzdHJpbmcge1xyXG4gICAgICAgIHJldHVybiB0aGlzLmRhdGEuam9iUXVlO1xyXG4gICAgfVxyXG5cclxuICAgIGdldCBwcm9ncmVzc0lkKCk6IHN0cmluZyB7XHJcbiAgICAgICAgcmV0dXJuIHRoaXMuZGF0YS5wcm9ncmVzc0lkO1xyXG4gICAgfVxyXG5cclxuICAgIGdldCBhc3NldElkKCk6IHN0cmluZyB7XHJcbiAgICAgICAgcmV0dXJuIHRoaXMuZGF0YS5hc3NldElkO1xyXG4gICAgfVxyXG5cclxuICAgIGNvbnN0cnVjdG9yKGlkOiBPYmplY3RJZCxcclxuICAgICAgICAgICAgICAgIGRhdGE6IFBhcnRpYWw8SUxhenlBc3NldD4sXHJcbiAgICAgICAgICAgICAgICBjb2xsZWN0aW9uOiBDb2xsZWN0aW9uLFxyXG4gICAgICAgICAgICAgICAgcHJvdGVjdGVkIGFzc2V0czogQXNzZXRzLFxyXG4gICAgICAgICAgICAgICAgcHJvdGVjdGVkIHByb2dyZXNzZXM6IFByb2dyZXNzZXMsXHJcbiAgICAgICAgICAgICAgICBwcm90ZWN0ZWQgam9iTWFuOiBKb2JNYW5hZ2VyKSB7XHJcbiAgICAgICAgc3VwZXIoaWQsIGRhdGEsIGNvbGxlY3Rpb24pO1xyXG4gICAgfVxyXG5cclxuICAgIGFzeW5jIHVubGluaygpOiBQcm9taXNlPHN0cmluZz4ge1xyXG4gICAgICAgIGF3YWl0IHRoaXMubG9hZCgpO1xyXG4gICAgICAgIGlmICghdGhpcy5wcm9ncmVzc0lkKSB7XHJcbiAgICAgICAgICAgIGF3YWl0IHRoaXMuY29sbGVjdGlvbi5kZWxldGVPbmUoe19pZDogdGhpcy5tSWR9KTtcclxuICAgICAgICB9XHJcbiAgICAgICAgcmV0dXJuIGRlbGV0ZUZyb21CdWNrZXQodGhpcy5hc3NldHMuYnVja2V0LCBuZXcgT2JqZWN0SWQodGhpcy5hc3NldElkKSk7XHJcbiAgICB9XHJcblxyXG4gICAgc3RhcnRXb3JraW5nKCk6IHZvaWQge1xyXG4gICAgICAgIHRoaXMubG9hZCgpLnRoZW4oKCkgPT4ge1xyXG4gICAgICAgICAgICBpZiAodGhpcy5kZWxldGVkKSByZXR1cm47XHJcbiAgICAgICAgICAgIHRoaXMucHJvZ3Jlc3Nlcy5nZXQodGhpcy5wcm9ncmVzc0lkKS50aGVuKHAgPT4ge1xyXG4gICAgICAgICAgICAgICAgcD8uY2FuY2VsKCk7XHJcbiAgICAgICAgICAgIH0pO1xyXG4gICAgICAgICAgICB0aGlzLnN0YXJ0V29ya2luZ09uQXNzZXQoKS50aGVuKCgpID0+IHtcclxuICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKGBTdGFydGVkIHdvcmtpbmcgb24gbGF6eSBhc3NldDogJHt0aGlzLmlkfWApO1xyXG4gICAgICAgICAgICB9KS5jYXRjaChyZWFzb24gPT4ge1xyXG4gICAgICAgICAgICAgICAgY29uc29sZS5sb2coYENhbid0IHN0YXJ0IHdvcmtpbmcgb24gbGF6eSBhc3NldDogJHt0aGlzLmlkfVxcblJlYXNvbjogJHtyZWFzb259YCk7XHJcbiAgICAgICAgICAgIH0pO1xyXG4gICAgICAgIH0pO1xyXG4gICAgfVxyXG5cclxuICAgIGFzeW5jIGxvYWRBc3NldCgpOiBQcm9taXNlPElBc3NldD4ge1xyXG4gICAgICAgIGF3YWl0IHRoaXMubG9hZCgpO1xyXG4gICAgICAgIGlmICh0aGlzLmRlbGV0ZWQpIHJldHVybiBudWxsO1xyXG4gICAgICAgIGlmICh0aGlzLmFzc2V0SWQpIHtcclxuICAgICAgICAgICAgcmV0dXJuIHRoaXMuYXNzZXRzLnJlYWQodGhpcy5hc3NldElkKTtcclxuICAgICAgICB9XHJcbiAgICAgICAgaWYgKHRoaXMucHJvZ3Jlc3NJZCkge1xyXG4gICAgICAgICAgICBhd2FpdCB0aGlzLnByb2dyZXNzZXMud2FpdFRvRmluaXNoKHRoaXMucHJvZ3Jlc3NJZCk7XHJcbiAgICAgICAgICAgIHJldHVybiB0aGlzLmxvYWRBc3NldCgpO1xyXG4gICAgICAgIH1cclxuICAgICAgICBhd2FpdCB0aGlzLnN0YXJ0V29ya2luZ09uQXNzZXQoKTtcclxuICAgICAgICByZXR1cm4gdGhpcy5sb2FkQXNzZXQoKTtcclxuICAgIH1cclxuXHJcbiAgICBhc3luYyB3cml0ZUFzc2V0KGFzc2V0OiBJQXNzZXQpOiBQcm9taXNlPElBc3NldD4ge1xyXG4gICAgICAgIHRoaXMuZGF0YS5hc3NldElkID0gYXNzZXQuaWQ7XHJcbiAgICAgICAgYXdhaXQgdGhpcy5zYXZlKCk7XHJcbiAgICAgICAgcmV0dXJuIGFzc2V0O1xyXG4gICAgfVxyXG5cclxuICAgIHByb3RlY3RlZCBhc3luYyBzdGFydFdvcmtpbmdPbkFzc2V0KCk6IFByb21pc2U8YW55PiB7XHJcbiAgICAgICAgdGhpcy5kYXRhLnByb2dyZXNzSWQgPSAoYXdhaXQgdGhpcy5wcm9ncmVzc2VzLmNyZWF0ZSgpKS5pZDtcclxuICAgICAgICB0aGlzLmRhdGEuYXNzZXRJZCA9IG51bGw7XHJcbiAgICAgICAgYXdhaXQgdGhpcy5zYXZlKCk7XHJcbiAgICAgICAgYXdhaXQgdGhpcy5qb2JNYW4uZW5xdWV1ZVdpdGhOYW1lKHRoaXMuZGF0YS5qb2JOYW1lLCB7Li4udGhpcy5kYXRhLmpvYlBhcmFtcywgbGF6eUlkOiB0aGlzLmlkfSk7XHJcbiAgICB9XHJcbn1cclxuIl19
|
|
@@ -48,7 +48,7 @@ let LazyAssets = class LazyAssets {
|
|
|
48
48
|
}
|
|
49
49
|
read(id) {
|
|
50
50
|
return __awaiter(this, void 0, void 0, function* () {
|
|
51
|
-
return this.find({ _id: new ObjectId(id) });
|
|
51
|
+
return !id ? null : this.find({ _id: new ObjectId(id) });
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
find(where) {
|
|
@@ -75,4 +75,4 @@ LazyAssets = __decorate([
|
|
|
75
75
|
Progresses, JobManager])
|
|
76
76
|
], LazyAssets);
|
|
77
77
|
export { LazyAssets };
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS1hc3NldHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvbGF6eS1hc3NldHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFDLFVBQVUsRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFDLE1BQU0sVUFBVSxDQUFDO0FBQ3ZELE9BQU8sRUFBQyxRQUFRLEVBQUMsTUFBTSxNQUFNLENBQUM7QUFJOUIsT0FBTyxFQUFDLGNBQWMsRUFBQyxNQUFNLG1CQUFtQixDQUFDO0FBQ2pELE9BQU8sRUFBQyxNQUFNLEVBQUMsTUFBTSxVQUFVLENBQUM7QUFDaEMsT0FBTyxFQUFDLFNBQVMsRUFBQyxNQUFNLHVCQUF1QixDQUFDO0FBQ2hELE9BQU8sRUFBQyxVQUFVLEVBQUMsTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxFQUFDLFVBQVUsRUFBQyxNQUFNLGNBQWMsQ0FBQztJQUkzQixVQUFVLFNBQVYsVUFBVTtJQUluQixZQUFxQixTQUF5QixFQUFXLE1BQWMsRUFDbEQsVUFBc0IsRUFBVyxNQUFrQjtRQURuRCxjQUFTLEdBQVQsU0FBUyxDQUFnQjtRQUFXLFdBQU0sR0FBTixNQUFNLENBQVE7UUFDbEQsZUFBVSxHQUFWLFVBQVUsQ0FBWTtRQUFXLFdBQU0sR0FBTixNQUFNLENBQVk7UUFDcEUsSUFBSSxDQUFDLFVBQVUsR0FBRyxTQUFTLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUNsRSxDQUFDO0lBRUssTUFBTSxDQUFDLE9BQW1CLEVBQUUsWUFBdUIsRUFBRSxFQUFFLFNBQWlCLE1BQU07O1lBQ2hGLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLE9BQU8sa0NBQU0sU0FBUyxLQUFFLE1BQU0sRUFBRSxFQUFFLElBQUUsQ0FBQztZQUM1RSxNQUFNLElBQUksR0FBRztnQkFDVCxPQUFPO2dCQUNQLFNBQVM7Z0JBQ1QsTUFBTTthQUNULENBQUM7WUFDRixNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDNUMsSUFBSSxhQUFhO2dCQUFFLE9BQU8sYUFBYSxDQUFDO1lBQ3hDLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbEQsT0FBTyxJQUFJLFNBQVMsQ0FDaEIsR0FBRyxDQUFDLFVBQVUsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLFVBQVUsRUFDckMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQzVDLENBQUM7UUFDTixDQUFDO0tBQUE7SUFFSyxJQUFJLENBQUMsRUFBVTs7WUFDakIsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUMsR0FBRyxFQUFFLElBQUksUUFBUSxDQUFDLEVBQUUsQ0FBQyxFQUFDLENBQUMsQ0FBQztRQUMzRCxDQUFDO0tBQUE7SUFFSyxJQUFJLENBQUMsS0FBOEI7O1lBQ3JDLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDbEQsT0FBTyxDQUFDLElBQUk7Z0JBQ1IsQ0FBQyxDQUFDLElBQUk7Z0JBQ04sQ0FBQyxDQUFDLElBQUksU0FBUyxDQUNYLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxVQUFVLEVBQy9CLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUM1QyxDQUFDO1FBQ1YsQ0FBQztLQUFBO0lBRUssTUFBTSxDQUFDLEVBQVU7O1lBQ25CLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNsQyxJQUFJLENBQUMsS0FBSztnQkFBRSxPQUFPLElBQUksQ0FBQztZQUN4QixPQUFPLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUMxQixDQUFDO0tBQUE7Q0FDSixDQUFBO0FBNUNZLFVBQVU7SUFGdEIsVUFBVSxFQUFFO0lBQ1osTUFBTSxDQUFDLFNBQVMsQ0FBQyxlQUFlLENBQUM7cUNBS0UsY0FBYyxFQUFtQixNQUFNO1FBQ3RDLFVBQVUsRUFBbUIsVUFBVTtHQUwvRCxVQUFVLENBNEN0QjtTQTVDWSxVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtpbmplY3RhYmxlLCBMaWZlY3ljbGUsIHNjb3BlZH0gZnJvbSBcInRzeXJpbmdlXCI7XHJcbmltcG9ydCB7T2JqZWN0SWR9IGZyb20gXCJic29uXCI7XHJcbmltcG9ydCB7Q29sbGVjdGlvbn0gZnJvbSBcIm1vbmdvZGJcIjtcclxuaW1wb3J0IHtGaWx0ZXJRdWVyeX0gZnJvbSBcIm1vbmdvb3NlXCI7XHJcbmltcG9ydCB7SUpvYiwgSUxhenlBc3NldCwgSm9iUGFyYW1zLCBUeXBlfSBmcm9tIFwiLi4vY29tbW9uLXR5cGVzXCI7XHJcbmltcG9ydCB7TW9uZ29Db25uZWN0b3J9IGZyb20gXCIuL21vbmdvLWNvbm5lY3RvclwiO1xyXG5pbXBvcnQge0Fzc2V0c30gZnJvbSBcIi4vYXNzZXRzXCI7XHJcbmltcG9ydCB7TGF6eUFzc2V0fSBmcm9tIFwiLi9lbnRpdGllcy9sYXp5LWFzc2V0XCI7XHJcbmltcG9ydCB7Sm9iTWFuYWdlcn0gZnJvbSBcIi4vam9iLW1hbmFnZXJcIjtcclxuaW1wb3J0IHtQcm9ncmVzc2VzfSBmcm9tIFwiLi9wcm9ncmVzc2VzXCI7XHJcblxyXG5AaW5qZWN0YWJsZSgpXHJcbkBzY29wZWQoTGlmZWN5Y2xlLkNvbnRhaW5lclNjb3BlZClcclxuZXhwb3J0IGNsYXNzIExhenlBc3NldHMge1xyXG5cclxuICAgIHByb3RlY3RlZCBjb2xsZWN0aW9uOiBDb2xsZWN0aW9uO1xyXG5cclxuICAgIGNvbnN0cnVjdG9yKHJlYWRvbmx5IGNvbm5lY3RvcjogTW9uZ29Db25uZWN0b3IsIHJlYWRvbmx5IGFzc2V0czogQXNzZXRzLFxyXG4gICAgICAgICAgICAgICAgcmVhZG9ubHkgcHJvZ3Jlc3NlczogUHJvZ3Jlc3NlcywgcmVhZG9ubHkgam9iTWFuOiBKb2JNYW5hZ2VyKSB7XHJcbiAgICAgICAgdGhpcy5jb2xsZWN0aW9uID0gY29ubmVjdG9yLmRhdGFiYXNlLmNvbGxlY3Rpb24oXCJsYXp5YXNzZXRzXCIpO1xyXG4gICAgfVxyXG5cclxuICAgIGFzeW5jIGNyZWF0ZShqb2JUeXBlOiBUeXBlPElKb2I+LCBqb2JQYXJhbXM6IEpvYlBhcmFtcyA9IHt9LCBqb2JRdWU6IHN0cmluZyA9IFwibWFpblwiKTogUHJvbWlzZTxJTGF6eUFzc2V0PiB7XHJcbiAgICAgICAgY29uc3Qgam9iTmFtZSA9IHRoaXMuam9iTWFuLnRyeVJlc29sdmUoam9iVHlwZSwgey4uLmpvYlBhcmFtcywgbGF6eUlkOiBcIlwifSk7XHJcbiAgICAgICAgY29uc3QgZGF0YSA9IHtcclxuICAgICAgICAgICAgam9iTmFtZSxcclxuICAgICAgICAgICAgam9iUGFyYW1zLFxyXG4gICAgICAgICAgICBqb2JRdWVcclxuICAgICAgICB9O1xyXG4gICAgICAgIGNvbnN0IGV4aXN0aW5nQXNzZXQgPSBhd2FpdCB0aGlzLmZpbmQoZGF0YSk7XHJcbiAgICAgICAgaWYgKGV4aXN0aW5nQXNzZXQpIHJldHVybiBleGlzdGluZ0Fzc2V0O1xyXG4gICAgICAgIGNvbnN0IHJlcyA9IGF3YWl0IHRoaXMuY29sbGVjdGlvbi5pbnNlcnRPbmUoZGF0YSk7XHJcbiAgICAgICAgcmV0dXJuIG5ldyBMYXp5QXNzZXQoXHJcbiAgICAgICAgICAgIHJlcy5pbnNlcnRlZElkLCBkYXRhLCB0aGlzLmNvbGxlY3Rpb24sXHJcbiAgICAgICAgICAgIHRoaXMuYXNzZXRzLCB0aGlzLnByb2dyZXNzZXMsIHRoaXMuam9iTWFuXHJcbiAgICAgICAgKTtcclxuICAgIH1cclxuXHJcbiAgICBhc3luYyByZWFkKGlkOiBzdHJpbmcpOiBQcm9taXNlPElMYXp5QXNzZXQ+IHtcclxuICAgICAgICByZXR1cm4gIWlkID8gbnVsbCA6IHRoaXMuZmluZCh7X2lkOiBuZXcgT2JqZWN0SWQoaWQpfSk7XHJcbiAgICB9XHJcblxyXG4gICAgYXN5bmMgZmluZCh3aGVyZTogRmlsdGVyUXVlcnk8SUxhenlBc3NldD4pOiBQcm9taXNlPElMYXp5QXNzZXQ+IHtcclxuICAgICAgICBjb25zdCBkYXRhID0gYXdhaXQgdGhpcy5jb2xsZWN0aW9uLmZpbmRPbmUod2hlcmUpO1xyXG4gICAgICAgIHJldHVybiAhZGF0YVxyXG4gICAgICAgICAgICA/IG51bGxcclxuICAgICAgICAgICAgOiBuZXcgTGF6eUFzc2V0KFxyXG4gICAgICAgICAgICAgICAgZGF0YS5faWQsIGRhdGEsIHRoaXMuY29sbGVjdGlvbixcclxuICAgICAgICAgICAgICAgIHRoaXMuYXNzZXRzLCB0aGlzLnByb2dyZXNzZXMsIHRoaXMuam9iTWFuXHJcbiAgICAgICAgICAgICk7XHJcbiAgICB9XHJcblxyXG4gICAgYXN5bmMgdW5saW5rKGlkOiBzdHJpbmcpOiBQcm9taXNlPGFueT4ge1xyXG4gICAgICAgIGNvbnN0IGFzc2V0ID0gYXdhaXQgdGhpcy5yZWFkKGlkKTtcclxuICAgICAgICBpZiAoIWFzc2V0KSByZXR1cm4gbnVsbDtcclxuICAgICAgICByZXR1cm4gYXNzZXQudW5saW5rKCk7XHJcbiAgICB9XHJcbn1cclxuIl19
|
|
@@ -54,7 +54,7 @@ let Progresses = class Progresses {
|
|
|
54
54
|
}
|
|
55
55
|
get(id) {
|
|
56
56
|
return __awaiter(this, void 0, void 0, function* () {
|
|
57
|
-
return this.find({ _id: new ObjectId(id) });
|
|
57
|
+
return !id ? null : this.find({ _id: new ObjectId(id) });
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
find(where) {
|
|
@@ -92,4 +92,4 @@ Progresses = __decorate([
|
|
|
92
92
|
__metadata("design:paramtypes", [MongoConnector, Configuration])
|
|
93
93
|
], Progresses);
|
|
94
94
|
export { Progresses };
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZ3Jlc3Nlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9wcm9ncmVzc2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBQyxVQUFVLEVBQUUsU0FBUyxFQUFDLE1BQU0sVUFBVSxDQUFDO0FBQy9DLE9BQU8sZ0JBQWdCLE1BQU0sa0JBQWtCLENBQUE7QUFDL0MsT0FBTyxFQUFDLFFBQVEsRUFBQyxNQUFNLE1BQU0sQ0FBQztBQUc5QixPQUFPLEVBQUMsY0FBYyxFQUFDLE1BQU0sVUFBVSxDQUFDO0FBQ3hDLE9BQU8sRUFBQyxhQUFhLEVBQUMsTUFBTSxpQkFBaUIsQ0FBQztBQUM5QyxPQUFPLEVBQUMsUUFBUSxFQUFDLE1BQU0scUJBQXFCLENBQUM7QUFDN0MsT0FBTyxFQUFDLGNBQWMsRUFBQyxNQUFNLG1CQUFtQixDQUFDO0FBR2pELE1BQU0sY0FBYyxHQUFHLGdCQUFnQixDQUFDO0lBSTNCLFVBQVUsU0FBVixVQUFVO0lBS25CLFlBQXFCLFNBQXlCLEVBQVcsTUFBcUI7UUFBekQsY0FBUyxHQUFULFNBQVMsQ0FBZ0I7UUFBVyxXQUFNLEdBQU4sTUFBTSxDQUFlO1FBQzFFLE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQ3pELElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLFlBQVksRUFBRSxFQUFDLElBQUksRUFBRSxTQUFTLEVBQUMsQ0FBQyxDQUFDO1FBQ3JGLElBQUksQ0FBQyxVQUFVLEdBQUcsU0FBUyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDbEUsQ0FBQztJQUVLLFlBQVksQ0FBQyxFQUFVOztZQUN6QixJQUFJLFVBQVUsR0FBRyxLQUFLLENBQUM7WUFDdkIsSUFBSSxRQUFRLEdBQWMsSUFBSSxDQUFDO1lBQy9CLE9BQU8sQ0FBQyxVQUFVLEVBQUU7Z0JBQ2hCLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQzlCLElBQUksQ0FBQyxRQUFRLEVBQUU7b0JBQ1gsTUFBTSxxQ0FBcUMsRUFBRSxFQUFFLENBQUM7aUJBQ25EO2dCQUNELElBQUksUUFBUSxDQUFDLEtBQUssRUFBRTtvQkFDaEIsTUFBTSxRQUFRLENBQUMsS0FBSyxDQUFDO2lCQUN4QjtnQkFDRCxVQUFVLEdBQUcsUUFBUSxDQUFDLE9BQU8sSUFBSSxHQUFHLENBQUM7Z0JBQ3JDLElBQUksQ0FBQyxVQUFVLEVBQUU7b0JBQ2IsTUFBTSxjQUFjLENBQUMsR0FBRyxDQUFDLENBQUM7aUJBQzdCO2FBQ0o7WUFDRCxPQUFPLFFBQVEsQ0FBQztRQUNwQixDQUFDO0tBQUE7SUFFSyxHQUFHLENBQUMsRUFBVTs7WUFDaEIsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUMsR0FBRyxFQUFFLElBQUksUUFBUSxDQUFDLEVBQUUsQ0FBQyxFQUFDLENBQUMsQ0FBQztRQUMzRCxDQUFDO0tBQUE7SUFFSyxJQUFJLENBQUMsS0FBNkI7O1lBQ3BDLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDbEQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLFFBQVEsQ0FDOUIsSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUMvQyxDQUFDO1FBQ04sQ0FBQztLQUFBO0lBRUssTUFBTSxDQUFDLE1BQWMsR0FBRzs7WUFDMUIsSUFBSSxLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsRUFBRTtnQkFDeEIsTUFBTSw2Q0FBNkMsQ0FBQzthQUN2RDtZQUNELE1BQU0sSUFBSSxHQUFHO2dCQUNULE9BQU8sRUFBRSxDQUFDO2dCQUNWLEdBQUcsRUFBRSxHQUFHO2dCQUNSLE9BQU8sRUFBRSxFQUFFO2dCQUNYLEtBQUssRUFBRSxFQUFFO2dCQUNULFFBQVEsRUFBRSxLQUFLO2FBQ2xCLENBQUM7WUFDRixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2xELE9BQU8sSUFBSSxRQUFRLENBQ2YsR0FBRyxDQUFDLFVBQVUsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUNyRCxDQUFDO1FBQ04sQ0FBQztLQUFBO0lBRUssTUFBTSxDQUFDLEVBQVU7O1lBQ25CLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsRUFBQyxHQUFHLEVBQUUsSUFBSSxRQUFRLENBQUMsRUFBRSxDQUFDLEVBQUMsQ0FBQyxDQUFDO1lBQ3pELE9BQU8sRUFBRSxDQUFDO1FBQ2QsQ0FBQztLQUFBO0NBQ0osQ0FBQTtBQTlEWSxVQUFVO0lBRnRCLFVBQVUsRUFBRTtJQUNaLFNBQVMsRUFBRTtxQ0FNd0IsY0FBYyxFQUFtQixhQUFhO0dBTHJFLFVBQVUsQ0E4RHRCO1NBOURZLFVBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge2luamVjdGFibGUsIHNpbmdsZXRvbn0gZnJvbSBcInRzeXJpbmdlXCI7XHJcbmltcG9ydCBzb2NrZXRfaW9fY2xpZW50IGZyb20gXCJzb2NrZXQuaW8tY2xpZW50XCJcclxuaW1wb3J0IHtPYmplY3RJZH0gZnJvbSBcImJzb25cIjtcclxuaW1wb3J0IHtGaWx0ZXJRdWVyeX0gZnJvbSBcIm1vbmdvb3NlXCI7XHJcbmltcG9ydCB7SVByb2dyZXNzfSBmcm9tIFwiLi4vY29tbW9uLXR5cGVzXCI7XHJcbmltcG9ydCB7cHJvbWlzZVRpbWVvdXR9IGZyb20gXCIuLi91dGlsc1wiO1xyXG5pbXBvcnQge0NvbmZpZ3VyYXRpb259IGZyb20gXCIuL2NvbmZpZ3VyYXRpb25cIjtcclxuaW1wb3J0IHtQcm9ncmVzc30gZnJvbSBcIi4vZW50aXRpZXMvcHJvZ3Jlc3NcIjtcclxuaW1wb3J0IHtNb25nb0Nvbm5lY3Rvcn0gZnJvbSBcIi4vbW9uZ28tY29ubmVjdG9yXCI7XHJcbmltcG9ydCB7Q29sbGVjdGlvbn0gZnJvbSBcIm1vbmdvZGJcIjtcclxuXHJcbmNvbnN0IHNvY2tldElPQ2xpZW50ID0gc29ja2V0X2lvX2NsaWVudDtcclxuXHJcbkBpbmplY3RhYmxlKClcclxuQHNpbmdsZXRvbigpXHJcbmV4cG9ydCBjbGFzcyBQcm9ncmVzc2VzIHtcclxuXHJcbiAgICBwcm90ZWN0ZWQgY2xpZW50OiBTb2NrZXRJT0NsaWVudC5Tb2NrZXQ7XHJcbiAgICByZWFkb25seSBjb2xsZWN0aW9uOiBDb2xsZWN0aW9uO1xyXG5cclxuICAgIGNvbnN0cnVjdG9yKHJlYWRvbmx5IGNvbm5lY3RvcjogTW9uZ29Db25uZWN0b3IsIHJlYWRvbmx5IGNvbmZpZzogQ29uZmlndXJhdGlvbikge1xyXG4gICAgICAgIGNvbnN0IG1haW5FbmRwb2ludCA9IHRoaXMuY29uZmlnLnJlc29sdmUoXCJtYWluRW5kcG9pbnRcIik7XHJcbiAgICAgICAgdGhpcy5jbGllbnQgPSAhbWFpbkVuZHBvaW50ID8gbnVsbCA6IHNvY2tldElPQ2xpZW50KG1haW5FbmRwb2ludCwge3BhdGg6IFwiL3NvY2tldFwifSk7XHJcbiAgICAgICAgdGhpcy5jb2xsZWN0aW9uID0gY29ubmVjdG9yLmRhdGFiYXNlLmNvbGxlY3Rpb24oXCJwcm9ncmVzc2VzXCIpO1xyXG4gICAgfVxyXG5cclxuICAgIGFzeW5jIHdhaXRUb0ZpbmlzaChpZDogc3RyaW5nKTogUHJvbWlzZTxJUHJvZ3Jlc3M+IHtcclxuICAgICAgICBsZXQgaXNGaW5pc2hlZCA9IGZhbHNlO1xyXG4gICAgICAgIGxldCBwcm9ncmVzczogSVByb2dyZXNzID0gbnVsbDtcclxuICAgICAgICB3aGlsZSAoIWlzRmluaXNoZWQpIHtcclxuICAgICAgICAgICAgcHJvZ3Jlc3MgPSBhd2FpdCB0aGlzLmdldChpZCk7XHJcbiAgICAgICAgICAgIGlmICghcHJvZ3Jlc3MpIHtcclxuICAgICAgICAgICAgICAgIHRocm93IGBQcm9ncmVzcyBkb2VzIG5vdCBleGlzdHMgd2l0aCBpZDogJHtpZH1gO1xyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgICAgIGlmIChwcm9ncmVzcy5lcnJvcikge1xyXG4gICAgICAgICAgICAgICAgdGhyb3cgcHJvZ3Jlc3MuZXJyb3I7XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICAgICAgaXNGaW5pc2hlZCA9IHByb2dyZXNzLnBlcmNlbnQgPT0gMTAwO1xyXG4gICAgICAgICAgICBpZiAoIWlzRmluaXNoZWQpIHtcclxuICAgICAgICAgICAgICAgIGF3YWl0IHByb21pc2VUaW1lb3V0KDE1MCk7XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICB9XHJcbiAgICAgICAgcmV0dXJuIHByb2dyZXNzO1xyXG4gICAgfVxyXG5cclxuICAgIGFzeW5jIGdldChpZDogc3RyaW5nKTogUHJvbWlzZTxJUHJvZ3Jlc3M+IHtcclxuICAgICAgICByZXR1cm4gIWlkID8gbnVsbCA6IHRoaXMuZmluZCh7X2lkOiBuZXcgT2JqZWN0SWQoaWQpfSk7XHJcbiAgICB9XHJcblxyXG4gICAgYXN5bmMgZmluZCh3aGVyZTogRmlsdGVyUXVlcnk8SVByb2dyZXNzPik6IFByb21pc2U8SVByb2dyZXNzPiB7XHJcbiAgICAgICAgY29uc3QgZGF0YSA9IGF3YWl0IHRoaXMuY29sbGVjdGlvbi5maW5kT25lKHdoZXJlKTtcclxuICAgICAgICByZXR1cm4gIWRhdGEgPyBudWxsIDogbmV3IFByb2dyZXNzKFxyXG4gICAgICAgICAgICBkYXRhLl9pZCwgZGF0YSwgdGhpcy5jb2xsZWN0aW9uLCB0aGlzLmNsaWVudFxyXG4gICAgICAgICk7XHJcbiAgICB9XHJcblxyXG4gICAgYXN5bmMgY3JlYXRlKG1heDogbnVtYmVyID0gMTAwKTogUHJvbWlzZTxJUHJvZ3Jlc3M+IHtcclxuICAgICAgICBpZiAoaXNOYU4obWF4KSB8fCBtYXggPD0gMCkge1xyXG4gICAgICAgICAgICB0aHJvdyBcIk1heCBwcm9ncmVzcyB2YWx1ZSBtdXN0IGJlIGJpZ2dlciB0aGFuIHplcm9cIjtcclxuICAgICAgICB9XHJcbiAgICAgICAgY29uc3QgZGF0YSA9IHtcclxuICAgICAgICAgICAgY3VycmVudDogMCxcclxuICAgICAgICAgICAgbWF4OiBtYXgsXHJcbiAgICAgICAgICAgIG1lc3NhZ2U6IFwiXCIsXHJcbiAgICAgICAgICAgIGVycm9yOiBcIlwiLFxyXG4gICAgICAgICAgICBjYW5jZWxlZDogZmFsc2VcclxuICAgICAgICB9O1xyXG4gICAgICAgIGNvbnN0IHJlcyA9IGF3YWl0IHRoaXMuY29sbGVjdGlvbi5pbnNlcnRPbmUoZGF0YSk7XHJcbiAgICAgICAgcmV0dXJuIG5ldyBQcm9ncmVzcyhcclxuICAgICAgICAgICAgcmVzLmluc2VydGVkSWQsIGRhdGEsIHRoaXMuY29sbGVjdGlvbiwgdGhpcy5jbGllbnRcclxuICAgICAgICApO1xyXG4gICAgfVxyXG5cclxuICAgIGFzeW5jIHJlbW92ZShpZDogc3RyaW5nKTogUHJvbWlzZTxhbnk+IHtcclxuICAgICAgICBhd2FpdCB0aGlzLmNvbGxlY3Rpb24uZGVsZXRlT25lKHtfaWQ6IG5ldyBPYmplY3RJZChpZCl9KTtcclxuICAgICAgICByZXR1cm4gaWQ7XHJcbiAgICB9XHJcbn1cclxuIl19
|
|
@@ -18,7 +18,7 @@ import { getValue as getValue$1, setValue } from 'mongoose/lib/utils';
|
|
|
18
18
|
import { PassThrough, Readable } from 'stream';
|
|
19
19
|
import { ObjectId } from 'bson';
|
|
20
20
|
import fontKit_ from 'fontkit';
|
|
21
|
-
import { fromBuffer
|
|
21
|
+
import { fromBuffer } from 'file-type';
|
|
22
22
|
import sharp_ from 'sharp';
|
|
23
23
|
import axios from 'axios';
|
|
24
24
|
import { GridFSBucket } from 'mongodb';
|
|
@@ -774,18 +774,24 @@ const fontProps = [
|
|
|
774
774
|
"xHeight", "numGlyphs", "characterSet", "availableFeatures"
|
|
775
775
|
];
|
|
776
776
|
let AssetProcessor = AssetProcessor_1 = class AssetProcessor {
|
|
777
|
-
static
|
|
777
|
+
static checkTextFileType(type) {
|
|
778
|
+
return type.mime.indexOf("text") >= 0 || type.mime.indexOf("xml") >= 0;
|
|
779
|
+
}
|
|
780
|
+
static fixTextFileType(type, buffer) {
|
|
781
|
+
const text = buffer.toString("utf8");
|
|
782
|
+
if (text.indexOf("<svg") >= 0) {
|
|
783
|
+
return { ext: "svg", mime: "image/svg+xml" };
|
|
784
|
+
}
|
|
785
|
+
return type;
|
|
786
|
+
}
|
|
787
|
+
static fileTypeFromBuffer(buffer) {
|
|
788
|
+
var _a;
|
|
778
789
|
return __awaiter$u(this, void 0, void 0, function* () {
|
|
779
|
-
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
catch (e) {
|
|
783
|
-
if (!mimeType) {
|
|
784
|
-
throw `Can't determine mime type`;
|
|
785
|
-
}
|
|
786
|
-
console.log(`Can't determine mime type`, e);
|
|
790
|
+
const type = ((_a = yield fromBuffer(buffer)) !== null && _a !== void 0 ? _a : { ext: "txt", mime: "text/plain" });
|
|
791
|
+
if (AssetProcessor_1.checkTextFileType(type)) {
|
|
792
|
+
return AssetProcessor_1.fixTextFileType(type, buffer);
|
|
787
793
|
}
|
|
788
|
-
return
|
|
794
|
+
return type;
|
|
789
795
|
});
|
|
790
796
|
}
|
|
791
797
|
static extractFontFormat(font) {
|
|
@@ -823,12 +829,12 @@ let AssetProcessor = AssetProcessor_1 = class AssetProcessor {
|
|
|
823
829
|
metadata[prop] = font[prop];
|
|
824
830
|
});
|
|
825
831
|
}
|
|
826
|
-
process(buffer, metadata,
|
|
832
|
+
process(buffer, metadata, fileType) {
|
|
827
833
|
return __awaiter$u(this, void 0, void 0, function* () {
|
|
828
|
-
if (AssetProcessor_1.isImage(
|
|
834
|
+
if (AssetProcessor_1.isImage(fileType.mime)) {
|
|
829
835
|
buffer = yield AssetProcessor_1.copyImageMeta(buffer, metadata);
|
|
830
836
|
}
|
|
831
|
-
if (AssetProcessor_1.isFont(
|
|
837
|
+
if (AssetProcessor_1.isFont(fileType.mime)) {
|
|
832
838
|
AssetProcessor_1.copyFontMeta(buffer, metadata);
|
|
833
839
|
}
|
|
834
840
|
return buffer;
|
|
@@ -1171,56 +1177,37 @@ let Assets = class Assets {
|
|
|
1171
1177
|
}
|
|
1172
1178
|
write(stream, contentType = null, metadata = null) {
|
|
1173
1179
|
return __awaiter$q(this, void 0, void 0, function* () {
|
|
1174
|
-
let extension = null;
|
|
1175
|
-
const fileTypeStream = copyStream(stream);
|
|
1176
1180
|
const uploadStream = copyStream(stream);
|
|
1181
|
+
const buffer = yield streamToBuffer(stream);
|
|
1182
|
+
let fileType = { ext: "", mime: contentType };
|
|
1177
1183
|
try {
|
|
1178
|
-
|
|
1179
|
-
contentType = fileType.mime;
|
|
1180
|
-
extension = fileType.ext;
|
|
1184
|
+
fileType = yield AssetProcessor.fileTypeFromBuffer(buffer);
|
|
1181
1185
|
}
|
|
1182
1186
|
catch (e) {
|
|
1183
|
-
if (!
|
|
1184
|
-
throw `Can't determine
|
|
1187
|
+
if (!fileType.mime) {
|
|
1188
|
+
throw `Can't determine mime type`;
|
|
1185
1189
|
}
|
|
1186
|
-
console.log(`Can't determine
|
|
1190
|
+
console.log(`Can't determine mime type`, e);
|
|
1187
1191
|
}
|
|
1188
|
-
|
|
1189
|
-
|
|
1190
|
-
metadata = Object.assign({
|
|
1191
|
-
extension,
|
|
1192
|
-
downloadCount: 0,
|
|
1193
|
-
firstDownload: null,
|
|
1194
|
-
lastDownload: null
|
|
1195
|
-
}, metadata || {});
|
|
1196
|
-
metadata.filename = metadata.filename || new ObjectId().toHexString();
|
|
1197
|
-
return new Promise(((resolve, reject) => {
|
|
1198
|
-
const uploaderStream = this.bucket.openUploadStream(metadata.filename);
|
|
1199
|
-
uploadStream.pipe(uploaderStream)
|
|
1200
|
-
.on("error", error => {
|
|
1201
|
-
reject(error.message || error);
|
|
1202
|
-
})
|
|
1203
|
-
.on("finish", () => {
|
|
1204
|
-
const asset = new Asset(uploaderStream.id, {
|
|
1205
|
-
filename: metadata.filename,
|
|
1206
|
-
contentType,
|
|
1207
|
-
metadata
|
|
1208
|
-
}, this.collection, this.bucket);
|
|
1209
|
-
asset.save().then(() => {
|
|
1210
|
-
resolve(asset);
|
|
1211
|
-
}, error => {
|
|
1212
|
-
reject(error.message || error);
|
|
1213
|
-
});
|
|
1214
|
-
});
|
|
1215
|
-
}));
|
|
1192
|
+
metadata = metadata || {};
|
|
1193
|
+
return this.upload(uploadStream, fileType, metadata);
|
|
1216
1194
|
});
|
|
1217
1195
|
}
|
|
1218
1196
|
writeBuffer(buffer, metadata = null, contentType = null) {
|
|
1219
1197
|
return __awaiter$q(this, void 0, void 0, function* () {
|
|
1220
|
-
|
|
1198
|
+
let fileType = { ext: "", mime: contentType };
|
|
1199
|
+
try {
|
|
1200
|
+
fileType = yield AssetProcessor.fileTypeFromBuffer(buffer);
|
|
1201
|
+
}
|
|
1202
|
+
catch (e) {
|
|
1203
|
+
if (!fileType.mime) {
|
|
1204
|
+
throw `Can't determine mime type`;
|
|
1205
|
+
}
|
|
1206
|
+
console.log(`Can't determine mime type`, e);
|
|
1207
|
+
}
|
|
1221
1208
|
metadata = metadata || {};
|
|
1222
|
-
buffer = yield this.assetProcessor.process(buffer, metadata,
|
|
1223
|
-
return this.
|
|
1209
|
+
buffer = yield this.assetProcessor.process(buffer, metadata, fileType);
|
|
1210
|
+
return this.upload(bufferToStream(buffer), fileType, metadata);
|
|
1224
1211
|
});
|
|
1225
1212
|
}
|
|
1226
1213
|
writeUrl(url, metadata = null) {
|
|
@@ -1231,7 +1218,7 @@ let Assets = class Assets {
|
|
|
1231
1218
|
}
|
|
1232
1219
|
read(id) {
|
|
1233
1220
|
return __awaiter$q(this, void 0, void 0, function* () {
|
|
1234
|
-
return this.find({ _id: new ObjectId(id) });
|
|
1221
|
+
return !id ? null : this.find({ _id: new ObjectId(id) });
|
|
1235
1222
|
});
|
|
1236
1223
|
}
|
|
1237
1224
|
find(where) {
|
|
@@ -1261,6 +1248,38 @@ let Assets = class Assets {
|
|
|
1261
1248
|
return asset.unlink();
|
|
1262
1249
|
});
|
|
1263
1250
|
}
|
|
1251
|
+
upload(stream, fileType, metadata) {
|
|
1252
|
+
return __awaiter$q(this, void 0, void 0, function* () {
|
|
1253
|
+
const contentType = fileType.mime.trim();
|
|
1254
|
+
const extension = (fileType.ext || "").trim();
|
|
1255
|
+
metadata = Object.assign({
|
|
1256
|
+
extension,
|
|
1257
|
+
downloadCount: 0,
|
|
1258
|
+
firstDownload: null,
|
|
1259
|
+
lastDownload: null
|
|
1260
|
+
}, metadata || {});
|
|
1261
|
+
metadata.filename = metadata.filename || new ObjectId().toHexString();
|
|
1262
|
+
return new Promise(((resolve, reject) => {
|
|
1263
|
+
const uploaderStream = this.bucket.openUploadStream(metadata.filename);
|
|
1264
|
+
stream.pipe(uploaderStream)
|
|
1265
|
+
.on("error", error => {
|
|
1266
|
+
reject(error.message || error);
|
|
1267
|
+
})
|
|
1268
|
+
.on("finish", () => {
|
|
1269
|
+
const asset = new Asset(uploaderStream.id, {
|
|
1270
|
+
filename: metadata.filename,
|
|
1271
|
+
contentType,
|
|
1272
|
+
metadata
|
|
1273
|
+
}, this.collection, this.bucket);
|
|
1274
|
+
asset.save().then(() => {
|
|
1275
|
+
resolve(asset);
|
|
1276
|
+
}, error => {
|
|
1277
|
+
reject(error.message || error);
|
|
1278
|
+
});
|
|
1279
|
+
});
|
|
1280
|
+
}));
|
|
1281
|
+
});
|
|
1282
|
+
}
|
|
1264
1283
|
};
|
|
1265
1284
|
Assets = __decorate$t([
|
|
1266
1285
|
injectable(),
|
|
@@ -1312,13 +1331,13 @@ class LazyAsset extends BaseEntity {
|
|
|
1312
1331
|
this.load().then(() => {
|
|
1313
1332
|
if (this.deleted)
|
|
1314
1333
|
return;
|
|
1315
|
-
|
|
1316
|
-
|
|
1317
|
-
|
|
1318
|
-
|
|
1319
|
-
|
|
1320
|
-
|
|
1321
|
-
});
|
|
1334
|
+
this.progresses.get(this.progressId).then(p => {
|
|
1335
|
+
p === null || p === void 0 ? void 0 : p.cancel();
|
|
1336
|
+
});
|
|
1337
|
+
this.startWorkingOnAsset().then(() => {
|
|
1338
|
+
console.log(`Started working on lazy asset: ${this.id}`);
|
|
1339
|
+
}).catch(reason => {
|
|
1340
|
+
console.log(`Can't start working on lazy asset: ${this.id}\nReason: ${reason}`);
|
|
1322
1341
|
});
|
|
1323
1342
|
});
|
|
1324
1343
|
}
|
|
@@ -1347,8 +1366,8 @@ class LazyAsset extends BaseEntity {
|
|
|
1347
1366
|
}
|
|
1348
1367
|
startWorkingOnAsset() {
|
|
1349
1368
|
return __awaiter$p(this, void 0, void 0, function* () {
|
|
1350
|
-
|
|
1351
|
-
this.data.
|
|
1369
|
+
this.data.progressId = (yield this.progresses.create()).id;
|
|
1370
|
+
this.data.assetId = null;
|
|
1352
1371
|
yield this.save();
|
|
1353
1372
|
yield this.jobMan.enqueueWithName(this.data.jobName, Object.assign(Object.assign({}, this.data.jobParams), { lazyId: this.id }));
|
|
1354
1373
|
});
|
|
@@ -1797,7 +1816,7 @@ let Progresses = class Progresses {
|
|
|
1797
1816
|
}
|
|
1798
1817
|
get(id) {
|
|
1799
1818
|
return __awaiter$m(this, void 0, void 0, function* () {
|
|
1800
|
-
return this.find({ _id: new ObjectId(id) });
|
|
1819
|
+
return !id ? null : this.find({ _id: new ObjectId(id) });
|
|
1801
1820
|
});
|
|
1802
1821
|
}
|
|
1803
1822
|
find(where) {
|
|
@@ -1878,7 +1897,7 @@ let LazyAssets = class LazyAssets {
|
|
|
1878
1897
|
}
|
|
1879
1898
|
read(id) {
|
|
1880
1899
|
return __awaiter$l(this, void 0, void 0, function* () {
|
|
1881
|
-
return this.find({ _id: new ObjectId(id) });
|
|
1900
|
+
return !id ? null : this.find({ _id: new ObjectId(id) });
|
|
1882
1901
|
});
|
|
1883
1902
|
}
|
|
1884
1903
|
find(where) {
|
|
@@ -2893,6 +2912,9 @@ let AssetsController = class AssetsController {
|
|
|
2893
2912
|
if (ext) {
|
|
2894
2913
|
res.header("content-disposition", `inline; filename=${asset.filename}.${ext}`);
|
|
2895
2914
|
}
|
|
2915
|
+
if (asset.contentType) {
|
|
2916
|
+
res.header("content-type", asset.contentType);
|
|
2917
|
+
}
|
|
2896
2918
|
return asset.download();
|
|
2897
2919
|
});
|
|
2898
2920
|
}
|