Merge pull request #216 from john-sharratt/master

Added support for compiling against wasm32-wasi

Author: syrusakbary

Cargo.lock

@@ -8,11 +8,10 @@ description = "WebAssembly Package Manager CLI"
 license = "MIT"
 
 [dependencies]
-atty = "0.2"
 billboard = { version = "0.1.0", optional = true }
 chrono = { version = "0.4", features = ["serde"] }
 colored = { version = "1.8", optional = true }
-dirs = "1"
+dirs = { version = "1", optional = true }
 anyhow = "1"
 thiserror = "1.0"
 fern = {version = "0.6", features = ["colored"]}
@@ -23,29 +22,40 @@ license-exprs = "1.4.0"
 log = "0.4"
 maplit = { version = "1", optional = true }
 minisign = "0.5"
-prettytable-rs = "0.8.0"
+prettytable-rs = { version = "0.8.0", optional = true }
 regex = "1"
-reqwest = { version = "0.11.0", features = ["native-tls-vendored", "blocking", "json", "gzip","socks","multipart"] }
-rpassword = "4"
-rusqlite = "0.24"
+rpassword-wasi = "5"
+rusqlite = { version = "0.24", optional = true }
 semver = { version = "0.11", features = ["serde"] }
 sentry = { version = "0.22.0", optional = true, features = ["anyhow", "panic", "backtrace"] }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 structopt = { version = "0.3", features = ["color"] }
-tar = "0.4"
 tempfile = "3"
 time = "0.1"
 toml = "0.5.6"
 url = "2"
 wasmer-wasm-interface = { version = "0.1.0", path = "lib/wasm-interface" }
 wasmparser = "0.51.4"
-whoami = "1.1.5"
 dialoguer = "0.4.0"
 hex = { version = "0.4", optional = true }
 blake3 = { version = "0.3.1", optional = true }
 
+[target.'cfg(not(target_os = "wasi"))'.dependencies]
+whoami = "1.1.5"
+atty = "0.2"
+reqwest = { version = "0.11.0", features = ["native-tls-vendored", "blocking", "json", "gzip","socks","multipart"], optional = true }
+tar = { version = "0.4" }
+
+[target.'cfg(target_os = "wasi")'.dependencies]
+whoami = "0.5"
+wasm-bus-reqwest = { version = "1.0", path = "../ate/wasm-bus-reqwest" }
+wasm-bus-process = { version = "1.0", path = "../ate/wasm-bus-process" }
+getrandom = "0.2.3"
+tar = { package = "tar-wasi", version = "0.4" }
+serde_yaml = { version = "^0.8" }
+
 [dev-dependencies]
 tempfile = "3"
 
@@ -56,10 +66,11 @@ members = [
 ]
 
 [features]
-default = ["packagesigning", "sqlite-bundled"]
+default = ["full","packagesigning", "sqlite-bundled"]
 sqlite-bundled = ["rusqlite/bundled"]
 telemetry = ["sentry"]
 update-notifications= ["billboard", "colored"]
 prehash-module = ["hex", "blake3"]
-packagesigning = []
+packagesigning = []#[cfg(feature = "full")]
 integration_tests = ["maplit"]
+full = [ "dirs", "rusqlite", "prettytable-rs", "reqwest" ]

Cargo.toml

@@ -1,7 +1,9 @@
+#![cfg_attr(target_os = "wasi", allow(unused_variables))]
 use std::{env, path};
 use structopt::{clap::AppSettings, StructOpt};
 #[cfg(feature = "update-notifications")]
 use wapm_cli::update_notifier;
+#[allow(unused_imports)]
 use wapm_cli::{commands, logging};
 
 #[derive(StructOpt, Debug)]
