@dapex-tech/elite-online-services 0.0.22 → 0.0.24

package/services/CustomerTripsService.js

@@ -19,20 +19,26 @@ class CustomerTripsService {
         });
     }
     /**
-     * Get all trips for a customer
+     * Get trips for a customer (paginated)
+     * @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, PAUSED_TRAFFIC, 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 TripDto List of trips
+     * @returns PaginatedTripsDto Paginated list of trips
      * @throws ApiError
      */
-    static findAll(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',
             query: {
+                'page': page,
+                'pageSize': pageSize,
                 'q': q,
+                'status': status,
                 'order': order,
                 'customerId': customerId,
                 'driverId': driverId,
@@ -64,6 +70,21 @@ class CustomerTripsService {
             url: '/customers/trips/active',
         });
     }
+    /**
+     * Get trip location points
+     * @param id
+     * @returns TripLocationPointDto List of trip location points
+     * @throws ApiError
+     */
+    static getTripLocationPoints(id) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'GET',
+            url: '/customers/trips/{id}/location-points',
+            path: {
+                'id': id,
+            },
+        });
+    }
     /**
      * Get a single trip by ID
      * @param id

package/services/CustomersAuthService.d.ts

@@ -9,7 +9,6 @@ import type { GenerateVerificationCodeDto } from '../models/GenerateVerification
 import type { MessageResponseDto } from '../models/MessageResponseDto';
 import type { ResetPasswordDto } from '../models/ResetPasswordDto';
 import type { TokensDto } from '../models/TokensDto';
-import type { ValidateResetCodeDto } from '../models/ValidateResetCodeDto';
 import type { CancelablePromise } from '../core/CancelablePromise';
 export declare class CustomersAuthService {
     /**
@@ -59,15 +58,9 @@ export declare class CustomersAuthService {
      * @throws ApiError
      */
     static generateResetCode(requestBody: GenerateResetCodeDto): CancelablePromise<MessageResponseDto>;
-    /**
-     * Validate Password Reset Code
-     * @param requestBody
-     * @returns MessageResponseDto Reset code is valid
-     * @throws ApiError
-     */
-    static validateResetCode(requestBody: ValidateResetCodeDto): CancelablePromise<MessageResponseDto>;
     /**
      * Reset Customer Password
+     * Requires the SMS reset code from forgot-password together with the new password.
      * @param requestBody
      * @returns MessageResponseDto Password reset successfully
      * @throws ApiError

package/services/CustomersAuthService.js

@@ -94,22 +94,9 @@ class CustomersAuthService {
             mediaType: 'application/json',
         });
     }
-    /**
-     * Validate Password Reset Code
-     * @param requestBody
-     * @returns MessageResponseDto Reset code is valid
-     * @throws ApiError
-     */
-    static validateResetCode(requestBody) {
-        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
-            method: 'POST',
-            url: '/auth/customers/validate-reset-code',
-            body: requestBody,
-            mediaType: 'application/json',
-        });
-    }
     /**
      * Reset Customer Password
+     * Requires the SMS reset code from forgot-password together with the new password.
      * @param requestBody
      * @returns MessageResponseDto Password reset successfully
      * @throws ApiError

package/services/DriverAuthService.d.ts

@@ -5,7 +5,6 @@ import type { GenerateResetCodeDto } from '../models/GenerateResetCodeDto';
 import type { MessageResponseDto } from '../models/MessageResponseDto';
 import type { ResetPasswordDto } from '../models/ResetPasswordDto';
 import type { TokensDto } from '../models/TokensDto';
-import type { ValidateResetCodeDto } from '../models/ValidateResetCodeDto';
 import type { CancelablePromise } from '../core/CancelablePromise';
 export declare class DriverAuthService {
     /**
@@ -40,15 +39,9 @@ export declare class DriverAuthService {
      * @throws ApiError
      */
     static generateResetCode(requestBody: GenerateResetCodeDto): CancelablePromise<MessageResponseDto>;
