dialog_ruby 0.1.10 → 0.1.11

data/lib/begin/_pre_bot.rb

@@ -0,0 +1,58 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    License    \ \ \ \ 
+##    Copyleft culture, Copyright (C) is prohibited here
+##    This work is licensed under a CC BY-SA 4.0
+##    Creative Commons Attribution-ShareAlike 4.0 License
+##    Refer to the http://creativecommons.org/licenses/by-sa/4.0/
+########    #######    ########    #######    ########    ########
+##    / / / /    Code Climate    \ \ \ \ 
+##    Language = ruby
+##    Indent = space;    2 chars;
+########    #######    ########    #######    ########    ########
+
+module Dialog  
+  class << self
+    
+  
+    def redisDBStore
+      @redisDBStore ||= Redis.new(path: Dialog.config.db.redis_url, db: Dialog.config.db.redisDBStore)
+    end
+    
+    def redisDBCache
+      @redisDBCache ||= Redis.new(path: Dialog.config.db.redis_url, db: Dialog.config.db.redisDBCache)
+    end    
+    
+    def redisDBStat
+      @redisDBStat ||= Redis.new(path: Dialog.config.db.redis_url, db: Dialog.config.db.redisDBStat)
+    end      
+    
+    def clear(args)
+      args[:x] = {metamess: {}, data: {}, labels: {}, send: {}, exec: {}}
+      args[:smsg] = {}
+    end
+    
+    def directoriesMustExists
+       FileUtils.mkdir_p("#{Dialog.config.path.dialogData}/#{Dialog.config.run.mode}/#{Dialog.config.naming.instance}")      
+       FileUtils.mkdir_p("#{Dialog.config.path.dialogTmpfiles}")
+    end
+    
+    def clearApi(args)
+      args[:api] = {}
+    end    
+    
+    
+    def perf(perf)
+      a = []
+      a << "mmsg: #{perf[:metamess] - perf[:init]}s"
+      if perf.has_key?(:preApiAction)
+        a << "canvas: #{perf[:preApiAction] - perf[:metamess]}s"        
+        a << "ApiAction in canvas: #{perf[:postApiAction] - perf[:preApiAction]}s"  
+      else
+        a << "canvas: #{perf[:canvas] - perf[:metamess]}s"          
+      end
+      a << "statistics: #{perf[:statistics] - perf[:canvas]}s" if perf.has_key?(:statistics)    
+      a << "full: #{perf[:fullend] - perf[:init]}s"  
+    end
+    
+  end
+end

data/lib/begin/background.rb

@@ -0,0 +1,24 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    License    \ \ \ \ 
+##    Copyleft culture, Copyright (C) is prohibited here
+##    This work is licensed under a CC BY-SA 4.0
+##    Creative Commons Attribution-ShareAlike 4.0 License
+##    Refer to the http://creativecommons.org/licenses/by-sa/4.0/
+########    #######    ########    #######    ########    ########
+##    / / / /    Code Climate    \ \ \ \ 
+##    Language = ruby
+##    Indent = space;    2 chars;
+########    #######    ########    #######    ########    ########
+
+module Dialog  
+  class << self  
+    
+    def start_background(args)
+      exec("#{Dir.home}/.gem/ruby/2.5.0/bin/sidekiq", "-r", "#{Dialog.config.path.dialog_ruby}/background/_init.rb")
+#       require_relative "#{Dir.home}/.gem/ruby/2.5.0/gems/sidekiq-5.2.2/lib/sidekiq/cli"
+
+    end
+    
+    
+  end
+end

data/lib/{triggers/start → begin}/bot.rb

@@ -19,14 +19,28 @@ module Dialog
       
       ### LANG
       i18n = Dialog::Lang.initial
-            
+      
+      ###DRb
+      DRb.start_service
+      
       begin    
-        Dialog::redis.call(['info', 'clients'])
+        Dialog::redisDBStore.call(['info', 'clients'])
+        Dialog::redisDBCache.call(['info', 'clients']) 
+        Dialog::redisDBStat.call(['info', 'clients'])                
       rescue
         Dialog.logger.error "No Redis connection!"
         sleep(2) 
         retry
       end
