[1] Cleanup unused field, fix and define action payload type

src/lib/gql.ts

@@ -10,9 +10,11 @@ type QV = {
   variables?: object;
 };
 
+type Resp = { data: object | null; errors: { message: string }[] | undefined };
+
 // Maps URL to dataloader. Cleared after batched request is fired.
 // Exported just for unit test.
-export const loaders: Record<string, Dataloader<QV, object>> = {};
+export const loaders: Record<string, Dataloader<QV, Resp>> = {};
 
 /**
  * Returns a dataloader instance that can send query & variable to the GraphQL endpoint specified by `url`.
@@ -26,26 +28,24 @@ export const loaders: Record<string, Dataloader<QV, object>> = {};
 function getGraphQLRespLoader(url: string) {
   if (loaders[url]) return loaders[url];
 
-  return (loaders[url] = new Dataloader<QV, object>(
-    async (queryAndVariables) => {
-      // Clear dataloader so that next batch will get a fresh dataloader
-      delete loaders[url];
+  return (loaders[url] = new Dataloader<QV, Resp>(async (queryAndVariables) => {
+    // Clear dataloader so that next batch will get a fresh dataloader
+    delete loaders[url];
 
-      // Implements Apollo's transport layer batching
-      // https://www.apollographql.com/blog/apollo-client/performance/query-batching/#1bce
-      //
-      return (
-        await fetch(url, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'x-app-secret': process.env.APP_SECRET ?? '',
-          },
-          body: JSON.stringify(queryAndVariables),
-        })
-      ).json();
-    }
-  ));
+    // Implements Apollo's transport layer batching
+    // https://www.apollographql.com/blog/apollo-client/performance/query-batching/#1bce
+    //
+    return (
+      await fetch(url, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'x-app-secret': process.env.APP_SECRET ?? '',
+        },
+        body: JSON.stringify(queryAndVariables),
+      })
+    ).json();
+  }));
 }
 
 // Usage:

src/types/chatbotState.ts

@@ -1,4 +1,4 @@
-import type { Message, MessageEvent, WebhookEvent } from '@line/bot-sdk';
+import type { Message, MessageEvent } from '@line/bot-sdk';
 
 export type ChatbotState =
   | '__INIT__'
@@ -28,7 +28,17 @@ type ArgumentedEventParams = {
   input: string;
 };
 
-export type ChatbotEvent = (WebhookEvent | ServerChooseEvent) &
+export type ChatbotEvent = (
+  | MessageEvent
+  | ServerChooseEvent
+  /**
+   * A special format of postback that Chatbot actually uses: postback + input (provided in `ArgumentedEventParams`)
+   * @FIXME Replace with original PostbackEvent and parse its action to support passing more thing than a string
+   */
+  | {
+      type: 'postback';
+    }
+) &
   ArgumentedEventParams;
 
 export type Context = {
@@ -67,3 +77,14 @@ export type ChatbotStateHandlerReturnType = Omit<
 export type ChatbotStateHandler = (
   params: ChatbotStateHandlerParams
 ) => Promise<ChatbotStateHandlerReturnType>;
+
+/**
+ * The data that postback action stores as JSON.
+ *
+ * @FIXME Replace input: string with something that is more structured
+ */
+export type PostbackActionData = {
+  input: string;
+  sessionId: number;
+  state: ChatbotState;
+};

src/webhook/handleInput.ts

@@ -46,7 +46,7 @@ export default async function handleInput(
       event = {
         type: 'postback',
         input: articleId,
-      } as ChatbotEvent;
+      };
       return await handlePostback({ data }, 'CHOOSING_ARTICLE', event, userId);
     } else if (event.input === TUTORIAL_STEPS['RICH_MENU']) {
       state = 'TUTORIAL';

src/webhook/handlePostback.ts

@@ -17,10 +17,10 @@ import { Message } from '@line/bot-sdk';
 /**
  * Given input event and context, outputs the new context and the reply to emit.
  *
- * @param {Object<data>} context The current context of the bot
- * @param {*} state The input state
- * @param {*} event The input event
- * @param {*} userId LINE user ID that does the input
+ * @param context The current context of the bot
+ * @param state The input state
+ * @param event The input event
+ * @param userId LINE user ID that does the input
  */
 export default async function handlePostback(
   { data = {} },

src/webhook/handlers/__tests__/__snapshots__/choosingArticle.test.js.snap

@@ -224,7 +224,6 @@ Object {
     "input": "AV--O3nfyCdS-nWhujMD",
     "type": "server_choose",
   },
-  "issuedAt": undefined,
   "replies": Array [
     Object {
       "text": "💡 Someone on the internet replies to the message:",

src/webhook/handlers/__tests__/__snapshots__/choosingReply.test.js.snap

@@ -259,7 +259,6 @@ Object {
     "timestamp": 1518964687709,
     "type": "postback",
   },
-  "issuedAt": 1518964688672,
   "replies": Array [
     Object {
       "text": "💡 Someone on the internet replies to the message:",
@@ -400,7 +399,6 @@ Object {
     "timestamp": 1518964687709,
     "type": "postback",
   },
-  "issuedAt": 1518964688672,
   "replies": Array [
     Object {
       "text": "💡 Someone on the internet replies to the message:",

src/webhook/handlers/__tests__/choosingArticle.test.js

@@ -38,7 +38,6 @@ it('should select article by articleId', async () => {
         data: '{"input":"article-id","sessionId":1497994017447,"state":"CHOOSING_ARTICLE"}',
       },
     },
-    issuedAt: 1505314295017,
     userId: 'Uc76d8ae9ccd1ada4f06c4e1515d46466',
   };
 
@@ -83,7 +82,6 @@ it('throws ManipulationError when articleId is not valid', async () => {
       type: 'postback',
       input: 'article-id',
     },
-    issuedAt: 1505314295017,
     userId: 'Uc76d8ae9ccd1ada4f06c4e1515d46466',
   };
 
@@ -109,7 +107,6 @@ it('should select article and have OPINIONATED and NOT_ARTICLE replies', async (
         data: '{"input":"article-id","sessionId":1497994017447,"state":"CHOOSING_ARTICLE"}',
       },
     },
-    issuedAt: 1511633232970,
     userId: 'Uc76d8ae9ccd1ada4f06c4e1515d46466',
     replies: undefined,
   };
@@ -180,7 +177,6 @@ it('should select article with no replies', async () => {
         data: '{"input":"article-id","sessionId":1497994017447,"state":"CHOOSING_ARTICLE"}',
       },
     },
-    issuedAt: 1511702208730,
     userId: 'Uc76d8ae9ccd1ada4f06c4e1515d46466',
     replies: undefined,
   };
@@ -240,7 +236,6 @@ it('should select article and choose the only one reply for user', async () => {
         data: '{"input":"article-id","sessionId":1497994017447,"state":"CHOOSING_ARTICLE"}',
       },
     },
-    issuedAt: 1511702208730,
     userId: 'Uc76d8ae9ccd1ada4f06c4e1515d46466',
     replies: undefined,
   };
@@ -288,7 +283,6 @@ it('should block non-postback interactions', async () => {
       timestamp: 1511702208226,
       message: { type: 'text', id: '7049700770815', text: '10' },
     },
-    issuedAt: 1511702208730,
     userId: 'Uc76d8ae9ccd1ada4f06c4e1515d46466',
     replies: undefined,
   };
@@ -314,7 +308,6 @@ it('should select article and slice replies when over 10', async () => {
         data: '{"input":"article-id","sessionId":1497994017447,"state":"CHOOSING_ARTICLE"}',
       },
     },
-    issuedAt: 1511633232970,
     userId: 'Uc76d8ae9ccd1ada4f06c4e1515d46466',
     replies: undefined,
   };
@@ -337,7 +330,6 @@ it('should ask users if they want to submit article when user say not found', as
         data: `{"input":"${POSTBACK_NO_ARTICLE_FOUND}","sessionId":1497994017447,"state":"CHOOSING_ARTICLE"}`,
       },
     },
-    issuedAt: 1511633232970,
     userId: 'Uc76d8ae9ccd1ada4f06c4e1515d46466',
     replies: undefined,
   };
@@ -375,7 +367,6 @@ it('should ask users if they want to submit image article when user say not foun
         data: `{"input":"${POSTBACK_NO_ARTICLE_FOUND}","sessionId":1497994017447,"state":"CHOOSING_ARTICLE"}`,
       },
     },
