insta 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da70366ba8d65dcdc2083d3409fa0b8e30c5f819dc4f6f6a934ba0cbb52ef618
-  data.tar.gz: cbe39575d60c95d609c4cb58ef364f5a1bb6e402ccbce97c1be9b9f9638fe91a
+  metadata.gz: bec08114e1b9f41bfef7edcbd86c95e32675740d16d0f3c0fad3d7fb532776c8
+  data.tar.gz: 9293e4e4e2e629f49cd1a3c864ad797a2406b6bad6fa0f12d4595f373159cca5
 SHA512:
-  metadata.gz: e17ccdb7aa662006c666abff601d10034ce68172efb9635bc71098f4b4dc97e80782b04d3d3df312e9a3f16efb175597fcfc55c5301a4c808ed59b74d1676174
-  data.tar.gz: 8e7bb62ac211ec5c79395c5ef0af06dddc8d7640de439942d1538ce91dd6ae1f2dd58ba3348b7aad7c373e32c692f3d13218d8840d07e928ea46a37b67816b65
+  metadata.gz: 7f962c4334dec673890eac92448a1f80f426ce3d0ddd1837482ee41f4d740c7561beb44982bdc726e5cab9b2e3e46d34d3381490a4286c25a242bfc7528debc7
+  data.tar.gz: 9ccc419917e4d8ac676ea8f6b0df85695909f11825773a4845d54ae7395226b920f9b587d9fb3cd22a5d2f589648f59cf6f40bde93d642c0d2ad97ea6a5066b7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    insta (0.2.1)
+    insta (0.2.2)
 
 GEM
   remote: https://rubygems.org/

data/insta.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Renan Garcia']
   spec.email         = ['email@renangarcia.me']
 
-  spec.summary       = 'Welcome to Insta gem! This Gem is hard fork from vicoerv/instagram-private-api and the implement from huttarichard/instagram-private-api'
+  spec.summary       = 'Welcome to Insta(pre-alpha) gem! This Gem is hard fork from vicoerv/instagram-private-api and the implement from huttarichard/instagram-private-api'
   spec.description   = spec.summary
   spec.homepage      = 'http://renangarcia.me'
   spec.license       = 'MIT'

data/lib/insta.rb

@@ -7,3 +7,4 @@ require 'insta/api'
 require 'insta/constants'
 require 'insta/device'
 require 'insta/user'
+require 'insta/proxy_manager'

data/lib/insta/api.rb

@@ -38,8 +38,14 @@ module Insta
 
     def self.http_desktop(args)
       args[:url] = URI.parse(args[:url])
-      proxy = args.dig(:proxys)&.sample || {}
-      http = Net::HTTP.new(args[:url].host, args[:url].port, proxy.dig(:host), proxy.dig(:port))
+      proxy = args[:proxy]
+
+      if proxy
+        http = Net::HTTP::Proxy(proxy.dig(:host), proxy.dig(:port), proxy.dig(:username), proxy.dig(:password)).new(args[:url].host, args[:url].port)
+      else
+        http = Net::HTTP.new(args[:url].host, args[:url].port)
+      end
+
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       request = nil
@@ -59,8 +65,14 @@ module Insta
 
     def self.http(args)
       args[:url] = URI.parse(args[:url])
-      proxy = args[:proxys].sample
-      http = Net::HTTP.new(args[:url].host, args[:url].port, proxy.dig(:host), proxy.dig(:port))
+      proxy = args[:proxy]
+
+      if proxy
+        http = Net::HTTP::Proxy(proxy.dig(:host), proxy.dig(:port), proxy.dig(:username), proxy.dig(:password)).new(args[:url].host, args[:url].port)
+      else
+        http = Net::HTTP.new(args[:url].host, args[:url].port)
+      end
+
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       request = nil

data/lib/insta/feed.rb

@@ -4,12 +4,14 @@ module Insta
       user_id = (!data[:id].nil? ? data[:id] : user.data[:id])
       rank_token = Insta::API.generate_rank_token user.session.scan(/ds_user_id=([\d]+);/)[0][0]
       endpoint = "https://i.instagram.com/api/v1/feed/user/#{user_id}/"
+      proxys = ProxyManager.new data[:proxys] unless data[:proxys].nil?
       param = "?rank_token=#{rank_token}" +
               (!data[:max_id].nil? ? '&max_id=' + data[:max_id] : '')
       result = Insta::API.http(
         url: endpoint + param,
         method: 'GET',
-        user: user
+        user: user,
+        proxy: proxys&.next
       )
 
       JSON.parse result.body
@@ -18,10 +20,12 @@ module Insta
     def self.user_media_graphql(user, data)
       user_id = (!data[:id].nil? ? data[:id] : user.data[:id])
       endpoint = "https://www.instagram.com/graphql/query/?query_id=17880160963012870&id=#{user_id}&first=80&after="
