@etohq/file-tigris 2.0.1 → 2.0.3
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 @@
|
|
|
1
|
-
{"version":3,"file":"tigris-file.d.ts","sourceRoot":"","sources":["../../src/services/tigris-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,QAAQ,EAET,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EACL,SAAS,EACT,MAAM,EACN,wBAAwB,EACzB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,
|
|
1
|
+
{"version":3,"file":"tigris-file.d.ts","sourceRoot":"","sources":["../../src/services/tigris-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,QAAQ,EAET,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EACL,SAAS,EACT,MAAM,EACN,wBAAwB,EACzB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,2BAA2B,EAAY,MAAM,wBAAwB,CAAA;AAE9E,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,KAAK,oBAAoB,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,UAAU,uBAAuB;IAC/B,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,MAAM,CAAA;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACjD;AAMD,qBAAa,iBAAkB,SAAQ,2BAA2B;IAChE,MAAM,CAAC,UAAU,SAAW;IAE5B,SAAS,CAAC,OAAO,EAAE,uBAAuB,CAAA;IAC1C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAA;gBAGzB,EAAE,MAAM,EAAE,EAAE,oBAAoB,EAChC,OAAO,EAAE,wBAAwB;IA0CnC,SAAS,CAAC,SAAS;IAgBb,MAAM,CACV,IAAI,EAAE,SAAS,CAAC,qBAAqB,GACpC,OAAO,CAAC,SAAS,CAAC,qBAAqB,CAAC;IAyCrC,MAAM,CACV,KAAK,EAAE,SAAS,CAAC,qBAAqB,GAAG,SAAS,CAAC,qBAAqB,EAAE,GACzE,OAAO,CAAC,IAAI,CAAC;IAgCV,uBAAuB,CAC3B,QAAQ,EAAE,SAAS,CAAC,kBAAkB,GACrC,OAAO,CAAC,MAAM,CAAC;IAWZ,qBAAqB,CACzB,QAAQ,EAAE,SAAS,CAAC,gCAAgC,GACnD,OAAO,CAAC,SAAS,CAAC,qBAAqB,CAAC;IAyCrC,iBAAiB,CACrB,IAAI,EAAE,SAAS,CAAC,kBAAkB,GACjC,OAAO,CAAC,QAAQ,CAAC;IAed,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;CAcvE"}
|
|
@@ -107,6 +107,11 @@ class TigrisFileService extends utils_1.AbstractFileProviderService {
|
|
|
107
107
|
}
|
|
108
108
|
catch (e) {
|
|
109
109
|
this.logger_.error(e);
|
|
110
|
+
// Rethrow, as the S3 provider does. Swallowing here made a failed delete
|
|
111
|
+
// indistinguishable from a successful one, so callers that delete an
|
|
112
|
+
// object and then remove the row naming it could not tell that the
|
|
113
|
+
// object was still there, and would drop the only record of it.
|
|
114
|
+
throw e;
|
|
110
115
|
}
|
|
111
116
|
}
|
|
112
117
|
async getPresignedDownloadUrl(fileData) {
|
|
@@ -135,10 +140,21 @@ class TigrisFileService extends utils_1.AbstractFileProviderService {
|
|
|
135
140
|
});
|
|
136
141
|
const signedUrl = await (0, s3_request_presigner_1.getSignedUrl)(this.client_, command, {
|
|
137
142
|
expiresIn: fileData.expiresIn ?? DEFAULT_UPLOAD_EXPIRATION_DURATION_SECONDS,
|
|
143
|
+
// The presigner hoists `x-amz-*` headers into the query string by
|
|
144
|
+
// default, and Tigris ignores the ACL there: the client then uploads a
|
|
145
|
+
// private object even though it asked for a public one, and the returned
|
|
146
|
+
// URL 403s. Keeping it unhoisted leaves it a signed header, which is
|
|
147
|
+
// honoured — and which the client must therefore send.
|
|
148
|
+
...(acl ? { unhoistableHeaders: new Set(["x-amz-acl"]) } : {}),
|
|
138
149
|
});
|
|
139
150
|
return {
|
|
140
151
|
url: signedUrl,
|
|
141
152
|
key: fileKey,
|
|
153
|
+
headers: {
|
|
154
|
+
...(fileData.mimeType ? { "Content-Type": fileData.mimeType } : {}),
|
|
155
|
+
// Signed above, so the client must send it for the upload to succeed.
|
|
156
|
+
...(acl ? { "x-amz-acl": acl } : {}),
|
|
157
|
+
},
|
|
142
158
|
};
|
|
143
159
|
}
|
|
144
160
|
async getDownloadStream(file) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tigris-file.js","sourceRoot":"","sources":["../../src/services/tigris-file.ts"],"names":[],"mappings":";;;;;;AAAA,kDAQ2B;AAC3B,wEAA4D;AAM5D,
|
|
1
|
+
{"version":3,"file":"tigris-file.js","sourceRoot":"","sources":["../../src/services/tigris-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../src/index.ts","../src/services/tigris-file.ts"],"version":"5.8.3"}
|
|
1
|
+
{"root":["../src/index.ts","../src/services/tigris-file.ts","../src/services/__tests__/tigris-file.spec.ts"],"version":"5.8.3"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@etohq/file-tigris",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.3",
|
|
4
4
|
"description": "Tigris object storage file provider for Eto",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -20,14 +20,14 @@
|
|
|
20
20
|
"author": "Eto",
|
|
21
21
|
"license": "MIT",
|
|
22
22
|
"devDependencies": {
|
|
23
|
+
"@etohq/framework": "2.0.4",
|
|
23
24
|
"@swc/core": "1.7.28",
|
|
24
25
|
"@swc/jest": "0.2.36",
|
|
25
26
|
"axios": "1.7.7",
|
|
26
27
|
"jest": "29.7.0",
|
|
27
28
|
"rimraf": "5.0.2",
|
|
28
29
|
"tsc-alias": "1.8.6",
|
|
29
|
-
"typescript": "5.8.3"
|
|
30
|
-
"@etohq/framework": "2.0.1"
|
|
30
|
+
"typescript": "5.8.3"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@aws-sdk/client-s3": "3.556.0",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"ulid": "2.3.0"
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
|
-
"@etohq/framework": "2.0.
|
|
39
|
+
"@etohq/framework": "2.0.4"
|
|
40
40
|
},
|
|
41
41
|
"keywords": [
|
|
42
42
|
"eto-plugin",
|