Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Base support for WASI in wasmer-js #2491

Merged
merged 90 commits into from
Aug 31, 2021
Merged

Base support for WASI in wasmer-js #2491

merged 90 commits into from
Aug 31, 2021

Conversation

syrusakbary
Copy link
Member

This PR adds support for WASI targeting Javascript

commit b6245ddd19077015a974e9ffd28f164fedb87801
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 23 23:07:45 2021 -0700

    Remove unused code

commit 6bbf28c5c6d8c4603606e21af3190c52f41cbeb8
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 23 22:50:50 2021 -0700

    Remove set_last_accessed, set_last_modified, set_created_time from the VirtualFs

commit 999d6941c93f0ea8c8c803c7b1843ec90bd178b5
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 23 22:42:23 2021 -0700

    Remove webc files

commit 197b72a8978a2364145e20ebd6d44b5bd23082db
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 23 22:38:29 2021 -0700

    Revert "Wip updates for python webc"

    This reverts commit 2d3e013e64424c0a50f32f44ad0401680d31bf9d.

    # Conflicts:
    #	Cargo.lock
    #	lib/cli/Cargo.toml
    #	lib/cli/src/commands/run.rs
    #	lib/cli/src/commands/run/wasi.rs
    #	lib/vfs/Cargo.toml
    #	lib/wasi/Cargo.toml
    #	lib/wasi/src/state/builder.rs
    #	lib/wasi/src/state/mod.rs

commit 83b7e3b1a1708ed34694e9a44902bd6d0617f0a4
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 23 22:34:36 2021 -0700

    revert Remove webc

commit 2de7f7f0ce518c74912509ef1fa4b7b1f00c4d11
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 23 22:31:05 2021 -0700

    Improved testing

commit 97075c5fa69fd2ef9192a4a9737400359e0ee37f
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 23 22:06:08 2021 -0700

    Improved bindings

commit 9388790c2d31654701dd2925d30bfb35b158727c
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 23 18:15:43 2021 -0700

    Renamed virtual-fs to vfs

commit 41d91328cd83d10c0fa7242fcfd731335bcd741e
Merge: c0634645a 51fdf66
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 23 18:00:49 2021 -0700

    Merge branch 'master' into js-api-wasi

commit c0634645aebdf25fb545c63368114b531934970d
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 23 15:06:08 2021 -0700

    Fixed serde dependency

commit 02def893ae24f2da279ed6d3b39b4e50c18ec708
Merge: f13e4c86d d3930be
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 23 15:04:35 2021 -0700

    Merge branch 'js-api' into js-api-wasi

    # Conflicts:
    #	lib/wasi/Cargo.toml

commit f13e4c86d48a0a527fa72270f29c9f8b97a6f820
Merge: f4ac010e1 fe04ea8
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 16 00:01:19 2021 -0700

    Merge branch 'js-api' into js-api-wasi

commit f4ac010e1ff33cd046474a500bb5b9e4604085f6
Author: Syrus Akbary <[email protected]>
Date:   Thu Jul 15 22:50:09 2021 -0700

    Use latest resolver for namespace

commit 505896a47c7d658cb4e39ab5256c9e960a2fedc6
Author: Syrus Akbary <[email protected]>
Date:   Thu Jul 15 22:49:48 2021 -0700

    Updated WASI implementation

commit 30470cb81248a388ea5cf27f1838aeb264dc8956
Author: Syrus Akbary <[email protected]>
Date:   Thu Jul 15 15:51:56 2021 -0700

    Improved logging

commit caf0c8289ad8ce2471558baab17adee4abc011f5
Author: Syrus Akbary <[email protected]>
Date:   Thu Jul 15 13:55:43 2021 -0700

    Improved wasmer-js debugging

commit 4e2278dafe8999c262a0cea5afd23f8ae895abcb
Author: Syrus Akbary <[email protected]>
Date:   Thu Jul 15 08:29:35 2021 -0700

    Added wasi tests

commit 4f5c1fdbdae1f953498016c32d158038b6a6dc97
Author: Syrus Akbary <[email protected]>
Date:   Wed Jul 14 22:22:41 2021 -0700

    Fixed build

commit 692111d098b73229dbe722645b3d86ff6f5e4a5e
Merge: 35dade1b1 7195a9c
Author: Syrus Akbary <[email protected]>
Date:   Wed Jul 14 22:18:01 2021 -0700

    Merge branch 'js-api' into js-api-wasi

    # Conflicts:
    #	lib/js-api/src/trap.rs

commit 35dade1b16f01ce67a23ba4fbfa25224dda1403e
Author: Syrus Akbary <[email protected]>
Date:   Wed Jul 14 22:12:38 2021 -0700

    Fixed wasi wast

