tgbot 0.1.6 → 0.2.2

data/lib/tgbot.rb

@@ -1,5 +1,291 @@
 require 'tgbot/version'
-require 'tgbot/core'
-require 'tgbot/update'
-require 'tgbot/runner'
-require 'tgbot/dsl'
+
+require 'http'
+require 'mimemagic'
+require 'ostruct'
+require 'json'
+require 'psych'
+
+class Tgbot
+  APIDOC = Psych.load_file File.join __dir__, 'api.yaml'
+
+  def self.run(*args, &blk)
+    bot = new(*args)
+    bot.instance_exec(bot, &blk) if blk
+    bot.run
+  end
+
+  attr_accessor :debug
+
+  def initialize(token, proxy: nil, debug: false)
+    @prefix = "/bot#{token}"
+    @client = HTTP.persistent "https://api.telegram.org"
+    if proxy
+      addr, port = *proxy.split(':')
+      @client = @client.via(addr, port.to_i)
+    end
+    @debug = debug
+    @commands = []
+    @start = @finish = nil
+  end
+
+  def start &blk
+    @start = blk
+  end
+
+  def finish &blk
+    @finish = blk
+  end
+
+  def on pattern=nil, name: nil, before_all: false, after_all: false, &blk
+    if before_all && after_all
+      raise ArgumentError, 'before_all and after_all can\'t both be true'
+    end
+    @commands << [pattern, name, before_all, after_all, blk]
+  end
+
+  def debug msg
+    STDERR.puts "#{Time.now.strftime "%FT%T"} #{msg}" if @debug
+  end
+
+  class Update
+    attr_reader :bot, :data
+
+    def initialize bot, data
+      @bot = bot
+      @data = data
+    end
+
+    def interrupt!
+      @bot.instance_variable_get(:@tasks).clear
+    end
+
+    alias done! interrupt!
+
+    def retry! n=1
+      @retried ||= n
+      return if @retried <= 0
+      @bot.instance_variable_get(:@updates) << self
+      @retried -= 1
+    end
+
+    def match? pattern
+      return true if pattern.nil?
+      return false if text.nil?
+      !!match(pattern)
+    end
+
+    def match pattern
+      return nil if pattern.nil? || text.nil?
+      text.match(pattern)
+    end
+
+    def message
+      @data.to_h.find { |k, v| k.match? /message|post/ }&.last
+    end
+
+    def text
+      message&.text&.gsub(/(\/\w+)(@\w+)/, '\1')
+    end
+
+    def reply *things, media: true, style: nil, **options
+      meth = :send_message
+      payload = { chat_id: message&.chat.id }
+      things.each do |x|
+        if IO === x
+          magic = MimeMagic.by_magic(x)
+          case
+          when magic.audio?
+            meth = :send_audio
+            payload[:audio] = x
+          when magic.image?
+            meth = :send_photo
+            payload[:photo] = x
+          when magic.video?
+            meth = :send_video
+            payload[:video] = x
+          else
+            meth = :send_document
+            payload[:document] = x
+          end
+        else
+          payload[:text] = x.to_s
+          payload[:parse_mode] = 'Markdown'
+        end
+      end
+      payload = payload.merge options
+      case style
+      when :at
+        if payload[:text] && message.from
+          from = message.from
+          if payload[:parse_mode].match? /Markdown/i
+            prefix = "[#{from.first_name}](tg://user?id=#{from.id}) "
+          elsif payload[:parse_mode].match? /HTML/i
+            prefix = "<a href=\"tg://user?id=#{from.id}\">#{from.first_name}</a> "
+          else
+            prefix = ''
+          end
+          payload[:text] = prefix + payload[:text]
+        end
+      when nil
+        if !payload[:reply_to_message_id]
+          payload[:reply_to_message_id] = message_id
+        end
+      end
+      @bot.send meth, payload
+    end
+
+    def message_id
+      message&.message_id
+    end
+
+    def method_missing meth, *args, &blk
+      return @data[meth] if args.empty? && @data[meth]
+      @bot.send(meth, *args, &blk)
+    end
+  end
+
+  def run &blk
+    @offset = 0
+    @timeout = 2
+    @updates = []
+    instance_exec(self, &@start) if @start
+    loop do
+      while x = @updates.shift
+        u = Update === x ? x : Update.new(self, x)
+        @offset = u.update_id if u.update_id && @offset < u.update_id
+        @tasks = @commands.select { |pattern, *| u.match? pattern }
+          .group_by { |e| e[2] ? :before : e[3] ? :after : nil }
+          .values_at(:before, nil, :after).compact.flatten(1)
+        while t = @tasks.shift
+          debug ">> #{t[1] || t[0]}"
+          u.instance_exec(u.match(t[0]), u, t, &t[4])
+        end
+      end
+      res = get_updates offset: @offset + 1, limit: 7, timeout: 15
+      if res.ok
+        @updates.push *res.result
+      else
+        debug "#{res.error_code}: #{res.description}"
+      end
+    end
+  rescue HTTP::ConnectionError
+    debug "connect failed, check proxy?"
+    retry
+  rescue Interrupt
+    instance_exec(self, &@finish) if @finish
+  ensure
+    @client.close
+  end
+
+  def api_version
+    search_in_doc(/changes/i, '')[0].desc[0].content[/\d+\.\d+/]
+  end
+
+  private
+
+  def method_missing meth, *args, &blk
+    meth = meth.to_s.split('_').map.
+      with_index { |x, i| i.zero? ? x : (x[0].upcase + x[1..-1]) }.join
+    payload = make_payload meth, *args
+    debug "/#{meth} #{payload}"
+    result = @client.post("#@prefix/#{meth}", form: payload).to_s
+    result = json_to_ostruct(result)
+    debug "=> #{result}"
+    blk ? blk.call(result) : result
+  end
+
+  def json_to_ostruct json
+    JSON.parse(json, object_class: OpenStruct)
+  end
+
+  def make_payload meth, *args
+    defaults, schema = meth_info meth
+    payload = {}
+    args.each do |arg|
+      if field = defaults.find { |k, _| k.any? { |l| check_match l, arg } }&.last
+        defaults.delete_if { |_, v| v == field }
+        payload[field] = arg
+      end
+      if Hash === arg
+        defaults.delete_if { |_, v| arg.keys.include?(v) || arg.keys.include?(v.to_sym) }
+        payload = payload.merge arg
+      end
+    end
+    if !defaults.empty?
+      debug "should 400: #{defaults.values.join(', ')} not specified"
+    end
+    check_type payload, schema
+  end
+
+  def meth_info meth
+    unless table = (search_in_doc '', /^#{meth}$/)[0]&.table
+      debug "don't find type of #{meth}"
+      return {}, {}
+    end
+    defaults = table.select { |e| e.Required.match? /Yes/i }
+      .map { |e|
+        [e.Type.split(/\s+or\s+/).flat_map { |s| 
+          string_to_native_types s, false
+        }.compact, e.Parameter]
+      }.reject { |(ts, _para)| ts.empty? }.to_h
+    schema = table
+      .map { |e|
+        [e.Parameter, e.Type.split(/\s+or\s+/).map { |s|
+          string_to_native_types s
+        }]
+      }.to_h
+    return defaults, schema
+  end
+
+  def string_to_native_types s, keep_unknown=true
+    if s['Array of ']
+      return [string_to_native_types(s[9..-1], keep_unknown)]
+    end
+    case s
+    when 'String'  then String
+    when 'Integer' then Integer
+    when 'Boolean' then [true, false]
+    else
+      keep_unknown ? s : nil
+    end
+  end
+
+  def check_match k, arg
+    if Array === k
+      if k.size > 1
+        k.any? { |t| t === arg }
+      else
+        Array === arg && arg.all? { |a| check_match k[0], a }
+      end
+    else
+      return true if String === k # unknown types, like "User"
+      k === arg
+    end
+  end
+
+  def check_type payload, schema
+    filtered = {}
+    payload.each do |field, value|
+      row = schema[field.to_s]
+      if row&.any? { |k| check_match k, value }
+        filtered[field] = value
+      else
+        debug "check_type failed at #{field} :: #{row&.join(' | ')} = #{value.inspect}"
+      end
+    end
+    filtered
+  end
+
+  def search_in_doc *hints
+    doc = [APIDOC]
+    hints.each do |hint|
+      if nxt = doc.flat_map { |x| x['children'] }.select { |x| x['name'][hint] }
+        doc = nxt
+      else
+        return nil
+      end
+    end
+    json_to_ostruct JSON.generate doc
+  end
+end

data/lib/tgbot/version.rb

@@ -1,3 +1,3 @@
-module Tgbot
-  VERSION = '0.1.6'.freeze
+class Tgbot
+  VERSION = '0.2.2'.freeze
 end

data/tgbot.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["hyrious@outlook.com"]
 
   spec.summary       = 'Telegram Bot API'
-  spec.description   = 'Telegram Bot API Wrapper'
+  spec.description   = 'A deadly simple Telegram Bot API wrapper.'
   spec.homepage      = 'https://github.com/hyrious/tgbot'
   spec.license       = "MIT"
 
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency 'faraday'
+  spec.add_dependency 'http'
   spec.add_dependency 'mimemagic'
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.6.0'
 end

data/tool/gen.rb

@@ -0,0 +1,32 @@
+require 'http'
+require 'nokogiri'
+
+raw = HTTP.via('127.0.0.1', 1080).get('https://core.telegram.org/bots/api').to_s
+nodes = Nokogiri::HTML(raw).at('#dev_page_content').children
+ret = [{ name: 'Telegram Bot API', children: [] }]
+uplevels = [2]
+nodes.each do |node|
+  case node.name
+  when 'h3', 'h4'
+    n = node.name[/\d/].to_i
+    while uplevels[-1] >= n
+      ret.pop
+      uplevels.pop
+    end
+    ret[-1][:children] << (x = { name: node.content, children: [] })
+    ret << x
+    uplevels << n
+  when 'h6', 'p', 'blockquote', 'pre'
+    (ret[-1]['desc'] ||= []) << { name: node.name, content: node.content.strip }
+  when 'ul', 'ol'
+    (ret[-1]['desc'] ||= []) << { name: node.name, content: node.css('li').map(&:content).map(&:strip) }
+  when 'table'
+    keys = node.css('th').map(&:content)
+    ret[-1]['table'] = node.css('tbody > tr').map do |tr|
+      keys.zip(tr.css('td').map(&:content)).to_h
+    end
+  end
+end
+ret = JSON.parse JSON.generate ret[0]
+require 'psych'
+open(File.expand_path('../lib/api.yaml', __dir__), 'wb') { |f| Psych.dump ret, f, line_width: 1<<30 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tgbot
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.2
 platform: ruby
 authors:
 - hyrious
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Telegram Bot API Wrapper
+description: A deadly simple Telegram Bot API wrapper.
 email:
 - hyrious@outlook.com
 executables: []
@@ -80,25 +80,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- example.rb
-- lib/methods.json
+- lib/api.yaml
 - lib/tgbot.rb
-- lib/tgbot/core.rb
-- lib/tgbot/dsl.rb
-- lib/tgbot/runner.rb
-- lib/tgbot/update.rb
 - lib/tgbot/version.rb
-- lib/types.json
 - tgbot.gemspec
-- tools/gen_methods_json.rb
-- tools/gen_methods_txt.rb
-- tools/gen_types_json.rb
-- tools/gen_types_txt.rb
-- tools/methods.json
-- tools/methods.txt
-- tools/types.json
-- tools/types.txt
-- usage.md
+- tool/gen.rb
 homepage: https://github.com/hyrious/tgbot
 licenses:
 - MIT
@@ -111,15 +97,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Telegram Bot API

data/example.rb

@@ -1,110 +0,0 @@
-require 'json'
-require 'faraday'
-require './helper'
-save_pid
-require 'tgbot'
-Garage = load_data.shuffle
-Cache = {}
-TOKEN = 
-Tgbot.run TOKEN, proxy: 'http://127.0.0.1:1080' do |bot|
-
-  bot.start do
-    log "\e[33m#{bot.name}\e[32m, at your service.", 2
-  end
-  bot.finish do
-    log "byebye.", 2
-  end
-
-  bot.get 'start' do
-    send_message(<<~EOF, parse_mode: 'Markdown')
-      ```
-      start : 显示此帮助信息
-      drive : 随机返回一张车库里的图
-              对该图回复 “原图” : 返回原图
-      exchange 100 CNY to JPY : 汇率转换
-      register : 添加自定义功能（会先提交给作者）
-      ```
-    EOF
-  end
-
-  bot.get 'drive' do
-    pic = Garage.pop
-    log ">> Sending #{File.basename(pic)} to @#{message.from.username} ##{id}", 6
-    bytes = File.size pic
-    size = hsize bytes
-    reply "正在发车 (#{size} #{htime(bytes / 30720)})"
-    x = reply_photo pic, caption: File.basename(pic, '.*')
-    if self.done = x['ok']
-      Cache["drive_#{x['result']['message_id']}"] = pic
-    end
-    self.done! if self.count > 1
-  end
-  bot.get '原图' do
-    x = message&.reply_to_message&.message_id
-    pic = Cache["drive_#{x}"]
-    unless pic
-      reply '没找到原图，重开'
-      next
-    end
-    log ">> Sending original #{File.basename(pic)} to @#{message.from.username} ##{id}", 6
-    reply_document pic
-  end
-
-  bot.get 'exchange' do
-    x = text&.match /([-+]?[1-9]\d*(\.\d+)?)\s*([A-Z]+)\s*to\s*([A-Z]+)/
-    unless x
-      reply 'Usage: exchange 100 CNY to JPY'
-      next
-    end
-    n, f, t = x.values_at 1, 3, 4
-    n = Float(n) rescue next
-    Cache["exchange_#{f}"] ||= JSON.parse Faraday.get("http://api.fixer.io/latest?base=#{f}").body
-    next unless Cache["exchange_#{f}"] && !Cache["exchange_#{f}"]['error']
-    next unless Cache["exchange_#{f}"]['rates'][t]
-    n *= Cache["exchange_#{f}"]['rates'][t]
-    t = Cache["exchange_#{f}"]['date']
-    reply "#{'%.2f' % n} (#{t})"
-  end
-
-  bot.before do |update|
-    log ">> Processing ##{update.id}"
-    log "@#{update.message&.from&.first_name}: #{update.text}", 3
-  end
-  bot.after do |update|
-    if update.done?
-      log "=> Success ##{update.id}", 2
-    else
-      log "?> Retry ##{update.id}", 3
-    end
-  end
-
-  bot.get 'register' do
-    e = message&.entities&.find { |e| e.type == 'pre' }
-    if e.nil?
-      send_message(<<~EOF)
-        register <功能名>
-        ```
-        get /command/ do |matched|
-          # your code here
-        end
-        ```
-      EOF
-      next
-    end
-    open 'register.rb', 'a' do |f|
-      f.puts text[e.offset, e.length]
-    end
-    reply '脚本已备分'
-  end
-
-  bot.get 'coin' do
-    send_message Array.new(text&.match(/\d+/)&.to_s.to_i || 1){ ['🌞', '🌚'].sample }.join
-  end
-  bot.get 'roll' do
-    send_message rand(text&.match(/\d+/)&.to_s.to_i.nonzero? || 100).to_s
-  end
-
-end
-
-save_data Garage
-delete_pid