Revert "Remove references to the webcrypto package since it is availa…

…ble natively in node 20" This reverts commit 5f04525.
TryQuiet · Sep 30, 2024 · 14f1730 · 14f1730
1 parent 5f04525
commit 14f1730
Show file tree

Hide file tree

Showing 26 changed files with 387 additions and 37 deletions.
diff --git a/packages/backend/jestSetup.js b/packages/backend/jestSetup.js
@@ -1,4 +1,5 @@
 import { setEngine, CryptoEngine } from 'pkijs'
+import { Crypto } from '@peculiar/webcrypto'
 
 const crypto = new Crypto()
 

diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -92,6 +92,7 @@
     "@nestjs/common": "^10.2.10",
     "@nestjs/core": "^10.2.10",
     "@nestjs/platform-express": "^10.2.10",
+    "@peculiar/webcrypto": "1.4.3",
     "@quiet/common": "^2.0.2-alpha.1",
     "@quiet/identity": "^2.0.2-alpha.2",
     "@quiet/logger": "^2.0.2-alpha.0",

diff --git a/packages/backend/src/backendManager.ts b/packages/backend/src/backendManager.ts
@@ -1,3 +1,4 @@
+import { Crypto } from '@peculiar/webcrypto'
 import { Command } from 'commander'
 import { NestFactory } from '@nestjs/core'
 import path from 'path'

diff --git a/packages/backend/src/nest/connections-manager/connections-manager.service.ts b/packages/backend/src/nest/connections-manager/connections-manager.service.ts
@@ -1,5 +1,6 @@
 import { peerIdFromKeys } from '@libp2p/peer-id'
 import { Inject, Injectable, OnModuleInit } from '@nestjs/common'
+import { Crypto } from '@peculiar/webcrypto'
 import { EventEmitter } from 'events'
 import fs from 'fs'
 import getPort from 'get-port'

diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
@@ -129,6 +129,7 @@
   },
   "dependencies": {
     "@electron/remote": "^2.0.10",
+    "@peculiar/webcrypto": "1.4.3",
     "@quiet/common": "^2.0.2-alpha.1",
     "@quiet/logger": "^2.0.2-alpha.0",
     "@quiet/types": "^2.0.2-alpha.1",

diff --git a/packages/desktop/src/main/main.ts b/packages/desktop/src/main/main.ts
@@ -7,6 +7,7 @@ import electronLocalshortcut from 'electron-localshortcut'
 import url from 'url'
 import { getPorts, ApplicationPorts, closeHangingBackendProcess } from './backendHelpers'
 import { setEngine, CryptoEngine } from 'pkijs'
+import { Crypto } from '@peculiar/webcrypto'
 import { createLogger } from './logger'
 import { fork, ChildProcess } from 'child_process'
 import { DESKTOP_DATA_DIR, DESKTOP_DEV_DATA_DIR, getFilesData } from '@quiet/common'

diff --git a/packages/desktop/src/shared/setupTests.ts b/packages/desktop/src/shared/setupTests.ts
@@ -1,4 +1,5 @@
 import { setEngine, CryptoEngine } from 'pkijs'
+import { Crypto } from '@peculiar/webcrypto'
 
 import { io } from 'socket.io-client'