Update dither dep

This commit is contained in:
Alexandre Bruyant 2024-01-03 12:50:33 +01:00
parent 607e7f44e9
commit e8fb5d0eb2
3 changed files with 502 additions and 683 deletions

View File

@ -1,66 +1,26 @@
/* eslint-disable no-undef */
/* eslint-disable no-restricted-globals */
// Copyright 2018 The Go Authors. All rights reserved. // Copyright 2018 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
"use strict";
(() => { (() => {
// Map multiple JavaScript environments to a single common API,
// preferring web standards over Node.js API.
//
// Environments considered:
// - Browsers
// - Node.js
// - Electron
// - Parcel
// - Webpack
if (typeof global !== "undefined") {
// global already exists
} else if (typeof window !== "undefined") {
window.global = window;
} else if (typeof self !== "undefined") {
self.global = self;
} else {
throw new Error(
"cannot export Go (neither global, window nor self is defined)"
);
}
if (!global.require && typeof require !== "undefined") {
global.require = require;
}
if (!global.fs && global.require) {
const fs = require("fs");
if (typeof fs === "object" && fs !== null && Object.keys(fs).length !== 0) {
global.fs = fs;
}
}
const enosys = () => { const enosys = () => {
const err = new Error("not implemented"); const err = new Error("not implemented");
err.code = "ENOSYS"; err.code = "ENOSYS";
return err; return err;
}; };
if (!global.fs) { if (!globalThis.fs) {
let outputBuf = ""; let outputBuf = "";
global.fs = { globalThis.fs = {
constants: { constants: { O_WRONLY: -1, O_RDWR: -1, O_CREAT: -1, O_TRUNC: -1, O_APPEND: -1, O_EXCL: -1 }, // unused
O_WRONLY: -1,
O_RDWR: -1,
O_CREAT: -1,
O_TRUNC: -1,
O_APPEND: -1,
O_EXCL: -1,
}, // unused
writeSync(fd, buf) { writeSync(fd, buf) {
outputBuf += decoder.decode(buf); outputBuf += decoder.decode(buf);
const nl = outputBuf.lastIndexOf("\n"); const nl = outputBuf.lastIndexOf("\n");
if (nl != -1) { if (nl != -1) {
console.log(outputBuf.substr(0, nl)); console.log(outputBuf.substring(0, nl));
outputBuf = outputBuf.substr(nl + 1); outputBuf = outputBuf.substring(nl + 1);
} }
return buf.length; return buf.length;
}, },
@ -72,152 +32,67 @@
const n = this.writeSync(fd, buf); const n = this.writeSync(fd, buf);
callback(null, n); callback(null, n);
}, },
chmod(path, mode, callback) { chmod(path, mode, callback) { callback(enosys()); },
callback(enosys()); chown(path, uid, gid, callback) { callback(enosys()); },
}, close(fd, callback) { callback(enosys()); },
chown(path, uid, gid, callback) { fchmod(fd, mode, callback) { callback(enosys()); },
callback(enosys()); fchown(fd, uid, gid, callback) { callback(enosys()); },
}, fstat(fd, callback) { callback(enosys()); },
close(fd, callback) { fsync(fd, callback) { callback(null); },
callback(enosys()); ftruncate(fd, length, callback) { callback(enosys()); },
}, lchown(path, uid, gid, callback) { callback(enosys()); },
fchmod(fd, mode, callback) { link(path, link, callback) { callback(enosys()); },
callback(enosys()); lstat(path, callback) { callback(enosys()); },
}, mkdir(path, perm, callback) { callback(enosys()); },
fchown(fd, uid, gid, callback) { open(path, flags, mode, callback) { callback(enosys()); },
callback(enosys()); read(fd, buffer, offset, length, position, callback) { callback(enosys()); },
}, readdir(path, callback) { callback(enosys()); },
fstat(fd, callback) { readlink(path, callback) { callback(enosys()); },
callback(enosys()); rename(from, to, callback) { callback(enosys()); },
}, rmdir(path, callback) { callback(enosys()); },
fsync(fd, callback) { stat(path, callback) { callback(enosys()); },
callback(null); symlink(path, link, callback) { callback(enosys()); },
}, truncate(path, length, callback) { callback(enosys()); },
ftruncate(fd, length, callback) { unlink(path, callback) { callback(enosys()); },
callback(enosys()); utimes(path, atime, mtime, callback) { callback(enosys()); },
},
lchown(path, uid, gid, callback) {
callback(enosys());
},
link(path, link, callback) {
callback(enosys());
},
lstat(path, callback) {
callback(enosys());
},
mkdir(path, perm, callback) {
callback(enosys());
},
open(path, flags, mode, callback) {
callback(enosys());
},
read(fd, buffer, offset, length, position, callback) {
callback(enosys());
},
readdir(path, callback) {
callback(enosys());
},
readlink(path, callback) {
callback(enosys());
},
rename(from, to, callback) {
callback(enosys());
},
rmdir(path, callback) {
callback(enosys());
},
stat(path, callback) {
callback(enosys());
},
symlink(path, link, callback) {
callback(enosys());
},
truncate(path, length, callback) {
callback(enosys());
},
unlink(path, callback) {
callback(enosys());
},
utimes(path, atime, mtime, callback) {
callback(enosys());
},
}; };
} }
if (!global.process) { if (!globalThis.process) {
global.process = { globalThis.process = {
getuid() { getuid() { return -1; },
return -1; getgid() { return -1; },
}, geteuid() { return -1; },
getgid() { getegid() { return -1; },
return -1; getgroups() { throw enosys(); },
},
geteuid() {
return -1;
},
getegid() {
return -1;
},
getgroups() {
throw enosys();
},
pid: -1, pid: -1,
ppid: -1, ppid: -1,
umask() { umask() { throw enosys(); },
throw enosys(); cwd() { throw enosys(); },
}, chdir() { throw enosys(); },
cwd() { }
throw enosys();
},
chdir() {
throw enosys();
},
};
} }
if (!global.crypto && global.require) { if (!globalThis.crypto) {
const nodeCrypto = require("crypto"); throw new Error("globalThis.crypto is not available, polyfill required (crypto.getRandomValues only)");
global.crypto = {
getRandomValues(b) {
nodeCrypto.randomFillSync(b);
},
};
}
if (!global.crypto) {
throw new Error(
"global.crypto is not available, polyfill required (getRandomValues only)"
);
} }
if (!global.performance) { if (!globalThis.performance) {
global.performance = { throw new Error("globalThis.performance is not available, polyfill required (performance.now only)");
now() {
const [sec, nsec] = process.hrtime();
return sec * 1000 + nsec / 1000000;
},
};
} }
if (!global.TextEncoder && global.require) { if (!globalThis.TextEncoder) {
global.TextEncoder = require("util").TextEncoder; throw new Error("globalThis.TextEncoder is not available, polyfill required");
}
if (!global.TextEncoder) {
throw new Error("global.TextEncoder is not available, polyfill required");
} }
if (!global.TextDecoder && global.require) { if (!globalThis.TextDecoder) {
global.TextDecoder = require("util").TextDecoder; throw new Error("globalThis.TextDecoder is not available, polyfill required");
} }
if (!global.TextDecoder) {
throw new Error("global.TextDecoder is not available, polyfill required");
}
// End of polyfills for common API.
const encoder = new TextEncoder("utf-8"); const encoder = new TextEncoder("utf-8");
const decoder = new TextDecoder("utf-8"); const decoder = new TextDecoder("utf-8");
global.Go = class { globalThis.Go = class {
constructor() { constructor() {
this.argv = ["js"]; this.argv = ["js"];
this.env = {}; this.env = {};
@ -236,13 +111,17 @@
const setInt64 = (addr, v) => { const setInt64 = (addr, v) => {
this.mem.setUint32(addr + 0, v, true); this.mem.setUint32(addr + 0, v, true);
this.mem.setUint32(addr + 4, Math.floor(v / 4294967296), true); this.mem.setUint32(addr + 4, Math.floor(v / 4294967296), true);
}; }
const setInt32 = (addr, v) => {
this.mem.setUint32(addr + 0, v, true);
}
const getInt64 = (addr) => { const getInt64 = (addr) => {
const low = this.mem.getUint32(addr + 0, true); const low = this.mem.getUint32(addr + 0, true);
const high = this.mem.getInt32(addr + 4, true); const high = this.mem.getInt32(addr + 4, true);
return low + high * 4294967296; return low + high * 4294967296;
}; }
const loadValue = (addr) => { const loadValue = (addr) => {
const f = this.mem.getFloat64(addr, true); const f = this.mem.getFloat64(addr, true);
@ -255,10 +134,10 @@
const id = this.mem.getUint32(addr, true); const id = this.mem.getUint32(addr, true);
return this._values[id]; return this._values[id];
}; }
const storeValue = (addr, v) => { const storeValue = (addr, v) => {
const nanHead = 0x7ff80000; const nanHead = 0x7FF80000;
if (typeof v === "number" && v !== 0) { if (typeof v === "number" && v !== 0) {
if (isNaN(v)) { if (isNaN(v)) {
@ -305,13 +184,13 @@
} }
this.mem.setUint32(addr + 4, nanHead | typeFlag, true); this.mem.setUint32(addr + 4, nanHead | typeFlag, true);
this.mem.setUint32(addr, id, true); this.mem.setUint32(addr, id, true);
}; }
const loadSlice = (addr) => { const loadSlice = (addr) => {
const array = getInt64(addr + 0); const array = getInt64(addr + 0);
const len = getInt64(addr + 8); const len = getInt64(addr + 8);
return new Uint8Array(this._inst.exports.mem.buffer, array, len); return new Uint8Array(this._inst.exports.mem.buffer, array, len);
}; }
const loadSliceOfValues = (addr) => { const loadSliceOfValues = (addr) => {
const array = getInt64(addr + 0); const array = getInt64(addr + 0);
@ -321,19 +200,20 @@
a[i] = loadValue(array + i * 8); a[i] = loadValue(array + i * 8);
} }
return a; return a;
}; }
const loadString = (addr) => { const loadString = (addr) => {
const saddr = getInt64(addr + 0); const saddr = getInt64(addr + 0);
const len = getInt64(addr + 8); const len = getInt64(addr + 8);
return decoder.decode( return decoder.decode(new DataView(this._inst.exports.mem.buffer, saddr, len));
new DataView(this._inst.exports.mem.buffer, saddr, len) }
);
};
const timeOrigin = Date.now() - performance.now(); const timeOrigin = Date.now() - performance.now();
this.importObject = { this.importObject = {
go: { _gotest: {
add: (a, b) => a + b,
},
gojs: {
// Go's SP does not change as long as no Go code is running. Some operations (e.g. calls, getters and setters) // Go's SP does not change as long as no Go code is running. Some operations (e.g. calls, getters and setters)
// may synchronously trigger a Go event handler. This makes Go code get executed in the middle of the imported // may synchronously trigger a Go event handler. This makes Go code get executed in the middle of the imported
// function. A goroutine can switch to a new stack if the current stack is too small (see morestack function). // function. A goroutine can switch to a new stack if the current stack is too small (see morestack function).
@ -358,10 +238,7 @@
const fd = getInt64(sp + 8); const fd = getInt64(sp + 8);
const p = getInt64(sp + 16); const p = getInt64(sp + 16);
const n = this.mem.getInt32(sp + 24, true); const n = this.mem.getInt32(sp + 24, true);
fs.writeSync( fs.writeSync(fd, new Uint8Array(this._inst.exports.mem.buffer, p, n));
fd,
new Uint8Array(this._inst.exports.mem.buffer, p, n)
);
}, },
// func resetMemoryDataView() // func resetMemoryDataView()
@ -379,7 +256,7 @@
// func walltime() (sec int64, nsec int32) // func walltime() (sec int64, nsec int32)
"runtime.walltime": (sp) => { "runtime.walltime": (sp) => {
sp >>>= 0; sp >>>= 0;
const msec = new Date().getTime(); const msec = (new Date).getTime();
setInt64(sp + 8, msec / 1000); setInt64(sp + 8, msec / 1000);
this.mem.setInt32(sp + 16, (msec % 1000) * 1000000, true); this.mem.setInt32(sp + 16, (msec % 1000) * 1000000, true);
}, },
@ -389,9 +266,7 @@
sp >>>= 0; sp >>>= 0;
const id = this._nextCallbackTimeoutID; const id = this._nextCallbackTimeoutID;
this._nextCallbackTimeoutID++; this._nextCallbackTimeoutID++;
this._scheduledTimeouts.set( this._scheduledTimeouts.set(id, setTimeout(
id,
setTimeout(
() => { () => {
this._resume(); this._resume();
while (this._scheduledTimeouts.has(id)) { while (this._scheduledTimeouts.has(id)) {
@ -401,9 +276,8 @@
this._resume(); this._resume();
} }
}, },
getInt64(sp + 8) + 1 // setTimeout has been seen to fire up to 1 millisecond early getInt64(sp + 8),
) ));
);
this.mem.setInt32(sp + 16, id, true); this.mem.setInt32(sp + 16, id, true);
}, },
@ -451,11 +325,7 @@
// func valueSet(v ref, p string, x ref) // func valueSet(v ref, p string, x ref)
"syscall/js.valueSet": (sp) => { "syscall/js.valueSet": (sp) => {
sp >>>= 0; sp >>>= 0;
Reflect.set( Reflect.set(loadValue(sp + 8), loadString(sp + 16), loadValue(sp + 32));
loadValue(sp + 8),
loadString(sp + 16),
loadValue(sp + 32)
);
}, },
// func valueDelete(v ref, p string) // func valueDelete(v ref, p string)
@ -467,20 +337,13 @@
// func valueIndex(v ref, i int) ref // func valueIndex(v ref, i int) ref
"syscall/js.valueIndex": (sp) => { "syscall/js.valueIndex": (sp) => {
sp >>>= 0; sp >>>= 0;
storeValue( storeValue(sp + 24, Reflect.get(loadValue(sp + 8), getInt64(sp + 16)));
sp + 24,
Reflect.get(loadValue(sp + 8), getInt64(sp + 16))
);
}, },
// valueSetIndex(v ref, i int, x ref) // valueSetIndex(v ref, i int, x ref)
"syscall/js.valueSetIndex": (sp) => { "syscall/js.valueSetIndex": (sp) => {
sp >>>= 0; sp >>>= 0;
Reflect.set( Reflect.set(loadValue(sp + 8), getInt64(sp + 16), loadValue(sp + 24));
loadValue(sp + 8),
getInt64(sp + 16),
loadValue(sp + 24)
);
}, },
// func valueCall(v ref, m string, args []ref) (ref, bool) // func valueCall(v ref, m string, args []ref) (ref, bool)
@ -559,10 +422,7 @@
// func valueInstanceOf(v ref, t ref) bool // func valueInstanceOf(v ref, t ref) bool
"syscall/js.valueInstanceOf": (sp) => { "syscall/js.valueInstanceOf": (sp) => {
sp >>>= 0; sp >>>= 0;
this.mem.setUint8( this.mem.setUint8(sp + 24, (loadValue(sp + 8) instanceof loadValue(sp + 16)) ? 1 : 0);
sp + 24,
loadValue(sp + 8) instanceof loadValue(sp + 16) ? 1 : 0
);
}, },
// func copyBytesToGo(dst []byte, src ref) (int, bool) // func copyBytesToGo(dst []byte, src ref) (int, bool)
@ -570,9 +430,7 @@
sp >>>= 0; sp >>>= 0;
const dst = loadSlice(sp + 8); const dst = loadSlice(sp + 8);
const src = loadValue(sp + 32); const src = loadValue(sp + 32);
if ( if (!(src instanceof Uint8Array || src instanceof Uint8ClampedArray)) {
!(src instanceof Uint8Array || src instanceof Uint8ClampedArray)
) {
this.mem.setUint8(sp + 48, 0); this.mem.setUint8(sp + 48, 0);
return; return;
} }
@ -587,9 +445,7 @@
sp >>>= 0; sp >>>= 0;
const dst = loadValue(sp + 8); const dst = loadValue(sp + 8);
const src = loadSlice(sp + 16); const src = loadSlice(sp + 16);
if ( if (!(dst instanceof Uint8Array || dst instanceof Uint8ClampedArray)) {
!(dst instanceof Uint8Array || dst instanceof Uint8ClampedArray)
) {
this.mem.setUint8(sp + 48, 0); this.mem.setUint8(sp + 48, 0);
return; return;
} }
@ -599,10 +455,10 @@
this.mem.setUint8(sp + 48, 1); this.mem.setUint8(sp + 48, 1);
}, },
debug: (value) => { "debug": (value) => {
console.log(value); console.log(value);
}, },
}, }
}; };
} }
@ -612,24 +468,22 @@
} }
this._inst = instance; this._inst = instance;
this.mem = new DataView(this._inst.exports.mem.buffer); this.mem = new DataView(this._inst.exports.mem.buffer);
this._values = [ this._values = [ // JS values that Go currently has references to, indexed by reference id
// JS values that Go currently has references to, indexed by reference id
NaN, NaN,
0, 0,
null, null,
true, true,
false, false,
global, globalThis,
this, this,
]; ];
this._goRefCounts = new Array(this._values.length).fill(Infinity); // number of references that Go has to a JS value, indexed by reference id this._goRefCounts = new Array(this._values.length).fill(Infinity); // number of references that Go has to a JS value, indexed by reference id
this._ids = new Map([ this._ids = new Map([ // mapping from JS values to reference ids
// mapping from JS values to reference ids
[0, 1], [0, 1],
[null, 2], [null, 2],
[true, 3], [true, 3],
[false, 4], [false, 4],
[global, 5], [globalThis, 5],
[this, 6], [this, 6],
]); ]);
this._idPool = []; // unused ids that have been garbage collected this._idPool = []; // unused ids that have been garbage collected
@ -674,9 +528,7 @@
// Keep in sync with cmd/link/internal/ld/data.go:wasmMinDataAddr. // Keep in sync with cmd/link/internal/ld/data.go:wasmMinDataAddr.
const wasmMinDataAddr = 4096 + 8192; const wasmMinDataAddr = 4096 + 8192;
if (offset >= wasmMinDataAddr) { if (offset >= wasmMinDataAddr) {
throw new Error( throw new Error("total length of command line and environment variables exceeds limit");
"total length of command line and environment variables exceeds limit"
);
} }
this._inst.exports.run(argc, argv); this._inst.exports.run(argc, argv);
@ -705,40 +557,5 @@
return event.result; return event.result;
}; };
} }
};
if (
typeof module !== "undefined" &&
global.require &&
global.require.main === module &&
global.process &&
global.process.versions &&
!global.process.versions.electron
) {
if (process.argv.length < 3) {
console.error("usage: go_js_wasm_exec [wasm binary] [arguments]");
process.exit(1);
}
const go = new Go();
go.argv = process.argv.slice(2);
go.env = Object.assign({ TMPDIR: require("os").tmpdir() }, process.env);
go.exit = process.exit;
WebAssembly.instantiate(fs.readFileSync(process.argv[2]), go.importObject)
.then((result) => {
process.on("exit", (code) => {
// Node.js exits if no event handler is pending
if (code === 0 && !go.exited) {
// deadlock, make Go print error and stack traces
go._pendingEvent = { id: 0 };
go._resume();
}
});
return go.run(result.instance);
})
.catch((err) => {
console.error(err);
process.exit(1);
});
} }
})(); })();