-    /**
-     * Validate Password Reset Code
-     * @param requestBody
-     * @returns MessageResponseDto Reset code is valid
-     * @throws ApiError
-     */
-    static validateResetCode(requestBody: ValidateResetCodeDto): CancelablePromise<MessageResponseDto>;
     /**
      * Reset Driver Password
+     * Requires the SMS reset code from forgot-password together with the new password.
      * @param requestBody
      * @returns MessageResponseDto Password reset successfully
      * @throws ApiError

package/services/DriverAuthService.js

@@ -65,22 +65,9 @@ class DriverAuthService {
             mediaType: 'application/json',
         });
     }
-    /**
-     * Validate Password Reset Code
-     * @param requestBody
-     * @returns MessageResponseDto Reset code is valid
-     * @throws ApiError
-     */
-    static validateResetCode(requestBody) {
-        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
-            method: 'POST',
-            url: '/auth/drivers/validate-reset-code',
-            body: requestBody,
-            mediaType: 'application/json',
-        });
-    }
     /**
      * Reset Driver Password
+     * Requires the SMS reset code from forgot-password together with the new password.
      * @param requestBody
      * @returns MessageResponseDto Password reset successfully
      * @throws ApiError

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

@@ -1,7 +1,9 @@
 import type { DriverTripActions } from '../models/DriverTripActions';
 import type { EstimateTripCostDto } from '../models/EstimateTripCostDto';
 import type { OrderDto } from '../models/OrderDto';
+import type { PaginatedTripsDto } from '../models/PaginatedTripsDto';
 import type { TripDto } from '../models/TripDto';
+import type { TripLocationPointDto } from '../models/TripLocationPointDto';
 import type { TripUpdateDto } from '../models/TripUpdateDto';
 import type { VoucherDriverCreateDto } from '../models/VoucherDriverCreateDto';
 import type { VoucherDto } from '../models/VoucherDto';
@@ -15,15 +17,18 @@ export declare class DriverTripsService {
      */
     static create(requestBody: TripDto): CancelablePromise<TripDto>;
     /**
-     * Get all trips for a driver
+     * Get trips for a driver (paginated)
+     * @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, PAUSED_TRAFFIC, 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 TripDto List of trips
+     * @returns PaginatedTripsDto Paginated list of trips
      * @throws ApiError
      */
-    static findAll(q?: string, order?: OrderDto, customerId?: number, driverId?: number): CancelablePromise<Array<TripDto>>;
+    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
@@ -52,6 +57,13 @@ export declare class DriverTripsService {
      * @throws ApiError
      */
     static getActiveTrip(): CancelablePromise<TripDto>;
+    /**
+     * Get trip location points
+     * @param id
+     * @returns TripLocationPointDto List of trip location points
+     * @throws ApiError
+     */
+    static getTripLocationPoints(id: number): CancelablePromise<Array<TripLocationPointDto>>;
     /**
      * Create voucher for trip (new senior not yet reported by city)
      * @param id Trip ID
@@ -68,4 +80,12 @@ export declare class DriverTripsService {
      * @throws ApiError
      */
     static executeTripAction(id: number, action: DriverTripActions): CancelablePromise<TripDto>;
+    /**
+     * Send pickup notification (voice call + SMS) to the customer
+     * Trip must be in DRIVER_ONWAY or DRIVER_AT_PICKUP status. Message language is determined by the trip language setting.
+     * @param id Trip ID
+     * @returns any Notifications dispatched.
+     * @throws ApiError
+     */
+    static sendPickupNotification(id: number): CancelablePromise<any>;
 }

package/services/DriverTripsService.js

@@ -19,20 +19,26 @@ class DriverTripsService {
         });
     }
     /**
-     * Get all trips for a driver
+     * Get trips for a driver (paginated)
+     * @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, PAUSED_TRAFFIC, 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 TripDto List of trips
+     * @returns PaginatedTripsDto Paginated list of trips
      * @throws ApiError
      */