+      
+      ##Sidekiq
+      Sidekiq.configure_client do |config|
+        config.redis = { path: Dialog.config.db.redis_url, db: Dialog.config.db.redisDBBackground }
+      end 
+      
+      #Dirs
+      Dialog.directoriesMustExists
+      
       Telegram::Bot::Client.run Dialog.config.secure.token do |bot|
         args[:bot]= bot; args[:bot].freeze
         
@@ -39,15 +53,19 @@ module Dialog
         args[:globals][:botUsername] = me["result"]["username"]
         args[:globals][:botFirstName] = me["result"]["first_name"]
         args[:globals][:botFirstNameArray] = me["result"]["first_name"].split("\s")
+        args[:globals][:tdlibUser] = DRbObject.new_with_uri("drbunix:./_data/tdlib/#{Dialog.config.tdlib.instance}/drb.sock")        
         args[:globals].freeze
         
+        DRb.start_service("drbunix:./_data/bot/#{Dialog.config.naming.instance}/drb.sock", bot)
+        #DRb.thread.join
+        
         #common queue
         args[:queue] = {}
         args[:queue][:threadCommon] = Concurrent::CachedThreadPool.new
         
         #Success
-        Dialog.logger.info "Started: Bot named \"#{args[:globals][:botUsername]}\", botInstance=\"#{Dialog.config.naming.instance}\" of botInterface=\"#{Dialog.config.naming.interface}\", ID=\"#{Dialog.config.naming.id}\", loglevel=\"#{Dialog.config.log.base}\""
-
+        Dialog.logger.info "Started: Bot named \"#{args[:globals][:botUsername]}\", instance=\"#{Dialog.config.naming.instance}\", interface=\"#{Dialog.config.naming.interface}\", ID=\"#{Dialog.config.naming.id}\", loglevel=\"#{Dialog.config.log.base}\""
+        
         begin        
           bot.listen do |rmsg|
             args[:rmsg] = rmsg
@@ -80,14 +98,17 @@ module Dialog
     
     def runMessage(args)      
         begin
-#           Dialog.logger.debug "######### - REDIS STAT:\n #{Dialog::redis.call(['client', 'list'])}\n\n"
+#           Dialog.logger.debug "######### - REDIS STAT:\n #{Dialog::redisDBCache.call(['client', 'list'])}\n\n"
           Dialog::Metamess.firstpoint(args)
+          Dialog::Statistics.general(args)
+          args[:perf][:statistics] = Time.now                               
           args[:perf][:fullend] = Time.now                     
           Dialog.logger.info("## PERF: #{perf(args[:perf]).join(", ")}")  
           
         rescue Exception => @e
           Dialog.logger.error "ERROR - #{@e.inspect}\n\n Backtrace:\n #{@e.backtrace.join("\n\t")}\n \
-          MMSG:\n#{args[:mmsg]}\n" if @e
+          MMSG:\n#{args[:mmsg]}\n
+          RMSG:\n#{args[:rmsg].to_hash}\n" if @e
           args[:bot].api.send("sendMessage".to_sym, {chat_id: Dialog.config.monitoring.channel, disable_notification: true, text: @e}) unless Dialog.config.monitoring.channel.nil?
           raise
         end

data/lib/{triggers/start → begin}/tdlib.rb

@@ -15,28 +15,24 @@ module Dialog
     
     def start_tdlib(args)
       require 'tdlib-ruby'
+      require 'drb/drb'
+
       args[:globals] = {}
       Dir.glob(File.join("#{Dialog.config.path.dialog_rubyLib}/tdlib/**", "*.rb")).each{|f| require f}      
-      tdlibInit(args)
-      args[:tdlib][:cli].on_ready do |client|
-        a = client.fetch('@type' => 'getMe')
-        args[:globals][:cliId] = a['id'].to_i
-      end        
-    end
-    
-    
-    def tdlibInit(args)
-      inits = ['cli']
-      args[:tdlib] = {}
-      inits.each do |init|
-        unless File.exists?("#{Dialog.config.path.dialogData}/tdlib/#{init}/td.binlog")
+      unless File.exists?("#{Dialog.config.path.dialogData}/tdlib/#{Dialog.config.naming.instance}/td.binlog")
           Dialog.logger.error "ERROR: please make init of the '#{init}' using 'ruby dialog.rb init #{init}"
           exit(false)
