fix(async-storage): proper errors on windows

Author: krizzu

packages/async-storage/src/AsyncStorageError.ts

@@ -38,6 +38,11 @@ export class AsyncStorageError extends Error {
   }
 
   static nativeError(e: unknown): AsyncStorageError {
+    // do not override own error
+    if(e instanceof AsyncStorageError) {
+      throw e
+    }
+
     const error = getNativeError(e);
     if (!error) {
       return new AsyncStorageError(

packages/async-storage/src/createAsyncStorage.windows.ts

@@ -50,12 +50,7 @@ class LegacyAsyncStorageImpl implements AsyncStorage {
         this.db.multiGet([key], (errors, result) => {
           const error = this.getError(errors);
           if (error) {
-            return reject(
-              AsyncStorageError.jsError(
-                error.message,
-                AsyncStorageError.Type.OtherStorageError
-              )
-            );
+            return reject(error);
           }
           resolve(result?.[0]?.[1] ?? null);
         });
@@ -71,12 +66,7 @@ class LegacyAsyncStorageImpl implements AsyncStorage {
         this.db.multiSet([[key, value]], (errors) => {
           const error = this.getError(errors);
           if (error) {
-            return reject(
-              AsyncStorageError.jsError(
-                error.message,
-                AsyncStorageError.Type.OtherStorageError
-              )
-            );
+            return reject(error);
           }
           resolve();
         });
@@ -92,12 +82,7 @@ class LegacyAsyncStorageImpl implements AsyncStorage {
         this.db.multiRemove([key], (errors) => {
           const error = this.getError(errors);
           if (error) {
-            return reject(
-              AsyncStorageError.jsError(
-                error.message,
-                AsyncStorageError.Type.OtherStorageError
-              )
-            );
+            return reject(error);
           }
           resolve();
         });
@@ -113,12 +98,7 @@ class LegacyAsyncStorageImpl implements AsyncStorage {
         this.db.multiGet(keys, (errors, result) => {
           const error = this.getError(errors);
           if (error) {
-            return reject(
-              AsyncStorageError.jsError(
-                error.message,
-                AsyncStorageError.Type.OtherStorageError
-              )
-            );
+            return reject(error);
           }
           const resultMap = new Map(result);
           const entries: Record<string, string | null> = {};
@@ -139,12 +119,7 @@ class LegacyAsyncStorageImpl implements AsyncStorage {
         this.db.multiSet(Object.entries(entries), (errors) => {
           const error = this.getError(errors);
           if (error) {
-            return reject(
-              AsyncStorageError.jsError(
-                error.message,
-                AsyncStorageError.Type.OtherStorageError
-              )
-            );
+            return reject(error);
           }
           resolve();
         });
@@ -160,12 +135,7 @@ class LegacyAsyncStorageImpl implements AsyncStorage {
         this.db.multiRemove(keys, (errors) => {
           const error = this.getError(errors);
           if (error) {
-            return reject(
-              AsyncStorageError.jsError(
-                error.message,
-                AsyncStorageError.Type.OtherStorageError
-              )
-            );
+            return reject(error);
           }
           resolve();
         });
@@ -181,12 +151,7 @@ class LegacyAsyncStorageImpl implements AsyncStorage {
         this.db.getAllKeys((errors, result) => {
           const error = this.getError(errors);
           if (error) {
-            return reject(
-              AsyncStorageError.jsError(
-                error.message,
-                AsyncStorageError.Type.OtherStorageError
-              )
-            );
+            return reject(error);
           }
           if (!result) {
             return reject(
@@ -211,12 +176,7 @@ class LegacyAsyncStorageImpl implements AsyncStorage {
         this.db.clear((errors) => {
           const error = this.getError(errors);
           if (error) {
-            return reject(
-              AsyncStorageError.jsError(
-                error.message,
-                AsyncStorageError.Type.OtherStorageError
-              )
-            );
+            return reject(error);
           }
           resolve();
         });

packages/async-storage/windows/code/DBStorage.cpp

@@ -595,5 +595,13 @@ void WriteValue(const winrt::IJSValueWriter &writer, const DBStorage::Error &val
 {
     writer.WriteObjectBegin();
     winrt::WriteProperty(writer, L"message", value.Message);
+    winrt::WriteProperty(writer, L"code", "AsyncStorageError"); // from AsyncStorageError.Type
+
+    writer.WritePropertyName(L"userInfo");
+    writer.WriteObjectBegin();
+    writer.WritePropertyName(L"type");
+    writer.WriteString(L"OtherException"); // make sure all Windows errors are treated as "OtherSqliteError"
+    writer.WriteObjectEnd();
+
     writer.WriteObjectEnd();
 }