speaker-calibration 2.2.256 → 2.2.258

package/src/utils.js

@@ -1,205 +1,215 @@
-import Swal from "sweetalert2";
-//import {phrases} from '../dist/example/i18n.js';
-/** .
- * .
- * .
- * Utlity function to pause execution for a given time
- *
- * @param {number} seconds
- * @returns {Promise}
- * @example
- */
-const sleep = seconds =>
-  new Promise(resolve => {
-    setTimeout(resolve, seconds * 1000);
-  });
-
-/** .
- * .
- * .
- * Uiltity function to create and save a CSV file from a buffer
- *
- * @param {*} data
- * @param {*} filename
- * @example
- */
-const saveToCSV = (data, filename = 'recordedMLSignal.csv') => {
-  // console.log(data)
-  let csvContent = 'data:text/csv;charset=utf-8,';
-
-  data.forEach((val, idx) => {
-    csvContent += `${idx},${val}\r\n`;
-  });
-  const encodedUri = encodeURI(csvContent);
-  const link = document.createElement('a');
-  link.setAttribute('href', encodedUri);
-  link.setAttribute('download', filename);
-  document.body.appendChild(link);
-  link.click();
-};
-
-const saveToJSON = (data, filename = 'recordedMLSignal.json') => {
-  const jsonData = JSON.stringify(data, null, 2);
-  const blob = new Blob([jsonData], { type: 'application/json' });
-  const url = URL.createObjectURL(blob);
-  const link = document.createElement('a');
-  link.setAttribute('href', url);
-  link.setAttribute('download', filename);
-  document.body.appendChild(link);
-  link.click();
-  URL.revokeObjectURL(url);
-};
-
-
-/** .
- * .
- * .
- * Utility function to create a buffer from a CSV file
- *
- * @param {*} csvString
- * @param {*} delimiter
- * @returns
- * @example
- */
-const csvToArray = (csvString, delimiter = ',') =>
-  csvString
-    .trim()
-    .split('\n')
-    .map(row => parseFloat(row.trim().split(delimiter)[1]));
-
-const findMinValue = (array) => {
-  let minValue = array[0];
-  for (let i = 1; i < array.length; i++) {
-      if (array[i] < minValue) {
-          minValue = array[i];
-      }
-  }
-  return minValue;
-};
-
-const findMaxValue = (array) => {
-  let maxValue = array[0];
-  for (let i = 1; i < array.length; i++) {
-      if (array[i] > maxValue) {
-          maxValue = array[i];
-      }
-  }
-  return maxValue;
-};
-
-export const getCurrentTimeString = () => {
-  const date = new Date();
-
-  // Get the date string in the user's locale
-  const dateOptions = {
-    year: "numeric",
-    month: "long",
-    day: "numeric",
-    timeZoneName: "longOffset",
-    hour: "numeric",
-    minute: "numeric",
-  };
-  const dateString = date.toLocaleDateString(undefined, dateOptions);
-
-  return dateString.replace("at ", "");
-};
-
-const standardDeviation = (values) => {
-  const avg = average(values);
-
-  const squareDiffs = values.map((value) => {
-    const diff = value - avg;
-    const sqrDiff = diff * diff;
-    return sqrDiff;
-  });
-
-  const avgSquareDiff = average(squareDiffs);
-
-  const stdDev = Math.sqrt(avgSquareDiff);
-  // only 1 digit after the decimal place
-  const std = Math.round(stdDev * 10) / 10;
-  return std.toFixed(1);
-};
-
-const average = (data) => {
-  const sum = data.reduce((sum, value) => {
-    return sum + value;
-  }, 0);
-
-  const avg = sum / data.length;
-  return avg;
-};
-
-function interpolate(x, x0, x1, y0, y1) {
-  return y0 + (y1 - y0) * (x - x0) / (x1 - x0);
-}
-
-export const formatLineBreak =(inputStr,checkInternetConnection) => {
-  let finalStr = inputStr
-  .replace(/\n/g, '<br>')
-  .replace('LLL',
-    `<a href="#" id="check-connection">${checkInternetConnection}</a>`);
-  
-  console.log(finalStr);
-
-  return finalStr;
-}
-
-
-  
-export const createAndShowPopup = (lang, phrases) => {
-  console.log(`
-    <div style="text-align: left;"> 
-    ${convertAsterisksToList(phrases.RC_NeedInternetConnectedPhone[lang].replace(/\n/g, '<br>'))}
-    </div>
-      <div class="col-3" style="margin-top:10px;">
-        <button id="okaybtn" class="btn btn-lg btn-dark">
-          ${phrases.EE_ok[lang]}
-        </button>
-      </div>`);
-  Swal.fire({
-    html: `
-    <div style="text-align: left;"> 
-    ${convertAsterisksToList(phrases.RC_NeedInternetConnectedPhone[lang].replace(/\n/g, '<br>'))}
-    </div>
-      <div class="col-3" style="margin-top:10px;">
-        <button id="okaybtn" class="btn btn-lg btn-dark">
-          ${phrases.EE_ok[lang]}
-        </button>
-      </div>`,
-    showConfirmButton: false,
-    position: 'bottom',
-    width: "40%",
-    customClass: {
-      container:'no-background',
-    },
-    showClass: {
-      popup: "fade-in",
-    },
-    hideClass: {
-      popup: "",
-    },
-    didOpen: () => {
-      const okayBtn = document.getElementById("okaybtn");
-      okayBtn.style.display = "flex"; 
-      okayBtn.addEventListener('click', () => {
-        Swal.close(); // Close the Swal popup
-      });
-    }
-  });
-};
-
-export function convertAsterisksToList(content) {
-  // Replace * with <li> and convert line breaks to </li><li>
-  console.log(content);
-  let result = content
-      .replace(/\* (.*?)(<br>|$)/g, '<li>$1</li>')
-      .replace(/(<li>)(<\/li>)\s*$/, '') // Remove trailing </li>
-      .replace('<li>', '<ul style="padding-left:40px"> <br> <li>');
-  result = result.replace('</li>5', '</li></ul>5');
-  return result;
-}
-
-
-
-export {sleep, saveToCSV, saveToJSON, csvToArray,findMinValue,findMaxValue, standardDeviation, interpolate};
+import Swal from "sweetalert2";
+//import {phrases} from '../dist/example/i18n.js';
+/** .
+ * .
+ * .
+ * Utlity function to pause execution for a given time
+ *
+ * @param {number} seconds
+ * @returns {Promise}
+ * @example
+ */
+const sleep = seconds =>
+  new Promise(resolve => {
+    setTimeout(resolve, seconds * 1000);
+  });
+
+/** .
+ * .
+ * .
+ * Uiltity function to create and save a CSV file from a buffer
+ *
+ * @param {*} data
+ * @param {*} filename
+ * @example
+ */
+const saveToCSV = (data, filename = 'recordedMLSignal.csv') => {
+  // console.log(data)
+  let csvContent = 'data:text/csv;charset=utf-8,';
+
+  data.forEach((val, idx) => {
+    csvContent += `${idx},${val}\r\n`;
+  });
+  const encodedUri = encodeURI(csvContent);
+  const link = document.createElement('a');
+  link.setAttribute('href', encodedUri);
+  link.setAttribute('download', filename);
+  document.body.appendChild(link);
+  link.click();
+};
+
+const saveToJSON = (data, filename = 'recordedMLSignal.json') => {
+  const jsonData = JSON.stringify(data, null, 2);
+  const blob = new Blob([jsonData], { type: 'application/json' });
+  const url = URL.createObjectURL(blob);
+  const link = document.createElement('a');
+  link.setAttribute('href', url);
+  link.setAttribute('download', filename);
+  document.body.appendChild(link);
+  link.click();
+  URL.revokeObjectURL(url);
+};
+
+
+/** .
+ * .
+ * .
+ * Utility function to create a buffer from a CSV file
+ *
+ * @param {*} csvString
+ * @param {*} delimiter
+ * @returns
+ * @example
+ */
+const csvToArray = (csvString, delimiter = ',') =>
+  csvString
+    .trim()
+    .split('\n')
+    .map(row => parseFloat(row.trim().split(delimiter)[1]));
+
+const findMinValue = (array) => {
+  let minValue = array[0];
+  for (let i = 1; i < array.length; i++) {
+      if (array[i] < minValue) {
+          minValue = array[i];
+      }
+  }
+  return minValue;
+};
+
+const findMaxValue = (array) => {
+  let maxValue = array[0];
+  for (let i = 1; i < array.length; i++) {
+      if (array[i] > maxValue) {
+          maxValue = array[i];
+      }
+  }
+  return maxValue;
+};
+
+export const getCurrentTimeString = () => {
+  const date = new Date();
+
+  // Get the date string in the user's locale
+  const dateOptions = {
+    year: "numeric",
+    month: "long",
+    day: "numeric",
+    timeZoneName: "longOffset",
+    hour: "numeric",
+    minute: "numeric",
+  };
+  const dateString = date.toLocaleDateString(undefined, dateOptions);
+
+  return dateString.replace("at ", "");
+};
+
+const standardDeviation = (values) => {
+  const avg = average(values);
+
+  const squareDiffs = values.map((value) => {
+    const diff = value - avg;
+    const sqrDiff = diff * diff;
+    return sqrDiff;
+  });
+
+  const avgSquareDiff = average(squareDiffs);
+
+  const stdDev = Math.sqrt(avgSquareDiff);
+  // only 1 digit after the decimal place
+  const std = Math.round(stdDev * 10) / 10;
+  return std.toFixed(1);
+};
+
+const average = (data) => {
+  const sum = data.reduce((sum, value) => {
+    return sum + value;
+  }, 0);
+
+  const avg = sum / data.length;
+  return avg;
+};
+
+function interpolate(x, x0, x1, y0, y1) {
+  return y0 + (y1 - y0) * (x - x0) / (x1 - x0);
+}
+
+export const formatLineBreak =(inputStr,checkInternetConnection) => {
+  let finalStr = inputStr
+  .replace(/\n/g, '<br>')
+  .replace('LLL',
+    `<a href="#" id="check-connection">${checkInternetConnection}</a>`);
+  
+  console.log(finalStr);
+
+  return finalStr;
+}
+
+
+  
+export const createAndShowPopup = (lang, phrases) => {
+  console.log(`
+    <div style="text-align: left;"> 
+    ${convertAsterisksToList(phrases.RC_NeedInternetConnectedPhone[lang].replace(/\n/g, '<br>'))}
+    </div>
+      <div class="col-3" style="margin-top:10px;">
+        <button id="okaybtn" class="btn btn-lg btn-dark">
+          ${phrases.EE_ok[lang]}
+        </button>
+      </div>`);
+  Swal.fire({
+    html: `
+    <div style="text-align: left;"> 
+    ${convertAsterisksToList(phrases.RC_NeedInternetConnectedPhone[lang].replace(/\n/g, '<br>'))}
+    </div>
+      <div class="col-3" style="margin-top:10px;">
+        <button id="okaybtn" class="btn btn-lg btn-dark">
+          ${phrases.EE_ok[lang]}
+        </button>
+      </div>`,
+    showConfirmButton: false,
+    position: 'bottom',
+    width: "40%",
+    customClass: {
+      container:'no-background',
+    },
+    showClass: {
+      popup: "fade-in",
+    },
+    hideClass: {
+      popup: "",
+    },
+    didOpen: () => {
+      const okayBtn = document.getElementById("okaybtn");
+      okayBtn.style.display = "flex"; 
+      okayBtn.addEventListener('click', () => {
+        Swal.close(); // Close the Swal popup
+      });
+    }
+  });
+};
+
+export function convertAsterisksToList(content) {
+  // Replace * with <li> and convert line breaks to </li><li>
+  console.log(content);
+  let result = content
+      .replace(/\* (.*?)(<br>|$)/g, '<li>$1</li>')
+      .replace(/(<li>)(<\/li>)\s*$/, '') // Remove trailing </li>
+      .replace('<li>', '<ul style="padding-left:40px"> <br> <li>');
+  result = result.replace('</li>5', '</li></ul>5');
+  return result;
+}
+
+export const reorderMLS = (mlsSignal, preSec, sourceSamplingRate) => {
+  // Number of samples to move
+  const numSamplesToMove = Math.round(preSec * sourceSamplingRate);
+  if (numSamplesToMove <= 0 || numSamplesToMove >= mlsSignal.length) {
+    // Nothing to reorder, return original
+    return mlsSignal;
+  }
+  const lastPart = mlsSignal.slice(-numSamplesToMove);
+  const firstPart = mlsSignal.slice(0, mlsSignal.length - numSamplesToMove);
+  return lastPart.concat(firstPart);
+}
+
+export {sleep, saveToCSV, saveToJSON, csvToArray,findMinValue,findMaxValue, standardDeviation, interpolate};

