more robust way to add cache-control for s3
This commit is contained in:
parent
3e7e05fc3d
commit
9e29405103
@ -1 +1 @@
|
|||||||
Subproject commit eda77d12e2764123e42cb9fc9dc5c7ed5fec3fde
|
Subproject commit b227202f0e7d012efd93e904f19e145fcc726610
|
||||||
@ -97,11 +97,6 @@ class ObsHttpHandler extends FetchHttpHandler {
|
|||||||
contentType = transformedHeaders["content-type"];
|
contentType = transformedHeaders["content-type"];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (transformedHeaders["cache-control"] === undefined) {
|
|
||||||
// every time is a new request
|
|
||||||
transformedHeaders["cache-control"] = "no-cache";
|
|
||||||
}
|
|
||||||
|
|
||||||
let transformedBody: any = body;
|
let transformedBody: any = body;
|
||||||
if (ArrayBuffer.isView(body)) {
|
if (ArrayBuffer.isView(body)) {
|
||||||
transformedBody = bufferToArrayBuffer(body);
|
transformedBody = bufferToArrayBuffer(body);
|
||||||
@ -200,8 +195,10 @@ export const getS3Client = (s3Config: S3Config) => {
|
|||||||
endpoint = `https://${endpoint}`;
|
endpoint = `https://${endpoint}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let s3Client: S3Client;
|
||||||
|
|
||||||
if (VALID_REQURL && s3Config.bypassCorsLocally) {
|
if (VALID_REQURL && s3Config.bypassCorsLocally) {
|
||||||
const s3Client = new S3Client({
|
s3Client = new S3Client({
|
||||||
region: s3Config.s3Region,
|
region: s3Config.s3Region,
|
||||||
endpoint: endpoint,
|
endpoint: endpoint,
|
||||||
forcePathStyle: s3Config.forcePathStyle,
|
forcePathStyle: s3Config.forcePathStyle,
|
||||||
@ -211,9 +208,8 @@ export const getS3Client = (s3Config: S3Config) => {
|
|||||||
},
|
},
|
||||||
requestHandler: new ObsHttpHandler(),
|
requestHandler: new ObsHttpHandler(),
|
||||||
});
|
});
|
||||||
return s3Client;
|
|
||||||
} else {
|
} else {
|
||||||
const s3Client = new S3Client({
|
s3Client = new S3Client({
|
||||||
region: s3Config.s3Region,
|
region: s3Config.s3Region,
|
||||||
endpoint: endpoint,
|
endpoint: endpoint,
|
||||||
forcePathStyle: s3Config.forcePathStyle,
|
forcePathStyle: s3Config.forcePathStyle,
|
||||||
@ -222,8 +218,19 @@ export const getS3Client = (s3Config: S3Config) => {
|
|||||||
secretAccessKey: s3Config.s3SecretAccessKey,
|
secretAccessKey: s3Config.s3SecretAccessKey,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return s3Client;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
s3Client.middlewareStack.add(
|
||||||
|
(next, context) => (args) => {
|
||||||
|
(args.request as any).headers["cache-control"] = "no-cache";
|
||||||
|
return next(args);
|
||||||
|
},
|
||||||
|
{
|
||||||
|
step: "build",
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
return s3Client;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getRemoteMeta = async (
|
export const getRemoteMeta = async (
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user