flow_chat 0.3.0 → 0.4.1

data/lib/flow_chat/ussd/app.rb

@@ -28,6 +28,31 @@ module FlowChat
       def say(msg)
         raise FlowChat::Interrupt::Terminate.new(msg)
       end
+
+      # WhatsApp-specific data accessors (not supported in USSD)
+      def contact_name
+        nil
+      end
+
+      def message_id
+        context["request.message_id"]
+      end
+
+      def timestamp
+        context["request.timestamp"]
+      end
+
+      def location
+        nil
+      end
+
+      def media
+        nil
+      end
+
+      def phone_number
+        context["request.msisdn"]
+      end
     end
   end
 end

data/lib/flow_chat/ussd/gateway/nalo.rb

@@ -12,6 +12,8 @@ module FlowChat
           params = context.controller.request.params
 
           context["request.id"] = params["USERID"]
+          context["request.message_id"] = SecureRandom.uuid
+          context["request.timestamp"] = Time.current.iso8601
           context["request.gateway"] = :nalo
           context["request.network"] = nil
           context["request.msisdn"] = Phonelib.parse(params["MSISDN"]).e164

data/lib/flow_chat/ussd/gateway/nsano.rb

@@ -12,6 +12,12 @@ module FlowChat
           controller = context["controller"]
           controller.request
 
+          # Add timestamp for all requests
+          context["request.timestamp"] = Time.current.iso8601
+          
+          # Set a basic message_id (can be enhanced based on actual Nsano implementation)
+          context["request.message_id"] = SecureRandom.uuid
+
           # input = context["rack.input"].read
           # context["rack.input"].rewind
           # if input.present?

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

@@ -29,7 +29,7 @@ module FlowChat
           return true unless FlowChat::Config.ussd.resumable_sessions_timeout_seconds
 
           last_active_at = Time.parse session.dig("context", "last_active_at")
-          (Time.now - FlowChat::Config.ussd.resumable_sessions_timeout_seconds) < last_active_at
+          (Time.current - FlowChat::Config.ussd.resumable_sessions_timeout_seconds) < last_active_at
         rescue
           false
         end

data/lib/flow_chat/ussd/processor.rb

@@ -1,55 +1,27 @@
-require "middleware"
-
 module FlowChat
   module Ussd
-    class Processor
-      attr_reader :middleware, :gateway
-
-      def initialize(controller)
-        @context = FlowChat::Context.new
-        @context["controller"] = controller
-        @middleware = ::Middleware::Builder.new(name: "ussd.middleware")
-
-        yield self if block_given?
-      end
-
-      def use_gateway(gateway)
-        @gateway = gateway
-        self
-      end
-
-      def use_session_store(session_store)
-        @context["session.store"] = session_store
-        self
-      end
-
-      def use_middleware(middleware)
-        @middleware.use middleware
-        self
-      end
-
+    class Processor < FlowChat::BaseProcessor
       def use_resumable_sessions
         middleware.insert_before 0, FlowChat::Ussd::Middleware::ResumableSession
         self
       end
 
-      def run(flow_class, action)
-        @context["flow.name"] = flow_class.name.underscore
-        @context["flow.class"] = flow_class
-        @context["flow.action"] = action
+      protected
 
-        stack = ::Middleware::Builder.new name: "ussd" do |b|
-          b.use gateway
-          b.use FlowChat::Session::Middleware
-          b.use FlowChat::Ussd::Middleware::Pagination
-          b.use middleware
-          b.use FlowChat::Ussd::Middleware::Executor
-        end.inject_logger(Rails.logger)
+      def middleware_name
+        "ussd.middleware"
+      end
 
-        yield stack if block_given?
+      def build_middleware_stack
+        create_middleware_stack("ussd")
+      end
 
-        stack.call(@context)
+      def configure_middleware_stack(builder)
+        builder.use FlowChat::Session::Middleware
+        builder.use FlowChat::Ussd::Middleware::Pagination
+        builder.use middleware
+        builder.use FlowChat::Ussd::Middleware::Executor
       end
     end
   end
