Skip to content

Commit

Permalink
Merge pull request #104 from lightninglabs/2024-02-update_to_v0.3.0-a…
Browse files Browse the repository at this point in the history 
…lpha

Bump version to v0.3.0-alpha
  • Loading branch information
@jamaljsr
jamaljsr authored Feb 7, 2024
2 parents f6436b7 + 7ffde3a commit 5caf63b
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 108 deletions.
4 changes: 2 additions & 2 deletions lib/lnc.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { wasmLog as log } from './util/log';

/** The default values for the LncConfig options */
const DEFAULT_CONFIG = {
wasmClientCode: 'https://lightning.engineering/lnc-v0.2.8-alpha.wasm',
wasmClientCode: 'https://lightning.engineering/lnc-v0.3.0-alpha.wasm',
namespace: 'default',
serverHost: 'mailbox.terminal.lightning.today:443'
} as Required<LncConfig>;
Expand Down Expand Up @@ -172,7 +172,7 @@ export default class LNC {

this.go.argv = [
'wasm-client',
'--debuglevel=trace',
'--debuglevel=debug,GOBN=info,GRPC=info',
'--namespace=' + this._namespace,
`--onlocalprivcreate=${this._namespace}.onLocalPrivCreate`,
`--onremotekeyreceive=${this._namespace}.onRemoteKeyReceive`,
Expand Down
135 changes: 30 additions & 105 deletions lib/wasm_exec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,25 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

(() => {
// 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;
}
}
"use strict";

(() => {
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
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);
console.log(outputBuf.substring(0, nl));
outputBuf = outputBuf.substring(nl + 1);
}
return buf.length;
},
Expand Down Expand Up @@ -87,8 +58,8 @@
};
}

if (!global.process) {
global.process = {
if (!globalThis.process) {
globalThis.process = {
getuid() { return -1; },
getgid() { return -1; },
geteuid() { return -1; },
Expand All @@ -102,47 +73,26 @@
}
}

if (!global.crypto && global.require) {
const nodeCrypto = require("crypto");
global.crypto = {
getRandomValues(b) {
nodeCrypto.randomFillSync(b);
},
};
}
if (!global.crypto) {
throw new Error("global.crypto is not available, polyfill required (getRandomValues only)");
if (!globalThis.crypto) {
throw new Error("globalThis.crypto is not available, polyfill required (crypto.getRandomValues only)");
}

if (!global.performance) {
global.performance = {
now() {
const [sec, nsec] = process.hrtime();
return sec * 1000 + nsec / 1000000;
},
};
if (!globalThis.performance) {
throw new Error("globalThis.performance is not available, polyfill required (performance.now only)");
}

if (!global.TextEncoder && global.require) {
global.TextEncoder = require("util").TextEncoder;
}
if (!global.TextEncoder) {
throw new Error("global.TextEncoder is not available, polyfill required");
if (!globalThis.TextEncoder) {
throw new Error("globalThis.TextEncoder is not available, polyfill required");
}

if (!global.TextDecoder && global.require) {
global.TextDecoder = require("util").TextDecoder;
}
if (!global.TextDecoder) {
throw new Error("global.TextDecoder is not available, polyfill required");
if (!globalThis.TextDecoder) {
throw new Error("globalThis.TextDecoder is not available, polyfill required");
}

// End of polyfills for common API.

const encoder = new TextEncoder("utf-8");
const decoder = new TextDecoder("utf-8");

global.Go = class {
globalThis.Go = class {
constructor() {
this.argv = ["js"];
this.env = {};
Expand All @@ -163,6 +113,10 @@
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 low = this.mem.getUint32(addr + 0, true);
const high = this.mem.getInt32(addr + 4, true);
Expand Down Expand Up @@ -256,7 +210,10 @@

const timeOrigin = Date.now() - performance.now();
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)
// 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).
Expand Down Expand Up @@ -319,7 +276,7 @@
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);
},
Expand Down Expand Up @@ -517,7 +474,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
Expand All @@ -526,7 +483,7 @@
[null, 2],
[true, 3],
[false, 4],
[global, 5],
[globalThis, 5],
[this, 6],
]);
this._idPool = []; // unused ids that have been garbage collected
Expand Down Expand Up @@ -569,9 +526,9 @@

// The linker guarantees global data starts from at least wasmMinDataAddr.
// Keep in sync with cmd/link/internal/ld/data.go:wasmMinDataAddr.
const wasmMinDataAddr = 4096 + 4096;
const wasmMinDataAddr = 4096 + 8192;
if (offset >= wasmMinDataAddr) {
throw new Error("command line too long");
throw new Error("total length of command line and environment variables exceeds limit");
}

this._inst.exports.run(argc, argv);
Expand Down Expand Up @@ -601,36 +558,4 @@
};
}
}

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);
});
}
})();
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@lightninglabs/lnc-web",
"version": "0.2.8-alpha",
"version": "0.3.0-alpha",
"description": "Lightning Node Connect npm module for web",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand Down

0 comments on commit 5caf63b

Please sign in to comment.