qbot 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 85d73bad55f14325b0a78aeaff2341de02ef5614aa2fffe440bf67a2a3b70b74
-  data.tar.gz: 4482b338249e3c9fa3f480768f41dde54e160220929b0d6bd58e9e2a7679ad20
+SHA1:
+  metadata.gz: 96175e44e35b00efdc98a08f7dc482c75358a2fa
+  data.tar.gz: f56a2d9a7e9d7634d8c8f1dcbe8a443cad455b05
 SHA512:
-  metadata.gz: a4cc7f82c33ba57018a77b0cfadfe8c168647d0d00c53722bc894ea741dc250c1cfa042814c53673a4f12ac512a55304335be7ecf9a8917ccdd2673f084ffde4
-  data.tar.gz: d8a08ddb77ede43079f68587967d5e70902df0ab2a9fbcb05d8ad3ade91cd0f95482e4ae7c97d3456d20577c477ad60d985c1366904ba62337bb0ee21087d3fb
+  metadata.gz: b03726403afaad4534f48644c27184b7a7df7fa562bbcdae9bd87a67004b816594f5c15d6726e204438793bff9cf0d3b6a27dfa715465168a4194a6bab6f6600
+  data.tar.gz: 0a33dbf259131511157139fefbe1faf4d790a40fc9962a77f8f4ddd962ae5b0a71de90f97748d29cc31219c2168c6f8c7b4d9d77e3b725c72d008f4070c668c6

data/README.md

@@ -43,7 +43,7 @@ end
 Then put your Slack API Token in `.env`.
 
 ```
-QBOT_SLACK_API_TOKEN=xoxb-############-#######################C
+QBOT_SLACK_API_TOKEN=xoxb-############-########################
 ```
 
 And now start your bot with the following command.

data/lib/qbot/adapter.rb

@@ -19,12 +19,12 @@ module Qbot
       end
 
       def run(bots)
-        on_message do |message|
+        listen do |message|
           bots.each { |bot| bot.call(message.dup) }
         end
       end
 
-      def on_message(&block)
+      def listen(&block)
         raise 'Not implemented'
       end
 

data/lib/qbot/adapter/mattermost.rb

@@ -12,7 +12,6 @@ module Qbot
       def initialize(url: nil, username: nil, password: nil)
         @mm_url = url || ENV['QBOT_MATTERMOST_URL']
         @server = URI.join(@mm_url, '/').to_s
-        @error  = false
 
         resp = api_call(:post, '/users/login', :body => {
           login_id: username || ENV['QBOT_MATTERMOST_USERNAME'],
@@ -20,47 +19,24 @@ module Qbot
         })
 
         access_token(resp.headers['token'])
+        raise 'Login failed' unless @token
       end
 
       def access_token(token)
         @token = token
       end
 
-      def on_message(&block)
-        ws_url = URI.join(@server.gsub(/^http(s?):/, 'ws\1:'), endpoint('/websocket')).to_s
-        headers = { "Authorization" => "Bearer #{@token}" }
-
-        EM.run do
-          @ws = Faye::WebSocket::Client.new(ws_url, {}, { headers: headers, ping: 60})
-
-          @ws.on :open do |e|
-            Qbot.app.logger.info("#{self.class} - Websocket connection opened")
-          end
-
-          @ws.on :close do |e|
-            Qbot.app.logger.info("#{self.class} - Websocket connection closed")
-            stop if @error
-            on_message(&block) # restart
-          end
-
-          @ws.on :error do |e|
-            Qbot.app.logger.error("#{self.class} - #{e.message}")
-            @error = true
-          end
-
-          @ws.on :message do |e|
-            data = JSON.parse(e.data)
-            emit_event(data, block)
-          end
-        end
+      def listen(&block)
+        EM.run { start_connection(&block) }
       end
 
-      def stop
+      def close
         EM.stop
       end
 
       def post(text, **options)
-        api_call(:post, "/posts", body: options.merge(message: text))
+        resp = api_call(:post, "/posts", body: options.merge(message: text))
+        Qbot.app.logger.info("#{self.class} - Post message: #{resp.status} - '#{text}'")
       end
 
       def reply_to(message, text, **options)
@@ -82,27 +58,54 @@ module Qbot
         URI(@mm_url).path + "/api/v4#{path}"
       end
 
