mixin_bot 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 844001cb92b3511f30cef15d4873763c9ff6f9d393d7ca8817afbad883ea4833
-  data.tar.gz: fb5e5e37129d3ccf01cb514fcf99c3539a9a73176d6c1d9ba5e3d35f48f55f8e
+  metadata.gz: d35e63d1229361b23be1356cd0d341662c5e33838dd0ba3f37afacd182c61dd4
+  data.tar.gz: b737b9d7ad6544ab5271433a920a0c37fdef126a9d0d6e2c730d65b9b40a4c6a
 SHA512:
-  metadata.gz: 6cc3caa449ef5bf0762c649e2be29b605b43e666d7ed651e7c01de6f590c88379b52510690fda86ceb411eaad62e2fc7a725c9eaea49d2a4979c5998eac63a02
-  data.tar.gz: 93cd21b8afd209f37e82f721eb99fa53abe30f435a78a701f34a9a9f259dff671e5544899e01cdded4ae5aef2682fd96ac1c1bd6027adcc5d6572b8cadba2d0b
+  metadata.gz: 5993dfafb5b91bdcf5b568f5458f51ce46911be312af5a3faa3fba221b073e3acfea037f5bd403eab952fc9790dd420d712a2321ec48583d5dd9a2b4a3ec657e
+  data.tar.gz: ebda3aeac025cf3e27840e6ac082cce436d87292ec22efd23aea7667c89c5b7e84ac83107125ff828df586c397f4511d8285cdd2cf0acf527d6ac2c2f1779448

data/lib/mixin_bot.rb

@@ -2,6 +2,7 @@
 
 require 'http'
 require 'base64'
+require 'faye/websocket'
 require 'openssl'
 require 'jwt'
 require 'jose'

data/lib/mixin_bot/api.rb

@@ -2,7 +2,9 @@
 
 require_relative './client'
 require_relative './errors'
+require_relative './api/attachment'
 require_relative './api/auth'
+require_relative './api/blaze'
 require_relative './api/conversation'
 require_relative './api/me'
 require_relative './api/message'
@@ -27,7 +29,9 @@ module MixinBot
       @client = Client.new
     end
 
+    include MixinBot::API::Attachment
     include MixinBot::API::Auth
+    include MixinBot::API::Blaze
     include MixinBot::API::Conversation
     include MixinBot::API::Me
     include MixinBot::API::Message

data/lib/mixin_bot/api/attachment.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module MixinBot
+  class API
+    module Attachment
+      # https://developers.mixin.one/api/beta-mixin-message/create-attachment/
+      # Sample Response
+      # {
+      #   "data":{
+      #     "type":"attachment",
+      #     "attachment_id":"7a54e394-1626-4cd4-b967-543932c2a032",
+      #     "upload_url":"https://moments-shou-tv.s3.amazonaws.com/mixin/attachments/xxx",
+      #     "view_url":"https://moments.shou.tv/mixin/attachments/1526305123xxxx"
+      #   }
+      # }
+      # Once get the upload_url, use it to upload the your file via PUT request
+      def create_attachment
+        path = '/attachments'
+        access_token ||= access_token('POST', path, {}.to_json)
+        authorization = format('Bearer %<access_token>s', access_token: access_token)
+        client.post(path, headers: { 'Authorization': authorization }, json: {})
+      end
+
+      def read_attachment(attachment_id)
+        path = format('/attachments/%<id>s', id: attachment_id)
+        access_token ||= access_token('GET', path, '')
+        authorization = format('Bearer %<access_token>s', access_token: access_token)
+        client.get(path, headers: { 'Authorization': authorization })
+      end
+    end
+  end
+end

data/lib/mixin_bot/api/auth.rb

@@ -34,7 +34,7 @@ module MixinBot
       end
 
       def request_oauth(scope = nil)