@@ -27,6 +29,7 @@ enum Command {
     /// Install a package
     Install(commands::InstallOpt),
 
+    #[cfg(feature = "full")]
     #[structopt(name = "publish")]
     /// Publish a package
     Publish(commands::PublishOpt),
@@ -38,12 +41,13 @@ enum Command {
     /// Run a command from the package or one of the dependencies
     Run(commands::RunOpt),
 
+    #[cfg(feature = "full")]
     #[structopt(name = "search")]
     /// Search packages
     Search(commands::SearchOpt),
 
     #[cfg(feature = "package")]
-    #[structopt(name = "package", raw(aliases = r#"&["p", "pkg"]"#))]
+    #[structopt(name = "package", aliases = r#"&["p", "pkg"]"#)]
     /// Create a wasm package with bundled assets
     Package(commands::PackageOpt),
 
@@ -59,10 +63,12 @@ enum Command {
     /// Set up current directory for use with wapm
     Init(commands::InitOpt),
 
+    #[cfg(feature = "full")]
     #[structopt(name = "list")]
     /// List the currently installed packages and their commands
     List(commands::ListOpt),
 
+    #[cfg(feature = "full")]
     #[cfg(feature = "packagesigning")]
     #[structopt(name = "keys")]
     /// Manage minisign keys for verifying packages
@@ -72,6 +78,7 @@ enum Command {
     /// Uninstall a package
     Uninstall(commands::UninstallOpt),
 
+    #[cfg(feature = "full")]
     #[structopt(name = "bin")]
     /// Get the .bin dir path
     Bin(commands::BinOpt),
@@ -89,14 +96,25 @@ enum Command {
     /// Remove packages from the manifest
     Remove(commands::RemoveOpt),
 
+    #[cfg(feature = "full")]
     /// Execute a command, installing it temporarily if necessary
     Execute(commands::ExecuteOpt),
 }
 
 fn main() {
-    let is_atty = atty::is(atty::Stream::Stdout);
-    if let Err(e) = logging::set_up_logging(is_atty) {
-        eprintln!("Error: {}", e);
+    #[cfg(not(target_os = "wasi"))]
+    {
+        let is_atty = atty::is(atty::Stream::Stdout);
+        if let Err(e) = logging::set_up_logging(is_atty) {
+            eprintln!("Error: {}", e);
+        }
+    }
+
+    //#[cfg(target_os = "wasi")]
+    {
+        if let Err(e) = logging::set_up_logging(true) {
+            eprintln!("Error: {}", e);
+        }
     }
 
     #[cfg(feature = "telemetry")]
@@ -121,6 +139,7 @@ fn main() {
         .expect("Could not parse argv[0] as a path")
         .to_string_lossy();
 
+    #[cfg(feature = "full")]
     let args = if prog_name == "wax" {
         Command::Execute(commands::ExecuteOpt::ExecArgs(
             env::args().skip(1).collect(),
@@ -133,6 +152,9 @@ fn main() {
         Command::from_args()
     };
 
+    #[cfg(not(feature = "full"))]
+    let args = Command::from_args();
+
     #[cfg(feature = "update-notifications")]
     // Only show the async check on certain commands
     let maybe_show_update_notification = match args {
@@ -158,15 +180,20 @@ fn main() {
         Command::Install(install_options) => commands::install(install_options),
         Command::Add(add_options) => commands::add(add_options),
         Command::Remove(remove_options) => commands::remove(remove_options),
+        #[cfg(feature = "full")]
         Command::Publish(publish_options) => commands::publish(publish_options),
         Command::Run(run_options) => commands::run(run_options),
+        #[cfg(feature = "full")]
         Command::Execute(execute_options) => commands::execute(execute_options),
+        #[cfg(feature = "full")]
         Command::Search(search_options) => commands::search(search_options),
         #[cfg(feature = "package")]
         Command::Package(package_options) => commands::package(package_options),
         Command::Validate(validate_options) => commands::validate(validate_options),
         Command::Init(init_options) => commands::init(init_options),
+        #[cfg(feature = "full")]
         Command::List(list_options) => commands::list(list_options),
+        #[cfg(feature = "full")]
         #[cfg(feature = "packagesigning")]
         Command::Keys(key_options) => commands::keys(key_options),
         Command::Completions(completion_options) => {
@@ -178,6 +205,7 @@ fn main() {
             Ok(())
         }
         Command::Uninstall(uninstall_options) => commands::uninstall(uninstall_options),
+        #[cfg(feature = "full")]
         Command::Bin(bin_options) => commands::bin(bin_options),
         #[cfg(feature = "update-notifications")]
         Command::BackgroundUpdateCheck => {

src/bin/wapm.rs

@@ -36,7 +36,7 @@ enum AddError {
 pub fn add(options: AddOpt) -> anyhow::Result<()> {
     let mut error = false;
     let mut manifest: Manifest = {
-        let cur_dir = std::env::current_dir()?;
+        let cur_dir = crate::config::Config::get_current_dir()?;
         Manifest::find_in_directory(cur_dir).map_err(|_| AddError::NoManifest)?
     };
 

src/commands/add.rs

@@ -1,7 +1,6 @@
 use crate::config::Config;
 use crate::data::manifest::PACKAGES_DIR_NAME;
 use crate::dataflow::bin_script::BIN_DIR_NAME;
-use std::env;
 use structopt::StructOpt;
 use thiserror::Error;
 
@@ -21,7 +20,7 @@ pub enum BinError {
 pub fn bin(options: BinOpt) -> anyhow::Result<()> {
     let mut root_dir = match options.global {
         true => Config::get_globals_directory()?,
-        false => env::current_dir()?,
+        false => Config::get_current_dir()?,
     };
     root_dir.push(PACKAGES_DIR_NAME);
 

src/commands/bin.rs

@@ -18,7 +18,6 @@ use thiserror::Error;
 use graphql_client::*;
 
 use std::convert::From;
-use std::env;
 use std::ffi::OsString;
 use std::path::PathBuf;
 use std::str::FromStr;
@@ -228,7 +227,7 @@ pub fn execute(opt: ExecuteOpt) -> anyhow::Result<()> {
     }
     let opt = opt;
     trace!("Execute {:?}", &opt);
-    let current_dir = env::current_dir()?;
+    let current_dir = crate::config::Config::get_current_dir()?;
     if let Some(which) = opt.which {
         let mut wax_index = wax_index::WaxIndex::open()?;
         let dir = if let Ok((package_name, version, _)) = wax_index.search_for_entry(which.clone())

src/commands/execute.rs

@@ -1,5 +1,4 @@
 use crate::init;
-use std::env;
 use structopt::StructOpt;
 
 #[derive(StructOpt, Debug)]
@@ -10,7 +9,7 @@ pub struct InitOpt {
 }
 
 pub fn init(opt: InitOpt) -> anyhow::Result<()> {
-    let current_directory = env::current_dir()?;
+    let current_directory = crate::config::Config::get_current_dir()?;
     init::init(current_directory, opt.force_yes)
 }
 

src/commands/init.rs

@@ -8,7 +8,6 @@ use crate::config::Config;
 use crate::dataflow;
 use crate::util;
 use std::borrow::Cow;
-use std::env;
 use std::path::Path;
 use structopt::StructOpt;
 use thiserror::Error;
@@ -36,6 +35,9 @@ enum InstallError {
     #[error("Failed to install packages. {0}")]
     CannotRegenLockFile(dataflow::Error),
 
+    #[error("Failed to create the install directory. {0}")]
+    CannotCreateInstallDirectory(std::io::Error),
+
     #[error("Failed to install packages in manifest. {0}")]
     FailureInstallingPackages(dataflow::Error),
 
@@ -69,7 +71,7 @@ mod package_args {
 
 /// Run the install command
 pub fn install(options: InstallOpt) -> anyhow::Result<()> {
-    let current_directory = env::current_dir()?;
+    let current_directory = crate::config::Config::get_current_dir()?;
     let _value = util::set_wapm_should_accept_all_prompts(options.force_yes);
     debug_assert!(
         _value.is_some(),
@@ -137,9 +139,12 @@ pub fn install(options: InstallOpt) -> anyhow::Result<()> {
                 }
                 false => Cow::Borrowed(&current_directory),
             };
+            std::fs::create_dir_all(install_directory.clone())
+                .map_err(|err| InstallError::CannotCreateInstallDirectory(err))?;
 
-            let changes_applied = dataflow::update(installed_packages, vec![], install_directory)
-                .map_err(|err| InstallError::CannotRegenLockFile(err))?;
+            let changes_applied =
+                dataflow::update(installed_packages.clone(), vec![], install_directory)
+                    .map_err(|err| InstallError::CannotRegenLockFile(err))?;
 
             if changes_applied {
                 if options.global {

src/commands/install.rs

@@ -4,7 +4,7 @@ use crate::config;
 use crate::data::lock::lockfile::{CommandMap, ModuleMap};
 use crate::dataflow::lockfile_packages::LockfileResult;
 use prettytable::{format, Table};
-use std::{env, fmt::Write as _};
+use std::{fmt::Write as _};
 use structopt::StructOpt;
 
 #[derive(StructOpt, Debug)]
@@ -37,7 +37,7 @@ pub fn list(options: ListOpt) -> anyhow::Result<()> {
 
     let mut handle = String::new();
     if local {
-        let cwd = env::current_dir()?;
+        let cwd = crate::config::Config::get_current_dir()?;
         match LockfileResult::find_in_directory(cwd) {
             LockfileResult::Lockfile(lockfile) => {
                 let has_modules = !lockfile.modules.is_empty();

src/commands/list.rs

@@ -1,5 +1,6 @@
 use crate::config::Config;
 use crate::graphql::execute_query;
+use rpassword_wasi as rpassword;
 use std::io::prelude::*;
 use std::io::{stdin, stdout};
 
@@ -21,8 +22,7 @@ pub fn login() -> anyhow::Result<()> {
     stdin().read_line(buffer)?;
     let username = buffer.trim_end();
 
-    let password =
-        rpassword::read_password_from_tty(Some("Password: ")).expect("Can't get password");
+    let password = rpassword::prompt_password("Password: ").expect("Can't get password");
 
     let q = LoginMutation::build_query(login_mutation::Variables {
         username: username.to_string(),