+      def start_connection(&block)
+        running = true
+        ws_url  = URI.join(@server.gsub(/^http(s?):/, 'ws\1:'), endpoint('/websocket')).to_s
+
+        ws = Faye::WebSocket::Client.new(ws_url)
+        ws.send({seq: 1, action: 'authentication_challenge', data: {token: @token}}.to_json)
+
+        ws.on :message do |e|
+          data = JSON.parse(e.data)
+          emit_event(data, block)
+        end
+
+        ws.on :open do |e|
+          Qbot.app.logger.info("#{self.class} - Websocket connection opened")
+        end
+
+        ws.on :close do |e|
+          Qbot.app.logger.info("#{self.class} - Websocket connection closed: #{e.code} #{e.reason}")
+          if running then start_connection(&block) else Qbot.app.stop end
+        end
+
+        ws.on :error do |e|
+          Qbot.app.logger.error("#{self.class} - Websocket encountered error: #{e.message}")
+          running = false
+        end
+      end
+
       def emit_event(data, callback)
-        event = data['event'].to_sym
-        Qbot.app.logger.debug("#{self.class} - Event '#{event}' recieved")
+        return unless type = data['event']
+        Qbot.app.logger.debug("#{self.class} - Event '#{type}' recieved")
 
-        case event
-        when :posted
+        case type
+        when 'posted'
           post = JSON.parse(data['data']['post'])
 
           message = Qbot::Message.new
           message.data = post
           message.text = post['message']
 
-          Qbot.app.logger.info("#{self.class} - Message was '#{message.text}'")
           callback.call(message)
         end
+      rescue => err
+        Qbot.app.logger.error("#{self.class} - ERROR! #{err}")
       end
 
       def api_call(method, path, **options, &block)
         headers = { "Authorization" => "Bearer #{@token}", "Accept" => "application/json" }
-
-        connection = Faraday::Connection.new(url: @server, headers: headers ) do |con|
+        connection = Faraday::Connection.new(url: @server, headers: headers) do |con|
           con.response :json
           con.adapter  :httpclient
         end

data/lib/qbot/adapter/shell.rb

@@ -27,10 +27,14 @@ module Qbot
         end
       end
 
-      def on_message(&block)
+      def listen(&block)
         EM.run { EM.open_keyboard(Keyboard, block) }
       end
 
+      def close
+        EM.stop
+      end
+
       def post(text, **options)
         $stdout.puts text
       end

data/lib/qbot/adapter/slack.rb

@@ -13,7 +13,6 @@ module Qbot
 
       def initialize(api_token: nil)
         @server = URI.join(SLACK_API_URL, '/').to_s
-        @error  = false
 
         access_token(api_token || ENV['QBOT_SLACK_API_TOKEN'])
       end
@@ -22,42 +21,17 @@ module Qbot
         @token = token
       end
 
-      def on_message(&block)
-        resp = api_call(:get, '/rtm.start')
-        data = JSON.parse(resp.body)
-        ws_url = data['url']
-
-        EM.run do
-          @ws = Faye::WebSocket::Client.new(ws_url, {}, { ping: 60})
-
-          @ws.on :open do |e|
-            Qbot.app.logger.info("#{self.class} - Websocket connection opened")
-          end
-
-          @ws.on :close do |e|
-            Qbot.app.logger.info("#{self.class} - Websocket connection closed")
-            stop if @error
-            on_message(&block) # restart
-          end
-
-          @ws.on :error do |e|
-            Qbot.app.logger.error("#{self.class} - #{e.message}")
-            @error = true
-          end
-
-          @ws.on :message do |e|
-            data = JSON.parse(e.data)
-            emit_event(data, block)
-          end
-        end
+      def listen(&block)
+        EM.run { start_connection(&block) }
       end
 
-      def stop
+      def close
         EM.stop
       end
 
       def post(text, **options)
-        api_call(:post, "/chat.postMessage", options.merge(text: text))
+        resp = api_call(:post, "/chat.postMessage", options.merge(text: text))
+        Qbot.app.logger.info("#{self.class} - Post message: #{resp.status} - '#{text}'")
       end
 
       def reply_to(message, text, **options)
@@ -79,19 +53,46 @@ module Qbot
         URI(SLACK_API_URL).path + path
       end
 
+      def start_connection(&block)
+        resp = api_call(:get, '/rtm.start')
+        data = JSON.parse(resp.body)
+
+        running = true
+        ws_url  = data['url']
+        ws = Faye::WebSocket::Client.new(ws_url, nil, {ping: 60})
+
+        ws.on :message do |e|
+          data = JSON.parse(e.data)
+          emit_event(data, block)
+        end
+
+        ws.on :open do |e|
+          Qbot.app.logger.info("#{self.class} - Websocket connection opened")
+        end
+
+        ws.on :close do |e|
+          Qbot.app.logger.info("#{self.class} - Websocket connection closed: #{e.code} #{e.reason}")
+          if running then start_connection(&block) else Qbot.app.stop end
+        end
+
+        ws.on :error do |e|
+          Qbot.app.logger.error("#{self.class} - Websocket encountered error: #{e.message}")
+          running = false
+        end
+      end
+
       def emit_event(data, callback)
