slack_socket_mode_bot 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47ada769275576b47617b518f5edfe68f9e868b5542bf54a6aff1b8c61cf7f12
-  data.tar.gz: d746a2d083f4b3aab6e249a564f83f36810c2c3db44f9e43531cb880a67ea905
+  metadata.gz: ecdae100a7f27d51751fe1fd77c772ca8a88cfab323266c874b996ffaed909c8
+  data.tar.gz: 92b4827386e87485f3adf26e93de16e910a2c4f9d320ba4cc683768d067b130f
 SHA512:
-  metadata.gz: 2fccbca8913960ce106189139af617f904f02038cb15a4575e81a3a7dd02c8e95cd613d90527286f437a9d73cbc85aebdbea3096386580deaeb118ca72b666bf
-  data.tar.gz: d756bea2c709da78cde7ec431cb0fe58cf05c9e06d25523e20fc99f9f01e71765a0c4adf90882eef1fc1056c3bc1fecce2567ec97a91337517b25c117aaaaae8
+  metadata.gz: 497006f3d3854a431e29f12f6463c57ed35290e5d722de7fe7bab24a886f667483821553da14ecc904d64b6de45c3d48ae446f90ba4424c3fbcbf7c59362ec38
+  data.tar.gz: a0e94a4812aaf022a7e62e02f0a56718ecb38cfd49002fc0dbdc7e9833fcb6520dfe799ff3d2279d9239520a615215240337261a4116c4c4ab1b7496d4239af5

data/README.md

@@ -64,22 +64,18 @@ bot.run
 ```
 
 ```
-$ ruby example/echo_bot.rb
+$ ruby examples/echo_bot.rb
 I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2560] websocket open
 I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2600] websocket open
-I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2560] slack hello
-I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2560] active connection count: 4
-I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2600] slack hello
-I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2600] active connection count: 4
 I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2640] websocket open
-I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2640] slack hello
-I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2640] active connection count: 4
 I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2680] websocket open
