Skip to content

Commit 6b7482a

Browse files
abuzuhriabuzuhri
authored
Merge pull request #819 from abuzuhri/return-old-rate-limit
rollback new rate limit
2 parents b39763f + 99a3172 commit 6b7482a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+528
-773
lines changed

‎Amazon-SP-API-CSharp.sln

-7
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FikaAmazonAPI.SampleCode",
1818
EndProject
1919
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FikaAmazonAPI", "Source\FikaAmazonAPI\FikaAmazonAPI.csproj", "{D6BE954D-174D-4C19-A0B6-46F020878E72}"
2020
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Source\Tests\Tests.csproj", "{4CB44101-8A9E-454A-B272-038C5FAF9F23}"
22-
EndProject
2321
Global
2422
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2523
Debug|Any CPU = Debug|Any CPU
@@ -34,18 +32,13 @@ Global
3432
{D6BE954D-174D-4C19-A0B6-46F020878E72}.Debug|Any CPU.Build.0 = Debug|Any CPU
3533
{D6BE954D-174D-4C19-A0B6-46F020878E72}.Release|Any CPU.ActiveCfg = Release|Any CPU
3634
{D6BE954D-174D-4C19-A0B6-46F020878E72}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{4CB44101-8A9E-454A-B272-038C5FAF9F23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{4CB44101-8A9E-454A-B272-038C5FAF9F23}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{4CB44101-8A9E-454A-B272-038C5FAF9F23}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{4CB44101-8A9E-454A-B272-038C5FAF9F23}.Release|Any CPU.Build.0 = Release|Any CPU
4135
EndGlobalSection
4236
GlobalSection(SolutionProperties) = preSolution
4337
HideSolutionNode = FALSE
4438
EndGlobalSection
4539
GlobalSection(NestedProjects) = preSolution
4640
{FC494085-19C4-4835-B053-F9B74FFB978A} = {3472E85C-6C29-4196-AA16-B95898241C04}
4741
{D6BE954D-174D-4C19-A0B6-46F020878E72} = {3472E85C-6C29-4196-AA16-B95898241C04}
48-
{4CB44101-8A9E-454A-B272-038C5FAF9F23} = {3472E85C-6C29-4196-AA16-B95898241C04}
4942
EndGlobalSection
5043
GlobalSection(ExtensibilityGlobals) = postSolution
5144
SolutionGuid = {F072E7DD-BF35-43CC-BF83-E5947CA2D772}

‎README.md

-34
Original file line numberDiff line numberDiff line change
@@ -120,41 +120,7 @@ AmazonConnection amazonConnection = new AmazonConnection(new AmazonCredential()
120120

121121
```
122122

123-
### Multithreaded connections
124-
If multithreading, the following should be done to avoid inadvertantly passing incorrect token data between different threads:
125-
```CSharp
126-
127-
// Note - you may also write and pass your own implementation of the IRateLimitingHandler interface if required
128-
129-
var connectionFactory = new AmazonMultithreadedConnectionFactory(
130-
ClientId: "amzn1.application-XXX-client.XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
131-
ClientSecret: "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
132-
RefreshToken: "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
133-
// a singleton that handles rate limiting across multiple threads
134-
rateLimitingHandler: new RateLimitingHandler());
135-
136-
// Then in each concurrent thread/request scope, a new connection can be created like so
137-
var amazonConnection = connectionFactory.RequestScopedConnection(
138-
marketPlaceId: "A2VIGQ35RCS4UG",
139-
sellerId: "MySellerId",
140-
// credentialConfiguration is an optional parameter that allows additional configuration of the AmazonCredential
141-
credentialConfiguration: cred =>
142-
{
143-
cred.IsActiveLimitRate = true;
144-
cred.IsDebugMode = true;
145-
});
146123

147-
// or (remember either Marketplace OR Marketplace ID must be provided)
148-
var amazonConnection = connectionFactory.RequestScopedConnection(
149-
sellerId: "MySellerId",
150-
credentialConfiguration: cred =>
151-
{
152-
cred.IsActiveLimitRate = true;
153-
cred.IsDebugMode = true;
154-
cred.Marketplace = MarketPlace.UnitedArabEmirates
155-
});
156-
157-
```
158124

159125
### Configuration using a proxy
160126
Please see [here](https://github.com/abuzuhri/Amazon-SP-API-CSharp/blob/main/Source/FikaAmazonAPI.SampleCode/Program.cs) for the relevant code file.

‎Source/FikaAmazonAPI.SampleCode/Program.cs

+21-27
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
using FikaAmazonAPI.AmazonSpApiSDK.Models.FbaSmallandLight;
2-
using FikaAmazonAPI.Utils;
3-
using Microsoft.Extensions.Configuration;
1+
using Microsoft.Extensions.Configuration;
2+
using Microsoft.Extensions.Logging;
43

54
namespace FikaAmazonAPI.SampleCode
65
{
@@ -14,32 +13,27 @@ static async Task Main(string[] args)
1413
.AddUserSecrets<Program>()
1514
.Build();
1615

17-
var connectionFactory = new AmazonMultithreadedConnectionFactory(
18-
ClientId: config.GetSection("FikaAmazonAPI:ClientId").Value,
19-
ClientSecret: config.GetSection("FikaAmazonAPI:ClientSecret").Value,
20-
RefreshToken: config.GetSection("FikaAmazonAPI:RefreshToken").Value,
21-
rateLimitingHandler: new RateLimitingHandler());
16+
var factory = LoggerFactory.Create(builder => builder.AddConsole());
2217

23-
var tasks = Enumerable.Range(1, 10).Select(x =>
24-
Task.Run(() =>
18+
AmazonConnection amazonConnection = new AmazonConnection(new AmazonCredential()
2519
{
26-
var amazonConnection = connectionFactory.RequestScopedConnection(
27-
marketPlaceId: config.GetSection("FikaAmazonAPI:MarketPlaceID").Value,
28-
sellerId: config.GetSection("FikaAmazonAPI:SellerId").Value,
29-
credentialConfiguration: cred =>
30-
{
31-
cred.IsActiveLimitRate = true;
32-
cred.IsDebugMode = true;
33-
});
34-
35-
ReportManagerSample reportManagerSample = new ReportManagerSample(amazonConnection);
36-
reportManagerSample.CallReport();
37-
}));
38-
39-
await Task.WhenAll(tasks);
40-
41-
//var loggingExamples = new SerilogLoggingExamples(config);
42-
//await loggingExamples.ConsoleLoggerExample();
20+
ClientId = config.GetSection("FikaAmazonAPI:ClientId").Value,
21+
ClientSecret = config.GetSection("FikaAmazonAPI:ClientSecret").Value,
22+
RefreshToken = config.GetSection("FikaAmazonAPI:RefreshToken").Value,
23+
MarketPlaceID = config.GetSection("FikaAmazonAPI:MarketPlaceID").Value,
24+
SellerID = config.GetSection("FikaAmazonAPI:SellerId").Value,
25+
IsDebugMode = true
26+
}, loggerFactory: factory);
27+
28+
29+
ReportManagerSample reportManagerSample = new ReportManagerSample(amazonConnection);
30+
reportManagerSample.CallReport();
31+
//var error = amazonConnection.Reports.CreateReportAndDownloadFile(Utils.Constants.ReportTypes.GET_STRANDED_INVENTORY_UI_DATA);
32+
//var dddd = amazonConnection.Reports.CreateReportAndDownloadFile(Utils.Constants.ReportTypes.GET_FBA_MYI_ALL_INVENTORY_DATA);
33+
//var dddd = amazonConnection.Reports.CreateReportAndDownloadFile(Utils.Constants.ReportTypes.GET_FBA_MYI_UNSUPPRESSED_INVENTORY_DATA);
34+
//ReportManager reportManager = new ReportManager(amazonConnection);
35+
36+
//var dddddd = reportManager.GetAFNInventoryQtyAsync().ConfigureAwait(false).GetAwaiter().GetResult();
4337

4438
Console.ReadLine();
4539

‎Source/FikaAmazonAPI/AmazonConnection.cs

+31-35
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
using FikaAmazonAPI.AmazonSpApiSDK.Models.Exceptions;
22
using FikaAmazonAPI.Services;
33
using FikaAmazonAPI.Utils;
4+
using Microsoft.Extensions.Logging;
45
using System;
56
using System.Globalization;
67
using System.Threading;
7-
using Microsoft.Extensions.Logging;
88

99
namespace FikaAmazonAPI
1010
{
1111
public class AmazonConnection
1212
{
1313
private readonly ILoggerFactory _loggerFactory;
1414
private AmazonCredential Credentials { get; set; }
15-
16-
private IRateLimitingHandler RateLimitingHandler { get; }
17-
1815
public AppIntegrationsServiceV20240401 AppIntegrationsServiceV20240401 => this._AppIntegrationsServiceV20240401 ?? throw _NoCredentials;
1916
public OrderService Orders => this._Orders ?? throw _NoCredentials;
2017
public ReportService Reports => this._Reports ?? throw _NoCredentials;
@@ -95,12 +92,11 @@ public class AmazonConnection
9592
private UnauthorizedAccessException _NoCredentials = new UnauthorizedAccessException($"Error, you cannot make calls to Amazon without credentials!");
9693

9794
public string RefNumber { get; set; }
98-
public AmazonConnection(AmazonCredential Credentials, IRateLimitingHandler rateLimitingHandler = null, string RefNumber = null, CultureInfo? cultureInfo = null, ILoggerFactory? loggerFactory = null)
95+
public AmazonConnection(AmazonCredential Credentials, string RefNumber = null, CultureInfo? cultureInfo = null, ILoggerFactory? loggerFactory = null)
9996
{
10097
_loggerFactory = loggerFactory;
10198
this.Authenticate(Credentials);
10299
this.RefNumber = RefNumber;
103-
this.RateLimitingHandler = rateLimitingHandler ?? new RateLimitingHandler();
104100
Thread.CurrentThread.CurrentCulture = cultureInfo ?? CultureInfo.CurrentCulture;
105101
}
106102

@@ -127,35 +123,35 @@ private void Init(AmazonCredential Credentials)
127123
this._CatalogItems = new CatalogItemService(this.Credentials, _loggerFactory);
128124
this._ProductPricing = new ProductPricingService(this.Credentials, _loggerFactory);
129125

130-
this._FbaInbound = new FbaInboundService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
131-
this._FbaInventory = new FbaInventoryService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
132-
this._FbaOutbound = new FbaOutboundService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
133-
this._FbaSmallandLight = new FbaSmallandLightService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
134-
this._FbaInboundEligibility = new FbaInboundEligibilityService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
135-
this._EasyShip20220323 = new EasyShip20220323Service(this.Credentials, _loggerFactory, this.RateLimitingHandler);
136-
this._AplusContent = new AplusContentService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
137-
this._Feed = new FeedService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
138-
this._ListingsItem = new ListingsItemService(this.Credentials, _loggerFactory, this.RateLimitingHandler );
139-
this._Restrictions = new RestrictionService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
140-
this._MerchantFulfillment = new MerchantFulfillmentService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
141-
this._Messaging = new MessagingService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
142-
this._Notification = new NotificationService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
143-
this._ProductFee = new ProductFeeService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
144-
this._ProductType = new ProductTypeService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
145-
this._Sales = new SalesService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
146-
this._Seller = new SellerService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
147-
this._Services = new ServicesService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
148-
this._ShipmentInvoicing = new ShipmentInvoicingService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
149-
this._Shipping = new ShippingService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
150-
this._ShippingV2 = new ShippingServiceV2(this.Credentials, _loggerFactory, this.RateLimitingHandler);
151-
this._Upload = new UploadService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
152-
this._Tokens = new TokenService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
153-
this._FulFillmentInbound = new FulFillmentInboundService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
154-
this._FulFillmentInboundv20240320 = new FulFillmentInboundServicev20240320(this.Credentials, _loggerFactory, this.RateLimitingHandler);
155-
this._FulFillmentOutbound = new FulFillmentOutboundService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
156-
this._VendorDirectFulfillmentOrders = new VendorDirectFulfillmentOrderService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
157-
this._VendorOrders = new VendorOrderService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
158-
this._VendorTransactionStatus = new VendorTransactionStatusService(this.Credentials, _loggerFactory, this.RateLimitingHandler);
126+
this._FbaInbound = new FbaInboundService(this.Credentials, _loggerFactory);
127+
this._FbaInventory = new FbaInventoryService(this.Credentials, _loggerFactory);
128+
this._FbaOutbound = new FbaOutboundService(this.Credentials, _loggerFactory);
129+
this._FbaSmallandLight = new FbaSmallandLightService(this.Credentials, _loggerFactory);
130+
this._FbaInboundEligibility = new FbaInboundEligibilityService(this.Credentials, _loggerFactory);
131+
this._EasyShip20220323 = new EasyShip20220323Service(this.Credentials, _loggerFactory);
132+
this._AplusContent = new AplusContentService(this.Credentials, _loggerFactory);
133+
this._Feed = new FeedService(this.Credentials, _loggerFactory);
134+
this._ListingsItem = new ListingsItemService(this.Credentials, _loggerFactory);
135+
this._Restrictions = new RestrictionService(this.Credentials, _loggerFactory);
136+
this._MerchantFulfillment = new MerchantFulfillmentService(this.Credentials, _loggerFactory);
137+
this._Messaging = new MessagingService(this.Credentials, _loggerFactory);
138+
this._Notification = new NotificationService(this.Credentials, _loggerFactory);
139+
this._ProductFee = new ProductFeeService(this.Credentials, _loggerFactory);
140+
this._ProductType = new ProductTypeService(this.Credentials, _loggerFactory);
141+
this._Sales = new SalesService(this.Credentials, _loggerFactory);
142+
this._Seller = new SellerService(this.Credentials, _loggerFactory);
143+
this._Services = new ServicesService(this.Credentials, _loggerFactory);
144+
this._ShipmentInvoicing = new ShipmentInvoicingService(this.Credentials, _loggerFactory);
145+
this._Shipping = new ShippingService(this.Credentials, _loggerFactory);
146+
this._ShippingV2 = new ShippingServiceV2(this.Credentials, _loggerFactory);
147+
this._Upload = new UploadService(this.Credentials, _loggerFactory);
148+
this._Tokens = new TokenService(this.Credentials, _loggerFactory);
149+
this._FulFillmentInbound = new FulFillmentInboundService(this.Credentials, _loggerFactory);
150+
this._FulFillmentInboundv20240320 = new FulFillmentInboundServicev20240320(this.Credentials, _loggerFactory);
151+
this._FulFillmentOutbound = new FulFillmentOutboundService(this.Credentials, _loggerFactory);
152+
this._VendorDirectFulfillmentOrders = new VendorDirectFulfillmentOrderService(this.Credentials, _loggerFactory);
153+
this._VendorOrders = new VendorOrderService(this.Credentials, _loggerFactory);
154+
this._VendorTransactionStatus = new VendorTransactionStatusService(this.Credentials, _loggerFactory);
159155

160156
AmazonCredential.DebugMode = this.Credentials.IsDebugMode;
161157
}

‎Source/FikaAmazonAPI/AmazonCredential.cs

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using FikaAmazonAPI.AmazonSpApiSDK.Models.Token;
22
using FikaAmazonAPI.Utils;
3+
using System.Collections.Generic;
34
using static FikaAmazonAPI.AmazonSpApiSDK.Models.Token.CacheTokenData;
45
using static FikaAmazonAPI.Utils.Constants;
56

@@ -57,5 +58,7 @@ public void SetAWSAuthenticationTokenData(AWSAuthenticationTokenData tokenData)
5758
{
5859
CacheTokenData.SetAWSAuthenticationTokenData(tokenData);
5960
}
61+
62+
internal Dictionary<RateLimitType, RateLimits> UsagePlansTimings { get; set; } = RateLimitsDefinitions.RateLimitsTime();
6063
}
6164
}

‎Source/FikaAmazonAPI/AmazonMultithreadedConnectionFactory.cs

-58
This file was deleted.

‎Source/FikaAmazonAPI/Services/AplusContentService.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
using FikaAmazonAPI.Utils;
2-
using Microsoft.Extensions.Logging;
1+
using Microsoft.Extensions.Logging;
32

43
namespace FikaAmazonAPI.Services
54
{
65

76
public class AplusContentService : RequestService
87
{
98

10-
public AplusContentService(AmazonCredential amazonCredential,ILoggerFactory? loggerFactory, IRateLimitingHandler rateLimitingHandler = null) : base(amazonCredential, loggerFactory, rateLimitingHandler)
9+
public AplusContentService(AmazonCredential amazonCredential, ILoggerFactory? loggerFactory) : base(amazonCredential, loggerFactory)
1110
{
1211

1312
}

‎Source/FikaAmazonAPI/Services/AppIntegrationsV20240401.cs

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
using FikaAmazonAPI.AmazonSpApiSDK.Models.AppIntegrationsV20240401;
22
using FikaAmazonAPI.Utils;
3-
using System;
4-
using System.Collections.Generic;
5-
using System.Text;
6-
using System.Threading.Tasks;
7-
using System.Threading;
83
using Microsoft.Extensions.Logging;
4+
using System.Threading;
5+
using System.Threading.Tasks;
96

107
namespace FikaAmazonAPI.Services
118
{
12-
public class AppIntegrationsServiceV20240401: RequestService
9+
public class AppIntegrationsServiceV20240401 : RequestService
1310
{
14-
public AppIntegrationsServiceV20240401(AmazonCredential amazonCredential,ILoggerFactory? loggerFactory, IRateLimitingHandler rateLimitingHandler = null) : base(amazonCredential, loggerFactory, rateLimitingHandler)
11+
public AppIntegrationsServiceV20240401(AmazonCredential amazonCredential, ILoggerFactory? loggerFactory) : base(amazonCredential, loggerFactory)
1512
{
1613

1714
}

‎Source/FikaAmazonAPI/Services/AuthorizationService.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
using FikaAmazonAPI.AmazonSpApiSDK.Models.Authorization;
22
using FikaAmazonAPI.AmazonSpApiSDK.Models.Token;
33
using FikaAmazonAPI.Parameter.Authorization;
4-
using FikaAmazonAPI.Utils;
4+
using Microsoft.Extensions.Logging;
55
using System.Threading;
66
using System.Threading.Tasks;
7-
using Microsoft.Extensions.Logging;
87
using static FikaAmazonAPI.AmazonSpApiSDK.Models.Token.CacheTokenData;
98

109
namespace FikaAmazonAPI.Services
1110
{
1211
public class AuthorizationService : RequestService
1312
{
14-
public AuthorizationService(AmazonCredential amazonCredential, ILoggerFactory? loggerFactory, IRateLimitingHandler rateLimitingHandler = null) : base(amazonCredential, loggerFactory, rateLimitingHandler)
13+
public AuthorizationService(AmazonCredential amazonCredential, ILoggerFactory? loggerFactory) : base(amazonCredential, loggerFactory)
1514
{
1615
}
1716
public string GetAuthorizationCode(ParameterAuthorizationCode parameterGetOrderMetrics) =>

0 commit comments

Comments
 (0)