-        event = data['type'].to_sym
-        Qbot.app.logger.debug("#{self.class} - Event '#{event}' recieved")
+        return unless type = data['event']
+        Qbot.app.logger.debug("#{self.class} - Event '#{type}' recieved")
 
-        case event
-        when :message
+        case type
+        when 'message'
           return if data['subtype']
 
           message = Qbot::Message.new
           message.data = data
           message.text = data['text']
 
-          Qbot.app.logger.info("#{self.class} - Message was '#{message.text}'")
           callback.call(message)
         end
       end

data/lib/qbot/app.rb

@@ -41,16 +41,18 @@ module Qbot
 
     def start
       @logger.info("Booting #{self.class}.")
-      @logger.info("#{storage.class} - Storage driver loaded")
-      @logger.info("#{adapter.class} - Adapter driver loaded")
+      @logger.info("#{storage.class} - Storage driver loaded.")
+      @logger.info("#{adapter.class} - Adapter driver loaded.")
+      bots.each { |bot| @logger.info("Loading #{bot}.") }
 
+      Thread.abort_on_exception = true
       @threads << Thread.start { loop { @timers.wait } }
       @threads << Thread.start { adapter.run(@bots) }
       @threads.each { |th| th.join }
     end
 
     def stop
-      adapter.stop if adapter.respond_to?(:stop)
+      adapter.close if adapter.respond_to?(:close)
       @threads.each { |th| th.kill if th }
     end
 

data/lib/qbot/autorun.rb

@@ -1,5 +1,3 @@
-require 'qbot/embed/help'
-
 module Qbot
 
   def self.autorun

data/lib/qbot/base.rb

@@ -1,5 +1,5 @@
-require 'parse-cron'
 require 'dotenv/load'
+require 'parse-cron'
 
 require 'qbot/app'
 require 'qbot/adapter'
@@ -22,15 +22,7 @@ module Qbot
         schedule(pattern, &block)
       end
 
-      def usage(text)
-        on(/^#{prefix}help\s+#{name.downcase}\b/) { post(text) }
-      end
-
       private
-      def prefix
-        "#{ENV['QBOT_PREFIX']}\s+" if ENV['QBOT_PREFIX']
-      end
-
       def schedule(pattern, &block)
         parser  = CronParser.new(pattern)
         current = Time.now
@@ -53,7 +45,12 @@ module Qbot
       @message = message
       return unless @pattern =~ @message.text.to_s.strip
 
-      instance_exec($~, &@callback)
+      begin
+        Qbot.app.logger.debug("#{self.class} - Recieve message: '#{message.text}'")
+        instance_exec($~, &@callback)
+      rescue => e
+        Qbot.app.logger.error("#{self.class} - Error: #{e}")
+      end
     end
 
     def post(text, **options)

data/lib/qbot/version.rb

@@ -1,3 +1,3 @@
 module Qbot
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/qbot.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "leveldb", "~> 0.1"
   spec.add_dependency "faraday", "~> 0.14"
   spec.add_dependency "faraday_middleware", "~> 0.12"
-  spec.add_dependency "httpclient", ">= 2.2"
+  spec.add_dependency "httpclient", ">= 2.6"
   spec.add_dependency "faye-websocket", "~> 0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qbot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,6 @@ files:
 - lib/qbot/base.rb
 - lib/qbot/embed/cron.rb
 - lib/qbot/embed/echo.rb
-- lib/qbot/embed/help.rb
 - lib/qbot/embed/ping.rb
 - lib/qbot/storage.rb
 - lib/qbot/storage/leveldb.rb
@@ -202,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Tiny chatbot flamework.

data/lib/qbot/embed/help.rb

@@ -1,22 +0,0 @@
-require 'stringio'
-
-module Qbot
-
-  class Help < Qbot::Base
-
-    on /^#{prefix}help$/ do |msg|
-      names = Qbot.app.bots
-        .reject { |n| %w(Qbot::Base Qbot::Help).include?(n) }
-        .map    { |n| n.split('::').last.downcase }
-
-      next if names.empty?
-      resp = StringIO.new
-      resp.puts 'Features:'
-      resp.puts names.map { |name| "  #{name}" }
-
-      post resp.string
-    end
-
-  end
-
-end