-    issuedAt: 1511633232970,
     userId: 'Uc76d8ae9ccd1ada4f06c4e1515d46466',
     replies: undefined,
   };
@@ -413,7 +404,6 @@ it('should create a UserArticleLink when selecting a article', async () => {
         data: '{"input":"article-id","sessionId":1497994017447,"state":"CHOOSING_ARTICLE"}',
       },
     },
-    issuedAt: 1505314295017,
     userId,
   };
 

src/webhook/handlers/__tests__/choosingReply.test.js

@@ -34,7 +34,6 @@ describe('should select reply by replyId', () => {
         data: '{"input":"AWDZeeV0yCdS-nWhuml8","state":"CHOOSING_REPLY"}',
       },
     },
-    issuedAt: 1518964688672,
     userId: 'Uaddc74df8a3a176b901d9d648b0fc4fe',
     replies: [],
   };
@@ -106,7 +105,6 @@ it('should block non-postback interactions', async () => {
       input: '123',
       timestamp: 1518964687709,
     },
-    issuedAt: 1518964688672,
     userId: 'Uaddc74df8a3a176b901d9d648b0fc4fe',
     replies: [],
   };
@@ -132,7 +130,6 @@ it('should handle graphql error gracefully', async () => {
         data: '{"input":"AWDZeeV0yCdS-nWhuml8","state":"CHOOSING_REPLY"}',
       },
     },
