Leahnaya/BOSS
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/BOSS.git synced 2026-03-21 17:34:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: Add @smithy/types for correct type for s3 client

Browse Source
This commit is contained in:
William Oldham 2025-01-07 13:42:26 +00:00
parent 23bf64c2c5
commit 96d2ccf8a8
3 changed files with 1236 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1239
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -32,6 +32,7 @@
"xmlbuilder": "^15.1.1"
},
"devDependencies": {
"@smithy/types": "^4.0.0",
"@types/dicer": "^0.2.4",
"@types/express": "^4.17.17",
"@types/fs-extra": "^11.0.1",
@ -45,4 +46,3 @@
"typescript": "^5.1.6",
"xmlbuilder2": "^3.0.2"
}
}

9
src/util.ts
View File

@ -3,15 +3,16 @@ import path from 'node:path';
import { Readable } from 'node:stream';
import fs from 'fs-extra';
import { createChannel, createClient, Metadata } from 'nice-grpc';
import { GetObjectCommand, PutObjectCommand, S3 } from '@aws-sdk/client-s3';
import { GetObjectCommand, PutObjectCommand, S3, S3Client } from '@aws-sdk/client-s3';
import { AccountClient, AccountDefinition } from '@pretendonetwork/grpc/account/account_service';
import { FriendsClient, FriendsDefinition } from '@pretendonetwork/grpc/friends/friends_service';
import { GetNEXDataResponse } from '@pretendonetwork/grpc/account/get_nex_data_rpc';
import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc';
import { GetUserFriendPIDsResponse } from '@pretendonetwork/grpc/friends/get_user_friend_pids_rpc';
import { config, disabledFeatures } from '@/config-manager';
import { NodeJsClient } from '@smithy/types';
let s3: S3;
let s3: NodeJsClient<S3Client>;
if (!disabledFeatures.s3) {
s3 = new S3({
@ -138,7 +139,7 @@ export async function getFriends(pid: number): Promise<GetUserFriendPIDsResponse
}
}
export async function getCDNFileStream(key: string): Promise<Readable | fs.ReadStream | null> {
export async function getCDNFileStream(key: string): Promise<Readable | null> {
try {
if (disabledFeatures.s3) {
return await getLocalCDNFile(key);
@ -152,7 +153,7 @@ export async function getCDNFileStream(key: string): Promise<Readable | fs.ReadS
return null;
}
return response.Body as Readable;
return response.Body;
}
} catch (error) {
return null;