Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aftership/tracking-sdk",
"version": "15.0.0",
"version": "15.0.1",
"description": "Tracking NodeJS SDK",
"main": "dist/aftership.js",
"types": "dist/aftership.d.ts",
Expand Down
6 changes: 3 additions & 3 deletions src/api/CourierConnection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
*/
import { Request } from "../lib/request";
import { AftershipError, AfterShipErrorCodes } from "../error";
import { PutCourierConnectionsByIdResponse } from "../model/PutCourierConnectionsByIdResponse";
import { DeleteCourierConnectionsByIdResponse } from "../model/DeleteCourierConnectionsByIdResponse";
import { GetCourierConnectionsResponse } from "../model/GetCourierConnectionsResponse";
import { GetCourierConnectionsQuery } from "../model/GetCourierConnectionsQuery";
import { PostCourierConnectionsRequest } from "../model/PostCourierConnectionsRequest";
import { PostCourierConnectionsResponse } from "../model/PostCourierConnectionsResponse";
import { GetCourierConnectionsByIdResponse } from "../model/GetCourierConnectionsByIdResponse";
import { PutCourierConnectionsByIdRequest } from "../model/PutCourierConnectionsByIdRequest";
import { PutCourierConnectionsByIdResponse } from "../model/PutCourierConnectionsByIdResponse";
import { DeleteCourierConnectionsByIdResponse } from "../model/DeleteCourierConnectionsByIdResponse";
import { GetCourierConnectionsResponse } from "../model/GetCourierConnectionsResponse";

