Merge pull request #110 from domainr/wasm

add support for wasm/wasip1 build without mmap support

Author: oschwald

mmap_unix.go

@@ -1,5 +1,5 @@
-//go:build !windows && !appengine && !plan9
-// +build !windows,!appengine,!plan9
+//go:build !windows && !appengine && !plan9 && !js && !wasip1
+// +build !windows,!appengine,!plan9,!js,!wasip1
 
 package maxminddb
 

mmap_windows.go

@@ -1,3 +1,4 @@
+//go:build windows && !appengine
 // +build windows,!appengine
 
 package maxminddb

reader_appengine.go

@@ -0,0 +1,26 @@
+//go:build appengine || plan9 || js || wasip1
+// +build appengine plan9 js wasip1
+
+package maxminddb
+
+import "io/ioutil"
+
+// Open takes a string path to a MaxMind DB file and returns a Reader
+// structure or an error. The database file is opened using a memory map
+// on supported platforms. On platforms without memory map support, such
+// as WebAssembly or Google App Engine, the database is loaded into memory.
+// Use the Close method on the Reader object to return the resources to the system.
+func Open(file string) (*Reader, error) {
+	bytes, err := ioutil.ReadFile(file)
+	if err != nil {
+		return nil, err
+	}
+
+	return FromBytes(bytes)
+}
+
+// Close returns the resources used by the database to the system.
+func (r *Reader) Close() error {
+	r.buffer = nil
+	return nil
+}

reader_memory.go

@@ -1,5 +1,5 @@
-//go:build !appengine && !plan9
-// +build !appengine,!plan9
+//go:build !appengine && !plan9 && !js && !wasip1
+// +build !appengine,!plan9,!js,!wasip1
 
 package maxminddb
 
@@ -9,10 +9,10 @@ import (
 )
 
 // Open takes a string path to a MaxMind DB file and returns a Reader
-// structure or an error. The database file is opened using a memory map,
-// except on Google App Engine where mmap is not supported; there the database
-// is loaded into memory. Use the Close method on the Reader object to return
-// the resources to the system.
+// structure or an error. The database file is opened using a memory map
+// on supported platforms. On platforms without memory map support, such
+// as WebAssembly or Google App Engine, the database is loaded into memory.
+// Use the Close method on the Reader object to return the resources to the system.
 func Open(file string) (*Reader, error) {
 	mapFile, err := os.Open(file)
 	if err != nil {
@@ -51,9 +51,7 @@ func Open(file string) (*Reader, error) {
 	return reader, nil
 }
 
-// Close unmaps the database file from virtual memory and returns the
-// resources to the system. If called on a Reader opened using FromBytes
-// or Open on Google App Engine, this method does nothing.
+// Close returns the resources used by the database to the system.
 func (r *Reader) Close() error {
 	var err error
 	if r.hasMappedFile {