wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-07 00:12:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into staging

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2024-10-25 21:35:56 +07:00
commit 0df9725a0c
No known key found for this signature in database
GPG Key ID: BD80F68D68D8F7F2
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/config/rush/pnpm-lock.yaml
View File

@ -1100,6 +1100,9 @@ dependencies:
'@signpdf/utils': '@signpdf/utils':
specifier: ^3.2.4 specifier: ^3.2.4
version: 3.2.4 version: 3.2.4
'@smithy/node-http-handler':
specifier: ^3.0.0
version: 3.0.0
'@storybook/addon-essentials': '@storybook/addon-essentials':
specifier: ^7.0.6 specifier: ^7.0.6
version: 7.6.17(react-dom@18.2.0)(react@18.2.0) version: 7.6.17(react-dom@18.2.0)(react@18.2.0)
@ -32630,7 +32633,7 @@ packages:
dev: false dev: false
file:projects/s3.tgz(esbuild@0.20.1)(ts-node@10.9.2): file:projects/s3.tgz(esbuild@0.20.1)(ts-node@10.9.2):
resolution: {integrity: sha512-K8tCIa7XhsCfCud4PK5ap0pAoF4fGanurF5AJ7Otx97p6m170W2DJIkiplk2x41Ksy9+Zw9dEF2VWRgdDrWX5A==, tarball: file:projects/s3.tgz} resolution: {integrity: sha512-9Jp4CG4EJYJsbePGfW/jFKXlhGI6ctSLUm0Wgu2xHck8JzgYCRuRkOjUdeQ0Tgg3njd+/ho+0eL9DmYooYjdrg==, tarball: file:projects/s3.tgz}
id: file:projects/s3.tgz id: file:projects/s3.tgz
name: '@rush-temp/s3' name: '@rush-temp/s3'
version: 0.0.0 version: 0.0.0
@ -32638,6 +32641,7 @@ packages:
'@aws-sdk/client-s3': 3.577.0 '@aws-sdk/client-s3': 3.577.0
'@aws-sdk/lib-storage': 3.583.0(@aws-sdk/client-s3@3.577.0) '@aws-sdk/lib-storage': 3.583.0(@aws-sdk/client-s3@3.577.0)
'@aws-sdk/s3-request-presigner': 3.582.0 '@aws-sdk/s3-request-presigner': 3.582.0
'@smithy/node-http-handler': 3.0.0
'@types/jest': 29.5.12 '@types/jest': 29.5.12
'@types/node': 20.11.19 '@types/node': 20.11.19
'@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.3.3) '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.3.3)

3
server/s3/package.json
View File

@ -40,6 +40,7 @@
"@hcengineering/storage": "^0.6.0", "@hcengineering/storage": "^0.6.0",
"@aws-sdk/client-s3": "^3.575.0", "@aws-sdk/client-s3": "^3.575.0",
"@aws-sdk/s3-request-presigner": "^3.582.0", "@aws-sdk/s3-request-presigner": "^3.582.0",
"@aws-sdk/lib-storage": "^3.583.0" "@aws-sdk/lib-storage": "^3.583.0",
"@smithy/node-http-handler": "^3.0.0"
} }
} }

11
server/s3/src/index.ts
View File

@ -15,6 +15,9 @@
import { CopyObjectCommand, PutObjectCommand, S3 } from '@aws-sdk/client-s3' import { CopyObjectCommand, PutObjectCommand, S3 } from '@aws-sdk/client-s3'
import { Upload } from '@aws-sdk/lib-storage' import { Upload } from '@aws-sdk/lib-storage'
import { NodeHttpHandler } from '@smithy/node-http-handler'
import { Agent as HttpAgent } from 'http'
import { Agent as HttpsAgent } from 'https'
import core, { import core, {
toWorkspaceString, toWorkspaceString,
@ -70,7 +73,13 @@ export class S3Service implements StorageAdapter {
accessKeyId: opt.accessKey, accessKeyId: opt.accessKey,
secretAccessKey: opt.secretKey secretAccessKey: opt.secretKey
}, },
region: opt.region ?? 'auto' region: opt.region ?? 'auto',
requestHandler: new NodeHttpHandler({
connectionTimeout: 5000,
socketTimeout: 120000,
httpAgent: new HttpAgent({ maxSockets: 500, keepAlive: true }),
httpsAgent: new HttpsAgent({ maxSockets: 500, keepAlive: true })
})
}) })
this.expireTime = parseInt(this.opt.expireTime ?? '168') * 3600 // use 7 * 24 - hours as default value for expireF this.expireTime = parseInt(this.opt.expireTime ?? '168') * 3600 // use 7 * 24 - hours as default value for expireF