mirror of
https://github.com/paricafe/misskey.git
synced 2024-11-25 20:06:43 -06:00
978a9bbb3b
* Implement? HttpFetchService
* ✌️
* remove node-fetch
* fix
* refactor
* fix
* gateway timeout
* UndiciFetcherクラスを追加 (仮コミット, ビルドもstartもさせていない)
* fix
* add logger and fix url preview
* fix ip check
* enhance logger and error handling
* fix
* fix
* clean up
* Use custom fetcher for ApRequest / ApResolver
* bypassProxyはproxyBypassHostsに判断を委譲するように
* set maxRedirections (default 3, ApRequest/ApResolver: 0)
* fix comment
* handle error s3 upload
* add debug message
* no return await
* Revert "no return await"
This reverts commit b5b0dc58a342393d260492e3a6f58304372f53b2.
* reduce maxSockets
* apResolverのUndiciFetcherを廃止しapRequestのものを使う、 add ap logger
* Revert "apResolverのUndiciFetcherを廃止しapRequestのものを使う、 add ap logger"
This reverts commit 997243915c8e1f8472da64f607f88c36cb1d5cb4.
* add logger
* fix
* change logger name
* safe
* デフォルトでUser-Agentを設定
40 lines
1.3 KiB
TypeScript
40 lines
1.3 KiB
TypeScript
import { URL } from 'node:url';
|
|
import { Inject, Injectable } from '@nestjs/common';
|
|
import S3 from 'aws-sdk/clients/s3.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
import type { Config } from '@/config.js';
|
|
import type { Meta } from '@/models/entities/Meta.js';
|
|
import { HttpRequestService } from '@/core/HttpRequestService.js';
|
|
import { bindThis } from '@/decorators.js';
|
|
|
|
@Injectable()
|
|
export class S3Service {
|
|
constructor(
|
|
@Inject(DI.config)
|
|
private config: Config,
|
|
|
|
private httpRequestService: HttpRequestService,
|
|
) {
|
|
}
|
|
|
|
@bindThis
|
|
public getS3(meta: Meta) {
|
|
const u = meta.objectStorageEndpoint != null
|
|
? `${meta.objectStorageUseSSL ? 'https://' : 'http://'}${meta.objectStorageEndpoint}`
|
|
: `${meta.objectStorageUseSSL ? 'https://' : 'http://'}example.net`;
|
|
|
|
return new S3({
|
|
endpoint: meta.objectStorageEndpoint ?? undefined,
|
|
accessKeyId: meta.objectStorageAccessKey!,
|
|
secretAccessKey: meta.objectStorageSecretKey!,
|
|
region: meta.objectStorageRegion ?? undefined,
|
|
sslEnabled: meta.objectStorageUseSSL,
|
|
s3ForcePathStyle: !meta.objectStorageEndpoint // AWS with endPoint omitted
|
|
? false
|
|
: meta.objectStorageS3ForcePathStyle,
|
|
httpOptions: {
|
|
agent: this.httpRequestService.getHttpAgentByUrl(new URL(u), !meta.objectStorageUseProxy),
|
|
},
|
|
});
|
|
}
|
|
}
|