Skip to content

Commit

Permalink
chore: rebase main (immich-app#3103)
Browse files Browse the repository at this point in the history 
Co-authored-by: Jason Rasmussen <[email protected]>
  • Loading branch information
@mertalev @jrasm91
mertalev and jrasm91 authored Jul 13, 2023
1 parent 34d1f74 commit 2fb85f4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 104 deletions.
18 changes: 6 additions & 12 deletions server/src/immich/api-v1/asset/asset.controller.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import {
Controller,
Delete,
Get,
Header,
Headers,
HttpCode,
HttpStatus,
Param,
Expand Down Expand Up @@ -111,39 +109,35 @@ export class AssetController {

@SharedLinkRoute()
@Get('/file/:id')
@Header('Cache-Control', 'private, max-age=86400, no-transform')
@ApiOkResponse({
content: {
'application/octet-stream': { schema: { type: 'string', format: 'binary' } },
},
})
serveFile(
async serveFile(
@AuthUser() authUser: AuthUserDto,
@Headers() headers: Record<string, string>,
@Response({ passthrough: true }) res: Res,
@Response() res: Res,
@Query(new ValidationPipe({ transform: true })) query: ServeFileDto,
@Param() { id }: UUIDParamDto,
) {
return this.assetService.serveFile(authUser, id, query, res, headers);
await this.assetService.serveFile(authUser, id, query, res);
}

@SharedLinkRoute()
@Get('/thumbnail/:id')
@Header('Cache-Control', 'private, max-age=86400, no-transform')
@ApiOkResponse({
content: {
'image/jpeg': { schema: { type: 'string', format: 'binary' } },
'image/webp': { schema: { type: 'string', format: 'binary' } },
},
})
getAssetThumbnail(
async getAssetThumbnail(
@AuthUser() authUser: AuthUserDto,
@Headers() headers: Record<string, string>,
@Response({ passthrough: true }) res: Res,
@Response() res: Res,
@Param() { id }: UUIDParamDto,
@Query(new ValidationPipe({ transform: true })) query: GetAssetThumbnailDto,
) {
return this.assetService.getAssetThumbnail(authUser, id, query, res, headers);
await this.assetService.serveThumbnail(authUser, id, query, res);
}

@Get('/curated-objects')
Expand Down
112 changes: 20 additions & 92 deletions server/src/immich/api-v1/asset/asset.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ import {
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Response as Res } from 'express';
import { constants, createReadStream } from 'fs';
import { constants } from 'fs';
import fs from 'fs/promises';
import path, { extname } from 'path';
import sanitize from 'sanitize-filename';
import { pipeline } from 'stream/promises';
import { QueryFailedError, Repository } from 'typeorm';
import { UploadRequest } from '../../app.interceptor';
import { IAssetRepository } from './asset-repository';
Expand Down Expand Up @@ -301,13 +300,7 @@ export class AssetService {
return mapAsset(updatedAsset);
}

async getAssetThumbnail(
authUser: AuthUserDto,
assetId: string,
query: GetAssetThumbnailDto,
res: Res,
headers: Record<string, string>,
) {
async serveThumbnail(authUser: AuthUserDto, assetId: string, query: GetAssetThumbnailDto, res: Res) {
await this.access.requirePermission(authUser, Permission.ASSET_VIEW, assetId);

const asset = await this._assetRepository.get(assetId);
Expand All @@ -316,7 +309,7 @@ export class AssetService {
}

try {
return this.streamFile(this.getThumbnailPath(asset, query.format), res, headers);
await this.sendFile(res, this.getThumbnailPath(asset, query.format));
} catch (e) {
res.header('Cache-Control', 'none');
this.logger.error(`Cannot create read stream for asset ${asset.id}`, 'getAssetThumbnail');
Expand All @@ -327,42 +320,23 @@ export class AssetService {
}
}

public async serveFile(
authUser: AuthUserDto,
assetId: string,
query: ServeFileDto,
res: Res,
headers: Record<string, string>,
) {
public async serveFile(authUser: AuthUserDto, assetId: string, query: ServeFileDto, res: Res) {
// this is not quite right as sometimes this returns the original still
await this.access.requirePermission(authUser, Permission.ASSET_VIEW, assetId);

const allowOriginalFile = !!(!authUser.isPublicUser || authUser.isAllowDownload);

const asset = await this._assetRepository.getById(assetId);
if (!asset) {
throw new NotFoundException('Asset does not exist');
}

// Handle Sending Images
if (asset.type == AssetType.IMAGE) {
try {
return this.streamFile(this.getServePath(asset, query, allowOriginalFile), res, headers);
} catch (e) {
this.logger.error(`Cannot create read stream for asset ${asset.id} ${JSON.stringify(e)}`, 'serveFile[IMAGE]');
throw new InternalServerErrorException(
e,
`Cannot read thumbnail file for asset ${asset.id} - contact your administrator`,
);
}
} else {
try {
return this.streamFile(asset.encodedVideoPath || asset.originalPath, res, headers);
} catch (e: Error | any) {
this.logger.error(`Error serving VIDEO asset=${asset.id}`, e?.stack);
throw new InternalServerErrorException(`Failed to serve video asset ${e}`, 'ServeFile');
}
}
const allowOriginalFile = !!(!authUser.isPublicUser || authUser.isAllowDownload);

const filepath =
asset.type === AssetType.IMAGE
? this.getServePath(asset, query, allowOriginalFile)
: asset.encodedVideoPath || asset.originalPath;

await this.sendFile(res, filepath);
}

public async deleteAll(authUser: AuthUserDto, dto: DeleteAssetDto): Promise<DeleteAssetResponseDto[]> {
Expand Down Expand Up @@ -624,64 +598,18 @@ export class AssetService {
return asset.resizePath;
}

private async streamFile(filepath: string, res: Res, headers: Record<string, string>) {
private async sendFile(res: Res, filepath: string): Promise<void> {
await fs.access(filepath, constants.R_OK);
const { size, mtimeNs } = await fs.stat(filepath, { bigint: true });

res.set('Cache-Control', 'private, max-age=86400, no-transform');
res.header('Content-Type', mimeTypes.lookup(filepath));

const range = this.setResRange(res, headers, Number(size));

// etag
const etag = `W/"${size}-${mtimeNs}"`;
res.setHeader('ETag', etag);
if (etag === headers['if-none-match']) {
res.status(304);
return;
}

const stream = createReadStream(filepath, range);
return await pipeline(stream, res).catch((err) => {
if (err.code !== 'ERR_STREAM_PREMATURE_CLOSE') {
this.logger.error(err);
res.sendFile(filepath, { root: process.cwd() }, (error: Error) => {
if (!error) {
return;
}
});
}

private setResRange(res: Res, headers: Record<string, string>, size: number) {
if (!headers.range) {
return {};
}

/** Extracting Start and End value from Range Header */
const [startStr, endStr] = headers.range.replace(/bytes=/, '').split('-');
let start = parseInt(startStr, 10);
let end = endStr ? parseInt(endStr, 10) : size - 1;

if (!isNaN(start) && isNaN(end)) {
start = start;
end = size - 1;
}

if (isNaN(start) && !isNaN(end)) {
start = size - end;
end = size - 1;
}

// Handle unavailable range request
if (start >= size || end >= size) {
console.error('Bad Request');
res.status(416).set({ 'Content-Range': `bytes */${size}` });

throw new BadRequestException('Bad Request Range');
}

res.status(206).set({
'Content-Range': `bytes ${start}-${end}/${size}`,
'Accept-Ranges': 'bytes',
'Content-Length': end - start + 1,
if (error.message !== 'Request aborted') {
this.logger.error(`Unable to send file: ${error.name}`, error.stack);
}
});

return { start, end };
}
}

0 comments on commit 2fb85f4

Please sign in to comment.