@dapex-tech/elite-online-services 0.0.23 → 0.0.25

package/models/DriverLocationUpdateDto.d.ts

@@ -2,9 +2,9 @@ export type DriverLocationUpdateDto = {
     /**
      * Latitude in decimal degrees
      */
-    latitude: number;
+    latitude?: number;
     /**
      * Longitude in decimal degrees
      */
-    longitude: number;
+    longitude?: number;
 };

package/models/DriverStatusResponseDto.d.ts

@@ -7,4 +7,6 @@ export type DriverStatusResponseDto = {
     isOnline?: boolean;
     waitingTripIds?: Array<number>;
     activeTripId?: number;
+    onlineTimeoutWarningFirstSent?: boolean;
+    onlineTimeoutWarningSecondSent?: boolean;
 };

package/models/PaymentDto.d.ts

@@ -19,4 +19,36 @@ export type PaymentDto = {
      * Payment amount
      */
     amount?: Record<string, any> | null;
+    /**
+     * When the payment was created
+     */
+    createdAt?: Record<string, any> | null;
+    /**
+     * Voucher ID
+     */
+    voucherId?: Record<string, any> | null;
+    /**
+     * Gateway transaction ID (Authorize.net)
+     */
+    gatewayTransactionId?: Record<string, any> | null;
+    /**
+     * Gateway customer profile ID
+     */
+    gatewayCustomerProfileId?: Record<string, any> | null;
+    /**
+     * Gateway payment profile ID
+     */
+    gatewayPaymentProfileId?: Record<string, any> | null;
+    /**
+     * Card brand
+     */
+    cardBrand?: Record<string, any> | null;
+    /**
+     * Last four digits of the card
+     */
+    cardLast4?: Record<string, any> | null;
+    /**
+     * Customer payment method ID
+     */
+    customerPaymentMethodId?: Record<string, any> | null;
 };

package/models/TripLocationPointDto.d.ts

