@rpcbase/client 0.98.0 → 0.100.0

package/auth/index.js

@@ -3,11 +3,13 @@ import debug from "debug"
 import {Platform} from "react-native"
 import isHexadecimal from "validator/lib/isHexadecimal"
 
+import storage from "../storage"
 import {disconnect as rts_disconnect} from "../rts"
 import post from "../helpers/post"
 
 import redirect_sign_in from "./helpers/redirect_sign_in"
 
+
 const LAST_TENANT_KEY = "rb.last_tenant_id"
 const uid_storage_key = (tenant_id) => `rb.${tenant_id}.user_id`
 
@@ -118,7 +120,7 @@ export const set_uid = (val) => {
 export const get_tenant_id = () => __tenant_id
 export const set_tenant_id = (val) => {
   __tenant_id = val
-  localStorage.setItem(LAST_TENANT_KEY, val)
+  storage.setItem(LAST_TENANT_KEY, val)
 }
 
 export const set_is_signed_in = (val) => __is_authenticated = val

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.98.0",
+  "version": "0.100.0",
   "scripts": {
     "build-firebase": "webpack -c firebase/webpack.config.js",
     "build": "yarn build-firebase",

package/storage/index.native.js

@@ -1,22 +1,29 @@
 /* @flow */
-import AsyncStorage from "@react-native-async-storage/async-storage"
+import {MMKV} from "react-native-mmkv"
+
+// TODO: add encryption key
+// https://github.com/mrousavy/react-native-mmkv#customize
+const mmkv = new MMKV
 
 const getStorage = () => {
   const storage = {
-    get: async(key) => {
+    getItem: (key) => {
       try {
-        const res = await AsyncStorage.getItem(key)
+        const res = mmkv.getString(key)
+        if (!res) return
         const val = JSON.parse(res)
         if (val) return val
       } catch (error) {
         // There was an error on the native side
+        console.log("storage.getItem error:", error)
       }
     },
-    set: async(key, value) => {
-      try {
-        await AsyncStorage.setItem(key, JSON.stringify(value))
-      } catch (error) {
-        // There was an error on the native side
+    setItem: (key, value) => {
+      if (value === null || typeof value === "undefined") {
+        mmkv.delete(key)
+        return
+      } else {
+        mmkv.set(key, JSON.stringify(value))
       }
     }
   }

package/storage/index.web.js

@@ -1,81 +1,21 @@
 /* @flow */
-const storeName = "store"
-const version = 1
-
-const getStorage = (
-  dbName = "rb-store"
-) => {
-  let __db
-
-  const openRequest = indexedDB.open(dbName, version)
-
-  // Handle the creation or upgrade of the database
-  openRequest.onupgradeneeded = (event) => {
-    const db = event.target.result
-    if (!db.objectStoreNames.contains(storeName)) {
-      db.createObjectStore(storeName, { keyPath: "key" })
-    }
-  }
-
-  // Handle errors when opening the database
-  openRequest.onerror = (event) => {
-    console.error("Error opening database:", event.target.errorCode)
-  }
-
-  openRequest.onsuccess = (event) => {
-    const db = event.target.result
-    __db = db
-  }
-
 
+const getStorage = () => {
   const storage = {
-    get: (key) => new Promise((resolve, reject) => {
-      const transaction = __db.transaction([storeName], "readonly")
-      const objectStore = transaction.objectStore(storeName)
-      const request = objectStore.get(key)
-
-      request.onsuccess = (event) => {
-        const obj = event.target.result?.obj
-        resolve(obj)
-      }
-
-      request.onerror = (event) => {
-        console.error("Error reading data:", event.target)
-        reject()
-      }
-
-    }),
-    set: (key, obj) => new Promise((resolve, reject) => {
-
-      const transaction = __db.transaction([storeName], "readwrite")
-      const objectStore = transaction.objectStore(storeName)
-      const request = objectStore.put({obj, key})
-
-      request.onsuccess = (event) => {
-        // console.log("Data written successfully:", event.target.result)
-        resolve()
-      }
-
-      request.onerror = (event) => {
-        // console.error("Error writing data:", event.target.errorCode)
-        console.log("ERRR", event.target)
-        reject()
-      }
-    }),
-    delete: (key) => new Promise((resolve, reject) => {
-      const transaction = __db.transaction([storeName], "readwrite")
-      const objectStore = transaction.objectStore(storeName)
-      const request = objectStore.delete(key)
-
-      request.onsuccess = (event) => {
-        resolve()
+    getItem: (key) => {
+      try {
+        const res = localStorage.getItem(key)
+        if (!res) return
+        const val = JSON.parse(res)
+        return val
+      } catch (error) {
+        // There was an error on the native side
+        console.log(error)
       }
-
-      request.onerror = (event) => {
-        console.error("Error deleting data:", event.target.errorCode)
-        reject()
-      }
-    }),
+    },
+    setItem: (key, value) => {
+      localStorage.setItem(key, JSON.stringify(value))
+    }
   }
 
   return storage