commit d3a6b42f8ebd790024c7631a87a295bd6957bb80
Author: Syrus Akbary <[email protected]>
Date:   Wed Jul 14 22:12:22 2021 -0700

    Added extra instruction for wasmer-js

commit 95b5c1ad005b17a3bacca45f906d717780f4f95a
Author: Syrus Akbary <[email protected]>
Date:   Wed Jul 14 22:12:12 2021 -0700

    Improved API to be resilient in and out js

commit e4074de27bd4adcd9ee8e9e4973c2cfd5208d523
Author: Syrus Akbary <[email protected]>
Date:   Wed Jul 14 18:54:14 2021 -0700

    Improved traps

commit e512e06cc8c476a74eb9a8e381b0d4019cdc4365
Author: Syrus Akbary <[email protected]>
Date:   Wed Jul 14 18:31:30 2021 -0700

    Improved WasiFs

commit cc7bda3ae33a01336e79e0a6ca48e2a72eb0ad98
Merge: 0721bbfe0 8047e3e
Author: Syrus Akbary <[email protected]>
Date:   Wed Jul 14 15:15:05 2021 -0700

    Merge branch 'js-api' into js-api-wasi

    # Conflicts:
    #	lib/js-api/Cargo.toml
    #	lib/js-api/src/cell.rs
    #	lib/js-api/src/env.rs
    #	lib/js-api/src/export.rs
    #	lib/js-api/src/exports.rs
    #	lib/js-api/src/externals/function.rs
    #	lib/js-api/src/externals/memory.rs
    #	lib/js-api/src/externals/table.rs
    #	lib/js-api/src/instance.rs
    #	lib/js-api/src/lib.rs
    #	lib/js-api/src/module.rs

commit 0721bbfe04d8d3b54ddcfa66a60a3cb501631ac6
Merge: 8354e03f1 3604deb
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 2 16:15:49 2021 -0700

    Merge branch 'master' into js-api-wasi

commit 8354e03f19b810f8fdaf0cadc3eb89bad30220ab
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 2 10:25:27 2021 -0700

    Improved sync

commit bfa6db7e7201b46fd992361699141df501e6d13c
Merge: 30aa8d4bb 7553efb
Author: Syrus Akbary <[email protected]>
Date:   Fri Jul 2 10:07:23 2021 -0700

    Merge branch 'features-cell' into js-api-wasi

    # Conflicts:
    #	lib/api/src/ptr.rs

commit 30aa8d4bb0115b3bb8275212d2f33327d32546e6
Author: Syrus Akbary <[email protected]>
Date:   Thu Jul 1 17:36:47 2021 -0700

    Improved VirtualFS

commit a72dc93d345ca2c4967a75a0e3ef5243ebe86f33
Author: Syrus Akbary <[email protected]>
Date:   Thu Jul 1 17:36:37 2021 -0700

    Improved wasmer-js API

commit 63c13f371f19103adb74a6f394c4c09d8fcc4d52
Author: Syrus Akbary <[email protected]>
Date:   Fri Jun 25 17:32:33 2021 -0700

    Updated memory_fs

commit a9e7206b7437984ac367351ea75bb14c8cafaf4d
Merge: 6e7285af0 be5af68ef
Author: Syrus Akbary <[email protected]>
Date:   Fri Jun 25 17:14:29 2021 -0700

    Merge branch 'feature/webc' into js-api-wasi

    # Conflicts:
    #	Cargo.lock
    #	lib/cli/Cargo.toml
    #	lib/virtual-fs/Cargo.toml
    #	lib/wasi/Cargo.toml
    #	lib/wasi/src/state/mod.rs

commit 6e7285af02367a6431b302c17b708f8e0854be82
Author: Syrus Akbary <[email protected]>
Date:   Fri Jun 25 17:07:39 2021 -0700

    Updated virtual fs deps

commit 5eab9ac6f629ddb82f5e97c5fce37998fadf262d
Author: Syrus Akbary <[email protected]>
Date:   Fri Jun 25 17:07:29 2021 -0700

    Make wasi not serializable

commit 1d242d4564e898d773601b87d135a8f5dc4a0f57
Author: Syrus Akbary <[email protected]>
Date:   Fri Jun 25 17:05:30 2021 -0700

    Set WASI to use Strings instead of str

commit 1d7cd64232e4bdd57b64d884d4d9b38dd68e1cdb
Author: Syrus Akbary <[email protected]>
Date:   Fri Jun 25 17:03:23 2021 -0700

    Improve Virtual FS

commit 85f4bbe5ebc0e87138e74a43665616e96772ac5d
Author: Syrus Akbary <[email protected]>
Date:   Fri Jun 25 16:57:14 2021 -0700

    wasmer-js: Added functions to the mix

commit 27effe1eda37a1d810a80a489ff5c737e986f200
Author: Syrus Akbary <[email protected]>
Date:   Fri Jun 25 16:01:12 2021 -0700

    wasmer-js function environments working

