linerb 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc0f82cf83433cc6e798d54d542ffe15839587526c60eab38a8ded0846882aea
-  data.tar.gz: 38bc0d916bc2f9d857b9740e3a27f4d931d6dcbb27695251708e4e5dbcacbf27
+  metadata.gz: 17f457c799b2f67ead8e2f61b0e28314232079148ce66ab42a7d6d200919a799
+  data.tar.gz: 9752ea144bab0281aabe9b3a7d88020937967b6961d34dcbb8cb7b92e40811ec
 SHA512:
-  metadata.gz: 69487a94fe2dc9c9170d16c945ef5010ce96d6a0c6fbcc897e52b92296177a8b123638fb8e55b1eddc42eba743887f02f141bbf4d47db6800e491728fb9eb376
-  data.tar.gz: c4f65d968af9e5c843e9b3325e9f12b1afc93470e2c6f1529423cebd0a5e35840605854919e278dd7a4146cdf528849b6bf9993b083719f316e9ade4e4d6a473
+  metadata.gz: 763a3c93dd1cc72c35a26c6b8ec91e6d0f5eb56db71de00e55028b6f29624f6f64ace53b9ae4248b775bd90f9445573ed55ba8540c7c8a10c27c4e6ffd6533d0
+  data.tar.gz: 2cdae63e62fd54b5138298d65642c835ca5edeb89779b0676c69775885d7c94eff1d9cd34cf7efa418c0e2d846c293ce7cae61cdf40ba32b451e2bd02ab0f112

data/lib/linerb.rb

@@ -1 +1,5 @@
 require 'linerb/client'
+require 'linerb/api/talkApi'
+require 'linerb/api/pollApi'
+
+require 'async'

data/lib/linerb/api/pollApi.rb

@@ -1 +1,44 @@
-#in progress
+require_relative 'pollRecv'
+
+require 'time'
+
+class PollApi
+  def initialize(client)
+    @client = client
+  end
+
+  def api_fetch_operations
+    recv = PollRecv.new
+
+    rev = @client.getLastOpRevision()
+
+    @local_rev = rev
+
+    last_rev = rev
+
+    while true do
+      begin
+        operations = @client.fetchOperations(@local_rev, 50)
+
+        operations.each { |op|
+
+          if op::type == J0_a_e_a_b_nd::END_OF_OPERATION || op::type == J0_a_e_a_b_nd::DUMMY
+            next
+          end
+
+          @local_rev = op::revision
+
+          if last_rev < op::revision
+            last_rev = op::revision
+            Async do
+              recv.op_process(op)
+            end
+          end
+        }
+
+      rescue Net::ReadTimeout
+        retry
+      end
+    end
+  end
+end

data/lib/linerb/api/pollRecv.rb

@@ -0,0 +1,3 @@
+class PollRecv
+  def op_process(op) end
+end

data/lib/linerb/api/talkApi.rb

@@ -1,13 +1,21 @@
-$:.push('./gen-rb')
-
 class TalkApi
   def initialize(client)
     @client = client
+    @reqSeq = 0
   end
 end
-  def api_sendMessage(text:, to:)
-    mes = Message.new
-    mes:: text = text
-    mes::to = to
-    @client.sendMessage(0, mes)
-    end
+
+def api_sendMessage(text:, to:, **param)
+  mes = Message.new
+  mes::text = text
+  mes::to = to
+  mes::contentType = param[:contentType]
+  @client.sendMessage(@reqSeq += 1, mes)
+end
+
+def api_deleteOtherFromChat(chatMid:, targetUserMids:)
+  del = DeleteOtherFromChatRequest.new
+  del::chatMid = chatMid
+  del::targetUserMids = "[#{targetUserMids}]"
+  @client.deleteOtherFromChat(0, del)
+end

data/lib/linerb/auth.rb

@@ -1,6 +1,3 @@
-$:.push('./gen-rb')
-
-require 'thrift'
 require 'openssl'
 require "base64"
 require 'cgi'
@@ -16,9 +13,9 @@ begin
 
   class Auth
 
