pezkuwichain/revive
1
0
Fork 0
mirror of https://github.com/pezkuwichain/revive.git synced 2026-06-14 12:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add web worker compatibility

Browse Source
This commit is contained in:
Sebastian Miasojed
2024-11-27 15:17:26 +01:00
parent 81915ddbcb
commit 6a4fd1e991
12 changed files with 222 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-2
View File
@@ -14,6 +14,4 @@ artifacts
tmp tmp
package-lock.json package-lock.json
/*.html /*.html
/js/src/resolc.*
/js/dist/
/build /build
js/embed/soljson_interface.js
+13 -3
View File
@@ -10,10 +10,20 @@ mergeInto(LibraryManager.library, {
}, },
resolc_compile: function(inputPtr, inputLen) { resolc_compile: function(inputPtr, inputLen) {
const inputJson = UTF8ToString(inputPtr, inputLen); const inputJson = UTF8ToString(inputPtr, inputLen);
const path = require('path');
const createRevive = require(path.resolve(__dirname, './resolc.js'));
const revive = createRevive();
// Check if running in a web worker or node.js
if (typeof importScripts === 'function') {
// Running in a web worker
importScripts('./resolc.js');
var revive = createRevive()
} else if (typeof require === 'function') {
// Running in Node.js
const path = require('path');
createRevive = require(path.resolve(__dirname, './resolc.js')); // `createRevive` is returned from the required module
var revive = createRevive();
} else {
throw new Error('Unknown environment: Unable to load resolc.js');
}
revive.setStdinData(inputJson); revive.setStdinData(inputJson);
let stdoutString = ""; let stdoutString = "";
js/examples/node/resolc.js
Symlink
+1
View File
@@ -0,0 +1 @@
../../../target/wasm32-unknown-emscripten/release/resolc.js
js/examples/node/resolc.wasm
Symlink
+1
View File
@@ -0,0 +1 @@
../../../target/wasm32-unknown-emscripten/release/resolc.wasm
js/run_revive.js → js/examples/node/run_revive.js
+3 -3
View File
@@ -1,5 +1,5 @@
const soljson = require('solc/soljson'); const soljson = require('solc/soljson');
const createRevive = require('./dist/revive-cjs/resolc.js'); const createRevive = require('./resolc.js');
const compilerStandardJsonInput = { const compilerStandardJsonInput = {
language: 'Solidity', language: 'Solidity',
@@ -52,8 +52,8 @@ async function runCompiler() {
// Compile the Solidity source code // Compile the Solidity source code
let x = m.callMain(['--standard-json']); let x = m.callMain(['--standard-json']);
console.log("Stdout: " + stdoutString) console.log("Stdout: " + stdoutString);
console.error("Stderr: " + stderrString) console.error("Stderr: " + stderrString);
} }
runCompiler().catch(err => { runCompiler().catch(err => {
js/examples/web/index.html
+35
View File
@@ -0,0 +1,35 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Web Worker Example</title>
<style>
/* Ensure the pre tag wraps long lines */
pre {
white-space: pre-wrap; /* Wrap long lines */
word-wrap: break-word; /* Break long words */
max-width: 100%; /* Optional: Ensures it doesn't overflow container */
overflow-wrap: break-word; /* Another method for wrapping */
}
</style>
</head>
<body>
<h1>Revive Compilation Output</h1>
<pre id="output"></pre>
<script>
var outputElement = document.getElementById('output');
var worker = new Worker('./worker.js');
worker.addEventListener('message', function (e) {
const output = e.data.output
outputElement.textContent = output;
}, false);
worker.postMessage({
contractCode: 'contract C { function f() public { } }',
})
</script>
</body>
</html>
js/examples/web/resolc.js
Symlink
+1
View File
@@ -0,0 +1 @@
../../../target/wasm32-unknown-emscripten/release/resolc.js
js/examples/web/resolc.wasm
Symlink
+1
View File
@@ -0,0 +1 @@
../../../target/wasm32-unknown-emscripten/release/resolc.wasm
js/examples/web/soljson.js
+111
View File
File diff suppressed because one or more lines are too long
js/examples/web/worker.js
+52
View File
@@ -0,0 +1,52 @@
importScripts('./soljson.js');
importScripts('./resolc.js');
// Handle messages from the main thread
onmessage = async function (e) {
const contractCode = e.data.contractCode
const sourceCode = {
language: 'Solidity',
sources: {
contract: {
content: contractCode,
}
},
settings: {
optimizer: {
enabled: true,
runs: 200,
},
outputSelection: {
'*': {
'*': ['abi'],
}
}
}
};
const m = createRevive();
m.soljson = Module;
// Set input data for stdin
m.setStdinData(JSON.stringify(sourceCode));
var stdoutString = "";
m.setStdoutCallback(function(char) {
if (char.charCodeAt(0) === '\n') {
console.log("new line")
exit
}
stdoutString += char;
});
var stderrString = "";
m.setStderrCallback(function(char) {
stderrString += char;
});
// Compile the Solidity source code
m.callMain(['--standard-json']);
postMessage({output: stdoutString || stderrString});
};
js/package.json
+4 -8
View File
@@ -2,19 +2,15 @@
"name": "revive", "name": "revive",
"version": "1.0.0", "version": "1.0.0",
"description": "Revive compiler", "description": "Revive compiler",
"main": "run_revive.js", "main": "resolc.js",
"dependencies": { "dependencies": {
"solc": "^0.8.28" "solc": "^0.8.28"
}, },
"scripts": { "scripts": {
"build": "mkdir -p src && cp ../target/wasm32-unknown-emscripten/release/resolc.js ../target/wasm32-unknown-emscripten/release/resolc.wasm ./src && npx rollup -c", "start-web": "http-server ./examples/web/",
"test": "npm run build && node run_revive.js" "start-node": "node ./examples//node/run_revive.js"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.26.0", "http-server": "^14.1.1"
"@babel/preset-env": "^7.26.0",
"@rollup/plugin-babel": "^6.0.4",
"rollup": "^4.27.3",
"rollup-plugin-copy": "^3.5.0"
} }
} }
js/rollup.config.js
-33
View File
@@ -1,33 +0,0 @@
const babel = require('@rollup/plugin-babel');
const copy = require('rollup-plugin-copy');
const outputDirCJS = 'dist/revive-cjs';
const outputDirESM = 'dist/revive-esm';
module.exports = {
input: ['src/resolc.js'],
output: [
{
dir: outputDirCJS,
format: 'cjs',
exports: 'auto',
},
{
dir: outputDirESM,
format: 'esm',
},
],
plugins: [
babel({
exclude: 'node_modules/**',
presets: ['@babel/preset-env'],
babelHelpers: 'inline',
}),
copy({
targets: [
{ src: 'src/resolc.wasm', dest: outputDirCJS },
{ src: 'src/resolc.wasm', dest: outputDirESM },
],
}),
],
};