flow_chat 0.7.0 → 0.8.1

data/lib/flow_chat/whatsapp/gateway/cloud_api.rb

@@ -160,6 +160,7 @@ module FlowChat
 
             context["request.id"] = phone_number
             context["request.gateway"] = :whatsapp_cloud_api
+            context["request.platform"] = :whatsapp
             context["request.message_id"] = message_id
             context["request.msisdn"] = Phonelib.parse(phone_number).e164
             context["request.contact_name"] = contact_name

data/lib/flow_chat/whatsapp/middleware/executor.rb

@@ -1,49 +1,21 @@
+require_relative "../../base_executor"
+
 module FlowChat
   module Whatsapp
     module Middleware
-      class Executor
-        def initialize(app)
-          @app = app
-          FlowChat.logger.debug { "Whatsapp::Executor: Initialized WhatsApp executor middleware" }
-        end
-
-        def call(context)
-          flow_class = context.flow
-          action = context["flow.action"]
-          session_id = context["session.id"]
-
-          FlowChat.logger.info { "Whatsapp::Executor: Executing flow #{flow_class.name}##{action} for session #{session_id}" }
+      class Executor < FlowChat::BaseExecutor
+        protected
 
-          whatsapp_app = build_whatsapp_app context
-          FlowChat.logger.debug { "Whatsapp::Executor: WhatsApp app built for flow execution" }
-
-          flow = flow_class.new whatsapp_app
-          FlowChat.logger.debug { "Whatsapp::Executor: Flow instance created, invoking #{action} method" }
-
-          flow.send action
-          FlowChat.logger.warn { "Whatsapp::Executor: Flow execution failed to interact with user for #{flow_class.name}##{action}" }
-          raise FlowChat::Interrupt::Terminate, "Unexpected end of flow."
-        rescue FlowChat::Interrupt::Prompt => e
-          FlowChat.logger.info { "Whatsapp::Executor: Flow prompted user - Session: #{session_id}, Prompt: '#{e.prompt.truncate(100)}'" }
-          FlowChat.logger.debug { "Whatsapp::Executor: Prompt details - Choices: #{e.choices&.size || 0}, Has media: #{!e.media.nil?}" }
-          # Return the same triplet format as USSD for consistency
-          [:prompt, e.prompt, e.choices, e.media]
-        rescue FlowChat::Interrupt::Terminate => e
-          FlowChat.logger.info { "Whatsapp::Executor: Flow terminated - Session: #{session_id}, Message: '#{e.prompt.truncate(100)}'" }
-          FlowChat.logger.debug { "Whatsapp::Executor: Destroying session #{session_id}" }
-          # Clean up session and return terminal message
-          context.session.destroy
-          [:terminate, e.prompt, nil, e.media]
-        rescue => error
-          FlowChat.logger.error { "Whatsapp::Executor: Flow execution failed - #{flow_class.name}##{action}, Session: #{session_id}, Error: #{error.class.name}: #{error.message}" }
-          FlowChat.logger.debug { "Whatsapp::Executor: Stack trace: #{error.backtrace.join("\n")}" }
-          raise
+        def platform_name
+          "WhatsApp"
         end
 
-        private
+        def log_prefix
+          "Whatsapp::Executor"
+        end
 
-        def build_whatsapp_app(context)
-          FlowChat.logger.debug { "Whatsapp::Executor: Building WhatsApp app instance" }
+        def build_platform_app(context)
+          FlowChat.logger.debug { "#{log_prefix}: Building WhatsApp app instance" }
           FlowChat::Whatsapp::App.new(context)
         end
       end

data/lib/flow_chat/whatsapp/processor.rb

@@ -20,8 +20,6 @@ module FlowChat
 
       def configure_middleware_stack(builder)
         FlowChat.logger.debug { "Whatsapp::Processor: Configuring WhatsApp middleware stack" }
-        builder.use FlowChat::Session::Middleware
-        FlowChat.logger.debug { "Whatsapp::Processor: Added Session::Middleware" }
 
         builder.use middleware
         FlowChat.logger.debug { "Whatsapp::Processor: Added custom middleware" }

data/lib/flow_chat.rb

@@ -15,7 +15,6 @@ module FlowChat
   end
 
   def self.setup_instrumentation!
-    require_relative "flow_chat/instrumentation/setup"
     FlowChat::Instrumentation::Setup.setup_instrumentation!
   end
 
@@ -27,13 +26,4 @@ module FlowChat
   def self.metrics
     FlowChat::Instrumentation::Setup.metrics_collector
   end
-end
-
-loader.eager_load
-
-# Auto-setup instrumentation in Rails environments
-if defined?(Rails)
-  Rails.application.config.after_initialize do
-    FlowChat.setup_instrumentation!
-  end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flow_chat
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-07 00:00:00.000000000 Z
+date: 2025-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -107,6 +107,7 @@ files:
 - docs/images/simulator.png
 - docs/instrumentation.md
 - docs/media.md
+- docs/sessions.md
 - docs/testing.md
 - docs/ussd-setup.md
 - docs/whatsapp-setup.md
@@ -118,6 +119,8 @@ files:
 - examples/whatsapp_message_job.rb
 - flow_chat.gemspec
 - lib/flow_chat.rb
+- lib/flow_chat/base_app.rb
+- lib/flow_chat/base_executor.rb
 - lib/flow_chat/base_processor.rb
 - lib/flow_chat/config.rb
 - lib/flow_chat/context.rb
@@ -139,7 +142,6 @@ files:
 - lib/flow_chat/ussd/middleware/choice_mapper.rb
 - lib/flow_chat/ussd/middleware/executor.rb
 - lib/flow_chat/ussd/middleware/pagination.rb
-- lib/flow_chat/ussd/middleware/resumable_session.rb
 - lib/flow_chat/ussd/processor.rb
 - lib/flow_chat/ussd/renderer.rb
 - lib/flow_chat/version.rb

data/lib/flow_chat/ussd/middleware/resumable_session.rb

@@ -1,39 +0,0 @@
-module FlowChat
-  module Ussd
-    module Middleware
-      class ResumableSession
-        def initialize(app)
-          @app = app
-        end
-
-        def call(context)
-          if FlowChat::Config.ussd.resumable_sessions_enabled && context["ussd.request"].present?
-            # First, try to find any interruption session.
-            # The session key can be:
-            #  - a global session (key: "global")
-            #  - a provider-specific session (key: <provider>)
-            session_key = self.class.session_key(context)
-            resumable_session = context["session.store"].get(session_key)
-
-            if resumable_session.present? && valid?(resumable_session)
-              context.merge! resumable_session
-            end
-          end
-
-          @app.call(context)
-        end
-
-        private
-
-        def valid?(session)
-          return true unless FlowChat::Config.ussd.resumable_sessions_timeout_seconds
-
-          last_active_at = Time.parse session.dig("context", "last_active_at")
-          (Time.current - FlowChat::Config.ussd.resumable_sessions_timeout_seconds) < last_active_at
-        rescue
-          false
-        end
-      end
-    end
-  end
-end