bruno/remotely-save
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new s3 every request to avoid request expired

Browse Source
This commit is contained in:
fyears 2022-04-18 00:56:25 +08:00
parent 13537d1481
commit ebd62b1581
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/remote.ts
View File

@ -15,7 +15,6 @@ import { log } from "./moreOnLog";
export class RemoteClient { export class RemoteClient {
readonly serviceType: SUPPORTED_SERVICES_TYPE; readonly serviceType: SUPPORTED_SERVICES_TYPE;
readonly s3Client?: s3.S3Client;
readonly s3Config?: S3Config; readonly s3Config?: S3Config;
readonly webdavClient?: webdav.WrappedWebdavClient; readonly webdavClient?: webdav.WrappedWebdavClient;
readonly webdavConfig?: WebdavConfig; readonly webdavConfig?: WebdavConfig;
@ -38,7 +37,6 @@ export class RemoteClient {
// so we use a ref not copy of config here // so we use a ref not copy of config here
if (serviceType === "s3") { if (serviceType === "s3") {
this.s3Config = s3Config; this.s3Config = s3Config;
this.s3Client = s3.getS3Client(this.s3Config);
} else if (serviceType === "webdav") { } else if (serviceType === "webdav") {
if (vaultName === undefined || saveUpdatedConfigFunc === undefined) { if (vaultName === undefined || saveUpdatedConfigFunc === undefined) {
throw Error( throw Error(
@ -86,7 +84,7 @@ export class RemoteClient {
getRemoteMeta = async (fileOrFolderPath: string) => { getRemoteMeta = async (fileOrFolderPath: string) => {
if (this.serviceType === "s3") { if (this.serviceType === "s3") {
return await s3.getRemoteMeta( return await s3.getRemoteMeta(
this.s3Client, s3.getS3Client(this.s3Config),
this.s3Config, this.s3Config,
fileOrFolderPath fileOrFolderPath
); );
@ -116,7 +114,7 @@ export class RemoteClient {
) => { ) => {
if (this.serviceType === "s3") { if (this.serviceType === "s3") {
return await s3.uploadToRemote( return await s3.uploadToRemote(
this.s3Client, s3.getS3Client(this.s3Config),
this.s3Config, this.s3Config,
fileOrFolderPath, fileOrFolderPath,
vault, vault,
@ -168,7 +166,11 @@ export class RemoteClient {
listFromRemote = async (prefix?: string) => { listFromRemote = async (prefix?: string) => {
if (this.serviceType === "s3") { if (this.serviceType === "s3") {
return await s3.listFromRemote(this.s3Client, this.s3Config, prefix); return await s3.listFromRemote(
s3.getS3Client(this.s3Config),
this.s3Config,
prefix
);
} else if (this.serviceType === "webdav") { } else if (this.serviceType === "webdav") {
return await webdav.listFromRemote(this.webdavClient, prefix); return await webdav.listFromRemote(this.webdavClient, prefix);
} else if (this.serviceType === "dropbox") { } else if (this.serviceType === "dropbox") {
@ -190,7 +192,7 @@ export class RemoteClient {
) => { ) => {
if (this.serviceType === "s3") { if (this.serviceType === "s3") {
return await s3.downloadFromRemote( return await s3.downloadFromRemote(
this.s3Client, s3.getS3Client(this.s3Config),
this.s3Config, this.s3Config,
fileOrFolderPath, fileOrFolderPath,
vault, vault,
@ -241,7 +243,7 @@ export class RemoteClient {
) => { ) => {
if (this.serviceType === "s3") { if (this.serviceType === "s3") {
return await s3.deleteFromRemote( return await s3.deleteFromRemote(
this.s3Client, s3.getS3Client(this.s3Config),
this.s3Config, this.s3Config,
fileOrFolderPath, fileOrFolderPath,
password, password,
@ -276,7 +278,7 @@ export class RemoteClient {
checkConnectivity = async (callbackFunc?: any) => { checkConnectivity = async (callbackFunc?: any) => {
if (this.serviceType === "s3") { if (this.serviceType === "s3") {
return await s3.checkConnectivity( return await s3.checkConnectivity(
this.s3Client, s3.getS3Client(this.s3Config),
this.s3Config, this.s3Config,
callbackFunc callbackFunc
); );