commit be5af68efe44c5084dd140f9cc6b425f61a84f8a
Author: Mark McCaskey <[email protected]>
Date:   Fri Jun 25 15:01:18 2021 -0700

    Move webc vfs impl into wasmer src tree

commit 765c89bb3954699b86a2b820fd40857811e6c466
Author: Mark McCaskey <[email protected]>
Date:   Fri Jun 25 14:38:19 2021 -0700

    Get python.webc working

commit bedc25cbf00a91cca193bb21834117dc3344febe
Author: Syrus Akbary <[email protected]>
Date:   Fri Jun 25 09:17:26 2021 -0700

    wasmer-js improve get_host_environment

commit ee3a36d53b06be72dc00877332c4aaf0b2f57aa4
Author: Syrus Akbary <[email protected]>
Date:   Thu Jun 24 19:37:34 2021 -0700

    Added wasm32 API

commit c136c2ac6829e4ac3d916dc5687a7c999dd6c412
Author: Syrus Akbary <[email protected]>
Date:   Thu Jun 24 18:56:19 2021 -0700

    Improved wasmer_js API

commit f819cbbb629442f6f020985ca34b2b57bc90deca
Author: Syrus Akbary <[email protected]>
Date:   Thu Jun 24 18:32:29 2021 -0700

    Improved wasmer_js imports

commit 1d4ed08d90808922ee5e74e92f162509ba8c2efb
Merge: 5451d71 2d3e013e6
Author: Syrus Akbary <[email protected]>
Date:   Thu Jun 24 17:55:25 2021 -0700

    Merge branch 'feature/webc' into js-api-wasi

    # Conflicts:
    #	lib/wasi/src/syscalls/mod.rs

commit 2d3e013e64424c0a50f32f44ad0401680d31bf9d
Author: Mark McCaskey <[email protected]>
Date:   Thu Jun 24 16:54:43 2021 -0700

    Wip updates for python webc

commit 3a5a687964780d48e8598247009721badd50d496
Author: Mark McCaskey <[email protected]>
Date:   Wed Jun 23 10:36:06 2021 -0700

    Add patch to get vfs
@syrusakbary
Copy link
Member Author

bors try

bors bot added a commit that referenced this pull request Jul 25, 2021
@bors
Copy link
Contributor

bors bot commented Jul 25, 2021

try

Build failed:

@syrusakbary
Copy link
Member Author

bors try

bors bot added a commit that referenced this pull request Jul 27, 2021
@bors
Copy link
Contributor

bors bot commented Jul 27, 2021

try

Build failed:

@syrusakbary
Copy link
Member Author

bors try

bors bot added a commit that referenced this pull request Jul 27, 2021
@bors
Copy link
Contributor

bors bot commented Jul 27, 2021

try

Build failed:

@syrusakbary
Copy link
Member Author

bors try

@bors
Copy link
Contributor

bors bot commented Aug 30, 2021

try

Build failed:

lib/types/src/memory_view.rs Show resolved Hide resolved
lib/wasi/src/state/builder.rs Outdated Show resolved Hide resolved
Comment on lines 1575 to 1576
todo!("temporarily disabled")
//bincode::serialize(self).ok()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? cc @syrusakbary

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can revert and make bincode an optional dependency if enable-serde feature is set

lib/wasi/src/syscalls/mod.rs Outdated Show resolved Hide resolved
@Hywan
Copy link
Contributor

Hywan commented Aug 30, 2021

bors try

bors bot added a commit that referenced this pull request Aug 30, 2021
@bors
Copy link
Contributor

bors bot commented Aug 30, 2021

@Hywan
Copy link
Contributor

Hywan commented Aug 31, 2021

I'm not fully satisfied with the state of this PR, but it's way better than it was initially. Let's fix the other pain points in other PR.

bors r+

bors bot added a commit that referenced this pull request Aug 31, 2021
2491: Base support for WASI in wasmer-js r=Hywan a=syrusakbary

This PR adds support for WASI targeting Javascript

Co-authored-by: Syrus Akbary <[email protected]>
Co-authored-by: Ivan Enderlin <[email protected]>
@Hywan
Copy link
Contributor

Hywan commented Aug 31, 2021

bors r-

@bors
Copy link
Contributor

bors bot commented Aug 31, 2021

Canceled.

@Hywan
Copy link
Contributor

Hywan commented Aug 31, 2021

bors r+

@bors
Copy link
Contributor

bors bot commented Aug 31, 2021

@bors bors bot merged commit a57a852 into master Aug 31, 2021
@bors bors bot deleted the js-api-wasi branch August 31, 2021 08:47
@syrusakbary syrusakbary mentioned this pull request Oct 28, 2021
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎉 enhancement New feature! 📦 lib-api About wasmer 📦 lib-wasi About wasmer-wasi
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants