proxy-seller-user-api 2.1.0__tar.gz → 2.1.2__tar.gz

{proxy_seller_user_api-2.1.0 → proxy_seller_user_api-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxy_seller_user_api
-Version: 2.1.0
+Version: 2.1.2
 Summary: Client library for the proxy-seller.com Client API v2
 Home-page: https://github.com/proxy-seller/user-api-python
 Author: proxy-seller
@@ -93,9 +93,18 @@ api.setPaymentCode('paddle_subscription')
 api.prolongMake('ipv4', ['1.2.3.4'], '1m', paymentId='balance')  # the balance pays, not the card
 ```
 
-Within one level the server rule stays: when a call passes both, `paymentCode` wins over
-`paymentId`, and the same goes for the two setters. When one `Api` instance is shared between
-threads, pass the payment with each call instead of switching the default.
+Within one call the server rule stays: when a call passes both, `paymentCode` wins over
+`paymentId`. The two setters replace each other — the last one called wins, as in the Java, PHP
+and Go SDKs:
+
+```python
+api.setPaymentCode('paddle_subscription')
+api.setPaymentId('balance')  # the default is now the balance; the card code is cleared
+```
+
+Before 2.1.1 the code set by `setPaymentCode()` outlived a later `setPaymentId()`, so the switch
+above kept charging the saved card. When one `Api` instance is shared between threads, pass the
+payment with each call instead of switching the default.
 
 `balancePaymentsList()` is not the place to pick an order payment from: it lists the systems for
 topping the balance up with `balanceAdd()` and never includes the balance itself. That top-up is
@@ -659,6 +668,19 @@ Downloads return a file, not the envelope: `text/plain` for `txt` and custom tem
 `proxyDownload('subresident', package_key='KEY')` for a subpackage and
 `proxyDownloadResident(id=...)` for the main package.
 
+Residential lines take the connection scheme in `protocol` (`http` or `socks5`) and the gateway
+in `host`. With `txt` a line becomes `socks5://login:password@host:port`, `csv` keeps its
+columns, and a custom template gets the value in `%protocol%`; without `protocol` the lines have
+no scheme, as before. Login, password and ports are the same for both protocols. `socks5` also
+carries UDP and HTTP/3 (QUIC) to websites. Gateways: `res.proxy-seller.com` (Europe, the
+default), `us.res.proxy-seller.com`, `asia.res.proxy-seller.com` — pick the one closest to your
+server. This is not `proto`, which selects IPv4 ports:
+
+```python
+api.proxyDownloadResident(id='LIST_ID', protocol='socks5', host='us.res.proxy-seller.com')
+api.proxyDownload('subresident', ext='txt', package_key='KEY', protocol='http')
+```
+
 ## Resident and subuser lists
 
 `resident/lists` returns a **flat array** (no `items` wrapper).
@@ -713,6 +735,14 @@ api.residentSubUserListDelete('PACKAGE_KEY', 561)  # {'status': 'delete'} | {'st
   `*Code` options are optional; `rotationId` never takes a code.
 - `authActive(id, "Y")` became `authChange(id, True)`.
 - `ping()` and `proxyCheck()` have no v2 equivalent.
+- API errors raise `ApiError`, which subclasses `Exception`, not `ValueError`. 1.x raised a bare
+  `ValueError` with the first message, so `except ValueError:` no longer catches API errors —
+  catch `ApiError`; it carries `code`, `errors` and `http_status`. `ValueError` / `TypeError`
+  come from the SDK's own argument checks, before anything is sent.
+- There is no default payment system. 1.x sent `paymentId=1` on orders and `29` from
+  `balanceAdd()` — v1 numeric ids that v2 refuses (`Incorrect payment system`). Call
+  `setPaymentCode('balance')` (or `'paddle_subscription'`) or pass the payment per call;
+  `balanceAdd()` takes an id from `balancePaymentsList()`.
 - `residentListDelete()` sends the ID in the request body.
 - `balanceAdd()` uses its explicit `paymentId`, then falls back to `setPaymentId()`;
   `paymentCode` is not accepted here.
@@ -785,6 +815,18 @@ Changes made after the 2.0 release, in the order the server shipped them:
 - **The API key no longer appears in errors.** A network error used to carry the request URL,
   key included, in its message and in the chained `requests` exception — see
   [The API key in errors and logs](#the-api-key-in-errors-and-logs).
+- **2.1.1: the two payment setters replace each other.** `setPaymentId()` after
+  `setPaymentCode()`, or the other way round, switches the client's default: the last call wins,
+  as in the Java, PHP and Go SDKs. Before, the code outlived a later `setPaymentId()`, so
+  `setPaymentCode('paddle_subscription')` followed by `setPaymentId('balance')` still charged the
+  saved card.
+- **2.1.1: `{type}` is URL-encoded in the path** of `reference/list`, `proxy/list`,
+  `proxy/download`, `prolong/*` and `autoprolong/*`, as in the other SDKs. A `/` in the value
+  used to split the path, and the request queue then took a `prolong/make` call for a read.
+- **Unreleased: `protocol` and `host` in residential exports.** `proxyDownloadResident()` takes
+  `protocol=` and `host=`, and `proxyDownload('subresident', ...)` passes them on as filters: the
+  connection scheme (`http` / `socks5`) and the gateway in the lines. Without them the request and
+  the lines are the same as before — see [Proxies](#proxies).
 
 ## Tests
 

{proxy_seller_user_api-2.1.0 → proxy_seller_user_api-2.1.2}/README.md

@@ -49,9 +49,18 @@ api.setPaymentCode('paddle_subscription')
 api.prolongMake('ipv4', ['1.2.3.4'], '1m', paymentId='balance')  # the balance pays, not the card
 ```
 
-Within one level the server rule stays: when a call passes both, `paymentCode` wins over
-`paymentId`, and the same goes for the two setters. When one `Api` instance is shared between
-threads, pass the payment with each call instead of switching the default.
+Within one call the server rule stays: when a call passes both, `paymentCode` wins over
+`paymentId`. The two setters replace each other — the last one called wins, as in the Java, PHP
+and Go SDKs:
+
+```python
+api.setPaymentCode('paddle_subscription')
+api.setPaymentId('balance')  # the default is now the balance; the card code is cleared
+```
+
+Before 2.1.1 the code set by `setPaymentCode()` outlived a later `setPaymentId()`, so the switch
+above kept charging the saved card. When one `Api` instance is shared between threads, pass the
+payment with each call instead of switching the default.
 
 `balancePaymentsList()` is not the place to pick an order payment from: it lists the systems for
 topping the balance up with `balanceAdd()` and never includes the balance itself. That top-up is
@@ -615,6 +624,19 @@ Downloads return a file, not the envelope: `text/plain` for `txt` and custom tem
 `proxyDownload('subresident', package_key='KEY')` for a subpackage and
 `proxyDownloadResident(id=...)` for the main package.
 
+Residential lines take the connection scheme in `protocol` (`http` or `socks5`) and the gateway
+in `host`. With `txt` a line becomes `socks5://login:password@host:port`, `csv` keeps its
+columns, and a custom template gets the value in `%protocol%`; without `protocol` the lines have
+no scheme, as before. Login, password and ports are the same for both protocols. `socks5` also
+carries UDP and HTTP/3 (QUIC) to websites. Gateways: `res.proxy-seller.com` (Europe, the
+default), `us.res.proxy-seller.com`, `asia.res.proxy-seller.com` — pick the one closest to your
+server. This is not `proto`, which selects IPv4 ports:
+
+```python
+api.proxyDownloadResident(id='LIST_ID', protocol='socks5', host='us.res.proxy-seller.com')
+api.proxyDownload('subresident', ext='txt', package_key='KEY', protocol='http')
+```
+
 ## Resident and subuser lists
 
 `resident/lists` returns a **flat array** (no `items` wrapper).
@@ -669,6 +691,14 @@ api.residentSubUserListDelete('PACKAGE_KEY', 561)  # {'status': 'delete'} | {'st
   `*Code` options are optional; `rotationId` never takes a code.
 - `authActive(id, "Y")` became `authChange(id, True)`.
 - `ping()` and `proxyCheck()` have no v2 equivalent.
+- API errors raise `ApiError`, which subclasses `Exception`, not `ValueError`. 1.x raised a bare
+  `ValueError` with the first message, so `except ValueError:` no longer catches API errors —
+  catch `ApiError`; it carries `code`, `errors` and `http_status`. `ValueError` / `TypeError`
+  come from the SDK's own argument checks, before anything is sent.
+- There is no default payment system. 1.x sent `paymentId=1` on orders and `29` from
+  `balanceAdd()` — v1 numeric ids that v2 refuses (`Incorrect payment system`). Call
+  `setPaymentCode('balance')` (or `'paddle_subscription'`) or pass the payment per call;
+  `balanceAdd()` takes an id from `balancePaymentsList()`.
 - `residentListDelete()` sends the ID in the request body.
 - `balanceAdd()` uses its explicit `paymentId`, then falls back to `setPaymentId()`;
   `paymentCode` is not accepted here.
@@ -741,6 +771,18 @@ Changes made after the 2.0 release, in the order the server shipped them:
 - **The API key no longer appears in errors.** A network error used to carry the request URL,
   key included, in its message and in the chained `requests` exception — see
   [The API key in errors and logs](#the-api-key-in-errors-and-logs).
+- **2.1.1: the two payment setters replace each other.** `setPaymentId()` after
+  `setPaymentCode()`, or the other way round, switches the client's default: the last call wins,
+  as in the Java, PHP and Go SDKs. Before, the code outlived a later `setPaymentId()`, so
+  `setPaymentCode('paddle_subscription')` followed by `setPaymentId('balance')` still charged the
+  saved card.
+- **2.1.1: `{type}` is URL-encoded in the path** of `reference/list`, `proxy/list`,
+  `proxy/download`, `prolong/*` and `autoprolong/*`, as in the other SDKs. A `/` in the value
+  used to split the path, and the request queue then took a `prolong/make` call for a read.
+- **Unreleased: `protocol` and `host` in residential exports.** `proxyDownloadResident()` takes
+  `protocol=` and `host=`, and `proxyDownload('subresident', ...)` passes them on as filters: the
+  connection scheme (`http` / `socks5`) and the gateway in the lines. Without them the request and
+  the lines are the same as before — see [Proxies](#proxies).
 
 ## Tests
 

{proxy_seller_user_api-2.1.0 → proxy_seller_user_api-2.1.2}/proxy_seller_user_api/__init__.py

@@ -614,6 +614,10 @@ class Api:
         paymentCode, пара setPaymentId()/setPaymentCode() в этот запрос не подмешивается вовсе
         (см. _payment_for).
 
+        setPaymentId() и setPaymentCode() вытесняют друг друга: выигрывает последний вызов, как
+        в Java, PHP и Go. Раньше код клиента был старше id, и setPaymentId('balance') после
+        setPaymentCode('paddle_subscription') оставлял оплату привязанной картой.
+
         Заказы и продления оплачиваются только балансом или привязанной картой: здесь
         подходят 'balance' и 'paddle_subscription' — код (сервер, не найдя ObjectId,
         резолвит значение как код) либо ObjectId одной из этих двух систем; остальные
@@ -623,6 +627,8 @@ class Api:
         (самого баланса в этом списке нет), см. balanceAdd.
         """
         self.paymentId = id
+        if id is not None:
+            self.paymentCode = None
 
     def getPaymentId(self):
         return self.paymentId
@@ -634,8 +640,12 @@ class Api:
 
         Значение ПО УМОЛЧАНИЮ для клиента, как и setPaymentId(): платёжка, переданная в вызов
         (paymentId или paymentCode), главнее, и тогда пара клиента не уходит вовсе.
+
+        Сбрасывает setPaymentId(): выигрывает последний из двух вызовов (см. setPaymentId).
         """
         self.paymentCode = code
+        if code is not None:
+            self.paymentId = None
 
     def getPaymentCode(self):
         return self.paymentCode
@@ -1150,7 +1160,7 @@ class Api:
         """
         if type is None:
             return self.request('GET', 'reference/list')
-        return self.request('GET', 'reference/list/' + str(type))
+        return self.request('GET', 'reference/list/' + self._segment(type))
 
     def prepare(self, **kwargs):
         return self.filterNone(dict(kwargs))
@@ -1169,6 +1179,16 @@ class Api:
         """Задано ли значение для сервера: None и строка из одних пробелов — "не задано"."""
         return value is not None and str(value).strip() != ''
 
+    @staticmethod
+    def _segment(value):
+        """
+        Значение {type} для пути — URL-кодированным одним сегментом, как в Java, PHP и Go.
+
+        Без кодирования '/' в значении дробил путь на лишние сегменты, и очередь относила
+        такой вызов не к своей категории (prolong/make/{type} — к чтению с его мягким разбором).
+        """
+        return quote(str(value), safe='')
+
     def _payment_for(self, values, fields=('paymentId', 'paymentCode')):
         """
         Платёжка клиента для тела запроса — с учётом платёжки самого вызова.
@@ -1897,7 +1917,7 @@ class Api:
                 mix_isp — все активные прокси выбранных заказов.
         """
         values = self._order_options(options, prolong_options)
-        return self.request('POST', 'prolong/calc/' + type,
+        return self.request('POST', 'prolong/calc/' + self._segment(type),
                             json=self.prepareProlong(ids, periodId, coupon, values, type))
 
     def prolongMake(self, type, ids=None, periodId=None, coupon='', options=None, **prolong_options):
@@ -1934,7 +1954,7 @@ class Api:
         # в errors[{code:16}], разбирается общим кодом конверта. Единственным оставшимся её
         # эффектом было превращать ЛЕГИТИМНЫЙ "status: success" с пустым orderId в фальшивую
         # ошибку — уже ПОСЛЕ списания денег, потеряв total/balance/listBaseOrderNumbers.
-        return self.request('POST', 'prolong/make/' + type,
+        return self.request('POST', 'prolong/make/' + self._segment(type),
                             json=self.prepareProlong(ids, periodId, coupon, values, type))
 
     # --------------------------- Auto prolong ---------------------------
@@ -2078,7 +2098,7 @@ class Api:
         values = self._order_options(options, autoprolong_options)
         payload = self.prepareAutoProlong(ids, periodId, values, type)
         self._assert_auto_prolong_payment(payload)
-        return self.request('POST', 'autoprolong/calc/' + type, json=payload)
+        return self.request('POST', 'autoprolong/calc/' + self._segment(type), json=payload)
 
     def autoProlongEnable(self, type, ids=None, periodId=None, options=None, **autoprolong_options):
         """
@@ -2109,7 +2129,7 @@ class Api:
         values = self._order_options(options, autoprolong_options)
         payload = self.prepareAutoProlong(ids, periodId, values, type)
         self._assert_auto_prolong_payment(payload)
-        return self.request('POST', 'autoprolong/enable/' + type, json=payload)
+        return self.request('POST', 'autoprolong/enable/' + self._segment(type), json=payload)
 
     def autoProlongDisable(self, type, ids=None, options=None, **autoprolong_options):
         """
@@ -2139,7 +2159,7 @@ class Api:
         """
         self._assert_auto_prolong_type(type)
         values = self._order_options(options, autoprolong_options)
-        return self.request('POST', 'autoprolong/disable/' + type,
+        return self.request('POST', 'autoprolong/disable/' + self._segment(type),
                             json=self.prepareAutoProlong(ids, None, values, type))
 
     # --------------------------- Proxy ---------------------------
@@ -2169,7 +2189,7 @@ class Api:
         params = self.filterNone(filters)
         if type is None:
             return self.request('GET', 'proxy/list', params=params)
-        return self.request('GET', 'proxy/list/' + str(type), params=params)
+        return self.request('GET', 'proxy/list/' + self._segment(type), params=params)
 
     def proxyDownload(self, type, ext=None, proto=None, listId=None, **filters):
         """
@@ -2186,7 +2206,10 @@ class Api:
                 csv — '%ip%;%port%;%login%;%password%'). Ограничения см. assertExt().
             proto (str): https | socks5 | None (иные значения сервер игнорирует)
             listId (str): only for resident-family types
-            filters: package_key (ТОЛЬКО subresident), country (код страны), ends
+            filters: package_key (ТОЛЬКО subresident), country (код страны), ends,
+                protocol и host — схема (http | socks5) и шлюз в строках резидентов, только
+                resident и subresident (см. proxyDownloadResident()). protocol — это не proto:
+                proto выбирает порты IPv4
 
         Note:
             Для резидентских листов основного пакета используйте proxyDownloadResident().
@@ -2204,9 +2227,10 @@ class Api:
                 "for the main resident package use proxyDownloadResident().")
         params = {'ext': self.assertExt(ext), 'proto': proto, 'listId': listId}
         params.update(filters)
-        return self.request('GET', 'proxy/download/' + type, params=self.filterNone(params))
+        return self.request('GET', 'proxy/download/' + self._segment(type),
+                            params=self.filterNone(params))
 
-    def proxyDownloadResident(self, id=None, ext=None, maxLine=None):
+    def proxyDownloadResident(self, id=None, ext=None, maxLine=None, protocol=None, host=None):
         """
         Export the resident proxy list (файл, attachment).
 
@@ -2219,12 +2243,20 @@ class Api:
                 это не ObjectId.
             ext (str): txt | csv | кастомный шаблон (см. proxyDownload)
             maxLine (int): Maximum number of lines.
+            protocol (str): http | socks5. При txt строка становится
+                ``socks5://login:password@host:port``, csv не меняется, кастомный шаблон
+                получает значение в %protocol%; None — строки без схемы, как раньше. Логин,
+                пароль и порты у обоих протоколов одни; socks5 несёт ещё UDP и HTTP/3 (QUIC)
+                к сайтам. Не путать с proto у proxyDownload(): тот выбирает порты IPv4.
+            host (str): шлюз — res.proxy-seller.com (по умолчанию), us.res.proxy-seller.com,
+                asia.res.proxy-seller.com.
 
         Returns:
             str: The exported proxies.
         """
         return self.request('GET', 'proxy/download/resident', params=self.filterNone(
-            {'id': id, 'ext': self.assertExt(ext), 'maxLine': maxLine}))
+            {'id': id, 'ext': self.assertExt(ext), 'maxLine': maxLine,
+             'protocol': protocol, 'host': host}))
 
     #: Допустимые значения type у proxy/replace — ПРИЧИНА замены.
     PROXY_REPLACE_TYPES = (

{proxy_seller_user_api-2.1.0 → proxy_seller_user_api-2.1.2}/proxy_seller_user_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxy_seller_user_api
-Version: 2.1.0
+Version: 2.1.2
 Summary: Client library for the proxy-seller.com Client API v2
 Home-page: https://github.com/proxy-seller/user-api-python
 Author: proxy-seller
@@ -93,9 +93,18 @@ api.setPaymentCode('paddle_subscription')
 api.prolongMake('ipv4', ['1.2.3.4'], '1m', paymentId='balance')  # the balance pays, not the card
 ```
 
-Within one level the server rule stays: when a call passes both, `paymentCode` wins over
-`paymentId`, and the same goes for the two setters. When one `Api` instance is shared between
-threads, pass the payment with each call instead of switching the default.
+Within one call the server rule stays: when a call passes both, `paymentCode` wins over
+`paymentId`. The two setters replace each other — the last one called wins, as in the Java, PHP
+and Go SDKs:
+
+```python
+api.setPaymentCode('paddle_subscription')
+api.setPaymentId('balance')  # the default is now the balance; the card code is cleared
+```
+
+Before 2.1.1 the code set by `setPaymentCode()` outlived a later `setPaymentId()`, so the switch
+above kept charging the saved card. When one `Api` instance is shared between threads, pass the
+payment with each call instead of switching the default.
 
 `balancePaymentsList()` is not the place to pick an order payment from: it lists the systems for
 topping the balance up with `balanceAdd()` and never includes the balance itself. That top-up is
@@ -659,6 +668,19 @@ Downloads return a file, not the envelope: `text/plain` for `txt` and custom tem
 `proxyDownload('subresident', package_key='KEY')` for a subpackage and
 `proxyDownloadResident(id=...)` for the main package.
 
+Residential lines take the connection scheme in `protocol` (`http` or `socks5`) and the gateway
+in `host`. With `txt` a line becomes `socks5://login:password@host:port`, `csv` keeps its
+columns, and a custom template gets the value in `%protocol%`; without `protocol` the lines have
+no scheme, as before. Login, password and ports are the same for both protocols. `socks5` also
+carries UDP and HTTP/3 (QUIC) to websites. Gateways: `res.proxy-seller.com` (Europe, the
+default), `us.res.proxy-seller.com`, `asia.res.proxy-seller.com` — pick the one closest to your
+server. This is not `proto`, which selects IPv4 ports:
+
+```python
+api.proxyDownloadResident(id='LIST_ID', protocol='socks5', host='us.res.proxy-seller.com')
+api.proxyDownload('subresident', ext='txt', package_key='KEY', protocol='http')
+```
+
 ## Resident and subuser lists
 
 `resident/lists` returns a **flat array** (no `items` wrapper).
@@ -713,6 +735,14 @@ api.residentSubUserListDelete('PACKAGE_KEY', 561)  # {'status': 'delete'} | {'st
   `*Code` options are optional; `rotationId` never takes a code.
 - `authActive(id, "Y")` became `authChange(id, True)`.
 - `ping()` and `proxyCheck()` have no v2 equivalent.
+- API errors raise `ApiError`, which subclasses `Exception`, not `ValueError`. 1.x raised a bare
+  `ValueError` with the first message, so `except ValueError:` no longer catches API errors —
+  catch `ApiError`; it carries `code`, `errors` and `http_status`. `ValueError` / `TypeError`
+  come from the SDK's own argument checks, before anything is sent.
+- There is no default payment system. 1.x sent `paymentId=1` on orders and `29` from
+  `balanceAdd()` — v1 numeric ids that v2 refuses (`Incorrect payment system`). Call
+  `setPaymentCode('balance')` (or `'paddle_subscription'`) or pass the payment per call;
+  `balanceAdd()` takes an id from `balancePaymentsList()`.
 - `residentListDelete()` sends the ID in the request body.
 - `balanceAdd()` uses its explicit `paymentId`, then falls back to `setPaymentId()`;
   `paymentCode` is not accepted here.
@@ -785,6 +815,18 @@ Changes made after the 2.0 release, in the order the server shipped them:
 - **The API key no longer appears in errors.** A network error used to carry the request URL,
   key included, in its message and in the chained `requests` exception — see
   [The API key in errors and logs](#the-api-key-in-errors-and-logs).
+- **2.1.1: the two payment setters replace each other.** `setPaymentId()` after
+  `setPaymentCode()`, or the other way round, switches the client's default: the last call wins,
+  as in the Java, PHP and Go SDKs. Before, the code outlived a later `setPaymentId()`, so
+  `setPaymentCode('paddle_subscription')` followed by `setPaymentId('balance')` still charged the
+  saved card.
+- **2.1.1: `{type}` is URL-encoded in the path** of `reference/list`, `proxy/list`,
+  `proxy/download`, `prolong/*` and `autoprolong/*`, as in the other SDKs. A `/` in the value
+  used to split the path, and the request queue then took a `prolong/make` call for a read.
+- **Unreleased: `protocol` and `host` in residential exports.** `proxyDownloadResident()` takes
+  `protocol=` and `host=`, and `proxyDownload('subresident', ...)` passes them on as filters: the
+  connection scheme (`http` / `socks5`) and the gateway in the lines. Without them the request and
+  the lines are the same as before — see [Proxies](#proxies).
 
 ## Tests
 

{proxy_seller_user_api-2.1.0 → proxy_seller_user_api-2.1.2}/setup.py

@@ -12,7 +12,7 @@ setup(
     name='proxy_seller_user_api',
     # 2.x = Client API v2 (baseUrl .../personal/api/v2/, ObjectId-строки, конверт
     # {status, data, errors}). 2.1 добавляет balance/autotopup/get и /set.
-    version='2.1.0',
+    version='2.1.2',
     author='proxy-seller',
     author_email='support@proxy-seller.com',
     description='Client library for the proxy-seller.com Client API v2',

{proxy_seller_user_api-2.1.0 → proxy_seller_user_api-2.1.2}/tests/test_client_api_v2.py

@@ -139,6 +139,26 @@ class ProxyDownloadTest(unittest.TestCase):
         api.proxyDownload('resident', ext='txt')
         self.assertEqual(session.last['params'], {'ext': 'txt'})
 
+    def test_resident_protocol_and_host_are_sent(self):
+        api, session = make_api([text_file('socks5://a:b@us.res.proxy-seller.com:10000')])
+        api.proxyDownloadResident('561', 'txt', 10, protocol='socks5', host='us.res.proxy-seller.com')
+        call = session.last
+        self.assertTrue(call['url'].endswith('proxy/download/resident'))
+        self.assertEqual(call['params'], {'id': '561', 'ext': 'txt', 'maxLine': 10,
+                                          'protocol': 'socks5', 'host': 'us.res.proxy-seller.com'})
+
+    def test_resident_without_protocol_and_host_is_unchanged(self):
+        api, session = make_api([text_file('a:b@res.proxy-seller.com:10000')])
+        api.proxyDownloadResident('561', 'txt', 10)
+        self.assertEqual(session.last['params'], {'id': '561', 'ext': 'txt', 'maxLine': 10})
+
+    def test_subresident_protocol_and_host_are_sent(self):
+        api, session = make_api([text_file('http://a:b@asia.res.proxy-seller.com:10000')])
+        api.proxyDownload('subresident', ext='txt', package_key='PKG',
+                          protocol='http', host='asia.res.proxy-seller.com')
+        self.assertEqual(session.last['params'], {'ext': 'txt', 'package_key': 'PKG',
+                                                  'protocol': 'http', 'host': 'asia.res.proxy-seller.com'})
+
     def test_ext_validation(self):
         with self.assertRaises(ValueError):
             Api.assertExt('a' * 251)