@casual-simulation/aux-records-aws 2.0.24 → 2.0.28
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/DynamoDBFileStore.js +13 -7
- package/DynamoDBFileStore.js.map +1 -1
- package/package.json +3 -3
package/DynamoDBFileStore.js
CHANGED
|
@@ -23,31 +23,37 @@ export class DynamoDBFileStore {
|
|
|
23
23
|
this._s3Host = s3Host;
|
|
24
24
|
}
|
|
25
25
|
presignFileUpload(request) {
|
|
26
|
+
var _a;
|
|
26
27
|
return __awaiter(this, void 0, void 0, function* () {
|
|
27
28
|
const credentials = yield this._getCredentials();
|
|
28
29
|
const secretAccessKey = credentials
|
|
29
30
|
? credentials.secretAccessKey
|
|
30
31
|
: null;
|
|
31
32
|
const accessKeyId = credentials ? credentials.accessKeyId : null;
|
|
32
|
-
const now = new Date();
|
|
33
|
+
const now = (_a = request.date) !== null && _a !== void 0 ? _a : new Date();
|
|
34
|
+
const fileUrl = this._fileUrl(request.recordName, request.fileName);
|
|
33
35
|
const requiredHeaders = {
|
|
34
36
|
'content-type': request.fileMimeType,
|
|
35
37
|
'content-length': request.fileByteLength.toString(),
|
|
36
38
|
'cache-control': 'max-age=31536000',
|
|
37
39
|
'x-amz-acl': 'public-read',
|
|
38
40
|
'x-amz-storage-class': this._storageClass,
|
|
39
|
-
|
|
41
|
+
host: fileUrl.host,
|
|
40
42
|
};
|
|
43
|
+
if (credentials && credentials.sessionToken) {
|
|
44
|
+
requiredHeaders['x-amz-security-token'] =
|
|
45
|
+
credentials.sessionToken;
|
|
46
|
+
}
|
|
41
47
|
const result = signRequest({
|
|
42
48
|
method: 'PUT',
|
|
43
49
|
payloadSha256Hex: request.fileSha256Hex,
|
|
44
50
|
headers: Object.assign(Object.assign({}, request.headers), requiredHeaders),
|
|
45
51
|
queryString: {},
|
|
46
|
-
|
|
52
|
+
path: fileUrl.pathname,
|
|
47
53
|
}, secretAccessKey, accessKeyId, now, this._region, 's3');
|
|
48
54
|
return {
|
|
49
55
|
success: true,
|
|
50
|
-
uploadUrl:
|
|
56
|
+
uploadUrl: fileUrl.href,
|
|
51
57
|
uploadHeaders: result.headers,
|
|
52
58
|
uploadMethod: result.method,
|
|
53
59
|
};
|
|
@@ -67,6 +73,7 @@ export class DynamoDBFileStore {
|
|
|
67
73
|
.promise();
|
|
68
74
|
if (result.Item) {
|
|
69
75
|
const file = result.Item;
|
|
76
|
+
let url = this._fileUrl(file.recordName, file.fileName);
|
|
70
77
|
return {
|
|
71
78
|
success: true,
|
|
72
79
|
recordName: file.recordName,
|
|
@@ -76,7 +83,7 @@ export class DynamoDBFileStore {
|
|
|
76
83
|
subjectId: file.subjectId,
|
|
77
84
|
sizeInBytes: file.sizeInBytes,
|
|
78
85
|
uploaded: file.uploadTime !== null,
|
|
79
|
-
url:
|
|
86
|
+
url: url.href,
|
|
80
87
|
};
|
|
81
88
|
}
|
|
82
89
|
else {
|
|
@@ -200,8 +207,7 @@ export class DynamoDBFileStore {
|
|
|
200
207
|
if (this._s3Host) {
|
|
201
208
|
filePath = `${this._s3Host}/${this._bucket}/${filePath}`;
|
|
202
209
|
}
|
|
203
|
-
return new URL(filePath, `https://${this._bucket}.s3.amazonaws.com`)
|
|
204
|
-
.href;
|
|
210
|
+
return new URL(filePath, `https://${this._bucket}.s3.amazonaws.com`);
|
|
205
211
|
}
|
|
206
212
|
}
|
|
207
213
|
//# sourceMappingURL=DynamoDBFileStore.js.map
|
package/DynamoDBFileStore.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DynamoDBFileStore.js","sourceRoot":"","sources":["DynamoDBFileStore.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAoB,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAQ/E,OAAO,GAAG,MAAM,SAAS,CAAC;AAG1B;;GAEG;AACH,MAAM,OAAO,iBAAiB;IAS1B,YACI,MAAc,EACd,MAAc,EACd,cAAuC,EACvC,SAAiB,EACjB,eAAuB,UAAU,EACjC,MAAkB,GAAG,EACrB,SAAiB,IAAI;QAErB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IAC1B,CAAC;IAEK,iBAAiB,CACnB,OAAiC
|
|
1
|
+
{"version":3,"file":"DynamoDBFileStore.js","sourceRoot":"","sources":["DynamoDBFileStore.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@casual-simulation/aux-records-aws",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.28",
|
|
4
4
|
"description": "AWS Store implementations for the CasualOS Records System.",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Casual Simulation, Inc.",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"access": "public"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@casual-simulation/aux-records": "^2.0.
|
|
41
|
+
"@casual-simulation/aux-records": "^2.0.28"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "e1f6accd3dd4725ad13655550bbab3aa200afdb7"
|
|
44
44
|
}
|