-I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2680] slack hello
-I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2680] active connection count: 4
-I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2680] slack events_api (event_callback)
-I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2680] slack events_api (event_callback)
-I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2680] slack events_api (event_callback)
+I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2560] hello (active connections: 4)
+I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2600] hello (active connections: 4)
+I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2640] hello (active connections: 4)
+I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2680] hello (active connections: 4)
+I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2680] events_api app_mention Ev08H3RABCDE
+I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2680] events_api app_mention Ev08H3RFGHIJ
+I, [20XX-XX-XXTXX:XX:XX.XXXXXX #XXXXXX]  INFO -- : [ws:2680] events_api app_mention Ev08H3RKLMNO
 ...
 ```
 
@@ -110,6 +106,11 @@ This method returns the response as a JSON data.
 
 Starts the main loop of communication with Slack. This method does not return.
 
+On an unrecoverable error (for example, losing every connection and being unable
+to reopen any), this method raises an exception instead of silently continuing in
+a degraded state. Running your bot under a process supervisor such as systemd is
+recommended so that it is restarted when this happens.
+
 ### `SlackSocketModeBot#step`
 
 Proceeds with the communication one step.

data/Rakefile

@@ -1,4 +1,12 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
-task default: %i[]
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "lib" << "test"
+  t.test_files = FileList["test/test_*.rb"]
+  t.warning = false
+end
+
+task default: %i[test]

data/lib/slack_socket_mode_bot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class SlackSocketModeBot
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/slack_socket_mode_bot.rb

@@ -12,6 +12,21 @@ require_relative "slack_socket_mode_bot/simple_web_socket"
 class SlackSocketModeBot
   class Error < StandardError; end
 
+  API_BASE = "https://slack.com/api/"
+
+  # Internal signal: retry after `wait` seconds. Always caught in #call.
+  class Retry < StandardError
+    attr_reader :wait
+    def initialize(wait)
+      @wait = wait
+      super("retry after #{ wait }s")
+    end
+  end
+  private_constant :Retry
+
+  # Max seconds to sleep on a 429 Retry-After; #call may run in the event loop.
+  RETRY_AFTER_CAP = 60
+
   #: (token: String, ?app_token: String, ?num_of_connections: Integer, ?debug: boolean, ?logger: Logger) { (untyped) -> untyped } -> void
   def initialize(token:, app_token: nil, num_of_connections: 4, debug: false, logger: nil, &callback)
     @token = token
@@ -20,28 +35,64 @@ class SlackSocketModeBot
     @debug = debug
     @logger = logger
     @events = {}
-    num_of_connections.times { add_connection(callback) } if app_token
+    @callback = callback
+    # No app token: Web API calls only, no Socket Mode connections.
+    @num_of_connections = app_token ? num_of_connections : 0
+    replenish_connections
   end
 
   #: (String method, untyped data, ?token: String) -> untyped
   def call(method, data, token: @token)
-    count = 0
+    url = URI(API_BASE + method)
+    body = JSON.generate(data)
+    headers = {
+      "Content-type" => "application/json; charset=utf-8",
+      "Authorization" => "Bearer " + token,
+    }
+
+    retries = 0
     begin
-      url = URI("https://slack.com/api/" + method)
-      res = Net::HTTP.post(
-        url, JSON.generate(data),
-        "Content-type" => "application/json; charset=utf-8",
-        "Authorization" => "Bearer " + token,
-      )
-      json = JSON.parse(res.body, symbolize_names: true)
-      raise Error, json[:error] unless json[:ok]
-      json
-    rescue Socket::ResolutionError
+      res = Net::HTTP.post(url, body, headers)
+
+      case res
+      when Net::HTTPSuccess
+        json = JSON.parse(res.body, symbolize_names: true)
+        raise Error, json[:error] unless json[:ok]
+        json
+      when Net::HTTPTooManyRequests
+        # Rejected, not processed: safe to retry after Retry-After seconds.
+        raise Retry, Integer(res["retry-after"] || retries + 1)
+      else
+        # 5xx etc.: may already be processed, so don't retry; just don't crash.
+        raise Error, "HTTP #{ res.code } #{ res.message }"
+      end
+    rescue Socket::ResolutionError, Net::OpenTimeout
+      # Never sent (DNS / connect failure): safe to retry.
+      retries += 1
+      raise if retries >= 3
       sleep 1
-      count += 1
-      retry if count < 3
-      raise
+      retry
+    rescue Retry => e
+      # Don't block the event loop on an absurdly long wait.
+      retries += 1
+      raise Error, "rate limited (retry-after: #{ e.wait }s)" if retries >= 3 || e.wait > RETRY_AFTER_CAP
+      sleep e.wait
+      retry
+    end
+  end
+
+  private def replenish_connections
+    # Reopen from the main loop, tolerating a single failure; #step retries.
+    while @conns.size < @num_of_connections
+      begin
+        add_connection(@callback)
+      rescue => e
+        @logger.warn("[reconnect] failed: #{ e.message }") if @logger
+        break
+      end
     end
+    # Fail loud rather than degrade silently once every connection is gone.
+    raise Error, "all socket connections lost" if @num_of_connections > 0 && @conns.empty?
   end
 
   private def add_connection(callback)
@@ -54,13 +105,14 @@ class SlackSocketModeBot
       when :open
         @logger.info("[ws:#{ ws.object_id }] websocket open") if @logger
       when :close
+        # #step drops the dead connection; #replenish_connections reopens it.
         @logger.info("[ws:#{ ws.object_id }] websocket closed") if @logger
-        add_connection(callback)
       when :message
         begin
           json = JSON.parse(data, symbolize_names: true)
         rescue JSON::ParserError
-          add_connection(callback)
+          # A stray non-JSON frame: skip it, don't open a spurious connection.
+          @logger.warn("[ws:#{ ws.object_id }] received a non-JSON message; ignored") if @logger
           next
         end
 
@@ -77,31 +129,34 @@ class SlackSocketModeBot
         else
           payload = json[:payload]
           if @logger
-            msg = "[ws:#{ ws.object_id }] #{ json[:type] } [##{ json[:retry_attempt] + 1 }] (#{
-              {
-                event_id: payload[:event_id],
-                event_time: Time.at(payload[:event_time]).strftime("%FT%T"),
-                type: payload[:type],
-              }.map {|k, v| "#{ k }: #{ v }" }.join(", ")
-            })"
-            @logger.info(msg)
+            # Log a per-type identifier; event_id/retry only apply to events_api.
+            detail =
+              case json[:type]
+              when "events_api"   then [payload.dig(:event, :type), payload[:event_id]].compact.join(" ")
+              when "slash_commands" then payload[:command]
+              else payload[:type]
+              end
+            retry_n = json[:retry_attempt].to_i
+            line = "[ws:#{ ws.object_id }] #{ json[:type] }"
+            line += " #{ detail }" if detail && !detail.empty?
+            line += " (retry ##{ retry_n })" if retry_n > 0
+            @logger.info(line)
           end