package/webpack.config.js

@@ -1,65 +1,65 @@
-const path = require('path');
-const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer');
-
-const config = {
-  entry: {
-    main: './src/main.js',
-    listener: './src/listener-app/listener.js',
-    phonePeer: './src/listener-app/PhonePeer.js',
-  },
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: '[name].js',
-    library: {
-      name: 'speakerCalibrator',
-      type: 'umd',
-    },
-  },
-  module: {
-    rules: [
-      {
-        // If you have .mjs files, use test: /\.m?js$/,
-        test: /\.js$/,
-        exclude: /node_modules/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            // You can also move this config into a separate .babelrc or babel.config.js file
-            presets: [
-              [
-                '@babel/preset-env',
-                {
-                  // Adjust your target browsers as needed
-                  targets: {
-                    ios: '12',
-                  },
-                  // This config tells Babel to automatically include necessary polyfills
-                  // for features you use, referencing core-js where needed
-                  useBuiltIns: 'usage',
-                  corejs: '3',
-                },
-              ],
-            ],
-          },
-        },
-      },
-      {
-        test: /\.css$/,
-        use: ['style-loader', 'css-loader'],
-      },
-    ],
-  },
-  plugins: [],
-  resolve: {
-    fallback: {
-      path: require.resolve('path-browserify'),
-      fs: false,
-    },
-  },
-};
-
-if (process.env.WEBPACK_ANALYZE === 'true') {
-  config.plugins.push(new BundleAnalyzerPlugin());
-}
-
-module.exports = config;
+const path = require('path');
+const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer');
+
+const config = {
+  entry: {
+    main: './src/main.js',
+    listener: './src/listener-app/listener.js',
+    phonePeer: './src/listener-app/PhonePeer.js',
+  },
+  output: {
+    path: path.resolve(__dirname, 'dist'),
+    filename: '[name].js',
+    library: {
+      name: 'speakerCalibrator',
+      type: 'umd',
+    },
+  },
+  module: {
+    rules: [
+      {
+        // If you have .mjs files, use test: /\.m?js$/,
+        test: /\.js$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            // You can also move this config into a separate .babelrc or babel.config.js file
+            presets: [
+              [
+                '@babel/preset-env',
+                {
+                  // Adjust your target browsers as needed
+                  targets: {
+                    ios: '12',
+                  },
+                  // This config tells Babel to automatically include necessary polyfills
+                  // for features you use, referencing core-js where needed
+                  useBuiltIns: 'usage',
+                  corejs: '3',
+                },
+              ],
+            ],
+          },
+        },
+      },
+      {
+        test: /\.css$/,
+        use: ['style-loader', 'css-loader'],
+      },
+    ],
+  },
+  plugins: [],
+  resolve: {
+    fallback: {
+      path: require.resolve('path-browserify'),
+      fs: false,
+    },
+  },
+};
+
+if (process.env.WEBPACK_ANALYZE === 'true') {
+  config.plugins.push(new BundleAnalyzerPlugin());
+}
+
+module.exports = config;