-    def initialize(authToken:, certificate:)
-      @a = authToken
-      @c = certificate
+    def initialize(auth_token:, certificate:)
+      @auth = auth_token
+      @cert = certificate
 
       #authToken login is in progress
     end
@@ -28,95 +25,99 @@ begin
       transport = Thrift::HTTPClientTransport.new(url)
       transport.add_headers(headers)
 
-      protocol = Thrift::CompactProtocol.new(transport)
-
-      return protocol
+      Thrift::CompactProtocol.new(transport)
     end
 
     def login
       protocol = client_proto(Config::LOGIN_URL, Config::HEADERS)
-      loginClient = SecondaryQrcodeLoginService::Client.new(protocol)
+      login_client = SecondaryQrcodeLoginService::Client.new(protocol)
 
-      sessionId = loginClient.createSession(CreateQrSessionRequest).authSessionId
+      session_id = login_client.createSession(CreateQrSessionRequest).authSessionId
 
       qr_req = CreateQrCodeRequest.new
-      qr_req::authSessionId = sessionId
+      qr_req::authSessionId = session_id
 
-      qr_url = loginClient.createQrCode(qr_req).callbackUrl
+      qr_url = login_client.createQrCode(qr_req).callbackUrl
 
       secret = Base64.strict_encode64(SecureRandom.base64(32))
       version = 1
       e2ee = "?secret=#{secret}" + "&e2eeVersion=#{version}"
-      puts "[LOGIN] => " + qr_url + e2ee
+      puts "LINE-RB: [LOGIN] => #{qr_url}#{e2ee}"
 
       Config::HEADERS[:"X-Line-Access"] = ""
 
       protocol = client_proto(Config::PERMIT_NOTICE_URL, Config::HEADERS)
-      certClient = SecondaryQrCodeLoginPermitNoticeService::Client.new(protocol)
+      cert_client = SecondaryQrCodeLoginPermitNoticeService::Client.new(protocol)
 
       qr_check = CheckQrCodeVerifiedRequest.new
-      qr_check::authSessionId = sessionId
+      qr_check::authSessionId = session_id
 
       begin
-        certClient.checkQrCodeVerified(qr_check)
+        cert_client.checkQrCodeVerified(qr_check)
 
       rescue Net::ReadTimeout
-        puts "[Timeout] QrCode verification"
+        puts "\nLINE-RB: [Timeout] QrCode verification\n"
         exit(1)
       end
 
       Config::HEADERS.delete(:"X-Line-Access") #=> ""
 
       protocol = client_proto(Config::LOGIN_URL, Config::HEADERS)
-      loginClient = SecondaryQrcodeLoginService::Client.new(protocol)
+      login_client = SecondaryQrcodeLoginService::Client.new(protocol)
 
       begin
 
         certificate_check = VerifyCertificateRequest.new
-        certificate_check::authSessionId = sessionId
-        certificate_check::certificate = @certificate
+        certificate_check::authSessionId = session_id
+        certificate_check::certificate = @cert
 
-        loginClient.verifyCertificate(certificate_check)
+        login_client.verifyCertificate(certificate_check)
 
         login_req = QrCodeLoginRequest.new
-        login_req.authSessionId = sessionId
+        login_req.authSessionId = session_id
         login_req.systemName = "Ruby on Rails"
         login_req.autoLoginIsRequired = FALSE
 
-        res = loginClient.qrCodeLogin(login_req)
+        res = login_client.qrCodeLogin(login_req)
 
-        puts "[CERT] => " + res.certificate
-        puts "[TOKEN] => " + res.accessToken
+        #DO NOT SHOW IN PUBLIC
+        #DO NOT EDIT IF YOU DONT KNOW WHAT YOU ARE DOING
+        #puts "LINE-RB: [CERT] " + Base64.strict_encode64(res.certificate)
+        #puts "LINE-RB: [TOKEN] " + Base64.strict_encode64(res.accessToken)
 
         Config::HEADERS[:"X-Line-Access"] = res.accessToken
 
       rescue SecondaryQrCodeException
         pin_req = CreatePinCodeRequest.new
-        pin_req::authSessionId = sessionId
-        pincode = loginClient.createPinCode(pin_req).pinCode
+        pin_req::authSessionId = session_id
+        pincode = login_client.createPinCode(pin_req).pinCode
 
