]> Cypherpunks repositories - gostls13.git/commitdiff
misc/wasm: pollute global JS namespace less
authorRichard Musiol <mail@richard-musiol.de>
Wed, 9 May 2018 13:18:59 +0000 (15:18 +0200)
committerBrad Fitzpatrick <bradfitz@golang.org>
Tue, 15 May 2018 14:15:07 +0000 (14:15 +0000)
This commit changes wasm_exec.js so it only puts the single
name "go" into the global namespace. Other names became private
or were turned into a property/method of "go".

Change-Id: I633829dfd3c06936f092c0a14b9978bf855e41fe
Reviewed-on: https://go-review.googlesource.com/112980
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Agniva De Sarker <agniva.quicksilver@gmail.com>
misc/wasm/wasm_exec.html
misc/wasm/wasm_exec.js

index 233b8823d6af4466cb304b43a98866ac35f8095c..634ae20cfcf6737a35a96863b26dffb102256e4b 100644 (file)
@@ -17,14 +17,14 @@ license that can be found in the LICENSE file.
                async function loadAndCompile() {
                        let resp = await fetch("test.wasm");
                        let bytes = await resp.arrayBuffer();
-                       await compile(bytes);
+                       await go.compile(bytes);
                        document.getElementById("runButton").disabled = false;
                }
 
                loadAndCompile();
        </script>
 
-       <button onClick="console.clear(); run();" id="runButton" disabled>Run</button>
+       <button onClick="console.clear(); go.run();" id="runButton" disabled>Run</button>
 </body>
 
 </html>