-    issuedAt: 1518964688672,
     userId: 'Uaddc74df8a3a176b901d9d648b0fc4fe',
     replies: [],
   };

src/webhook/handlers/__tests__/tutorial.test.js

@@ -16,7 +16,6 @@ const param = {
     input: undefined,
     timestamp: 1519019734813,
   },
-  issuedAt: 1519019735467,
   userId: 'Uaddc74df8a3a176b901d9d648b0fc4fe',
   replies: undefined,
 };

src/webhook/handlers/choosingReply.js

@@ -117,7 +117,7 @@ function createShareBubble(articleId, fullArticleText, replyTypeEnumValue) {
 }
 
 export default async function choosingReply(params) {
-  let { data, state, event, issuedAt, userId, replies } = params;
+  let { data, state, event, userId, replies } = params;
 
   if (event.type !== 'postback' && event.type !== 'server_choose') {
     throw new ManipulationError(t`Please choose from provided options.`);
@@ -182,5 +182,5 @@ export default async function choosingReply(params) {
   visitor.event({ ec: 'Reply', ea: 'Type', el: GetReply.type, ni: true });
   visitor.send();
 
-  return { data, event, issuedAt, userId, replies };
+  return { data, event, userId, replies };
 }

src/webhook/handlers/defaultState.js

@@ -1,11 +1,11 @@
 export default function defaultState(params) {
-  let { data, event, issuedAt, userId, replies } = params;
+  let { data, event, userId, replies } = params;
 
   replies = [
     {
       type: 'text',
       text: '我們看不懂 QQ\n大俠請重新來過。',
     },
   ];
-  return { data, event, issuedAt, userId, replies };
+  return { data, event, userId, replies };
 }

src/webhook/handlers/processMedia.ts

@@ -6,7 +6,7 @@ import type {
   FlexMessage,
   FlexComponent,
 } from '@line/bot-sdk';
-import { Context } from 'src/types/chatbotState';
+import { ChatbotStateHandlerParams } from 'src/types/chatbotState';
 
 import {
   getLineContentProxyURL,
@@ -28,7 +28,7 @@ const CIRCLED_DIGITS = '⓪①②③④⑤⑥⑦⑧⑨⑩⑪';
 const SIMILARITY_THRESHOLD = 0.95;
 
 export default async function (
-  { data = {} as Context },
+  { data }: { data: ChatbotStateHandlerParams['data'] },
   event: MessageEvent,
   userId: string
 ) {

src/webhook/handlers/tutorial.ts

@@ -9,6 +9,7 @@ import {
 } from '@line/bot-sdk';
 import { CreateReplyMessagesReplyFragment } from 'typegen/graphql';
 import {
+  ChatbotState,
   ChatbotStateHandlerParams,
   ChatbotStateHandlerReturnType,
   Context,
@@ -84,15 +85,15 @@ function createImageTextBubble(imageUrl: string, text: string): FlexBubble {
 }
 
 /**
- * @param {string} label Act as quickReply's label and postback's input and displayText
- * @param {number} sessionId Search session ID
- * @param {string} postbackState Used by `handleInput` to determine which handler to call
- * @returns {object} quickReply items object
+ * @param label Act as quickReply's label and postback's input and displayText
+ * @param sessionId Search session ID
+ * @param postbackState Used by `handleInput` to determine which handler to call
+ * @returns quickReply items object
  */
 function createQuickReplyPostbackItem(
   label: string,
   sessionId: number,
-  postbackState: string
+  postbackState: ChatbotState
 ): QuickReplyItem {
   return {
     type: 'action',

src/webhook/handlers/utils.ts

@@ -21,6 +21,7 @@ import type {
 } from 'typegen/graphql';
 import { getArticleURL, createTypeWords } from 'src/lib/sharedUtils';
 import { sign } from 'src/lib/jwt';
+import { ChatbotState, PostbackActionData } from 'src/types/chatbotState';
 
 const splitter = new GraphemeSplitter();
 
@@ -36,17 +37,20 @@ export function createPostbackAction(
   input: string,
   displayText: string,
   sessionId: number,
-  state: string
+  state: ChatbotState
 ): Action {
+  // Ensure the data type before stringification
+  const data: PostbackActionData = {
+    input,
+    sessionId,
+    state,
+  };
+
   return {
     type: 'postback',
     label,
     displayText,
-    data: JSON.stringify({
-      input,
-      sessionId,
-      state,
-    }),
+    data: JSON.stringify(data),
   };
 }