-        if pincode != nil then
-          puts "[PIN] => " + pincode
+        if pincode != nil
+          puts "LINE-RB: [PIN] => #{pincode}\n"
           pin_check = CheckPinCodeVerifiedRequest.new
-          pin_check::authSessionId = sessionId
+          pin_check::authSessionId = session_id
 
           begin
-            certClient.checkPinCodeVerified(pin_check)
+            cert_client.checkPinCodeVerified(pin_check)
 
             login_req = QrCodeLoginRequest.new
-            login_req.authSessionId = sessionId
+            login_req.authSessionId = session_id
             login_req.systemName = "Ruby on Rails"
             login_req.autoLoginIsRequired = FALSE
 
-            res = loginClient.qrCodeLogin(login_req)
+            res = login_client.qrCodeLogin(login_req)
 
-            puts "[CERT] => " + res.certificate
-            puts "[TOKEN] => " + res.accessToken
+            #DO NOT SHOW IN PUBLIC
+            #DO NOT EDIT IF YOU DONT KNOW WHAT YOU ARE DOING
+            #puts "LINE-RB: [CERT] " + Base64.strict_encode64(res.certificate)
+            #puts "LINE-RB: [TOKEN] " + Base64.strict_encode64(res.accessToken)
 
             Config::HEADERS[:"X-Line-Access"] = res.accessToken
 
+            puts "\nLINE-RB: [LOGIN SUCCESS]\n"
+
           rescue Net::ReadTimeout
-            puts "[Timeout] PinCode verification"
+            puts "\nLINE-RB: [Timeout] PinCode verification\n"
             exit(1)
           end
         end

data/lib/linerb/client.rb

@@ -1,38 +1,32 @@
-$:.push('./gen-rb')
-
 require_relative 'auth'
 require_relative 'gen-rb/talk_service'
 
 class LineClient
 
-  def initialize(authToken:, certificate:)
-    @a = authToken
-    @c = certificate
-  end
-
-  def doAuthService
-    Auth.new(authToken: @a, certificate: @c).login
+  def initialize(auth_token:, certificate:)
+    @auth = auth_token
+    @cert = certificate
   end
 
-  def getTalkService
+  def get_talk_service
     transport = Thrift::HTTPClientTransport.new(Config::TALK_SERVICE_V4_URL)
     transport.add_headers(Config::HEADERS)
 
     protocol = Thrift::CompactProtocol.new(transport)
 
-    client = TalkService::Client.new(protocol)
-
-    return client
+    TalkService::Client.new(protocol)
   end
 
-  def getPollService
+  def get_poll_service
     transport = Thrift::HTTPClientTransport.new(Config::POLL_SERVICE_V4_URL)
     transport.add_headers(Config::HEADERS)
 
     protocol = Thrift::CompactProtocol.new(transport)
 
-    client = TalkService::Client.new(protocol)
+    TalkService::Client.new(protocol)
+  end
 
-    return client
+  def do_auth_service
+    Auth.new(auth_token: @auth, certificate: @cert).login
   end
 end

data/lib/linerb/config.rb

@@ -1,14 +1,15 @@
 module Config
-  HOST_URL = "https://legy-jp-addr.line.naver.jp"
+  HOST_URL = "https://legy-backup.line.naver.jp"
   LOGIN_URL = HOST_URL + "/acct/lgn/sq/v1"
   PERMIT_NOTICE_URL = HOST_URL + "/acct/lp/lgn/sq/v1"
 
-  TALK_SERVICE_V4_URL = HOST_URL + "/S4"
+  TALK_SERVICE_V4_URL = HOST_URL + "/F4"
   POLL_SERVICE_V4_URL = HOST_URL + "/P4"
 
   HEADERS = {
-      "User-Agent": "LLA/2.11.1 Nexus 5X 10",
-      "X-Line-Application": "ANDROIDLITE\t2.11.1\tAndroid OS\t10.0;SECONDARY",
+      "User-Agent": "Mozilla/5.0 (Windows NT 6.1; rv:49.0) Gecko/20100101 Firefox/49.0",
+      "X-Line-Application": "DESKTOPWIN\t6.3.1.2337\tDESKTOP_WIN\t10;SECONDARY",
       "x-lal": "ja_jp",
   }
