@live-change/framework 0.9.105 → 0.9.107

package/lib/App.js

@@ -632,20 +632,28 @@ class App {
   }
 
   async cachedTask(taskDescription, expireAfter, task) {
-    const taskDescriptionHash = crypto.createHash('sha256').update(taskDescription).digest('hex')
+    /// Parse expireAfter in format "10s", "1m", "1h", "1d"
+    const expireAfterMs = utils.parseDuration(expireAfter)    
+    const utf8 = new TextEncoder().encode(JSON.stringify(taskDescription))
+    const taskDescriptionHashBinary = await crypto.subtle.digest('SHA-256', utf8)
+    const taskDescriptionHash = Array.from(new Uint8Array(taskDescriptionHashBinary))
+      .map(b => b.toString(16).padStart(2, '0')).join('')
+    //console.log("taskDescriptionHash", taskDescriptionHash)
     let cacheEntry = await this.dao.get(['database', 'tableObject', this.databaseName, 'cache', taskDescriptionHash])
-    if(!cacheEntry || cacheEntry.createdAt < new Date(Date.now() - expireAfter).toISOString()) {
+    if(!cacheEntry || cacheEntry.createdAt < new Date(Date.now() - expireAfterMs).toISOString()) {
+      //console.log("cache miss", taskDescription)
       const result = await task()
-      const expiresAt = new Date(Date.now() + expireAfter).toISOString()
+      const expiresAt = new Date(Date.now() + expireAfterMs).toISOString()
       cacheEntry = {
         id: taskDescriptionHash,
         createdAt: new Date().toISOString(),
-        expiresAt: expiresAt > cacheEntry.expiresAt ? expiresAt : cacheEntry.expiresAt,
+        expiresAt,
         result
       }
       await this.dao.request(['database', 'put'], this.databaseName, 'cache', cacheEntry)
     } else { // extend cache entry expiration
-      const newExpiresAt = new Date(new Date(cacheEntry.createdAt).getTime() + expireAfter).toISOString()
+      //console.log("cache hit", taskDescription)
+      const newExpiresAt = new Date(new Date(cacheEntry.createdAt).getTime() + expireAfterMs).toISOString()
       if(cacheEntry.expiresAt < newExpiresAt) {
         cacheEntry.expiresAt = newExpiresAt
         await this.dao.request(['database', 'put'], this.databaseName, 'cache', cacheEntry)
@@ -654,6 +662,32 @@ class App {
     return cacheEntry.result
   }
 
+  async cacheGet(taskDescription, expireAfter) {
+    const expireAfterMs = utils.parseDuration(expireAfter)
+    const utf8 = new TextEncoder().encode(JSON.stringify(taskDescription))
+    const taskDescriptionHashBinary = await crypto.subtle.digest('SHA-256', utf8)
+    const taskDescriptionHash = Array.from(new Uint8Array(taskDescriptionHashBinary))
+      .map(b => b.toString(16).padStart(2, '0')).join('')
+    const cacheEntry = await this.dao.get(['database', 'tableObject', this.databaseName, 'cache', taskDescriptionHash])
+    if(!cacheEntry || cacheEntry.createdAt < new Date(Date.now() - expireAfterMs).toISOString()) {
+      return null
+    }
+    return cacheEntry.result
+  }
+
+  async cachePut(taskDescription, result) {
+    const utf8 = new TextEncoder().encode(JSON.stringify(taskDescription))
+    const taskDescriptionHashBinary = await crypto.subtle.digest('SHA-256', utf8)
+    const taskDescriptionHash = Array.from(new Uint8Array(taskDescriptionHashBinary))
+      .map(b => b.toString(16).padStart(2, '0')).join('')
+    const cacheEntry = {
+      id: taskDescriptionHash,
+      createdAt: new Date().toISOString(),
+      result
+    }
+    await this.dao.request(['database', 'put'], this.databaseName, 'cache', cacheEntry)
+  }
+
 }
 
 export default App

package/lib/definition/ModelDefinition.ts

@@ -10,8 +10,16 @@ export interface ModelIndexDefinitionSpecification {
   multi?: boolean,
 }
 
+export type ValidationConfig = string | {
+  name: string,
+  [key: string]: any
+}
+
 export interface ModelPropertyDefinitionSpecification {
   type?: any,
+  default?: ((...args: any[]) => any) | any,
+  updated?: (...args: any[]) => any,
+  validation?: ValidationConfig[],
   index?: ModelIndexDefinitionSpecification
 }
 

package/lib/runtime/LiveDao.js

@@ -31,12 +31,16 @@ class LiveDao extends LcDao.DaoProxy {
 
   computeCredentials() {
     let credentials = JSON.parse(JSON.stringify(this.initialCredentials))
+    const keys = Object.keys(credentials).filter(key => key.endsWith("Key"))
     for(const credentialsObserver of this.credentialsObservations) {
       credentials = {
         ...credentials,
         ...credentialsObserver.credentials,
         roles: [...credentials.roles, ...(credentialsObserver.credentials.roles || [])]
       }
+    }    
+    for(const key of keys) {
+      delete credentials[key]
     }
     return credentials
   }

package/lib/utils.js

@@ -229,7 +229,6 @@ function prefixRange({ gt, lt, gte, lte, limit, reverse }, prefix, from = "") {
     if(id.length > from.length) {
       if(id.slice(0, from.length) !== from) {
         console.error("ID:", id, "does not start with", from)
-        console.trace('id does not match prefix')
         throw new Error("id does not match prefix")
       }
       id = id.slice(from.length)
@@ -354,3 +353,16 @@ export {
   prefixRange, rangeProperties, fieldListToFieldsObject,
   encodeIdentifier, extractRange, isomorphic, computeDefaults, computeUpdates
 }
+
+export function parseDuration(duration) {
+  if(typeof duration === 'number') return duration
+  const match = duration.match(/(\d+)([smhd])/g)
+  if(!match || match.length === 0) throw new Error(`Invalid duration: ${duration}`)
+  let result = 0
+  for(const m of match) {
+    const value = parseInt(m.slice(0, -1))
+    const unit = m.slice(-1)
+    result += value * { s: 1000, m: 60000, h: 3600000, d: 86400000 }[unit]
+  }
+  return result
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.9.105",
+  "version": "0.9.107",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {
@@ -22,11 +22,11 @@
   },
   "homepage": "https://github.com/live-change/live-change-stack",
   "devDependencies": {
-    "@live-change/dao": "^0.9.105",
-    "@live-change/uid": "^0.9.105",
+    "@live-change/dao": "^0.9.107",
+    "@live-change/uid": "^0.9.107",
     "typedoc": "0.28.3",
     "typedoc-plugin-markdown": "^4.6.3",
     "typedoc-plugin-rename-defaults": "^0.7.3"
   },
-  "gitHead": "e96d52126ea0b5af39ecf6d4ea5120c0ec58346d"
+  "gitHead": "c546be0c12841aa8eca060d4c53d6d89bac2d088"
 }