@resolveio/server-lib 5.2.8 → 5.2.9
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/methods/aws.js +38 -27
- package/methods/pdf.js +6 -1
- package/package.json +1 -1
package/methods/aws.js
CHANGED
|
@@ -65,34 +65,45 @@ function loadAWSMethods(methodManager) {
|
|
|
65
65
|
function: function (fileName, fileData, fileSize, fileOrder, fileType) {
|
|
66
66
|
var _this = this;
|
|
67
67
|
var that = this;
|
|
68
|
-
return new Promise(function (resolve, reject) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
if (
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
68
|
+
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
69
|
+
var key_1, file, newParams;
|
|
70
|
+
return __generator(this, function (_a) {
|
|
71
|
+
if (fileName) {
|
|
72
|
+
key_1 = 'uploads/' + Date.now() + '-' + (pdfCnt++) + '-' + fileName;
|
|
73
|
+
if (fileData.split(',')[0].split(':')[1].split(';')[0] === 'application/pdf') {
|
|
74
|
+
file = {
|
|
75
|
+
_id: mongoose_1.Types.ObjectId().toHexString(),
|
|
76
|
+
__v: 0,
|
|
77
|
+
name: fileName,
|
|
78
|
+
size: fileSize,
|
|
79
|
+
key: key_1,
|
|
80
|
+
order: fileOrder,
|
|
81
|
+
type: fileType
|
|
82
|
+
};
|
|
83
|
+
file_collection_1.Files.create(file).then(function (resFile) {
|
|
84
|
+
resolve(resFile);
|
|
85
|
+
}, function (errFile) { return reject(errFile); });
|
|
86
|
+
this.callMethodInternal.call(this, 'compressAndUploadPDF', file._id, fileName, key_1, fileData.replace('data:' + fileData.split(',')[0].split(':')[1].split(';')[0] + ';base64,', ''));
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
newParams = { Bucket: that.serverConfig.AWSBUCKET, Key: key_1, Body: Buffer.from(fileData.replace('data:' + fileData.split(',')[0].split(':')[1].split(';')[0] + ';base64,', ''), 'base64'), ACL: 'private', ContentType: fileData.split(',')[0].split(':')[1].split(';')[0], ContentDisposition: 'inline' };
|
|
90
|
+
that.getAWS().upload(newParams, function (err, res) {
|
|
91
|
+
if (err) {
|
|
92
|
+
reject(err);
|
|
93
|
+
}
|
|
94
|
+
else if (res) {
|
|
95
|
+
file_collection_1.Files.create({
|
|
96
|
+
_id: mongoose_1.Types.ObjectId().toHexString(), __v: 0, name: fileName, size: fileSize, key: key_1, order: fileOrder, type: fileType
|
|
97
|
+
}).then(function (resFile) {
|
|
98
|
+
resolve(resFile);
|
|
99
|
+
}, function (errFile) { return reject(errFile); });
|
|
100
|
+
}
|
|
101
|
+
});
|
|
102
|
+
}
|
|
93
103
|
}
|
|
94
|
-
|
|
95
|
-
|
|
104
|
+
return [2 /*return*/];
|
|
105
|
+
});
|
|
106
|
+
}); });
|
|
96
107
|
}
|
|
97
108
|
},
|
|
98
109
|
uploadNonPDFFileAndSave: {
|
package/methods/pdf.js
CHANGED
|
@@ -4,6 +4,7 @@ var fs = require('fs');
|
|
|
4
4
|
var request = require("request");
|
|
5
5
|
var mongoose_1 = require("mongoose");
|
|
6
6
|
var simpl_schema_1 = require("simpl-schema");
|
|
7
|
+
var file_collection_1 = require("../collections/file.collection");
|
|
7
8
|
var pdfCnt = 0;
|
|
8
9
|
function loadPDFMethods(methodManager) {
|
|
9
10
|
methodManager.methods({
|
|
@@ -122,6 +123,9 @@ function loadPDFMethods(methodManager) {
|
|
|
122
123
|
compressAndUploadPDF: {
|
|
123
124
|
skipQueue: true,
|
|
124
125
|
check: new simpl_schema_1.default({
|
|
126
|
+
id_file: {
|
|
127
|
+
type: String
|
|
128
|
+
},
|
|
125
129
|
fileName: {
|
|
126
130
|
type: String
|
|
127
131
|
},
|
|
@@ -132,7 +136,7 @@ function loadPDFMethods(methodManager) {
|
|
|
132
136
|
type: String
|
|
133
137
|
}
|
|
134
138
|
}),
|
|
135
|
-
function: function (fileName, filePath, fileContent) {
|
|
139
|
+
function: function (id_file, fileName, filePath, fileContent) {
|
|
136
140
|
var _this = this;
|
|
137
141
|
return new Promise(function (resolve, reject) {
|
|
138
142
|
_this.callMethodInternal.call(_this, 'getCCProcessURL').then(function (resCC) {
|
|
@@ -163,6 +167,7 @@ function loadPDFMethods(methodManager) {
|
|
|
163
167
|
}, function (error, response, body) {
|
|
164
168
|
if (!error) {
|
|
165
169
|
if (body.output.size) {
|
|
170
|
+
file_collection_1.Files.updateOne({ _id: id_file }, { $set: { size: body.output.size } }).exec();
|
|
166
171
|
resolve();
|
|
167
172
|
}
|
|
168
173
|
else {
|