Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REF] client side image processing refactor agau #3346

Draft
wants to merge 4 commits into
base: saas-16.4-fix-image-mimetype-safari-agau
Choose a base branch
from
Draft
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
220 changes: 220 additions & 0 deletions addons/web/static/src/core/image_processing_service.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
/** @odoo-module **/

import { registry } from "@web/core/registry";
import { canExportCanvasAsWebp, convertCanvasToDataURL } from "@web/core/utils/image_processing";

export const IMAGE_TYPE = {
WEBP: {
mimetype: "image/webp",
extension: "webp",
},
JPEG: {
mimetype: "image/jpeg",
extension: "jpeg",
},
PNG: {
mimetype: "image/png",
extension: "png",
},
};

export const STANDARD_ALTERNATIVE_TYPES = [IMAGE_TYPE.WEBP, IMAGE_TYPE.JPEG];
export const STANDARD_ALTERNATIVE_SIZES = [1024, 512, 256, 128];

/**
* Looks up the extension for the given mimetype from {@link IMAGE_TYPE}
*
* @returns {string}
*/
export function getImageExtensionForMimetype(mimetype) {
return Object.values(IMAGE_TYPE).find((type) => type.mimetype === mimetype).extension;
}

export class ImageProcessingService {
static dependencies = ["orm"];

constructor() {
this.setup(...arguments);
}

setup(env, { orm }) {
this.orm = orm;
}

/**
* Generate alternative sizes for a given image, image sizes and types {@link IMAGE_TYPE}.
* Only available types are generated.
* Optionally save the generated images as an attachment tree (Original image > First image of size > Other types)
*
* @param {string} src
* @param {number} quality See {@link HTMLCanvasElement.toDataURL}
* @param {boolean} [doSave] Whether to save
* @param {string} [fileBasename] File basename for saved attachments
* @param {number[]} [requestedSizes] {@link IMAGE_TYPE}
* @param {{ mimetype: string, extension: string }[]} [imageTypes] {@link IMAGE_TYPE}
* @return {Promise<{
* originalImage: {} | undefined,
* alternativeImagesBySize: Record<number, { dataURL: string, mimetype: string }>
* }>} originalImage is only provided when `doSave === true`.
*/
async generateImageAlternatives(
src,
quality,
doSave = false,
fileBasename = undefined,
requestedSizes = STANDARD_ALTERNATIVE_SIZES,
imageTypes = STANDARD_ALTERNATIVE_TYPES
) {
const imageElement = await this._makeImageElementForProcessing(src);
const { originalSize, alternativeSizes } = this._getImageElementAlternativeSizes(
imageElement,
requestedSizes
);

const alternativeImagesBySize = {};
for (const size of [originalSize, ...alternativeSizes]) {
const availableImageTypes = imageTypes.filter(
(imageType) => imageType.mimetype !== "image/webp" || canExportCanvasAsWebp()
);
const canvas = this._makeCanvasForImage(imageElement, size, originalSize);
alternativeImagesBySize[size] = this._getAlternativeImagesFromCanvas(
canvas,
quality,
availableImageTypes
);
}

let originalImage = undefined;

if (doSave) {
originalImage = await this._saveAlternativeImageSizesAttachments(
alternativeImagesBySize,
originalSize,
fileBasename
);
}

return {
originalImage: originalImage,
alternativeImagesBySize: alternativeImagesBySize,
};
}

/**
* Saves images as attachment tree.
*
* @param alternativeImagesBySize {Record<number, { dataURL: string, mimetype: string }>} Lists of images by size
* @param originalSize {number}
* @param fileBasename {string}
* @returns {Promise<{ id: number, dataURL: string, mimetype: string }>} The original image's data
*/
async _saveAlternativeImageSizesAttachments(
alternativeImagesBySize,
originalSize,
fileBasename
) {
let originalId = undefined;
let originalImage = undefined;
for (const size in alternativeImagesBySize) {
const images = alternativeImagesBySize[size];
const isOriginalSize = size === originalSize.toString();

let sizeRootId = undefined;

for (const image of images) {
const extension = getImageExtensionForMimetype(image.mimetype);

let description;
if (sizeRootId === undefined) {
description = isOriginalSize ? "" : `resize: ${size}`;
} else {
description = `format: ${extension}`;
}

const attachmentData = {
res_model: "ir.attachment",
name: `${fileBasename}.${extension}`,
description: description,
datas: image.dataURL.split(",")[1],
res_id: sizeRootId || originalId,
mimetype: image.mimetype,
};
const [attachmentId] = await this.orm.call("ir.attachment", "create_unique", [
[attachmentData],
]);

sizeRootId = sizeRootId || attachmentId;
originalId = originalId || attachmentId;
originalImage = originalImage || image;
}
}

return {
id: originalId,
...originalImage,
};
}

async _makeImageElementForProcessing(src) {
const imageElement = document.createElement("img");
imageElement.src = src;
await new Promise((resolve) => imageElement.addEventListener("load", resolve));
return imageElement;
}

_getImageElementAlternativeSizes(imageElement, requestedSizes) {
const originalSize = Math.max(imageElement.width, imageElement.height);
const smallerSizes = requestedSizes.filter((size) => size < originalSize);
return {
originalSize: originalSize,
alternativeSizes: smallerSizes,
};
}

_makeCanvasForImage(imageElement, size, originalSize) {
const ratio = size / originalSize;
const canvas = document.createElement("canvas");
canvas.width = imageElement.width * ratio;
canvas.height = imageElement.height * ratio;
const ctx = canvas.getContext("2d");
ctx.fillStyle = "rgb(255, 255, 255)";
ctx.fillRect(0, 0, canvas.width, canvas.height);
ctx.drawImage(
imageElement,
0,
0,
imageElement.width,
imageElement.height,
0,
0,
canvas.width,
canvas.height
);
return canvas;
}

_getAlternativeImagesFromCanvas(canvas, quality, imageTypes) {
const imageDatas = [];
for (const imageType of imageTypes) {
const { dataURL, mimetype } = convertCanvasToDataURL(
canvas,
imageType.mimetype,
quality
);
imageDatas.push({
dataURL: dataURL,
mimetype: mimetype,
});
}
return imageDatas;
}
}

