shipflow 0.1.0 → 0.2.1

package/dist/carriers/aymakan/adapter.d.ts

@@ -13,6 +13,11 @@ export declare class AymakanAdapter extends BaseCarrierAdapter {
     readonly name = "aymakan";
     readonly supportedCountries: string[];
     private http;
+    /**
+     * Shared options applied to every Aymakan http call so fake-200 error
+     * envelopes surface as APIError instead of being silently swallowed.
+     */
+    private readonly errorOpts;
     /** Cached Aymakan cities list for city name resolution */
     private citiesCache;
     private citiesCacheTime;
@@ -58,7 +63,7 @@ export declare class AymakanAdapter extends BaseCarrierAdapter {
     track(trackingNumber: string): Promise<TrackingResult>;
     trackMultiple(trackingNumbers: string[]): Promise<TrackingResult[]>;
     trackByReference(reference: string): Promise<TrackingResult>;
-    getLabel(trackingNumber: string, format?: "PDF" | "PNG"): Promise<string>;
+    getLabel(trackingNumber: string, _format?: "PDF" | "ZPL" | "PNG"): Promise<string>;
     getBulkLabels(trackingNumbers: string[]): Promise<string>;
     getPickupCities(): Promise<City[]>;
     getTimeSlots(_city: string, date: string): Promise<TimeSlot[]>;
@@ -69,9 +74,10 @@ export declare class AymakanAdapter extends BaseCarrierAdapter {
     getDropoffLocations(): Promise<{
         id: string;
         name: string;
-        nameAr?: string;
         address?: string;
         city?: string;
+        latitude?: number;
+        longitude?: number;
     }[]>;
     createCustomerAddress(address: CustomerAddress): Promise<CustomerAddress>;
     getCustomerAddresses(): Promise<CustomerAddress[]>;

package/dist/carriers/aymakan/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/carriers/aymakan/adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/carriers/aymakan/adapter.ts"],"names":[],"mappings":"AACA;;;GAGG;AAYH,OAAO,KAAK,EACV,OAAO,EACP,aAAa,EACb,IAAI,EACJ,mBAAmB,EACnB,eAAe,EACf,MAAM,EACN,aAAa,EACb,QAAQ,EACR,QAAQ,EACR,cAAc,EACd,aAAa,EACb,YAAY,EACb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AA0E7C,MAAM,WAAW,aAAc,SAAQ,aAAa;IAClD,WAAW,EAAE;QACX,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,qBAAa,cAAe,SAAQ,kBAAkB;IACpD,QAAQ,CAAC,IAAI,aAAa;IAC1B,QAAQ,CAAC,kBAAkB,WAAwC;IAEnE,OAAO,CAAC,IAAI,CAAa;IAEzB;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6C;IAEvE,0DAA0D;IAC1D,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,eAAe,CAAK;IAC5B,wBAAwB;IACxB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;gBAE9C,MAAM,EAAE,aAAa;IAWjC,SAAS,CAAC,UAAU,IAAI,MAAM;IAU9B;;;OAGG;YACW,kBAAkB;IAehC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAQ9B;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,WAAW;IA+CnB;;OAEG;IACH,OAAO,CAAC,oBAAoB;cAoBZ,qBAAqB,CACnC,KAAK,EAAE,mBAAmB,GACzB,OAAO,CAAC,QAAQ,CAAC;IAoBd,mBAAmB,CACvB,MAAM,EAAE,mBAAmB,EAAE,GAC5B,OAAO,CAAC,QAAQ,EAAE,CAAC;IAyChB,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAcxD,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAStD,qBAAqB,CACzB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,OAAO,CAAC;IAuBb,KAAK,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAStD,aAAa,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAwBnE,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAqB5D,QAAQ,CACZ,cAAc,EAAE,MAAM,EACtB,OAAO,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAC9B,OAAO,CAAC,MAAM,CAAC;IAsBZ,aAAa,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBzD,eAAe,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAgBlC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAwB9D,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBnD,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IASzD,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IA8BtC,SAAS,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAa5B,mBAAmB,IAAI,OAAO,CAClC;QACE,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,EAAE,CACJ;IAsCK,qBAAqB,CACzB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,eAAe,CAAC;IA+BrB,oBAAoB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAmClD,qBAAqB,CACzB,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAChC,OAAO,CAAC,eAAe,CAAC;IAyCrB,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAazD,YAAY,CACV,OAAO,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACjC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrC,MAAM,CAAC,EAAE,aAAa,CAAC;KACxB,GACA,YAAY;IAQf,QAAQ,IAAI,OAAO,CAAC,KAAK,CAAC;CAG3B"}

package/dist/carriers/aymakan/index.js

@@ -7,7 +7,7 @@ import {
   WebhookVerificationError,
   validateCreateShipmentInput,
   validatePickupRequest
-} from "../../index-x8sk1kw9.js";
+} from "../../index-qjtxhwzv.js";
 
 // src/carriers/aymakan/services.ts
 var AymakanService = {
@@ -43,6 +43,33 @@ function mapAymakanStatus(statusCode) {
   const mapped = AymakanStatusCodes[statusCode];
   return mapped;
 }
+var AymakanStatusLabels = {
+  "awb created at origin": "created",
+  "shipment created": "created",
+  "collected from collection point": "picked_up",
+  collected: "picked_up",
+  "picked up": "picked_up",
+  "received at hub": "at_warehouse",
+  "received at warehouse": "at_warehouse",
+  "out for delivery": "out_for_delivery",
+  "out for final destination": "out_for_delivery",
+  delivered: "delivered",
+  "shipment is delivered": "delivered",
+  "transferred to destination city": "in_transit",
+  "in transit": "in_transit",
+  "not delivered": "exception",
+  "failed attempt": "exception",
+  pending: "pending",
+  "future delivery": "pending",
+  returned: "returned",
+  "returned to shipper": "returned",
+  "return to origin": "returned",
+  cancelled: "cancelled",
+  canceled: "cancelled"
+};
+function mapAymakanStatusLabel(label) {
+  return AymakanStatusLabels[label.trim().toLowerCase()];
+}
 function mapNationalAddress(addr) {
   if (!addr)
     return;
@@ -70,17 +97,19 @@ function mapCreateShipmentRequest(input) {
   const totalPieces = input.parcels.reduce((sum, p) => sum + p.pieces, 0);
   const totalWeight = input.parcels.reduce((sum, p) => sum + (p.weight.unit === "lb" ? p.weight.value * 0.453592 : p.weight.value), 0);
   const totalItems = input.parcels.reduce((sum, p) => sum + (p.itemsCount ?? p.pieces), 0);
+  const codEnabled = input.cod?.enabled === true;
+  const declaredValueCurrency = input.declaredValue?.currency ?? "SAR";
   return {
     requested_by: input.options?.requestedBy ?? input.shipper.name,
-    declared_value: input.declaredValue?.amount ?? input.cod?.amount ?? 0,
-    declared_value_currency: input.declaredValue?.currency ?? input.cod?.currency ?? "SAR",
+    declared_value: input.declaredValue?.amount ?? 0,
+    declared_value_currency: declaredValueCurrency,
     reference: input.reference,
     customer_tracking: input.options?.customerTracking,
     service_type: resolveServiceType(input.serviceType),
-    is_cod: input.cod?.enabled ? 1 : 0,
-    cod_amount: input.cod?.enabled ? input.cod.amount : undefined,
+    is_cod: codEnabled ? 1 : 0,
+    cod_amount: codEnabled ? input.cod?.amount : undefined,
     fulfilment_customer_name: input.options?.fulfilmentCustomerName,
-    currency: input.cod?.currency ?? "SAR",
+    currency: codEnabled ? input.cod?.currency ?? "SAR" : declaredValueCurrency,
     delivery_name: input.consignee.name,
     delivery_email: input.consignee.email,
     delivery_city: input.consignee.city,
@@ -152,16 +181,22 @@ function mapShipmentResponse(data) {
     statusLabel: data.status_label,
     labelUrl: data.label || undefined,
     pdfLabelUrl: data.pdf_label || undefined,
-    codAmount: codAmount && !Number.isNaN(codAmount) ? codAmount : undefined,
+    codAmount: codAmount != null && !Number.isNaN(codAmount) && codAmount !== 0 ? codAmount : undefined,
     declaredValue: data.declared_value,
     currency: data.currency,
     createdAt: new Date(data.created_at),
     raw: data
   };
 }
+function parseAymakanDate(value) {
+  if (/[TZ]|[+-]\d{2}:?\d{2}$/.test(value)) {
+    return new Date(value);
+  }
+  return new Date(`${value.replace(" ", "T")}+03:00`);
+}
 function mapTrackingEvent(event) {
   return {
-    timestamp: new Date(event.created_at),
+    timestamp: parseAymakanDate(event.created_at),
     statusCode: event.status_code,
     status: mapAymakanStatus(event.status_code) ?? "unknown",
     description: event.description,
@@ -169,13 +204,21 @@ function mapTrackingEvent(event) {
   };
 }
 function mapTrackingResult(data) {
+  const events = data.tracking_info.map(mapTrackingEvent);
+  const latestEvent = events.length ? [...events].sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime())[0] : undefined;
+  let status;
+  if (latestEvent && latestEvent.status !== "unknown") {
+    status = latestEvent.status;
+  } else {
+    status = mapAymakanStatus(data.status) ?? mapAymakanStatusLabel(data.status) ?? latestEvent?.status ?? "unknown";
+  }
   return {
     trackingNumber: data.tracking_number,
     carrier: "aymakan",
     reference: data.reference ?? undefined,
-    status: mapAymakanStatus(data.status) ?? "unknown",
+    status,
     statusLabel: data.status_label,
-    events: data.tracking_info.map(mapTrackingEvent),
+    events,
     deliveryDate: data.delivery_date ? new Date(data.delivery_date) : undefined,
     pickupDate: data.pickup_date ? new Date(data.pickup_date) : undefined,
     receivedAt: data.received_at ? new Date(data.received_at) : undefined,
@@ -256,7 +299,7 @@ function parseAymakanWebhook(payload, options) {
     eventType,
     trackingNumber: data.tracking_number,
     reference: data.reference ?? undefined,
-    status: eventType === "weight_update" ? "unknown" : mapAymakanStatus(data.status) ?? "unknown",
+    status: mapAymakanStatus(data.status) ?? "unknown",
     statusCode: data.status,
     statusLabel: data.status_label,
     reasonCode: data.reason_code ?? undefined,
@@ -269,11 +312,29 @@ function parseAymakanWebhook(payload, options) {
 // src/carriers/aymakan/adapter.ts
 var AYMAKAN_SANDBOX_URL = "https://dev-api.aymakan.com.sa/v2";
 var AYMAKAN_PRODUCTION_URL = "https://api.aymakan.net/v2";
+function aymakanErrorExtractor(json) {
+  if (!json || typeof json !== "object") {
+    return { hasError: false };
+  }
+  const obj = json;
+  const hasValidationErrors = !!obj.errors && typeof obj.errors === "object" && Object.keys(obj.errors).length > 0;
+  const hasError = obj.error === true || obj.success === false || hasValidationErrors;
+  if (!hasError) {
+    return { hasError: false };
+  }
+  const message = typeof obj.message === "string" && obj.message || typeof obj.response === "string" && obj.response || typeof obj.error === "string" && obj.error || undefined;
+  return {
+    hasError: true,
+    message,
+    errors: hasValidationErrors ? obj.errors : undefined
+  };
+}
 
 class AymakanAdapter extends BaseCarrierAdapter {
   name = "aymakan";
   supportedCountries = ["SA", "AE", "BH", "KW", "OM", "QA"];
   http;
+  errorOpts = { errorExtractor: aymakanErrorExtractor };
   citiesCache = null;
   citiesCacheTime = 0;
   static CITIES_CACHE_TTL = 60 * 60 * 1000;
@@ -348,7 +409,7 @@ class AymakanAdapter extends BaseCarrierAdapter {
     await this.ensureCitiesLoaded();
     const resolved = this.resolveCitiesInInput(input);
     const request = mapCreateShipmentRequest(resolved);
-    const response = await this.http.post("/shipping/create", request);
+    const response = await this.http.post("/shipping/create", request, this.errorOpts);
     if (!response.success) {
       throw new APIError("Failed to create shipment", {
         carrier: "aymakan",
@@ -358,27 +419,35 @@ class AymakanAdapter extends BaseCarrierAdapter {
     return mapShipmentResponse(response.shipping);
   }
   async createBulkShipments(inputs) {
+    if (inputs.length === 0)
+      return [];
+    if (inputs.length > 30) {
+      throw new ValidationError("Aymakan bulk create accepts at most 30 shipments per request", { raw: { count: inputs.length } });
+    }
     inputs.forEach(validateCreateShipmentInput);
     await this.ensureCitiesLoaded();
     const requests = inputs.map((i) => this.resolveCitiesInInput(i)).map(mapCreateShipmentRequest);
-    const response = await this.http.post("/shipping/create_bulk", { data: requests });
+    const response = await this.http.post("/shipping/create/bulk_shipping", { shipments: requests }, this.errorOpts);
     if (!response.success) {
       throw new APIError("Failed to create bulk shipments", {
         carrier: "aymakan",
         raw: response
       });
     }
-    return response.data.shipments.map(mapShipmentResponse);
+    if (!Array.isArray(response.shipments)) {
+      throw new APIError("Aymakan bulk create response is missing the shipments array", { carrier: "aymakan", raw: response });
+    }
+    return response.shipments.map(mapShipmentResponse);
   }
   async cancelShipment(trackingNumber) {
     const response = await this.http.post("/shipping/cancel", {
       tracking: trackingNumber
-    });
-    return response.success;
+    }, this.errorOpts);
+    return response.success === true;
   }
   async cancelByReference(reference) {
-    const response = await this.http.post(`/shipping/cancel/reference/${encodeURIComponent(reference)}`);
-    return response.success;
+    const response = await this.http.post("/shipping/cancel_by_reference", { reference }, this.errorOpts);
+    return response.success === true;
   }
   async updateDeliveryAddress(trackingNumber, address) {
     await this.ensureCitiesLoaded();
@@ -405,52 +474,51 @@ class AymakanAdapter extends BaseCarrierAdapter {
   }
   async trackMultiple(trackingNumbers) {
     const ids = trackingNumbers.map(encodeURIComponent).join(",");
-    const response = await this.http.get(`/shipping/track/${ids}`);
+    const response = await this.http.get(`/shipping/track/${ids}`, this.errorOpts);
     if (!response.success) {
       throw new APIError("Failed to track shipments", {
         carrier: "aymakan",
         raw: response
       });
     }
-    return response.data.shipments.map(mapTrackingResult);
-  }
-  async trackByReference(reference) {
-    const response = await this.http.get(`/shipments/by_reference/${encodeURIComponent(reference)}`);
-    if (!response.success || !response.data.shipments[0]) {
-      throw new APIError("Shipment not found", {
+    if (!Array.isArray(response.data?.shipments)) {
+      throw new APIError("Aymakan track response is missing data.shipments", {
         carrier: "aymakan",
         raw: response
       });
     }
-    return mapTrackingResult(response.data.shipments[0]);
+    return response.data.shipments.map(mapTrackingResult);
   }
-  async getLabel(trackingNumber, format) {
-    const response = await this.http.get(`/shipping/awb/tracking/${encodeURIComponent(trackingNumber)}`);
-    if (!response.success) {
-      throw new APIError("Failed to get label", {
+  async trackByReference(reference) {
+    const response = await this.http.get(`/shipping/by_reference/${encodeURIComponent(reference)}`, this.errorOpts);
+    const shipment = response.data?.shipments?.[0];
+    if (!response.success || !shipment) {
+      throw new APIError("Shipment not found", {
         carrier: "aymakan",
         raw: response
       });
     }
-    if (format === "PNG") {
-      return response.data.label || response.data.awb_url || response.data.pdf_label;
+    return mapTrackingResult(shipment);
+  }
+  async getLabel(trackingNumber, _format) {
+    const response = await this.http.get(`/shipping/awb/tracking/${encodeURIComponent(trackingNumber)}`, this.errorOpts);
+    if (!response.success || !response.data?.awb_url) {
+      const msg = response.message ?? response.response ?? "Failed to get label";
+      throw new APIError(msg, { carrier: "aymakan", raw: response });
     }
-    return response.data.pdf_label || response.data.awb_url || response.data.label;
+    return response.data.awb_url;
   }
   async getBulkLabels(trackingNumbers) {
-    const response = await this.http.post("/shipping/bulk_awb_labels", {
-      tracking_numbers: trackingNumbers
-    });
-    if (!response.success) {
-      throw new APIError("Failed to get bulk labels", {
-        carrier: "aymakan",
-        raw: response
-      });
+    const ids = trackingNumbers.map(encodeURIComponent).join(",");
+    const response = await this.http.get(`/shipping/bulk_awb/trackings/${ids}`, this.errorOpts);
+    if (!response.success || !response.data?.bulk_awb_url) {
+      const msg = response.message ?? response.response ?? "Failed to get bulk labels";
+      throw new APIError(msg, { carrier: "aymakan", raw: response });
     }
-    return response.data.label_url;
+    return response.data.bulk_awb_url;
   }
   async getPickupCities() {
-    const response = await this.http.get("/pickup_request/cities");
+    const response = await this.http.get("/pickup_request/cities", this.errorOpts);
     if (!response.success) {
       throw new APIError("Failed to get pickup cities", {
         carrier: "aymakan",
@@ -475,7 +543,7 @@ class AymakanAdapter extends BaseCarrierAdapter {
     await this.ensureCitiesLoaded();
     const resolvedInput = { ...input, city: this.resolveCity(input.city) };
     const request = mapPickupRequest(resolvedInput);
-    const response = await this.http.post("/pickup_request/create", request);
+    const response = await this.http.post("/pickup_request/create", request, this.errorOpts);
     if (!response.success) {
       throw new APIError("Failed to create pickup", {
         carrier: "aymakan",
@@ -485,18 +553,22 @@ class AymakanAdapter extends BaseCarrierAdapter {
     return mapPickupResponse(response.data);
   }
   async cancelPickup(pickupId) {
-    const response = await this.http.post(`/pickup_request/cancel/${encodeURIComponent(String(pickupId))}`);
-    return response.success;
+    const response = await this.http.post("/pickup_request/cancel", { pickup_request: Number(pickupId) }, this.errorOpts);
+    return response.success === true;
   }
   async getPickupRequests() {
-    const response = await this.http.get("/pickup_requests");
+    const response = await this.http.get("/pickup_request/list", this.errorOpts);
     if (!response.success) {
       throw new APIError("Failed to get pickup requests", {
         carrier: "aymakan",
         raw: response
       });
     }
-    return response.data.pickup_requests.map(mapPickupResponse);
+    const list = response.data?.pickupRequests?.data;
+    if (!Array.isArray(list)) {
+      throw new APIError("Aymakan pickup list response is missing data.pickupRequests.data", { carrier: "aymakan", raw: response });
+    }
+    return list.map(mapPickupResponse);
   }
   async getCities() {
     const response = await this.http.get("/cities");
@@ -516,18 +588,19 @@ class AymakanAdapter extends BaseCarrierAdapter {
         raw: response
       });
     }
-    return response.data.locations.map((loc) => ({
-      id: String(loc.id),
+    return response.data.map((loc) => ({
+      id: loc.name,
       name: loc.name,
-      nameAr: loc.name_ar,
       address: loc.address,
-      city: loc.city
+      city: loc.city,
+      latitude: loc.location_lat ?? undefined,
+      longitude: loc.location_lng ?? undefined
     }));
   }
   async createCustomerAddress(address) {
     const request = mapCustomerAddressRequest(address);
-    const response = await this.http.post("/address/create", request);
-    if (!response.success) {
+    const response = await this.http.post("/address/create", request, this.errorOpts);
+    if (!response.success || !response.data?.address) {
       throw new APIError("Failed to create address", {
         carrier: "aymakan",
         raw: response
@@ -549,14 +622,17 @@ class AymakanAdapter extends BaseCarrierAdapter {
     };
   }
   async getCustomerAddresses() {
-    const response = await this.http.get("/addresses");
+    const response = await this.http.get("/address/list", this.errorOpts);
     if (!response.success) {
       throw new APIError("Failed to get customer addresses", {
         carrier: "aymakan",
         raw: response
       });
     }
-    return response.data.addresses.map((addr) => ({
+    if (!Array.isArray(response.data?.address)) {
+      throw new APIError("Aymakan address list response is missing data.address", { carrier: "aymakan", raw: response });
+    }
+    return response.data.address.map((addr) => ({
       id: addr.id,
       title: addr.title,
       name: addr.name,
@@ -571,7 +647,8 @@ class AymakanAdapter extends BaseCarrierAdapter {
     }));
   }
   async updateCustomerAddress(id, address) {
-    const response = await this.http.put(`/address/update/${id}`, {
+    const response = await this.http.put("/address/update", {
+      id,
       title: address.title,
       name: address.name,
       email: address.email,
@@ -581,8 +658,8 @@ class AymakanAdapter extends BaseCarrierAdapter {
       postcode: address.postalCode,
       phone: address.phone,
       description: address.description
-    });
-    if (!response.success) {
+    }, this.errorOpts);
+    if (!response.success || !response.data?.address) {
       throw new APIError("Failed to update address", {
         carrier: "aymakan",
         raw: response
@@ -604,7 +681,7 @@ class AymakanAdapter extends BaseCarrierAdapter {
     };
   }
   async deleteCustomerAddress(id) {
-    const response = await this.http.delete(`/address/delete/${id}`);
+    const response = await this.http.delete("/address/delete", { body: { id }, errorExtractor: aymakanErrorExtractor });
     return response.success;
   }
   parseWebhook(payload, options) {
@@ -622,4 +699,4 @@ export {
   AymakanAdapter
 };
 
-//# debugId=ECFB3CDDA31BC0F864756E2164756E21
+//# debugId=52369388ABAA8E1964756E2164756E21