@live-change/session-service 0.9.209 → 0.9.213

package/authenticator.js

@@ -6,29 +6,60 @@ import { createHmac } from 'crypto'
 const config = definition.config
 
 definition.authenticator({
+  name: 'session',
   async prepareCredentials(credentials) {
+    const startedAt = Date.now()
     const sessionKey = credentials.sessionKey
-    if(!sessionKey) throw new Error("sessionKey required!")
-    const sessions = await app.dao.get(
-        ['database', 'indexRange', app.databaseName, Session.tableName + '_byKey', {
-          gt: `"${sessionKey}"_`,
-          lt: `"${sessionKey}"_\xFF`
-        }])
-    //console.log("FOUND SESSIONS", sessions)
-    let session = sessions[0]?.to
-    if(!session) {
-      if(config.createSessionOnUpdate) {
-        session = createHmac('sha256', config.sessionHmacSecret || 'secret')
-            .update(credentials.sessionKey)
-            .digest('base64').slice(0, 32).replace(/\//g, '_').replace(/\+/g, '-')
-      } else {
-        const createResult = await app.triggerService({ service: definition.name, type: "createSessionKeyIfNotExists" }, {
-          sessionKey
+    const sessionKeyPrefix = sessionKey && typeof sessionKey === 'string'
+      ? sessionKey.slice(0, 8) + '…'
+      : undefined
+    let session = null
+    let path = null
+    try {
+      if(!config.createSessionOnUpdate) {
+        if(!sessionKey) throw new Error("sessionKey required!")
+        const sessions = await app.dao.get(
+            ['database', 'indexRange', app.databaseName, Session.tableName + '_byKey', {
+              gt: `"${sessionKey}"_`,
+              lt: `"${sessionKey}"_\xFF`
+            }])
+        //console.log("FOUND SESSIONS", sessions)
+        session = sessions[0]?.to
+        path = session ? 'lookup' : null
+      }
+      if(!session) {
+        if(config.createSessionOnUpdate) {
+          session = createHmac('sha256', config.sessionHmacSecret || 'secret')
+              .update(credentials.sessionKey)
+              .digest('base64').slice(0, 32).replace(/\//g, '_').replace(/\+/g, '-')
+          path = 'hmac'
+        } else {
+          const createResult = await app.triggerService({ service: definition.name, type: "createSessionKeyIfNotExists" }, {
+            sessionKey
+          })
+          //console.log("CREATE SESSION RESULT", createResult)
+          session = createResult.session
+          path = 'create'
+        }
+      }
+      credentials.session = session
+      const ms = Date.now() - startedAt
+      if(ms > 200 || process.env.DEBUG_AUTH === '1' || process.env.DEBUG_AUTH === 'true') {
+        console.log('[auth] prepareCredentials session done', {
+          sessionKeyPrefix,
+          session,
+          ms,
+          path
         })
-        //console.log("CREATE SESSION RESULT", createResult)
-        session = createResult.session
       }
+    } catch(error) {
+      console.error('[auth] prepareCredentials session error', {
+        sessionKeyPrefix,
+        ms: Date.now() - startedAt,
+        path,
+        error
+      })
+      throw error
     }
-    credentials.session = session
   }
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/session-service",
-  "version": "0.9.209",
+  "version": "0.9.213",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,9 +22,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.9.209",
-    "@live-change/relations-plugin": "^0.9.209",
+    "@live-change/framework": "^0.9.213",
+    "@live-change/relations-plugin": "^0.9.213",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "e1f934934d5d8a119f7ed27aa97bc6b9e9791719"
+  "gitHead": "1e22d761822df56c327242bccb3d7aed57631146"
 }

package/sessionItem.js

@@ -3,6 +3,7 @@ import App from '@live-change/framework'
 import {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition
 } from '@live-change/framework'
+import { fireChangeTriggers, extractObjectData } from '@live-change/relations-plugin'
 import { Session } from "./model.js"
 
 import pluralize from 'pluralize'
@@ -24,6 +25,7 @@ definition.processor(function(service, app) {
 
       const config = model.sessionItem
       const writeableProperties = modelProperties || config.writableProperties
+      const objectType = service.name + '_' + modelName
 
       console.log("SESSION ITEM", model)
 
@@ -97,7 +99,7 @@ definition.processor(function(service, app) {
           },
           //queuedBy: (command) => command.client.session,
           waitForEvents: true,
-          async execute(properties, { client, service }, emit) {
+          async execute(properties, { client, service, trigger }, emit) {
             const id = properties[modelPropertyName] || app.generateUid()
             const entity = await modelRuntime().get(id)
             if(entity) throw app.logicError("exists")
@@ -110,6 +112,11 @@ definition.processor(function(service, app) {
             const data = App.utils.mergeDeep({},
               App.computeDefaults(model, properties, { client, service }), newObject)
             await App.validation.validate(data, validators, validationContext)
+            const identifiers = { session: client.session }
+            await fireChangeTriggers({
+              service, modelName, app, objectType, object: id,
+              identifiers, oldData: null, data, trigger
+            })
             emit({
               type: eventName,
               [modelPropertyName]: id,
@@ -141,7 +148,7 @@ definition.processor(function(service, app) {
           skipValidation: true,
           queuedBy: (command) => command.client.session,
           waitForEvents: true,
-          async execute(properties, { client, service }, emit) {
+          async execute(properties, { client, service, trigger }, emit) {
             const entity = await modelRuntime().get(properties[modelPropertyName])
             if(!entity) throw app.logicError("not_found")
             if(entity.session != client.session) throw app.logicError("not_authorized")
@@ -155,6 +162,14 @@ definition.processor(function(service, app) {
             const data = App.utils.mergeDeep({}, updateObject, computedUpdates)
             const merged = App.utils.mergeDeep({}, entity, data)
             await App.validation.validate({ ...merged, [modelPropertyName]: entity.id }, validators, validationContext)
+            const identifiers = { session: client.session }
+            await fireChangeTriggers({
+              service, modelName, app, objectType, object: entity.id,
+              identifiers,
+              oldData: extractObjectData(writeableProperties, entity, {}),
+              data,
+              trigger
+            })
             emit({
               type: eventName,
               [modelPropertyName]: entity.id,
@@ -183,10 +198,18 @@ definition.processor(function(service, app) {
           },
           queuedBy: (command) => command.client.session,
           waitForEvents: true,
-          async execute(properties, { client, service }, emit) {
+          async execute(properties, { client, service, trigger }, emit) {
             const entity = await modelRuntime().get(properties[modelPropertyName])
             if(!entity) throw app.logicError("not_found")
             if(entity.session != client.session) throw app.logicError("not_authorized")
+            const identifiers = { session: client.session }
+            await fireChangeTriggers({
+              service, modelName, app, objectType, object: entity.id,
+              identifiers,
+              oldData: extractObjectData(writeableProperties, entity, {}),
+              data: null,
+              trigger
+            })
             emit({
               type: eventName,
               [modelPropertyName]: entity.id,

package/sessionProperty.js

@@ -1,6 +1,7 @@
 import definition from './definition.js'
 import App from '@live-change/framework'
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
+import { fireChangeTriggers, extractObjectData } from '@live-change/relations-plugin'
 import { Session } from "./model.js"
 
 definition.processor(function(service, app) {
@@ -21,6 +22,7 @@ definition.processor(function(service, app) {
 
       const config = model.sessionProperty
       const writeableProperties = modelProperties || config.writableProperties
+      const objectType = service.name + '_' + modelName
 
       if(model.propertyOf) throw new Error("model " + modelName + " already have owner")
       model.propertyOf = {
@@ -69,7 +71,7 @@ definition.processor(function(service, app) {
           skipValidation: true,
           queuedBy: (command) => command.client.session,
           waitForEvents: true,
-          async execute(properties, {client, service}, emit) {
+          async execute(properties, { client, service, trigger }, emit) {
             let newObject = {}
             for(const propertyName of writeableProperties) {
               if(properties.hasOwnProperty(propertyName)) {
@@ -79,6 +81,12 @@ definition.processor(function(service, app) {
             const data = App.utils.mergeDeep({},
               App.computeDefaults(model, properties, { client, service } ), newObject)
             await App.validation.validate(data, validators, validationContext)
+            const id = client.session
+            const identifiers = { session: client.session }
+            await fireChangeTriggers({
+              service, modelName, app, objectType, object: id,
+              identifiers, oldData: null, data, trigger
+            })
             emit({
               type: eventName,
               identifiers: {
@@ -105,7 +113,7 @@ definition.processor(function(service, app) {
           skipValidation: true,
           queuedBy: (command) => command.client.session,
           waitForEvents: true,
-          async execute(properties, { client, service }, emit) {
+          async execute(properties, { client, service, trigger }, emit) {
             const entity = await modelRuntime().get(client.session)
             if(!entity) throw app.logicError("not_found")
             let updateObject = {}
@@ -119,6 +127,15 @@ definition.processor(function(service, app) {
             const merged = App.utils.mergeDeep({}, entity, data)
             await App.validation.validate({ session: client.session, ...merged }, validators,
               validationContext)
+            const id = client.session
+            const identifiers = { session: client.session }
+            await fireChangeTriggers({
+              service, modelName, app, objectType, object: id,
+              identifiers,
+              oldData: extractObjectData(writeableProperties, entity, {}),
+              data,
+              trigger
+            })
             emit({
               type: eventName,
               identifiers: {
@@ -141,9 +158,18 @@ definition.processor(function(service, app) {
           access: config.sessionResetAccess || config.sessionWriteAccess,
           queuedBy: (command) => command.client.session,
           waitForEvents: true,
-          async execute(properties, {client, service}, emit) {
+          async execute(properties, { client, service, trigger }, emit) {
             const entity = await modelRuntime().indexObjectGet('bySession', client.session)
             if (!entity) throw app.logicError("not_found")
+            const id = client.session
+            const identifiers = { session: client.session }
+            await fireChangeTriggers({
+              service, modelName, app, objectType, object: id,
+              identifiers,
+              oldData: extractObjectData(writeableProperties, entity, {}),
+              data: null,
+              trigger
+            })
             emit({
               type: eventName,
               identifiers: {