mirror of
https://github.com/spacebarchat/server.git
synced 2024-09-20 01:31:34 +02:00
"Fix" jimp import typings
This commit is contained in:
parent
e069db134f
commit
a987671e4a
@ -16,14 +16,22 @@
|
|||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
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 { Request, Response } from "express";
|
||||||
import { yellow } from "picocolors";
|
import { yellow } from "picocolors";
|
||||||
import crypto from "crypto";
|
import crypto from "crypto";
|
||||||
import fetch from "node-fetch";
|
import fetch from "node-fetch";
|
||||||
|
|
||||||
let sharp: undefined | false | { default: typeof import("sharp") } = undefined;
|
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([
|
const sharpSupported = new Set([
|
||||||
"image/jpeg",
|
"image/jpeg",
|
||||||
@ -112,20 +120,21 @@ export async function ImageProxy(req: Request, res: Response) {
|
|||||||
const arrayBuffer = await request.arrayBuffer();
|
const arrayBuffer = await request.arrayBuffer();
|
||||||
let resultBuffer = Buffer.from(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) {
|
if (sharp !== false) {
|
||||||
try {
|
try {
|
||||||
sharp = await import("sharp");
|
sharp = await import("sharp");
|
||||||
} catch (e) {
|
} catch {
|
||||||
sharp = false;
|
sharp = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (sharp === false && Jimp !== false) {
|
|
||||||
|
if (sharp === false && !Jimp) {
|
||||||
try {
|
try {
|
||||||
// @ts-expect-error Typings don't fit
|
// @ts-expect-error Typings don't fit
|
||||||
Jimp = await import("jimp");
|
Jimp = await import("jimp");
|
||||||
} catch {
|
} catch {
|
||||||
Jimp = false;
|
sentImageProxyWarning = true;
|
||||||
console.log(
|
console.log(
|
||||||
`[ImageProxy] ${yellow(
|
`[ImageProxy] ${yellow(
|
||||||
'Neither "sharp" or "jimp" NPM packages are installed, image resizing will be disabled',
|
'Neither "sharp" or "jimp" NPM packages are installed, image resizing will be disabled',
|
||||||
|
23
src/util/imports/Jimp.ts
Normal file
23
src/util/imports/Jimp.ts
Normal file
@ -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>;
|
||||||
|
};
|
@ -18,3 +18,4 @@
|
|||||||
|
|
||||||
export * from "./OrmUtils";
|
export * from "./OrmUtils";
|
||||||
export * from "./Erlpack";
|
export * from "./Erlpack";
|
||||||
|
export * from "./Jimp";
|
||||||
|
Loading…
Reference in New Issue
Block a user