Northern_Lights/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-02-06 13:05:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor downloadSceneType to use enum type

Browse Source 
Replaced numeric downloadSceneType fields with the DownloadSceneType enum in relevant interfaces. Updated NodeIKernelFlashTransferService method signatures to use DownloadSceneType for download operations, improving type safety and code clarity.
This commit is contained in:
手瓜一十雪
2026-01-24 14:40:08 +08:00
parent 0dec0c471b
commit 5939e613d4
2 changed files with 138 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/napcat-core/data/flash.ts
View File

@@ -53,7 +53,7 @@ export interface DownloadStatusInfo {
isAllFileAlreadyDownloaded: boolean, isAllFileAlreadyDownloaded: boolean,
saveFileSetDir: string, saveFileSetDir: string,
allWaitingStatusTask: boolean, allWaitingStatusTask: boolean,
downloadSceneType: number, downloadSceneType: DownloadSceneType,
retryCount: number, retryCount: number,
statisticInfo: { statisticInfo: {
downloadTaskId: string, downloadTaskId: string,
@@ -261,7 +261,21 @@ export interface FileListInfoRequests {
isNeedPhysicalInfoReady: boolean; isNeedPhysicalInfoReady: boolean;
}[]; }[];
} }
export enum DownloadSceneType {
KDOWNLOADSCENEUNKNOWN,
KDOWNLOADSCENEARKC2C,
KDOWNLOADSCENEARKC2CDETAILPAGE,
KDOWNLOADSCENEARKGROUP,
KDOWNLOADSCENEARKGROUPDETAILPAGE,
KDOWNLOADSCENELINKC2C,
KDOWNLOADSCENELINKGROUP,
KDOWNLOADSCENELINKCHANNEL,
KDOWNLOADSCENELINKTEMPCHAT,
KDOWNLOADSCENELINKOTHERINQQ,
KDOWNLOADSCENESCANQRCODE,
KDWONLOADSCENEFLASHTRANSFERCENTERCLIENT,
KDWONLOADSCENEFLASHTRANSFERCENTERSCHEMA
}
export interface FlashFileSetInfo { export interface FlashFileSetInfo {
fileSetId: string, fileSetId: string,
name: string, name: string,
@@ -327,7 +341,7 @@ export interface FlashFileSetInfo {
downloadPauseReason: 0, downloadPauseReason: 0,
saveFileSetDir: string, saveFileSetDir: string,
uploadSceneType: UploadSceneType, uploadSceneType: UploadSceneType,
downloadSceneType: 0, // 0 PC-QQ 103 web downloadSceneType: DownloadSceneType, // 0 PC-QQ 103 web
retryCount: number, retryCount: number,
isMergeShareUpload: 0, isMergeShareUpload: 0,
isRemoveDeviceInfo: boolean, isRemoveDeviceInfo: boolean,

241
packages/napcat-core/services/NodeIKernelFlashTransferService.ts
View File

@@ -10,6 +10,7 @@ import {
DownloadStatusInfo, DownloadStatusInfo,
SendTargetRequests, SendTargetRequests,
FlashOneFileInfo, FlashOneFileInfo,
DownloadSceneType,
} from '../data/flash'; } from '../data/flash';
export interface NodeIKernelFlashTransferService { export interface NodeIKernelFlashTransferService {
@@ -18,48 +19,48 @@ export interface NodeIKernelFlashTransferService {
* @param timestamp * @param timestamp
* @param fileInfo * @param fileInfo
*/ */
createFlashTransferUploadTask(timestamp: number, fileInfo: StartFlashTaskRequests): Promise < GeneralCallResult & { createFlashTransferUploadTask (timestamp: number, fileInfo: StartFlashTaskRequests): Promise<GeneralCallResult & {
createFlashTransferResult: createFlashTransferResult; createFlashTransferResult: createFlashTransferResult;
seq: number; seq: number;
} >; // 2 arg 重点 // 自动上传 }>; // 2 arg 重点 // 自动上传
createMergeShareTask(...args: unknown[]): unknown; // 2 arg createMergeShareTask (...args: unknown[]): unknown; // 2 arg
updateFlashTransfer(...args: unknown[]): unknown; // 2 arg updateFlashTransfer (...args: unknown[]): unknown; // 2 arg
getFileSetList(...args: unknown[]): unknown; // 1 arg getFileSetList (...args: unknown[]): unknown; // 1 arg
getFileSetListCount(...args: unknown[]): unknown; // 1 arg getFileSetListCount (...args: unknown[]): unknown; // 1 arg
/** /**
* 获取file set 的信息 * 获取file set 的信息
* @param fileSetIdDict * @param fileSetIdDict
*/ */
getFileSet(fileSetIdDict: FlashBaseRequest): Promise < GeneralCallResult & { getFileSet (fileSetIdDict: FlashBaseRequest): Promise<GeneralCallResult & {
seq: number; seq: number;
isCache: boolean; isCache: boolean;
fileSet: FlashFileSetInfo; fileSet: FlashFileSetInfo;
} >; // 1 arg }>; // 1 arg
/** /**
* 获取file set 里面的文件信息（文件夹结构） * 获取file set 里面的文件信息（文件夹结构）
* @param requestArgs * @param requestArgs
*/ */
getFileList(requestArgs: FileListInfoRequests): Promise < { getFileList (requestArgs: FileListInfoRequests): Promise<{
rsp: FileListResponse; rsp: FileListResponse;
} > ; // 1 arg 这个方法QQ有bug？？？ 并没有，是我参数有问题 }>; // 1 arg 这个方法QQ有bug？？？ 并没有，是我参数有问题
getDownloadedFileCount(...args: unknown[]): unknown; // 1 arg getDownloadedFileCount (...args: unknown[]): unknown; // 1 arg
getLocalFileList(...args: unknown[]): unknown; // 3 arg getLocalFileList (...args: unknown[]): unknown; // 3 arg
batchRemoveUserFileSetHistory(...args: unknown[]): unknown; // 1 arg batchRemoveUserFileSetHistory (...args: unknown[]): unknown; // 1 arg
/** /**
* 获取分享链接 * 获取分享链接
* @param fileSetId * @param fileSetId
*/ */
getShareLinkReq(fileSetId:string): Promise< GeneralCallResult & { getShareLinkReq (fileSetId: string): Promise<GeneralCallResult & {
shareLink: string; shareLink: string;
expireTimestamp: string; expireTimestamp: string;
}>; }>;
@@ -68,235 +69,235 @@ export interface NodeIKernelFlashTransferService {
* 由分享链接到fileSetId * 由分享链接到fileSetId
* @param shareCode * @param shareCode
*/ */
getFileSetIdByCode(shareCode: string): Promise < GeneralCallResult & { getFileSetIdByCode (shareCode: string): Promise<GeneralCallResult & {
fileSetId: string; fileSetId: string;
} > ; // 1 arg code == share code }>; // 1 arg code == share code
batchRemoveFile(...args: unknown[]): unknown; // 1 arg batchRemoveFile (...args: unknown[]): unknown; // 1 arg
checkUploadPathValid(...args: unknown[]): unknown; // 1 arg checkUploadPathValid (...args: unknown[]): unknown; // 1 arg
cleanFailedFiles(...args: unknown[]): unknown; // 2 arg cleanFailedFiles (...args: unknown[]): unknown; // 2 arg
/** /**
* 暂停所有的任务 * 暂停所有的任务
*/ */
resumeAllUnfinishedTasks(): unknown; // 0 arg !! resumeAllUnfinishedTasks (): unknown; // 0 arg !!
addFileSetUploadListener(...args: unknown[]): unknown; // 1 arg addFileSetUploadListener (...args: unknown[]): unknown; // 1 arg
removeFileSetUploadListener(...args: unknown[]): unknown; // 1 arg removeFileSetUploadListener (...args: unknown[]): unknown; // 1 arg
/** /**
* 开始上传任务 适用于已暂停的 * 开始上传任务 适用于已暂停的
* @param fileSetId * @param fileSetId
*/ */
startFileSetUpload(fileSetId: string): void; // 1 arg 并不是新建任务，应该是暂停后的启动 startFileSetUpload (fileSetId: string): void; // 1 arg 并不是新建任务，应该是暂停后的启动
/** /**
* 结束，无法再次启动 * 结束，无法再次启动
* @param fileSetId * @param fileSetId
*/ */
stopFileSetUpload(fileSetId: string): void; // 1 arg stop 后start无效 stopFileSetUpload (fileSetId: string): void; // 1 arg stop 后start无效
/** /**
* 暂停上传 * 暂停上传
* @param fileSetId * @param fileSetId
*/ */
pauseFileSetUpload(fileSetId: string): void; // 1 arg 暂停上传 pauseFileSetUpload (fileSetId: string): void; // 1 arg 暂停上传
/** /**
* 继续上传 * 继续上传
* @param args * @param args
*/ */
resumeFileSetUpload(...args: unknown[]): unknown; // 1 arg 继续 resumeFileSetUpload (...args: unknown[]): unknown; // 1 arg 继续
pauseFileUpload(...args: unknown[]): unknown; // 1 arg pauseFileUpload (...args: unknown[]): unknown; // 1 arg
resumeFileUpload(...args: unknown[]): unknown; // 1 arg resumeFileUpload (...args: unknown[]): unknown; // 1 arg
stopFileUpload(...args: unknown[]): unknown; // 1 arg stopFileUpload (...args: unknown[]): unknown; // 1 arg
asyncGetThumbnailPath(...args: unknown[]): unknown; // 2 arg asyncGetThumbnailPath (...args: unknown[]): unknown; // 2 arg
setDownLoadDefaultFileDir(...args: unknown[]): unknown; // 1 arg setDownLoadDefaultFileDir (...args: unknown[]): unknown; // 1 arg
setFileSetDownloadDir(...args: unknown[]): unknown; // 2 arg setFileSetDownloadDir (...args: unknown[]): unknown; // 2 arg
getFileSetDownloadDir(...args: unknown[]): unknown; // 1 arg getFileSetDownloadDir (...args: unknown[]): unknown; // 1 arg
setFlashTransferDir(...args: unknown[]): unknown; // 2 arg setFlashTransferDir (...args: unknown[]): unknown; // 2 arg
addFileSetDownloadListener(...args: unknown[]): unknown; // 1 arg addFileSetDownloadListener (...args: unknown[]): unknown; // 1 arg
removeFileSetDownloadListener(...args: unknown[]): unknown; // 1 arg removeFileSetDownloadListener (...args: unknown[]): unknown; // 1 arg
/** /**
* 开始下载file set的函数 同开始上传 * 开始下载file set的函数 同开始上传
* @param fileSetId * @param fileSetId
* @param chatType 聊天类型 //因为没有peer，其实可以硬编码为1 （好友私聊） * @param downloadSceneType 下载类型 //因为没有peer，其实可以硬编码为1 （好友私聊）
* @param arg // 默认为false * @param arg // 默认为false
*/ */
startFileSetDownload(fileSetId:string, chatType: number, arg: { isIncludeCompressInnerFiles: boolean }): Promise < GeneralCallResult & { startFileSetDownload (fileSetId: string, downloadSceneType: DownloadSceneType, downloadOptionParams: { isIncludeCompressInnerFiles: boolean; }): Promise<GeneralCallResult & {
extraInfo: 0 extraInfo: 0;
} >; // 3 arg }>; // 3 arg
stopFileSetDownload(fileSetId: string, arg1: { isIncludeCompressInnerFiles: boolean }): Promise < GeneralCallResult & { stopFileSetDownload (fileSetId: string, downloadOptionParams: { isIncludeCompressInnerFiles: boolean; }): Promise<GeneralCallResult & {
extraInfo: 0 extraInfo: 0;
} > ; // 2 arg 结束不可重启！！ }>; // 2 arg 结束不可重启！！
pauseFileSetDownload(fileSetId: string, arg1: { isIncludeCompressInnerFiles: boolean }): Promise < GeneralCallResult & { pauseFileSetDownload (fileSetId: string, downloadOptionParams: { isIncludeCompressInnerFiles: boolean; }): Promise<GeneralCallResult & {
extraInfo: 0 extraInfo: 0;
} > ; // 2 arg }>; // 2 arg
resumeFileSetDownload(fileSetId: string, arg1: { isIncludeCompressInnerFiles: boolean }): Promise < GeneralCallResult & { resumeFileSetDownload (fileSetId: string, downloadOptionParams: { isIncludeCompressInnerFiles: boolean; }): Promise<GeneralCallResult & {
extraInfo: 0 extraInfo: 0;
} > ; // 2 arg }>; // 2 arg
startFileListDownLoad(...args: unknown[]): unknown; // 4 arg // 大概率是选择set里面的部分文件进行下载，没必要，不想写 startFileListDownLoad (...args: unknown[]): unknown; // 4 arg // 大概率是选择set里面的部分文件进行下载，没必要，不想写
pauseFileListDownLoad(...args: unknown[]): unknown; // 2 arg pauseFileListDownLoad (...args: unknown[]): unknown; // 2 arg
resumeFileListDownLoad(...args: unknown[]): unknown; // 2 arg resumeFileListDownLoad (...args: unknown[]): unknown; // 2 arg
stopFileListDownLoad(...args: unknown[]): unknown; // 2 arg stopFileListDownLoad (...args: unknown[]): unknown; // 2 arg
startThumbnailListDownload(fileSetId: string): Promise < GeneralCallResult >; // 1 arg // 缩略图下载 startThumbnailListDownload (fileSetId: string): Promise<GeneralCallResult>; // 1 arg // 缩略图下载
stopThumbnailListDownload(fileSetId: string): Promise < GeneralCallResult >; // 1 arg stopThumbnailListDownload (fileSetId: string): Promise<GeneralCallResult>; // 1 arg
asyncRequestDownLoadStatus(fileSetId: string): Promise < DownloadStatusInfo >; // 1 arg asyncRequestDownLoadStatus (fileSetId: string): Promise<DownloadStatusInfo>; // 1 arg
startFileTransferUrl(fileInfo: FlashOneFileInfo): Promise < { startFileTransferUrl (fileInfo: FlashOneFileInfo): Promise<{
ret: number, ret: number,
url: string, url: string,
expireTimestampSeconds: string expireTimestampSeconds: string;
} >; // 1 arg }>; // 1 arg
startFileListDownLoadBySessionId(...args: unknown[]): unknown; // 2 arg startFileListDownLoadBySessionId (...args: unknown[]): unknown; // 2 arg
addFileSetSimpleStatusListener(...args: unknown[]): unknown; // 2 arg addFileSetSimpleStatusListener (...args: unknown[]): unknown; // 2 arg
addFileSetSimpleStatusMonitoring(...args: unknown[]): unknown; // 2 arg addFileSetSimpleStatusMonitoring (...args: unknown[]): unknown; // 2 arg
removeFileSetSimpleStatusMonitoring(...args: unknown[]): unknown; // 2 arg removeFileSetSimpleStatusMonitoring (...args: unknown[]): unknown; // 2 arg
removeFileSetSimpleStatusListener(...args: unknown[]): unknown; // 1 arg removeFileSetSimpleStatusListener (...args: unknown[]): unknown; // 1 arg
addDesktopFileSetSimpleStatusListener(...args: unknown[]): unknown; // 1 arg addDesktopFileSetSimpleStatusListener (...args: unknown[]): unknown; // 1 arg
addDesktopFileSetSimpleStatusMonitoring(...args: unknown[]): unknown; // 1 arg addDesktopFileSetSimpleStatusMonitoring (...args: unknown[]): unknown; // 1 arg
removeDesktopFileSetSimpleStatusMonitoring(...args: unknown[]): unknown; // 1 arg removeDesktopFileSetSimpleStatusMonitoring (...args: unknown[]): unknown; // 1 arg
removeDesktopFileSetSimpleStatusListener(...args: unknown[]): unknown; // 1 arg removeDesktopFileSetSimpleStatusListener (...args: unknown[]): unknown; // 1 arg
addFileSetSimpleUploadInfoListener(...args: unknown[]): unknown; // 1 arg addFileSetSimpleUploadInfoListener (...args: unknown[]): unknown; // 1 arg
addFileSetSimpleUploadInfoMonitoring(...args: unknown[]): unknown; // 1 arg addFileSetSimpleUploadInfoMonitoring (...args: unknown[]): unknown; // 1 arg
removeFileSetSimpleUploadInfoMonitoring(...args: unknown[]): unknown; // 1 arg removeFileSetSimpleUploadInfoMonitoring (...args: unknown[]): unknown; // 1 arg
removeFileSetSimpleUploadInfoListener(...args: unknown[]): unknown; // 1 arg removeFileSetSimpleUploadInfoListener (...args: unknown[]): unknown; // 1 arg
/** /**
* 发送闪传消息 * 发送闪传消息
* @param sendArgs * @param sendArgs
*/ */
sendFlashTransferMsg(sendArgs: SendTargetRequests): Promise < { sendFlashTransferMsg (sendArgs: SendTargetRequests): Promise<{
errCode: number, errCode: number,
errMsg: string, errMsg: string,
rsp: { rsp: {
sendStatus: SendStatus[] sendStatus: SendStatus[];
} };
} >; // 1 arg 估计是file set id }>; // 1 arg 估计是file set id
addFlashTransferTaskInfoListener(...args: unknown[]): unknown; // 1 arg addFlashTransferTaskInfoListener (...args: unknown[]): unknown; // 1 arg
removeFlashTransferTaskInfoListener(...args: unknown[]): unknown; // 1 arg removeFlashTransferTaskInfoListener (...args: unknown[]): unknown; // 1 arg
retrieveLocalLastFailedSetTasksInfo(): unknown; // 0 arg retrieveLocalLastFailedSetTasksInfo (): unknown; // 0 arg
getFailedFileList(fileSetId: string): Promise < { getFailedFileList (fileSetId: string): Promise<{
rsp: { rsp: {
seq: number; seq: number;
result: number; result: number;
errMs: string; errMs: string;
fileSetId: string; fileSetId: string;
fileList: [] fileList: [];
} };
} >; // 1 arg }>; // 1 arg
getLocalFileListByStatuses(...args: unknown[]): unknown; // 1 arg getLocalFileListByStatuses (...args: unknown[]): unknown; // 1 arg
addTransferStateListener(...args: unknown[]): unknown; // 1 arg addTransferStateListener (...args: unknown[]): unknown; // 1 arg
removeTransferStateListener(...args: unknown[]): unknown; // 1 arg removeTransferStateListener (...args: unknown[]): unknown; // 1 arg
getFileSetFirstClusteringList(...args: unknown[]): unknown; // 3 arg getFileSetFirstClusteringList (...args: unknown[]): unknown; // 3 arg
getFileSetClusteringList(...args: unknown[]): unknown; // 1 arg getFileSetClusteringList (...args: unknown[]): unknown; // 1 arg
addFileSetClusteringListListener(...args: unknown[]): unknown; // 1 arg addFileSetClusteringListListener (...args: unknown[]): unknown; // 1 arg
removeFileSetClusteringListListener(...args: unknown[]): unknown; // 1 arg removeFileSetClusteringListListener (...args: unknown[]): unknown; // 1 arg
getFileSetClusteringDetail(...args: unknown[]): unknown; // 1 arg getFileSetClusteringDetail (...args: unknown[]): unknown; // 1 arg
doAIOFlashTransferBubbleActionWithStatus(...args: unknown[]): unknown; // 4 arg doAIOFlashTransferBubbleActionWithStatus (...args: unknown[]): unknown; // 4 arg
getFilesTransferProgress(...args: unknown[]): unknown; // 1 arg getFilesTransferProgress (...args: unknown[]): unknown; // 1 arg
pollFilesTransferProgress(...args: unknown[]): unknown; // 1 arg pollFilesTransferProgress (...args: unknown[]): unknown; // 1 arg
cancelPollFilesTransferProgress(...args: unknown[]): unknown; // 1 arg cancelPollFilesTransferProgress (...args: unknown[]): unknown; // 1 arg
checkDownloadStatusBeforeLocalFileOper(...args: unknown[]): unknown; // 3 arg checkDownloadStatusBeforeLocalFileOper (...args: unknown[]): unknown; // 3 arg
getCompressedFileFolder(...args: unknown[]): unknown; // 1 arg getCompressedFileFolder (...args: unknown[]): unknown; // 1 arg
addFolderListener(...args: unknown[]): unknown; // 1 arg addFolderListener (...args: unknown[]): unknown; // 1 arg
removeFolderListener(...args: unknown[]): unknown; removeFolderListener (...args: unknown[]): unknown;
addCompressedFileListener(...args: unknown[]): unknown; addCompressedFileListener (...args: unknown[]): unknown;
removeCompressedFileListener(...args: unknown[]): unknown; removeCompressedFileListener (...args: unknown[]): unknown;
getFileCategoryList(...args: unknown[]): unknown; getFileCategoryList (...args: unknown[]): unknown;
addDeviceStatusListener(...args: unknown[]): unknown; addDeviceStatusListener (...args: unknown[]): unknown;
removeDeviceStatusListener(...args: unknown[]): unknown; removeDeviceStatusListener (...args: unknown[]): unknown;
checkDeviceStatus(...args: unknown[]): unknown; checkDeviceStatus (...args: unknown[]): unknown;
pauseAllTasks(...args: unknown[]): unknown; // 2 arg pauseAllTasks (...args: unknown[]): unknown; // 2 arg
resumePausedTasksAfterDeviceStatus(...args: unknown[]): unknown; resumePausedTasksAfterDeviceStatus (...args: unknown[]): unknown;
onSystemGoingToSleep(...args: unknown[]): unknown; onSystemGoingToSleep (...args: unknown[]): unknown;
onSystemWokeUp(...args: unknown[]): unknown; onSystemWokeUp (...args: unknown[]): unknown;
getFileMetas(...args: unknown[]): unknown; getFileMetas (...args: unknown[]): unknown;
addDownloadCntStatisticsListener(...args: unknown[]): unknown; addDownloadCntStatisticsListener (...args: unknown[]): unknown;
removeDownloadCntStatisticsListener(...args: unknown[]): unknown; removeDownloadCntStatisticsListener (...args: unknown[]): unknown;
detectPrivacyInfoInPaths(...args: unknown[]): unknown; detectPrivacyInfoInPaths (...args: unknown[]): unknown;
getFileThumbnailUrl(...args: unknown[]): unknown; getFileThumbnailUrl (...args: unknown[]): unknown;
handleDownloadFinishAfterSaveToAlbum(...args: unknown[]): unknown; handleDownloadFinishAfterSaveToAlbum (...args: unknown[]): unknown;
checkBatchFilesDownloadStatus(...args: unknown[]): unknown; checkBatchFilesDownloadStatus (...args: unknown[]): unknown;
onCheckAlbumStorageStatusResult(...args: unknown[]): unknown; onCheckAlbumStorageStatusResult (...args: unknown[]): unknown;
addFileAlbumStorageListener(...args: unknown[]): unknown; addFileAlbumStorageListener (...args: unknown[]): unknown;
removeFileAlbumStorageListener(...args: unknown[]): unknown; removeFileAlbumStorageListener (...args: unknown[]): unknown;
refreshFolderStatus(...args: unknown[]): unknown; refreshFolderStatus (...args: unknown[]): unknown;
} }