-        end
-        args[:tdlib][init.to_sym] = Dialog::TDLib.tdlibInit(init)        
       end
-      args[:tdlib].freeze
+      sess = Dialog::TDLib.tdlibInit
+      sess.on_ready do |client|
+        a = client.fetch('@type' => 'getMe')
+        args[:globals][:cliId] = a['id'].to_i
+      end  
+
+      DRb.start_service("drbunix:./_data/tdlib/#{Dialog.config.naming.instance}/drb.sock", sess)
+      DRb.thread.join
     end
     
+    
   end
 end

data/lib/configuration.rb

@@ -25,56 +25,63 @@ module Dialog
         else        res = val 
       end
     else res = ENV[env]; end
-      puts err
     return res
   end    
   
   err = []
   app = 'Dialog'  
   
-  setting :api do
+  setting :tdlib do
     setting :id,     Dialog.checkEnv('ApiID',   false, err)
     setting :hash_s, Dialog.checkEnv('ApiHash', false, err)
+    setting :instance, Dialog.checkEnv('TdlibInstance', false, err)    
   end
   
+  _scope = Dialog.checkEnv('runScope', false, err)
+  _mode =  Dialog.checkEnv('runMode',  false, err)
+  _instance = Dialog.checkEnv('runInstance',  false, err)
   setting :run do
-    setting :scope, Dialog.checkEnv('runScope', false, err) 
-    setting :mode,  Dialog.checkEnv('runMode',  false, err)
+    setting :scope, _scope 
+    setting :mode,  _mode
   end  
   
   setting :naming do
     setting :app, app
   end
 
-  unless Dialog.checkEnv('runScope', false, err) == 'init'
-    namingFull = Dialog.checkEnv('BotFullname',  false, err)
+  _interface = Dialog.checkEnv('Interface', 'Demo')
+  unless _scope == 'deploy' or _mode == 'background'
     token = Dialog.checkEnv('BotToken',  false, err)    
     
     setting :naming do    
       setting :app, app
-      setting :full, namingFull
-      if /__/.match? namingFull
-        setting :interface, namingFull.split('__')[0]
-        setting :instance,  namingFull.split('__')[0]   
+      setting :interface, _interface      
+      unless _instance == false
+        setting :instance, _instance
       else
-        err << "Error in naming!"
+        err << "No instance!"        
       end
       setting :id, token.split(':')[0].to_i unless token == false
     end  
     
     setting :dialect do
-      setting :folder, Dialog.checkEnv('DialectFolder', false, err)
-      setting :sqlite, Dialog.checkEnv('DialectSqlite', '/tmp/dialect.sqlite')
-    end    
-    
-    setting :db do
-      setting :redis_url,  "./_data/redis/redis.sock"
+      setting :sqlite, Dialog.checkEnv('DialectSqlite', "#{Dialog.getDialogPath}/dialect/dialect.sqlite")
+      setting :json,   Dialog.checkEnv('DialectJSON',   "#{Dialog.getDialogPath}/dialect/#{_interface}.json")      
     end    
     
     setting :secure do
       setting :token,  token
     end     
   end
+  
+  setting :db do
+    setting :redis_url,  "./_data/redis/redis.sock"
+    setting :redisDBBackground, 0    
+    setting :redisDBStore, 1
+    setting :redisDBStat, 2
+    setting :redisDBCache, 3    
+    
+  end     
 
   setting :proxy do
     setting :type,  Dialog.checkEnv('BotProxyType',  false, err)
@@ -89,16 +96,13 @@ module Dialog
     setting :dialog_rubyLib,"#{Dialog.getDialog_rubyPath}"
     setting :dialog,        "#{Dialog.getDialogPath}"        
     setting :dialogData,    "#{Dialog.getDialogPath}/_data"    
