multiparty · Snafkin547 · Apr 30, 2024 · Apr 26, 2024 · Apr 29, 2024 · Apr 29, 2024
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -26,19 +26,30 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Start Server
-        run: node demos/support/server.ts & echo $! > SERVER_PID
+      - name: Run Cypress Test for Array MPC as a Service
+        run: |
+          echo "Running Cypress test: array-mpc-as-a-service"
+          node demos/array-mpc-as-a-service/server.js & echo $! > SERVER_PID
+          sleep 5
+          echo "Initiating three computational parties"
+          node demos/array-mpc-as-a-service/compute-party.js config.json &
+          node demos/array-mpc-as-a-service/compute-party.js config.json &
+          node demos/array-mpc-as-a-service/compute-party.js config.json &
+          sleep 5
+          echo "Running the cypress test for two input parties"
+          npx cypress run --config-file demos/cypress.config.ts --spec "demos/array-mpc-as-a-service/test.cy.ts"
+          kill $(cat SERVER_PID) || true
 
-      - name: Run Cypress Tests
+      - name: Run Cypress Tests for Standard Tests
         run: |
           TESTS=("array-concat" "array-binary-search" "array-merge-sort" "array-substring" "array-bubble-sort" "array-shell-sort" "the-valentine-question" "array-shuffle")
           for TEST in "${TESTS[@]}"
           do
             echo "Running Cypress test: $TEST"
+            node demos/support/server.ts & echo $! > SERVER_PID
             sleep 5
             npx cypress run --config-file demos/cypress.config.ts --spec "demos/$TEST/test.cy.ts"
-            kill $(cat SERVER_PID) # stop the server
-            node demos/support/server.ts & echo $! > SERVER_PID
+            kill $(cat SERVER_PID)
           done
 
       - name: Stop Server

diff --git a/demos/array-mpc-as-a-service/client.html b/demos/array-mpc-as-a-service/client.html
@@ -23,12 +23,13 @@
 <body>
   <h1>Connect JIFF</h1>
   <label for="computation_id">Computation ID</label><input id="computation_id" value="test"/><br/><br/>
-  <button id="connectButton" onclick="connect();">Connect</button>
+  <button id="connectButton" onclick="connect(1);connect(2);">Connect</button>
   <br/><br/>
   <hr/>
   <h1>Sum and Dot Numbers under MPC as a service</h1>
     <label for="number">Enter your array: </label> <br/><br/>
-    <textarea id="inputText" rows="5" cols="35">[1, 3, 2]</textarea> &nbsp; <button onclick="submit();" disabled="disabled" id="processButton">Start</button><br/>
+    <textarea id="inputText1" rows="5" cols="35">[1, 3, 2]</textarea> &nbsp; <button onclick="submit(1);" id="submit1">Start</button><br/>
+    <textarea id="inputText2" rows="5" cols="35">[1, 3, 2]</textarea> &nbsp; <button onclick="submit(2);" id="submit2">Start</button><br/>
   <div id="output"></div>
 </body>
 </html>
diff --git a/demos/array-mpc-as-a-service/client.js b/demos/array-mpc-as-a-service/client.js
@@ -1,19 +1,12 @@
-/**
- * Do not modify this file unless you have to.
- * This file has UI handlers.
- */
-
+let worker = new Worker('./web-worker.js');
 /* global config */
 
 // eslint-disable-next-line no-unused-vars