+
 end

data/lib/linerb/gen-rb/takagi_chan_constants.rb

@@ -5,5 +5,5 @@
 #
 
 require 'thrift'
-require_relative 'takagi_chan_types'
+require 'takagi_chan_types'
 

data/lib/linerb/gen-rb/talk_service.rb

@@ -89,6 +89,38 @@ module TalkService
       return
     end
 
+    def getLastOpRevision()
+      send_getLastOpRevision()
+      return recv_getLastOpRevision()
+    end
+
+    def send_getLastOpRevision()
+      send_message('getLastOpRevision', GetLastOpRevision_args)
+    end
+
+    def recv_getLastOpRevision()
+      result = receive_message(GetLastOpRevision_result)
+      return result.success unless result.success.nil?
+      raise result.e unless result.e.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getLastOpRevision failed: unknown result')
+    end
+
+    def fetchOperations(localRev, count)
+      send_fetchOperations(localRev, count)
+      return recv_fetchOperations()
+    end
+
+    def send_fetchOperations(localRev, count)
+      send_message('fetchOperations', FetchOperations_args, :localRev => localRev, :count => count)
+    end
+
+    def recv_fetchOperations()
+      result = receive_message(FetchOperations_result)
+      return result.success unless result.success.nil?
+      raise result.e unless result.e.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'fetchOperations failed: unknown result')
+    end
+
     def fetchOps(localRev, count, globalRev, individualRev)
       send_fetchOps(localRev, count, globalRev, individualRev)
       return recv_fetchOps()
@@ -1517,6 +1549,28 @@ module TalkService
       write_result(result, oprot, 'sendPostback', seqid)
     end
 
+    def process_getLastOpRevision(seqid, iprot, oprot)
+      args = read_args(iprot, GetLastOpRevision_args)
+      result = GetLastOpRevision_result.new()
+      begin
+        result.success = @handler.getLastOpRevision()
+      rescue ::TalkException => e
+        result.e = e
+      end
+      write_result(result, oprot, 'getLastOpRevision', seqid)
+    end
+
+    def process_fetchOperations(seqid, iprot, oprot)
+      args = read_args(iprot, FetchOperations_args)
+      result = FetchOperations_result.new()
+      begin
+        result.success = @handler.fetchOperations(args.localRev, args.count)
+      rescue ::TalkException => e
+        result.e = e
+      end
+      write_result(result, oprot, 'fetchOperations', seqid)
+    end
+
     def process_fetchOps(seqid, iprot, oprot)
       args = read_args(iprot, FetchOps_args)
       result = FetchOps_result.new()
@@ -2649,6 +2703,75 @@ module TalkService
     ::Thrift::Struct.generate_accessors self
   end
 
+  class GetLastOpRevision_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class GetLastOpRevision_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+    E = 1
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::I64, :name => 'success'},
+      E => {:type => ::Thrift::Types::STRUCT, :name => 'e', :class => ::TalkException}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class FetchOperations_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    LOCALREV = 2
+    COUNT = 3
+
+    FIELDS = {
+      LOCALREV => {:type => ::Thrift::Types::I64, :name => 'localRev'},
+      COUNT => {:type => ::Thrift::Types::I32, :name => 'count'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class FetchOperations_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+    E = 1
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Operation}},
+      E => {:type => ::Thrift::Types::STRUCT, :name => 'e', :class => ::TalkException}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
   class FetchOps_args
     include ::Thrift::Struct, ::Thrift::Struct_Union
     LOCALREV = 2

data/lib/linerb/version.rb

@@ -1,3 +1,3 @@
 module Linerb
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linerb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - TakagiChan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0.0
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.26.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.26.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +75,7 @@ extra_rdoc_files: []
 files:
 - lib/linerb.rb
 - lib/linerb/api/pollApi.rb
+- lib/linerb/api/pollRecv.rb
 - lib/linerb/api/talkApi.rb
 - lib/linerb/auth.rb
 - lib/linerb/client.rb