Compare commits
168 Commits
Author | SHA1 | Date | |
---|---|---|---|
24254df7db | |||
cae73f1f1b | |||
073a52213e | |||
0d34485a00 | |||
65519d539e | |||
ec44a8e817 | |||
920f225cb0 | |||
d5d4bd61ff | |||
5656d10b67 | |||
adb4b6468b | |||
0a293d7f63 | |||
27cb5afd5b | |||
5e58fc6b04 | |||
e820adfc96 | |||
5a8a114dcb | |||
a1c685e820 | |||
377dcfcc1b | |||
913e67ca93 | |||
fb1a97c7d4 | |||
42eef6945d | |||
d04b08d640 | |||
c547dd10d3 | |||
f4579da9c9 | |||
37dc585d80 | |||
bc0a425a0f | |||
b696f246a1 | |||
e6e197e140 | |||
1c0e8a1fd3 | |||
e3e154fa1a | |||
73b7c437f9 | |||
719168be77 | |||
a2021b175c | |||
9a388fbd13 | |||
1ba0452540 | |||
73df9f18f0 | |||
0e7521877b | |||
120b37c192 | |||
5f3502b838 | |||
33f99432c5 | |||
85756ff5df | |||
84e567ad6a | |||
39281331fa | |||
438ce2ce63 | |||
a13e17e256 | |||
cd6db2d776 | |||
a08662b617 | |||
003ec9de35 | |||
e7f76ca0b8 | |||
21111e2927 | |||
445c3ef32c | |||
9df5542ee1 | |||
fffc4a0cd1 | |||
50a8743be3 | |||
8480bc7dbd | |||
72e4546922 | |||
11be5babca | |||
17e5db2427 | |||
465093eb07 | |||
b430ac1041 | |||
ea96847c1e | |||
3b5106a61d | |||
9f611b0b52 | |||
18a6b3c3e5 | |||
d9ed4e18ea | |||
9e757aa896 | |||
89b58bb446 | |||
e80ca583cc | |||
2ecc81b34f | |||
60e98ee34f | |||
538ea89ea9 | |||
3990e11e0a | |||
0251f88fe5 | |||
bbcb959b11 | |||
b5e928bac9 | |||
6592dee4a9 | |||
9b3d72191e | |||
a92e5b48ff | |||
e355764ab0 | |||
c5efd5a8bf | |||
385461944b | |||
8385ba3274 | |||
6ca6a77595 | |||
14c837e894 | |||
33346d7cb6 | |||
05d4f531e2 | |||
ede2c49b12 | |||
16acd32c68 | |||
cc90192860 | |||
3607005fa8 | |||
7646a64f94 | |||
c8ce6ce27b | |||
1240474c4b | |||
f5e84441c0 | |||
6bc19d78bc | |||
a4437d2873 | |||
cd19650748 | |||
253315b3b1 | |||
4203ad9a13 | |||
6958202f9d | |||
386fef063f | |||
d7246ca427 | |||
fd024853b6 | |||
bd53d17876 | |||
3f87f571f4 | |||
1c69a6f1b7 | |||
82419cbb6e | |||
db65630c8d | |||
b8e54b947f | |||
f23897108d | |||
1efe5b21f0 | |||
fc71b4d249 | |||
dc81d46556 | |||
56c2080f43 | |||
4cc50fcaa5 | |||
2d67562576 | |||
76f2d7afa7 | |||
80fa9c4f21 | |||
8f215a5b4b | |||
bffd9cb52a | |||
74b1ff5b10 | |||
3c0079fea0 | |||
c0a9723d20 | |||
a4f0a76200 | |||
eb57b0130b | |||
f8c37c7abc | |||
72373f8812 | |||
b285e99e7d | |||
f9a6b88bb6 | |||
4a65d506f2 | |||
3bc03c90fd | |||
c35dfa4ac5 | |||
1d2a9a9dde | |||
925220bb13 | |||
16d088bfe3 | |||
b8e22ee435 | |||
60dea4b932 | |||
8ae1a42e4b | |||
cfdc7a46e6 | |||
afb23adcbf | |||
3b84a474b8 | |||
e96bb04e88 | |||
2e3b8507b2 | |||
e12c69f1a6 | |||
d049a23469 | |||
2633f427c8 | |||
ff920f1d7b | |||
fd69560025 | |||
ba51e47e05 | |||
409f552274 | |||
69a7c184bd | |||
3039c84738 | |||
bfa5cd085d | |||
7c282b30b1 | |||
06fa3c541e | |||
c9e31ac1f7 | |||
e248486d3d | |||
b32a52d236 | |||
a24b4d6d4d | |||
b831aa0075 | |||
bf4d4b78cb | |||
496896e36e | |||
6b88ec1f8a | |||
3af5f3a96d | |||
ddc5564515 | |||
bc5da7ef06 | |||
45221c0b03 | |||
d29cf2ffa7 | |||
f6c0b89d1f |
1
codecs/resize/.gitignore
vendored
1
codecs/resize/.gitignore
vendored
@ -3,3 +3,4 @@ target
|
||||
Cargo.lock
|
||||
bin/
|
||||
pkg/README.md
|
||||
lut.inc
|
||||
|
@ -1,5 +1,5 @@
|
||||
[package]
|
||||
name = "resize"
|
||||
name = "squooshresize"
|
||||
version = "0.1.0"
|
||||
authors = ["Surma <surma@surma.link>"]
|
||||
|
||||
|
53
codecs/resize/benchmark.js
Normal file
53
codecs/resize/benchmark.js
Normal file
@ -0,0 +1,53 @@
|
||||
// THIS IS NOT A NODE SCRIPT
|
||||
// This is a d8 script. Please install jsvu[1] and install v8.
|
||||
// Then run `npm run --silent benchmark`.
|
||||
// [1]: https://github.com/GoogleChromeLabs/jsvu
|
||||
|
||||
self = global = this;
|
||||
load("./pkg/resize.js");
|
||||
|
||||
async function init() {
|
||||
// Adjustable constants.
|
||||
const inputDimensions = 2000;
|
||||
const outputDimensions = 1500;
|
||||
const algorithm = 3; // Lanczos
|
||||
const iterations = new Array(100);
|
||||
|
||||
// Constants. Don’t change.
|
||||
const imageByteSize = inputDimensions * inputDimensions * 4;
|
||||
const imageBuffer = new Uint8ClampedArray(imageByteSize);
|
||||
|
||||
const module = await WebAssembly.compile(readbuffer("./pkg/resize_bg.wasm"));
|
||||
await wasm_bindgen(module);
|
||||
[[false, false], [true, false], [false, true], [true, true]].forEach(
|
||||
opts => {
|
||||
print(`\npremultiplication: ${opts[0]}`);
|
||||
print(`color space conversion: ${opts[1]}`);
|
||||
print(`==============================`);
|
||||
for (let i = 0; i < 100; i++) {
|
||||
const start = Date.now();
|
||||
wasm_bindgen.resize(
|
||||
imageBuffer,
|
||||
inputDimensions,
|
||||
inputDimensions,
|
||||
outputDimensions,
|
||||
outputDimensions,
|
||||
algorithm,
|
||||
...opts
|
||||
);
|
||||
iterations[i] = Date.now() - start;
|
||||
}
|
||||
const average =
|
||||
iterations.reduce((sum, c) => sum + c) / iterations.length;
|
||||
const stddev = Math.sqrt(
|
||||
iterations
|
||||
.map(i => Math.pow(i - average, 2))
|
||||
.reduce((sum, c) => sum + c) / iterations.length
|
||||
);
|
||||
print(`n = ${iterations.length}`);
|
||||
print(`Average: ${average}`);
|
||||
print(`StdDev: ${stddev}`);
|
||||
}
|
||||
);
|
||||
}
|
||||
init().catch(e => console.error(e, e.stack));
|
23
codecs/resize/build.rs
Normal file
23
codecs/resize/build.rs
Normal file
@ -0,0 +1,23 @@
|
||||
include!("./src/srgb.rs");
|
||||
|
||||
use std::io::Write;
|
||||
|
||||
fn main() -> std::io::Result<()> {
|
||||
let mut srgb_to_linear_lut = String::from("static SRGB_TO_LINEAR_LUT: [f32; 256] = [");
|
||||
let mut linear_to_srgb_lut = String::from("static LINEAR_TO_SRGB_LUT: [f32; 256] = [");
|
||||
for i in 0..256 {
|
||||
srgb_to_linear_lut.push_str(&format!("{0:.7}", srgb_to_linear((i as f32) / 255.0)));
|
||||
srgb_to_linear_lut.push_str(",");
|
||||
linear_to_srgb_lut.push_str(&format!("{0:.7}", linear_to_srgb((i as f32) / 255.0)));
|
||||
linear_to_srgb_lut.push_str(",");
|
||||
}
|
||||
srgb_to_linear_lut.pop().unwrap();
|
||||
linear_to_srgb_lut.pop().unwrap();
|
||||
srgb_to_linear_lut.push_str("];");
|
||||
linear_to_srgb_lut.push_str("];");
|
||||
|
||||
let mut file = std::fs::File::create("src/lut.inc")?;
|
||||
file.write_all(srgb_to_linear_lut.as_bytes())?;
|
||||
file.write_all(linear_to_srgb_lut.as_bytes())?;
|
||||
Ok(())
|
||||
}
|
@ -2,6 +2,7 @@
|
||||
"name": "resize",
|
||||
"scripts": {
|
||||
"build:image": "docker build -t squoosh-resize .",
|
||||
"build": "docker run --rm -v $(pwd):/src squoosh-resize ./build.sh"
|
||||
"build": "docker run --rm -v $(pwd):/src squoosh-resize ./build.sh",
|
||||
"benchmark": "v8 --no-liftoff --no-wasm-tier-up ./benchmark.js"
|
||||
}
|
||||
}
|
||||
|
4
codecs/resize/pkg/resize.d.ts
vendored
4
codecs/resize/pkg/resize.d.ts
vendored
@ -6,6 +6,8 @@
|
||||
* @param {number} arg3
|
||||
* @param {number} arg4
|
||||
* @param {number} arg5
|
||||
* @param {boolean} arg6
|
||||
* @param {boolean} arg7
|
||||
* @returns {Uint8Array}
|
||||
*/
|
||||
export function resize(arg0: Uint8Array, arg1: number, arg2: number, arg3: number, arg4: number, arg5: number): Uint8Array;
|
||||
export function resize(arg0: Uint8Array, arg1: number, arg2: number, arg3: number, arg4: number, arg5: number, arg6: boolean, arg7: boolean): Uint8Array;
|
||||
|
@ -46,13 +46,15 @@
|
||||
* @param {number} arg3
|
||||
* @param {number} arg4
|
||||
* @param {number} arg5
|
||||
* @param {boolean} arg6
|
||||
* @param {boolean} arg7
|
||||
* @returns {Uint8Array}
|
||||
*/
|
||||
__exports.resize = function(arg0, arg1, arg2, arg3, arg4, arg5) {
|
||||
__exports.resize = function(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
|
||||
const ptr0 = passArray8ToWasm(arg0);
|
||||
const len0 = WASM_VECTOR_LEN;
|
||||
const retptr = globalArgumentPtr();
|
||||
wasm.resize(retptr, ptr0, len0, arg1, arg2, arg3, arg4, arg5);
|
||||
wasm.resize(retptr, ptr0, len0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
|
||||
const mem = getUint32Memory();
|
||||
const rustptr = mem[retptr / 4];
|
||||
const rustlen = mem[retptr / 4 + 1];
|
||||
|
2
codecs/resize/pkg/resize_bg.d.ts
vendored
2
codecs/resize/pkg/resize_bg.d.ts
vendored
@ -3,4 +3,4 @@ export const memory: WebAssembly.Memory;
|
||||
export function __wbindgen_global_argument_ptr(): number;
|
||||
export function __wbindgen_malloc(a: number): number;
|
||||
export function __wbindgen_free(a: number, b: number): void;
|
||||
export function resize(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number): void;
|
||||
export function resize(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number): void;
|
||||
|
Binary file not shown.
@ -9,6 +9,9 @@ use resize::Pixel::RGBA;
|
||||
use resize::Type;
|
||||
use wasm_bindgen::prelude::*;
|
||||
|
||||
mod srgb;
|
||||
use srgb::Clamp;
|
||||
|
||||
cfg_if! {
|
||||
// When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
|
||||
// allocator.
|
||||
@ -19,15 +22,50 @@ cfg_if! {
|
||||
}
|
||||
}
|
||||
|
||||
include!("./lut.inc");
|
||||
|
||||
// If `with_space_conversion` is true, this function returns 2 functions that
|
||||
// convert from sRGB to linear RGB and vice versa. If `with_space_conversion` is
|
||||
// false, the 2 functions returned do nothing.
|
||||
fn converter_funcs(with_space_conversion: bool) -> ((fn(u8) -> f32), (fn(f32) -> u8)) {
|
||||
if with_space_conversion {
|
||||
(
|
||||
|v| SRGB_TO_LINEAR_LUT[v as usize] * 255.0,
|
||||
|v| (LINEAR_TO_SRGB_LUT[v as usize] * 255.0) as u8,
|
||||
)
|
||||
} else {
|
||||
(|v| v as f32, |v| v as u8)
|
||||
}
|
||||
}
|
||||
|
||||
// If `with_alpha_premultiplication` is true, this function returns a function
|
||||
// that premultiply the alpha channel with the given channel value and another
|
||||
// function that reverses that process. If `with_alpha_premultiplication` is
|
||||
// false, the functions just return the channel value.
|
||||
fn alpha_multiplier_funcs(
|
||||
with_alpha_premultiplication: bool,
|
||||
) -> ((fn(f32, u8) -> u8), (fn(u8, u8) -> f32)) {
|
||||
if with_alpha_premultiplication {
|
||||
(
|
||||
|v, a| (v * (a as f32) / 255.0) as u8,
|
||||
|v, a| (v as f32) * 255.0 / (a as f32).clamp(0.0, 255.0),
|
||||
)
|
||||
} else {
|
||||
(|v, _a| v as u8, |v, _a| v as f32)
|
||||
}
|
||||
}
|
||||
|
||||
#[wasm_bindgen]
|
||||
#[no_mangle]
|
||||
pub fn resize(
|
||||
input_image: Vec<u8>,
|
||||
mut input_image: Vec<u8>,
|
||||
input_width: usize,
|
||||
input_height: usize,
|
||||
output_width: usize,
|
||||
output_height: usize,
|
||||
typ_idx: usize,
|
||||
premultiply: bool,
|
||||
color_space_conversion: bool,
|
||||
) -> Vec<u8> {
|
||||
let typ = match typ_idx {
|
||||
0 => Type::Triangle,
|
||||
@ -36,7 +74,23 @@ pub fn resize(
|
||||
3 => Type::Lanczos3,
|
||||
_ => panic!("Nope"),
|
||||
};
|
||||
let num_input_pixels = input_width * input_height;
|
||||
let num_output_pixels = output_width * output_height;
|
||||
|
||||
let (to_linear, to_color_space) = converter_funcs(color_space_conversion);
|
||||
let (premultiplier, demultiplier) = alpha_multiplier_funcs(premultiply);
|
||||
|
||||
// If both options are false, there is no preprocessing on the pixel valus
|
||||
// and we can skip the loop.
|
||||
if premultiply || color_space_conversion {
|
||||
for i in 0..num_input_pixels {
|
||||
for j in 0..3 {
|
||||
input_image[4 * i + j] =
|
||||
premultiplier(to_linear(input_image[4 * i + j]), input_image[4 * i + 3]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let mut resizer = resize::new(
|
||||
input_width,
|
||||
input_height,
|
||||
@ -48,5 +102,20 @@ pub fn resize(
|
||||
let mut output_image = Vec::<u8>::with_capacity(num_output_pixels * 4);
|
||||
output_image.resize(num_output_pixels * 4, 0);
|
||||
resizer.resize(input_image.as_slice(), output_image.as_mut_slice());
|
||||
|
||||
if premultiply || color_space_conversion {
|
||||
for i in 0..num_output_pixels {
|
||||
for j in 0..3 {
|
||||
// We don’t need to worry about division by zero, as division by zero
|
||||
// is well-defined on floats to return ±Inf. ±Inf is converted to 0
|
||||
// when casting to integers.
|
||||
output_image[4 * i + j] = to_color_space(demultiplier(
|
||||
output_image[4 * i + j],
|
||||
output_image[4 * i + 3],
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return output_image;
|
||||
}
|
||||
|
29
codecs/resize/src/srgb.rs
Normal file
29
codecs/resize/src/srgb.rs
Normal file
@ -0,0 +1,29 @@
|
||||
pub trait Clamp: std::cmp::PartialOrd + Sized {
|
||||
fn clamp(self, min: Self, max: Self) -> Self {
|
||||
if self.lt(&min) {
|
||||
min
|
||||
} else if self.gt(&max) {
|
||||
max
|
||||
} else {
|
||||
self
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Clamp for f32 {}
|
||||
|
||||
pub fn srgb_to_linear(v: f32) -> f32 {
|
||||
if v < 0.04045 {
|
||||
v / 12.92
|
||||
} else {
|
||||
((v + 0.055) / 1.055).powf(2.4).clamp(0.0, 1.0)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn linear_to_srgb(v: f32) -> f32 {
|
||||
if v < 0.0031308 {
|
||||
v * 12.92
|
||||
} else {
|
||||
(1.055 * v.powf(1.0 / 2.4) - 0.055).clamp(0.0, 1.0)
|
||||
}
|
||||
}
|
@ -1,203 +0,0 @@
|
||||
const path = require('path');
|
||||
const { URL } = require('url');
|
||||
|
||||
const gzipSize = require('gzip-size');
|
||||
const fetch = require('node-fetch');
|
||||
const prettyBytes = require('pretty-bytes');
|
||||
const escapeRE = require('escape-string-regexp');
|
||||
const readdirp = require('readdirp');
|
||||
const chalk = new require('chalk').constructor({ level: 4 });
|
||||
|
||||
function fetchTravis(path, options = {}) {
|
||||
const url = new URL(path, 'https://api.travis-ci.org');
|
||||
url.search = new URLSearchParams(options);
|
||||
|
||||
return fetch(url, {
|
||||
headers: { 'Travis-API-Version': '3' },
|
||||
});
|
||||
}
|
||||
|
||||
function fetchTravisBuildInfo(user, repo, branch) {
|
||||
return fetchTravis(`/repo/${encodeURIComponent(`${user}/${repo}`)}/builds`, {
|
||||
'branch.name': branch,
|
||||
state: 'passed',
|
||||
limit: 1,
|
||||
event_type: 'push',
|
||||
}).then(r => r.json());
|
||||
}
|
||||
|
||||
function fetchTravisText(path) {
|
||||
return fetchTravis(path).then(r => r.text());
|
||||
}
|
||||
|
||||
/**
|
||||
* Recursively-read a directory and turn it into an array of { name, size, gzipSize }
|
||||
*/
|
||||
async function dirToInfoArray(startPath) {
|
||||
const results = await new Promise((resolve, reject) => {
|
||||
readdirp({ root: startPath }, (err, results) => {
|
||||
if (err) reject(err); else resolve(results);
|
||||
});
|
||||
});
|
||||
|
||||
return Promise.all(
|
||||
results.files.map(async (entry) => ({
|
||||
name: entry.path,
|
||||
gzipSize: await gzipSize.file(entry.fullPath),
|
||||
size: entry.stat.size,
|
||||
})),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Try to treat two entries with different file name hashes as the same file.
|
||||
*/
|
||||
function findHashedMatch(name, buildInfo) {
|
||||
const nameParts = /^(.+\.)[a-f0-9]+(\..+)$/.exec(name);
|
||||
if (!nameParts) return;
|
||||
|
||||
const matchRe = new RegExp(`^${escapeRE(nameParts[1])}[a-f0-9]+${escapeRE(nameParts[2])}$`);
|
||||
const matchingEntry = buildInfo.find(entry => matchRe.test(entry.name));
|
||||
return matchingEntry;
|
||||
}
|
||||
|
||||
const buildSizePrefix = '=== BUILD SIZES: ';
|
||||
const buildSizePrefixRe = new RegExp(`^${escapeRE(buildSizePrefix)}(.+)$`, 'm');
|
||||
|
||||
async function getPreviousBuildInfo() {
|
||||
const buildData = await fetchTravisBuildInfo('GoogleChromeLabs', 'squoosh', 'master');
|
||||
const jobUrl = buildData.builds[0].jobs[0]['@href'];
|
||||
const log = await fetchTravisText(jobUrl + '/log.txt');
|
||||
const reResult = buildSizePrefixRe.exec(log);
|
||||
|
||||
if (!reResult) return;
|
||||
return JSON.parse(reResult[1]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate an array that represents the difference between builds.
|
||||
* Returns an array of { beforeName, afterName, beforeSize, afterSize }.
|
||||
* Sizes are gzipped size.
|
||||
* Before/after properties are missing if resource isn't in the previous/new build.
|
||||
*/
|
||||
function getChanges(previousBuildInfo, buildInfo) {
|
||||
const buildChanges = [];
|
||||
const alsoInPreviousBuild = new Set();
|
||||
|
||||
for (const oldEntry of previousBuildInfo) {
|
||||
const newEntry = buildInfo.find(entry => entry.name === oldEntry.name) ||
|
||||
findHashedMatch(oldEntry.name, buildInfo);
|
||||
|
||||
// Entry is in previous build, but not the new build.
|
||||
if (!newEntry) {
|
||||
buildChanges.push({
|
||||
beforeName: oldEntry.name,
|
||||
beforeSize: oldEntry.gzipSize,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
// Mark this entry so we know we've dealt with it.
|
||||
alsoInPreviousBuild.add(newEntry);
|
||||
|
||||
// If they're the same, just ignore.
|
||||
// Using size rather than gzip size. I've seen different platforms produce different zipped
|
||||
// sizes.
|
||||
if (
|
||||
oldEntry.size === newEntry.size &&
|
||||
oldEntry.name === newEntry.name
|
||||
) continue;
|
||||
|
||||
// Entry is in both builds (maybe renamed).
|
||||
buildChanges.push({
|
||||
beforeName: oldEntry.name,
|
||||
afterName: newEntry.name,
|
||||
beforeSize: oldEntry.gzipSize,
|
||||
afterSize: newEntry.gzipSize,
|
||||
});
|
||||
}
|
||||
|
||||
// Look for entries that are only in the new build.
|
||||
for (const newEntry of buildInfo) {
|
||||
if (alsoInPreviousBuild.has(newEntry)) continue;
|
||||
|
||||
buildChanges.push({
|
||||
afterName: newEntry.name,
|
||||
afterSize: newEntry.gzipSize,
|
||||
});
|
||||
}
|
||||
|
||||
return buildChanges;
|
||||
}
|
||||
|
||||
async function main() {
|
||||
// Output the current build sizes for later retrieval.
|
||||
const buildInfo = await dirToInfoArray(__dirname + '/../build');
|
||||
console.log(buildSizePrefix + JSON.stringify(buildInfo));
|
||||
console.log('\nBuild change report:');
|
||||
|
||||
let previousBuildInfo;
|
||||
|
||||
try {
|
||||
previousBuildInfo = await getPreviousBuildInfo();
|
||||
} catch (err) {
|
||||
console.log(` Couldn't parse previous build info`);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!previousBuildInfo) {
|
||||
console.log(` Couldn't find previous build info`);
|
||||
return;
|
||||
}
|
||||
|
||||
const buildChanges = getChanges(previousBuildInfo, buildInfo);
|
||||
|
||||
if (buildChanges.length === 0) {
|
||||
console.log(' No changes');
|
||||
return;
|
||||
}
|
||||
|
||||
// One letter references, so it's easier to get the spacing right.
|
||||
const y = chalk.yellow;
|
||||
const g = chalk.green;
|
||||
const r = chalk.red;
|
||||
|
||||
for (const change of buildChanges) {
|
||||
// New file.
|
||||
if (!change.beforeSize) {
|
||||
console.log(` ${g('ADDED')} ${change.afterName} - ${prettyBytes(change.afterSize)}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Removed file.
|
||||
if (!change.afterSize) {
|
||||
console.log(` ${r('REMOVED')} ${change.beforeName} - was ${prettyBytes(change.beforeSize)}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Changed file.
|
||||
let size;
|
||||
|
||||
if (change.beforeSize === change.afterSize) {
|
||||
// Just renamed.
|
||||
size = `${prettyBytes(change.afterSize)} -> no change`;
|
||||
} else {
|
||||
const color = change.afterSize > change.beforeSize ? r : g;
|
||||
const sizeDiff = prettyBytes(change.afterSize - change.beforeSize, { signed: true });
|
||||
const relativeDiff = Math.round((change.afterSize / change.beforeSize) * 1000) / 1000;
|
||||
|
||||
size = `${prettyBytes(change.beforeSize)} -> ${prettyBytes(change.afterSize)}` +
|
||||
' (' +
|
||||
color(`${sizeDiff}, ${relativeDiff}x`) +
|
||||
')';
|
||||
}
|
||||
|
||||
console.log(` ${y('CHANGED')} ${change.afterName} - ${size}`);
|
||||
|
||||
if (change.beforeName !== change.afterName) {
|
||||
console.log(` Renamed from: ${change.beforeName}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
main();
|
10270
package-lock.json
generated
10270
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
63
package.json
63
package.json
@ -1,14 +1,14 @@
|
||||
{
|
||||
"private": true,
|
||||
"name": "squoosh",
|
||||
"version": "1.4.0",
|
||||
"version": "1.7.0",
|
||||
"license": "apache-2.0",
|
||||
"scripts": {
|
||||
"start": "webpack-dev-server --host 0.0.0.0 --hot",
|
||||
"build": "webpack -p",
|
||||
"lint": "tslint -c tslint.json -p tsconfig.json -t verbose",
|
||||
"lintfix": "tslint -c tslint.json -p tsconfig.json -t verbose --fix 'src/**/*.{ts,tsx,js,jsx}'",
|
||||
"sizereport": "node config/size-report.js"
|
||||
"sizereport": "sizereport --config"
|
||||
},
|
||||
"husky": {
|
||||
"hooks": {
|
||||
@ -16,60 +16,61 @@
|
||||
}
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "10.12.29",
|
||||
"@types/node": "10.14.9",
|
||||
"@types/pretty-bytes": "5.1.0",
|
||||
"@types/webassembly-js-api": "0.0.2",
|
||||
"@webcomponents/custom-elements": "1.2.1",
|
||||
"@webpack-cli/serve": "0.1.3",
|
||||
"@types/webassembly-js-api": "0.0.3",
|
||||
"@webcomponents/custom-elements": "1.2.4",
|
||||
"@webpack-cli/serve": "0.1.8",
|
||||
"assets-webpack-plugin": "3.9.10",
|
||||
"chokidar": "2.1.2",
|
||||
"chalk": "2.4.2",
|
||||
"chokidar": "3.0.1",
|
||||
"classnames": "2.2.6",
|
||||
"clean-webpack-plugin": "1.0.1",
|
||||
"comlink": "3.1.1",
|
||||
"copy-webpack-plugin": "5.0.0",
|
||||
"copy-webpack-plugin": "5.0.3",
|
||||
"critters-webpack-plugin": "2.3.0",
|
||||
"css-loader": "1.0.1",
|
||||
"ejs": "2.6.1",
|
||||
"escape-string-regexp": "1.0.5",
|
||||
"ejs": "2.6.2",
|
||||
"escape-string-regexp": "2.0.0",
|
||||
"exports-loader": "0.7.0",
|
||||
"file-drop-element": "0.2.0",
|
||||
"file-loader": "3.0.1",
|
||||
"gzip-size": "5.0.0",
|
||||
"file-loader": "4.0.0",
|
||||
"gzip-size": "5.1.1",
|
||||
"html-webpack-plugin": "3.2.0",
|
||||
"husky": "1.3.1",
|
||||
"idb-keyval": "3.1.0",
|
||||
"husky": "2.4.1",
|
||||
"idb-keyval": "3.2.0",
|
||||
"linkstate": "1.1.1",
|
||||
"loader-utils": "1.2.3",
|
||||
"mini-css-extract-plugin": "0.5.0",
|
||||
"mini-css-extract-plugin": "0.7.0",
|
||||
"minimatch": "3.0.4",
|
||||
"node-fetch": "2.3.0",
|
||||
"node-sass": "4.11.0",
|
||||
"node-fetch": "2.6.0",
|
||||
"node-sass": "4.12.0",
|
||||
"optimize-css-assets-webpack-plugin": "5.0.1",
|
||||
"pointer-tracker": "2.0.3",
|
||||
"preact": "8.4.2",
|
||||
"prerender-loader": "1.3.0",
|
||||
"pretty-bytes": "5.1.0",
|
||||
"pretty-bytes": "5.2.0",
|
||||
"progress-bar-webpack-plugin": "1.12.1",
|
||||
"raw-loader": "1.0.0",
|
||||
"readdirp": "2.2.1",
|
||||
"raw-loader": "3.0.0",
|
||||
"readdirp": "3.0.2",
|
||||
"sass-loader": "7.1.0",
|
||||
"script-ext-html-webpack-plugin": "2.1.3",
|
||||
"source-map-loader": "0.2.4",
|
||||
"style-loader": "0.23.1",
|
||||
"terser-webpack-plugin": "1.2.3",
|
||||
"ts-loader": "5.3.3",
|
||||
"tslint": "5.13.1",
|
||||
"terser-webpack-plugin": "1.3.0",
|
||||
"travis-size-report": "1.0.1",
|
||||
"ts-loader": "6.0.2",
|
||||
"tslint": "5.17.0",
|
||||
"tslint-config-airbnb": "5.11.1",
|
||||
"tslint-config-semistandard": "7.0.0",
|
||||
"tslint-react": "3.6.0",
|
||||
"typed-css-modules": "0.4.1",
|
||||
"typescript": "3.3.3333",
|
||||
"url-loader": "1.1.2",
|
||||
"tslint-config-semistandard": "8.0.1",
|
||||
"tslint-react": "4.0.0",
|
||||
"typed-css-modules": "0.4.2",
|
||||
"typescript": "3.5.2",
|
||||
"url-loader": "2.0.0",
|
||||
"webpack": "4.28.0",
|
||||
"webpack-bundle-analyzer": "3.1.0",
|
||||
"webpack-cli": "3.2.3",
|
||||
"webpack-dev-server": "3.2.1",
|
||||
"webpack-bundle-analyzer": "3.3.2",
|
||||
"webpack-cli": "3.3.4",
|
||||
"webpack-dev-server": "3.7.1",
|
||||
"worker-plugin": "3.1.0"
|
||||
}
|
||||
}
|
||||
|
14
sizereport.config.js
Normal file
14
sizereport.config.js
Normal file
@ -0,0 +1,14 @@
|
||||
const escapeRE = require("escape-string-regexp");
|
||||
|
||||
module.exports = {
|
||||
repo: "GoogleChromeLabs/squoosh",
|
||||
path: "build/**/!(*.map)",
|
||||
branch: "master",
|
||||
findRenamed(path, newPaths) {
|
||||
const nameParts = /^(.+\.)[a-f0-9]+(\..+)$/.exec(path);
|
||||
if (!nameParts) return;
|
||||
|
||||
const matchRe = new RegExp(`^${escapeRE(nameParts[1])}[a-f0-9]+${escapeRE(nameParts[2])}$`);
|
||||
return newPaths.find(newPath => matchRe.test(newPath));
|
||||
}
|
||||
};
|
@ -1,8 +1,10 @@
|
||||
import { h, Component } from 'preact';
|
||||
import linkState from 'linkstate';
|
||||
import { bind, linkRef } from '../../lib/initial-util';
|
||||
import { inputFieldValueAsNumber, inputFieldValue, preventDefault } from '../../lib/util';
|
||||
import { ResizeOptions } from './processor-meta';
|
||||
import {
|
||||
inputFieldValueAsNumber, inputFieldValue, preventDefault, inputFieldChecked,
|
||||
} from '../../lib/util';
|
||||
import { ResizeOptions, isWorkerOptions } from './processor-meta';
|
||||
import * as style from '../../components/Options/style.scss';
|
||||
import Checkbox from '../../components/checkbox';
|
||||
import Expander from '../../components/expander';
|
||||
@ -38,6 +40,8 @@ export default class ResizerOptions extends Component<Props, State> {
|
||||
width: inputFieldValueAsNumber(width),
|
||||
height: inputFieldValueAsNumber(height),
|
||||
method: form.resizeMethod.value,
|
||||
premultiply: inputFieldChecked(form.premultiply, true),
|
||||
linearRGB: inputFieldChecked(form.linearRGB, true),
|
||||
// Casting, as the formfield only returns the correct values.
|
||||
fitMethod: inputFieldValue(form.fitMethod, options.fitMethod) as ResizeOptions['fitMethod'],
|
||||
};
|
||||
@ -90,7 +94,7 @@ export default class ResizerOptions extends Component<Props, State> {
|
||||
<option value="lanczos3">Lanczos3</option>
|
||||
<option value="mitchell">Mitchell</option>
|
||||
<option value="catrom">Catmull-Rom</option>
|
||||
<option value="triangle">Triangle</option>
|
||||
<option value="triangle">Triangle (bilinear)</option>
|
||||
<option value="browser-pixelated">Browser pixelated</option>
|
||||
<option value="browser-low">Browser low quality</option>
|
||||
<option value="browser-medium">Browser medium quality</option>
|
||||
@ -121,6 +125,30 @@ export default class ResizerOptions extends Component<Props, State> {
|
||||
onInput={this.onHeightInput}
|
||||
/>
|
||||
</label>
|
||||
<Expander>
|
||||
{isWorkerOptions(options) ?
|
||||
<label class={style.optionInputFirst}>
|
||||
<Checkbox
|
||||
name="premultiply"
|
||||
checked={options.premultiply}
|
||||
onChange={this.onChange}
|
||||
/>
|
||||
Premultiply alpha channel
|
||||
</label>
|
||||
: null
|
||||
}
|
||||
{isWorkerOptions(options) ?
|
||||
<label class={style.optionInputFirst}>
|
||||
<Checkbox
|
||||
name="linearRGB"
|
||||
checked={options.linearRGB}
|
||||
onChange={this.onChange}
|
||||
/>
|
||||
Linear RGB
|
||||
</label>
|
||||
: null
|
||||
}
|
||||
</Expander>
|
||||
<label class={style.optionInputFirst}>
|
||||
<Checkbox
|
||||
name="maintainAspect"
|
||||
|
@ -1,25 +1,38 @@
|
||||
type BrowserResizeMethods = 'browser-pixelated' | 'browser-low' | 'browser-medium' | 'browser-high';
|
||||
type WorkerResizeMethods = 'point' | 'triangle' | 'catrom' | 'mitchell' | 'lanczos3';
|
||||
type WorkerResizeMethods = 'triangle' | 'catrom' | 'mitchell' | 'lanczos3';
|
||||
const workerResizeMethods: WorkerResizeMethods[] = ['triangle', 'catrom', 'mitchell', 'lanczos3'];
|
||||
|
||||
export interface ResizeOptions {
|
||||
export type ResizeOptions = BrowserResizeOptions | WorkerResizeOptions | VectorResizeOptions;
|
||||
|
||||
export interface ResizeOptionsCommon {
|
||||
width: number;
|
||||
height: number;
|
||||
method: 'vector' | BrowserResizeMethods | WorkerResizeMethods;
|
||||
fitMethod: 'stretch' | 'contain';
|
||||
}
|
||||
|
||||
export interface BrowserResizeOptions extends ResizeOptions {
|
||||
export interface BrowserResizeOptions extends ResizeOptionsCommon {
|
||||
method: BrowserResizeMethods;
|
||||
}
|
||||
|
||||
export interface WorkerResizeOptions extends ResizeOptions {
|
||||
export interface WorkerResizeOptions extends ResizeOptionsCommon {
|
||||
method: WorkerResizeMethods;
|
||||
premultiply: boolean;
|
||||
linearRGB: boolean;
|
||||
}
|
||||
|
||||
export interface VectorResizeOptions extends ResizeOptions {
|
||||
export interface VectorResizeOptions extends ResizeOptionsCommon {
|
||||
method: 'vector';
|
||||
}
|
||||
|
||||
/**
|
||||
* Return whether a set of options are worker resize options.
|
||||
*
|
||||
* @param opts
|
||||
*/
|
||||
export function isWorkerOptions(opts: ResizeOptions): opts is WorkerResizeOptions {
|
||||
return (workerResizeMethods as string[]).includes(opts.method);
|
||||
}
|
||||
|
||||
export const defaultOptions: ResizeOptions = {
|
||||
// Width and height will always default to the image size.
|
||||
// This is set elsewhere.
|
||||
@ -28,4 +41,6 @@ export const defaultOptions: ResizeOptions = {
|
||||
// This will be set to 'vector' if the input is SVG.
|
||||
method: 'lanczos3',
|
||||
fitMethod: 'stretch',
|
||||
premultiply: true,
|
||||
linearRGB: true,
|
||||
};
|
||||
|
@ -45,7 +45,7 @@ export async function resize(data: ImageData, opts: WorkerResizeOptions): Promis
|
||||
|
||||
const result = wasm_bindgen.resize(
|
||||
new Uint8Array(input.data.buffer), input.width, input.height, opts.width, opts.height,
|
||||
resizeMethods.indexOf(opts.method),
|
||||
resizeMethods.indexOf(opts.method), opts.premultiply, opts.linearRGB,
|
||||
);
|
||||
|
||||
return new ImageData(new Uint8ClampedArray(result.buffer), opts.width, opts.height);
|
||||
|
@ -14,9 +14,10 @@ const ROUTE_EDITOR = '/editor';
|
||||
const compressPromise = import(
|
||||
/* webpackChunkName: "main-app" */
|
||||
'../compress');
|
||||
const offlinerPromise = import(
|
||||
/* webpackChunkName: "offliner" */
|
||||
'../../lib/offliner');
|
||||
|
||||
const swBridgePromise = import(
|
||||
/* webpackChunkName: "sw-bridge" */
|
||||
'../../lib/sw-bridge');
|
||||
|
||||
function back() {
|
||||
window.history.back();
|
||||
@ -25,6 +26,7 @@ function back() {
|
||||
interface Props {}
|
||||
|
||||
interface State {
|
||||
awaitingShareTarget: boolean;
|
||||
file?: File | Fileish;
|
||||
isEditorOpen: Boolean;
|
||||
Compress?: typeof import('../compress').default;
|
||||
@ -32,6 +34,7 @@ interface State {
|
||||
|
||||
export default class App extends Component<Props, State> {
|
||||
state: State = {
|
||||
awaitingShareTarget: new URL(location.href).searchParams.has('share-target'),
|
||||
isEditorOpen: false,
|
||||
file: undefined,
|
||||
Compress: undefined,
|
||||
@ -48,7 +51,15 @@ export default class App extends Component<Props, State> {
|
||||
this.showSnack('Failed to load app');
|
||||
});
|
||||
|
||||
offlinerPromise.then(({ offliner }) => offliner(this.showSnack));
|
||||
swBridgePromise.then(async ({ offliner, getSharedImage }) => {
|
||||
offliner(this.showSnack);
|
||||
if (!this.state.awaitingShareTarget) return;
|
||||
const file = await getSharedImage();
|
||||
// Remove the ?share-target from the URL
|
||||
history.replaceState('', '', '/');
|
||||
this.openEditor();
|
||||
this.setState({ file, awaitingShareTarget: false });
|
||||
});
|
||||
|
||||
// In development, persist application state across hot reloads:
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
@ -103,15 +114,18 @@ export default class App extends Component<Props, State> {
|
||||
this.setState({ isEditorOpen: true });
|
||||
}
|
||||
|
||||
render({}: Props, { file, isEditorOpen, Compress }: State) {
|
||||
render({}: Props, { file, isEditorOpen, Compress, awaitingShareTarget }: State) {
|
||||
const showSpinner = awaitingShareTarget || (isEditorOpen && !Compress);
|
||||
|
||||
return (
|
||||
<div id="app" class={style.app}>
|
||||
<file-drop accept="image/*" onfiledrop={this.onFileDrop} class={style.drop}>
|
||||
{!isEditorOpen
|
||||
? <Intro onFile={this.onIntroPickFile} showSnack={this.showSnack} />
|
||||
: (Compress)
|
||||
? <Compress file={file!} showSnack={this.showSnack} onBack={back} />
|
||||
: <loading-spinner class={style.appLoader}/>
|
||||
{
|
||||
showSpinner
|
||||
? <loading-spinner class={style.appLoader}/>
|
||||
: isEditorOpen
|
||||
? Compress && <Compress file={file!} showSnack={this.showSnack} onBack={back} />
|
||||
: <Intro onFile={this.onIntroPickFile} showSnack={this.showSnack} />
|
||||
}
|
||||
<snack-bar ref={linkRef(this, 'snackbar')} />
|
||||
</file-drop>
|
||||
|
@ -178,6 +178,7 @@ export default class Options extends Component<Props, State> {
|
||||
{encoderSupportMap ?
|
||||
<Select value={encoderState.type} onChange={this.onEncoderTypeChange} large>
|
||||
{encoders.filter(encoder => encoderSupportMap[encoder.type]).map(encoder => (
|
||||
// tslint:disable-next-line:jsx-key
|
||||
<option value={encoder.type}>{encoder.label}</option>
|
||||
))}
|
||||
</Select>
|
||||
|
@ -18,23 +18,13 @@ import * as browserTIFF from '../../codecs/browser-tiff/encoder-meta';
|
||||
import * as browserJP2 from '../../codecs/browser-jp2/encoder-meta';
|
||||
import * as browserBMP from '../../codecs/browser-bmp/encoder-meta';
|
||||
import * as browserPDF from '../../codecs/browser-pdf/encoder-meta';
|
||||
import {
|
||||
EncoderState,
|
||||
EncoderType,
|
||||
EncoderOptions,
|
||||
encoderMap,
|
||||
} from '../../codecs/encoders';
|
||||
import {
|
||||
PreprocessorState,
|
||||
defaultPreprocessorState,
|
||||
} from '../../codecs/preprocessors';
|
||||
import { EncoderState, EncoderType, EncoderOptions, encoderMap } from '../../codecs/encoders';
|
||||
import { PreprocessorState, defaultPreprocessorState } from '../../codecs/preprocessors';
|
||||
import { decodeImage } from '../../codecs/decoders';
|
||||
import { cleanMerge, cleanSet } from '../../lib/clean-modify';
|
||||
import Processor from '../../codecs/processor';
|
||||
import {
|
||||
VectorResizeOptions,
|
||||
BrowserResizeOptions,
|
||||
WorkerResizeOptions,
|
||||
BrowserResizeOptions, isWorkerOptions as isWorkerResizeOptions,
|
||||
} from '../../codecs/resize/processor-meta';
|
||||
import './custom-els/MultiPanel';
|
||||
import Results from '../results';
|
||||
@ -114,12 +104,12 @@ async function preprocessImage(
|
||||
if (preprocessData.resize.method === 'vector' && source.vectorImage) {
|
||||
result = processor.vectorResize(
|
||||
source.vectorImage,
|
||||
preprocessData.resize as VectorResizeOptions,
|
||||
preprocessData.resize,
|
||||
);
|
||||
} else if (preprocessData.resize.method.startsWith('browser-')) {
|
||||
result = processor.resize(result, preprocessData.resize as BrowserResizeOptions);
|
||||
} else if (isWorkerResizeOptions(preprocessData.resize)) {
|
||||
result = await processor.workerResize(result, preprocessData.resize);
|
||||
} else {
|
||||
result = await processor.workerResize(result, preprocessData.resize as WorkerResizeOptions);
|
||||
result = processor.resize(result, preprocessData.resize as BrowserResizeOptions);
|
||||
}
|
||||
}
|
||||
if (preprocessData.quantizer.enabled) {
|
||||
@ -254,7 +244,7 @@ export default class Compress extends Component<Props, State> {
|
||||
this.widthQuery.addListener(this.onMobileWidthChange);
|
||||
this.updateFile(props.file);
|
||||
|
||||
import('../../lib/offliner').then(({ mainAppLoaded }) => mainAppLoaded());
|
||||
import('../../lib/sw-bridge').then(({ mainAppLoaded }) => mainAppLoaded());
|
||||
}
|
||||
|
||||
@bind
|
||||
@ -577,6 +567,7 @@ export default class Compress extends Component<Props, State> {
|
||||
const [leftImageData, rightImageData] = sides.map(i => i.data);
|
||||
|
||||
const options = sides.map((side, index) => (
|
||||
// tslint:disable-next-line:jsx-key
|
||||
<Options
|
||||
source={source}
|
||||
mobileView={mobileView}
|
||||
@ -592,6 +583,7 @@ export default class Compress extends Component<Props, State> {
|
||||
(mobileView ? ['down', 'up'] : ['right', 'left']) as CopyAcrossIconProps['copyDirection'][];
|
||||
|
||||
const results = sides.map((side, index) => (
|
||||
// tslint:disable-next-line:jsx-key
|
||||
<Results
|
||||
downloadUrl={side.downloadUrl}
|
||||
imageFile={side.file}
|
||||
|
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
@ -53,11 +53,17 @@ export default class Intro extends Component<Props, State> {
|
||||
state: State = {};
|
||||
private fileInput?: HTMLInputElement;
|
||||
|
||||
@bind
|
||||
private resetFileInput() {
|
||||
this.fileInput!.value = '';
|
||||
}
|
||||
|
||||
@bind
|
||||
private onFileChange(event: Event): void {
|
||||
const fileInput = event.target as HTMLInputElement;
|
||||
const file = fileInput.files && fileInput.files[0];
|
||||
if (!file) return;
|
||||
this.resetFileInput();
|
||||
this.props.onFile(file);
|
||||
}
|
||||
|
||||
|
@ -40,6 +40,23 @@ async function updateReady(reg: ServiceWorkerRegistration): Promise<void> {
|
||||
});
|
||||
}
|
||||
|
||||
/** Wait for a shared image */
|
||||
export function getSharedImage(): Promise<File> {
|
||||
return new Promise((resolve) => {
|
||||
const onmessage = (event: MessageEvent) => {
|
||||
if (event.data.action !== 'load-image') return;
|
||||
resolve(event.data.file);
|
||||
navigator.serviceWorker.removeEventListener('message', onmessage);
|
||||
};
|
||||
|
||||
navigator.serviceWorker.addEventListener('message', onmessage);
|
||||
|
||||
// This message is picked up by the service worker - it's how it knows we're ready to receive
|
||||
// the file.
|
||||
navigator.serviceWorker.controller!.postMessage('share-ready');
|
||||
});
|
||||
}
|
||||
|
||||
/** Set up the service worker and monitor changes */
|
||||
export async function offliner(showSnack: SnackBarElement['showSnackbar']) {
|
||||
// This needs to be a typeof because Webpack.
|
@ -12,5 +12,18 @@
|
||||
"type": "image/png",
|
||||
"sizes": "1024x1024"
|
||||
}
|
||||
]
|
||||
],
|
||||
"share_target": {
|
||||
"action": "/?share-target",
|
||||
"method": "POST",
|
||||
"enctype": "multipart/form-data",
|
||||
"params": {
|
||||
"files": [
|
||||
{
|
||||
"name": "file",
|
||||
"accept": ["image/*"]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,6 @@
|
||||
import {
|
||||
cacheOrNetworkAndCache, cleanupCache, cacheOrNetwork, cacheBasics, cacheAdditionalProcessors,
|
||||
serveShareTarget,
|
||||
} from './util';
|
||||
import { get } from 'idb-keyval';
|
||||
|
||||
@ -40,14 +41,23 @@ self.addEventListener('activate', (event) => {
|
||||
});
|
||||
|
||||
self.addEventListener('fetch', (event) => {
|
||||
// We only care about GET.
|
||||
if (event.request.method !== 'GET') return;
|
||||
|
||||
const url = new URL(event.request.url);
|
||||
|
||||
// Don't care about other-origin URLs
|
||||
if (url.origin !== location.origin) return;
|
||||
|
||||
if (
|
||||
url.pathname === '/' &&
|
||||
url.searchParams.has('share-target') &&
|
||||
event.request.method === 'POST'
|
||||
) {
|
||||
serveShareTarget(event);
|
||||
return;
|
||||
}
|
||||
|
||||
// We only care about GET from here on in.
|
||||
if (event.request.method !== 'GET') return;
|
||||
|
||||
if (url.pathname.startsWith('/demo-') || url.pathname.startsWith('/wc-polyfill')) {
|
||||
cacheOrNetworkAndCache(event, dynamicCache);
|
||||
cleanupCache(event, dynamicCache, BUILD_ASSETS);
|
||||
|
@ -1,8 +1,11 @@
|
||||
import webpDataUrl from 'url-loader!../codecs/tiny.webp';
|
||||
|
||||
// Give TypeScript the correct global.
|
||||
declare var self: ServiceWorkerGlobalScope;
|
||||
|
||||
export function cacheOrNetwork(event: FetchEvent): void {
|
||||
event.respondWith(async function () {
|
||||
const cachedResponse = await caches.match(event.request);
|
||||
const cachedResponse = await caches.match(event.request, { ignoreSearch: true });
|
||||
return cachedResponse || fetch(event.request);
|
||||
}());
|
||||
}
|
||||
@ -29,6 +32,23 @@ export function cacheOrNetworkAndCache(event: FetchEvent, cacheName: string): vo
|
||||
}());
|
||||
}
|
||||
|
||||
export function serveShareTarget(event: FetchEvent): void {
|
||||
const dataPromise = event.request.formData();
|
||||
|
||||
// Redirect so the user can refresh the page without resending data.
|
||||
// @ts-ignore It doesn't like me giving a response to respondWith, although it's allowed.
|
||||
event.respondWith(Response.redirect('/?share-target'));
|
||||
|
||||
event.waitUntil(async function () {
|
||||
// The page sends this message to tell the service worker it's ready to receive the file.
|
||||
await nextMessage('share-ready');
|
||||
const client = await self.clients.get(event.resultingClientId);
|
||||
const data = await dataPromise;
|
||||
const file = data.get('file');
|
||||
client.postMessage({ file, action: 'load-image' });
|
||||
}());
|
||||
}
|
||||
|
||||
export function cleanupCache(event: FetchEvent, cacheName: string, keepAssets: string[]) {
|
||||
event.waitUntil(async function () {
|
||||
const cache = await caches.open(cacheName);
|
||||
@ -104,3 +124,26 @@ export async function cacheAdditionalProcessors(cacheName: string, buildAssets:
|
||||
const cache = await caches.open(cacheName);
|
||||
await cache.addAll(toCache);
|
||||
}
|
||||
|
||||
const nextMessageResolveMap = new Map<string, (() => void)[]>();
|
||||
|
||||
/**
|
||||
* Wait on a message with a particular event.data value.
|
||||
*
|
||||
* @param dataVal The event.data value.
|
||||
*/
|
||||
function nextMessage(dataVal: string): Promise<void> {
|
||||
return new Promise((resolve) => {
|
||||
if (!nextMessageResolveMap.has(dataVal)) {
|
||||
nextMessageResolveMap.set(dataVal, []);
|
||||
}
|
||||
nextMessageResolveMap.get(dataVal)!.push(resolve);
|
||||
});
|
||||
}
|
||||
|
||||
self.addEventListener('message', (event) => {
|
||||
const resolvers = nextMessageResolveMap.get(event.data);
|
||||
if (!resolvers) return;
|
||||
nextMessageResolveMap.delete(event.data);
|
||||
for (const resolve of resolvers) resolve();
|
||||
});
|
||||
|
Reference in New Issue
Block a user