@live-change/framework 0.9.87 → 0.9.88

package/lib/App.js

@@ -631,6 +631,29 @@ class App {
     return await view.get(params, { internal: true, roles: ['admin'] })
   }
 
+  async cachedTask(taskDescription, expireAfter, task) {
+    const taskDescriptionHash = crypto.createHash('sha256').update(taskDescription).digest('hex')
+    let cacheEntry = await this.dao.get(['database', 'tableObject', this.databaseName, 'cache', taskDescriptionHash])
+    if(!cacheEntry || cacheEntry.createdAt < new Date(Date.now() - expireAfter).toISOString()) {
+      const result = await task()
+      const expiresAt = new Date(Date.now() + expireAfter).toISOString()
+      cacheEntry = {
+        id: taskDescriptionHash,
+        createdAt: new Date().toISOString(),
+        expiresAt: expiresAt > cacheEntry.expiresAt ? expiresAt : cacheEntry.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()
+      if(cacheEntry.expiresAt < newExpiresAt) {
+        cacheEntry.expiresAt = newExpiresAt
+        await this.dao.request(['database', 'put'], this.databaseName, 'cache', cacheEntry)
+      }
+    }
+    return cacheEntry.result
+  }
+
 }
 
 export default App

package/lib/definition/ServiceDefinition.ts

@@ -11,15 +11,17 @@ import { crudChanges, definitionToJSON } from "../utils.js"
 
 function createModelProxy(definition, model) {
   return new Proxy(model, {
-    get(target, prop, receiver) {
-      const runtime  = definition._runtime
+    get(target, prop, receiver) {    
+      const runtime  = definition._runtime      
       if(runtime) {
         const modelRuntime = runtime.models[model.name]
         if(modelRuntime[prop]) {
           return Reflect.get(modelRuntime, prop, receiver)
         }
       }
-      return Reflect.get(target, prop, receiver)
+      const resutlt = Reflect.get(target, prop, receiver)
+      if(!resutlt) console.warn("Model runtime used before created", model.name)
+      return resutlt
     }
   })
 }

package/lib/updaters/database.js

@@ -10,6 +10,17 @@ async function update(changes, service, app, force) {
   const dao = app.dao
   const database = app.databaseName
 
+  if(!app.noCache) {
+    dao.request(['database', 'createTable'], database, 'cache').catch(e => 'ok')
+    dao.request(['database', 'createIndex'], database, 'cache_byTimestamp', `${
+      async (input, output) => {
+        await input.table('cache').onChange((obj, oldObj) => {
+          if(obj && !oldObj) output.change({ id: obj.expiresAt+'_'+obj.id, to: obj.id }, null)
+        })
+      }
+    }`, {}).catch(e => 'ok')
+  }
+
   if(!app.shortEvents) {
     dao.request(['database', 'createTable'], database, 'eventConsumers').catch(e => 'ok')
     dao.request(['database', 'createTable'], database, 'eventReports').catch(e => 'ok')
@@ -60,6 +71,28 @@ async function update(changes, service, app, force) {
     requestTimeout: 10 * 60 * 1000 // 10 minutes?
   }
 
+  async function doCreateIndexIfNotExists(indexName, functionCode, parameters, storage) {
+    try {
+      await dao.requestWithSettings(indexRequestSettings, ['database', 'createIndex'], database, indexName,
+        functionCode, parameters, storage)
+    } catch(e) {
+      if(e.message.includes("already exists")) {
+        const indexConfig = await dao.get(['database', 'indexConfig', database, indexName])
+        const requiredConfig = {
+          name: indexName,
+          functionCode,
+          parameters,
+          storage
+        }
+        const match = JSON.stringify(indexConfig) === JSON.stringify(requiredConfig)
+        if(!match) {
+          console('ERROR INDEX MATCH', indexConfig, requiredConfig, "MATCH", match)
+        }
+      }      
+      throw e
+    }
+  }
+
   async function createIndex(table, indexName, index) {
     if(table) {
       indexName = table + '_' + indexName
@@ -120,8 +153,7 @@ async function update(changes, service, app, force) {
         }
         const functionCode = `(${func})`
         ;(globalThis.compiledFunctionsCandidates = globalThis.compiledFunctionsCandidates || {})[functionCode] = func
-        await dao.requestWithSettings(indexRequestSettings, ['database', 'createIndex'], database, indexName,
-          functionCode, { properties, table, hash: index.hash }, index.storage ?? {})
+        await doCreateIndexIfNotExists(indexName, functionCode, { properties, table, hash: index.hash }, index.storage ?? {})
       } else {
         if(!table) throw new Error("only function indexes are possible without table")
         const properties = (Array.isArray(index.property) ? index.property : [index.property]).map(p => p.split('.'))
@@ -139,8 +171,7 @@ async function update(changes, service, app, force) {
         }
         const functionCode = `(${func})`
         ;(globalThis.compiledFunctionsCandidates = globalThis.compiledFunctionsCandidates || {})[functionCode] = func
-        await dao.requestWithSettings(indexRequestSettings, ['database', 'createIndex'], database, indexName,
-          functionCode, { properties, table, hash: index.hash }, index.storage ?? {})
+        await doCreateIndexIfNotExists(indexName, functionCode, { properties, table, hash: index.hash }, index.storage ?? {})
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.9.87",
+  "version": "0.9.88",
   "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.87",
-    "@live-change/uid": "^0.9.87",
+    "@live-change/dao": "^0.9.88",
+    "@live-change/uid": "^0.9.88",
     "typedoc": "0.28.3",
     "typedoc-plugin-markdown": "^4.6.3",
     "typedoc-plugin-rename-defaults": "^0.7.3"
   },
-  "gitHead": "7a7694ad2801b7ffa16f347aed441ca5f81ab5fd"
+  "gitHead": "c042d36f63a6cc50158c3b3385f7f21ea98b847d"
 }