export const imageProcessingService = {
dependencies: ImageProcessingService.dependencies,
start() {
return new ImageProcessingService(...arguments);
},
};

registry.category("services").add("image_processing", imageProcessingService);
36 changes: 36 additions & 0 deletions addons/web/static/src/core/utils/image_processing.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/** @odoo-module **/

import { memoize } from "@web/core/utils/functions";

/**
* Use this function to handle implicit conversion on canvas.toDataURL due to browser incompatibility
* See {@link https://caniuse.com/mdn-api_htmlcanvaselement_todataurl_type_parameter_webp}
*
* @param {HTMLCanvasElement} canvas
* @param {string} mimetype See {@link HTMLCanvasElement.toDataURL}
* @param {number} quality See {@link HTMLCanvasElement.toDataURL}
* @returns {{dataURL: string, mimetype: string}} The resulting data url from {@link HTMLCanvasElement.toDataURL} and
* the actual output mimetype
*/
export function convertCanvasToDataURL(canvas, mimetype, quality) {
const dataURL = canvas.toDataURL(mimetype, quality);
const actualMimetype = dataURL.split(":")[1].split(";")[0];
return {
dataURL,
mimetype: actualMimetype,
};
}

/**
* Checks whether the browser can export a webp image from a canvas using {@link HTMLCanvasElement.toDataURL}
*
* @type {() => boolean}
*/
export const canExportCanvasAsWebp = memoize(() => {
const dummyCanvas = document.createElement("canvas");
dummyCanvas.width = 1;
dummyCanvas.height = 1;
const data = dummyCanvas.toDataURL("image/webp");
dummyCanvas.remove();
return data.split(":")[1].split(";")[0] === "image/webp";
});
61 changes: 7 additions & 54 deletions addons/web/static/src/views/fields/image/image_field.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export class ImageField extends Component {
};

setup() {
this.imageProcessing = useService("image_processing");
this.notification = useService("notification");
this.orm = useService("orm");
this.isMobile = isMobileOS();
Expand Down Expand Up @@ -130,60 +131,12 @@ export class ImageField extends Component {
this.state.isValid = true;
if (info.type === "image/webp") {
// Generate alternate sizes and format for reports.
const image = document.createElement("img");
image.src = `data:image/webp;base64,${info.data}`;
await new Promise((resolve) => image.addEventListener("load", resolve));
const originalSize = Math.max(image.width, image.height);
const smallerSizes = [1024, 512, 256, 128].filter((size) => size < originalSize);
let referenceId = undefined;
for (const size of [originalSize, ...smallerSizes]) {
const ratio = size / originalSize;
const canvas = document.createElement("canvas");
canvas.width = image.width * ratio;
canvas.height = image.height * ratio;
const ctx = canvas.getContext("2d");
ctx.fillStyle = "rgb(255, 255, 255)";
ctx.fillRect(0, 0, canvas.width, canvas.height);
ctx.drawImage(
image,
0,
0,
image.width,
image.height,
0,
0,
canvas.width,
canvas.height
);
const [resizedId] = await this.orm.call("ir.attachment", "create_unique", [
[
{
name: info.name,
description: size === originalSize ? "" : `resize: ${size}`,
datas:
size === originalSize
? info.data
: canvas.toDataURL("image/webp", 0.75).split(",")[1],
res_id: referenceId,
res_model: "ir.attachment",
mimetype: "image/webp",
},
],
]);
referenceId = referenceId || resizedId; // Keep track of original.
await this.orm.call("ir.attachment", "create_unique", [
[
{
name: info.name.replace(/\.webp$/, ".jpg"),
description: "format: jpeg",
datas: canvas.toDataURL("image/jpeg", 0.75).split(",")[1],
res_id: resizedId,
res_model: "ir.attachment",
mimetype: "image/jpeg",
},
],
]);
}
await this.imageProcessing.generateImageAlternatives(
`data:image/webp;base64,${info.data}`,
0.75,
true,
info.name.split(".").splice(-1).join()
);
}
this.props.record.update({ [this.props.name]: info.data });
}
Expand Down
Loading