package/.github/workflows/update-phrases.yml

@@ -1,37 +0,0 @@
-name: Update International Phrases
-
-on: workflow_dispatch
-
-jobs:
-  phrases:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-      - name: Set commit account information
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-      - name: Installs
-        run: |
-          npm install
-      - name: Decrypt credentials
-        run: |
-          gpg --quiet --batch --yes --passphrase="${{secrets.google_api_pw}}" \
-          --output dist/example/credentials.json \
-          --decrypt dist/example/credentials.json.gpg
-      - name: Fetch and update phrases
-        run: |
-          npm run phrases
-      - name: Remove credentials
-        run: |
-          rm dist/example/credentials.json
-      - name: Commit and push changes
-        run: |
-          git status
-          git add -A
-          git commit -m 'github action: update phrases' --no-verify
-          git remote set-url origin https://x-access-token:${{secrets.ci_token}}@github.com/EasyEyes/speaker-calibration
-          git push

package/makefile

@@ -1,74 +0,0 @@
-##################################### UTILITIES ######################################
-COM_COLOR   = \033[0;34m
-OBJ_COLOR   = \033[0;36m
-OK_COLOR    = \033[0;32m
-ERROR_COLOR = \033[0;31m
-WARN_COLOR  = \033[0;33m
-NO_COLOR    = \033[m
-
-OK_STRING    = "[OK]"
-ERROR_STRING = "[ERROR]"
-WARN_STRING  = "[WARNING]"
-COM_STRING   = "Compiling..."
-
-define run_and_test
-printf "%b" "$(COM_COLOR)$(COM_STRING) $(OBJ_COLOR)$(@F)$(NO_COLOR)\r"; \
-$(1) 2> $@.log; \
-RESULT=$$?; \
-if [ $$RESULT -ne 0 ]; then \
-  printf "%-60b%b" "$(COM_COLOR)$(COM_STRING)$(OBJ_COLOR) $@" "$(ERROR_COLOR)$(ERROR_STRING)$(NO_COLOR)\n"   ; \
-elif [ -s $@.log ]; then \
-  printf "%-60b%b" "$(COM_COLOR)$(COM_STRING)$(OBJ_COLOR) $@" "$(WARN_COLOR)$(WARN_STRING)$(NO_COLOR)\n"   ; \
-else  \
-  printf "%-60b%b" "$(COM_COLOR)$(COM_STRING)$(OBJ_COLOR) $(@F)" "$(OK_COLOR)$(OK_STRING)$(NO_COLOR)\n"   ; \
-fi; \
-cat $@.log; \
-rm -f $@.log; \
-exit $$RESULT
-endef
-
-##################################### WASM ########################################
-PROJECT_NAME = mlsGen
-
-# directories
-DIST_DIR = ./dist/
-SRC_DIR = $(addprefix ./src/tasks/impulse-response/,$(PROJECT_NAME)/)
-
-# WASM files
-SRC_FILE := $(addprefix $(SRC_DIR),$(PROJECT_NAME).cpp) # SRC_DIR + PROJECT_NAME + .cpp
-OBJ_FILE := $(addprefix $(SRC_DIR),$(PROJECT_NAME).o)
-OUTPUT_WASM_JS := $(addprefix $(DIST_DIR),$(PROJECT_NAME).js) # DIST_DIR + PROJECT_NAME + .js
-OUTPUT_WASM := $(addprefix $(DIST_DIR),$(PROJECT_NAME).wasm) # DIST_DIR + PROJECT_NAME + .wasm
-OUTPUT := $(addprefix $(DIST_DIR),$(PROJECT_NAME).*) # DIST_DIR + PROJECT_NAME + .*
-
-# emcc compiler options
-EMCC = em++ # emcc compiler front end
-STD = --std=c++17 # C++ standard
-OPTIMIZE = -O3 # Optimization level O0 ~ 28.8 kB, O1 ~ 20.3 kB, O2 ~ 20.3 kB, O3 ~ 19.7 kB
-ENV = -s ENVIRONMENT='web' # environment
-NOENTRY = --no-entry # no entry point (no main function)
-MODULARIZE = -s MODULARIZE=1 -s 'EXPORT_NAME="createMLSGenModule"' # puts all of the generated JavaScript into a factory function
-BIND = -lembind # links against embind library
-MEMORY_CHECKS = -s ASSERTIONS=1 -fsanitize=address -g2 
-
-# gcc compiler options
-GCC = gcc # gcc compiler front end
-
-# KISSFFT Library
-KISS_LIB= /Users/hugo/Desktop/dev/easyeyes/speaker-calibration/src/tasks/impulse-response/kissfft/libkissfft-float.a
-KISS_H= -I /Users/hugo/Desktop/dev/easyeyes/speaker-calibration/src/tasks/impulse-response/kissfft/
-
-# build the WASM + JS glue module, linked with embind
-$(PROJECT_NAME)_bind: # $(OBJ_FILE)
-	@mkdir -p $(@D)
-	@$(call run_and_test, $(EMCC) $(STD) $(BIND) $(SRC_FILE) -o $(OUTPUT_WASM_JS) $(MODULARIZE) $(OPTIMIZE) $(ENV) $(MEMORY_CHECKS) $(KISS_H) $(KISS_LIB))
-
-# clean the WASM + JS files
-.PHONY: clean
-clean:
-	@mkdir -p $(@D)
-	@$(call run_and_test, rm -f $(OUTPUT))
-
-.PHONY: rebuild
-rebuild:
-	@make clean; make $(PROJECT_NAME)_bind