From 6431182ec30d8d390df9af0860115719d2df9c3e Mon Sep 17 00:00:00 2001
From: fyears <hjwdhjwd@gmail.com>
Date: Wed, 3 Nov 2021 00:15:23 +0800
Subject: [PATCH] promisify data

---
 src/encrypt.ts | 43 ++++++++++++++++++++++++-------------------
 src/s3.ts      |  4 ++--
 src/sync.ts    |  4 ++--
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/encrypt.ts b/src/encrypt.ts
index 529c8ae..ae070a6 100644
--- a/src/encrypt.ts
+++ b/src/encrypt.ts
@@ -1,16 +1,17 @@
-import * as crypto from "crypto";
+import { randomBytes, pbkdf2, createDecipheriv, createCipheriv } from "crypto";
+import { promisify } from "util";
 import * as base32 from "hi-base32";
 import { bufferToArrayBuffer, arrayBufferToBuffer } from "./misc";
 
 const DEFAULT_ITER = 10000;
 
-export const encryptBuffer = (
+export const encryptBuffer = async (
   buf: Buffer,
   password: string,
   rounds: number = DEFAULT_ITER
 ) => {
-  const salt = crypto.randomBytes(8);
-  const derivedKey = crypto.pbkdf2Sync(
+  const salt = await promisify(randomBytes)(8);
+  const derivedKey = await promisify(pbkdf2)(
     password,
     salt,
     rounds,
@@ -19,7 +20,7 @@ export const encryptBuffer = (
   );
   const key = derivedKey.slice(0, 32);
   const iv = derivedKey.slice(32, 32 + 16);
-  const cipher = crypto.createCipheriv("aes-256-cbc", key, iv);
+  const cipher = createCipheriv("aes-256-cbc", key, iv);
   cipher.write(buf);
   cipher.end();
   const encrypted = cipher.read();
@@ -27,14 +28,14 @@ export const encryptBuffer = (
   return res;
 };
 
-export const decryptBuffer = (
+export const decryptBuffer = async (
   buf: Buffer,
   password: string,
   rounds: number = DEFAULT_ITER
 ) => {
   const prefix = buf.slice(0, 8);
   const salt = buf.slice(8, 16);
-  const derivedKey = crypto.pbkdf2Sync(
+  const derivedKey = await promisify(pbkdf2)(
     password,
     salt,
     rounds,
@@ -43,49 +44,53 @@ export const decryptBuffer = (
   );
   const key = derivedKey.slice(0, 32);
   const iv = derivedKey.slice(32, 32 + 16);
-  const decipher = crypto.createDecipheriv("aes-256-cbc", key, iv);
+  const decipher = createDecipheriv("aes-256-cbc", key, iv);
   decipher.write(buf.slice(16));
   decipher.end();
   const decrypted = decipher.read();
   return decrypted as Buffer;
 };
 
-export const encryptArrayBuffer = (
+export const encryptArrayBuffer = async (
   arrBuf: ArrayBuffer,
   password: string,
   rounds: number = DEFAULT_ITER
 ) => {
   return bufferToArrayBuffer(
-    encryptBuffer(arrayBufferToBuffer(arrBuf), password, rounds)
+    await encryptBuffer(arrayBufferToBuffer(arrBuf), password, rounds)
   );
 };
 
-export const decryptArrayBuffer = (
+export const decryptArrayBuffer = async (
   arrBuf: ArrayBuffer,
   password: string,
   rounds: number = DEFAULT_ITER
 ) => {
   return bufferToArrayBuffer(
-    decryptBuffer(arrayBufferToBuffer(arrBuf), password, rounds)
+    await decryptBuffer(arrayBufferToBuffer(arrBuf), password, rounds)
   );
 };
 
-export const encryptStringToBase32 = (
+export const encryptStringToBase32 = async (
   text: string,
   password: string,
   rounds: number = DEFAULT_ITER
 ) => {
-  return base32.encode(encryptBuffer(Buffer.from(text), password, rounds));
+  return base32.encode(
+    await encryptBuffer(Buffer.from(text), password, rounds)
+  );
 };
 
-export const decryptBase32ToString = (
+export const decryptBase32ToString = async (
   text: string,
   password: string,
   rounds: number = DEFAULT_ITER
 ) => {
-  return decryptBuffer(
-    Buffer.from(base32.decode.asBytes(text)),
-    password,
-    rounds
+  return (
+    await decryptBuffer(
+      Buffer.from(base32.decode.asBytes(text)),
+      password,
+      rounds
+    )
   ).toString();
 };
diff --git a/src/s3.ts b/src/s3.ts
index 7e78716..e26e986 100644
--- a/src/s3.ts
+++ b/src/s3.ts
@@ -109,7 +109,7 @@ export const uploadToRemote = async (
     const localContent = await vault.adapter.readBinary(fileOrFolderPath);
     let remoteContent = localContent;
     if (password !== "") {
-      remoteContent = encryptArrayBuffer(localContent, password);
+      remoteContent = await encryptArrayBuffer(localContent, password);
     }
     const body = arrayBufferToBuffer(remoteContent);
     await s3Client.send(
@@ -214,7 +214,7 @@ export const downloadFromRemote = async (
     );
     let localContent = remoteContent;
     if (password !== "") {
-      localContent = decryptArrayBuffer(remoteContent, password);
+      localContent = await decryptArrayBuffer(remoteContent, password);
     }
     await vault.adapter.writeBinary(fileOrFolderPath, localContent, {
       mtime: mtime,
diff --git a/src/sync.ts b/src/sync.ts
index 09b9da9..ad2b64d 100644
--- a/src/sync.ts
+++ b/src/sync.ts
@@ -62,7 +62,7 @@ export const ensembleMixedStates = async (
       const remoteEncryptedKey = entry.Key;
       let key = remoteEncryptedKey;
       if (password !== "") {
-        key = decryptBase32ToString(remoteEncryptedKey, password);
+        key = await decryptBase32ToString(remoteEncryptedKey, password);
       }
       const backwardMapping = await getSyncMetaMappingByRemoteKeyS3(
         db,
@@ -299,7 +299,7 @@ export const doActualSync = async (
       if (password !== "") {
         remoteEncryptedKey = state.remote_encrypted_key;
         if (remoteEncryptedKey === undefined || remoteEncryptedKey === "") {
-          remoteEncryptedKey = encryptStringToBase32(key, password);
+          remoteEncryptedKey = await encryptStringToBase32(key, password);
         }
       }