-        scope ||= (MixinBot.scope || 'PROFILE:READ+PHONE:READ')
+        scope ||= (MixinBot.scope || 'PROFILE:READ')
         format(
           'https://mixin.one/oauth/authorize?client_id=%<client_id>s&scope=%<scope>s',
           client_id: client_id,

data/lib/mixin_bot/api/blaze.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module MixinBot
+  class API
+    module Blaze
+      def blaze
+        access_token = access_token('GET', '/', '')
+        authorization = format('Bearer %<access_token>s', access_token: access_token)
+        Faye::WebSocket::Client.new(
+          'wss://blaze.mixin.one/',
+          ['Mixin-Blaze-1'],
+          headers: { 'Authorization' => authorization },
+          ping: 60
+        )
+      end
+
+      def start_blaze_connnect(reconnect = true, &_block)
+        ws ||= blaze
+        yield if block_given?
+
+        ws.on :open do |event|
+          if defined? on_open
+            on_open ws, event
+          else
+            p [Time.now.to_s, :open]
+            ws.send list_pending_message
+          end
+        end
+
+        ws.on :message do |event|
+          if defined? on_message
+            on_message ws, event
+          else
+            raw = JSON.parse read_ws_message(event.data)
+            p [Time.now.to_s, :message, raw&.[]('action')]
+
+            ws.send acknowledge_message_receipt(raw['data']['message_id']) unless raw&.[]('data')&.[]('message_id').nil?
+          end
+        end
+
+        ws.on :error do |event|
+          if defined? on_error
+            on_error ws, event
+          else
+            p [Time.now.to_s, :error]
+          end
+        end
+
+        ws.on :close do |event|
+          if defined? on_close
+            on_close ws, event
+          else
+            p [Time.now.to_s, :close, event.code, event.reason]
+          end
+
+          ws = nil
+          start_blaze_connnect { yield } if reconnect
+        end
+      end
+    end
+  end
+end

data/lib/mixin_bot/api/conversation.rb

@@ -33,10 +33,11 @@ module MixinBot
         client.post(path, headers: { 'Authorization': authorization }, json: payload)
       end
 
-      def unique_conversation_id(user_id)
+      def unique_conversation_id(user_id, opponent_id = nil)
+        opponent_id ||= client_id
         md5 = Digest::MD5.new
-        md5 << [user_id, client_id].min
-        md5 << [user_id, client_id].max
+        md5 << [user_id, opponent_id].min
+        md5 << [user_id, opponent_id].max
         digest = md5.digest
         digest6 = (digest[6].ord & 0x0f | 0x30).chr
         digest8 = (digest[8].ord & 0x3f | 0x80).chr

data/lib/mixin_bot/api/message.rb

@@ -203,11 +203,33 @@ module MixinBot
         base_message_params(options)
       end
 
+      def recall_message_params(message_id, options)
+        raise 'recipient_id is required!' if options[:recipient_id].nil?
+
+        options.merge!(
+          category: 'MESSAGE_RECALL',
+          data: {
+            message_id: message_id
+          }
+        )
+        base_message_params(options)
+      end
+
       # base format of message params
-      def base_message_params(conversation_id:, category:, data:, quote_message_id: nil, message_id: nil)
+      def base_message_params(
+        conversation_id:,
+        category:,
+        data:,
+        quote_message_id: nil,
+        message_id: nil,
+        recipient_id: nil,
+        representative_id: nil
+      )
         data = data.is_a?(String) ? data : data.to_json
         {
           conversation_id: conversation_id,
+          recipient_id: recipient_id,
+          representative_id: representative_id,
           category: category,
           status: 'SENT',
           quote_message_id: quote_message_id,
@@ -258,6 +280,10 @@ module MixinBot
         send_message app_button_group(options)
       end
 
+      def recall_message(message_id, options)
+        send_message [recall_message_params(message_id, options)]
+      end
+
       # {
       #   "id": "UUID",
       #   "action": "CREATE_PLAIN_MESSAGES",
@@ -276,9 +302,8 @@ module MixinBot
       #     ]
       #   }
       # }
-      # not verified yet
       def send_plain_messages(messages)
-        send_message(messages: messages)
+        send_message messages
       end
 
       # http post request

data/lib/mixin_bot/api/pin.rb

@@ -15,14 +15,13 @@ module MixinBot
         client.post(path, headers: { 'Authorization': authorization }, json: payload)
       end
 
-      # not verified yet
+      # TODO:
       # https://developers.mixin.one/api/alpha-mixin-network/create-pin/
       def update_pin(old_pin:, new_pin:)
         path = '/pin/update'
-        timestamp = Time.now.utc.to_i
         payload = {
-          old_pin: old_pin.nil? ? '' : encrypt_pin(old_pin, timestamp: timestamp),
-          pin: encrypt_pin(new_pin, timestamp: timestamp)
+          old_pin: old_pin.nil? ? '' : encrypt_pin(old_pin),
+          pin: encrypt_pin(new_pin)
         }
 
         access_token = access_token('POST', path, payload.to_json)
@@ -47,13 +46,13 @@ module MixinBot
 
       # https://developers.mixin.one/api/alpha-mixin-network/encrypted-pin/
       # use timestamp(timestamp) for iterator as default: must be bigger than the previous, the first time must be greater than 0. After a new session created, it will be reset to 0.
-      def encrypt_pin(pin_code, timestamp: nil)
+      def encrypt_pin(pin_code, iterator: nil)
         aes_key = JOSE::JWA::PKCS1.rsaes_oaep_decrypt('SHA256', pin_token, private_key, session_id)
-        timestamp ||= Time.now.utc.to_i
-        tszero = timestamp % 0x100
-        tsone = (timestamp % 0x10000) >> 8
-        tstwo = (timestamp % 0x1000000) >> 16
-        tsthree = (timestamp % 0x100000000) >> 24
+        iterator ||= Time.now.utc.to_i
+        tszero = iterator % 0x100
+        tsone = (iterator % 0x10000) >> 8
+        tstwo = (iterator % 0x1000000) >> 16
+        tsthree = (iterator % 0x100000000) >> 24
         tsstring = tszero.chr + tsone.chr + tstwo.chr + tsthree.chr + "\0\0\0\0"
         encrypt_content = pin_code + tsstring + tsstring
         pad_count = 16 - encrypt_content.length % 16

data/lib/mixin_bot/api/snapshot.rb

@@ -3,7 +3,7 @@
 module MixinBot
   class API
     module Snapshot
-      def read_snapshots(options = {})
+      def read_network_snapshots(options = {})
         path = format(
           '/network/snapshots?limit=%<limit>s&offset=%<offset>s&asset=%<asset>s&order=%<order>s',
           limit: options[:limit],
@@ -11,21 +11,24 @@ module MixinBot
           asset: options[:asset],
           order: options[:order]
         )
+        client.get(path)
+      end
+
+      def read_snapshots(options = {})
+        path = format(
+          '/snapshots?limit=%<limit>s&offset=%<offset>s&asset=%<asset>s',
+          limit: options[:limit],
+          offset: options[:offset],
+          asset: options[:asset]
+        )
 
-        if options[:private]
-          # TODO:
-          # read private snapshots
-          access_token = access_token('GET', path)
-          authorization = format('Bearer %<access_token>s', access_token: access_token)
-          client.get(path, headers: { 'Authorization': authorization, 'Content-length': 0 })
-        else
-          # read public snapshots as default
-          client.get(path)
-        end
+        access_token = access_token('GET', path)
+        authorization = format('Bearer %<access_token>s', access_token: access_token)
+        client.get(path, headers: { 'Authorization': authorization })
       end
 
-      def read_snapshot(snapshot_id)
-        path = format('network/snapshots/%<snapshot_id>s', snapshot_id: snapshot_id)
+      def read_network_snapshot(snapshot_id)
+        path = format('/network/snapshots/%<snapshot_id>s', snapshot_id: snapshot_id)
         client.get(path)
       end
     end

data/lib/mixin_bot/api/transfer.rb

@@ -14,7 +14,7 @@ module MixinBot
         payload = {
           asset_id: asset_id,
           opponent_id: opponent_id,
-          pin: pin,
+          pin: encrypt_pin(pin),
           amount: amount.to_s,
           trace_id: trace_id,
           memo: memo

data/lib/mixin_bot/api/user.rb

@@ -38,7 +38,7 @@ module MixinBot
           public_key: rsa_key.public_key.to_pem
         }
       end
-      
+
       # https://developers.mixin.one/api/beta-mixin-message/search-user/
       # search by Mixin Id or Phone Number
       def search_user(query)

data/lib/mixin_bot/api/withdraw.rb

@@ -7,7 +7,7 @@ module MixinBot
       def create_withdraw_address(options)
         path = '/addresses'
         encrypted_pin = encrypt_pin(options[:pin])
-        payload = 
+        payload =
           # for EOS withdraw, account_name & account_tag must be valid
           if options[:public_key].nil?
             {
@@ -75,4 +75,4 @@ module MixinBot
       end
     end
   end
-end
+end

data/lib/mixin_bot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MixinBot
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,127 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - an-lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: jose
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.72'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.72'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.33'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.33'
 description: An API wrapper for Mixin Nexwork
 email:
 - an.lee.work@gmail.com
@@ -132,7 +146,9 @@ files:
 - MIT-LICENSE
 - lib/mixin_bot.rb
 - lib/mixin_bot/api.rb
+- lib/mixin_bot/api/attachment.rb
 - lib/mixin_bot/api/auth.rb
+- lib/mixin_bot/api/blaze.rb
 - lib/mixin_bot/api/conversation.rb
 - lib/mixin_bot/api/me.rb
 - lib/mixin_bot/api/message.rb
@@ -164,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: An API wrapper for Mixin Nexwork