@defra/flood-webchat 0.0.1-beta.47 → 0.0.1-beta.49

package/dist/server.js

@@ -1,303 +1 @@
-/******/ (() => { // webpackBootstrap
-/******/ 	var __webpack_modules__ = ({
-
-/***/ "./src/server/index.js":
-/*!*****************************!*\
-  !*** ./src/server/index.js ***!
-  \*****************************/
-/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
-
-const {
-  authenticate,
-  getApiBaseUrl,
-  getIsOpen,
-  getActivity
-} = __webpack_require__(/*! ./lib/client.js */ "./src/server/lib/client.js");
-
-/**
- * Returns webchat availability
- * @param options {object}
- * @param options.clientId {string}
- * @param options.clientSecret {string}
- * @param options.accessKey {string}
- * @param options.accessSecret {string}
- * @param options.skillEndpoint {string}
- * @param options.hoursEndpoint {string}
- * @param options.authenticationUri {string}
- * @param options.wellKnownUri {string}
- * @param options.maxQueueCount {string}
- * @returns {Promise<{date: Date, availability: (string)}>}
- */
-module.exports = async function getAvailability({
-  clientId,
-  clientSecret,
-  accessKey,
-  accessSecret,
-  maxQueueCount,
-  skillEndpoint,
-  hoursEndpoint,
-  wellKnownUri = 'https://cxone.niceincontact.com/.well-known/cxone-configuration',
-  authenticationUri = 'https://cxone.niceincontact.com/auth/token'
-}) {
-  const authorisation = 'Basic ' + Buffer.from(`${encodeURIComponent(clientId)}:${encodeURIComponent(clientSecret)}`).toString('base64');
-
-  // Cache authentication and re-authenticate when needed (lasts 1 hour?)
-  const {
-    tenantId,
-    token,
-    tokenType
-  } = await authenticate({
-    authenticationUri,
-    authorisation,
-    accessKey,
-    accessSecret
-  });
-  const apiBaseUrl = await getApiBaseUrl({
-    wellKnownUri,
-    tenantId
-  });
-  const [{
-    hasCapacity,
-    hasAgentsAvailable
-  }, isOpen] = await Promise.all([getActivity({
-    baseUrl: apiBaseUrl,
-    tokenType,
-    token,
-    skillEndpoint,
-    maxQueueCount
-  }), getIsOpen({
-    baseUrl: apiBaseUrl,
-    token,
-    tokenType,
-    hoursEndpoint
-  })]);
-  const isAvailable = isOpen && hasAgentsAvailable && hasCapacity;
-  const isExistingOnly = isOpen && hasAgentsAvailable && !hasCapacity;
-  let availability = 'UNAVAILABLE';
-  if (isAvailable) {
-    availability = 'AVAILABLE';
-  } else if (isExistingOnly) {
-    availability = 'EXISTING';
-  }
-  return {
-    date: new Date(),
-    availability
-  };
-};
-
-/***/ }),
-
-/***/ "./src/server/lib/client.js":
-/*!**********************************!*\
-  !*** ./src/server/lib/client.js ***!
-  \**********************************/
-/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
-
-const querystring = __webpack_require__(/*! querystring */ "querystring");
-const axios = __webpack_require__(/*! axios */ "axios");
-const jwtdecode = __webpack_require__(/*! jwt-decode */ "jwt-decode");
-const {
-  isWithinHours
-} = __webpack_require__(/*! ./utils.js */ "./src/server/lib/utils.js");
-const contentType = 'application/x-www-form-urlencoded';
-const authenticate = async ({
-  authenticationUri,
-  authorisation,
-  accessKey,
-  accessSecret
-}) => {
-  const url = new URL(authenticationUri);
-  const body = querystring.stringify({
-    grant_type: 'password',
-    username: accessKey,
-    password: accessSecret
-  });
-  const auth = await axios.post(url.href, body, {
-    signal: AbortSignal.timeout(3000),
-    headers: {
-      Host: url.host,
-      'Content-Type': contentType,
-      Authorization: authorisation
-    }
-  });
-  return {
-    token: auth.data.access_token,
-    tokenType: auth.data.token_type,
-    tenantId: jwtdecode(auth.data.id_token)?.tenantId
-  };
-};
-const getApiBaseUrl = async ({
-  wellKnownUri,
-  tenantId
-}) => {
-  const url = new URL(wellKnownUri);
-  url.searchParams.set('tenantId', tenantId);
-  const {
-    data
-  } = await axios.get(url.href, {
-    headers: {
-      Host: url.host
-    },
-    signal: AbortSignal.timeout(3000)
-  });
-  return data.api_endpoint;
-};
-const getActivity = async ({
-  tokenType,
-  token,
-  baseUrl,
-  skillEndpoint,
-  maxQueueCount
-}) => {
-  const url = new URL(skillEndpoint, baseUrl);
-  const skill = await axios.get(url.href, {
-    signal: AbortSignal.timeout(3000),
-    headers: {
-      Host: url.host,
-      Authorization: `${tokenType} ${token}`,
-      'Content-Type': contentType
-    }
-  });
-  const activity = skill.data.skillActivity[0];
-  return {
-    hasCapacity: activity.queueCount < maxQueueCount,
-    hasAgentsAvailable: activity.agentsAvailable >= 1
-  };
-};
-const getIsOpen = async ({
-  baseUrl,
-  token,
-  tokenType,
-  hoursEndpoint
-}) => {
-  const url = new URL(hoursEndpoint, baseUrl);
-  const hours = await axios.get(url.href, {
-    signal: AbortSignal.timeout(3000),
-    headers: {
-      Host: url.host,
-      Authorization: `${tokenType} ${token}`,
-      'Content-Type': contentType
-    }
-  });
-  const days = hours.data.resultSet.hoursOfOperationProfiles[0].days;
-  return isWithinHours(days);
-};
-module.exports = {
-  authenticate,
-  getApiBaseUrl,
-  getIsOpen,
-  getActivity
-};
-
-/***/ }),
-
-/***/ "./src/server/lib/utils.js":
-/*!*********************************!*\
-  !*** ./src/server/lib/utils.js ***!
-  \*********************************/
-/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
-
-const {
-  DateTime
-} = __webpack_require__(/*! luxon */ "luxon");
-const getHour = time => Number(time.split(':')[0]);
-const isWithinHours = (days, date) => {
-  const now = date ? DateTime.fromISO(date) : DateTime.local();
-  now.setZone('Europe/London');
-  const newDate = date ? new Date(date) : new Date();
-  const today = newDate.toLocaleDateString('en-GB', {
-    weekday: 'long'
-  });
-  const dateParts = newDate.toLocaleDateString('en-GB').split('/');
-  const todaysAvailability = days.find(item => item.day === today);
-  const todaysDateTimeOpen = DateTime.local(Number(dateParts[2]), Number(dateParts[1]), Number(dateParts[0]), getHour(todaysAvailability.openTime));
-  const todaysDateTimeClose = DateTime.local(Number(dateParts[2]), Number(dateParts[1]), Number(dateParts[0]), getHour(todaysAvailability.closeTime));
-  return now.diff(todaysDateTimeOpen).milliseconds >= 0 && now.diff(todaysDateTimeClose).milliseconds <= 0;
-};
-module.exports = {
-  isWithinHours
-};
-
-/***/ }),
-
-/***/ "axios":
-/*!************************!*\
-  !*** external "axios" ***!
-  \************************/
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("axios");
-
-/***/ }),
-
-/***/ "jwt-decode":
-/*!*****************************!*\
-  !*** external "jwt-decode" ***!
-  \*****************************/
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("jwt-decode");
-
-/***/ }),
-
-/***/ "luxon":
-/*!************************!*\
-  !*** external "luxon" ***!
-  \************************/
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("luxon");
-
-/***/ }),
-
-/***/ "querystring":
-/*!******************************!*\
-  !*** external "querystring" ***!
-  \******************************/
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("querystring");
-
-/***/ })
-
-/******/ 	});
-/************************************************************************/
-/******/ 	// The module cache
-/******/ 	var __webpack_module_cache__ = {};
-/******/ 	
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/ 		// Check if module is in cache
-/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
-/******/ 		if (cachedModule !== undefined) {
-/******/ 			return cachedModule.exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = __webpack_module_cache__[moduleId] = {
-/******/ 			// no module.id needed
-/******/ 			// no module.loaded needed
-/******/ 			exports: {}
-/******/ 		};
-/******/ 	
-/******/ 		// Execute the module function
-/******/ 		__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-/******/ 	
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/ 	
-/************************************************************************/
-/******/ 	
-/******/ 	// startup
-/******/ 	// Load entry module and return exports
-/******/ 	// This entry module is referenced by other modules so it can't be inlined
-/******/ 	var __webpack_exports__ = __webpack_require__("./src/server/index.js");
-/******/ 	module.exports = __webpack_exports__;
-/******/ 	
-/******/ })()
-;
-//# sourceMappingURL=server.js.map
+(()=>{var e={553:(e,t,n)=>{const{authenticate:o,getApiBaseUrl:a,getIsOpen:i,getActivity:s}=n(980);e.exports=async function({clientId:e,clientSecret:t,accessKey:n,accessSecret:r,maxQueueCount:c,skillEndpoint:u,hoursEndpoint:l,wellKnownUri:p="https://cxone.niceincontact.com/.well-known/cxone-configuration",authenticationUri:d="https://cxone.niceincontact.com/auth/token"}){const h="Basic "+Buffer.from(`${encodeURIComponent(e)}:${encodeURIComponent(t)}`).toString("base64"),{tenantId:m,token:y,tokenType:w}=await o({authenticationUri:d,authorisation:h,accessKey:n,accessSecret:r}),g=await a({wellKnownUri:p,tenantId:m}),[{hasCapacity:A,hasAgentsAvailable:k},f]=await Promise.all([s({baseUrl:g,tokenType:w,token:y,skillEndpoint:u,maxQueueCount:c}),i({baseUrl:g,token:y,tokenType:w,hoursEndpoint:l})]);let x="UNAVAILABLE";return f&&k&&A?x="AVAILABLE":f&&k&&!A&&(x="EXISTING"),{date:new Date,availability:x}}},980:(e,t,n)=>{const o=n(819),a=n(167),i=n(567),{isWithinHours:s}=n(393),r="application/x-www-form-urlencoded";e.exports={authenticate:async({authenticationUri:e,authorisation:t,accessKey:n,accessSecret:s})=>{const c=new URL(e),u=o.stringify({grant_type:"password",username:n,password:s}),l=await a.post(c.href,u,{signal:AbortSignal.timeout(3e3),headers:{Host:c.host,"Content-Type":r,Authorization:t}});return{token:l.data.access_token,tokenType:l.data.token_type,tenantId:i(l.data.id_token)?.tenantId}},getApiBaseUrl:async({wellKnownUri:e,tenantId:t})=>{const n=new URL(e);n.searchParams.set("tenantId",t);const{data:o}=await a.get(n.href,{headers:{Host:n.host},signal:AbortSignal.timeout(3e3)});return o.api_endpoint},getIsOpen:async({baseUrl:e,token:t,tokenType:n,hoursEndpoint:o})=>{const i=new URL(o,e),c=(await a.get(i.href,{signal:AbortSignal.timeout(3e3),headers:{Host:i.host,Authorization:`${n} ${t}`,"Content-Type":r}})).data.resultSet.hoursOfOperationProfiles[0].days;return s(c)},getActivity:async({tokenType:e,token:t,baseUrl:n,skillEndpoint:o,maxQueueCount:i})=>{const s=new URL(o,n),c=(await a.get(s.href,{signal:AbortSignal.timeout(3e3),headers:{Host:s.host,Authorization:`${e} ${t}`,"Content-Type":r}})).data.skillActivity[0];return{hasCapacity:c.queueCount<i,hasAgentsAvailable:c.agentsAvailable>=1}}}},393:(e,t,n)=>{const{DateTime:o}=n(748),a=e=>Number(e.split(":")[0]);e.exports={isWithinHours:(e,t)=>{const n=t?o.fromISO(t):o.local();n.setZone("Europe/London");const i=t?new Date(t):new Date,s=i.toLocaleDateString("en-GB",{weekday:"long"}),r=i.toLocaleDateString("en-GB").split("/"),c=e.find((e=>e.day===s)),u=o.local(Number(r[2]),Number(r[1]),Number(r[0]),a(c.openTime)),l=o.local(Number(r[2]),Number(r[1]),Number(r[0]),a(c.closeTime));return n.diff(u).milliseconds>=0&&n.diff(l).milliseconds<=0}}},167:e=>{"use strict";e.exports=require("axios")},567:e=>{"use strict";e.exports=require("jwt-decode")},748:e=>{"use strict";e.exports=require("luxon")},819:e=>{"use strict";e.exports=require("querystring")}},t={},n=function n(o){var a=t[o];if(void 0!==a)return a.exports;var i=t[o]={exports:{}};return e[o](i,i.exports,n),i.exports}(553);module.exports=n})();

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@defra/flood-webchat",
-  "version": "0.0.1-beta.47",
+  "version": "0.0.1-beta.49",
   "description": "",
   "main": "dist/server.js",
   "browser": "dist/client.js",
   "scripts": {
     "test": "npm run lint && npm run unit-test",
     "dev": "(cd demo && webpack server)",
-    "build": "webpack",
+    "build": "webpack --config webpack.prod.mjs",
     "unit-test": "jest",
     "lint": "npm run lint:js && npm run lint:scss",
     "lint:fix": "npm run lint:js -- --fix && npm run lint:scss -- --fix",
@@ -53,6 +53,7 @@
     "webpack": "^5.88.2",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1",
+    "webpack-merge": "^5.10.0",
     "webpack-node-externals": "^3.0.0"
   },
   "peerDependencies": {

package/src/client/components/screens/feedback.jsx

@@ -30,7 +30,7 @@ export function Feedback ({ onCancel }) {
 
       <div className='wc-body'>
         <div className='wc-content'>
-          <h3 id='wc-subtitle' className='wc-heading'>Give Feedback on Floodline webchat</h3>
+          <h3 id='wc-subtitle' className='wc-heading'>Give feedback on Floodline webchat</h3>
           <p>We're running webchat as a trial. you can&nbsp;
             <a
               id='feedback-send'

package/src/client/index.jsx

@@ -5,6 +5,7 @@ import { Availability } from './components/availability/availability.jsx'
 import { checkAvailability } from './lib/check-availability'
 import { AppProvider } from './store/AppProvider.jsx'
 import { CUSTOMER_ID_STORAGE_KEY } from './store/constants.js'
+import { messageNotification } from './lib/message-notification.js'
 
 export async function init (container, options) {
   const sdk = new ChatSdk({
@@ -16,14 +17,16 @@ export async function init (container, options) {
 
   const root = createRoot(container)
   let availability
+  let playSound
   try {
     const result = await checkAvailability(options.availabilityEndpoint)
+    playSound = await messageNotification(options.audioUrl)
     availability = result.availability
   } catch (e) {
     availability = 'UNAVAILABLE'
   }
   root.render(
-    <AppProvider sdk={sdk} availability={availability} options={options}>
+    <AppProvider sdk={sdk} availability={availability} playSound={playSound}>
       <Availability />
     </AppProvider>
   )

package/src/client/lib/message-notification.js

@@ -1,6 +1,4 @@
-export const messageNotification = audioUrl => {
-  let buffer
-
+export const messageNotification = async audioUrl => {
   const context = new (window.AudioContext || window.webkitAudioContext)()
 
   if (context.state === 'suspended') {
@@ -19,13 +17,9 @@ export const messageNotification = audioUrl => {
     })
   }
 
-  fetch(audioUrl)
-    .then(response => response.arrayBuffer())
-    .then(data => context.decodeAudioData(data))
-    .then(decodedData => {
-      buffer = decodedData
-    })
-    .catch(console.error)
+  const response = await fetch(audioUrl)
+  const arrayBuffer = await response.arrayBuffer()
+  const buffer = await context.decodeAudioData(arrayBuffer)
 
   return () => {
     const source = context.createBufferSource()

package/src/client/store/AppProvider.jsx

@@ -1,18 +1,14 @@
 import React, { createContext, useEffect, useReducer, useMemo } from 'react'
 import { ChatEvent } from '@nice-devone/nice-cxone-chat-web-sdk'
 
-import { messageNotification } from '../lib/message-notification.js'
-
 import { initialState, reducer } from './reducer.js'
 import { CUSTOMER_ID_STORAGE_KEY, THREAD_ID_STORAGE_KEY, SETTINGS_STORAGE_KEY } from './constants.js'
 
 export const AppContext = createContext(initialState)
 
-export const AppProvider = ({ sdk, availability, options, children }) => {
+export const AppProvider = ({ sdk, availability, playSound, children }) => {
   const [state, dispatch] = useReducer(reducer, initialState)
 
-  const playSound = messageNotification(options.audioUrl)
-
   /**
    * SDK event handlers
    */
@@ -43,7 +39,7 @@ export const AppProvider = ({ sdk, availability, options, children }) => {
 
     const isAudioOn = JSON.parse(window.localStorage.getItem(SETTINGS_STORAGE_KEY)).audio
 
-    if (isAudioOn && e.detail.data.message.direction === 'outbound') {
+    if (isAudioOn && e.detail.data.message.direction === 'outbound' && playSound) {
       playSound()
     }
   }

package/webpack.config.mjs

@@ -9,8 +9,6 @@ export default {
     client: path.join(__dirname, 'src/client/index.jsx'),
     server: path.join(__dirname, 'src/server/index.js')
   },
-  devtool: 'source-map',
-  mode: 'development',
   output: {
     path: path.resolve(__dirname, 'dist'),
     library: {

package/webpack.prod.mjs

@@ -0,0 +1,7 @@
+import { merge } from 'webpack-merge'
+
+import common from './webpack.config.mjs'
+
+export default merge(common, {
+  mode: 'production'
+})