wasm: fix walltime link error by adding up-to-date wasm_exec.js

Solves link error while running rclone's wasm version. Go's `walltime1` function was renamed to `walltime`. This commit updates wasm_exec.js with the new name.

fs/rc/js/wasm_exec.js

@@ -2,53 +2,32 @@
 // Use of this source code is governed by a BSD-style
 // 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
-
-	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 (Object.keys(fs) !== 0) {
-			global.fs = fs;
-		}
-	}
-
   const enosys = () => {
     const err = new Error("not implemented");
     err.code = "ENOSYS";
     return err;
   };
 
-	if (!global.fs) {
+  if (!globalThis.fs) {
     let outputBuf = "";
-		global.fs = {
+    globalThis.fs = {
-			constants: { O_WRONLY: -1, O_RDWR: -1, O_CREAT: -1, O_TRUNC: -1, O_APPEND: -1, O_EXCL: -1 }, // unused
+      constants: {
+        O_WRONLY: -1,
+        O_RDWR: -1,
+        O_CREAT: -1,
+        O_TRUNC: -1,
+        O_APPEND: -1,
+        O_EXCL: -1,
+      }, // unused
       writeSync(fd, buf) {
         outputBuf += decoder.decode(buf);
         const nl = outputBuf.lastIndexOf("\n");
         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;
       },
@@ -60,79 +39,137 @@
         const n = this.writeSync(fd, buf);
         callback(null, n);
       },
-			chmod(path, mode, callback) { callback(enosys()); },
+      chmod(path, mode, callback) {
-			chown(path, uid, gid, callback) { callback(enosys()); },
+        callback(enosys());
-			close(fd, callback) { callback(enosys()); },
+      },
-			fchmod(fd, mode, callback) { callback(enosys()); },
+      chown(path, uid, gid, callback) {
-			fchown(fd, uid, gid, callback) { callback(enosys()); },
+        callback(enosys());
-			fstat(fd, callback) { callback(enosys()); },
+      },
-			fsync(fd, callback) { callback(null); },
+      close(fd, callback) {
-			ftruncate(fd, length, callback) { callback(enosys()); },
+        callback(enosys());
-			lchown(path, uid, gid, callback) { callback(enosys()); },
+      },
-			link(path, link, callback) { callback(enosys()); },
+      fchmod(fd, mode, callback) {
-			lstat(path, callback) { callback(enosys()); },
+        callback(enosys());
-			mkdir(path, perm, callback) { callback(enosys()); },
+      },
-			open(path, flags, mode, callback) { callback(enosys()); },
+      fchown(fd, uid, gid, callback) {
-			read(fd, buffer, offset, length, position, callback) { callback(enosys()); },
+        callback(enosys());
-			readdir(path, callback) { callback(enosys()); },
+      },
-			readlink(path, callback) { callback(enosys()); },
+      fstat(fd, callback) {
-			rename(from, to, callback) { callback(enosys()); },
+        callback(enosys());
-			rmdir(path, callback) { callback(enosys()); },
+      },
-			stat(path, callback) { callback(enosys()); },
+      fsync(fd, callback) {
-			symlink(path, link, callback) { callback(enosys()); },
+        callback(null);
-			truncate(path, length, callback) { callback(enosys()); },
+      },
-			unlink(path, callback) { callback(enosys()); },
+      ftruncate(fd, length, callback) {
-			utimes(path, atime, mtime, callback) { callback(enosys()); },
+        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() { return -1; },
+      getuid() {
-			getgid() { return -1; },
+        return -1;
-			geteuid() { return -1; },
+      },
-			getegid() { return -1; },
+      getgid() {
-			getgroups() { throw enosys(); },
+        return -1;
+      },
+      geteuid() {
+        return -1;
+      },
+      getegid() {
+        return -1;
+      },
+      getgroups() {
+        throw enosys();
+      },
       pid: -1,
       ppid: -1,
-			umask() { throw enosys(); },
+      umask() {
-			cwd() { throw enosys(); },
+        throw enosys();
-			chdir() { throw enosys(); },
+      },
-		}
+      cwd() {
-	}
+        throw enosys();
-
+      },
-	if (!global.crypto) {
+      chdir() {
-		const nodeCrypto = require("crypto");
+        throw enosys();
-		global.crypto = {
-			getRandomValues(b) {
-				nodeCrypto.randomFillSync(b);
       },
     };
   }
 
-	if (!global.performance) {
+  if (!globalThis.crypto) {
-		global.performance = {
+    throw new Error(
-			now() {
+      "globalThis.crypto is not available, polyfill required (crypto.getRandomValues only)",
-				const [sec, nsec] = process.hrtime();
+    );
-				return sec * 1000 + nsec / 1000000;
-			},
-		};
   }
 
-	if (!global.TextEncoder) {
+  if (!globalThis.performance) {
-		global.TextEncoder = require("util").TextEncoder;
+    throw new Error(
+      "globalThis.performance is not available, polyfill required (performance.now only)",
+    );
   }
 
-	if (!global.TextDecoder) {
+  if (!globalThis.TextEncoder) {
-		global.TextDecoder = require("util").TextDecoder;
+    throw new Error(
+      "globalThis.TextEncoder is not available, polyfill required",
+    );
   }
 
-	// End of polyfills for common API.
+  if (!globalThis.TextDecoder) {
+    throw new Error(
+      "globalThis.TextDecoder is not available, polyfill required",
+    );
+  }
 
   const encoder = new TextEncoder("utf-8");
   const decoder = new TextDecoder("utf-8");
 
-	global.Go = class {
+  globalThis.Go = class {
     constructor() {
       this.argv = ["js"];
       this.env = {};
@@ -151,13 +188,13 @@
       const setInt64 = (addr, v) => {
         this.mem.setUint32(addr + 0, v, true);
         this.mem.setUint32(addr + 4, Math.floor(v / 4294967296), true);
-			}
+      };
 
       const getInt64 = (addr) => {
         const low = this.mem.getUint32(addr + 0, true);
         const high = this.mem.getInt32(addr + 4, true);
         return low + high * 4294967296;
-			}
+      };
 
       const loadValue = (addr) => {
         const f = this.mem.getFloat64(addr, true);
@@ -170,7 +207,7 @@
 
         const id = this.mem.getUint32(addr, true);
         return this._values[id];
-			}
+      };
 
       const storeValue = (addr, v) => {
         const nanHead = 0x7FF80000;
@@ -220,13 +257,13 @@
         }
         this.mem.setUint32(addr + 4, nanHead | typeFlag, true);
         this.mem.setUint32(addr, id, true);
-			}
+      };
 
       const loadSlice = (addr) => {
         const array = getInt64(addr + 0);
         const len = getInt64(addr + 8);
         return new Uint8Array(this._inst.exports.mem.buffer, array, len);
-			}
+      };
 
       const loadSliceOfValues = (addr) => {
         const array = getInt64(addr + 0);
@@ -236,13 +273,15 @@
           a[i] = loadValue(array + i * 8);
         }
         return a;
-			}
+      };
 
       const loadString = (addr) => {
         const saddr = getInt64(addr + 0);
         const len = getInt64(addr + 8);
-				return decoder.decode(new DataView(this._inst.exports.mem.buffer, saddr, len));
+        return decoder.decode(
-			}
+          new DataView(this._inst.exports.mem.buffer, saddr, len),
+        );
+      };
 
       const timeOrigin = Date.now() - performance.now();
       this.importObject = {
@@ -254,6 +293,7 @@
 
           // func wasmExit(code int32)
           "runtime.wasmExit": (sp) => {
+            sp >>>= 0;
             const code = this.mem.getInt32(sp + 8, true);
             this.exited = true;
             delete this._inst;
@@ -266,34 +306,44 @@
 
           // func wasmWrite(fd uintptr, p unsafe.Pointer, n int32)
           "runtime.wasmWrite": (sp) => {
+            sp >>>= 0;
             const fd = getInt64(sp + 8);
             const p = getInt64(sp + 16);
             const n = this.mem.getInt32(sp + 24, true);
-						fs.writeSync(fd, new Uint8Array(this._inst.exports.mem.buffer, p, n));
+            fs.writeSync(
+              fd,
+              new Uint8Array(this._inst.exports.mem.buffer, p, n),
+            );
           },
 
           // func resetMemoryDataView()
           "runtime.resetMemoryDataView": (sp) => {
+            sp >>>= 0;
             this.mem = new DataView(this._inst.exports.mem.buffer);
           },
 
           // func nanotime1() int64
           "runtime.nanotime1": (sp) => {
+            sp >>>= 0;
             setInt64(sp + 8, (timeOrigin + performance.now()) * 1000000);
           },
 
-					// func walltime1() (sec int64, nsec int32)
+          // func walltime() (sec int64, nsec int32)
-					"runtime.walltime1": (sp) => {
+          "runtime.walltime": (sp) => {
-						const msec = (new Date).getTime();
+            sp >>>= 0;
+            const msec = (new Date()).getTime();
             setInt64(sp + 8, msec / 1000);
             this.mem.setInt32(sp + 16, (msec % 1000) * 1000000, true);
           },
 
           // func scheduleTimeoutEvent(delay int64) int32
           "runtime.scheduleTimeoutEvent": (sp) => {
+            sp >>>= 0;
             const id = this._nextCallbackTimeoutID;
             this._nextCallbackTimeoutID++;
-						this._scheduledTimeouts.set(id, setTimeout(
+            this._scheduledTimeouts.set(
+              id,
+              setTimeout(
                 () => {
                   this._resume();
                   while (this._scheduledTimeouts.has(id)) {
@@ -304,12 +354,14 @@
                   }
                 },
                 getInt64(sp + 8) + 1, // setTimeout has been seen to fire up to 1 millisecond early
-						));
+              ),
+            );
             this.mem.setInt32(sp + 16, id, true);
           },
 
           // func clearTimeoutEvent(id int32)
           "runtime.clearTimeoutEvent": (sp) => {
+            sp >>>= 0;
             const id = this.mem.getInt32(sp + 8, true);
             clearTimeout(this._scheduledTimeouts.get(id));
             this._scheduledTimeouts.delete(id);
@@ -317,11 +369,13 @@
 
           // func getRandomData(r []byte)
           "runtime.getRandomData": (sp) => {
+            sp >>>= 0;
             crypto.getRandomValues(loadSlice(sp + 8));
           },
 
           // func finalizeRef(v ref)
           "syscall/js.finalizeRef": (sp) => {
+            sp >>>= 0;
             const id = this.mem.getUint32(sp + 8, true);
             this._goRefCounts[id]--;
             if (this._goRefCounts[id] === 0) {
@@ -334,47 +388,66 @@
 
           // func stringVal(value string) ref
           "syscall/js.stringVal": (sp) => {
+            sp >>>= 0;
             storeValue(sp + 24, loadString(sp + 8));
           },
 
           // func valueGet(v ref, p string) ref
           "syscall/js.valueGet": (sp) => {
+            sp >>>= 0;
             const result = Reflect.get(loadValue(sp + 8), loadString(sp + 16));
-						sp = this._inst.exports.getsp(); // see comment above
+            sp = this._inst.exports.getsp() >>> 0; // see comment above
             storeValue(sp + 32, result);
           },
 
           // func valueSet(v ref, p string, x ref)
           "syscall/js.valueSet": (sp) => {
-						Reflect.set(loadValue(sp + 8), loadString(sp + 16), loadValue(sp + 32));
+            sp >>>= 0;
+            Reflect.set(
+              loadValue(sp + 8),
+              loadString(sp + 16),
+              loadValue(sp + 32),
+            );
           },
 
           // func valueDelete(v ref, p string)
           "syscall/js.valueDelete": (sp) => {
+            sp >>>= 0;
             Reflect.deleteProperty(loadValue(sp + 8), loadString(sp + 16));
           },
 
           // func valueIndex(v ref, i int) ref
           "syscall/js.valueIndex": (sp) => {
-						storeValue(sp + 24, Reflect.get(loadValue(sp + 8), getInt64(sp + 16)));
+            sp >>>= 0;
+            storeValue(
+              sp + 24,
+              Reflect.get(loadValue(sp + 8), getInt64(sp + 16)),
+            );
           },
 
           // valueSetIndex(v ref, i int, x ref)
           "syscall/js.valueSetIndex": (sp) => {
-						Reflect.set(loadValue(sp + 8), getInt64(sp + 16), loadValue(sp + 24));
+            sp >>>= 0;
+            Reflect.set(
+              loadValue(sp + 8),
+              getInt64(sp + 16),
+              loadValue(sp + 24),
+            );
           },
 
           // func valueCall(v ref, m string, args []ref) (ref, bool)
           "syscall/js.valueCall": (sp) => {
+            sp >>>= 0;
             try {
               const v = loadValue(sp + 8);
               const m = Reflect.get(v, loadString(sp + 16));
               const args = loadSliceOfValues(sp + 32);
               const result = Reflect.apply(m, v, args);
-							sp = this._inst.exports.getsp(); // see comment above
+              sp = this._inst.exports.getsp() >>> 0; // see comment above
               storeValue(sp + 56, result);
               this.mem.setUint8(sp + 64, 1);
             } catch (err) {
+              sp = this._inst.exports.getsp() >>> 0; // see comment above
               storeValue(sp + 56, err);
               this.mem.setUint8(sp + 64, 0);
             }
@@ -382,14 +455,16 @@
 
           // func valueInvoke(v ref, args []ref) (ref, bool)
           "syscall/js.valueInvoke": (sp) => {
+            sp >>>= 0;
             try {
               const v = loadValue(sp + 8);
               const args = loadSliceOfValues(sp + 16);
               const result = Reflect.apply(v, undefined, args);
-							sp = this._inst.exports.getsp(); // see comment above
+              sp = this._inst.exports.getsp() >>> 0; // see comment above
               storeValue(sp + 40, result);
               this.mem.setUint8(sp + 48, 1);
             } catch (err) {
+              sp = this._inst.exports.getsp() >>> 0; // see comment above
               storeValue(sp + 40, err);
               this.mem.setUint8(sp + 48, 0);
             }
@@ -397,14 +472,16 @@
 
           // func valueNew(v ref, args []ref) (ref, bool)
           "syscall/js.valueNew": (sp) => {
+            sp >>>= 0;
             try {
               const v = loadValue(sp + 8);
               const args = loadSliceOfValues(sp + 16);
               const result = Reflect.construct(v, args);
-							sp = this._inst.exports.getsp(); // see comment above
+              sp = this._inst.exports.getsp() >>> 0; // see comment above
               storeValue(sp + 40, result);
               this.mem.setUint8(sp + 48, 1);
             } catch (err) {
+              sp = this._inst.exports.getsp() >>> 0; // see comment above
               storeValue(sp + 40, err);
               this.mem.setUint8(sp + 48, 0);
             }
@@ -412,11 +489,13 @@
 
           // func valueLength(v ref) int
           "syscall/js.valueLength": (sp) => {
+            sp >>>= 0;
             setInt64(sp + 16, parseInt(loadValue(sp + 8).length));
           },
 
           // valuePrepareString(v ref) (ref, int)
           "syscall/js.valuePrepareString": (sp) => {
+            sp >>>= 0;
             const str = encoder.encode(String(loadValue(sp + 8)));
             storeValue(sp + 16, str);
             setInt64(sp + 24, str.length);
@@ -424,20 +503,28 @@
 
           // valueLoadString(v ref, b []byte)
           "syscall/js.valueLoadString": (sp) => {
+            sp >>>= 0;
             const str = loadValue(sp + 8);
             loadSlice(sp + 16).set(str);
           },
 
           // func valueInstanceOf(v ref, t ref) bool
           "syscall/js.valueInstanceOf": (sp) => {
-						this.mem.setUint8(sp + 24, (loadValue(sp + 8) instanceof loadValue(sp + 16)) ? 1 : 0);
+            sp >>>= 0;
+            this.mem.setUint8(
+              sp + 24,
+              (loadValue(sp + 8) instanceof loadValue(sp + 16)) ? 1 : 0,
+            );
           },
 
           // func copyBytesToGo(dst []byte, src ref) (int, bool)
           "syscall/js.copyBytesToGo": (sp) => {
+            sp >>>= 0;
             const dst = loadSlice(sp + 8);
             const src = loadValue(sp + 32);
-						if (!(src instanceof Uint8Array || src instanceof Uint8ClampedArray)) {
+            if (
+              !(src instanceof Uint8Array || src instanceof Uint8ClampedArray)
+            ) {
               this.mem.setUint8(sp + 48, 0);
               return;
             }
@@ -449,9 +536,12 @@
 
           // func copyBytesToJS(dst ref, src []byte) (int, bool)
           "syscall/js.copyBytesToJS": (sp) => {
+            sp >>>= 0;
             const dst = loadValue(sp + 8);
             const src = loadSlice(sp + 16);
-						if (!(dst instanceof Uint8Array || dst instanceof Uint8ClampedArray)) {
+            if (
+              !(dst instanceof Uint8Array || dst instanceof Uint8ClampedArray)
+            ) {
               this.mem.setUint8(sp + 48, 0);
               return;
             }
@@ -464,11 +554,14 @@
           "debug": (value) => {
             console.log(value);
           },
-				}
+        },
       };
     }
 
     async run(instance) {
+      if (!(instance instanceof WebAssembly.Instance)) {
+        throw new Error("Go.run: WebAssembly.Instance expected");
+      }
       this._inst = instance;
       this.mem = new DataView(this._inst.exports.mem.buffer);
       this._values = [ // JS values that Go currently has references to, indexed by reference id
@@ -477,7 +570,7 @@
         null,
         true,
         false,
-				global,
+        globalThis,
         this,
       ];
       this._goRefCounts = new Array(this._values.length).fill(Infinity); // number of references that Go has to a JS value, indexed by reference id
@@ -486,7 +579,7 @@
         [null, 2],
         [true, 3],
         [false, 4],
-				[global, 5],
+        [globalThis, 5],
         [this, 6],
       ]);
       this._idPool = []; // unused ids that have been garbage collected
@@ -527,6 +620,15 @@
         offset += 8;
       });
 
+      // The linker guarantees global data starts from at least wasmMinDataAddr.
+      // Keep in sync with cmd/link/internal/ld/data.go:wasmMinDataAddr.
+      const wasmMinDataAddr = 4096 + 8192;
+      if (offset >= wasmMinDataAddr) {
+        throw new Error(
+          "total length of command line and environment variables exceeds limit",
+        );
+      }
+
       this._inst.exports.run(argc, argv);
       if (this.exited) {
         this._resolveExitPromise();
@@ -553,36 +655,5 @@
         return event.result;
       };
     }
-	}
+  };
-
-	if (
-		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);
-		});
-	}
 })();