Slave/lifecycle #11

Merged
nobswebdev merged 9 commits from slave/lifecycle into master 2026-10-27 21:12:04 +00:00
2 changed files with 16 additions and 2 deletions
Showing only changes of commit 073e6ac1f2 - Show all commits
@@ -51,14 +51,15 @@ describe('UploadService', () => {
let service: UploadService; let service: UploadService;
let dataSource: jest.Mocked<Pick<DataSource, 'transaction'>>; let dataSource: jest.Mocked<Pick<DataSource, 'transaction'>>;
let storageService: jest.Mocked<Pick<StorageService, 'write' | 'read'>>; let storageService: jest.Mocked<Pick<StorageService, 'write' | 'read'>>;
let uploadRepository: { create: jest.Mock; save: jest.Mock; findOne: jest.Mock }; let uploadRepository: { create: jest.Mock; save: jest.Mock; findOne: jest.Mock; increment: jest.Mock };
let transaction: jest.Mock; let transaction: jest.Mock;
beforeEach(() => { beforeEach(() => {
uploadRepository = { uploadRepository = {
create: jest.fn((entityLike: unknown) => entityLike), create: jest.fn((entityLike: unknown) => entityLike),
save: jest.fn(async (entity: unknown) => entity), save: jest.fn(async (entity: unknown) => entity),
findOne: jest.fn() findOne: jest.fn(),
increment: jest.fn().mockResolvedValue({ affected: 1, raw: [], generatedMaps: [] })
}; };
transaction = jest.fn(async (runInTransaction: (manager: EntityManager) => Promise<unknown>) => { transaction = jest.fn(async (runInTransaction: (manager: EntityManager) => Promise<unknown>) => {
@@ -224,6 +225,7 @@ describe('UploadService', () => {
relations: ['zk'] relations: ['zk']
}); });
expect(storageService.read).toHaveBeenCalledWith(fixedId); expect(storageService.read).toHaveBeenCalledWith(fixedId);
expect(uploadRepository.increment).toHaveBeenCalledWith({ id: fixedId }, 'viewCount', 1);
}); });
it('includes wrap fields when password protected', async () => { it('includes wrap fields when password protected', async () => {
@@ -253,6 +255,7 @@ describe('UploadService', () => {
wrapIv: wrapIv.toString('base64'), wrapIv: wrapIv.toString('base64'),
salt: salt.toString('base64') salt: salt.toString('base64')
}); });
expect(uploadRepository.increment).toHaveBeenCalledWith({ id: fixedId }, 'viewCount', 1);
}); });
it('throws NotFoundException when upload is missing or not zk', async () => { it('throws NotFoundException when upload is missing or not zk', async () => {
@@ -260,6 +263,7 @@ describe('UploadService', () => {
await expect(service.getZkUploadCiphertext(fixedId)).rejects.toThrow(NotFoundException); await expect(service.getZkUploadCiphertext(fixedId)).rejects.toThrow(NotFoundException);
expect(storageService.read).not.toHaveBeenCalled(); expect(storageService.read).not.toHaveBeenCalled();
expect(uploadRepository.increment).not.toHaveBeenCalled();
}); });
it('throws NotFoundException when ciphertext file is missing', async () => { it('throws NotFoundException when ciphertext file is missing', async () => {
@@ -271,6 +275,7 @@ describe('UploadService', () => {
storageService.read.mockRejectedValue(Object.assign(new Error('ENOENT'), { code: 'ENOENT' })); storageService.read.mockRejectedValue(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }));
await expect(service.getZkUploadCiphertext(fixedId)).rejects.toThrow(NotFoundException); await expect(service.getZkUploadCiphertext(fixedId)).rejects.toThrow(NotFoundException);
expect(uploadRepository.increment).not.toHaveBeenCalled();
}); });
it('throws NotFoundException when password protected but wrap data is incomplete', async () => { it('throws NotFoundException when password protected but wrap data is incomplete', async () => {
@@ -287,6 +292,7 @@ describe('UploadService', () => {
storageService.read.mockResolvedValue(Buffer.alloc(8)); storageService.read.mockResolvedValue(Buffer.alloc(8));
await expect(service.getZkUploadCiphertext(fixedId)).rejects.toThrow(NotFoundException); await expect(service.getZkUploadCiphertext(fixedId)).rejects.toThrow(NotFoundException);
expect(uploadRepository.increment).not.toHaveBeenCalled();
}); });
}); });
@@ -314,6 +320,7 @@ describe('UploadService', () => {
where: { id: fixedId, mode: UploadMode.Hotlink }, where: { id: fixedId, mode: UploadMode.Hotlink },
relations: ['hotlink'] relations: ['hotlink']
}); });
expect(uploadRepository.increment).toHaveBeenCalledWith({ id: fixedId }, 'viewCount', 1);
}); });
it('throws NotFoundException when upload is missing or not hotlink', async () => { it('throws NotFoundException when upload is missing or not hotlink', async () => {
@@ -321,6 +328,7 @@ describe('UploadService', () => {
await expect(service.getHotlinkImage(fixedId, secret)).rejects.toThrow(NotFoundException); await expect(service.getHotlinkImage(fixedId, secret)).rejects.toThrow(NotFoundException);
expect(storageService.read).not.toHaveBeenCalled(); expect(storageService.read).not.toHaveBeenCalled();
expect(uploadRepository.increment).not.toHaveBeenCalled();
}); });
it('throws NotFoundException when secret is wrong but well-formed', async () => { it('throws NotFoundException when secret is wrong but well-formed', async () => {
@@ -334,6 +342,7 @@ describe('UploadService', () => {
const wrongSecret = Buffer.alloc(32, 0x99).toString('base64url'); const wrongSecret = Buffer.alloc(32, 0x99).toString('base64url');
await expect(service.getHotlinkImage(fixedId, wrongSecret)).rejects.toThrow(NotFoundException); await expect(service.getHotlinkImage(fixedId, wrongSecret)).rejects.toThrow(NotFoundException);
expect(uploadRepository.increment).not.toHaveBeenCalled();
}); });
it('throws NotFoundException when ciphertext file is missing', async () => { it('throws NotFoundException when ciphertext file is missing', async () => {
@@ -345,6 +354,7 @@ describe('UploadService', () => {
storageService.read.mockRejectedValue(Object.assign(new Error('ENOENT'), { code: 'ENOENT' })); storageService.read.mockRejectedValue(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }));
await expect(service.getHotlinkImage(fixedId, secret)).rejects.toThrow(NotFoundException); await expect(service.getHotlinkImage(fixedId, secret)).rejects.toThrow(NotFoundException);
expect(uploadRepository.increment).not.toHaveBeenCalled();
}); });
}); });
@@ -155,6 +155,8 @@ export class UploadService {
result.salt = toBase64(upload.zk.salt); result.salt = toBase64(upload.zk.salt);
} }
await this.uploadRepository.increment({ id }, 'viewCount', 1);
return result; return result;
} }
@@ -190,6 +192,8 @@ export class UploadService {
throw new NotFoundException(); throw new NotFoundException();
} }
await this.uploadRepository.increment({ id }, 'viewCount', 1);
return { return {
body, body,
mimeType: upload.hotlink.mimeType mimeType: upload.hotlink.mimeType