Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
"pm2": "6.0.10",
"range-parser": "1.2.1",
"selfsigned": "3.0.1",
"sharp": "0.34.3",
"tty-table": "4.2.3",
"winston": "3.17.0"
},
Expand All @@ -83,6 +82,9 @@
"vitest": "3.2.4",
"vitest-mock-express": "2.2.0"
},
"optionalDependencies": {
"sharp": "0.34.3"
},
"engines": {
"node": ">=22.12.0"
},
Expand Down
4 changes: 4 additions & 0 deletions src/commands/create-folder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { DriveFolderService } from '../services/drive/drive-folder.service';
import { ConfigService } from '../services/config.service';
import { ValidationService } from '../services/validation.service';
import { EmptyFolderNameError, MissingCredentialsError, NotValidFolderUuidError } from '../types/command.types';
import { AsyncUtils } from '../utils/async.utils';

export default class CreateFolder extends Command {
static readonly args = {};
Expand Down Expand Up @@ -53,6 +54,9 @@ export default class CreateFolder extends Command {
});

const newFolder = await createNewFolder;
// This aims to prevent this issue: https://inxt.atlassian.net/browse/PB-1446
await AsyncUtils.sleep(500);

CLIUtils.done(flags['json']);
// eslint-disable-next-line max-len
const message = `Folder ${newFolder.plainName} created successfully, view it at ${ConfigService.instance.get('DRIVE_WEB_URL')}/folder/${newFolder.uuid}`;
Expand Down
39 changes: 27 additions & 12 deletions src/services/thumbnail.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,19 @@ import { DriveFileService } from './drive/drive-file.service';
import { StorageTypes } from '@internxt/sdk/dist/drive';
import { NetworkFacade } from './network/network-facade.service';
import { isImageThumbnailable, ThumbnailConfig } from '../utils/thumbnail.utils';
import sharp from 'sharp';

let sharpDependency: typeof import('sharp') | null = null;

const getSharp = async () => {
if (!sharpDependency) {
try {
sharpDependency = (await import('sharp')).default;
} catch {
return null;
}
}
return sharpDependency;
};

export class ThumbnailService {
public static readonly instance: ThumbnailService = new ThumbnailService();
Expand Down Expand Up @@ -51,16 +63,19 @@ export class ThumbnailService {
}
};

private readonly getThumbnailFromImageBuffer = (buffer: Buffer): Promise<Buffer> => {
return sharp(buffer)
.resize({
height: ThumbnailConfig.MaxHeight,
width: ThumbnailConfig.MaxWidth,
fit: 'inside',
})
.png({
quality: ThumbnailConfig.Quality,
})
.toBuffer();
private readonly getThumbnailFromImageBuffer = async (buffer: Buffer): Promise<Buffer | undefined> => {
const sharp = await getSharp();
if (sharp) {
return sharp(buffer, { failOnError: false })
.resize({
height: ThumbnailConfig.MaxHeight,
width: ThumbnailConfig.MaxWidth,
fit: 'inside',
})
.png({
quality: ThumbnailConfig.Quality,
})
.toBuffer();
}
};
}
Loading