@@ -1,3 +1,4 @@
+import type { TripStatuses } from './TripStatuses';
 export type TripLocationPointDto = {
     /**
      * Location point ID
@@ -18,7 +19,7 @@ export type TripLocationPointDto = {
     /**
      * Status
      */
-    status?: Record<string, any> | null;
+    status?: TripStatuses | null;
     /**
      * Created at timestamp
      */

package/models/TripStatuses.d.ts

@@ -8,7 +8,7 @@ export declare enum TripStatuses {
     DRIVER_AT_PICKUP = "DRIVER_AT_PICKUP",
     IN_PROGRESS = "IN_PROGRESS",
     PAUSED = "PAUSED",
-    PAUSED_TRAFFIC = "PAUSED_TRAFFIC",
+    TRAFFIC_DELAY = "TRAFFIC_DELAY",
     COMPLETED = "COMPLETED",
     CANCELED_PASSENGER = "CANCELED_PASSENGER",
     CANCELED_DRIVER = "CANCELED_DRIVER",

package/models/TripStatuses.js

@@ -16,7 +16,7 @@ var TripStatuses;
     TripStatuses["DRIVER_AT_PICKUP"] = "DRIVER_AT_PICKUP";
     TripStatuses["IN_PROGRESS"] = "IN_PROGRESS";
     TripStatuses["PAUSED"] = "PAUSED";
-    TripStatuses["PAUSED_TRAFFIC"] = "PAUSED_TRAFFIC";
+    TripStatuses["TRAFFIC_DELAY"] = "TRAFFIC_DELAY";
     TripStatuses["COMPLETED"] = "COMPLETED";
     TripStatuses["CANCELED_PASSENGER"] = "CANCELED_PASSENGER";
     TripStatuses["CANCELED_DRIVER"] = "CANCELED_DRIVER";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dapex-tech/elite-online-services",
-	"version": "0.0.23",
+	"version": "0.0.25",
 	"main": "./index.js",
 	"types": "./index.d.ts",
 	"private": false,

package/services/AdminTripsService.d.ts

@@ -14,13 +14,14 @@ export declare class AdminTripsService {
      * @param page Page number
      * @param pageSize Items per page
      * @param q Text to search for in trip fields
+     * @param status Comma-separated trip status values. Valid values: SCHEDULED, REQUESTED, DRIVER_SEARCHING, DRIVER_ASSIGNED, DRIVER_ASSIGNED_PENDING, DRIVER_ONWAY, DRIVER_AT_PICKUP, IN_PROGRESS, PAUSED, TRAFFIC_DELAY, COMPLETED, CANCELED_PASSENGER, CANCELED_DRIVER, CANCELED_ADMIN.
      * @param order Sorting options
      * @param customerId Filter by customer ID (scope to customer)
      * @param driverId Filter by driver ID (scope to driver)
      * @returns PaginatedTripsDto Paginated list of trips
      * @throws ApiError
      */
-    static findAll(page?: number, pageSize?: number, q?: string, order?: OrderDto, customerId?: number, driverId?: number): CancelablePromise<PaginatedTripsDto>;
+    static findAll(page?: number, pageSize?: number, q?: string, status?: string, order?: OrderDto, customerId?: number, driverId?: number): CancelablePromise<PaginatedTripsDto>;
     /**
      * Create a new trip/service order
      * @param requestBody

package/services/AdminTripsService.js

@@ -9,13 +9,14 @@ class AdminTripsService {
      * @param page Page number
      * @param pageSize Items per page
      * @param q Text to search for in trip fields
+     * @param status Comma-separated trip status values. Valid values: SCHEDULED, REQUESTED, DRIVER_SEARCHING, DRIVER_ASSIGNED, DRIVER_ASSIGNED_PENDING, DRIVER_ONWAY, DRIVER_AT_PICKUP, IN_PROGRESS, PAUSED, TRAFFIC_DELAY, COMPLETED, CANCELED_PASSENGER, CANCELED_DRIVER, CANCELED_ADMIN.
      * @param order Sorting options
      * @param customerId Filter by customer ID (scope to customer)
      * @param driverId Filter by driver ID (scope to driver)
      * @returns PaginatedTripsDto Paginated list of trips
      * @throws ApiError
      */
-    static findAll(page = 1, pageSize = 12, q, order, customerId, driverId) {
+    static findAll(page = 1, pageSize = 12, q, status, order, customerId, driverId) {
         return (0, request_1.request)(OpenAPI_1.OpenAPI, {
             method: 'GET',
             url: '/admins/trips',
@@ -23,6 +24,7 @@ class AdminTripsService {
                 'page': page,
                 'pageSize': pageSize,
                 'q': q,
+                'status': status,
                 'order': order,
                 'customerId': customerId,
                 'driverId': driverId,

package/services/CustomerTripsService.d.ts

@@ -20,13 +20,14 @@ export declare class CustomerTripsService {
      * @param page Page number
      * @param pageSize Items per page
      * @param q Text to search for in trip fields
+     * @param status Comma-separated trip status values. Valid values: SCHEDULED, REQUESTED, DRIVER_SEARCHING, DRIVER_ASSIGNED, DRIVER_ASSIGNED_PENDING, DRIVER_ONWAY, DRIVER_AT_PICKUP, IN_PROGRESS, PAUSED, TRAFFIC_DELAY, COMPLETED, CANCELED_PASSENGER, CANCELED_DRIVER, CANCELED_ADMIN.
      * @param order Sorting options
      * @param customerId Filter by customer ID (scope to customer)
      * @param driverId Filter by driver ID (scope to driver)
      * @returns PaginatedTripsDto Paginated list of trips
      * @throws ApiError
      */
-    static findAll(page?: number, pageSize?: number, q?: string, order?: OrderDto, customerId?: number, driverId?: number): CancelablePromise<PaginatedTripsDto>;
+    static findAll(page?: number, pageSize?: number, q?: string, status?: string, order?: OrderDto, customerId?: number, driverId?: number): CancelablePromise<PaginatedTripsDto>;
     /**
      * Estimate trip cost by origin and destination
      * @param requestBody

package/services/CustomerTripsService.js

@@ -23,13 +23,14 @@ class CustomerTripsService {
      * @param page Page number
      * @param pageSize Items per page
      * @param q Text to search for in trip fields
+     * @param status Comma-separated trip status values. Valid values: SCHEDULED, REQUESTED, DRIVER_SEARCHING, DRIVER_ASSIGNED, DRIVER_ASSIGNED_PENDING, DRIVER_ONWAY, DRIVER_AT_PICKUP, IN_PROGRESS, PAUSED, TRAFFIC_DELAY, COMPLETED, CANCELED_PASSENGER, CANCELED_DRIVER, CANCELED_ADMIN.
      * @param order Sorting options
      * @param customerId Filter by customer ID (scope to customer)
      * @param driverId Filter by driver ID (scope to driver)
      * @returns PaginatedTripsDto Paginated list of trips
      * @throws ApiError
      */
-    static findAll(page = 1, pageSize = 12, q, order, customerId, driverId) {
+    static findAll(page = 1, pageSize = 12, q, status, order, customerId, driverId) {
         return (0, request_1.request)(OpenAPI_1.OpenAPI, {
             method: 'GET',
             url: '/customers/trips',
@@ -37,6 +38,7 @@ class CustomerTripsService {
                 'page': page,
                 'pageSize': pageSize,
                 'q': q,
+                'status': status,
                 'order': order,
                 'customerId': customerId,
                 'driverId': driverId,

package/services/DriverPaymentsService.js

@@ -174,6 +174,7 @@ class DriverPaymentsService {
             errors: {
                 400: `Invalid voucher inquiry request or trip has no voucher`,
                 404: `Trip not found`,
+                502: `Voucher gateway unreachable or returned an error`,
             },
         });
     }

package/services/DriverTripsService.d.ts

@@ -21,13 +21,14 @@ export declare class DriverTripsService {
      * @param page Page number
      * @param pageSize Items per page
      * @param q Text to search for in trip fields
+     * @param status Comma-separated trip status values. Valid values: SCHEDULED, REQUESTED, DRIVER_SEARCHING, DRIVER_ASSIGNED, DRIVER_ASSIGNED_PENDING, DRIVER_ONWAY, DRIVER_AT_PICKUP, IN_PROGRESS, PAUSED, TRAFFIC_DELAY, COMPLETED, CANCELED_PASSENGER, CANCELED_DRIVER, CANCELED_ADMIN.
      * @param order Sorting options
      * @param customerId Filter by customer ID (scope to customer)
      * @param driverId Filter by driver ID (scope to driver)
      * @returns PaginatedTripsDto Paginated list of trips
      * @throws ApiError
      */
-    static findAll(page?: number, pageSize?: number, q?: string, order?: OrderDto, customerId?: number, driverId?: number): CancelablePromise<PaginatedTripsDto>;
+    static findAll(page?: number, pageSize?: number, q?: string, status?: string, order?: OrderDto, customerId?: number, driverId?: number): CancelablePromise<PaginatedTripsDto>;
     /**
      * Estimate trip cost by origin and destination
      * @param requestBody

package/services/DriverTripsService.js

@@ -23,13 +23,14 @@ class DriverTripsService {
      * @param page Page number
      * @param pageSize Items per page
      * @param q Text to search for in trip fields
+     * @param status Comma-separated trip status values. Valid values: SCHEDULED, REQUESTED, DRIVER_SEARCHING, DRIVER_ASSIGNED, DRIVER_ASSIGNED_PENDING, DRIVER_ONWAY, DRIVER_AT_PICKUP, IN_PROGRESS, PAUSED, TRAFFIC_DELAY, COMPLETED, CANCELED_PASSENGER, CANCELED_DRIVER, CANCELED_ADMIN.
      * @param order Sorting options
      * @param customerId Filter by customer ID (scope to customer)
      * @param driverId Filter by driver ID (scope to driver)
      * @returns PaginatedTripsDto Paginated list of trips
      * @throws ApiError
      */
-    static findAll(page = 1, pageSize = 12, q, order, customerId, driverId) {
+    static findAll(page = 1, pageSize = 12, q, status, order, customerId, driverId) {
         return (0, request_1.request)(OpenAPI_1.OpenAPI, {
             method: 'GET',
             url: '/drivers/trips',
@@ -37,6 +38,7 @@ class DriverTripsService {
                 'page': page,
                 'pageSize': pageSize,
                 'q': q,
+                'status': status,
                 'order': order,
                 'customerId': customerId,
                 'driverId': driverId,

package/socketService.js

@@ -11,6 +11,10 @@ class SocketService {
             path,
             transports: ['websocket'],
             autoConnect: false,
+            reconnection: true,
+            reconnectionAttempts: Infinity,
+            reconnectionDelay: 1000,
+            timeout: 20000,
         });
     }
     splitSocketUrl(baseUrl) {
@@ -35,15 +39,27 @@ class SocketService {
         }
         return instance;
     }
-    setToken(token) {
+    /*
+    setToken(token: string) {
         this.token = token;
         this.socket.auth = { token };
+
         // always force re-auth
         if (this.socket.connected) {
             this.socket.disconnect();
         }
         this.socket.connect();
     }
+    */
+    setToken(token) {
+        if (this.token === token)
+            return;
+        this.token = token;
+        this.socket.auth = { token };
+        if (this.socket.connected) {
+            this.socket.disconnect().connect();
+        }
+    }
     clearToken() {
         this.token = undefined;
         if (!this.socket || !this.socket.auth)

package/types/realtime/driver-status.d.ts

@@ -7,5 +7,9 @@ export interface DriverStatus {
     isOnline?: boolean;
     waitingTripIds?: number[];
     activeTripId?: number;
+    /** Set by scheduler after first stale-heartbeat warning; cleared on heartbeat. */
+    onlineTimeoutWarningFirstSent?: boolean;
+    /** Set by scheduler after second stale-heartbeat warning; cleared on heartbeat. */
+    onlineTimeoutWarningSecondSent?: boolean;
 }
 export declare function isValidDriverStatus(driverStatus: DriverStatus): boolean;