-function connect() {
+function connect(party_id) {
   $('#connectButton').prop('disabled', true);
   var computation_id = $('#computation_id').val();
 
   var options = { party_count: config.party_count };
-  options.onError = function (_, error) {
-    $('#output').append("<p class='error'>"+error+'</p>');
-  };
 
   var hostname = window.location.hostname.trim();
   var port = window.location.port;
@@ -31,16 +24,18 @@
   }
 
   hostname = hostname + ':' + port;
-  // eslint-disable-next-line no-undef
-  var jiff = mpc.connect(hostname, computation_id, options, config);
-  jiff.wait_for(config.compute_parties, function () {
-    $('#processButton').attr('disabled', false); $('#output').append('<p>Connected to the compute parties!</p>');
+  worker.postMessage({
+    type: 'init_' + String(party_id),
+    hostname: hostname,
+    computation_id: computation_id,
+    options: options,
+    config: config
   });
 }
 
 // eslint-disable-next-line no-unused-vars
-function submit() {
-  var arr = JSON.parse(document.getElementById('inputText').value);
+function submit(party_id) {
+  var arr = JSON.parse(document.getElementById('inputText' + String(party_id)).value);
 
   if (arr.length !== config.input_length) {
     alert('Please input an array of length ' + config.input_length + '.');
@@ -53,22 +48,16 @@
       return;
     }
   }
-
-  $('#processButton').attr('disabled', true);
-  $('#output').append('<p>Starting...</p>');
-
   // eslint-disable-next-line no-undef
-  var promise = mpc.compute(arr);
-  promise.then(function (opened_array) {
-    var results = {
-      sum: opened_array[0],
-      product: opened_array[1]
-    };
-    handleResult(results);
+  worker.postMessage({
+    type: 'compute' + String(party_id),
+    input: arr
   });
 }
 
-function handleResult(results) {
-  $('#output').append('<p>The sum is ' + results.sum + ' and the inner product is ' + results.product + '.</p>');
-  $('#button').attr('disabled', false);
-}
+worker.onmessage = function (e) {
+  if ($('#output').is(':empty') && (e.data.type === 'result1' || e.data.type === 'result2')) {
+    $('#output').append('<p>The sum is ' + e.data.result[0] + ' and the inner product is ' + e.data.result[1] + '.</p>');
+    $('#button').attr('disabled', false);
+  }
+};
diff --git a/demos/array-mpc-as-a-service/test.cy.ts b/demos/array-mpc-as-a-service/test.cy.ts
@@ -0,0 +1,31 @@
+describe('Array mpc as a service', () => {
+  before(() => {
+    // Load the fixture data before the tests
+    cy.fixture('mpc_input.json').as('inputData');
+  });
+
+  it('MPC as a service on Arrays', () => {
+    // Visit the HTML page
+    cy.visit('array-mpc-as-a-service/client.html');
+
+    // Load the input data and interact with the UI
+    cy.get('@inputData').then((inputData) => {
+      const arrayInput1 = (inputData as any)['array-mpc-as-a-service']['1'] as number[];
+      const arrayInput2 = (inputData as any)['array-mpc-as-a-service']['2'] as number[];
+
+      // Start JIFF Clients
+      cy.get('#connectButton').click();
+
+      // Input the array1
+      cy.get('#inputText1').clear().type(JSON.stringify(arrayInput1));
+      cy.get('#submit1').click();
+
+      // Input the array2
+      cy.get('#inputText2').clear().type(JSON.stringify(arrayInput2));
+      cy.get('#submit2').click();
+
+      // Check the output
+      cy.get('#output').should('contain', 'The sum is 12 and the inner product is 14');
+    });
+  });
+});
diff --git a/demos/array-mpc-as-a-service/web-worker.js b/demos/array-mpc-as-a-service/web-worker.js
@@ -0,0 +1,27 @@
+importScripts('./client-mpc.js', '../../dist/jiff-client.js', '../../lib/ext/jiff-client-restful.js', );
+
+let instance1;
+let instance2;
+
+self.onmessage = function (event) {
+  const data = event.data;
+
+  switch (data.type) {
+    case 'init_1':
+      instance1 = mpc.connect(data.hostname, data.computation_id, data.options, data.config);
+      break;
+    case 'init_2':
+      instance2 = mpc.connect(data.hostname, data.computation_id, data.options, data.config);
+      break;
+    case 'compute1':
+      mpc.compute(data.input, instance1).then((result) => {
+        self.postMessage({ result: result, type: 'result1' });
+      });
+      break;
+    case 'compute2':
+      mpc.compute(data.input, instance2).then((result) => {
+        self.postMessage({ result: result, type: 'result2' });
+      });
+      break;
+  }
+};
diff --git a/demos/fixtures/mpc_input.json b/demos/fixtures/mpc_input.json
@@ -5,5 +5,6 @@
     "array-merge-sort": {"1": [1, 3, 2, 4], "2":[1, 3, 2, 4]},
     "array-shell-sort": {"1": [1, 3, 2, 4], "2":[1, 3, 2, 4]},
     "array-shuffle": {"1": [1, 3, 2], "2":[1, 3, 2]},
-    "array-substring": {"1": "abcde", "2":"c"}
+    "array-substring": {"1": "abcde", "2":"c"},
+    "array-mpc-as-a-service": {"1": [1, 3, 2], "2":[1, 3, 2]}
 }
diff --git a/lib/ext/jiff-client-restful.js b/lib/ext/jiff-client-restful.js
@@ -111,7 +111,7 @@
     jiff.socket.connected = true;
     jiff.socket.connect = function () {
       var connectListeners = jiff.socket.listeners('connect');
-      for (var i = 1; i < connectListeners.length; i++) {
+      for (var i = 0; i < connectListeners.length; i++) {
         connectListeners[i]();
       }
     };