-    static findAll(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',
             query: {
+                'page': page,
+                'pageSize': pageSize,
                 'q': q,
+                'status': status,
                 'order': order,
                 'customerId': customerId,
                 'driverId': driverId,
@@ -97,6 +103,21 @@ class DriverTripsService {
             url: '/drivers/trips/active',
         });
     }
+    /**
+     * Get trip location points
+     * @param id
+     * @returns TripLocationPointDto List of trip location points
+     * @throws ApiError
+     */
+    static getTripLocationPoints(id) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'GET',
+            url: '/drivers/trips/{id}/location-points',
+            path: {
+                'id': id,
+            },
+        });
+    }
     /**
      * Create voucher for trip (new senior not yet reported by city)
      * @param id Trip ID
@@ -132,5 +153,21 @@ class DriverTripsService {
             },
         });
     }
+    /**
+     * Send pickup notification (voice call + SMS) to the customer
+     * Trip must be in DRIVER_ONWAY or DRIVER_AT_PICKUP status. Message language is determined by the trip language setting.
+     * @param id Trip ID
+     * @returns any Notifications dispatched.
+     * @throws ApiError
+     */
+    static sendPickupNotification(id) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'POST',
+            url: '/drivers/trips/{id}/send-pickup-notification',
+            path: {
+                'id': id,
+            },
+        });
+    }
 }
 exports.DriverTripsService = DriverTripsService;

package/services/DriversService.d.ts

@@ -1,6 +1,10 @@
+import type { AdminSearchCustomersResponseDto } from '../models/AdminSearchCustomersResponseDto';
 import type { DriverDto } from '../models/DriverDto';
+import type { DriverLocationUpdateDto } from '../models/DriverLocationUpdateDto';
+import type { DriverStatusResponseDto } from '../models/DriverStatusResponseDto';
 import type { DriverUpdateDto } from '../models/DriverUpdateDto';
 import type { MessageResponseDto } from '../models/MessageResponseDto';
+import type { OrderDto } from '../models/OrderDto';
 import type { SeniorCenterDto } from '../models/SeniorCenterDto';
 import type { TwilioTokenResponse } from '../models/TwilioTokenResponse';
 import type { UpdateFcmTokenDto } from '../models/UpdateFcmTokenDto';
@@ -56,4 +60,21 @@ export declare class DriversService {
      * @throws ApiError
      */
     static findAllSeniorCenters(): CancelablePromise<Array<SeniorCenterDto>>;
+    /**
+     * Search customers (registered + manual + vouchers), paginated per bucket
+     * @param page Page number
+     * @param pageSize Items per page
+     * @param q Text to search for in customers (registered customers + manual customers + vouchers)
+     * @param order Sorting options (each bucket uses its own table default when omitted)
+     * @returns AdminSearchCustomersResponseDto Each of registeredCustomers, vouchers, and manualCustomers includes page, pageSize, total, and items
+     * @throws ApiError
+     */
+    static searchCustomers(page?: number, pageSize?: number, q?: string, order?: OrderDto): CancelablePromise<AdminSearchCustomersResponseDto>;
+    /**
+     * Update driver live location
+     * @param requestBody
+     * @returns DriverStatusResponseDto Updated driver status snapshot stored in Redis
+     * @throws ApiError
+     */
+    static updateDriverLocation(requestBody: DriverLocationUpdateDto): CancelablePromise<DriverStatusResponseDto>;
 }

package/services/DriversService.js

@@ -102,5 +102,40 @@ class DriversService {
             url: '/drivers/senior-centers',
         });
     }
