From 046300368198d9d2c6054dd1015a4557b361709e Mon Sep 17 00:00:00 2001 From: seb Date: Sun, 18 Oct 2026 14:44:23 +0200 Subject: [PATCH] u --- src/services/companyImport/imageHasher.js | 32 +++++++++++------------ src/util/manifestAttachment.js | 12 +++------ 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/src/services/companyImport/imageHasher.js b/src/services/companyImport/imageHasher.js index b304bb3..bae43d9 100644 --- a/src/services/companyImport/imageHasher.js +++ b/src/services/companyImport/imageHasher.js @@ -17,25 +17,23 @@ const log = createLogger('import'); * @returns {Promise<{base62: string, width: number, height: number, hashLength: number}|null>} */ export async function computeSkeleHash(buffer) { - try { - const { data, info } = await sharp(buffer) - .rotate() - .resize({ width: 200, height: 200, fit: 'inside' }) - .ensureAlpha() - .raw() - .toBuffer({ resolveWithObject: true }); + const { data, info } = await sharp(buffer) + .rotate() + .resize({ width: 200, height: 200, fit: 'inside' }) + .ensureAlpha() + .raw() + .toBuffer({ resolveWithObject: true }); - const result = await encodeRGBA(info.width, info.height, data); - return { - base62: result.base62, - width: info.width, - height: info.height, - hashLength: result.hash?.length ?? 0, - }; - } catch (err) { - log.warn('Failed to compute skelehash for image:', err.message); - return null; + const result = await encodeRGBA(info.width, info.height, data); + if (!result?.base62) { + throw new Error('encodeRGBA failed to produce a base62 skelehash'); } + return { + base62: result.base62, + width: info.width, + height: info.height, + hashLength: result.hash?.length ?? 0, + }; } // #endregion diff --git a/src/util/manifestAttachment.js b/src/util/manifestAttachment.js index db24794..cbb57cc 100644 --- a/src/util/manifestAttachment.js +++ b/src/util/manifestAttachment.js @@ -18,14 +18,10 @@ export async function formatAttachment(file) { } if (!skeledash && file.thumbavif) { - try { - const result = await computeSkeleHash(file.thumbavif); - skeledash = result?.base62 || null; - if (file.hash && skeledash) { - skeleCache.set(file.hash, skeledash); - } - } catch { - skeledash = null; + const result = await computeSkeleHash(file.thumbavif); + skeledash = result.base62; + if (file.hash && skeledash) { + skeleCache.set(file.hash, skeledash); } }