@e-mc/cloud 0.0.1 → 0.0.2
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/aws/download/index.js +1 -1
- package/aws/index.js +4 -4
- package/aws/upload/index.js +2 -2
- package/aws-v3/download/index.js +1 -1
- package/aws-v3/index.js +4 -4
- package/aws-v3/upload/index.js +2 -2
- package/azure/download/index.js +1 -1
- package/azure/index.js +1 -1
- package/azure/upload/index.js +2 -2
- package/gcp/download/index.js +1 -1
- package/gcp/index.js +6 -6
- package/gcp/upload/index.js +3 -3
- package/index.js +18 -8
- package/minio/download/index.js +1 -1
- package/minio/index.js +3 -3
- package/minio/upload/index.js +2 -2
- package/package.json +3 -3
package/aws/download/index.js
CHANGED
|
@@ -22,7 +22,7 @@ function download(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
|
|
|
22
22
|
if (deleteObject) {
|
|
23
23
|
s3.deleteObject((0, types_1.isPlainObject)(deleteObject) ? Object.assign(deleteObject, params) : params, error => {
|
|
24
24
|
if (!error) {
|
|
25
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /*
|
|
25
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /* VAL_CLOUD.DELETE_FILE */, location, { ...index_2.default.LOG_CLOUD_DELETE });
|
|
26
26
|
}
|
|
27
27
|
else {
|
|
28
28
|
this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, location], error, { ...index_2.default.LOG_CLOUD_FAIL, fatal: !!target.active });
|
package/aws/index.js
CHANGED
|
@@ -189,7 +189,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws', sdk =
|
|
|
189
189
|
}
|
|
190
190
|
return S3.createBucket(input).promise()
|
|
191
191
|
.then(async () => {
|
|
192
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket created" /*
|
|
192
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket created" /* VAL_CLOUD.CREATE_BUCKET */, Bucket], '', { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
193
193
|
if (ACL) {
|
|
194
194
|
await setCannedAcl.call(this, S3, Bucket, ACL, service);
|
|
195
195
|
}
|
|
@@ -220,7 +220,7 @@ function setBucketPolicy(credential, Bucket, options, service = 'aws', sdk = 'aw
|
|
|
220
220
|
}
|
|
221
221
|
return ('Policy' in options && (0, types_1.isString)(options.Policy) && service !== 'ibm' ? S3.putBucketPolicy(options) : S3.putBucketAcl(options)).promise()
|
|
222
222
|
.then(() => {
|
|
223
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket policy configured" /*
|
|
223
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket policy configured" /* VAL_CLOUD.POLICY_BUCKET */, Bucket], '', { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
224
224
|
return true;
|
|
225
225
|
})
|
|
226
226
|
.catch(err => {
|
|
@@ -242,7 +242,7 @@ function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'a
|
|
|
242
242
|
}
|
|
243
243
|
return S3.putBucketWebsite({ Bucket, WebsiteConfiguration }).promise()
|
|
244
244
|
.then(() => {
|
|
245
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /*
|
|
245
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */, Bucket], WebsiteConfiguration, { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
246
246
|
return true;
|
|
247
247
|
})
|
|
248
248
|
.catch(err => {
|
|
@@ -270,7 +270,7 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = '
|
|
|
270
270
|
.then(data => {
|
|
271
271
|
if ((0, types_1.isArray)(data.Deleted)) {
|
|
272
272
|
const files = data.Deleted.length + ' files';
|
|
273
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket emptied" /*
|
|
273
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket emptied" /* VAL_CLOUD.EMPTY_BUCKET */ + ` (${recursive ? 'recursive' : files})`, Bucket], recursive ? files : '', { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
274
274
|
}
|
|
275
275
|
})
|
|
276
276
|
.catch(err => {
|
package/aws/upload/index.js
CHANGED
|
@@ -56,7 +56,7 @@ function upload(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
|
|
|
56
56
|
});
|
|
57
57
|
} while (exists && ++i);
|
|
58
58
|
if (i > 0) {
|
|
59
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /*
|
|
59
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /* VAL_CLOUD.RENAME_FILE */, current], filename, { ...index_2.default.LOG_CLOUD_WARN });
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
if (pathname) {
|
|
@@ -113,7 +113,7 @@ function upload(credential, service = 'aws', sdk = 'aws-sdk/clients/s3') {
|
|
|
113
113
|
s3.upload(params, (err, result) => {
|
|
114
114
|
if (!err) {
|
|
115
115
|
const url = endpoint ? module_1.default.joinPath(endpoint, result.Key) : result.Location;
|
|
116
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /*
|
|
116
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /* VAL_CLOUD.UPLOAD_FILE */, url, { ...index_2.default.LOG_CLOUD_UPLOAD });
|
|
117
117
|
if (first) {
|
|
118
118
|
cleanup();
|
|
119
119
|
callback(null, url);
|
package/aws-v3/download/index.js
CHANGED
|
@@ -27,7 +27,7 @@ function download(config, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
|
|
|
27
27
|
input = Object.assign(deleteObject, input);
|
|
28
28
|
}
|
|
29
29
|
client.send(new AWS.DeleteObjectCommand(input))
|
|
30
|
-
.then(() => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /*
|
|
30
|
+
.then(() => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /* VAL_CLOUD.DELETE_FILE */, location, { ...index_2.default.LOG_CLOUD_DELETE }))
|
|
31
31
|
.catch(err => this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, location], err, { ...index_2.default.LOG_CLOUD_FAIL, fatal: !!target.active }));
|
|
32
32
|
}
|
|
33
33
|
})
|
package/aws-v3/index.js
CHANGED
|
@@ -117,7 +117,7 @@ function createBucketV2(credential, Bucket, ACL, options, service = 'aws-v3', sd
|
|
|
117
117
|
}
|
|
118
118
|
return client.send(new AWS.CreateBucketCommand(input))
|
|
119
119
|
.then(async () => {
|
|
120
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket created" /*
|
|
120
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket created" /* VAL_CLOUD.CREATE_BUCKET */, Bucket], '', { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
121
121
|
if (ACL) {
|
|
122
122
|
await setCannedAcl.call(this, AWS, client, Bucket, ACL, service);
|
|
123
123
|
}
|
|
@@ -145,7 +145,7 @@ function setBucketPolicy(credential, Bucket, options, service = 'aws', sdk = 'aw
|
|
|
145
145
|
options.Bucket = Bucket;
|
|
146
146
|
return (policy ? client.send(new AWS.PutBucketPolicyCommand(options)) : client.send(new AWS.PutBucketAclCommand(options)))
|
|
147
147
|
.then(() => {
|
|
148
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, [policy ? "Bucket policy configured" /*
|
|
148
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, [policy ? "Bucket policy configured" /* VAL_CLOUD.POLICY_BUCKET */ : "Bucket ACL configured" /* VAL_CLOUD.ACL_BUCKET */, Bucket], '', { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
149
149
|
return true;
|
|
150
150
|
})
|
|
151
151
|
.catch(err => {
|
|
@@ -167,7 +167,7 @@ function setBucketWebsite(credential, Bucket, options, service = 'aws', sdk = 'a
|
|
|
167
167
|
}
|
|
168
168
|
return client.send(new AWS.PutBucketWebsiteCommand({ Bucket, WebsiteConfiguration }))
|
|
169
169
|
.then(() => {
|
|
170
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /*
|
|
170
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */, Bucket], WebsiteConfiguration, { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
171
171
|
return true;
|
|
172
172
|
})
|
|
173
173
|
.catch(err => {
|
|
@@ -195,7 +195,7 @@ async function deleteObjectsV2(credential, Bucket, recursive = true, service = '
|
|
|
195
195
|
.then(data => {
|
|
196
196
|
if ((0, types_1.isArray)(data.Deleted)) {
|
|
197
197
|
const files = data.Deleted.length + ' files';
|
|
198
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket emptied" /*
|
|
198
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket emptied" /* VAL_CLOUD.EMPTY_BUCKET */ + ` (${recursive ? 'recursive' : files})`, Bucket], recursive ? files : '', { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
199
199
|
}
|
|
200
200
|
})
|
|
201
201
|
.catch(err => {
|
package/aws-v3/upload/index.js
CHANGED
|
@@ -60,7 +60,7 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
|
|
|
60
60
|
});
|
|
61
61
|
} while (exists && ++i);
|
|
62
62
|
if (i > 0) {
|
|
63
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /*
|
|
63
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /* VAL_CLOUD.RENAME_FILE */, current], filename, { ...index_3.default.LOG_CLOUD_WARN });
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
if (pathname) {
|
|
@@ -136,7 +136,7 @@ function upload(credential, service = 'aws-v3', sdk = '@aws-sdk/client-s3') {
|
|
|
136
136
|
cleanup();
|
|
137
137
|
callback(null, url);
|
|
138
138
|
}
|
|
139
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /*
|
|
139
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /* VAL_CLOUD.UPLOAD_FILE */, url, { ...index_3.default.LOG_CLOUD_UPLOAD });
|
|
140
140
|
})
|
|
141
141
|
.catch(err => {
|
|
142
142
|
if (first) {
|
package/azure/download/index.js
CHANGED
|
@@ -21,7 +21,7 @@ function download(credential, service = 'azure') {
|
|
|
21
21
|
const deleteObject = target.deleteObject;
|
|
22
22
|
if (target.deleteObject) {
|
|
23
23
|
blobClient.delete((0, types_1.isPlainObject)(deleteObject) && (deleteObject.abortSignal = this.signal) ? deleteObject : undefined)
|
|
24
|
-
.then(() => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /*
|
|
24
|
+
.then(() => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /* VAL_CLOUD.DELETE_FILE */, location, { ...index_2.default.LOG_CLOUD_DELETE }))
|
|
25
25
|
.catch((err) => {
|
|
26
26
|
if (!(err instanceof Error && err.code === 'BlobNotFound')) {
|
|
27
27
|
this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, location], err, { ...index_2.default.LOG_CLOUD_FAIL, fatal: !!target.active });
|
package/azure/index.js
CHANGED
|
@@ -119,7 +119,7 @@ function setBucketWebsite(credential, bucket, options, service = 'azure') {
|
|
|
119
119
|
}
|
|
120
120
|
return createStorageClient.call(this, credential).setProperties({ staticWebsite })
|
|
121
121
|
.then(() => {
|
|
122
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /*
|
|
122
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */, bucket], options, { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
123
123
|
return true;
|
|
124
124
|
})
|
|
125
125
|
.catch(err => {
|
package/azure/upload/index.js
CHANGED
|
@@ -58,7 +58,7 @@ function upload(credential, service = 'azure') {
|
|
|
58
58
|
}
|
|
59
59
|
} while (exists && ++i);
|
|
60
60
|
if (i > 0) {
|
|
61
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /*
|
|
61
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /* VAL_CLOUD.RENAME_FILE */, current], filename, { ...index_2.default.LOG_CLOUD_WARN });
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
catch (err) {
|
|
@@ -99,7 +99,7 @@ function upload(credential, service = 'azure') {
|
|
|
99
99
|
.then(result => {
|
|
100
100
|
let requestUrl = result._response.request.url;
|
|
101
101
|
const url = endpoint ? module_1.default.joinPath(endpoint, blobName) : module_1.default.isFile(requestUrl = decodeURIComponent(requestUrl), 'http/s') ? requestUrl : module_1.default.joinPath(`https://${credential.accountName}.blob.core.windows.net`, bucket, blobName);
|
|
102
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /*
|
|
102
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /* VAL_CLOUD.UPLOAD_FILE */, url, { ...index_2.default.LOG_CLOUD_UPLOAD });
|
|
103
103
|
if (first) {
|
|
104
104
|
cleanup();
|
|
105
105
|
callback(null, url);
|
package/gcp/download/index.js
CHANGED
|
@@ -30,7 +30,7 @@ function download(credential, service = 'gcp') {
|
|
|
30
30
|
}
|
|
31
31
|
const location = module_1.default.joinPath(Bucket, Key);
|
|
32
32
|
const destination = path.join(tempDir, path.basename(Key));
|
|
33
|
-
const deleteMessage = () => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /*
|
|
33
|
+
const deleteMessage = () => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /* VAL_CLOUD.DELETE_FILE */, location, { ...index_2.default.LOG_CLOUD_DELETE });
|
|
34
34
|
if (firebase) {
|
|
35
35
|
const { ref, getDownloadURL, deleteObject } = require('@firebase/storage');
|
|
36
36
|
const objectRef = ref(storage, Key);
|
package/gcp/index.js
CHANGED
|
@@ -184,7 +184,7 @@ async function createBucketV2(credential, bucket, acl, options, service = 'gcp')
|
|
|
184
184
|
}
|
|
185
185
|
return storage.createBucket(bucket, options)
|
|
186
186
|
.then(async ([target]) => {
|
|
187
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket created" /*
|
|
187
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket created" /* VAL_CLOUD.CREATE_BUCKET */, bucket], '', { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
188
188
|
if (acl) {
|
|
189
189
|
await setBucketPolicy.call(this, credential, bucket, { acl, bucket: target }, service);
|
|
190
190
|
}
|
|
@@ -249,7 +249,7 @@ async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
|
|
|
249
249
|
this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to update bucket policy" /* ERR_CLOUD.POLICY_BUCKET */, bucket], errors[0], { ...index_1.default.LOG_CLOUD_FAIL, fatal: false });
|
|
250
250
|
return false;
|
|
251
251
|
}
|
|
252
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket ACL configured" /*
|
|
252
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket ACL configured" /* VAL_CLOUD.ACL_BUCKET */, bucket], (0, types_1.isString)(acl) ? acl : '', { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
253
253
|
return true;
|
|
254
254
|
}
|
|
255
255
|
exports.setBucketPolicy = setBucketPolicy;
|
|
@@ -266,7 +266,7 @@ function setBucketWebsite(credential, bucket, options, service = 'gcp') {
|
|
|
266
266
|
}
|
|
267
267
|
return createStorageClient.call(this, credential, bucket).bucket(bucket).setMetadata({ website })
|
|
268
268
|
.then(() => {
|
|
269
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /*
|
|
269
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */, bucket], website, { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
270
270
|
return true;
|
|
271
271
|
})
|
|
272
272
|
.catch(err => {
|
|
@@ -310,7 +310,7 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
|
|
|
310
310
|
const client = storage.bucket(bucket);
|
|
311
311
|
if (await hasBucket(client)) {
|
|
312
312
|
if (recursive) {
|
|
313
|
-
return client.deleteFiles({ force: true }).then(() => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Bucket emptied" /*
|
|
313
|
+
return client.deleteFiles({ force: true }).then(() => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Bucket emptied" /* VAL_CLOUD.EMPTY_BUCKET */ + ' (recursive)', bucket, { ...index_1.default.LOG_CLOUD_COMMAND }));
|
|
314
314
|
}
|
|
315
315
|
const tasks = [];
|
|
316
316
|
try {
|
|
@@ -341,7 +341,7 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
|
|
|
341
341
|
errors.push(...result.filter(item => item.status === 'rejected').map((item) => item.reason));
|
|
342
342
|
if (!checkErrors()) {
|
|
343
343
|
const files = result.length + ' files';
|
|
344
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket emptied" /*
|
|
344
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket emptied" /* VAL_CLOUD.EMPTY_BUCKET */ + ` (${recursive ? 'recursive' : files})`, bucket], recursive ? files : '', { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
345
345
|
}
|
|
346
346
|
})
|
|
347
347
|
.catch(err => {
|
|
@@ -662,7 +662,7 @@ function setPublicRead(acl, pathname, requested, service = 'gcp') {
|
|
|
662
662
|
acl.add({ entity: 'allUsers', role: 'READER' })
|
|
663
663
|
.then(() => {
|
|
664
664
|
if (requested) {
|
|
665
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Grant public-read" /*
|
|
665
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Grant public-read" /* VAL_CLOUD.PUBLIC_READ */, pathname, { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
666
666
|
}
|
|
667
667
|
})
|
|
668
668
|
.catch(err => {
|
package/gcp/upload/index.js
CHANGED
|
@@ -72,7 +72,7 @@ function upload(credential, service = 'gcp') {
|
|
|
72
72
|
}
|
|
73
73
|
} while (exists && ++i);
|
|
74
74
|
if (i > 0) {
|
|
75
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /*
|
|
75
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /* VAL_CLOUD.RENAME_FILE */, current], filename, { ...index_2.default.LOG_CLOUD_WARN });
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
const Key = [filename];
|
|
@@ -123,7 +123,7 @@ function upload(credential, service = 'gcp') {
|
|
|
123
123
|
uploadBytes(ref(bucketClient, destination), Body[i], params)
|
|
124
124
|
.then(() => {
|
|
125
125
|
const url = getURL(destination);
|
|
126
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /*
|
|
126
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /* VAL_CLOUD.UPLOAD_FILE */, url, { ...index_2.default.LOG_CLOUD_UPLOAD });
|
|
127
127
|
if (first) {
|
|
128
128
|
uploadResponse(null, url);
|
|
129
129
|
}
|
|
@@ -204,7 +204,7 @@ function upload(credential, service = 'gcp') {
|
|
|
204
204
|
bucketClient.upload(outputUri, params, (err, file) => {
|
|
205
205
|
if (file) {
|
|
206
206
|
const url = getURL(file.name);
|
|
207
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /*
|
|
207
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /* VAL_CLOUD.UPLOAD_FILE */, url, { ...index_2.default.LOG_CLOUD_UPLOAD });
|
|
208
208
|
if (first) {
|
|
209
209
|
uploadResponse(null, url);
|
|
210
210
|
}
|
package/index.js
CHANGED
|
@@ -235,7 +235,7 @@ class Cloud extends core_1.ClientDb {
|
|
|
235
235
|
this.addDownload(size = value.length);
|
|
236
236
|
}
|
|
237
237
|
this.add(destUri);
|
|
238
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, data.service, ["Download success" /*
|
|
238
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, data.service, ["Download success" /* VAL_CLOUD.DOWNLOAD_FILE */, (0, types_1.formatSize)(size)], destUri, { ...Cloud.LOG_CLOUD_DOWNLOAD });
|
|
239
239
|
result || (result = destUri);
|
|
240
240
|
}
|
|
241
241
|
catch (err) {
|
|
@@ -753,11 +753,10 @@ class Cloud extends core_1.ClientDb {
|
|
|
753
753
|
return (SERVICE_DOWNLOAD[service] || (SERVICE_DOWNLOAD[service] = require(this.resolveService(service, 'download')))).call(this, credential, service);
|
|
754
754
|
}
|
|
755
755
|
resolveService(service, folder) {
|
|
756
|
-
let result
|
|
756
|
+
let result;
|
|
757
757
|
if (service[0] === '@') {
|
|
758
758
|
result = service;
|
|
759
759
|
folder || (folder = 'client');
|
|
760
|
-
sep = '/';
|
|
761
760
|
}
|
|
762
761
|
else {
|
|
763
762
|
switch (service) {
|
|
@@ -768,12 +767,23 @@ class Cloud extends core_1.ClientDb {
|
|
|
768
767
|
service = 'gcp';
|
|
769
768
|
break;
|
|
770
769
|
}
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
770
|
+
switch (service) {
|
|
771
|
+
case 'aws':
|
|
772
|
+
case 'aws-v3':
|
|
773
|
+
case 'azure':
|
|
774
|
+
case 'gcp':
|
|
775
|
+
case 'ibm':
|
|
776
|
+
case 'minio':
|
|
777
|
+
case 'oci':
|
|
778
|
+
result = '@e-mc2/' + service;
|
|
779
|
+
folder || (folder = 'client');
|
|
780
|
+
break;
|
|
781
|
+
default:
|
|
782
|
+
result = service;
|
|
783
|
+
break;
|
|
774
784
|
}
|
|
775
785
|
}
|
|
776
|
-
return result + (folder ?
|
|
786
|
+
return result + (folder ? '/' + folder : '');
|
|
777
787
|
}
|
|
778
788
|
settingsOf(service, name, component) {
|
|
779
789
|
const settings = this.settings;
|
|
@@ -806,7 +816,7 @@ class Cloud extends core_1.ClientDb {
|
|
|
806
816
|
data.ignoreCache ?? (data.ignoreCache = true);
|
|
807
817
|
return this.getDatabaseRows(data, true);
|
|
808
818
|
});
|
|
809
|
-
return items.length === 0 ? Promise.resolve(false) : this.allSettled(items, ["Execute unassigned queries" /*
|
|
819
|
+
return items.length === 0 ? Promise.resolve(false) : this.allSettled(items, ["Execute unassigned queries" /* VAL_DB.EXEC_QUERYUNASSIGNED */, this.moduleName]).then(result => result.length > 0).catch(() => false);
|
|
810
820
|
}
|
|
811
821
|
getClient(service) {
|
|
812
822
|
try {
|
package/minio/download/index.js
CHANGED
|
@@ -22,7 +22,7 @@ function download(credential, service) {
|
|
|
22
22
|
minio.removeObject(bucketName, filename, (0, types_1.isPlainObject)(deleteObject) ? deleteObject : { versionId }, err => {
|
|
23
23
|
const location = module_1.default.joinPath(bucketName, filename);
|
|
24
24
|
if (!err) {
|
|
25
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /*
|
|
25
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /* VAL_CLOUD.DELETE_FILE */, location, { ...index_2.default.LOG_CLOUD_DELETE });
|
|
26
26
|
}
|
|
27
27
|
else {
|
|
28
28
|
this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, location], err, { ...index_2.default.LOG_CLOUD_FAIL, fatal: !!target.active });
|
package/minio/index.js
CHANGED
|
@@ -84,7 +84,7 @@ async function createBucketV2(credential, bucketName, policy) {
|
|
|
84
84
|
if (!exists) {
|
|
85
85
|
return minio.makeBucket(bucketName, credential.region || "us-east-1" /* MINIO.REGION */)
|
|
86
86
|
.then(() => {
|
|
87
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, "minio" /* MINIO.SERVICE */, ["Bucket created" /*
|
|
87
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, "minio" /* MINIO.SERVICE */, ["Bucket created" /* VAL_CLOUD.CREATE_BUCKET */, bucketName], '', { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
88
88
|
if (policy) {
|
|
89
89
|
setBucketPolicy.call(this, credential, bucketName, policy);
|
|
90
90
|
}
|
|
@@ -128,7 +128,7 @@ async function setBucketPolicy(credential, bucketName, bucketPolicy) {
|
|
|
128
128
|
}
|
|
129
129
|
return minio.setBucketPolicy(bucketName, bucketPolicy)
|
|
130
130
|
.then(() => {
|
|
131
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, "minio" /* MINIO.SERVICE */, ["Bucket policy configured" /*
|
|
131
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, "minio" /* MINIO.SERVICE */, ["Bucket policy configured" /* VAL_CLOUD.POLICY_BUCKET */, bucketName], '', { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
132
132
|
return true;
|
|
133
133
|
})
|
|
134
134
|
.catch(err => {
|
|
@@ -162,7 +162,7 @@ async function deleteObjectsV2(credential, bucketName, recursive = true) {
|
|
|
162
162
|
stream.on('end', () => {
|
|
163
163
|
minio.removeObjects(bucketName, items.map(item => item.name), err => {
|
|
164
164
|
if (!err) {
|
|
165
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, "minio" /* MINIO.SERVICE */, ["Bucket emptied" /*
|
|
165
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, "minio" /* MINIO.SERVICE */, ["Bucket emptied" /* VAL_CLOUD.EMPTY_BUCKET */ + ` (${items.length} files)`, bucketName], '', { ...index_1.default.LOG_CLOUD_COMMAND });
|
|
166
166
|
resolve();
|
|
167
167
|
}
|
|
168
168
|
else {
|
package/minio/upload/index.js
CHANGED
|
@@ -58,7 +58,7 @@ function upload(credential, service) {
|
|
|
58
58
|
});
|
|
59
59
|
} while (exists && ++i);
|
|
60
60
|
if (i > 0) {
|
|
61
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /*
|
|
61
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /* VAL_CLOUD.RENAME_FILE */, current], filename, { ...index_2.default.LOG_CLOUD_WARN });
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
const Key = [filename];
|
|
@@ -111,7 +111,7 @@ function upload(credential, service) {
|
|
|
111
111
|
minio.putObject(bucketName, objectName, Body[i], Buffer.byteLength(Body[i]), params, err => {
|
|
112
112
|
if (!err) {
|
|
113
113
|
const url = module_1.default.joinPath(endpoint || module_1.default.joinPath("http://localhost:9000" /* MINIO.SERVER */, bucketName), objectName);
|
|
114
|
-
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /*
|
|
114
|
+
this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /* VAL_CLOUD.UPLOAD_FILE */, url, { ...index_2.default.LOG_CLOUD_UPLOAD });
|
|
115
115
|
if (first) {
|
|
116
116
|
cleanup();
|
|
117
117
|
callback(null, url);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@e-mc/cloud",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.2",
|
|
4
4
|
"description": "Cloud constructor for e-mc.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"types": "index.d.ts",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"license": "BSD 3-Clause",
|
|
21
21
|
"homepage": "https://github.com/anpham6/e-mc#readme",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@e-mc/core": "0.0.
|
|
24
|
-
"@e-mc/db": "0.0.
|
|
23
|
+
"@e-mc/core": "0.0.2",
|
|
24
|
+
"@e-mc/db": "0.0.2"
|
|
25
25
|
}
|
|
26
26
|
}
|