Merge c8fb4c17f1 into c023bd30f3

go.mod

@@ -12,7 +12,7 @@ require (
 	codeberg.org/gruf/go-debug v1.3.0
 	codeberg.org/gruf/go-errors/v2 v2.3.2
 	codeberg.org/gruf/go-fastcopy v1.1.3
-	codeberg.org/gruf/go-ffmpreg v0.3.1
+	codeberg.org/gruf/go-ffmpreg v0.2.6
 	codeberg.org/gruf/go-iotools v0.0.0-20240710125620-934ae9c654cf
 	codeberg.org/gruf/go-kv v1.6.5
 	codeberg.org/gruf/go-list v0.0.0-20240425093752-494db03d641f
@@ -55,7 +55,7 @@ require (
 	github.com/superseriousbusiness/oauth2/v4 v4.3.2-SSB.0.20230227143000-f4900831d6c8
 	github.com/tdewolff/minify/v2 v2.20.37
 	github.com/technologize/otel-go-contrib v1.1.1
-	github.com/tetratelabs/wazero v1.8.1
+	github.com/tetratelabs/wazero v1.8.0
 	github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
 	github.com/ulule/limiter/v3 v3.11.2
 	github.com/uptrace/bun v1.2.1

go.sum

@@ -46,8 +46,8 @@ codeberg.org/gruf/go-fastcopy v1.1.3 h1:Jo9VTQjI6KYimlw25PPc7YLA3Xm+XMQhaHwKnM7x
 codeberg.org/gruf/go-fastcopy v1.1.3/go.mod h1:GDDYR0Cnb3U/AIfGM3983V/L+GN+vuwVMvrmVABo21s=
 codeberg.org/gruf/go-fastpath/v2 v2.0.0 h1:iAS9GZahFhyWEH0KLhFEJR+txx1ZhMXxYzu2q5Qo9c0=
 codeberg.org/gruf/go-fastpath/v2 v2.0.0/go.mod h1:3pPqu5nZjpbRrOqvLyAK7puS1OfEtQvjd6342Cwz56Q=
-codeberg.org/gruf/go-ffmpreg v0.3.1 h1:5qE6sHQbLCbQ4RO7ZL4OKZBN4ViAYfDm9ExT8N0ZE7s=
+codeberg.org/gruf/go-ffmpreg v0.2.6 h1:OHlTOF+62/b+VeM3Svg7praweU/NECRIsuhilZLFaO4=
-codeberg.org/gruf/go-ffmpreg v0.3.1/go.mod h1:Ar5nbt3tB2Wr0uoaqV3wDBNwAx+H+AB/mV7Kw7NlZTI=
+codeberg.org/gruf/go-ffmpreg v0.2.6/go.mod h1:sViRI0BYK2B8PJw4BrOg7DquPD71mZjDfffRAFcDtvk=
 codeberg.org/gruf/go-iotools v0.0.0-20240710125620-934ae9c654cf h1:84s/ii8N6lYlskZjHH+DG6jyia8w2mXMZlRwFn8Gs3A=
 codeberg.org/gruf/go-iotools v0.0.0-20240710125620-934ae9c654cf/go.mod h1:zZAICsp5rY7+hxnws2V0ePrWxE0Z2Z/KXcN3p/RQCfk=
 codeberg.org/gruf/go-kv v1.6.5 h1:ttPf0NA8F79pDqBttSudPTVCZmGncumeNIxmeM9ztz0=
@@ -548,8 +548,8 @@ github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03
 github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8=
 github.com/technologize/otel-go-contrib v1.1.1 h1:wZH9aSPNWZWIkEh3vfaKfMb15AJ80jJ1aVj/4GZdqIw=
 github.com/technologize/otel-go-contrib v1.1.1/go.mod h1:dCN/wj2WyUO8aFZFdIN+6tfJHImjTML/8r2YVYAy3So=
-github.com/tetratelabs/wazero v1.8.1 h1:NrcgVbWfkWvVc4UtT4LRLDf91PsOzDzefMdwhLfA550=
+github.com/tetratelabs/wazero v1.8.0 h1:iEKu0d4c2Pd+QSRieYbnQC9yiFlMS9D+Jr0LsRmcF4g=
-github.com/tetratelabs/wazero v1.8.1/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
+github.com/tetratelabs/wazero v1.8.0/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
 github.com/tidwall/btree v0.0.0-20191029221954-400434d76274 h1:G6Z6HvJuPjG6XfNGi/feOATzeJrfgTNJY+rGrHbA04E=
 github.com/tidwall/btree v0.0.0-20191029221954-400434d76274/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8=
 github.com/tidwall/buntdb v1.1.2 h1:noCrqQXL9EKMtcdwJcmuVKSEjqu1ua99RHHgbLTEHRo=

internal/media/ffmpeg/runner.go

@@ -20,7 +20,6 @@
 import (
 	"context"
 
-	"codeberg.org/gruf/go-ffmpreg/wasm"
 	"github.com/tetratelabs/wazero"
 )
 
@@ -66,6 +65,6 @@ func (r *runner) Run(ctx context.Context, cmod wazero.CompiledModule, args Args)
 	// Release slot back to pool on end.
 	defer func() { r.pool <- struct{}{} }()
 
-	// Pass to main module runner function.
+	// Pass to main module runner.
-	return wasm.Run(ctx, runtime, cmod, args)
+	return run(ctx, cmod, args)
 }

internal/media/ffmpeg/wasm.go

@@ -19,18 +19,20 @@
 
 import (
 	"context"
+	"io"
 	"os"
 
 	ffmpeglib "codeberg.org/gruf/go-ffmpreg/embed/ffmpeg"
 	ffprobelib "codeberg.org/gruf/go-ffmpreg/embed/ffprobe"
-	"codeberg.org/gruf/go-ffmpreg/wasm"
 	"github.com/tetratelabs/wazero"
 	"github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1"
+	"github.com/tetratelabs/wazero/sys"
 )
 
 // Use all core features required by ffmpeg / ffprobe
 // (these should be the same but we OR just in case).
-const corefeatures = wasm.CoreFeatures
+const corefeatures = ffprobelib.CoreFeatures |
+	ffmpeglib.CoreFeatures
 
 var (
 	// shared WASM runtime instance.
@@ -45,7 +47,65 @@
 // configuration options to run an instance
 // of a compiled WebAssembly module that is
 // run in a typical CLI manner.
-type Args = wasm.Args
+type Args struct {
+
+	// Optional further module configuration function.
+	// (e.g. to mount filesystem dir, set env vars, etc).
+	Config func(wazero.ModuleConfig) wazero.ModuleConfig
+
+	// Standard FDs.
+	Stdin  io.Reader
+	Stdout io.Writer
+	Stderr io.Writer
+
+	// CLI args.
+	Args []string
+}
+
+// run will run the given compiled
+// WebAssembly module using given args,
+// using the global wazero runtime.
+func run(
+	ctx context.Context,
+	cmod wazero.CompiledModule,
+	args Args,
+) (
+	uint32, // exit code
+	error,
+) {
+	// Prefix module name as argv0 to args.
+	cargs := make([]string, len(args.Args)+1)
+	copy(cargs[1:], args.Args)
+	cargs[0] = cmod.Name()
+
+	// Create base module config.
+	modcfg := wazero.NewModuleConfig()
+	modcfg = modcfg.WithArgs(cargs...)
+	modcfg = modcfg.WithStdin(args.Stdin)
+	modcfg = modcfg.WithStdout(args.Stdout)
+	modcfg = modcfg.WithStderr(args.Stderr)
+
+	if args.Config != nil {
+		// Pass through config fn.
+		modcfg = args.Config(modcfg)
+	}
+
+	// Instantiate the module from precompiled wasm module data.
+	mod, err := runtime.InstantiateModule(ctx, cmod, modcfg)
+
+	if mod != nil {
+		// Ensure closed.
+		_ = mod.Close(ctx)
+	}
+
+	// Try extract exit code.
+	switch err := err.(type) {
+	case *sys.ExitError:
+		return err.ExitCode(), nil
+	default:
+		return 0, err
+	}
+}
 
 // compileFfmpeg ensures the ffmpeg WebAssembly has been
 // pre-compiled into memory. If already compiled is a no-op.

vendor/codeberg.org/gruf/go-ffmpreg/embed/ffmpeg/lib.go

@@ -3,6 +3,8 @@
 import (
 	_ "embed"
 	"os"
+
+	"github.com/tetratelabs/wazero/api"
 )
 
 func init() {
@@ -21,5 +23,14 @@ func init() {
 	}
 }
 
+// CoreFeatures is the WebAssembly Core specification
+// features this embedded binary was compiled with.
+const CoreFeatures = api.CoreFeatureSIMD |
+	api.CoreFeatureBulkMemoryOperations |
+	api.CoreFeatureNonTrappingFloatToIntConversion |
+	api.CoreFeatureMutableGlobal |
+	api.CoreFeatureReferenceTypes |
+	api.CoreFeatureSignExtensionOps
+
 //go:embed ffmpeg.wasm
 var B []byte

vendor/codeberg.org/gruf/go-ffmpreg/embed/ffprobe/lib.go

@@ -3,6 +3,8 @@
 import (
 	_ "embed"
 	"os"
+
+	"github.com/tetratelabs/wazero/api"
 )
 
 func init() {
@@ -21,5 +23,14 @@ func init() {
 	}
 }
 
+// CoreFeatures is the WebAssembly Core specification
+// features this embedded binary was compiled with.
+const CoreFeatures = api.CoreFeatureSIMD |
+	api.CoreFeatureBulkMemoryOperations |
+	api.CoreFeatureNonTrappingFloatToIntConversion |
+	api.CoreFeatureMutableGlobal |
+	api.CoreFeatureReferenceTypes |
+	api.CoreFeatureSignExtensionOps
+
 //go:embed ffprobe.wasm
 var B []byte

vendor/codeberg.org/gruf/go-ffmpreg/wasm/instance.go

@@ -1,89 +0,0 @@
-package wasm
-
-import (
-	"context"
-	"io"
-	"unsafe"
-
-	"github.com/tetratelabs/wazero"
-	"github.com/tetratelabs/wazero/api"
-	"github.com/tetratelabs/wazero/sys"
-)
-
-// CoreFeatures are the WebAssembly Core specification
-// features our embedded binaries are compiled with.
-const CoreFeatures = api.CoreFeatureSIMD |
-	api.CoreFeatureBulkMemoryOperations |
-	api.CoreFeatureNonTrappingFloatToIntConversion |
-	api.CoreFeatureMutableGlobal |
-	api.CoreFeatureReferenceTypes |
-	api.CoreFeatureSignExtensionOps
-
-// Args encompasses a common set of
-// configuration options often passed to
-// wazero.Runtime on module instantiation.
-type Args struct {
-
-	// Optional further module configuration function.
-	// (e.g. to mount filesystem dir, set env vars, etc).
-	Config func(wazero.ModuleConfig) wazero.ModuleConfig
-
-	// Standard FDs.
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-
-	// CLI args.
-	Args []string
-}
-
-// Run will run given compiled WebAssembly module
-// within the given runtime, with given arguments.
-// Returns the exit code, or error.
-func Run(
-	ctx context.Context,
-	runtime wazero.Runtime,
-	module wazero.CompiledModule,
-	args Args,
-) (rc uint32, err error) {
-
-	// Prefix arguments with module name.
-	cargs := make([]string, len(args.Args)+1)
-	cargs[0] = module.Name()
-	copy(cargs[1:], args.Args)
-
-	// Prepare new module configuration.
-	modcfg := wazero.NewModuleConfig()
-	modcfg = modcfg.WithArgs(cargs...)
-	modcfg = modcfg.WithStdin(args.Stdin)
-	modcfg = modcfg.WithStdout(args.Stdout)
-	modcfg = modcfg.WithStderr(args.Stderr)
-
-	if args.Config != nil {
-		// Pass through config fn.
-		modcfg = args.Config(modcfg)
-	}
-
-	// Instantiate the module from precompiled wasm module data.
-	mod, err := runtime.InstantiateModule(ctx, module, modcfg)
-
-	if !isNil(mod) {
-		// Ensure closed.
-		_ = mod.Close(ctx)
-	}
-
-	// Try extract exit code.
-	switch err := err.(type) {
-	case *sys.ExitError:
-		return err.ExitCode(), nil
-	default:
-		return 0, err
-	}
-}
-
-// isNil will safely check if 'v' is nil without
-// dealing with weird Go interface nil bullshit.
-func isNil(i interface{}) bool {
-	type eface struct{ Type, Data unsafe.Pointer }
-	return (*(*eface)(unsafe.Pointer(&i))).Data == nil
-}

vendor/github.com/tetratelabs/wazero/experimental/memory.go

@@ -35,8 +35,6 @@ type LinearMemory interface {
 	// Notes:
 	//   - To back a shared memory, Reallocate can't change the address of the
 	//     backing []byte (only its length/capacity may change).
-	//   - Reallocate may return nil if fails to grow the LinearMemory. This
-	//     condition may or may not be handled gracefully by the Wasm module.
 	Reallocate(size uint64) []byte
 	// Free the backing memory buffer.
 	Free()

vendor/github.com/tetratelabs/wazero/internal/descriptor/table.go

@@ -1,9 +1,6 @@
 package descriptor
 
-import (
+import "math/bits"
-	"math/bits"
-	"slices"
-)
 
 // Table is a data structure mapping 32 bit descriptor to items.
 //
@@ -40,13 +37,23 @@ func (t *Table[Key, Item]) Len() (n int) {
 	return n
 }
 
-// grow grows the table by n * 64 items.
+// grow ensures that t has enough room for n items, potentially reallocating the
+// internal buffers if their capacity was too small to hold this many items.
 func (t *Table[Key, Item]) grow(n int) {
-	total := len(t.masks) + n
+	// Round up to a multiple of 64 since this is the smallest increment due to
-	t.masks = slices.Grow(t.masks, n)[:total]
+	// using 64 bits masks.
+	n = (n*64 + 63) / 64
 
-	total = len(t.items) + n*64
+	if n > len(t.masks) {
-	t.items = slices.Grow(t.items, n*64)[:total]
+		masks := make([]uint64, n)
+		copy(masks, t.masks)
+
+		items := make([]Item, n*64)
+		copy(items, t.items)
+
+		t.masks = masks
+		t.items = items
+	}
 }
 
 // Insert inserts the given item to the table, returning the key that it is
@@ -71,9 +78,13 @@ func (t *Table[Key, Item]) Insert(item Item) (key Key, ok bool) {
 		}
 	}
 
-	// No free slot found, grow the table and retry.
 	offset = len(t.masks)
-	t.grow(1)
+	n := 2 * len(t.masks)
+	if n == 0 {
+		n = 1
+	}
+
+	t.grow(n)
 	goto insert
 }
 
@@ -98,10 +109,10 @@ func (t *Table[Key, Item]) InsertAt(item Item, key Key) bool {
 	if key < 0 {
 		return false
 	}
-	index := uint(key) / 64
+	if diff := int(key) - t.Len(); diff > 0 {
-	if diff := int(index) - len(t.masks) + 1; diff > 0 {
 		t.grow(diff)
 	}
+	index := uint(key) / 64
 	shift := uint(key) % 64
 	t.masks[index] |= 1 << shift
 	t.items[key] = item
@@ -113,8 +124,7 @@ func (t *Table[Key, Item]) Delete(key Key) {
 	if key < 0 { // invalid key
 		return
 	}
-	if index := uint(key) / 64; int(index) < len(t.masks) {
+	if index, shift := key/64, key%64; int(index) < len(t.masks) {
-		shift := uint(key) % 64
 		mask := t.masks[index]
 		if (mask & (1 << shift)) != 0 {
 			var zero Item

vendor/github.com/tetratelabs/wazero/internal/engine/interpreter/interpreter.go

@@ -487,7 +487,7 @@ func (e *engine) setLabelAddress(op *uint64, label label, labelAddressResolution
 }
 
 // ResolveImportedFunction implements wasm.ModuleEngine.
-func (e *moduleEngine) ResolveImportedFunction(index, descFunc, indexInImportedModule wasm.Index, importedModuleEngine wasm.ModuleEngine) {
+func (e *moduleEngine) ResolveImportedFunction(index, indexInImportedModule wasm.Index, importedModuleEngine wasm.ModuleEngine) {
 	imported := importedModuleEngine.(*moduleEngine)
 	e.functions[index] = imported.functions[indexInImportedModule]
 }

vendor/github.com/tetratelabs/wazero/internal/engine/wazevo/module_engine.go

@@ -237,7 +237,7 @@ func (m *moduleEngine) putLocalMemory() {
 }
 
 // ResolveImportedFunction implements wasm.ModuleEngine.
-func (m *moduleEngine) ResolveImportedFunction(index, descFunc, indexInImportedModule wasm.Index, importedModuleEngine wasm.ModuleEngine) {
+func (m *moduleEngine) ResolveImportedFunction(index, indexInImportedModule wasm.Index, importedModuleEngine wasm.ModuleEngine) {
 	executableOffset, moduleCtxOffset, typeIDOffset := m.parent.offsets.ImportedFunctionOffset(index)
 	importedME := importedModuleEngine.(*moduleEngine)
 
@@ -245,12 +245,12 @@ func (m *moduleEngine) ResolveImportedFunction(index, descFunc, indexInImportedM
 		indexInImportedModule -= wasm.Index(len(importedME.importedFunctions))
 	} else {
 		imported := &importedME.importedFunctions[indexInImportedModule]
-		m.ResolveImportedFunction(index, descFunc, imported.indexInModule, imported.me)
+		m.ResolveImportedFunction(index, imported.indexInModule, imported.me)
 		return // Recursively resolve the imported function.
 	}
 
 	offset := importedME.parent.functionOffsets[indexInImportedModule]
-	typeID := m.module.TypeIDs[descFunc]
+	typeID := getTypeIDOf(indexInImportedModule, importedME.module)
 	executable := &importedME.parent.executable[offset]
 	// Write functionInstance.
 	binary.LittleEndian.PutUint64(m.opaque[executableOffset:], uint64(uintptr(unsafe.Pointer(executable))))
@@ -261,6 +261,28 @@ func (m *moduleEngine) ResolveImportedFunction(index, descFunc, indexInImportedM
 	m.importedFunctions[index] = importedFunction{me: importedME, indexInModule: indexInImportedModule}
 }
 
+func getTypeIDOf(funcIndex wasm.Index, m *wasm.ModuleInstance) wasm.FunctionTypeID {
+	source := m.Source
+
+	var typeIndex wasm.Index
+	if funcIndex >= source.ImportFunctionCount {
+		funcIndex -= source.ImportFunctionCount
+		typeIndex = source.FunctionSection[funcIndex]
+	} else {
+		var cnt wasm.Index
+		for i := range source.ImportSection {
+			if source.ImportSection[i].Type == wasm.ExternTypeFunc {
+				if cnt == funcIndex {
+					typeIndex = source.ImportSection[i].DescFunc
+					break
+				}
+				cnt++
+			}
+		}
+	}
+	return m.TypeIDs[typeIndex]
+}
+
 // ResolveImportedMemory implements wasm.ModuleEngine.
 func (m *moduleEngine) ResolveImportedMemory(importedModuleEngine wasm.ModuleEngine) {
 	importedME := importedModuleEngine.(*moduleEngine)

vendor/github.com/tetratelabs/wazero/internal/sysfs/dirfs_supported.go

@@ -5,7 +5,6 @@
 import (
 	"io/fs"
 	"os"
-	"path"
 
 	experimentalsys "github.com/tetratelabs/wazero/experimental/sys"
 )
@@ -35,11 +34,6 @@ func (d *dirFS) Chmod(path string, perm fs.FileMode) experimentalsys.Errno {
 
 // Symlink implements the same method as documented on sys.FS
 func (d *dirFS) Symlink(oldName, link string) experimentalsys.Errno {
-	// Creating a symlink with an absolute path string fails with a "not permitted" error.
-	// https://github.com/WebAssembly/wasi-filesystem/blob/v0.2.0/path-resolution.md#symlinks
-	if path.IsAbs(oldName) {
-		return experimentalsys.EPERM
-	}
 	// Note: do not resolve `oldName` relative to this dirFS. The link result is always resolved
 	// when dereference the `link` on its usage (e.g. readlink, read, etc).
 	// https://github.com/bytecodealliance/cap-std/blob/v1.0.4/cap-std/src/fs/dir.rs#L404-L409

vendor/github.com/tetratelabs/wazero/internal/sysfs/file.go

@@ -269,7 +269,7 @@ func (f *fsFile) Readdir(n int) (dirents []experimentalsys.Dirent, errno experim
 
 	if f.reopenDir { // re-open the directory if needed.
 		f.reopenDir = false
-		if errno = adjustReaddirErr(f, f.closed, f.rewindDir()); errno != 0 {
+		if errno = adjustReaddirErr(f, f.closed, f.reopen()); errno != 0 {
 			return
 		}
 	}
@@ -418,25 +418,19 @@ func seek(s io.Seeker, offset int64, whence int) (int64, experimentalsys.Errno)
 	return newOffset, experimentalsys.UnwrapOSError(err)
 }
 
-func (f *fsFile) rewindDir() experimentalsys.Errno {
+// reopenFile allows re-opening a file for reasons such as applying flags or
-	// Reopen the directory to rewind it.
+// directory iteration.
-	file, err := f.fs.Open(f.name)
+type reopenFile func() experimentalsys.Errno
-	if err != nil {
+
-		return experimentalsys.UnwrapOSError(err)
+// compile-time check to ensure fsFile.reopen implements reopenFile.
-	}
+var _ reopenFile = (*fsFile)(nil).reopen
-	fi, err := file.Stat()
+
-	if err != nil {
+// reopen implements the same method as documented on reopenFile.
-		return experimentalsys.UnwrapOSError(err)
+func (f *fsFile) reopen() experimentalsys.Errno {
-	}
+	_ = f.close()
-	// Can't check if it's still the same file,
+	var err error
-	// but is it still a directory, at least?
+	f.file, err = f.fs.Open(f.name)
-	if !fi.IsDir() {
+	return experimentalsys.UnwrapOSError(err)
-		return experimentalsys.ENOTDIR
-	}
-	// Only update f on success.
-	_ = f.file.Close()
-	f.file = file
-	return 0
 }
 
 // readdirFile allows masking the `Readdir` function on os.File.

vendor/github.com/tetratelabs/wazero/internal/sysfs/osfile.go

@@ -83,12 +83,21 @@ func (f *osFile) SetAppend(enable bool) (errno experimentalsys.Errno) {
 		f.flag &= ^experimentalsys.O_APPEND
 	}
 
-	// appendMode cannot be changed later, so we have to re-open the file
+	// Clear any create or trunc flag, as we are re-opening, not re-creating.
-	// https://github.com/golang/go/blob/go1.23/src/os/file_unix.go#L60
+	f.flag &= ^(experimentalsys.O_CREAT | experimentalsys.O_TRUNC)
+
+	// appendMode (bool) cannot be changed later, so we have to re-open the
+	// file. https://github.com/golang/go/blob/go1.20/src/os/file_unix.go#L60
 	return fileError(f, f.closed, f.reopen())
 }
 
+// compile-time check to ensure osFile.reopen implements reopenFile.
+var _ reopenFile = (*osFile)(nil).reopen
+
 func (f *osFile) reopen() (errno experimentalsys.Errno) {
+	// Clear any create flag, as we are re-opening, not re-creating.
+	f.flag &= ^experimentalsys.O_CREAT
+
 	var (
 		isDir  bool
 		offset int64
@@ -107,47 +116,22 @@ func (f *osFile) reopen() (errno experimentalsys.Errno) {
 		}
 	}
 
-	// Clear any create or trunc flag, as we are re-opening, not re-creating.
+	_ = f.close()
-	flag := f.flag &^ (experimentalsys.O_CREAT | experimentalsys.O_TRUNC)
+	f.file, errno = OpenFile(f.path, f.flag, f.perm)
-	file, errno := OpenFile(f.path, flag, f.perm)
-	if errno != 0 {
-		return errno
-	}
-	errno = f.checkSameFile(file)
 	if errno != 0 {
 		return errno
 	}
 
 	if !isDir {
-		_, err = file.Seek(offset, io.SeekStart)
+		_, err = f.file.Seek(offset, io.SeekStart)
 		if err != nil {
-			_ = file.Close()
 			return experimentalsys.UnwrapOSError(err)
 		}
 	}
 
-	// Only update f on success.
-	_ = f.file.Close()
-	f.file = file
-	f.fd = file.Fd()
 	return 0
 }
 
-func (f *osFile) checkSameFile(osf *os.File) experimentalsys.Errno {
-	fi1, err := f.file.Stat()
-	if err != nil {
-		return experimentalsys.UnwrapOSError(err)
-	}
-	fi2, err := osf.Stat()
-	if err != nil {
-		return experimentalsys.UnwrapOSError(err)
-	}
-	if os.SameFile(fi1, fi2) {
-		return 0
-	}
-	return experimentalsys.ENOENT
-}
-
 // IsNonblock implements the same method as documented on fsapi.File
 func (f *osFile) IsNonblock() bool {
 	return isNonblock(f)

vendor/github.com/tetratelabs/wazero/internal/wasm/engine.go

@@ -44,10 +44,9 @@ type ModuleEngine interface {
 
 	// ResolveImportedFunction is used to add imported functions needed to make this ModuleEngine fully functional.
 	// 	- `index` is the function Index of this imported function.
-	// 	- `descFunc` is the type Index in Module.TypeSection of this imported function. It corresponds to Import.DescFunc.
 	// 	- `indexInImportedModule` is the function Index of the imported function in the imported module.
 	//	- `importedModuleEngine` is the ModuleEngine for the imported ModuleInstance.
-	ResolveImportedFunction(index, descFunc, indexInImportedModule Index, importedModuleEngine ModuleEngine)
+	ResolveImportedFunction(index, indexInImportedModule Index, importedModuleEngine ModuleEngine)
 
 	// ResolveImportedMemory is called when this module imports a memory from another module.
 	ResolveImportedMemory(importedModuleEngine ModuleEngine)

vendor/github.com/tetratelabs/wazero/internal/wasm/memory.go

@@ -77,7 +77,6 @@ func NewMemoryInstance(memSec *Memory, allocator experimental.MemoryAllocator, m
 	if allocator != nil {
 		expBuffer = allocator.Allocate(capBytes, maxBytes)
 		buffer = expBuffer.Reallocate(minBytes)
-		_ = buffer[:minBytes] // Bounds check that the minimum was allocated.
 	} else if memSec.IsShared {
 		// Shared memory needs a fixed buffer, so allocate with the maximum size.
 		//
@@ -239,15 +238,12 @@ func (m *MemoryInstance) Grow(delta uint32) (result uint32, ok bool) {
 		return currentPages, true
 	}
 
+	// If exceeds the max of memory size, we push -1 according to the spec.
 	newPages := currentPages + delta
 	if newPages > m.Max || int32(delta) < 0 {
 		return 0, false
 	} else if m.expBuffer != nil {
 		buffer := m.expBuffer.Reallocate(MemoryPagesToBytesNum(newPages))
-		if buffer == nil {
-			// Allocator failed to grow.
-			return 0, false
-		}
 		if m.Shared {
 			if unsafe.SliceData(buffer) != unsafe.SliceData(m.Buffer) {
 				panic("shared memory cannot move, this is a bug in the memory allocator")

vendor/github.com/tetratelabs/wazero/internal/wasm/store.go

@@ -446,7 +446,7 @@ func (m *ModuleInstance) resolveImports(ctx context.Context, module *Module) (er
 					return
 				}
 
-				m.Engine.ResolveImportedFunction(i.IndexPerType, i.DescFunc, imported.Index, importedModule.Engine)
+				m.Engine.ResolveImportedFunction(i.IndexPerType, imported.Index, importedModule.Engine)
 			case ExternTypeTable:
 				expected := i.DescTable
 				importedTable := importedModule.Tables[imported.Index]

vendor/github.com/tetratelabs/wazero/sys/stat.go

@@ -29,7 +29,9 @@
 // # Notes
 //
 //   - This is used for WebAssembly ABI emulating the POSIX `stat` system call.
-//     See https://pubs.opengroup.org/onlinepubs/9699919799/functions/stat.html
+//     Fields included are required for WebAssembly ABI including wasip1
+//     (a.k.a. wasix) and wasi-filesystem (a.k.a. wasip2). See
+//     https://pubs.opengroup.org/onlinepubs/9699919799/functions/stat.html
 //   - Fields here are required for WebAssembly ABI including wasip1
 //     (a.k.a. wasix) and wasi-filesystem (a.k.a. wasip2).
 //   - This isn't the same as syscall.Stat_t because wazero supports Windows,

vendor/modules.txt

@@ -24,11 +24,10 @@ codeberg.org/gruf/go-fastcopy
 # codeberg.org/gruf/go-fastpath/v2 v2.0.0
 ## explicit; go 1.14
 codeberg.org/gruf/go-fastpath/v2
-# codeberg.org/gruf/go-ffmpreg v0.3.1
+# codeberg.org/gruf/go-ffmpreg v0.2.6
 ## explicit; go 1.22.0
 codeberg.org/gruf/go-ffmpreg/embed/ffmpeg
 codeberg.org/gruf/go-ffmpreg/embed/ffprobe
-codeberg.org/gruf/go-ffmpreg/wasm
 # codeberg.org/gruf/go-iotools v0.0.0-20240710125620-934ae9c654cf
 ## explicit; go 1.21
 codeberg.org/gruf/go-iotools
@@ -845,7 +844,7 @@ github.com/tdewolff/parse/v2/strconv
 # github.com/technologize/otel-go-contrib v1.1.1
 ## explicit; go 1.17
 github.com/technologize/otel-go-contrib/otelginmetrics
-# github.com/tetratelabs/wazero v1.8.1
+# github.com/tetratelabs/wazero v1.8.0
 ## explicit; go 1.21
 github.com/tetratelabs/wazero
 github.com/tetratelabs/wazero/api

web/assets/themes/moonlight-hunt.css

@@ -30,10 +30,14 @@
 
   /* Buttons */
   --bloodshot: linear-gradient(
-    var(--bright-red),
+    var(--blood-red) 0%,
-    var(--blood-red),
+    var(--feral-orange) 2%,
-    var(--blood-red),
+    var(--bright-red) 5%,
-    var(--bright-red)
+    var(--blood-red) 40%,
+    var(--blood-red) 60%,
+    var(--bright-red) 95%,
+    var(--feral-orange) 98%,
+    var(--blood-red) 100%
   );
   --button-bg: var(--bloodshot);
   --button-fg: var(--bleached-bone);

web/assets/themes/solarized-dark.css

@@ -40,31 +40,31 @@
   --orange2: var(--red);
 
   /* Restyle basic colors to use Solarized */
-  --white1: var(--base03);
+  --white1: var(--base02);
-  --white2: var(--base02);
+  --white2: var(--base03);
-  --blue2: var(--base1);
+  --blue2: var(--base0);
   --blue3: var(--base1);
 
   /* Basic page styling (background + foreground) */
-  --bg: var(--base02);
+  --bg: var(--base03);
   --bg-accent: var(--base02);
   --fg-reduced: var(--base0);
-  --fg: var(--base0);
+  --fg: var(--base1);
 
   /* Profile page styling */
   --profile-bg: var(--white2);
 
   /* Solarize statuses */
-  --status-bg: var(--base03);
+  --status-bg: var(--white1);
-  --status-focus-bg: var(--base03);
+  --status-focus-bg: var(--white1);
-  --status-info-bg: var(--base02);
+  --status-info-bg: var(--white2);
-  --status-focus-info-bg: var(--base02);
+  --status-focus-info-bg: var(--white2);
 
   /* Used around statuses + other items */
-  --boxshadow-border: 0.15rem solid var(--base01);
+  --boxshadow-border: 0.1rem solid var(--base01);
 
-  --plyr-video-control-color: var(--base1);
+  --plyr-video-control-color: var(--fg);
-  --plyr-video-control-color-hover: var(--base03);
+  --plyr-video-control-color-hover: var(--fg-reduced);
 }
 
 @font-face {
@@ -83,7 +83,6 @@ html, body {
 /* Column headers */
 .col-header {
   border: var(--boxshadow-border);
-  color: var(--base1);
 }
 
 .profile .about-user .col-header {
@@ -91,32 +90,20 @@ html, body {
   margin-bottom: 0;
 }
 
-/* Instance title color */
-.page-header a h1 {
-  color: var(--base1);
-}
-
 /* Header card */
 .profile .profile-header {
   border: var(--boxshadow-border);
-  background: var(--base03);
 }
 
 /* Fiddle around with borders on about sections */
 .profile .about-user .fields,
 .profile .about-user .bio,
 .profile .about-user .accountstats {
-  background: var(--base03);
   border-left: var(--boxshadow-border);
   border-right: var(--boxshadow-border);
 }
 .profile .about-user .accountstats {
   border-bottom: var(--boxshadow-border);
-  color: var(--base0);
-}
-
-.profile .about-user .fields {
-  padding-top: 0;
 }
 
 /* Profile fields */
@@ -130,11 +117,10 @@ html, body {
 /* Status media */
 .status .media .media-wrapper {
   border: var(--boxshadow-border);
-  background: var(--base02);
 }
 .status .media .media-wrapper details .unknown-attachment .placeholder {
-  color: var(--base1);
+  color: var(--base01);
-  border: 0.2rem dashed var(--base1);
+  border: 0.2rem dashed var(--base01);
 }
 .status .media .media-wrapper details video.plyr-video {
   background: transparent;
@@ -142,11 +128,10 @@ html, body {
 
 /* Status polls */
 .status .text .poll {
-  background-color: var(--base03);
+  background-color: var(--white2);
-  border: var(--boxshadow-border);
 }
 .status .text .poll .poll-info {
-  background-color: var(--base03);
+  background-color: var(--white1);
 }
 
 /* Code snippets */
@@ -168,24 +153,23 @@ button, .button,
 }
 
 .button {
-  color: var(--base1);
-  background: var(--base02);
-  border: var(--boxshadow-border);
-}
-
-.button:hover {
   color: var(--base0);
   background: var(--base03);
   border: var(--boxshadow-border);
 }
 
-/* Ensure role badge readable */
+.button:hover {
-.profile .profile-header .basic-info .namerole .role.admin {
   color: var(--base1);
+  background: var(--base02);
+  border: var(--boxshadow-border);
 }
 
-/* Distinguish bot icon */
+/* Ensure role badge readable */
+.profile .profile-header .basic-info .namerole .role.admin {
+  color: var(--base0);
+}
+
+/* Distinguish bot icon from background */
 .profile .profile-header .basic-info .namerole .bot-username-wrapper .bot-legend-wrapper {
   border: var(--boxshadow-border);
-  color: var(--base1);
 }