Skip to content

Commit

Permalink
"Fix" jimp import typings
Browse files Browse the repository at this point in the history
  • Loading branch information
DEVTomatoCake committed Jun 28, 2024
1 parent e069db1 commit a987671
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 6 deletions.
21 changes: 15 additions & 6 deletions src/api/middlewares/ImageProxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,22 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

import { Config } from "@spacebar/util";
import { Config, JimpType } from "@spacebar/util";
import { Request, Response } from "express";
import { yellow } from "picocolors";
import crypto from "crypto";
import fetch from "node-fetch";

let sharp: undefined | false | { default: typeof import("sharp") } = undefined;
let Jimp: undefined | false | typeof import("jimp") = undefined;

let Jimp: JimpType | undefined = undefined;
try {
Jimp = require("jimp") as JimpType;
} catch {
// empty
}

let sentImageProxyWarning = false;

const sharpSupported = new Set([
"image/jpeg",
Expand Down Expand Up @@ -112,20 +120,21 @@ export async function ImageProxy(req: Request, res: Response) {
const arrayBuffer = await request.arrayBuffer();
let resultBuffer = Buffer.from(arrayBuffer);

if (/^\d+x\d+$/.test(path[1]) && resizeSupported.has(contentType)) {
if (!sentImageProxyWarning && resizeSupported.has(contentType) && /^\d+x\d+$/.test(path[1])) {
if (sharp !== false) {
try {
sharp = await import("sharp");
} catch (e) {
} catch {
sharp = false;
}
}
if (sharp === false && Jimp !== false) {

if (sharp === false && !Jimp) {
try {
// @ts-expect-error Typings don't fit

Check failure on line 134 in src/api/middlewares/ImageProxy.ts

View workflow job for this annotation

GitHub Actions / build (18.x)

Unused '@ts-expect-error' directive.
Jimp = await import("jimp");
} catch {
Jimp = false;
sentImageProxyWarning = true;
console.log(
`[ImageProxy] ${yellow(
'Neither "sharp" or "jimp" NPM packages are installed, image resizing will be disabled',
Expand Down
23 changes: 23 additions & 0 deletions src/util/imports/Jimp.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
Copyright (C) 2023 Spacebar and Spacebar Contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

/* eslint-disable @typescript-eslint/no-explicit-any */

export type JimpType = {
read: (data: Buffer) => Promise<any>;
};
1 change: 1 addition & 0 deletions src/util/imports/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@

export * from "./OrmUtils";
export * from "./Erlpack";
export * from "./Jimp";

0 comments on commit a987671

Please sign in to comment.