Merge 63d5692 into 18430f9

package.json

@@ -1,7 +1,7 @@
 {
   "name": "messenger-chat",
   "author": "Amine Ben hammou",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "license": "MIT",
   "description": "A library to create chat bots for Messenger",
   "module": "dist/messenger-chat.esm.js",

src/bot/handle.ts

@@ -1,6 +1,5 @@
-import {EventEntry, WebhookEvent} from '../events/types'
-import {Reply} from '../messages/types'
-import {BotConfig} from './types'
+import {send} from './send'
+import {BotConfig, EventEntry, WebhookEvent} from '../types'
 
 export async function handle(config: BotConfig, event: WebhookEvent) {
   if (event.object !== 'page') {
@@ -17,33 +16,18 @@ async function handleEntry(config: BotConfig, entry: EventEntry) {
   const context = (await storage.get(contextKey)) || initialContext
   const setContext = (value: any) => storage.set(contextKey, value)
   const getUserFields = () => loadUserFields(config, sender)
-  let responses = config.handle({...messaging, context, setContext, getUserFields})
+  let responses = config.handle({...messaging, contextKey, context, setContext, getUserFields})
   if (responses instanceof Promise) {
     responses = await responses
   }
   if (responses && !Array.isArray(responses)) {
     responses = [responses]
   }
   if (responses) {
-    await Promise.all(
-      responses.map(response =>
-        sendReply(config, {
-          messaging_type: 'RESPONSE',
-          recipient: sender,
-          message: response,
-        })
-      )
-    )
+    await Promise.all(responses.map(response => send(config, sender.id, response)))
   }
 }
 
-async function sendReply({axiosInstance, accessToken}: BotConfig, reply: Reply) {
-  return axiosInstance.post(
-    `https://graph.facebook.com/v11.0/me/messages?access_token=${accessToken}`,
-    reply
-  )
-}
-
 async function loadUserFields({axiosInstance, accessToken}: BotConfig, sender: {id: string}) {
   const res = await axiosInstance.get(
     `https://graph.facebook.com/v11.0/${sender.id}?access_token=${accessToken}&fields=id,first_name,last_name,profile_pic`

src/bot/index.ts

@@ -1,4 +1,5 @@
 import axios from 'axios'
+import {send} from './send'
 import {handle} from './handle'
 import {verify} from './verify'
 import {Bot, BotConfig} from './types'
@@ -21,5 +22,6 @@ export function bot(config: Partial<BotConfig>): Bot {
   return {
     verify: query => verify(config as BotConfig, query),
     handle: event => handle(config as BotConfig, event),
+    send: (id, message) => send(config as BotConfig, id, message),
   }
 }

src/bot/send.ts

@@ -0,0 +1,14 @@
+import {Message} from '../messages/types'
+import {BotConfig} from './types'
+
+export async function send(config: BotConfig, recipientId: string, message: Message) {
+  const {axiosInstance, accessToken} = config
+  return axiosInstance.post(
+    `https://graph.facebook.com/v11.0/me/messages?access_token=${accessToken}`,
+    {
+      messaging_type: 'RESPONSE',
+      recipient: {id: recipientId},
+      message,
+    }
+  )
+}

src/bot/types.ts

@@ -17,6 +17,7 @@ export type BotConfig = {
 export interface Bot {
   verify(query: VerificationQuery): string
   handle(event: WebhookEvent): Promise<void>
+  send(recipientId: string, message: Message): Promise<any>
 }
 
 export type VerificationQuery = {
@@ -26,6 +27,7 @@ export type VerificationQuery = {
 }
 
 export type ChatEntry = MessagingItem & {
+  contextKey: string
   context: any
   setContext: (value: Record<string, any>) => void
   getUserFields: () => Promise<UserFields>