View File

@ -1,5 +1,5 @@
module github.com/CrispyBaguette/wasm-palette-converter module github.com/CrispyBaguette/wasm-palette-converter
go 1.17 go 1.21
require github.com/makeworld-the-better-one/dither/v2 v2.2.0 require github.com/makeworld-the-better-one/dither/v2 v2.4.0

View File

@ -2,6 +2,8 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/makeworld-the-better-one/dither/v2 v2.2.0 h1:VTMAiyyO1YIO07fZwuLNZZasJgKUmvsIA48ze3ALHPQ= github.com/makeworld-the-better-one/dither/v2 v2.2.0 h1:VTMAiyyO1YIO07fZwuLNZZasJgKUmvsIA48ze3ALHPQ=
github.com/makeworld-the-better-one/dither/v2 v2.2.0/go.mod h1:VBtN8DXO7SNtyGmLiGA7IsFeKrBkQPze1/iAeM95arc= github.com/makeworld-the-better-one/dither/v2 v2.2.0/go.mod h1:VBtN8DXO7SNtyGmLiGA7IsFeKrBkQPze1/iAeM95arc=
github.com/makeworld-the-better-one/dither/v2 v2.4.0 h1:Az/dYXiTcwcRSe59Hzw4RI1rSnAZns+1msaCXetrMFE=
github.com/makeworld-the-better-one/dither/v2 v2.4.0/go.mod h1:VBtN8DXO7SNtyGmLiGA7IsFeKrBkQPze1/iAeM95arc=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=