refactor: correctly serialize nativeImage/buffer with typeUtils (#23666)
* refactor: correctly serialize nativeImage/buffer with typeUtils * test: add serialization specs * fix: construct from dataURL * test: test for dataURL specificity
This commit is contained in:
parent
33d6a99d40
commit
4b23a85475
4 changed files with 166 additions and 16 deletions
|
@ -6,6 +6,8 @@ import { ifdescribe } from './spec-helpers';
|
|||
import { ipcMain, BrowserWindow } from 'electron/main';
|
||||
import { emittedOnce } from './events-helpers';
|
||||
import { NativeImage } from 'electron/common';
|
||||
import { serialize, deserialize } from '../lib/common/type-utils';
|
||||
import { nativeImage } from 'electron';
|
||||
|
||||
const features = process.electronBinding('features');
|
||||
|
||||
|
@ -76,6 +78,143 @@ function makeEachWindow () {
|
|||
return () => w;
|
||||
}
|
||||
|
||||
describe('typeUtils serialization/deserialization', () => {
|
||||
it('serializes and deserializes an empty NativeImage', () => {
|
||||
const image = nativeImage.createEmpty();
|
||||
const serializedImage = serialize(image);
|
||||
const empty = deserialize(serializedImage);
|
||||
|
||||
expect(empty.isEmpty()).to.be.true();
|
||||
expect(empty.getAspectRatio()).to.equal(1);
|
||||
expect(empty.toDataURL()).to.equal('data:image/png;base64,');
|
||||
expect(empty.toDataURL({ scaleFactor: 2.0 })).to.equal('data:image/png;base64,');
|
||||
expect(empty.getSize()).to.deep.equal({ width: 0, height: 0 });
|
||||
expect(empty.getBitmap()).to.be.empty();
|
||||
expect(empty.getBitmap({ scaleFactor: 2.0 })).to.be.empty();
|
||||
expect(empty.toBitmap()).to.be.empty();
|
||||
expect(empty.toBitmap({ scaleFactor: 2.0 })).to.be.empty();
|
||||
expect(empty.toJPEG(100)).to.be.empty();
|
||||
expect(empty.toPNG()).to.be.empty();
|
||||
expect(empty.toPNG({ scaleFactor: 2.0 })).to.be.empty();
|
||||
});
|
||||
|
||||
it('serializes and deserializes a non-empty NativeImage', () => {
|
||||
const dataURL = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAAFklEQVQYlWP8//8/AwMDEwMDAwMDAwAkBgMBBMzldwAAAABJRU5ErkJggg==';
|
||||
const image = nativeImage.createFromDataURL(dataURL);
|
||||
const serializedImage = serialize(image);
|
||||
const nonEmpty = deserialize(serializedImage);
|
||||
|
||||
expect(nonEmpty.isEmpty()).to.be.false();
|
||||
expect(nonEmpty.getAspectRatio()).to.equal(1);
|
||||
expect(nonEmpty.toDataURL()).to.not.be.empty();
|
||||
expect(nonEmpty.toDataURL({ scaleFactor: 1.0 })).to.equal(dataURL);
|
||||
expect(nonEmpty.getSize()).to.deep.equal({ width: 2, height: 2 });
|
||||
expect(nonEmpty.getBitmap()).to.not.be.empty();
|
||||
expect(nonEmpty.toPNG()).to.not.be.empty();
|
||||
});
|
||||
|
||||
it('serializes and deserializes a non-empty NativeImage with multiple representations', () => {
|
||||
const image = nativeImage.createEmpty();
|
||||
|
||||
const dataURL1 = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQYlWNgAAIAAAUAAdafFs0AAAAASUVORK5CYII=';
|
||||
image.addRepresentation({ scaleFactor: 1.0, dataURL: dataURL1 });
|
||||
|
||||
const dataURL2 = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAAFklEQVQYlWP8//8/AwMDEwMDAwMDAwAkBgMBBMzldwAAAABJRU5ErkJggg==';
|
||||
image.addRepresentation({ scaleFactor: 2.0, dataURL: dataURL2 });
|
||||
|
||||
const serializedImage = serialize(image);
|
||||
const nonEmpty = deserialize(serializedImage);
|
||||
|
||||
expect(nonEmpty.isEmpty()).to.be.false();
|
||||
expect(nonEmpty.getAspectRatio()).to.equal(1);
|
||||
expect(nonEmpty.getSize()).to.deep.equal({ width: 1, height: 1 });
|
||||
expect(nonEmpty.getBitmap()).to.not.be.empty();
|
||||
expect(nonEmpty.getBitmap({ scaleFactor: 1.0 })).to.not.be.empty();
|
||||
expect(nonEmpty.getBitmap({ scaleFactor: 2.0 })).to.not.be.empty();
|
||||
expect(nonEmpty.toBitmap()).to.not.be.empty();
|
||||
expect(nonEmpty.toBitmap({ scaleFactor: 1.0 })).to.not.be.empty();
|
||||
expect(nonEmpty.toBitmap({ scaleFactor: 2.0 })).to.not.be.empty();
|
||||
expect(nonEmpty.toPNG()).to.not.be.empty();
|
||||
expect(nonEmpty.toPNG({ scaleFactor: 1.0 })).to.not.be.empty();
|
||||
expect(nonEmpty.toPNG({ scaleFactor: 2.0 })).to.not.be.empty();
|
||||
expect(nonEmpty.toDataURL()).to.not.be.empty();
|
||||
expect(nonEmpty.toDataURL({ scaleFactor: 1.0 })).to.equal(dataURL1);
|
||||
expect(nonEmpty.toDataURL({ scaleFactor: 2.0 })).to.equal(dataURL2);
|
||||
});
|
||||
|
||||
it('serializes and deserializes an Array', () => {
|
||||
const array = [1, 2, 3, 4, 5];
|
||||
const serialized = serialize(array);
|
||||
const deserialized = deserialize(serialized);
|
||||
|
||||
expect(deserialized).to.deep.equal(array);
|
||||
});
|
||||
|
||||
it('serializes and deserializes a Buffer', () => {
|
||||
const buffer = Buffer.from('hello world!', 'utf-8');
|
||||
const serialized = serialize(buffer);
|
||||
const deserialized = deserialize(serialized);
|
||||
|
||||
expect(deserialized).to.deep.equal(buffer);
|
||||
});
|
||||
|
||||
it('serializes and deserializes a Boolean', () => {
|
||||
const bool = true;
|
||||
const serialized = serialize(bool);
|
||||
const deserialized = deserialize(serialized);
|
||||
|
||||
expect(deserialized).to.equal(bool);
|
||||
});
|
||||
|
||||
it('serializes and deserializes a Date', () => {
|
||||
const date = new Date();
|
||||
const serialized = serialize(date);
|
||||
const deserialized = deserialize(serialized);
|
||||
|
||||
expect(deserialized).to.equal(date);
|
||||
});
|
||||
|
||||
it('serializes and deserializes a Number', () => {
|
||||
const number = 42;
|
||||
const serialized = serialize(number);
|
||||
const deserialized = deserialize(serialized);
|
||||
|
||||
expect(deserialized).to.equal(number);
|
||||
});
|
||||
|
||||
it('serializes and deserializes a Regexp', () => {
|
||||
const regex = new RegExp('ab+c');
|
||||
const serialized = serialize(regex);
|
||||
const deserialized = deserialize(serialized);
|
||||
|
||||
expect(deserialized).to.equal(regex);
|
||||
});
|
||||
|
||||
it('serializes and deserializes a String', () => {
|
||||
const str = 'hello world';
|
||||
const serialized = serialize(str);
|
||||
const deserialized = deserialize(serialized);
|
||||
|
||||
expect(deserialized).to.equal(str);
|
||||
});
|
||||
|
||||
it('serializes and deserializes an Error', () => {
|
||||
const err = new Error('oh crap');
|
||||
const serialized = serialize(err);
|
||||
const deserialized = deserialize(serialized);
|
||||
|
||||
expect(deserialized).to.equal(err);
|
||||
});
|
||||
|
||||
it('serializes and deserializes a simple Object', () => {
|
||||
const obj = { hello: 'world', 'answer-to-everything': 42 };
|
||||
const serialized = serialize(obj);
|
||||
const deserialized = deserialize(serialized);
|
||||
|
||||
expect(deserialized).to.deep.equal(obj);
|
||||
});
|
||||
});
|
||||
|
||||
ifdescribe(features.isRemoteModuleEnabled())('remote module', () => {
|
||||
const fixtures = path.join(__dirname, 'fixtures');
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue