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

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/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.24",
+	"version": "0.0.26",
 	"main": "./index.js",
 	"types": "./index.d.ts",
 	"private": false,

package/services/AdminTripsService.d.ts

@@ -14,7 +14,7 @@ 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, PAUSED_TRAFFIC, COMPLETED, CANCELED_PASSENGER, CANCELED_DRIVER, CANCELED_ADMIN.
+     * @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)

package/services/AdminTripsService.js

@@ -9,7 +9,7 @@ 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, PAUSED_TRAFFIC, COMPLETED, CANCELED_PASSENGER, CANCELED_DRIVER, CANCELED_ADMIN.
+     * @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)

package/services/CustomerTripsService.d.ts

@@ -20,7 +20,7 @@ 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, PAUSED_TRAFFIC, COMPLETED, CANCELED_PASSENGER, CANCELED_DRIVER, CANCELED_ADMIN.
+     * @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)

package/services/CustomerTripsService.js

@@ -23,7 +23,7 @@ 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, PAUSED_TRAFFIC, COMPLETED, CANCELED_PASSENGER, CANCELED_DRIVER, CANCELED_ADMIN.
+     * @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)

package/services/DriverTripsService.d.ts

@@ -21,7 +21,7 @@ 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, PAUSED_TRAFFIC, COMPLETED, CANCELED_PASSENGER, CANCELED_DRIVER, CANCELED_ADMIN.
+     * @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)

package/services/DriverTripsService.js

@@ -23,7 +23,7 @@ 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, PAUSED_TRAFFIC, COMPLETED, CANCELED_PASSENGER, CANCELED_DRIVER, CANCELED_ADMIN.
+     * @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)

package/socketService.d.ts

@@ -13,6 +13,7 @@ export declare class SocketService {
     connect(): void;
     disconnect(): void;
     isConnected(): boolean;
+    isActive(): boolean;
     on<T = any>(event: string, cb: (data: T) => void): void;
     off(event: string, cb?: (...args: any[]) => void): void;
     emit<T = any>(event: string, data: T): void;

package/socketService.js

@@ -57,8 +57,10 @@ class SocketService {
         this.token = token;
         this.socket.auth = { token };
         if (this.socket.connected) {
-            this.socket.disconnect().connect();
+            this.socket.disconnect();
         }
+        if (!this.isActive())
+            this.socket.connect();
     }
     clearToken() {
         this.token = undefined;
@@ -76,6 +78,9 @@ class SocketService {
     isConnected() {
         return this.socket.connected;
     }
+    isActive() {
+        return this.socket.connected && this.socket.active;
+    }
     on(event, cb) {
         this.socket.on(event, cb);
     }

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;