Skip to content

Commit 85edd59

Browse files
rrrublevrrrublev
committed
feat: поддержка брендов, Session.post(), рефакторинг констант; bump 0.8.4
- добавлены методы getBrandProductCount, getBrandCatalog, getBrandCatalogPage - добавлен Session.post() с retry/backoff - SupplierTotalProducts переименован в getSupplierProductCount - в Constants расширен блок BRAND (INFO, INFO_BY_NAME, CATALOG_INTERNAL, ENRICH, FILTERS) - SUPPLIER.BESTSELLERS → STOREFRONT, TOTALPRODUCTS → FILTERS - в тестах SessionBuilder.setAntibotToken заменён на wbapi.setToken() - URL-тесты переведены на wbapi.session.get() вместо raw fetch
1 parent f822c30 commit 85edd59

9 files changed

Lines changed: 371 additions & 266 deletions

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rrrublev/wb-private-api",
3-
"version": "0.8.3",
3+
"version": "0.8.4",
44
"description": "Wildberries Private API",
55
"main": "index.js",
66
"scripts": {

‎src/Constants.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,22 @@ module.exports = {
77
MAIN_MENU:
88
"https://static-basket-01.wbbasket.ru/vol0/data/main-menu-ru-ru-v3.json",
99
BRAND: {
10+
INFO_BY_NAME: "https://static-basket-01.wbbasket.ru/vol0/data/brands/{0}.json",
11+
INFO: "https://static-basket-01.wbbasket.ru/vol0/data/brands-by-id/{0}.json",
1012
IMAGE: "https://static-basket-01.wbbasket.ru/vol0/brand-flow-logos/by-id/{0}.webp",
1113
CATALOG: "https://catalog.wb.ru/brands/v4/catalog",
14+
CATALOG_INTERNAL: "https://www.wildberries.ru/__internal/catalog/brands/v4/catalog",
15+
ENRICH: "https://user-data-syncer.wb.ru/sellers/api/v1/enrich_brands",
16+
FILTERS: "https://catalog.wb.ru/brands/v8/filters",
17+
FILTERS_INTERNAL: "https://www.wildberries.ru/__internal/catalog/brands/v8/filters",
1218
},
1319
SUPPLIER: {
1420
INFO: "https://static-basket-01.wbbasket.ru/vol0/data/supplier-by-id/{0}.json",
15-
BESTSELLERS: "https://static-basket-01.wbbasket.ru/vol0/constructor-api/shops/v3/{0}.json",
21+
STOREFRONT: "https://static-basket-01.wbbasket.ru/vol0/constructor-api/shops/v3/{0}.json",
1622
CATALOG: "https://catalog.wb.ru/sellers/v4/catalog",
1723
CATALOG_INTERNAL: "https://www.wildberries.ru/__internal/catalog/sellers/v4/catalog",
18-
TOTALPRODUCTS: "https://catalog.wb.ru/sellers/v8/filters",
19-
TOTALPRODUCTS_INTERNAL: "https://www.wildberries.ru/__internal/catalog/sellers/v8/filters",
24+
FILTERS: "https://catalog.wb.ru/sellers/v8/filters",
25+
FILTERS_INTERNAL: "https://www.wildberries.ru/__internal/catalog/sellers/v8/filters",
2026
SHIPMENT:
2127
"https://suppliers-shipment-2.wildberries.ru/api/v1/suppliers/{0}",
2228
},
@@ -27,7 +33,7 @@ module.exports = {
2733
SELLERS: "https://basket-{0}.wbbasket.ru/vol{1}/part{2}/{3}/info/sellers.json",
2834
PRICE_HISTORY: "https://basket-{0}.wbbasket.ru/vol{1}/part{2}/{3}/info/price-history.json",
2935
CERTIFICATE: "https://basket-{0}.wbbasket.ru/vol{1}/part{2}/{3}/info/certificate.json",
30-
EXTRADATA: "https://www.wildberries.ru/webapi/product/{}/data",
36+
EXTRADATA: "https://www.wildberries.ru/webapi/product/{0}/data",
3137
DETAILS: "https://card.wb.ru/cards/v4/detail",
3238
DETAILS_INTERNAL: "https://www.wildberries.ru/__internal/card/cards/v4/detail",
3339
FEEDBACKS: "https://feedbacks{0}.wb.ru/feedbacks/v2/{1}",

‎src/SessionBuilder.js‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class Session {
6060
return !!this.defaults.headers.common["Cookie"];
6161
}
6262

63+
/** @returns {Promise<{status: number, data: any}>} */
6364
async get(url, options = {}) {
6465
const { params = {}, headers = {}, retryOptions, responseType = "auto" } = options;
6566

@@ -156,6 +157,88 @@ class Session {
156157
throw lastError;
157158
}
158159
}
160+
161+
/** @returns {Promise<{status: number, data: any}>} */
162+
async post(url, body, options = {}) {
163+
const { headers = {}, retryOptions } = options;
164+
165+
const mergedHeaders = {
166+
...this._config.headers,
167+
...this.defaults.headers.common,
168+
"Content-Type": "application/json",
169+
...headers,
170+
};
171+
172+
const retries = retryOptions?.retries ?? this._config.retries;
173+
const retryCondition =
174+
retryOptions?.retryCondition ??
175+
((ctx) => ctx.status === 429 || ctx.status >= 500 || Boolean(ctx.error));
176+
177+
let lastError;
178+
for (let attempt = 0; attempt <= retries; attempt++) {
179+
if (attempt > 0) {
180+
const delay = Math.min(Math.pow(2, attempt) * 1000 + Math.random() * 1000, 10000);
181+
this._logger.debug("Retry attempt", { attempt, url });
182+
await sleep(delay);
183+
}
184+
185+
let response;
186+
try {
187+
response = await fetch(url, {
188+
method: "POST",
189+
headers: mergedHeaders,
190+
body: JSON.stringify(body),
191+
dispatcher: this._agent,
192+
signal: AbortSignal.timeout(this._config.timeout),
193+
});
194+
} catch (error) {
195+
lastError = error;
196+
const shouldRetry =
197+
attempt < retries &&
198+
retryCondition({ status: null, error, attempt, url, method: "post" });
199+
if (!shouldRetry) {
200+
error.config = { url, method: "post" };
201+
throw error;
202+
}
203+
continue;
204+
}
205+
206+
if (response.status >= 200 && response.status < 300) {
207+
let data;
208+
const contentType = response.headers.get("content-type") || "";
209+
if (contentType.includes("application/json")) {
210+
data = await response.json();
211+
} else {
212+
const text = await response.text();
213+
const trimmed = text.trimStart();
214+
if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
215+
try { data = JSON.parse(text); } catch { data = text; }
216+
} else {
217+
data = text;
218+
}
219+
}
220+
return { status: response.status, data };
221+
}
222+
223+
const shouldRetry =
224+
attempt < retries &&
225+
retryCondition({ status: response.status, error: null, attempt, url, method: "post" });
226+
227+
if (shouldRetry) {
228+
lastError = createHttpError(response.status, url, "post");
229+
continue;
230+
}
231+
232+
const err = createHttpError(response.status, url, "post");
233+
this._logger.error("Request failed", { url, status: response.status });
234+
throw err;
235+
}
236+
237+
if (lastError) {
238+
lastError.config = { url, method: "post" };
239+
throw lastError;
240+
}
241+
}
159242
}
160243

161244
class SessionBuilder {

‎src/WBPrivateAPI.js‎

Lines changed: 61 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,19 +189,73 @@ class WBPrivateAPI {
189189
* @param {number} supplierId - the search query
190190
* @returns {number} Total number of products
191191
*/
192-
async SupplierTotalProducts(supplierId) {
193-
const res = await this.session.get(Constants.URLS.SUPPLIER.TOTALPRODUCTS, {
192+
async getSupplierProductCount(supplierId) {
193+
const res = await this.session.get(Constants.URLS.SUPPLIER.CATALOG, {
194194
params: {
195195
appType: Constants.APPTYPES.DESKTOP,
196196
curr: Constants.CURRENCIES.RUB,
197197
dest: this.destination.ids[0],
198-
filters: "xsubject",
199-
spp: "30",
200198
supplier: supplierId,
199+
limit: 0,
201200
},
202201
});
203202

204-
return res.data.data?.total || 0;
203+
return res.data.total || 0;
204+
}
205+
206+
/**
207+
* @returns {number} Total number of products for a brand
208+
*/
209+
async getBrandProductCount(brandId) {
210+
const res = await this.session.get(Constants.URLS.BRAND.CATALOG, {
211+
params: {
212+
appType: Constants.APPTYPES.DESKTOP,
213+
curr: Constants.CURRENCIES.RUB,
214+
dest: this.destination.ids[0],
215+
brand: brandId,
216+
limit: 0,
217+
},
218+
});
219+
return res.data.total || 0;
220+
}
221+
222+
/**
223+
* @returns {Promise<object>} Raw API response for brand catalog page
224+
*/
225+
async getBrandCatalog(brandId, page = 1) {
226+
const res = await this.session.get(Constants.URLS.BRAND.CATALOG, {
227+
params: {
228+
appType: Constants.APPTYPES.DESKTOP,
229+
curr: Constants.CURRENCIES.RUB,
230+
dest: this.destination.ids[0],
231+
lang: Constants.LOCALES.RU,
232+
page,
233+
sort: "popular",
234+
spp: "30",
235+
brand: brandId,
236+
},
237+
});
238+
return res.data || {};
239+
}
240+
241+
/**
242+
* @returns {array} Products from a brand catalog page
243+
*/
244+
async getBrandCatalogPage(brandId, page = 1, retries = 0) {
245+
const res = await this.session.get(Constants.URLS.BRAND.CATALOG, {
246+
params: {
247+
appType: Constants.APPTYPES.DESKTOP,
248+
curr: Constants.CURRENCIES.RUB,
249+
dest: this.destination.ids[0],
250+
lang: Constants.LOCALES.RU,
251+
page,
252+
sort: "popular",
253+
spp: "30",
254+
brand: brandId,
255+
},
256+
retryOptions: { retries },
257+
});
258+
return res.data.data?.products ?? res.data.products ?? [];
205259
}
206260

207261
/**
@@ -396,7 +450,7 @@ class WBPrivateAPI {
396450
* It takes a supplier id and returns an array of products
397451
* @param {number} supplierId - supplier ID
398452
* @param {number} page - page number
399-
* @returns {object} - Raw API response data.
453+
* @returns {Promise<object>} - Raw API response data.
400454
*/
401455
async getSupplierCatalog(supplierId, page = 1) {
402456
const res = await this.session.get(Constants.URLS.SUPPLIER.CATALOG, {
@@ -424,7 +478,7 @@ class WBPrivateAPI {
424478
async getSupplierCatalogAll(supplierId, pageCount = 0, retries = 0) {
425479
const products = [];
426480

427-
const totalProducts = await this.SupplierTotalProducts(supplierId);
481+
const totalProducts = await this.getSupplierProductCount(supplierId);
428482
if (totalProducts === 0) {
429483
return new WBCatalog({
430484
supplierId,

‎tests/Constants.URLs.integration.test.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ const Constants = require("../src/Constants");
33
const WBPrivateAPI = require("../src/WBPrivateAPI");
44
const WBProduct = require("../src/WBProduct");
55
const WBCatalog = require("../src/WBCatalog");
6-
const SessionBuilder = require("../src/SessionBuilder");
7-
86
describe("Интеграционное тестирование URL с методами API", () => {
97
let wbapi;
108
let testProduct;
@@ -15,7 +13,7 @@ describe("Интеграционное тестирование URL с мето
1513
destination: Constants.DESTINATIONS.MOSCOW,
1614
});
1715
const token = process.env.WBAAS_TOKEN;
18-
if (token) SessionBuilder.setAntibotToken(wbapi.session, token);
16+
if (token) wbapi.setToken(token);
1917

2018
try {
2119
const catalog = await wbapi.search("швабра zetter", 1);
@@ -61,13 +59,13 @@ describe("Интеграционное тестирование URL с мето
6159
const supplierInfo = await wbapi.getSupplierInfo(testSupplierId);
6260
expect(supplierInfo).toBeDefined();
6361

64-
// Проверяем SupplierTotalProducts
65-
const totalProducts = await wbapi.SupplierTotalProducts(testSupplierId);
62+
// Проверяем getSupplierProductCount
63+
const totalProducts = await wbapi.getSupplierProductCount(testSupplierId);
6664
expect(typeof totalProducts).toBe("number");
6765

6866
// URL должны соответствовать константам
6967
expect(Constants.URLS.SUPPLIER.INFO).toContain("supplier-by-id");
70-
expect(Constants.URLS.SUPPLIER.TOTALPRODUCTS).toContain("sellers/v8/filters");
68+
expect(Constants.URLS.SUPPLIER.FILTERS).toContain("sellers/v8/filters");
7169
expect(Constants.URLS.SUPPLIER.CATALOG).toContain("sellers/v4/catalog");
7270

7371
console.log("✅ URL поставщика соответствуют методам supplier");
@@ -175,7 +173,7 @@ describe("Интеграционное тестирование URL с мето
175173
const urlVersions = {
176174
"SEARCH.EXACTMATCH": { url: Constants.URLS.SEARCH.EXACTMATCH, expectedVersion: "v18" },
177175
"SEARCH.TOTALPRODUCTS": { url: Constants.URLS.SEARCH.TOTALPRODUCTS, expectedVersion: "v18" },
178-
"SUPPLIER.TOTALPRODUCTS": { url: Constants.URLS.SUPPLIER.TOTALPRODUCTS, expectedVersion: "v8" },
176+
"SUPPLIER.FILTERS": { url: Constants.URLS.SUPPLIER.FILTERS, expectedVersion: "v8" },
179177
"SUPPLIER.CATALOG": { url: Constants.URLS.SUPPLIER.CATALOG, expectedVersion: "v4" },
180178
"PRODUCT.DETAILS": { url: Constants.URLS.PRODUCT.DETAILS, expectedVersion: "v4" },
181179
"PRODUCT.FEEDBACKS": { url: Constants.URLS.PRODUCT.FEEDBACKS, expectedVersion: "v2" },
@@ -197,7 +195,7 @@ describe("Интеграционное тестирование URL с мето
197195
"PRODUCT.EXTRADATA",
198196
"PRODUCT.QUESTIONS",
199197
"SUPPLIER.CATALOG_INTERNAL",
200-
"SUPPLIER.TOTALPRODUCTS_INTERNAL",
198+
"SUPPLIER.FILTERS_INTERNAL",
201199
"SUPPLIER.SHIPMENT",
202200
"SEARCH.TOTALPRODUCTS_INTERNAL",
203201
"SEARCH.EXACTMATCH_INTERNAL",
@@ -207,7 +205,7 @@ describe("Интеграционное тестирование URL с мето
207205
"SEARCH.SIMILAR_BY_NM"
208206
],
209207
"search.wb.ru": ["SEARCH.EXACTMATCH", "SEARCH.TOTALPRODUCTS"],
210-
"catalog.wb.ru": ["SUPPLIER.CATALOG", "SUPPLIER.TOTALPRODUCTS", "BRAND.CATALOG"],
208+
"catalog.wb.ru": ["SUPPLIER.CATALOG", "SUPPLIER.FILTERS", "BRAND.CATALOG"],
211209
"card.wb.ru": ["PRODUCT.DETAILS", "PRODUCT.DELIVERYDATA", "SEARCH.LIST"],
212210
"wb.ru": ["PRODUCT.FEEDBACKS", "SEARCH.HINT"],
213211
"wbbasket.ru": ["BRAND.IMAGE", "PRODUCT.CARD", "PRODUCT.SELLERS", "IMAGES.TINY", "IMAGES.BIG", "IMAGES.SMALL", "IMAGES.MEDIUM"],

0 commit comments

Comments
 (0)