New emscripten builds and dist files

Add support for loading a .wasm file

Author: jcbrand

Gruntfile.js

@@ -155,7 +155,6 @@ module.exports = function(grunt) {
           '-Qunused-arguments',
           '-o',  outfile,
           '-Inative/ed25519/nacl_includes -Inative/ed25519 -Inative/ed25519/sha512',
-          '-s', "WASM=0",
           '-s', "EXPORTED_FUNCTIONS=\"[" + exported_functions.join(',') + "]\""];
 
       const command = [].concat('emcc', this.data.src_files, flags).join(' ');

Makefile

@@ -15,7 +15,7 @@ eslint: node_modules
 
 
 .PHONY: check
-check: eslint
+check: eslint dist
 	$(KARMA) start karma.conf.js $(ARGS)
 
 dist/libsignal-protocol.js:: node_modules

build/curve25519_compiled.js

@@ -1556,6 +1556,16 @@ var _curve25519_sign = Module["_curve25519_sign"] = function() {
   return (_curve25519_sign = Module["_curve25519_sign"] = Module["asm"]["curve25519_sign"]).apply(null, arguments);
 };
 
+/** @type {function(...*):?} */
+var _malloc = Module["_malloc"] = function() {
+  return (_malloc = Module["_malloc"] = Module["asm"]["malloc"]).apply(null, arguments);
+};
+
+/** @type {function(...*):?} */
+var _free = Module["_free"] = function() {
+  return (_free = Module["_free"] = Module["asm"]["free"]).apply(null, arguments);
+};
+
 /** @type {function(...*):?} */
 var _curve25519_verify = Module["_curve25519_verify"] = function() {
   return (_curve25519_verify = Module["_curve25519_verify"] = Module["asm"]["curve25519_verify"]).apply(null, arguments);
@@ -1571,11 +1581,6 @@ var _xed25519_sign = Module["_xed25519_sign"] = function() {
   return (_xed25519_sign = Module["_xed25519_sign"] = Module["asm"]["xed25519_sign"]).apply(null, arguments);
 };
 
-/** @type {function(...*):?} */
-var _malloc = Module["_malloc"] = function() {
-  return (_malloc = Module["_malloc"] = Module["asm"]["malloc"]).apply(null, arguments);
-};
-
 /** @type {function(...*):?} */
 var _curve25519_donna = Module["_curve25519_donna"] = function() {
   return (_curve25519_donna = Module["_curve25519_donna"] = Module["asm"]["curve25519_donna"]).apply(null, arguments);

build/curve25519_compiled.wasm

@@ -1556,6 +1556,16 @@ var _curve25519_sign = Module["_curve25519_sign"] = function() {
   return (_curve25519_sign = Module["_curve25519_sign"] = Module["asm"]["curve25519_sign"]).apply(null, arguments);
 };
 
+/** @type {function(...*):?} */
+var _malloc = Module["_malloc"] = function() {
+  return (_malloc = Module["_malloc"] = Module["asm"]["malloc"]).apply(null, arguments);
+};
+
+/** @type {function(...*):?} */
+var _free = Module["_free"] = function() {
+  return (_free = Module["_free"] = Module["asm"]["free"]).apply(null, arguments);
+};
+
 /** @type {function(...*):?} */
 var _curve25519_verify = Module["_curve25519_verify"] = function() {
   return (_curve25519_verify = Module["_curve25519_verify"] = Module["asm"]["curve25519_verify"]).apply(null, arguments);
@@ -1571,11 +1581,6 @@ var _xed25519_sign = Module["_xed25519_sign"] = function() {
   return (_xed25519_sign = Module["_xed25519_sign"] = Module["asm"]["xed25519_sign"]).apply(null, arguments);
 };
 
-/** @type {function(...*):?} */
-var _malloc = Module["_malloc"] = function() {
-  return (_malloc = Module["_malloc"] = Module["asm"]["malloc"]).apply(null, arguments);
-};
-
 /** @type {function(...*):?} */
 var _curve25519_donna = Module["_curve25519_donna"] = function() {
   return (_curve25519_donna = Module["_curve25519_donna"] = Module["asm"]["curve25519_donna"]).apply(null, arguments);

build/curve25519_concat.js

@@ -1559,6 +1559,16 @@ var _curve25519_sign = Module["_curve25519_sign"] = function() {
   return (_curve25519_sign = Module["_curve25519_sign"] = Module["asm"]["curve25519_sign"]).apply(null, arguments);
 };
 
+/** @type {function(...*):?} */
+var _malloc = Module["_malloc"] = function() {
+  return (_malloc = Module["_malloc"] = Module["asm"]["malloc"]).apply(null, arguments);
+};
+
+/** @type {function(...*):?} */
+var _free = Module["_free"] = function() {
+  return (_free = Module["_free"] = Module["asm"]["free"]).apply(null, arguments);
+};
+
 /** @type {function(...*):?} */
 var _curve25519_verify = Module["_curve25519_verify"] = function() {
   return (_curve25519_verify = Module["_curve25519_verify"] = Module["asm"]["curve25519_verify"]).apply(null, arguments);
@@ -1574,11 +1584,6 @@ var _xed25519_sign = Module["_xed25519_sign"] = function() {
   return (_xed25519_sign = Module["_xed25519_sign"] = Module["asm"]["xed25519_sign"]).apply(null, arguments);
 };
 
-/** @type {function(...*):?} */
-var _malloc = Module["_malloc"] = function() {
-  return (_malloc = Module["_malloc"] = Module["asm"]["malloc"]).apply(null, arguments);
-};
-
 /** @type {function(...*):?} */
 var _curve25519_donna = Module["_curve25519_donna"] = function() {
   return (_curve25519_donna = Module["_curve25519_donna"] = Module["asm"]["curve25519_donna"]).apply(null, arguments);

dist/libsignal-protocol-worker.js

@@ -1559,6 +1559,16 @@ var _curve25519_sign = Module["_curve25519_sign"] = function() {
   return (_curve25519_sign = Module["_curve25519_sign"] = Module["asm"]["curve25519_sign"]).apply(null, arguments);
 };
 
+/** @type {function(...*):?} */
+var _malloc = Module["_malloc"] = function() {
+  return (_malloc = Module["_malloc"] = Module["asm"]["malloc"]).apply(null, arguments);
+};
+
+/** @type {function(...*):?} */
+var _free = Module["_free"] = function() {
+  return (_free = Module["_free"] = Module["asm"]["free"]).apply(null, arguments);
+};
+
 /** @type {function(...*):?} */
 var _curve25519_verify = Module["_curve25519_verify"] = function() {
   return (_curve25519_verify = Module["_curve25519_verify"] = Module["asm"]["curve25519_verify"]).apply(null, arguments);
@@ -1574,11 +1584,6 @@ var _xed25519_sign = Module["_xed25519_sign"] = function() {
   return (_xed25519_sign = Module["_xed25519_sign"] = Module["asm"]["xed25519_sign"]).apply(null, arguments);
 };
 
-/** @type {function(...*):?} */
-var _malloc = Module["_malloc"] = function() {
-  return (_malloc = Module["_malloc"] = Module["asm"]["malloc"]).apply(null, arguments);
-};
-
 /** @type {function(...*):?} */
 var _curve25519_donna = Module["_curve25519_donna"] = function() {
   return (_curve25519_donna = Module["_curve25519_donna"] = Module["asm"]["curve25519_donna"]).apply(null, arguments);

dist/libsignal-protocol.js

@@ -22,6 +22,7 @@ module.exports = function(config) {
       'test/testvectors.js',
       'test/InMemorySignalProtocolStore.js',
 
+      { pattern: 'build/curve25519_compiled.wasm', served: true, type: "wasm", included: false },
       'build/curve25519_concat.js',
       'src/curve25519_worker_manager.js',
       'build/components_concat.js',