+    /**
+     * Search customers (registered + manual + vouchers), paginated per bucket
+     * @param page Page number
+     * @param pageSize Items per page
+     * @param q Text to search for in customers (registered customers + manual customers + vouchers)
+     * @param order Sorting options (each bucket uses its own table default when omitted)
+     * @returns AdminSearchCustomersResponseDto Each of registeredCustomers, vouchers, and manualCustomers includes page, pageSize, total, and items
+     * @throws ApiError
+     */
+    static searchCustomers(page = 1, pageSize = 12, q, order) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'GET',
+            url: '/drivers/search-customers',
+            query: {
+                'page': page,
+                'pageSize': pageSize,
+                'q': q,
+                'order': order,
+            },
+        });
+    }
+    /**
+     * Update driver live location
+     * @param requestBody
+     * @returns DriverStatusResponseDto Updated driver status snapshot stored in Redis
+     * @throws ApiError
+     */
+    static updateDriverLocation(requestBody) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'PATCH',
+            url: '/drivers/status',
+            body: requestBody,
+            mediaType: 'application/json',
+        });
+    }
 }
 exports.DriversService = DriversService;

package/services/MainService.d.ts

@@ -1,3 +1,4 @@
+import type { SendDriverPushDto } from '../models/SendDriverPushDto';
 import type { CancelablePromise } from '../core/CancelablePromise';
 export declare class MainService {
     /**
@@ -5,6 +6,13 @@ export declare class MainService {
      * @throws ApiError
      */
     static getHello(): CancelablePromise<any>;
+    /**
+     * Send a push notification to a driver
+     * @param requestBody
+     * @returns any Notification sent successfully.
+     * @throws ApiError
+     */
+    static sendDriverPushNotification(requestBody: SendDriverPushDto): CancelablePromise<any>;
     /**
      * @returns any
      * @throws ApiError

package/services/MainService.js

@@ -14,6 +14,25 @@ class MainService {
             url: '/',
         });
     }
+    /**
+     * Send a push notification to a driver
+     * @param requestBody
+     * @returns any Notification sent successfully.
+     * @throws ApiError
+     */
+    static sendDriverPushNotification(requestBody) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'POST',
+            url: '/drivers/push-notification',
+            body: requestBody,
+            mediaType: 'application/json',
+            errors: {
+                400: `Driver has no FCM token.`,
+                404: `Driver not found.`,
+                500: `FCM send failed.`,
+            },
+        });
+    }
     /**
      * @returns any
      * @throws ApiError

package/services/index.d.ts

@@ -1,8 +1,10 @@
 export * from './AdminAuthService';
 export * from './AdminCustomerService';
+export * from './AdminDispatchService';
 export * from './AdminDriversService';
 export * from './AdminPaymentsService';
 export * from './AdminQueuesService';
+export * from './AdminRedisService';
 export * from './AdminSectionContentService';
 export * from './AdminService';
 export * from './AdminSettingsService';

package/services/index.js

@@ -16,9 +16,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AdminAuthService"), exports);
 __exportStar(require("./AdminCustomerService"), exports);
+__exportStar(require("./AdminDispatchService"), exports);
 __exportStar(require("./AdminDriversService"), exports);
 __exportStar(require("./AdminPaymentsService"), exports);
 __exportStar(require("./AdminQueuesService"), exports);
+__exportStar(require("./AdminRedisService"), exports);
 __exportStar(require("./AdminSectionContentService"), exports);
 __exportStar(require("./AdminService"), exports);
 __exportStar(require("./AdminSettingsService"), exports);

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/active-trip.d.ts

@@ -12,8 +12,9 @@ export interface ActiveTrip {
     paymentType?: PaymentTypes;
     status: TripStatuses;
     driverAssignmentMode?: DriverAssignmentModes;
-    currentLatitude: number;
-    currentLongitude: number;
+    /** Live driver position on the trip; null until known (not defaulted to 0,0). */
+    currentLatitude: number | null;
+    currentLongitude: number | null;
     lastUpdate?: Date;
     deltaDistanceMeters?: number;
     deltaTotalMilliseconds?: number;

package/models/ValidateResetCodeDto.d.ts

@@ -1,14 +0,0 @@
-export type ValidateResetCodeDto = {
-    /**
-     * Phone Country Code
-     */
-    phoneCountryCode: string;
-    /**
-     * Phone Number
-     */
-    phone: string;
-    /**
-     * Reset Code (4 digits)
-     */
-    resetCode: string;
-};