+      proxys = ProxyManager.new data[:proxys] unless data[:proxys].nil?
       result = Insta::API.http(
         url: endpoint,
         method: 'GET',
-        user: user
+        user: user,
+        proxy: proxys&.next
       )
 
       JSON.parse result.body
@@ -31,9 +35,10 @@ module Insta
       has_next_page = true
       followers = []
       user_id = (!data[:id].nil? ? data[:id] : user.data[:id])
+      proxys = ProxyManager.new data[:proxys] unless data[:proxys].nil?
       data[:rank_token] = Insta::API.generate_rank_token user.session.scan(/ds_user_id=([\d]+);/)[0][0]
       while has_next_page && limit > followers.size
-        response = user_followers_next_page(user, user_id, data)
+        response = user_followers_next_page(user, user_id, data, proxys)
         has_next_page = !response['next_max_id'].nil?
         data[:max_id] = response['next_max_id']
         followers += response['users']
@@ -45,8 +50,9 @@ module Insta
       has_next_page = true
       followers = []
       user_id = (!data[:id].nil? ? data[:id] : user.data[:id])
+      proxys = ProxyManager.new data[:proxys] unless data[:proxys].nil?
       while has_next_page && limit > followers.size
-        response = user_followers_graphql_next_page(user, user_id, data)
+        response = user_followers_graphql_next_page(user, user_id, data, proxys)
         has_next_page = response['data']['user']['edge_followed_by']['page_info']['has_next_page']
         data[:end_cursor] = response['data']['user']['edge_followed_by']['page_info']['end_cursor']
         followers += response['data']['user']['edge_followed_by']['edges']
@@ -54,25 +60,27 @@ module Insta
       limit.infinite? ? followers : followers[0...limit]
     end
 
-    def self.user_followers_graphql_next_page(user, user_id, data)
+    def self.user_followers_graphql_next_page(user, user_id, data, proxys)
       endpoint = "https://www.instagram.com/graphql/query/?query_id=17851374694183129&id=#{user_id}&first=5000"
       param = (!data[:end_cursor].nil? ? "&after=#{data[:end_cursor]}" : '')
       result = Insta::API.http(
         url: endpoint + param,
         method: 'GET',
-        user: user
+        user: user,
+        proxy: proxys&.next
       )
       JSON.parse result.body
     end
 
-    def self.user_followers_next_page(user, user_id, data)
+    def self.user_followers_next_page(user, user_id, data, proxys)
       endpoint = "https://i.instagram.com/api/v1/friendships/#{user_id}/followers/"
       param = "?rank_token=#{data[:rank_token]}" +
               (!data[:max_id].nil? ? '&max_id=' + data[:max_id] : '')
       result = Insta::API.http(
         url: endpoint + param,
         method: 'GET',
-        user: user
+        user: user,
+        proxy: proxys&.next
       )
       JSON.parse result.body
     end

data/lib/insta/proxy_manager.rb

@@ -0,0 +1,21 @@
+require 'securerandom'
+
+class ProxyManager
+  attr_reader :proxys
+  attr_writer :proxys
+
+  def initialize(proxys = [])
+    proxys.each do |proxy|
+      proxy[:id] = SecureRandom.uuid
+      proxy[:last_use] = nil
+    end
+    @proxys = proxys
+  end
+
+  def next
+    return nil if @proxys.nil?
+    next_proxy = @proxys.sort_by { |proxy| proxy[:last_use] }.first
+    next_proxy[:last_use] = Time.now
+    next_proxy
+  end
+end

data/lib/insta/version.rb

@@ -1,3 +1,3 @@
 module Insta
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insta
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Renan Garcia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Welcome to Insta gem! This Gem is hard fork from vicoerv/instagram-private-api
+description: Welcome to Insta(pre-alpha) gem! This Gem is hard fork from vicoerv/instagram-private-api
   and the implement from huttarichard/instagram-private-api
 email:
 - email@renangarcia.me
@@ -81,6 +81,7 @@ files:
 - lib/insta/constants.rb
 - lib/insta/device.rb
 - lib/insta/feed.rb
+- lib/insta/proxy_manager.rb
 - lib/insta/user.rb
 - lib/insta/version.rb
 homepage: http://renangarcia.me
@@ -107,6 +108,6 @@ rubyforge_project:
 rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: Welcome to Insta gem! This Gem is hard fork from vicoerv/instagram-private-api
+summary: Welcome to Insta(pre-alpha) gem! This Gem is hard fork from vicoerv/instagram-private-api
   and the implement from huttarichard/instagram-private-api
 test_files: []