-end
+end 

data/lib/flow_chat/ussd/prompt.rb

@@ -7,23 +7,31 @@ module FlowChat
         @user_input = input
       end
 
-      def ask(msg, choices: nil, convert: nil, validate: nil, transform: nil)
+      def ask(msg, choices: nil, convert: nil, validate: nil, transform: nil, media: nil)
         if user_input.present?
           input = user_input
           input = convert.call(input) if convert.present?
           validation_error = validate.call(input) if validate.present?
 
-          prompt!([validation_error, msg].join("\n\n"), choices:) if validation_error.present?
+          if validation_error.present?
+            # Include media URL in validation error message
+            original_message_with_media = build_message_with_media(msg, media)
+            prompt!([validation_error, original_message_with_media].join("\n\n"), choices:)
+          end
 
           input = transform.call(input) if transform.present?
           return input
         end
 
-        prompt! msg, choices:
+        # Include media URL in the message for USSD
+        final_message = build_message_with_media(msg, media)
+        prompt! final_message, choices:
       end
 
-      def say(message)
-        terminate! message
+      def say(message, media: nil)
+        # Include media URL in the message for USSD
+        final_message = build_message_with_media(message, media)
+        terminate! final_message
       end
 
       def select(msg, choices)
@@ -43,6 +51,32 @@ module FlowChat
 
       private
 
+      def build_message_with_media(message, media)
+        return message unless media
+
+        media_url = media[:url] || media[:path]
+        media_type = media[:type] || :image
+
+        # For USSD, we append the media URL to the message
+        media_text = case media_type.to_sym
+                    when :image
+                      "📷 Image: #{media_url}"
+                    when :document
+                      "📄 Document: #{media_url}"
+                    when :audio
+                      "🎵 Audio: #{media_url}"
+                    when :video
+                      "🎥 Video: #{media_url}"
+                    when :sticker
+                      "😊 Sticker: #{media_url}"
+                    else
+                      "📎 Media: #{media_url}"
+                    end
+
+        # Combine message with media information
+        "#{message}\n\n#{media_text}"
+      end
+
       def build_select_choices(choices)
         case choices
         when Array

data/lib/flow_chat/version.rb

@@ -1,3 +1,3 @@
 module FlowChat
-  VERSION = "0.3.0"
+  VERSION = "0.4.1"
 end

data/lib/flow_chat/whatsapp/app.rb

@@ -0,0 +1,64 @@
+module FlowChat
+  module Whatsapp
+    class App
+      attr_reader :session, :input, :context, :navigation_stack
+
+      def initialize(context)
+        @context = context
+        @session = context.session
+        @input = context.input
+        @navigation_stack = []
+      end
+
+      def screen(key)
+        raise ArgumentError, "a block is expected" unless block_given?
+        raise ArgumentError, "screen has been presented" if navigation_stack.include?(key)
+
+        navigation_stack << key
+        return session.get(key) if session.get(key).present?
+
+        user_input = input
+        if session.get("$started_at$").nil?
+          session.set("$started_at$", Time.current.iso8601)
+          user_input = nil
+        end
+
+        prompt = FlowChat::Whatsapp::Prompt.new user_input
+        @input = nil # input is being submitted to prompt so we clear it
+
+        value = yield prompt
+        session.set(key, value)
+        value
+      end
+
+      def say(msg)
+        raise FlowChat::Interrupt::Terminate.new([:text, msg, {}])
+      end
+
+      # WhatsApp-specific data accessors (read-only)
+      def contact_name
+        context["request.contact_name"]
+      end
+
+      def message_id
+        context["request.message_id"]
+      end
+
+      def timestamp
+        context["request.timestamp"]
+      end
+
+      def location
+        context["request.location"]
+      end
+
+      def media
+        context["request.media"]
+      end
+
+      def phone_number
+        context["request.msisdn"]
+      end
+    end
+  end
+end