-    setting :dialogRender,  "#{Dialog.getDialogPath}/#{namingFull}/_render"    
+    setting :dialogRender,  "#{Dialog.getDialogPath}/_render/#{_instance}"
+    setting :dialogTmpfiles,"#{Dialog.getDialogPath}/_render/#{_instance}/tmpfiles"        
   end 
   
-  setting :common do
-    setting :mode,   Dialog.checkEnv('runMode', false, err) 
-  end
-  
   setting :log do
     setting :base,  Dialog.checkEnv('LogLevel', 'info')
-    setting :tdlib, Dialog.checkEnv('TdlibLoglevel', 9)
+    setting :tdlib, Dialog.checkEnv('LogLevel', 1)
   end  
   
   setting :monitoring do
@@ -112,14 +116,22 @@ module Dialog
     setting :web_hook_url, "https://#{botInstanceHostName}/telegram/api/web_hook"    
   end 
   
-  if Dialog.checkEnv('runScope', false, err) == false and Dialog.checkEnv('runMode', false, err) == false 
-   FileUtils.cp "#{Dialog.getDialog_rubyPath}/../exec/dialog.sh", "#{Dialog.getDialogPath}/" if not File.file?("#{Dialog.getDialogPath}/dialog.sh")
-   Dialog.logger.info "dialog.sh is copied to your dialog folder, please use it for correct ENV exports!"
+  if _scope == false 
+    case _mode
+    when false 
+      FileUtils.cp "#{Dialog.getDialog_rubyPath}/../exec/dialog.sh", "#{Dialog.getDialogPath}/" if not File.file?("#{Dialog.getDialogPath}/dialog.sh")
+      Dialog.logger.info "dialog.sh is copied to your dialog folder, please use it for correct ENV exports,\nbash ./dialog.sh"
+      Dialog.logger.info "Deploying dialog base"   
+      deploy = true
+    when 'dev'
+      deploy = true
+    end
+    Dialog::Triggers.trigger_deploy if deploy == true
   end
   
   unless err.empty?
     err << "EXITING!"
-    puts err
+    Dialog.logger.debug "ERRORS: #{err}"
     exit(false)
   end
 end

data/lib/dialect/canvas/element/send/Inline_query_result.rb

@@ -18,12 +18,14 @@ module Dialog
           args[:smsg] ||={}
           args[:x].has_key?(:dataResp) ? results = args[:x][:dataResp] : results = makeInline_query_resultArticle(args, props, viewId)        
           args[:smsg][:results] = results
+          return Dialog::BotApi.apiAction(args)        
       end
       
       def send_DialogElementSendInline_query_resultDocument(args)
           args[:smsg] ||={}
           args[:x].has_key?(:dataResp) ? results = args[:x][:dataResp] : results = makeInline_query_resultDocument(args, props, viewId)        
           args[:smsg][:results] = results
+          return Dialog::BotApi.apiAction(args)        
       end    
       
     end

data/lib/dialect/canvas/element/send/background.rb

@@ -0,0 +1,28 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    License    \ \ \ \ 
+##    Copyleft culture, Copyright (C) is prohibited here
+##    This work is licensed under a CC BY-SA 4.0
+##    Creative Commons Attribution-ShareAlike 4.0 License
+##    Refer to the http://creativecommons.org/licenses/by-sa/4.0/
+########    #######    ########    #######    ########    ########
+##    / / / /    Code Climate    \ \ \ \ 
+##    Language = ruby
+##    Indent = space;    2 chars;
+########    #######    ########    #######    ########    ########
+
+module Dialog
+  module ElementSend
+    class << self
+
+    
+      def send_DialogElementSendExecBackground(args)
+        require "#{Dialog.config.path.dialog_ruby}/background/batch"        
+        res = Dialog::Background::BotApi.perform_async(Dialog.config.naming.instance, args[:mmsg])               
+        Dialog.logger.debug "Async result: '#{res}'"      
+      end  
+      
+
+    end
+  end
+end
+#     

data/lib/dialect/canvas/element/send/recognize.rb

@@ -16,7 +16,7 @@ module Dialog
 
     
       def send_DialogElementSendRecognizeCode(args)
