fix: adjust notifyHandler

Author: michelonsouza

README.md

@@ -32,7 +32,7 @@ Using the [`crypto-js`](https://github.com/brix/crypto-js) library as an encrypt
       - [*setItem*](#setitem)
       - [*setMultipleItems*](#setmultipleitems)
       - [*getItem*](#getitem)
-      - [*getMultipleItems*](#getmultipleites)
+      - [*getMultipleItems*](#getmultipleitems)
       - [*removeItem*](#removeitem)
       - [*getItemFromPattern*](#getitemfrompattern)
       - [*removeItemFromPattern*](#removeitemfrompattern)
@@ -355,8 +355,8 @@ const value = {
   user: {
     id: '123456',
     name: 'John Doe'
-    'any-key': undefined,
-  }
+  },
+  'any-key': undefined,
 }
 ```
 

src/encrypt-storage.ts

@@ -17,6 +17,8 @@ export class EncryptStorage implements EncryptStorageInterface {
 
   readonly #prefix: string;
 
+  #multiple = false;
+
   readonly #stateManagementUse: boolean;
 
   readonly #doNotEncryptValues: boolean;
@@ -81,7 +83,7 @@ export class EncryptStorage implements EncryptStorageInterface {
 
     this.storage?.setItem(storageKey, encryptedValue);
 
-    if (this.#notifyHandler) {
+    if (this.#notifyHandler && !this.#multiple) {
       this.#notifyHandler({
         type: 'set',
         key,
@@ -94,9 +96,24 @@ export class EncryptStorage implements EncryptStorageInterface {
     param: [string, any][],
     doNotEncrypt?: boolean,
   ): void {
+    this.#multiple = true;
     param.forEach(([key, value]) => {
       this.setItem(key, value, doNotEncrypt);
     });
+
+    if (this.#notifyHandler) {
+      const keys = param.map(([key]) => key);
+      const values = param.map(([_, value]) =>
+        typeof value === 'object' ? JSON.stringify(value) : String(value),
+      );
+      this.#notifyHandler({
+        type: 'setMultiple',
+        key: keys,
+        value: values,
+      });
+
+      this.#multiple = false;
+    }
   }
 
   public getItem<T = any>(key: string, doNotDecrypt = false): T | undefined {
@@ -109,7 +126,7 @@ export class EncryptStorage implements EncryptStorageInterface {
         ? item
         : this.#encryptation.decrypt(item);
 
-      if (this.#stateManagementUse) {
+      if (this.#stateManagementUse && !this.#multiple) {
         if (this.#notifyHandler) {
           this.#notifyHandler({
             type: 'get',
@@ -159,12 +176,23 @@ export class EncryptStorage implements EncryptStorageInterface {
     keys: string[],
     doNotDecrypt?: boolean,
   ): Record<string, any> {
+    this.#multiple = true;
     const result = keys.reduce((accumulator: Record<string, any>, key) => {
       accumulator[key] = this.getItem(key, doNotDecrypt);
 
       return accumulator;
     }, {});
 
+    if (this.#notifyHandler) {
+      this.#notifyHandler({
+        type: 'getMultiple',
+        key: keys,
+        value: result,
+      });
+
+      this.#multiple = false;
+    }
+
     return result;
   }
 

src/experiments/test-1.ts

@@ -113,7 +113,9 @@ export const test1 = () =>
       const key1 = faker.random.word();
       const key2 = faker.random.word();
       const value1 = faker.random.word();
-      const value2 = faker.random.objectElement<Record<string, any>>();
+      const value2 = {
+        [faker.random.word()]: faker.random.alphaNumeric(),
+      };
 
       safeStorage.setMultipleItems([
         [key1, value1],

src/types.ts

@@ -2,7 +2,15 @@ export type EncAlgorithm = 'AES' | 'Rabbit' | 'RC4' | 'RC4Drop';
 
 type StorageType = 'localStorage' | 'sessionStorage';
 
-type ChangeType = 'set' | 'get' | 'remove' | 'clear' | 'length' | 'key';
+type ChangeType =
+  | 'set'
+  | 'get'
+  | 'getMultiple'
+  | 'setMultiple'
+  | 'remove'
+  | 'clear'
+  | 'length'
+  | 'key';
 
 export interface NotifyHandlerParams {
   type: ChangeType;