Revert "Structure refactor"

This reverts commit 69afb3d.

Author: DaKingKong

README.md

@@ -8,7 +8,7 @@ This is a fork of [https://github.com/ringcentral/ringcentral-chatbot-js](https:
 import { extendApp } from 'ringcentral-chatbot-core'
 import express from 'express'
 
-function botCommandHandler ({
+function eventHandler ({
     type, // could be 'BotRemoved', 'Message4Bot', 'BotGroupLeft', 'BotJoinGroup', 'Maintain', 'SetupDatabase'
     bot, // the bot instance, check src/models/Bot.ts for instance methods
     text, // the text message user posted in chatgroup
@@ -65,27 +65,17 @@ function botCommandHandler ({
   }
 }
 
-const config = {
-  admin : {
-    route: '/admin',
-    handler: null
-  },
-  bot:{
-    route: '/bot',
-    handler: botCommandHandler
-  },
-  card: {
-    route: '/interactive-messages',
-    handler: null
-  },    
-  models: { // optional
-    Bot: 'your bot data model defination' // check src/models/Bot.ts as a example, optional
-  }
+const botConfig = {
+    adminRoute: '/admin', // optional
+    botRoute: '/bot', // optional
+    models: { // optional
+        Bot: 'your bot data model defination' // check src/models/Bot.ts as a example, optional
+    }
 }
 
-let app = express();
+let app = express()
 const skills = []
-app = extendApp(app, skills, config)
+app = extendApp(app, skills, eventHandler, botConfig)
 app.listen(3000, () => {
     console.log('server running')
 })

src/index.ts

@@ -4,25 +4,30 @@ import adminApp from './apps/admin';
 import { BotConfig } from './types';
 import defaultModels from './models';
 import express from 'express';
+
 export const extendApp = (
   app: any,
   skills: { handle: Function; app?: any }[] = [],
-  config: BotConfig
+  handle?: Function,
+  config: BotConfig = {
+    adminRoute: '/admin',
+    botRoute: '/bot',
+    models: {}
+  }
 ) => {
   const conf = {
     ...config,
     models: Object.assign({}, defaultModels, config.models || {})
   }
-
   conf.setupDatabase = async (force = false) => {
     for (const modelName in conf.models) {
       await conf.models[modelName].sync({ force });
     }
   };
   const mergedHandle = async (event: any) => {
     let handled = false;
-    if (config.bot.handler) {
-      handled = await config.bot.handler(event, handled);
+    if (handle) {
+      handled = await handle(event, handled);
     }
     for (const skill of skills) {
       if (skill.handle) {
@@ -31,16 +36,16 @@ export const extendApp = (
       }
     }
   };
-
+  
   app.use(express.json());
-  app.use(express.urlencoded({ extended: true }));
-
+  app.use(express.urlencoded({extended: true}));
+  
   app.use(
-    config.admin.route,
+    config.adminRoute,
     adminApp(mergedHandle, conf)
   );
   app.use(
-    config.bot.route,
+    config.botRoute,
     botApp(mergedHandle, conf)
   );
   for (const skill of skills) {
@@ -49,10 +54,6 @@ export const extendApp = (
     }
   }
   (app as any).mergedHandle = mergedHandle; // for unit testing
-  console.log('server running...');
-  console.log(`- bot oauth uri:\n${process.env.RINGCENTRAL_CHATBOT_SERVER}${config.bot.route}/oauth`);
-  console.log(`- interactive message uri:\n${process.env.RINGCENTRAL_CHATBOT_SERVER}${config.card.route}`);
-  console.log(`- admin uri:\n${process.env.RINGCENTRAL_CHATBOT_SERVER}${config.admin.route}`);
   return app;
 };
 

src/types.ts

@@ -27,11 +27,11 @@ export type Message = {
     creatorId: string;
     groupId: string;
     mentions:
-    | null
-    | {
-      id: string;
-      type: string;
-    }[];
+      | null
+      | {
+          id: string;
+          type: string;
+        }[];
     attachments?: AttachmentType[];
   };
   ownerId: string;
@@ -43,15 +43,9 @@ export type AttachmentType = {
   name: string;
 };
 
-export interface EndPoint {
-  route: string;
-  handler?: Function;
-}
-
 export interface BotConfig {
-  admin: EndPoint,
-  bot: EndPoint,
-  card: EndPoint,
+  adminRoute: string,
+  botRoute: string,
   models?: any,
   setupDatabase?: Function
 }