@live-change/db-web 0.9.227 → 0.9.228

package/lib/dbDao.js

@@ -1,9 +1,18 @@
 import ReactiveDao from "@live-change/dao"
 
-function getDatabaseStorageStats(server, dbName) {
+function observableFromAsync(fn) {
+  const obs = new ReactiveDao.ObservableValue(undefined)
+  Promise.resolve().then(() => fn()).then(
+    value => obs.set(value),
+    error => obs.error(error)
+  )
+  return obs
+}
+
+async function getDatabaseStorageStats(server, dbName) {
   const db = server.databases.get(dbName)
   if(!db) throw new Error('databaseNotFound')
-  const stats = db.storageStats()
+  const stats = await db.storageStats()
   return {
     env: { available: false },
     stores: stats.stores,
@@ -12,7 +21,7 @@ function getDatabaseStorageStats(server, dbName) {
   }
 }
 
-function getTableStorageStats(server, dbName, tableName) {
+async function getTableStorageStats(server, dbName, tableName) {
   const db = server.databases.get(dbName)
   if(!db) throw new Error('databaseNotFound')
   const table = db.table(tableName)
@@ -20,7 +29,7 @@ function getTableStorageStats(server, dbName, tableName) {
   return table.storeStats()
 }
 
-function getIndexStorageStats(server, dbName, indexName) {
+async function getIndexStorageStats(server, dbName, indexName) {
   const db = server.databases.get(dbName)
   if(!db) throw new Error('databaseNotFound')
   const config = db.config.indexes[indexName]
@@ -28,7 +37,7 @@ function getIndexStorageStats(server, dbName, indexName) {
   return db.storageStatsForConfig('index', indexName, config)
 }
 
-function getLogStorageStats(server, dbName, logName) {
+async function getLogStorageStats(server, dbName, logName) {
   const db = server.databases.get(dbName)
   if(!db) throw new Error('databaseNotFound')
   const log = db.log(logName)
@@ -761,43 +770,25 @@ function localReads(server, scriptContext) {
       }
     },
     databaseStorageStats: {
-      observable: (dbName) => {
-        try {
-          return new ReactiveDao.ObservableValue(getDatabaseStorageStats(server, dbName))
-        } catch(e) {
-          return new ReactiveDao.ObservableError(e.message || e)
-        }
-      },
+      observable: (dbName) => observableFromAsync(() => getDatabaseStorageStats(server, dbName)),
       get: async (dbName) => getDatabaseStorageStats(server, dbName)
     },
     tableStorageStats: {
-      observable: (dbName, tableName) => {
-        try {
-          return new ReactiveDao.ObservableValue(getTableStorageStats(server, dbName, tableName))
-        } catch(e) {
-          return new ReactiveDao.ObservableError(e.message || e)
-        }
-      },
+      observable: (dbName, tableName) => observableFromAsync(
+        () => getTableStorageStats(server, dbName, tableName)
+      ),
       get: async (dbName, tableName) => getTableStorageStats(server, dbName, tableName)
     },
     indexStorageStats: {
-      observable: (dbName, indexName) => {
-        try {
-          return new ReactiveDao.ObservableValue(getIndexStorageStats(server, dbName, indexName))
-        } catch(e) {
-          return new ReactiveDao.ObservableError(e.message || e)
-        }
-      },
+      observable: (dbName, indexName) => observableFromAsync(
+        () => getIndexStorageStats(server, dbName, indexName)
+      ),
       get: async (dbName, indexName) => getIndexStorageStats(server, dbName, indexName)
     },
     logStorageStats: {
-      observable: (dbName, logName) => {
-        try {
-          return new ReactiveDao.ObservableValue(getLogStorageStats(server, dbName, logName))
-        } catch(e) {
-          return new ReactiveDao.ObservableError(e.message || e)
-        }
-      },
+      observable: (dbName, logName) => observableFromAsync(
+        () => getLogStorageStats(server, dbName, logName)
+      ),
       get: async (dbName, logName) => getLogStorageStats(server, dbName, logName)
     },
     query: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db-web",
-  "version": "0.9.227",
+  "version": "0.9.228",
   "author": {
     "email": "michal@laszczewski.com",
     "name": "Michał Łaszczewski",
@@ -29,12 +29,12 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/dao": "^0.9.227",
-    "@live-change/db": "^0.9.227",
-    "@live-change/db-store-indexeddb": "^0.9.227",
-    "@live-change/db-store-localstorage": "^0.9.227",
-    "@live-change/db-store-rbtree": "^0.9.227",
+    "@live-change/dao": "^0.9.228",
+    "@live-change/db": "^0.9.228",
+    "@live-change/db-store-indexeddb": "^0.9.228",
+    "@live-change/db-store-localstorage": "^0.9.228",
+    "@live-change/db-store-rbtree": "^0.9.228",
     "debug": "^4.3.4"
   },
-  "gitHead": "7d4dc92dcb9a50381292dded7d8766a3cadbecf9"
+  "gitHead": "fd47aa55100c5a25c3f52c899a79a663421037ff"
 }