-        name = "#{Dialog.config.path.render}/_tmpfiles/#{Dialog::Wrappers.downloadFile(args)}"
+        name = "#{Dialog.config.path.dialogTmpfiles}/#{Dialog::Wrappers.downloadFile(args)}"
         attrs, stderr_str, status = Open3.capture3('/usr/bin/zbarimg', "-q", name)
         
         unless attrs == ""
@@ -29,7 +29,8 @@ module Dialog
           text = answer_DialogModSendRecognizeCommonAction_fail
         end
         args[:smsg][:text] = text
-        args[:x][:dataRespRaw] = response      
+        args[:x][:dataRespRaw] = response  
+        send_DialogElementSendBot_messageSend(args)                
       end  
       
         def answer_DialogModSendRecognizeCommonAction_success(codeType, response)

data/lib/dialect/canvas/element/send/restrict.rb

@@ -22,7 +22,6 @@ module Dialog
         args[:smsg][:can_send_media_messages] = false
         args[:smsg][:can_send_other_messages] = false
         args[:smsg][:can_add_web_page_previews] = false
-        
         return Dialog::BotApi.apiAction(args)        
       end       
       

data/lib/dialect/canvas/element/send/tdlib_chat.rb

@@ -19,7 +19,7 @@ module Dialog
         args[:smsg]['title'] = 'test'    
         args[:smsg]['is_channel'] = false
         args[:smsg]['description'] = 'description'           
-        args[:tdlib][:cli].on_ready do |client| 
+        args[:globals][:tdlibUser].on_ready do |client| 
           group = client.broadcast_and_receive(args[:smsg]) 
           Dialog.logger.debug "#### group created - #{group}"
         end

data/lib/dialect/canvas/element/send/tdlib_message.rb

@@ -15,7 +15,7 @@ module Dialog
     class << self
       
       def send_DialogElementSendTdlib_messageSend(args)
-        args[:tdlib][:cli].on_ready do |client|
+        args[:globals][:tdlibUser].on_ready do |client|
           args[:smsg]['@type'] = 'sendMessage'
           
           if args[:smsg][:chat_id] == args[:mmsg][:fqndata][:o][:from][:id]

data/lib/dialect/codegen/codegen.rb

@@ -48,15 +48,15 @@ module Dialog
           nameSym = runProps[:name].to_sym        
           data = args[:dialect][:perView][Dialog.config.naming.app.to_sym]
           if data.is_a?(Hash)          
-            data.each do |viewId, viewProps|      
-              if runProps[:erb] == 1 && data[viewId][runProps[:name]].is_a?(Hash)
-                Dialog.logger.debug "### erb - #{runProps}"
-                fullName = "#{runProps[:order]}_#{runProps[:name]}_#{viewId}"
-                fullNameSym = fullName.to_sym
-              
-                tmpl = ERB.new(File.read("#{File.dirname(__FILE__)}/erb/#{stage}/#{runProps[:order]}.#{runProps[:name]}.erb")).result(binding)
-                runProps.has_key?(:erb_order) ? rname = "#{runProps[:erb_order]}_#{fullName}" : rname = fullName              
-                File.open("#{Dialog.config.path.dialogRender}/code_#{type}/#{stage}__#{rname}.rb", 'w') do |f| f.write tmpl; end   
+            data.each do |viewId, viewProps|                  
+              if runProps[:erb] == 1 && data[viewId].is_a?(Hash) and data[viewId][runProps[:name]].is_a?(Hash)
+                  Dialog.logger.debug "### erb - #{runProps}"
+                  fullName = "#{runProps[:order]}_#{runProps[:name]}_#{viewId}"
+                  fullNameSym = fullName.to_sym
+                
+                  tmpl = ERB.new(File.read("#{File.dirname(__FILE__)}/erb/#{stage}/#{runProps[:order]}.#{runProps[:name]}.erb")).result(binding)
+                  runProps.has_key?(:erb_order) ? rname = "#{runProps[:erb_order]}_#{fullName}" : rname = fullName              
+                  File.open("#{Dialog.config.path.dialogRender}/code_#{type}/#{stage}__#{rname}.rb", 'w') do |f| f.write tmpl; end   
               end
             end  
           end

data/lib/dialect/codegen/erb/functional/2.2.1.Events2ModReceive.erb