+          # Only events_api has an event_id; dedup just those (others have none).
+          event_id = payload[:event_id]
           expired = Time.now.to_i - 600
           @events.reject! {|_, timestamp| timestamp < expired }
 
-          if @events[json[:payload][:event_id]]
-            # ignore
-          else
-            @events[json[:payload][:event_id]] = json[:payload][:event_time]
-
-            response = { envelope_id: json[:envelope_id] }
-            if json[:accepts_response_payload]
-              response[:payload] = callback.call(json)
-            else
-              callback.call(json)
-            end
-            ws.send(JSON.generate(response))
+          # ACK every message; only skip the handler for a duplicate, else Slack resends.
+          duplicate = event_id && @events[event_id]
+          @events[event_id] = payload[:event_time] if event_id
+
+          response = { envelope_id: json[:envelope_id] }
+          unless duplicate
+            result = callback.call(json)
+            response[:payload] = result if json[:accepts_response_payload]
           end
+          ws.send(JSON.generate(response))
         end
       end
     end
@@ -113,6 +168,7 @@ class SlackSocketModeBot
   def step
     read_ios, write_ios = [], []
     @conns.select! {|ws| ws.step(read_ios, write_ios) }
+    replenish_connections
     return read_ios, write_ios
   end
 

data/sig/slack_socket_mode.rbs

@@ -1,13 +1,14 @@
-module Slack
-  class SocketMode
-    VERSION: String
-  
-    def initialize: (token: String, ?app_token: String, ?num_of_connections: Integer, ?debug: boolean, ?logger: Logger) { (untyped) -> untyped } -> void
-  
-    def call: (String method, untyped data, ?token: String) -> untyped
-  
-    def step: -> [Array[IO], Array[IO]]
-  
-    def run: -> bot
+class SlackSocketModeBot
+  VERSION: String
+
+  class Error < StandardError
   end
+
+  def initialize: (token: String, ?app_token: String?, ?num_of_connections: Integer, ?debug: bool, ?logger: Logger?) { (untyped) -> untyped } -> void
+
+  def call: (String method, untyped data, ?token: String) -> untyped
+
+  def step: () -> [ Array[IO], Array[IO] ]
+
+  def run: () -> void
 end

metadata

@@ -1,62 +1,66 @@
 --- !ruby/object:Gem::Specification
 name: slack_socket_mode_bot
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
-- Yusuke Endoh
+  - Yusuke Endoh
 bindir: bin
 cert_chain: []
-date: 2024-06-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
+  - !ruby/object:Gem::Dependency
+    name: websocket
+    requirement: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ~>
+          - !ruby/object:Gem::Version
+            version: "1.2"
+    type: :runtime
+    prerelease: false
+    version_requirements: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ~>
+          - !ruby/object:Gem::Version
+            version: "1.2"
 email:
-- mame@ruby-lang.org
+  - mame@ruby-lang.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- Rakefile
-- lib/slack_socket_mode_bot.rb
-- lib/slack_socket_mode_bot/simple_web_socket.rb
-- lib/slack_socket_mode_bot/version.rb
-- sig/slack_socket_mode.rbs
-homepage: https://github.com/mame/slack_socket_mode_bot
+  - LICENSE
+  - README.md
+  - Rakefile
+  - lib/slack_socket_mode_bot.rb
+  - lib/slack_socket_mode_bot/simple_web_socket.rb
+  - lib/slack_socket_mode_bot/version.rb
+  - sig/slack_socket_mode.rbs
+homepage: "https://github.com/mame/slack_socket_mode_bot"
 licenses:
-- MIT
+  - MIT
 metadata:
-  homepage_uri: https://github.com/mame/slack_socket_mode_bot
-  source_code_uri: https://github.com/mame/slack_socket_mode_bot
+  homepage_uri: "https://github.com/mame/slack_socket_mode_bot"
+  source_code_uri: "https://github.com/mame/slack_socket_mode_bot"
 rdoc_options: []
 require_paths:
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: 3.0.0
+    -
+      - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    -
+      - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 4.1.0.dev
 specification_version: 4
 summary: A simple wrapper library for Slack's Socket Mode API
 test_files: []