@@ -19,6 +19,7 @@ import (
1919 "github.com/larksuite/oapi-sdk-go/v3/core/httpserverext"
2020 larkevent "github.com/larksuite/oapi-sdk-go/v3/event"
2121 larkim "github.com/larksuite/oapi-sdk-go/v3/service/im/v1"
22+ larkws "github.com/larksuite/oapi-sdk-go/v3/ws"
2223
2324 "github.com/larksuite/oapi-sdk-go/v3/event/dispatcher"
2425
@@ -66,8 +67,7 @@ func New(cfg *Config, db *database.DB, tlsConfig *tls.Config, acts actions.Actio
6667 var client = lark .NewClient (
6768 cfg .AppID ,
6869 cfg .AppSecret ,
69- lark .WithLogReqAtDebug (true ),
70- lark .WithLogLevel (larkcore .LogLevelDebug ),
70+ lark .WithLogLevel (larkcore .LogLevelInfo ),
7171 lark .WithHttpClient (httpClient ))
7272
7373 // Check that AppID and AppSecret are valid
@@ -113,38 +113,52 @@ func New(cfg *Config, db *database.DB, tlsConfig *tls.Config, acts actions.Actio
113113}
114114
115115func (lrk * Lark ) Start () error {
116+ var dispatcher * dispatcher.EventDispatcher
116117
118+ // Webhooks by default
119+ if lrk .cfg .Mode == ModeWebhook || lrk .cfg .Mode == "" {
120+ dispatcher = lrk .makeDispatcher (lrk .cfg .VerificationToken , lrk .cfg .EncryptKey , true )
121+ return lrk .startWebhook (dispatcher )
122+ } else {
123+ dispatcher = lrk .makeDispatcher ("" , "" , false )
124+ return lrk .startWebsocket (dispatcher )
125+ }
126+ }
127+
128+ func (lrk * Lark ) makeDispatcher (verificationToken , eventEncryptKey string , dedupEvents bool ) * dispatcher.EventDispatcher {
117129 // Sometimes the same event is sent several times, so keep recent event ids
118130 // to prevent handling the same event more than once.
119131 recentEvents := map [string ]time.Time {}
120132 recentEventsMutex := sync.Mutex {}
121133
122- ticker := time .NewTicker (10 * time .Second )
123- go func () {
124- for {
125- select {
126- case <- ticker .C :
127- toRemove := make ([]string , 0 )
128-
129- for eventID , handledAt := range recentEvents {
130-
131- // Cleanup events after 10m
132- // TODO: config
133- if time .Since (handledAt ) > time .Minute * 5 {
134- toRemove = append (toRemove , eventID )
134+ if dedupEvents {
135+ go func () {
136+ ticker := time .NewTicker (10 * time .Second )
137+ for {
138+ select {
139+ case <- ticker .C :
140+ toRemove := make ([]string , 0 )
141+
142+ for eventID , handledAt := range recentEvents {
143+
144+ // Cleanup events after 10m
145+ // TODO: config
146+ if time .Since (handledAt ) > time .Minute * 5 {
147+ toRemove = append (toRemove , eventID )
148+ }
135149 }
136- }
137150
138- recentEventsMutex .Lock ()
139- for _ , eventID := range toRemove {
140- delete (recentEvents , eventID )
151+ recentEventsMutex .Lock ()
152+ for _ , eventID := range toRemove {
153+ delete (recentEvents , eventID )
154+ }
155+ recentEventsMutex .Unlock ()
141156 }
142- recentEventsMutex .Unlock ()
143157 }
144- }
145- }()
158+ }()
159+ }
146160
147- handler := dispatcher .NewEventDispatcher (lrk . cfg . VerificationToken , lrk . cfg . EncryptKey ).
161+ return dispatcher .NewEventDispatcher (verificationToken , eventEncryptKey ).
148162 OnP2MessageReceiveV1 (
149163 func (ctx context.Context , event * larkim.P2MessageReceiveV1 ) error {
150164
@@ -159,17 +173,19 @@ func (lrk *Lark) Start() error {
159173 return nil
160174 }
161175
162- eventID := event .EventV2Base .Header .EventID
176+ if dedupEvents {
177+ eventID := event .EventV2Base .Header .EventID
163178
164- recentEventsMutex .Lock ()
165- if _ , ok := recentEvents [eventID ]; ok {
166- recentEventsMutex .Unlock ()
179+ recentEventsMutex .Lock ()
180+ if _ , ok := recentEvents [eventID ]; ok {
181+ recentEventsMutex .Unlock ()
167182
168- // Event was already handled
169- return nil
183+ // Event was already handled
184+ return nil
185+ }
186+ recentEvents [eventID ] = time .Now ()
187+ recentEventsMutex .Unlock ()
170188 }
171- recentEvents [eventID ] = time .Now ()
172- recentEventsMutex .Unlock ()
173189
174190 userID := event .Event .Sender .SenderId .UserId
175191 msgID := event .Event .Message .MessageId
@@ -234,12 +250,23 @@ func (lrk *Lark) Start() error {
234250 return nil
235251 },
236252 )
253+ }
254+
255+ func (lrk * Lark ) startWebsocket (eventHandler * dispatcher.EventDispatcher ) error {
256+ cli := larkws .NewClient (lrk .cfg .AppID , lrk .cfg .AppSecret ,
257+ larkws .WithEventHandler (eventHandler ),
258+ larkws .WithLogLevel (larkcore .LogLevelInfo ),
259+ )
260+
261+ return cli .Start (context .TODO ())
262+ }
237263
264+ func (lrk * Lark ) startWebhook (eventHandler * dispatcher.EventDispatcher ) error {
238265 mux := http .NewServeMux ()
239266
240267 // TODO: take path from config
241- mux .HandleFunc ("/webhook/event" , httpserverext .NewEventHandlerFunc (handler ,
242- larkevent .WithLogLevel (larkcore .LogLevelDebug )))
268+ mux .HandleFunc ("/webhook/event" , httpserverext .NewEventHandlerFunc (eventHandler ,
269+ larkevent .WithLogLevel (larkcore .LogLevelInfo )))
243270
244271 // TODO: take port from config
245272 srv := http.Server {
0 commit comments