Draft: Optimization size of wasm binary

Cargo.toml

@@ -17,7 +17,7 @@ members = [
 ]
 
 [profile.release]
-lto = "thin"
+opt-level = "s"  # Tell `rustc` to optimize for small code size.
 
 [dependencies]
 actix = "0.8"

Makefile

@@ -15,6 +15,8 @@ eq = $(if $(or $(1),$(2)),$(and $(findstring $(1),$(2)),\
 # Aliases #
 ###########
 
+build: build.jason
+
 # Resolve all project dependencies.
 #
 # Usage:
@@ -46,6 +48,34 @@ test: test.unit
 
 
 
+##################
+# Build commands #
+##################
+
+# Build Jason E2E demo in production mode.
+#
+# Usage:
+#	make build.jason
+
+build.jason:
+	@rm -rf jason/e2e-demo/dist/
+	npm run build --prefix=jason/e2e-demo
+	@make opt.jason
+
+
+# Optimize wasm binary.
+#
+# Usage:
+#	make opt.wasm [file=(|<wasm-file>)]
+
+wasm-file = $(if $(call eq,$(file),),$(shell find jason/e2e-demo/dist -name '*.module.wasm'),$(file))
+
+opt.jason:
+	wasm-opt $(wasm-file) -Os -d -o $(wasm-file)
+
+
+
+
 ##################
 # Cargo commands #
 ##################
@@ -185,8 +215,10 @@ up.medea:
 # .PHONY section #
 ##################
 
-.PHONY: cargo cargo.fmt cargo.lint \
+.PHONY: build build.jason \
+		cargo cargo.fmt cargo.lint \
         docs docs.rust \
+        opt.jason \
         test test.unit \
         up up.coturn up.jason up.medea \
         yarn

jason/Cargo.toml

@@ -11,24 +11,18 @@ repository = "https://github.com/instrumentisto/medea"
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[profile.release]
-opt-level = "s"  # Tell `rustc` to optimize for small code size.
-
 [features]
-default = ["console_error_panic_hook", "wee_alloc"]
+default = ["console_error_panic_hook"]
 
 [dependencies]
 console_error_panic_hook = { version = "0.1", optional = true }
 futures = "0.1"
 js-sys = "0.3"
-macro-attr = "0.2"
 medea-client-api-proto = { path = "../proto/client-api", features = ["jason"] }
-newtype_derive = "0.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.3"
-wee_alloc = { version = "0.4", optional = true }
 [dependencies.web-sys]
     version = "0.3.4"
     features = [

jason/e2e-demo/package.json

@@ -2,8 +2,8 @@
   "name": "jason-e2e-demo",
   "private": true,
   "scripts": {
-    "start": "webpack-dev-server -d --open --port 8081",
-    "build": "webpack"
+    "start": "webpack-dev-server -d --config webpack.dev.js --open --port 8081",
+    "build": "webpack --config webpack.prod.js"
   },
   "devDependencies": {
     "@wasm-tool/wasm-pack-plugin": "^0.2",

jason/e2e-demo/webpack.config.js → jason/e2e-demo/webpack.dev.js

@@ -6,22 +6,22 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
 const dist = path.resolve(__dirname, "dist");
 
 module.exports = {
+  mode: 'development',
   entry: "./js/index.js",
   output: {
     path: dist,
     filename: "bundle.js"
   },
   devServer: {
-    contentBase: dist,
+    contentBase: dist
   },
   plugins: [
     new HtmlWebpackPlugin({
       template: 'index.html'
     }),
     new WasmPackPlugin({
       crateDirectory: path.resolve(__dirname, '../'),
-      // WasmPackPlugin defaults to compiling in "dev" profile.
-      // To change that, use `forceMode: 'release'`.
-    }),
+      forceMode: 'development'
+    })
   ]
 };

jason/e2e-demo/webpack.prod.js

@@ -0,0 +1,24 @@
+const path = require("path");
+
+const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+
+const dist = path.resolve(__dirname, "dist");
+
+module.exports = {
+  mode: 'production',
+  entry: "./js/index.js",
+  output: {
+    path: dist,
+    filename: "bundle.js"
+  },
+  plugins: [
+    new HtmlWebpackPlugin({
+      template: 'index.html'
+    }),
+    new WasmPackPlugin({
+      crateDirectory: path.resolve(__dirname, '../'),
+      forceMode: 'production'
+    })
+  ]
+};

jason/src/lib.rs

@@ -2,20 +2,11 @@ mod api;
 mod rpc;
 mod utils;
 
-// When the `console_error_panic_hook` feature is enabled, we can call the
-// `set_panic_hook` function at least once during initialization, and then
-// we will get better error messages if our code ever panics.
-//
-// For more details see:
-// https://github.com/rustwasm/console_error_panic_hook#readme
-#[cfg(feature = "console_error_panic_hook")]
-pub use console_error_panic_hook::set_once as set_panic_hook;
-
 #[doc(inline)]
 pub use self::api::{Jason, RoomHandle};
 
-// When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
-// allocator.
-#[cfg(feature = "wee_alloc")]
-#[global_allocator]
-static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
+#[cfg(feature = "console_error_panic_hook")]
+pub use console_error_panic_hook::set_once as set_panic_hook;
+
+#[cfg(not(feature = "console_error_panic_hook"))]
+pub fn set_panic_hook() {}

jason/src/rpc/websocket.rs

@@ -5,9 +5,7 @@
 use std::{cell::RefCell, convert::TryFrom, rc::Rc};
 
 use futures::future::{Future, IntoFuture};
-use macro_attr::*;
 use medea_client_api_proto::{ClientMsg, ServerMsg};
-use newtype_derive::NewtypeFrom;
 use web_sys::{CloseEvent, Event, MessageEvent, WebSocket as BackingSocket};
 
 use crate::{
@@ -147,9 +145,9 @@ impl WebSocket {
         inner_mut.on_message = Some(EventListener::new_mut(
             Rc::clone(&inner_mut.socket),
             "message",
-            move |msg| {
+            move |msg: MessageEvent| {
                 let parsed =
-                    ServerMessage::try_from(&msg).map(std::convert::Into::into);
+                    msg.data().into_serde::<ServerMsg>().map_err(WasmErr::from);
                 f(parsed);
             },
         )?);
@@ -217,23 +215,3 @@ impl From<&CloseEvent> for CloseMsg {
         }
     }
 }
-
-macro_attr! {
-    #[derive(NewtypeFrom!)]
-    pub struct ServerMessage(ServerMsg);
-}
-
-impl TryFrom<&MessageEvent> for ServerMessage {
-    type Error = WasmErr;
-
-    fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
-        let payload = msg
-            .data()
-            .as_string()
-            .ok_or_else(|| WasmErr::from_str("Payload is not string"))?;
-
-        serde_json::from_str::<ServerMsg>(&payload)
-            .map_err(WasmErr::from)
-            .map(Self::from)
-    }
-}