Wapm 4

.github/workflows/wapm.yml

@@ -0,0 +1,30 @@
+name: CI
+on:
+  push:
+    branches: [ wapm ]
+  pull_request:
+    branches: [ wapm ]
+
+env:
+  CARGO_TERM_COLOR: always
+  RUST_MIN_STACK: 20971520
+
+jobs:
+  tokterm:
+    name: Build Wapm Shell
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Build
+      run: |
+        cd tokterm
+        npm install
+        npm run build
+        cp -r public/* dist/
+    - name: Publish documentation
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: tokterm/dist

Cargo.toml

@@ -44,6 +44,16 @@ members = [
 
 [patch.crates-io]
 tokio = { git = "https://github.com/john-sharratt/tokio.git", branch = "wasix" }
-wasmer-vfs = { path = "/prog/wasmer/lib/vfs" }
+
+wasmer = { path = "../../wasmer/lib/api" }
+wasmer-wasi = { path = "../../wasmer/lib/wasi" }
+wasmer-vfs = { path = "../../wasmer/lib/vfs" }
+wasmer-compiler-cranelift = { path = "../../wasmer/lib/compiler-cranelift" }
+wasmer-compiler-llvm = { path = "../../wasmer/lib/compiler-llvm" }
+wasmer-compiler-singlepass = { path = "../../wasmer/lib/compiler-singlepass" }
+wasmer-compiler = { path = "../../wasmer/lib/compiler" }
+wasmer-emscripten = { path = "../../wasmer/lib/emscripten" }
+wasmer-wasi-local-networking = { path = "../../wasmer/lib/wasi-local-networking" }
+
 #tokio = { path = "/prog/tokio/tokio" }
 

atedb/Cargo.toml

@@ -7,7 +7,7 @@ description = "Distributed datachain (database) built on an immutable data store
 license = "MIT OR Apache-2.0"
 keywords = ["immutable", "database", "server", "async" ]
 categories = ["database", "cryptography", "database-implementations", "asynchronous"]
-repository = "https://github.com/john-sharratt/ate/atedb"
+repository = "https://github.com/wasmerio/ate/atedb"
 readme = "README.md"
 
 [features]

comms/Cargo.toml

@@ -7,7 +7,7 @@ description = "Provides the communication library integrates with ate"
 license = "MIT OR Apache-2.0"
 keywords = [ "networking" ]
 categories = [ "networking" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

crypto/Cargo.toml

@@ -7,7 +7,7 @@ description = "Provides all the cryptographic functions"
 license = "MIT OR Apache-2.0"
 keywords = [ "cryptography" ]
 categories = [ "cryptography" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

files/Cargo.toml

@@ -7,7 +7,7 @@ description = "Model and helper functions for access files stored in ATEs"
 license = "MIT OR Apache-2.0"
 keywords = ["immutable", "filesystem", "fs" ]
 categories = ["filesystem", "database", "development-tools"]
-repository = "https://github.com/john-sharratt/ate/tree/master/wasmer-dfs"
+repository = "https://github.com/wasmerio/ate/tree/master/wasmer-dfs"
 readme = "README.md"
 
 [features]

files/README.md

@@ -8,7 +8,7 @@ from the distributed redo log..
 
 ## What is ATE
 
-[See here](https://github.com/john-sharratt/ate/blob/master/README.md)
+[See here](https://github.com/wasmerio/ate/blob/master/README.md)
 
 ## Contribution
 

lib/Cargo.toml

@@ -7,7 +7,7 @@ description = "Distributed immutable data store with strong encryption and authe
 license = "MIT OR Apache-2.0"
 keywords = ["immutable", "database", "crypto", "nosql", "async"]
 categories = ["asynchronous", "caching", "cryptography", "database-implementations"]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "../README.md"
 
 [features]

wasmer-auth/Cargo.toml

@@ -7,7 +7,7 @@ description = "Represents a standardized data model and API for authenticating a
 license = "MIT OR Apache-2.0"
 keywords = [ "authentication", "cli", "authorization", "crypto" ]
 categories = [ "data-structures", "command-line-utilities", "authentication", "cryptography" ]
-repository = "https://github.com/john-sharratt/ate/auth"
+repository = "https://github.com/wasmerio/ate/auth"
 readme = "README.md"
 
 [[bin]]

wasmer-bus/deploy/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "WebAssembly fuse bus interface"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "bus", "fuse" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

wasmer-bus/fuse/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "WebAssembly fuse bus interface"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "bus", "fuse" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

wasmer-bus/hello/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "WebAssembly Bus Hello World"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "bus", "time" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

wasmer-bus/lib/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "Invocation bus for web assembly modules"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "bus" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

wasmer-bus/macros/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "WebAssembly Bus Macros"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "bus" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [lib]

wasmer-bus/mio/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "WebAssembly MIO"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "opengl", "webgl" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

wasmer-bus/process/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "WebAssembly Process Interface"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "bus", "process" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

wasmer-bus/reqwest/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "WebAssembly HTTP(s) Web Request Interface"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "bus", "http", "api" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

wasmer-bus/time/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "WebAssembly Time Interface"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "bus", "time" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

wasmer-bus/tty/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "WebAssembly Terminal Interface"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "bus", "websocket" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

wasmer-bus/types/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "WebAssembly Bus Macros"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "bus" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

wasmer-bus/webgl/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "WebAssembly WebGL Interface"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "opengl", "webgl" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

wasmer-bus/ws/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "WebAssembly Web Socket Interface"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasi", "wasm", "bus", "websocket" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "README.md"
 
 [features]

wasmer-dfs/README.md

@@ -10,7 +10,7 @@ particular varient has some unique qualities that differentiate it from others.
 
 ## What is ATE
 
-[See here](https://github.com/john-sharratt/ate/blob/master/README.md)
+[See here](https://github.com/wasmerio/ate/blob/master/README.md)
 
 ## Summary
 

wasmer-dnet/Cargo.toml

@@ -11,7 +11,7 @@ keywords = [
     "http-server",
 ]
 categories = ["network-programming", "web-programming::http-server"]
-repository = "https://github.com/john-sharratt/ate/tree/master/wasmer-dfs"
+repository = "https://github.com/wasmerio/ate/tree/master/wasmer-dfs"
 readme = "README.md"
 
 [features]

wasmer-gw/Cargo.toml

@@ -11,7 +11,7 @@ keywords = [
     "http-server",
 ]
 categories = ["network-programming", "web-programming::http-server"]
-repository = "https://github.com/john-sharratt/ate/tree/master/wasmer-dfs"
+repository = "https://github.com/wasmerio/ate/tree/master/wasmer-dfs"
 readme = "README.md"
 
 [features]

wasmer-gw/README.md

@@ -16,7 +16,7 @@ AteWeb also includes an automation certificate generation engine using LetsEncry
 
 ## What is ATE
 
-[See here](https://github.com/john-sharratt/ate/blob/master/README.md)
+[See here](https://github.com/wasmerio/ate/blob/master/README.md)
 
 ## Contribution
 

wasmer-instance/Cargo.toml

@@ -9,7 +9,7 @@ keywords = [
     "ssh-server",
     "wasm"
 ]
-repository = "https://github.com/john-sharratt/ate/tree/master/wasmer-instance"
+repository = "https://github.com/wasmerio/ate/tree/master/wasmer-instance"
 readme = "README.md"
 
 [features]

wasmer-instance/README.md

@@ -17,7 +17,7 @@ running with full wasmer-bus support.
 
 ## What is ATE
 
-[See here](https://github.com/john-sharratt/ate/blob/master/README.md)
+[See here](https://github.com/wasmerio/ate/blob/master/README.md)
 
 ## Contribution
 

wasmer-os-grammar/Cargo.toml

@@ -7,7 +7,7 @@ publish = true
 description = "Terminal Shell Grammar"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasm", "browser", "terminal" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "../README.md"
 
 [dependencies]

wasmer-os/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = "Terminal Library built on WASMER and ATE"
 license = "MIT OR Apache-2.0"
 keywords = [ "wasm", "browser", "terminal" ]
-repository = "https://github.com/john-sharratt/ate"
+repository = "https://github.com/wasmerio/ate"
 readme = "../README.md"
 
 [features]
@@ -24,29 +24,30 @@ async_ws = [ ]
 [dependencies]
 wasmer-os-grammar = { version = "^0.1", path = "../wasmer-os-grammar", package = "wasmer-os-grammar" }
 
-#wasmer = { version = "3.0.0-beta", git = "https://github.com/john-sharratt/wasmer.git", branch = "wasmer3-wasix", default-features = false, features = [ "wat"] }
-#wasmer-wasi = { version = "3.0.0-beta", git = "https://github.com/john-sharratt/wasmer.git", branch = "wasmer3-wasix", default-features = false, features = [ "mem-fs" ] }
-#wasmer-vfs = { version = "3.0.0-beta", git = "https://github.com/john-sharratt/wasmer.git", branch = "wasmer3-wasix", default-features = false, features = ["mem-fs"] }
-#wasmer-vnet = { version = "3.0.0-beta", git = "https://github.com/john-sharratt/wasmer.git", branch = "wasmer3-wasix", default-features = false }
-#wasmer-vbus = { version = "3.0.0-beta", git = "https://github.com/john-sharratt/wasmer.git", branch = "wasmer3-wasix", default-features = false }
-#wasmer-compiler-cranelift = { version = "3.0.0-beta", git = "https://github.com/john-sharratt/wasmer.git", branch = "wasmer3-wasix", optional = true }
-#wasmer-compiler-llvm = { version = "3.0.0-beta", git = "https://github.com/john-sharratt/wasmer.git", branch = "wasmer3-wasix", optional = true }
-#wasmer-compiler-singlepass = { version = "3.0.0-beta", git = "https://github.com/john-sharratt/wasmer.git", branch = "wasmer3-wasix", optional = true }
-#wasmer-compiler = { version = "3.0.0-beta", git = "https://github.com/john-sharratt/wasmer.git", branch = "wasmer3-wasix", features = [ "translator" ], optional = true }
-#wasmer-wasi-local-networking = { version = "3.0.0-beta", git = "https://github.com/john-sharratt/wasmer.git", branch = "wasmer3-wasix", optional = true }
+wasmer = { version = "3.0.0-beta", git = "https://github.com/wasmerio/wasmer.git", branch = "wasix", default-features = false, features = [ "wat"] }
+wasmer-wasi = { version = "3.0.0-beta", git = "https://github.com/wasmerio/wasmer.git", branch = "wasix", default-features = false, features = [ "mem-fs" ] }
+wasmer-vfs = { version = "3.0.0-beta", git = "https://github.com/wasmerio/wasmer.git", branch = "wasix", default-features = false, features = ["mem-fs"] }
+wasmer-vnet = { version = "3.0.0-beta", git = "https://github.com/wasmerio/wasmer.git", branch = "wasix", default-features = false }
+wasmer-vbus = { version = "3.0.0-beta", git = "https://github.com/wasmerio/wasmer.git", branch = "wasix", default-features = false }
+wasmer-compiler-cranelift = { version = "3.0.0-beta", git = "https://github.com/wasmerio/wasmer.git", branch = "wasix", optional = true }
+wasmer-compiler-llvm = { version = "3.0.0-beta", git = "https://github.com/wasmerio/wasmer.git", branch = "wasix", optional = true }
+wasmer-compiler-singlepass = { version = "3.0.0-beta", git = "https://github.com/wasmerio/wasmer.git", branch = "wasix", optional = true }
+wasmer-compiler = { version = "3.0.0-beta", git = "https://github.com/wasmerio/wasmer.git", branch = "wasix", features = [ "translator" ], optional = true }
+wasmer-wasi-local-networking = { version = "3.0.0-beta", git = "https://github.com/wasmerio/wasmer.git", branch = "wasix", optional = true }
 
-wasmer = { version = "3.0.0-beta", path = "../../wasmer/lib/api", default-features = false, features = [ "wat", "tracing" ] }
-wasmer-wasi = { version = "3.0.0-beta", path = "../../wasmer/lib/wasi", default-features = false, features = [ "mem-fs" ] }
-wasmer-vfs = { version = "3.0.0-beta", path = "../../wasmer/lib/vfs", default-features = false, features = ["mem-fs"] }
-wasmer-vnet = { version = "3.0.0-beta", path = "../../wasmer/lib/vnet", default-features = false }
-wasmer-vbus = { version = "3.0.0-beta", path = "../../wasmer/lib/vbus", default-features = false }
-wasmer-compiler-cranelift = { version = "3.0.0-beta", path = "../../wasmer/lib/compiler-cranelift", optional = true }
-wasmer-compiler-llvm = { version = "3.0.0-beta", path = "../../wasmer/lib/compiler-llvm", optional = true }
-wasmer-compiler-singlepass = { version = "3.0.0-beta", path = "../../wasmer/lib/compiler-singlepass", optional = true }
-wasmer-compiler = { version = "3.0.0-beta", path = "../../wasmer/lib/compiler", features = [ "translator" ], optional = true }
-wasmer-wasi-local-networking = { version = "3.0.0-beta", path = "../../wasmer/lib/wasi-local-networking", optional = true }
-webc = { version = "0.1", path = "../../pirita/crates/webc" }
-webc-vfs = { version = "0.1", path = "../../pirita/crates/webc-vfs" }
+# wasmer = { version = "3.0.0-beta", path = "../../../wasmer/lib/api", default-features = false, features = [ "wat", "tracing" ] }
+# wasmer-wasi = { version = "3.0.0-beta", path = "../../../wasmer/lib/wasi", default-features = false, features = [ "mem-fs" ] }
+# wasmer-vfs = { version = "3.0.0-beta", path = "../../../wasmer/lib/vfs", default-features = false, features = ["mem-fs"] }
+# wasmer-vnet = { version = "3.0.0-beta", path = "../../../wasmer/lib/vnet", default-features = false }
+# wasmer-vbus = { version = "3.0.0-beta", path = "../../../wasmer/lib/vbus", default-features = false }
+# wasmer-compiler-cranelift = { version = "3.0.0-beta", path = "../../../wasmer/lib/compiler-cranelift", optional = true }
+# wasmer-compiler-llvm = { version = "3.0.0-beta", path = "../../../wasmer/lib/compiler-llvm", optional = true }
+# wasmer-compiler-singlepass = { version = "3.0.0-beta", path = "../../../wasmer/lib/compiler-singlepass", optional = true }
+# wasmer-compiler = { version = "3.0.0-beta", path = "../../../wasmer/lib/compiler", features = [ "translator" ], optional = true }
+# wasmer-wasi-local-networking = { version = "3.0.0-beta", path = "../../../wasmer/lib/wasi-local-networking", optional = true }
+
+webc = { version = "0.1", path = "../../../pirita/crates/webc" }
+webc-vfs = { version = "0.1", path = "../../../pirita/crates/webc-vfs" }
 
 chrono = { version = "^0.4", git = "https://github.com/john-sharratt/chrono.git" }
 tracing = { version = "^0.1" }

wasmer-os/src/builtins/export.rs

@@ -33,9 +33,9 @@ pub(super) fn export(
 
     for arg in &args[1..] {
         if arg.contains('=') {
-            let key = ctx.env.parse_key(arg);
+            let (key, value) = ctx.env.parse_key_value(arg);
             ctx.env.export(key.as_str());
-            ctx.env.set_vareq_with_key(key, arg.clone());
+            ctx.env.set_var(&key, value);
         } else {
             ctx.env.export(arg.as_str())
         }

wasmer-os/src/builtins/readonly.rs

@@ -33,9 +33,9 @@ pub(super) fn readonly(
 
     for arg in &args[1..] {
         if arg.contains('=') {
-            let key = ctx.env.parse_key(arg);
+            let (key, value) = ctx.env.parse_key_value(arg);
             ctx.env.readonly(key.as_str());
-            ctx.env.set_vareq_with_key(key, arg.clone());
+            ctx.env.set_var(&key, value);
         } else {
             ctx.env.readonly(arg.as_str())
         }