Merge branch 'development' into dependabot/npm_and_yarn/lex-web-ui/nanoid-3.3.8

Author: atjohns

CHANGELOG.md

@@ -4,7 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.21.6] - 2024-09-20
+## [0.21.6] - 2025-01-23
+- Add heartbeat for streaming responses to prevent idle timeout of 10 mins
+
+## [0.21.6] - 2024-12-18
 - Updatae the Web UI to allow VPC integration with all Lambda functions. This requires your VPC to at a minimum be able to access S3, and additional optional functionality will require additional VPC endpoints to services.
 - Package updates to address vulnerabilities. 
 

build/Makefile

@@ -21,7 +21,7 @@ VPATH := $(OUT)
 
 # upload files to bootstrap bucket
 # NOTE: files uploaded with public read permissions
-upload: upload-templates upload-custom-resources-zip upload-src-zip upload-layers \
+upload: upload-templates upload-custom-resources-zip upload-src-zip \
 	upload-response-card-image upload-initiate-chat-lambda upload-streaming-lambda upload-qbusiness-lambda
 .PHONY: upload
 
@@ -37,15 +37,8 @@ upload-templates: $(TEMPLATES) | $(OUT)
 	aws s3 sync --acl public-read --exclude "*" --include "*.yaml" \
 		"$(TEMPLATES_DIR)" "s3://$(BOOTSTRAP_BUCKET_PATH)/templates/" \
 		| tee "$(OUT)/$(@)"
-	aws s3 cp "$(TEMPLATES_DIR)"/layers.zip \
-		"s3://${BOOTSTRAP_BUCKET_PATH}/layers.zip"
 	@echo "[INFO] master template: https://s3.amazonaws.com/$(BOOTSTRAP_BUCKET_PATH)/templates/master.yaml"
 
-LAMBDA_LAYER_ZIP := $(TEMPLATES_DIR)/layers.zip
-
-upload-layers:
-	@echo "[INFO] Uploading lambda layer"
-	aws s3 cp --acl public-read "$(LAMBDA_LAYER_ZIP)" "s3://${BOOTSTRAP_BUCKET_PATH}/layers.zip"
 
 # cfn custom resource lambda files are found under this directory
 CUSTOM_RESOURCES_DIR := $(TEMPLATES_DIR)/custom-resources

build/update-lex-web-ui-config.js

@@ -147,7 +147,9 @@ const lexV2BotLocaleVoices = {
   'CONNECT_START_LIVE_CHAT_ICON',
   'CONNECT_END_LIVE_CHAT_LABEL',
   'CONNECT_END_LIVE_CHAT_ICON',
+  'CONNECT_END_LIVE_CHAT_UTTERANCE',
   'CONNECT_TRANSCRIPT_MESSAGE_DELAY_IN_MSEC',
+  'CONNECT_TRANSCRIPT_REDACT_REGEX',
   'APP_DOMAIN_NAME',
   'UI_TOOLBAR_TITLE',
   'UI_TOOLBAR_LOGO',

config/base.env.js

@@ -23,7 +23,9 @@ module.exports = {
     chatEndedMessage: process.env.CONNECT_CHAT_ENDED_MESSAGE,
     attachChatTranscript: process.env.CONNECT_ATTACH_CHAT_TRANSCRIPT,
     liveChatTerms: process.env.CONNECT_LIVE_CHAT_TERMS,
+    endLiveChatUtterance: process.env.CONNECT_END_LIVE_CHAT_UTTERANCE,
     transcriptMessageDelayInMsec: process.env.CONNECT_TRANSCRIPT_MESSAGE_DELAY_IN_MSEC,
+    transcriptRedactRegex: process.env.CONNECT_TRANSCRIPT_REDACT_REGEX,
   },
   lex: {
     v2BotId: process.env.V2_BOT_ID,

config/env.mk

@@ -36,7 +36,9 @@ export CONNECT_START_LIVE_CHAT_LABEL ?= $()
 export CONNECT_START_LIVE_CHAT_ICON ?= $()
 export CONNECT_END_LIVE_CHAT_LABEL ?= $()
 export CONNECT_END_LIVE_CHAT_ICON ?= $()
+export CONNECT_END_LIVE_CHAT_UTTERANCE ?= $()
 export CONNECT_TRANSCRIPT_MESSAGE_DELAY_IN_MSEC ?= $()
+export CONNECT_TRANSCRIPT_REDACT_REGEX ?= $()
 export BOT_INITIAL_TEXT ?= $()
 export BOT_INITIAL_SPEECH ?= $()
 export BOT_INITIAL_UTTERANCE ?= $()

config/utils/merge-config.js

@@ -33,6 +33,8 @@ module.exports = function mergeConfig(baseConfig, srcConfig) {
             key=== 'initialText' ||
             key=== 'avatarImageUrl' ||
             key=== 'toolbarLogo' ||
+            key=== 'streamingWebSocketEndpoint' ||
+            key=== 'streamingDynamoDbTable' ||
             !isEmpty(srcConfig[key]) ) {
             value = (typeof (baseConfig[key]) === 'object') ?
                 // recursively merge sub-objects in both directions

dist/index.html

@@ -14,7 +14,7 @@
         font-src 'self' fonts.gstatic.com; 
         upgrade-insecure-requests;">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
-    <title>LexWebUi Demo</title>
+    <title>LexWebUi</title>
     <!-- empty favicon to avoid 404 -->
     <link href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII=" rel="icon" type="image/x-icon" />