export class CourierConnectionApi {
private readonly request: Request;
Expand Down
16 changes: 8 additions & 8 deletions src/api/Tracking.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
*/
import { Request } from "../lib/request";
import { AftershipError, AfterShipErrorCodes } from "../error";
import { MarkTrackingCompletedByIdResponse } from "../model/MarkTrackingCompletedByIdResponse";
import { GetTrackingByIdQuery } from "../model/GetTrackingByIdQuery";
import { UpdateTrackingByIdRequest } from "../model/UpdateTrackingByIdRequest";
import { UpdateTrackingByIdResponse } from "../model/UpdateTrackingByIdResponse";
import { DeleteTrackingByIdResponse } from "../model/DeleteTrackingByIdResponse";
import { GetTrackingsResponse } from "../model/GetTrackingsResponse";
import { GetTrackingsQuery } from "../model/GetTrackingsQuery";
import { CreateTrackingRequest } from "../model/CreateTrackingRequest";
import { CreateTrackingResponse } from "../model/CreateTrackingResponse";
import { GetTrackingByIdResponse } from "../model/GetTrackingByIdResponse";
import { UpdateTrackingByIdRequest } from "../model/UpdateTrackingByIdRequest";
import { RetrackTrackingByIdResponse } from "../model/RetrackTrackingByIdResponse";
import { MarkTrackingCompletedByIdRequest } from "../model/MarkTrackingCompletedByIdRequest";
import { MarkTrackingCompletedByIdResponse } from "../model/MarkTrackingCompletedByIdResponse";
import { GetTrackingsResponse } from "../model/GetTrackingsResponse";
import { CreateTrackingResponse } from "../model/CreateTrackingResponse";
import { GetTrackingByIdResponse } from "../model/GetTrackingByIdResponse";
import { GetTrackingByIdQuery } from "../model/GetTrackingByIdQuery";
import { UpdateTrackingByIdResponse } from "../model/UpdateTrackingByIdResponse";
import { DeleteTrackingByIdResponse } from "../model/DeleteTrackingByIdResponse";

export class TrackingApi {
private readonly request: Request;
Expand Down
28 changes: 25 additions & 3 deletions src/lib/request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ import { AftershipError } from "../error";
import { AfterShipErrorCodes } from "../error/code";
import { AfterShipMetaCodeMap } from "../error/meta_code";
import { Proxy } from "../utils/parse_proxy";
import querystring from "querystring";

export const DEFAULT_DOMAIN = "https://api.aftership.com";
export const DEFAULT_TIMEOUT = 10000;
export const DEFAULT_MAX_RETRY = 3;
export const MAX_MAX_RETRY = 10;
export const MIN_MAX_RETRY = 0;
export const DEFAULT_USER_AGENT =
"tracking-sdk-nodejs/15.0.0 (https://www.aftership.com) axios/1.7.2";
"tracking-sdk-nodejs/15.0.1 (https://www.aftership.com) axios/1.7.2";

type ResponseData = {
meta: {
Expand Down Expand Up @@ -133,7 +134,7 @@ export class Request {
public async makeRequest<T>(config: RequestConfig): Promise<T> {
const headers = this.getHeaders(config);
try {
const response = await this.withRetry<ResponseData>({
const axiosConfig: AxiosRequestConfig = {
url: config.url,
method: config.method,
headers,
Expand All @@ -143,7 +144,28 @@ export class Request {
data: config.body,
timeout: this.options.timeout,
proxy: this.options.proxy,
});
};

// Use custom paramsSerializer to match signature calculation encoding (RFC 3986)
// Signature calculation uses querystring.escape(), so we need to use the same encoding
if (config.query) {
axiosConfig.paramsSerializer = (params: any) => {
const query_keys = Object.keys(params).sort();
const parts: string[] = [];
for (const k of query_keys) {
const value = params[k];
if (value !== null && value !== undefined) {
const key = k.trim();
const val = value.toString().trim();
// Use querystring.escape (RFC 3986) to match signature calculation
parts.push(`${key}=${querystring.escape(val)}`);
}
}
return parts.join("&");
};
}

const response = await this.withRetry<ResponseData>(axiosConfig);

const plainHeaders: Record<string, string> = {};
if (response.headers) {
Expand Down
4 changes: 2 additions & 2 deletions src/model/Checkpoint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
* This code was auto generated by AfterShip SDK Generator.
* Do not edit the class manually.
*/
import { Tag } from "./Tag";
import { CheckpointEvents } from "./CheckpointEvents";
import { CheckpointSource } from "./CheckpointSource";
import { CheckpointCoordinate } from "./CheckpointCoordinate";
import { Tag } from "./Tag";
import { CheckpointEvents } from "./CheckpointEvents";

/**
* Object describes checkpoint information.
Expand Down
2 changes: 1 addition & 1 deletion src/model/EstimatedDeliveryDateRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
* This code was auto generated by AfterShip SDK Generator.
* Do not edit the class manually.
*/
import { EstimatedDeliveryDateRequestOriginAddress } from "./EstimatedDeliveryDateRequestOriginAddress";
import { EstimatedDeliveryDateRequestDestinationAddress } from "./EstimatedDeliveryDateRequestDestinationAddress";
import { EstimatedDeliveryDateRequestWeight } from "./EstimatedDeliveryDateRequestWeight";
import { EstimatedDeliveryDateRequestEstimatedPickup } from "./EstimatedDeliveryDateRequestEstimatedPickup";
import { EstimatedDeliveryDateRequestOriginAddress } from "./EstimatedDeliveryDateRequestOriginAddress";

/**
*
Expand Down
14 changes: 7 additions & 7 deletions src/model/Tracking.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
* This code was auto generated by AfterShip SDK Generator.
* Do not edit the class manually.
*/
import { TrackingCourierEstimatedDeliveryDate } from "./TrackingCourierEstimatedDeliveryDate";
import { TrackingShipmentWeight } from "./TrackingShipmentWeight";
import { Tag } from "./Tag";
import { Checkpoint } from "./Checkpoint";
import { TrackingAftershipEstimatedDeliveryDate } from "./TrackingAftershipEstimatedDeliveryDate";
import { TrackingLatestEstimatedDelivery } from "./TrackingLatestEstimatedDelivery";
import { TrackingSignatureRequirement } from "./TrackingSignatureRequirement";
import { TrackingCustomEstimatedDeliveryDate } from "./TrackingCustomEstimatedDeliveryDate";
import { TrackingFirstEstimatedDelivery } from "./TrackingFirstEstimatedDelivery";
import { TrackingLatestEstimatedDelivery } from "./TrackingLatestEstimatedDelivery";
import { TrackingCustomers } from "./TrackingCustomers";
import { TrackingCourierEstimatedDeliveryDate } from "./TrackingCourierEstimatedDeliveryDate";
import { Checkpoint } from "./Checkpoint";
import { TrackingCarbonEmissions } from "./TrackingCarbonEmissions";
import { TrackingSignatureRequirement } from "./TrackingSignatureRequirement";
import { TrackingFirstMile } from "./TrackingFirstMile";
import { TrackingLastMile } from "./TrackingLastMile";
import { TrackingShipmentWeight } from "./TrackingShipmentWeight";
import { Tag } from "./Tag";
import { TrackingCustomers } from "./TrackingCustomers";

/**
* Object describes the tracking information.&lt;div style=&#34;display:none; height: 0&#34;&gt;&lt;/div&gt;
Expand Down
2 changes: 1 addition & 1 deletion src/model/TrackingResponseForGetTrackingsData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* This code was auto generated by AfterShip SDK Generator.
* Do not edit the class manually.
*/
import { TrackingResponseForGetTrackingsDataPagination } from "./TrackingResponseForGetTrackingsDataPagination";
import { Tracking } from "./Tracking";
import { TrackingResponseForGetTrackingsDataPagination } from "./TrackingResponseForGetTrackingsDataPagination";

/**
*
Expand Down