aws-classify-server 0.1.5 → 0.1.7

package/lib/cjs/ClassifyServerless.js

@@ -16,6 +16,7 @@ const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const client_apigatewaymanagementapi_1 = require("@aws-sdk/client-apigatewaymanagementapi");
 const ddbClient = new client_dynamodb_1.DynamoDBClient({ region: process.env.DD_REGION, endpoint: process.env.DD_ENDPOINT });
 const ddbDocClient = lib_dynamodb_1.DynamoDBDocument.from(ddbClient);
+const updateDebounceInterval = 1000 * 60 * 10; // Don't update session unless 10 minutes have passed or data changed
 class ClassifyServerless {
     constructor() {
         this.logLevel = {};
@@ -82,13 +83,16 @@ class ClassifyServerless {
                 // Instantiate the class
                 const obj = new classDef.serverClass();
                 // Retrieve session data from DynamoDB base on sessionId in request
+                let orignalSessionData = "";
                 const result = yield getSessionData(sessionId, request.interfaceName);
                 if (!result)
                     sessionId = context.awsRequestId;
                 else {
                     const sessionData = result[`interface_${request.interfaceName}`];
-                    if (sessionData) // Enrich it with session data
-                        Object.assign(obj, (0, js_freeze_dry_1.deserialize)(sessionData, classes));
+                    if (sessionData) { // Enrich it with session data
+                        orignalSessionData = (0, js_freeze_dry_1.deserialize)(sessionData, classes);
+                        Object.assign(obj, orignalSessionData);
+                    }
                 }
                 obj.__sessionId__ = sessionId;
                 obj.__connectionId__ = result === null || result === void 0 ? void 0 : result.connectionId;
@@ -109,7 +113,7 @@ class ClassifyServerless {
                     return (0, js_freeze_dry_1.serialize)(lambdaResponse, classes);
                 }
                 const updatedSessionData = (0, js_freeze_dry_1.serialize)(obj, classes);
-                if (!result || updatedSessionData !== result.sessionData)
+                if (!result || updatedSessionData !== orignalSessionData || (Date.now() > (result.updated + updateDebounceInterval)))
                     sessionId = yield saveSessionData(sessionId, request.interfaceName, updatedSessionData, undefined, obj.__userId__, this.expirationMinutes);
                 // Formulate response
                 const lambdaResponse = {
@@ -242,7 +246,7 @@ class ClassifyServerless {
                 this.log(`creating response for ${interfaceName} with sessionId=${sessionId} connectionId= ${obj.__connectionId__} sessionData=${sessionData}`);
             const ret = yield callback(obj);
             const updatedSessionData = (0, js_freeze_dry_1.serialize)(obj, classes);
-            if (updatedSessionData !== result.sessionData || Math.floor(Date.now() / 1000 / 60) !== result.expires / 60) {
+            if (updatedSessionData !== sessionData || (Date.now() > (result.updated + updateDebounceInterval))) {
                 if (this.logLevel.calls)
                     this.log(`saving session data for ${interfaceName} with sessionId=${sessionId} connectionId= ${obj.__connectionId__} sessionData=${updatedSessionData}`);
                 yield saveSessionData(sessionId, interfaceName, updatedSessionData, undefined, undefined, this.expirationMinutes);
@@ -338,7 +342,7 @@ function saveSessionData(sessionId, interfaceName, sessionData, connectionId, us
             const expires = new Date();
             expires.setMinutes(expires.getMinutes() + expirationMinutes);
             updateExpressionComponents.push('expires = :expires');
-            expressionAttributeValues[':expires'] = expires.getTime() / 1000;
+            expressionAttributeValues[':expires'] = Math.floor(expires.getTime() / 1000);
         }
         if (sessionData && interfaceName) {
             updateExpressionComponents.push(`interface_${interfaceName} = :data`);

package/lib/esm/ClassifyServerless.js

@@ -13,6 +13,7 @@ import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
 import { ApiGatewayManagementApiClient, PostToConnectionCommand } from "@aws-sdk/client-apigatewaymanagementapi";
 const ddbClient = new DynamoDBClient({ region: process.env.DD_REGION, endpoint: process.env.DD_ENDPOINT });
 const ddbDocClient = DynamoDBDocument.from(ddbClient);
+const updateDebounceInterval = 1000 * 60 * 10; // Don't update session unless 10 minutes have passed or data changed
 export class ClassifyServerless {
     constructor() {
         this.logLevel = {};
@@ -79,13 +80,16 @@ export class ClassifyServerless {
                 // Instantiate the class
                 const obj = new classDef.serverClass();
                 // Retrieve session data from DynamoDB base on sessionId in request
+                let orignalSessionData = "";
                 const result = yield getSessionData(sessionId, request.interfaceName);
                 if (!result)
                     sessionId = context.awsRequestId;
                 else {
                     const sessionData = result[`interface_${request.interfaceName}`];
-                    if (sessionData) // Enrich it with session data
-                        Object.assign(obj, deserialize(sessionData, classes));
+                    if (sessionData) { // Enrich it with session data
+                        orignalSessionData = deserialize(sessionData, classes);
+                        Object.assign(obj, orignalSessionData);
+                    }
                 }
                 obj.__sessionId__ = sessionId;
                 obj.__connectionId__ = result === null || result === void 0 ? void 0 : result.connectionId;
@@ -106,7 +110,7 @@ export class ClassifyServerless {
                     return serialize(lambdaResponse, classes);
                 }
                 const updatedSessionData = serialize(obj, classes);
-                if (!result || updatedSessionData !== result.sessionData)
+                if (!result || updatedSessionData !== orignalSessionData || (Date.now() > (result.updated + updateDebounceInterval)))
                     sessionId = yield saveSessionData(sessionId, request.interfaceName, updatedSessionData, undefined, obj.__userId__, this.expirationMinutes);
                 // Formulate response
                 const lambdaResponse = {
@@ -239,7 +243,7 @@ export class ClassifyServerless {
                 this.log(`creating response for ${interfaceName} with sessionId=${sessionId} connectionId= ${obj.__connectionId__} sessionData=${sessionData}`);
             const ret = yield callback(obj);
             const updatedSessionData = serialize(obj, classes);
-            if (updatedSessionData !== result.sessionData || Math.floor(Date.now() / 1000 / 60) !== result.expires / 60) {
+            if (updatedSessionData !== sessionData || (Date.now() > (result.updated + updateDebounceInterval))) {
                 if (this.logLevel.calls)
                     this.log(`saving session data for ${interfaceName} with sessionId=${sessionId} connectionId= ${obj.__connectionId__} sessionData=${updatedSessionData}`);
                 yield saveSessionData(sessionId, interfaceName, updatedSessionData, undefined, undefined, this.expirationMinutes);
@@ -333,7 +337,7 @@ export function saveSessionData(sessionId, interfaceName, sessionData, connectio
             const expires = new Date();
             expires.setMinutes(expires.getMinutes() + expirationMinutes);
             updateExpressionComponents.push('expires = :expires');
-            expressionAttributeValues[':expires'] = expires.getTime() / 1000;
+            expressionAttributeValues[':expires'] = Math.floor(expires.getTime() / 1000);
         }
         if (sessionData && interfaceName) {
             updateExpressionComponents.push(`interface_${interfaceName} = :data`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-classify-server",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
   "types": "./lib/esm/index.d.ts",

package/yml/resources-dynamodb-stream.yml

@@ -0,0 +1,24 @@
+Resources:
+  AWSClassifySessionTable:
+    Type: AWS::DynamoDB::Table
+    Properties:
+      TableName: classifySessionStore.${self:custom.domainName}
+      BillingMode: PAY_PER_REQUEST
+      AttributeDefinitions:
+        - AttributeName: sessionId
+          AttributeType: S
+        - AttributeName: userId
+          AttributeType: S
+      KeySchema:
+        - AttributeName: sessionId
+          KeyType: HASH
+      TimeToLiveSpecification:
+        AttributeName: expires
+        Enabled: true
+      GlobalSecondaryIndexes:
+      - IndexName: userId
+        KeySchema:
+          - AttributeName: userId
+            KeyType: HASH
+        Projection:
+          ProjectionType: KEYS_ONLY

package/yml/resources-dynamodb.yml

@@ -23,4 +23,4 @@ Resources:
         Projection:
           ProjectionType: KEYS_ONLY
       StreamSpecification:
-        StreamViewType: ${self:custom.SessionStreamViewType, 'NEW_IMAGE'}
+        StreamViewType: ${self:custom.SessionStreamViewType, 'NEW_AND_OLD_IMAGES'}