Remove class

laurent22 · Jul 8, 2024 · 17aa0fd · 17aa0fd
1 parent 71f0204
commit 17aa0fd
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 25 deletions.
diff --git a/packages/app-mobile/services/e2ee/NativeEncryption.react-native.ts b/packages/app-mobile/services/e2ee/NativeEncryption.react-native.ts
@@ -2,17 +2,18 @@ import { NativeEncryptionInterface } from '@joplin/lib/services/e2ee/types';
 import crypto from 'react-native-quick-crypto';
 import { HashAlgorithm } from 'react-native-quick-crypto/lib/typescript/keys';
 
-class NativeEncryption implements NativeEncryptionInterface {
-	public getCiphers(): string[] {
+const NativeEncryption: NativeEncryptionInterface = {
+
+	getCiphers: (): string[] => {
 		return crypto.getCiphers();
-	}
+	},
 
-	public getHashes(): string[] {
+	getHashes: (): string[] => {
 		return crypto.getHashes();
-	}
+	},
 
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- TODO: remove the type "any" here
-	public async randomBytes(size: number): Promise<Buffer | any> {
+	randomBytes: async (size: number): Promise<Buffer | any> => {
 		return new Promise((resolve, reject) => {
 			crypto.randomBytes(size, (error, result) => {
 				if (error) {
@@ -22,10 +23,10 @@ class NativeEncryption implements NativeEncryptionInterface {
 				}
 			});
 		});
-	}
+	},
 
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- TODO: remove the type "any" here
-	public async pbkdf2Raw(password: string, salt: Buffer, iterations: number, keylen: number, digest: string): Promise<Buffer | any> {
+	pbkdf2Raw: async (password: string, salt: Buffer, iterations: number, keylen: number, digest: string): Promise<Buffer | any> => {
 		const digestMap: { [key: string]: HashAlgorithm } = {
 			'sha1': 'SHA-1',
 			'sha224': 'SHA-224',
@@ -44,8 +45,7 @@ class NativeEncryption implements NativeEncryptionInterface {
 				}
 			});
 		});
-	}
-
-}
+	},
+};
 
 export default NativeEncryption;
diff --git a/packages/app-mobile/utils/shim-init-react.js b/packages/app-mobile/utils/shim-init-react.js
@@ -26,9 +26,7 @@ function shimInit() {
 	shim.Geolocation = GeolocationReact;
 	shim.sjclModule = require('@joplin/lib/vendor/sjcl-rn.js');
 
-	// copied from generated shim-init-node.js. Strange but works
-	const NativeEncryption = require('../services/e2ee/NativeEncryption.react-native');
-	shim.NativeEncryption = new NativeEncryption.default;
+	shim.NativeEncryption = require('../services/e2ee/NativeEncryption.react-native').default;
 
 	shim.fsDriver = () => {
 		if (!shim.fsDriver_) {

diff --git a/packages/lib/services/e2ee/NativeEncryption.node.ts b/packages/lib/services/e2ee/NativeEncryption.node.ts
@@ -2,21 +2,22 @@ import { NativeEncryptionInterface } from './types';
 import { promisify } from 'util';
 import crypto = require('crypto');
 
-class NativeEncryption implements NativeEncryptionInterface {
-	public getCiphers(): string[] {
+const NativeEncryption: NativeEncryptionInterface = {
+
+	getCiphers: (): string[] => {
 		return crypto.getCiphers();
-	}
+	},
 
-	public getHashes(): string[] {
+	getHashes: (): string[] => {
 		return crypto.getHashes();
-	}
+	},
 
-	public async randomBytes(size: number): Promise<Buffer> {
+	randomBytes: async (size: number): Promise<Buffer> => {
 		const randomBytesAsync = promisify(crypto.randomBytes);
 		return randomBytesAsync(size);
-	}
+	},
 
-	public async pbkdf2Raw(password: string, salt: Buffer, iterations: number, keylen: number, digest: string): Promise<Buffer> {
+	pbkdf2Raw: async (password: string, salt: Buffer, iterations: number, keylen: number, digest: string): Promise<Buffer> => {
 		const digestMap: { [key: string]: string } = {
 			'sha-1': 'sha1',
 			'sha-224': 'sha224',
@@ -29,7 +30,7 @@ class NativeEncryption implements NativeEncryptionInterface {
 
 		const pbkdf2Async = promisify(crypto.pbkdf2);
 		return pbkdf2Async(password, salt, iterations, keylen, digestAlgorithm);
-	}
-}
+	},
+};
 
 export default NativeEncryption;
diff --git a/packages/lib/shim-init-node.ts b/packages/lib/shim-init-node.ts
@@ -136,7 +136,7 @@ function shimInit(options: ShimInitOptions = null) {
 	shim.Geolocation = GeolocationNode;
 	shim.FormData = require('form-data');
 	shim.sjclModule = require('./vendor/sjcl.js');
-	shim.NativeEncryption = new NativeEncryption;
+	shim.NativeEncryption = NativeEncryption;
 	shim.electronBridge_ = options.electronBridge;
 
 	shim.fsDriver = () => {