make the util worker be bundled with parcel

.gitignore

@@ -44,3 +44,5 @@ yarn-error.log
 
 playwright.config.js
 *.js.map
+ts/node/**/*.d.ts
+ts/node/**/*.d.ts.map

package.json

@@ -13,6 +13,15 @@
     "url": "https://github.com/oxen-io/session-desktop.git"
   },
   "main": "ts/mains/main_node.js",
+  "targets": {
+    "util-worker": {
+      "source": "ts/webworker/workers/util.worker.ts",
+      "distDir": "./ts/webworker/workers/",
+      "optimize" : false,
+      "sourceMap": false,
+      "context": "web-worker"
+    }
+  },
   "scripts": {
     "postinstall": "yarn patch-package && yarn electron-builder install-app-deps",
     "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
@@ -33,13 +42,14 @@
     "test": "mocha --globals=Worker -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\" ",
     "lint-full": "yarn format-full && eslint . && tslint --format stylish --project .",
     "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"",
-    "transpile": "tsc",
+    "transpile": "tsc && yarn parcel-util-worker",
     "transpile:watch": "yarn grunt --force; tsc -w",
     "integration-test": "npx playwright test",
     "clean-transpile": "rimraf 'ts/**/*.js' 'ts/*.js' 'ts/*.js.map' 'ts/**/*.js.map' && rimraf tsconfig.tsbuildinfo;",
     "ready": "yarn grunt && yarn lint-full && yarn test",
     "sedtoAppImage": "sed -i 's/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/\"target\": \"AppImage\"/g' package.json",
-    "sedtoDeb": "sed -i 's/\"target\": \"AppImage\"/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/g' package.json"
+    "sedtoDeb": "sed -i 's/\"target\": \"AppImage\"/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/g' package.json",
+    "parcel-util-worker": "rimraf ts/webworker/workers/util.worker.js; parcel build --target util-worker --no-autoinstall --no-cache"
   },
   "dependencies": {
     "@reduxjs/toolkit": "^1.4.0",
@@ -159,10 +169,12 @@
     "@types/styled-components": "^5.1.4",
     "@types/uuid": "3.4.4",
     "asar": "0.14.0",
+    "buffer": "^6.0.3",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-bytes": "^0.1.2",
     "cross-env": "^6.0.3",
+    "crypto-browserify": "^3.12.0",
     "electron": "^17.1.2",
     "electron-builder": "22.8.0",
     "electron-notarize": "^0.2.0",
@@ -173,6 +185,7 @@
     "eslint-plugin-import": "2.8.0",
     "eslint-plugin-mocha": "4.12.1",
     "eslint-plugin-more": "0.3.1",
+    "events": "^3.3.0",
     "grunt": "1.0.1",
     "grunt-cli": "1.2.0",
     "grunt-contrib-concat": "1.0.1",
@@ -189,12 +202,16 @@
     "node-gyp": "3.8.0",
     "node-loader": "^2.0.0",
     "node-sass-import-once": "1.2.0",
+    "parcel": "^2.4.1",
     "patch-package": "^6.4.7",
+    "path-browserify": "^1.0.1",
     "playwright": "^1.16.3",
     "postinstall-prepare": "^1.0.1",
     "prettier": "1.19.0",
+    "process": "^0.11.10",
     "run-script-os": "^1.1.6",
     "sinon": "9.0.2",
+    "stream-browserify": "^3.0.0",
     "ts-loader": "^9.2.8",
     "ts-mock-imports": "^1.3.0",
     "tslint": "5.19.0",

ts/models/conversation.ts

@@ -1741,7 +1741,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 }
 
-const trotthledAllConversationsDispatch = _.throttle(() => {
+const trotthledAllConversationsDispatch = _.debounce(() => {
   if (updatesToDispatch.size === 0) {
     return;
   }

ts/models/message.ts

@@ -1313,13 +1313,13 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
   }
 }
 
-const trotthledAllMessagesDispatch = _.throttle(() => {
+const trotthledAllMessagesDispatch = _.debounce(() => {
   if (updatesToDispatch.size === 0) {
     return;
   }
   window.inboxStore?.dispatch(messagesChanged([...updatesToDispatch.values()]));
   updatesToDispatch.clear();
-}, 1000);
+}, 2000);
 
 const updatesToDispatch: Map<string, MessageModelPropsWithoutConvoProps> = new Map();
 export class MessageCollection extends Backbone.Collection<MessageModel> {}

ts/node/encrypt_attachment_buffer.ts

@@ -2,9 +2,10 @@ import { getSodiumNode } from './sodiumNode';
 
 export async function decryptAttachmentBufferNode(
   encryptingKey: Uint8Array,
-  bufferIn: ArrayBuffer
+  bufferIn: ArrayBuffer,
+  getSodiumOverride?: () => Promise<any>
 ) {
-  const sodium = await getSodiumNode();
+  const sodium = getSodiumOverride ? await getSodiumOverride() : await getSodiumNode();
 
   const header = new Uint8Array(
     bufferIn.slice(0, sodium.crypto_secretstream_xchacha20poly1305_HEADERBYTES)
@@ -33,9 +34,10 @@ export async function decryptAttachmentBufferNode(
 
 export async function encryptAttachmentBufferNode(
   encryptingKey: Uint8Array,
-  bufferIn: ArrayBuffer
+  bufferIn: ArrayBuffer,
+  getSodiumOverride?: () => Promise<any>
 ) {
-  const sodium = await getSodiumNode();
+  const sodium = getSodiumOverride ? await getSodiumOverride() : await getSodiumNode();
 
   try {
     const uintArrayIn = new Uint8Array(bufferIn);

ts/node/tsconfig.json

@@ -1,3 +0,0 @@
-{
-  "extends": "../tsconfig.json"
-}

ts/webworker/workers/util.worker.ts

@@ -3,8 +3,8 @@ import { generateKeyPair, sharedKey, verify } from 'curve25519-js';
 import { default as sodiumWrappers } from 'libsodium-wrappers-sumo';
 import _ from 'lodash';
 import {
-  decryptAttachmentBufferNode,
-  encryptAttachmentBufferNode,
+  decryptAttachmentBufferNode as realDecryptAttachmentBufferNode,
+  encryptAttachmentBufferNode as realEncryptAttachmentBufferNode,
 } from '../../node/encrypt_attachment_buffer';
 
 /* eslint-disable no-console */
@@ -62,6 +62,14 @@ function arrayBufferToStringBase64(arrayBuffer: ArrayBuffer) {
   return ByteBuffer.wrap(arrayBuffer).toString('base64');
 }
 
+async function encryptAttachmentBufferNode(encryptingKey: Uint8Array, bufferIn: ArrayBuffer) {
+  return realEncryptAttachmentBufferNode(encryptingKey, bufferIn, getSodiumWorker);
+}
+
+async function decryptAttachmentBufferNode(encryptingKey: Uint8Array, bufferIn: ArrayBuffer) {
+  return realDecryptAttachmentBufferNode(encryptingKey, bufferIn, getSodiumWorker);
+}
+
 function fromBase64ToArrayBuffer(base64Str: string) {
   return ByteBuffer.wrap(base64Str, 'base64').toArrayBuffer();
 }