@@ -30,18 +30,41 @@ module Dialog
                 <% hash_tOID.each do |tOID, prop| 
 
                   prop[:tProp][:op] == "=~" ? valuePrefix = "/" : valuePrefix = "\""
-                  prop[:tProp][:value].to_s === prop[:tProp][:value].to_i.to_s ? value = prop[:tProp][:value] : value = "#{valuePrefix}#{prop[:tProp][:value]}#{valuePrefix}" %>         
+                  prop[:tProp][:value].to_s === prop[:tProp][:value].to_i.to_s ? value = prop[:tProp][:value] : value = "#{valuePrefix}#{prop[:tProp][:value]}#{valuePrefix}"
+                  /[*.,.*]/.match?(value) ? valueArr = value[2..-3].split(",") : valueArr = false %>         
+                  
                   ## <%= prop[:tName]%>
                   ## <%= prop[:fFqn]%> ->> <%= tFqn%>
-                    if args[:mmsg][:fqndata]<%= prop[:tProp][:key]%> <%= prop[:tProp][:op]%> <%= value %>
+                  <% if valueArr.is_a?(Array)
+                    res = ""
+                    i = 0
+                    valueArr.each do |v|
+                      res = res + "args[:mmsg][:fqndata]#{prop[:tProp][:key]} #{prop[:tProp][:op]} '#{v}' "
+                      i += 1
+                      i < valueArr.count ? res = res + " or " : true
+                    end %>
+                    if  <%= res %>              
+                  <% else %>
+                    if args[:mmsg][:fqndata]<%= prop[:tProp][:key]%> <%= prop[:tProp][:op]%> <%= value %>                  
+                  <% end %>
                       args[:x][:labels] = {} if args[:x][:labels] == 'next'
                       args[:x][:labels][:oid_<%= prop[:tOID]%>] = true
                       Dialog.logger.debug "### ADD LABEL: <%= prop[:tProp][:key]%> = #{args[:mmsg][:fqndata]<%= prop[:tProp][:key]%>} <%= prop[:tProp][:op]%> %Q[#{<%= value %>}]"
                       <% if args[:dialect][:perView][Dialog.config.naming.app.to_sym][viewId][:ModReceive2GetData].is_a?(Hash)
                       if args[:dialect][:perView][Dialog.config.naming.app.to_sym][viewId][:ModReceive2GetData][:repack][:tOID][tOID.to_sym].is_a?(Hash) 
                           case args[:dialect][:perView][Dialog.config.naming.app.to_sym][viewId][:ModReceive2GetData][:repack][:tOID][tOID.to_sym][:fFqn]
-                          when "#{Dialog.config.naming.app}ArchiGetdataField" %>
-                            args[:x][:dataReq] = args[:mmsg][:fqndata]<%= prop[:tProp][:key]%>
+                          when "#{Dialog.config.naming.app}ArchiGetdataField"
+                            if prop[:tProp].has_key?(:vAction) and prop[:tProp].has_key?(:vFrom) and prop[:tProp].has_key?(:vTo)
+                              case prop[:tProp][:vAction]
+                                when 'sub' %>
+                                args[:x][:dataReq] =  args[:mmsg][:fqndata]<%= prop[:tProp][:key]%>.sub("<%=  prop[:tProp][:vFrom] %>", "<%= prop[:tProp][:vTo] %>")
+                                Dialog.logger.debug "@@@ SUB - #{args[:x][:dataReq]}"
+                              <% when 'replace' %>
+                                args[:x][:dataReq] =  args[:mmsg][:fqndata]<%= prop[:tProp][:key]%> ## TODO
+                              <% end %>
+                            <% else %>
+                              args[:x][:dataReq] = args[:mmsg][:fqndata]<%= prop[:tProp][:key]%>                  
+                            <% end %>                          
                           <% when "#{Dialog.config.naming.app}ArchiGetdataFixed" %>
                             args[:x][:dataReq] = "<%= args[:dialect][:perView][Dialog.config.naming.app.to_sym][viewId][:ModReceive2GetData][:repack][:tOID][tOID.to_sym][:fProp][:data] %>"
                           <%  end %>