index 18bff387db5be101375c48fb00485ae6adfbe239..f616b5a1a6faa47a98fa39a854ae7fbd70c9c6ba 100755 (executable)
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-let args = ["js"];
-
-// Map web browser API and Node.js API to a single common API (preferring web standards over Node.js API).
-if (typeof process !== "undefined") { // detect Node.js
-       if (process.argv.length < 3) {
-               process.stderr.write("usage: go_js_wasm_exec [wasm binary]\n");
-               process.exit(1);
-       }
-
-       args = args.concat(process.argv.slice(3));
-       global.require = require;
-
-       global.fs = require("fs");
-
-       const nodeCrypto = require("crypto");
-       global.crypto = {
-               getRandomValues(b) {
-                       nodeCrypto.randomFillSync(b);
-               },
-       };
-
-       const now = () => {
-               const [sec, nsec] = process.hrtime();
-               return sec * 1000 + nsec / 1000000;
-       };
-       global.performance = {
-               timeOrigin: Date.now() - now(),
-               now: now,
-       };
-
-       const util = require("util");
-       global.TextEncoder = util.TextEncoder;
-       global.TextDecoder = util.TextDecoder;
-
-       compileAndRun(fs.readFileSync(process.argv[2])).catch((err) => {
-               console.error(err);
-               process.exit(1);
-       });
-} else {
-       window.global = window;
-
-       global.process = {
-               env: {},
-               exit(code) {
-                       if (code !== 0) {
-                               console.warn("exit code:", code);
-                       }
-               },
-       };
-
-       let outputBuf = "";
-       global.fs = {
-               constants: {},
-               writeSync(fd, buf) {
-                       outputBuf += decoder.decode(buf);
-                       const nl = outputBuf.lastIndexOf("\n");
-                       if (nl != -1) {
-                               console.log(outputBuf.substr(0, nl));
-                               outputBuf = outputBuf.substr(nl + 1);
-                       }
-                       return buf.length;
-               },
-       };
-}
-
-const encoder = new TextEncoder("utf-8");
-const decoder = new TextDecoder("utf-8");
-
-let mod, inst;
-let values = []; // TODO: garbage collection
-
-function mem() {
-       // The buffer may change when requesting more memory.
-       return new DataView(inst.exports.mem.buffer);
-}
-
-function setInt64(addr, v) {
-       mem().setUint32(addr + 0, v, true);
-       if (v >= 0) {
-               mem().setUint32(addr + 4, v / 4294967296, true);
-       } else {
-               mem().setUint32(addr + 4, -1, true); // FIXME
-       }
-}
-
-function getInt64(addr) {
-       const low = mem().getUint32(addr + 0, true);
-       const high = mem().getInt32(addr + 4, true);
-       return low + high * 4294967296;
-}
-
-function loadValue(addr) {
-       const id = mem().getUint32(addr, true);
-       return values[id];
-}
-
-function storeValue(addr, v) {
-       if (v === undefined) {
-               mem().setUint32(addr, 0, true);
-               return;
-       }
-       if (v === null) {
-               mem().setUint32(addr, 1, true);
-               return;
-       }
-       values.push(v);
-       mem().setUint32(addr, values.length - 1, true);
-}
-
-function loadSlice(addr) {
-       const array = getInt64(addr + 0);
-       const len = getInt64(addr + 8);
-       return new Uint8Array(inst.exports.mem.buffer, array, len);
-}
-
-function loadSliceOfValues(addr) {
-       const array = getInt64(addr + 0);
-       const len = getInt64(addr + 8);
-       const a = new Array(len);
-       for (let i = 0; i < len; i++) {
-               const id = mem().getUint32(array + i * 4, true);
-               a[i] = values[id];
-       }
-       return a;
-}
-
-function loadString(addr) {
-       const saddr = getInt64(addr + 0);
-       const len = getInt64(addr + 8);
-       return decoder.decode(new DataView(inst.exports.mem.buffer, saddr, len));
-}
-
-async function compileAndRun(source) {
-       await compile(source);
-       await run();
-}
-
-async function compile(source) {
-       mod = await WebAssembly.compile(source);
-}
-
-async function run() {
-       let importObject = {
-               go: {
-                       // func wasmExit(code int32)
-                       "runtime.wasmExit": function (sp) {
-                               process.exit(mem().getInt32(sp + 8, true));
-                       },
-
-                       // func wasmWrite(fd uintptr, p unsafe.Pointer, n int32)
-                       "runtime.wasmWrite": function (sp) {
-                               const fd = getInt64(sp + 8);
-                               const p = getInt64(sp + 16);
-                               const n = mem().getInt32(sp + 24, true);
-                               fs.writeSync(fd, new Uint8Array(inst.exports.mem.buffer, p, n));
-                       },
-
-                       // func nanotime() int64
-                       "runtime.nanotime": function (sp) {
-                               setInt64(sp + 8, (performance.timeOrigin + performance.now()) * 1000000);
-                       },
-
-                       // func walltime() (sec int64, nsec int32)
-                       "runtime.walltime": function (sp) {
-                               const msec = (new Date).getTime();
-                               setInt64(sp + 8, msec / 1000);
-                               mem().setInt32(sp + 16, (msec % 1000) * 1000000, true);
-                       },
+(() => {
+       let args = ["js"];
+
+       // Map web browser API and Node.js API to a single common API (preferring web standards over Node.js API).
+       const isNodeJS = typeof process !== "undefined";
+       if (isNodeJS) {
+               if (process.argv.length < 3) {
+                       process.stderr.write("usage: go_js_wasm_exec [wasm binary]\n");
+                       process.exit(1);
+               }
 
-                       // func boolVal(value bool) Value
-                       "syscall/js.boolVal": function (sp) {
-                               storeValue(sp + 16, mem().getUint8(sp + 8) !== 0);
-                       },
+               args = args.concat(process.argv.slice(3));
+               global.require = require;
 
-                       // func intVal(value int) Value
-                       "syscall/js.intVal": function (sp) {
-                               storeValue(sp + 16, getInt64(sp + 8));
-                       },
+               global.fs = require("fs");
 
-                       // func floatVal(value float64) Value
-                       "syscall/js.floatVal": function (sp) {
-                               storeValue(sp + 16, mem().getFloat64(sp + 8, true));
+               const nodeCrypto = require("crypto");
+               global.crypto = {
+                       getRandomValues(b) {
+                               nodeCrypto.randomFillSync(b);
                        },
+               };
+
+               const now = () => {
+                       const [sec, nsec] = process.hrtime();
+                       return sec * 1000 + nsec / 1000000;
+               };
+               global.performance = {
+                       timeOrigin: Date.now() - now(),
+                       now: now,
+               };
+
+               const util = require("util");
+               global.TextEncoder = util.TextEncoder;
+               global.TextDecoder = util.TextDecoder;
+       } else {
+               window.global = window;
 
-                       // func stringVal(value string) Value
-                       "syscall/js.stringVal": function (sp) {
-                               storeValue(sp + 24, loadString(sp + 8));
+               global.process = {
+                       env: {},
+                       exit(code) {
+                               if (code !== 0) {
+                                       console.warn("exit code:", code);
+                               }
                        },
-
-                       // func (v Value) Get(key string) Value
-                       "syscall/js.Value.Get": function (sp) {
-                               storeValue(sp + 32, Reflect.get(loadValue(sp + 8), loadString(sp + 16)));
+               };
+
+               let outputBuf = "";
+               global.fs = {
+                       constants: {},
+                       writeSync(fd, buf) {
+                               outputBuf += decoder.decode(buf);
+                               const nl = outputBuf.lastIndexOf("\n");
+                               if (nl != -1) {
+                                       console.log(outputBuf.substr(0, nl));
+                                       outputBuf = outputBuf.substr(nl + 1);
+                               }
+                               return buf.length;
                        },
+               };
+       }
 
-                       // func (v Value) set(key string, value Value)
-                       "syscall/js.Value.set": function (sp) {
-                               Reflect.set(loadValue(sp + 8), loadString(sp + 16), loadValue(sp + 32));
-                       },
+       const encoder = new TextEncoder("utf-8");
+       const decoder = new TextDecoder("utf-8");
 
-                       // func (v Value) Index(i int) Value
-                       "syscall/js.Value.Index": function (sp) {
-                               storeValue(sp + 24, Reflect.get(loadValue(sp + 8), getInt64(sp + 16)));
-                       },
+       let mod, inst;
+       let values = []; // TODO: garbage collection
 
-                       // func (v Value) setIndex(i int, value Value)
-                       "syscall/js.Value.setIndex": function (sp) {
-                               Reflect.set(loadValue(sp + 8), getInt64(sp + 16), loadValue(sp + 24));
-                       },
+       const mem = () => {
+               // The buffer may change when requesting more memory.
+               return new DataView(inst.exports.mem.buffer);
+       }
 
-                       // func (v Value) call(name string, args []Value) (Value, bool)
-                       "syscall/js.Value.call": function (sp) {
-                               try {
-                                       const v = loadValue(sp + 8);
-                                       const m = Reflect.get(v, loadString(sp + 16));
-                                       const args = loadSliceOfValues(sp + 32);
-                                       storeValue(sp + 56, Reflect.apply(m, v, args));
-                                       mem().setUint8(sp + 60, 1);
-                               } catch (err) {
-                                       storeValue(sp + 56, err);
-                                       mem().setUint8(sp + 60, 0);
-                               }
-                       },
+       const setInt64 = (addr, v) => {
+               mem().setUint32(addr + 0, v, true);
+               if (v >= 0) {
+                       mem().setUint32(addr + 4, v / 4294967296, true);
+               } else {
+                       mem().setUint32(addr + 4, -1, true); // FIXME
+               }
+       }
 
-                       // func (v Value) invoke(args []Value) (Value, bool)
-                       "syscall/js.Value.invoke": function (sp) {
-                               try {
-                                       const v = loadValue(sp + 8);
-                                       const args = loadSliceOfValues(sp + 16);
-                                       storeValue(sp + 40, Reflect.apply(v, undefined, args));
-                                       mem().setUint8(sp + 44, 1);
-                               } catch (err) {
-                                       storeValue(sp + 40, err);
-                                       mem().setUint8(sp + 44, 0);
-                               }
-                       },
+       const getInt64 = (addr) => {
+               const low = mem().getUint32(addr + 0, true);
+               const high = mem().getInt32(addr + 4, true);
+               return low + high * 4294967296;
+       }
 
-                       // func (v Value) new(args []Value) (Value, bool)
-                       "syscall/js.Value.new": function (sp) {
-                               try {
-                                       const v = loadValue(sp + 8);
-                                       const args = loadSliceOfValues(sp + 16);
-                                       storeValue(sp + 40, Reflect.construct(v, args));
-                                       mem().setUint8(sp + 44, 1);
-                               } catch (err) {
-                                       storeValue(sp + 40, err);
-                                       mem().setUint8(sp + 44, 0);
-                               }
-                       },
+       const loadValue = (addr) => {
+               const id = mem().getUint32(addr, true);
+               return values[id];
+       }
 
-                       // func (v Value) Float() float64
-                       "syscall/js.Value.Float": function (sp) {
-                               mem().setFloat64(sp + 16, parseFloat(loadValue(sp + 8)), true);
-                       },
+       const storeValue = (addr, v) => {
+               if (v === undefined) {
+                       mem().setUint32(addr, 0, true);
+                       return;
+               }
+               if (v === null) {
+                       mem().setUint32(addr, 1, true);
+                       return;
+               }
+               values.push(v);
+               mem().setUint32(addr, values.length - 1, true);
+       }
 
-                       // func (v Value) Int() int
-                       "syscall/js.Value.Int": function (sp) {
-                               setInt64(sp + 16, parseInt(loadValue(sp + 8)));
-                       },
+       const loadSlice = (addr) => {
+               const array = getInt64(addr + 0);
+               const len = getInt64(addr + 8);
+               return new Uint8Array(inst.exports.mem.buffer, array, len);
+       }
 
-                       // func (v Value) Bool() bool
-                       "syscall/js.Value.Bool": function (sp) {
-                               mem().setUint8(sp + 16, !!loadValue(sp + 8));
-                       },
+       const loadSliceOfValues = (addr) => {
+               const array = getInt64(addr + 0);
+               const len = getInt64(addr + 8);
+               const a = new Array(len);
+               for (let i = 0; i < len; i++) {
+                       const id = mem().getUint32(array + i * 4, true);
+                       a[i] = values[id];
+               }
+               return a;
+       }
 
-                       // func (v Value) Length() int
-                       "syscall/js.Value.Length": function (sp) {
-                               setInt64(sp + 16, parseInt(loadValue(sp + 8).length));
-                       },
+       const loadString = (addr) => {
+               const saddr = getInt64(addr + 0);
+               const len = getInt64(addr + 8);
+               return decoder.decode(new DataView(inst.exports.mem.buffer, saddr, len));
+       }
 
-                       // func (v Value) prepareString() (Value, int)
-                       "syscall/js.Value.prepareString": function (sp) {
-                               const str = encoder.encode(String(loadValue(sp + 8)));
-                               storeValue(sp + 16, str);
-                               setInt64(sp + 24, str.length);
-                       },
+       global.go = {
+               async compileAndRun(source) {
+                       await go.compile(source);
+                       await go.run();
+               },
 
-                       // func (v Value) loadString(b []byte)
-                       "syscall/js.Value.loadString": function (sp) {
-                               const str = loadValue(sp + 8);
-                               loadSlice(sp + 16).set(str);
-                       },
+               async compile(source) {
+                       mod = await WebAssembly.compile(source);
+               },
 
-                       "debug": function (value) {
-                               console.log(value);
-                       },
+               async run() {
+                       let importObject = {
+                               go: {
+                                       // func wasmExit(code int32)
+                                       "runtime.wasmExit": (sp) => {
+                                               process.exit(mem().getInt32(sp + 8, true));
+                                       },
+
+                                       // func wasmWrite(fd uintptr, p unsafe.Pointer, n int32)
+                                       "runtime.wasmWrite": (sp) => {
+                                               const fd = getInt64(sp + 8);
+                                               const p = getInt64(sp + 16);
+                                               const n = mem().getInt32(sp + 24, true);
+                                               fs.writeSync(fd, new Uint8Array(inst.exports.mem.buffer, p, n));
+                                       },
+
+                                       // func nanotime() int64
+                                       "runtime.nanotime": (sp) => {
+                                               setInt64(sp + 8, (performance.timeOrigin + performance.now()) * 1000000);
+                                       },
+
+                                       // func walltime() (sec int64, nsec int32)
+                                       "runtime.walltime": (sp) => {
+                                               const msec = (new Date).getTime();
+                                               setInt64(sp + 8, msec / 1000);
+                                               mem().setInt32(sp + 16, (msec % 1000) * 1000000, true);
+                                       },
+
+                                       // func boolVal(value bool) Value
+                                       "syscall/js.boolVal": (sp) => {
+                                               storeValue(sp + 16, mem().getUint8(sp + 8) !== 0);
+                                       },
+
+                                       // func intVal(value int) Value
+                                       "syscall/js.intVal": (sp) => {
+                                               storeValue(sp + 16, getInt64(sp + 8));
+                                       },
+
+                                       // func floatVal(value float64) Value
+                                       "syscall/js.floatVal": (sp) => {
+                                               storeValue(sp + 16, mem().getFloat64(sp + 8, true));
+                                       },
+
+                                       // func stringVal(value string) Value
+                                       "syscall/js.stringVal": (sp) => {
+                                               storeValue(sp + 24, loadString(sp + 8));
+                                       },
+
+                                       // func (v Value) Get(key string) Value
+                                       "syscall/js.Value.Get": (sp) => {
+                                               storeValue(sp + 32, Reflect.get(loadValue(sp + 8), loadString(sp + 16)));
+                                       },
+
+                                       // func (v Value) set(key string, value Value)
+                                       "syscall/js.Value.set": (sp) => {
+                                               Reflect.set(loadValue(sp + 8), loadString(sp + 16), loadValue(sp + 32));
+                                       },
+
+                                       // func (v Value) Index(i int) Value
+                                       "syscall/js.Value.Index": (sp) => {
+                                               storeValue(sp + 24, Reflect.get(loadValue(sp + 8), getInt64(sp + 16)));
+                                       },
+
+                                       // func (v Value) setIndex(i int, value Value)
+                                       "syscall/js.Value.setIndex": (sp) => {
+                                               Reflect.set(loadValue(sp + 8), getInt64(sp + 16), loadValue(sp + 24));
+                                       },
+
+                                       // func (v Value) call(name string, args []Value) (Value, bool)
+                                       "syscall/js.Value.call": (sp) => {
+                                               try {
+                                                       const v = loadValue(sp + 8);
+                                                       const m = Reflect.get(v, loadString(sp + 16));
+                                                       const args = loadSliceOfValues(sp + 32);
+                                                       storeValue(sp + 56, Reflect.apply(m, v, args));
+                                                       mem().setUint8(sp + 60, 1);
+                                               } catch (err) {
+                                                       storeValue(sp + 56, err);
+                                                       mem().setUint8(sp + 60, 0);
+                                               }
+                                       },
+
+                                       // func (v Value) invoke(args []Value) (Value, bool)
+                                       "syscall/js.Value.invoke": (sp) => {
+                                               try {
+                                                       const v = loadValue(sp + 8);
+                                                       const args = loadSliceOfValues(sp + 16);
+                                                       storeValue(sp + 40, Reflect.apply(v, undefined, args));
+                                                       mem().setUint8(sp + 44, 1);
+                                               } catch (err) {
+                                                       storeValue(sp + 40, err);
+                                                       mem().setUint8(sp + 44, 0);
+                                               }
+                                       },
+
+                                       // func (v Value) new(args []Value) (Value, bool)
+                                       "syscall/js.Value.new": (sp) => {
+                                               try {
+                                                       const v = loadValue(sp + 8);
+                                                       const args = loadSliceOfValues(sp + 16);
+                                                       storeValue(sp + 40, Reflect.construct(v, args));
+                                                       mem().setUint8(sp + 44, 1);
+                                               } catch (err) {
+                                                       storeValue(sp + 40, err);
+                                                       mem().setUint8(sp + 44, 0);
+                                               }
+                                       },
+
+                                       // func (v Value) Float() float64
+                                       "syscall/js.Value.Float": (sp) => {
+                                               mem().setFloat64(sp + 16, parseFloat(loadValue(sp + 8)), true);
+                                       },
+
+                                       // func (v Value) Int() int
+                                       "syscall/js.Value.Int": (sp) => {
+                                               setInt64(sp + 16, parseInt(loadValue(sp + 8)));
+                                       },
+
+                                       // func (v Value) Bool() bool
+                                       "syscall/js.Value.Bool": (sp) => {
+                                               mem().setUint8(sp + 16, !!loadValue(sp + 8));
+                                       },
+
+                                       // func (v Value) Length() int
+                                       "syscall/js.Value.Length": (sp) => {
+                                               setInt64(sp + 16, parseInt(loadValue(sp + 8).length));
+                                       },
+
+                                       // func (v Value) prepareString() (Value, int)
+                                       "syscall/js.Value.prepareString": (sp) => {
+                                               const str = encoder.encode(String(loadValue(sp + 8)));
+                                               storeValue(sp + 16, str);
+                                               setInt64(sp + 24, str.length);
+                                       },
+
+                                       // func (v Value) loadString(b []byte)
+                                       "syscall/js.Value.loadString": (sp) => {
+                                               const str = loadValue(sp + 8);
+                                               loadSlice(sp + 16).set(str);
+                                       },
+
+                                       "debug": (value) => {
+                                               console.log(value);
+                                       },
+                               }
+                       };
+
+                       inst = await WebAssembly.instantiate(mod, importObject);
+                       values = [undefined, null, global, inst.exports.mem];
+
+                       // Pass command line arguments and environment variables to WebAssembly by writing them to the linear memory.
+                       let offset = 4096;
+
+                       const strPtr = (str) => {
+                               let ptr = offset;
+                               new Uint8Array(inst.exports.mem.buffer, offset, str.length + 1).set(encoder.encode(str + "\0"));
+                               offset += str.length + (8 - (str.length % 8));
+                               return ptr;
+                       };
+
+                       const argc = args.length;
+
+                       const argvPtrs = [];
+                       args.forEach((arg) => {
+                               argvPtrs.push(strPtr(arg));
+                       });
+
+                       const keys = Object.keys(process.env).sort();
+                       argvPtrs.push(keys.length);
+                       keys.forEach((key) => {
+                               argvPtrs.push(strPtr(`${key}=${process.env[key]}`));
+                       });
+
+                       const argv = offset;
+                       argvPtrs.forEach((ptr) => {
+                               mem().setUint32(offset, ptr, true);
+                               mem().setUint32(offset + 4, 0, true);
+                               offset += 8;
+                       });
+
+                       try {
+                               inst.exports.run(argc, argv);
+                       } catch (err) {
+                               console.error(err);
+                               process.exit(1);
+                       }
                }
-       };
-
-       inst = await WebAssembly.instantiate(mod, importObject);
-       values = [undefined, null, global, inst.exports.mem];
-
-       // Pass command line arguments and environment variables to WebAssembly by writing them to the linear memory.
-       let offset = 4096;
-
-       const strPtr = (str) => {
-               let ptr = offset;
-               new Uint8Array(inst.exports.mem.buffer, offset, str.length + 1).set(encoder.encode(str + "\0"));
-               offset += str.length + (8 - (str.length % 8));
-               return ptr;
-       };
-
-       const argc = args.length;
-
-       const argvPtrs = [];
-       args.forEach((arg) => {
-               argvPtrs.push(strPtr(arg));
-       });
-
-       const keys = Object.keys(process.env).sort();
-       argvPtrs.push(keys.length);
-       keys.forEach((key) => {
-               argvPtrs.push(strPtr(`${key}=${process.env[key]}`));
-       });
-
-       const argv = offset;
-       argvPtrs.forEach((ptr) => {
-               mem().setUint32(offset, ptr, true);
-               mem().setUint32(offset + 4, 0, true);
-               offset += 8;
-       });
-
-       try {
-               inst.exports.run(argc, argv);
-       } catch (err) {
-               console.error(err);
-               process.exit(1);
        }
-}
+
+       if (isNodeJS) {
+               go.compileAndRun(fs.readFileSync(process.argv[2])).catch((err) => {
+                       console.error(err);
+                       process.exit(1);
+               });
+       }
+})();