@dapex-tech/elite-online-services 0.0.12 → 0.0.13

package/socketService.bak.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SocketServiceBak = void 0;
+const socket_io_client_1 = require("socket.io-client");
+class SocketServiceBak {
+    /*
+    constructor(baseUrl: string) {
+      this.socket = io(baseUrl, { transports: ['websocket'] });
+    }
+    */
+    constructor(baseUrl, token) {
+        this.socket = (0, socket_io_client_1.io)(baseUrl, {
+            transports: ['websocket'],
+            auth: token ? { token } : undefined, // ✅ send token if available
+        });
+    }
+    connect() {
+        this.socket.connect();
+    }
+    disconnect() {
+        this.socket.disconnect();
+    }
+    isConnected() {
+        return this.socket.connected;
+    }
+    isActive() {
+        return this.socket.active;
+    }
+    on(event, cb) {
+        this.socket.on(event, cb);
+    }
+    off(event, cb) {
+        if (cb) {
+            this.socket.off(event, cb);
+        }
+        else {
+            this.socket.removeAllListeners(event);
+        }
+    }
+    emit(event, data) {
+        this.socket.emit(event, data);
+    }
+    // Custom methods
+    sendMessage(message) {
+        this.emit('message', { text: message });
+    }
+    onMessageReceived(cb) {
+        this.on('messageReceived', cb);
+    }
+    offMessageReceived(cb) {
+        this.off('messageReceived', cb);
+    }
+    updateLocation(data) {
+        this.emit('updateLocation', { ...data });
+    }
+    onLocationUpdated(cb) {
+        this.on('locationUpdated', cb);
+    }
+    offLocationUpdated(cb) {
+        this.off('locationUpdated', cb);
+    }
+    onAllLocations(cb) {
+        this.on('allLocations', cb);
+    }
+    offAllLocations(cb) {
+        this.off('allLocations', cb);
+    }
+    sendHeartbeat(clientID) {
+        this.emit('heartbeat', { clientID });
+    }
+    onHeartbeatReceived(cb) {
+        this.on('heartbeatReceived', cb);
+    }
+    offHeartbeatReceived(cb) {
+        this.off('heartbeatReceived', cb);
+    }
+    onAllHeartbeats(cb) {
+        this.on('allHeartbeats', cb);
+    }
+    offAllHeartbeats(cb) {
+        this.off('allHeartbeats', cb);
+    }
+    updateServiceOrderStatus(orderID, status) {
+        this.emit('serviceOrderStatusUpdate', { orderID, status });
+    }
+    onServiceOrderStatusUpdated(callback) {
+        this.on('serviceOrderStatusUpdated', callback);
+    }
+    offServiceOrderStatusUpdated(callback) {
+        this.off('serviceOrderStatusUpdated', callback);
+    }
+    onAllServiceOrderStatuses(callback) {
+        this.on('allServiceOrderStatuses', callback);
+    }
+    offAllServiceOrderStatuses(callback) {
+        this.off('allServiceOrderStatuses', callback);
+    }
+}
+exports.SocketServiceBak = SocketServiceBak;

package/socketService.d.ts

@@ -1,54 +1,27 @@
-import { DriverLocationMap, DriverLocationWithClientID } from './types';
 export declare class SocketService {
     private socket;
-    constructor(baseUrl: string, token?: string);
+    private token;
+    private constructor();
+    splitSocketUrl(baseUrl: string): {
+        url: string;
+        path: string;
+    };
+    static getInstance(): Promise<SocketService>;
+    setToken(token: string): void;
+    clearToken(): void;
     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;
-    sendMessage(message: string): void;
-    onMessageReceived(cb: (data: {
-        text: string;
-    }) => void): void;
-    offMessageReceived(cb: (data: {
-        text: string;
-    }) => void): void;
-    updateLocation(data: DriverLocationWithClientID): void;
-    onLocationUpdated(cb: (data: DriverLocationMap) => void): void;
-    offLocationUpdated(cb: (data: DriverLocationMap) => void): void;
-    onAllLocations(cb: (data: DriverLocationMap) => void): void;
-    offAllLocations(cb: (data: DriverLocationMap) => void): void;
-    sendHeartbeat(clientID: string): void;
-    onHeartbeatReceived(cb: (data: {
-        clientID: string;
-        timestamp: number;
-    }) => void): void;
-    offHeartbeatReceived(cb: (data: {
-        clientID: string;
-        timestamp: number;
-    }) => void): void;
-    onAllHeartbeats(cb: (data: {
-        [clientID: string]: number;
-    }) => void): void;
-    offAllHeartbeats(cb: (data: {
-        [clientID: string]: number;
-    }) => void): void;
-    updateServiceOrderStatus(orderID: string, status: number): void;
-    onServiceOrderStatusUpdated(callback: (data: {
-        orderID: string;
-        status: number;
-    }) => void): void;
-    offServiceOrderStatusUpdated(callback: (data: {
-        orderID: string;
-        status: number;
-    }) => void): void;
-    onAllServiceOrderStatuses(callback: (statuses: {
-        [orderID: string]: number;
-    }) => void): void;
-    offAllServiceOrderStatuses(callback: (statuses: {
-        [orderID: string]: number;
-    }) => void): void;
+    onConnected(cb: (data: any) => void): void;
+    offConnected(cb?: (data: any) => void): void;
+    onDisconnected(cb: (data: any) => void): void;
+    offDisconnected(cb?: (data: any) => void): void;
+    onDriverStatusUpdate(cb: (data: any) => void): void;
+    offDriverStatusUpdate(cb?: (data: any) => void): void;
+    onTripUpdate(cb: (data: any) => void): void;
+    offTripUpdate(cb?: (data: any) => void): void;
+    updateDriverStatus(data: Object): void;
 }

package/socketService.js

@@ -2,18 +2,55 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SocketService = void 0;
 const socket_io_client_1 = require("socket.io-client");
+const OpenAPI_1 = require("./core/OpenAPI");
+let instance = null;
 class SocketService {
-    /*
-    constructor(baseUrl: string) {
-      this.socket = io(baseUrl, { transports: ['websocket'] });
-    }
-    */
-    constructor(baseUrl, token) {
-        this.socket = (0, socket_io_client_1.io)(baseUrl, {
+    constructor(baseUrl) {
+        const { url, path } = this.splitSocketUrl(baseUrl);
+        this.socket = (0, socket_io_client_1.io)(url, {
+            path,
             transports: ['websocket'],
-            auth: token ? { token } : undefined, // ✅ send token if available
+            autoConnect: false,
         });
     }
+    splitSocketUrl(baseUrl) {
+        // Absolute URL (prod)
+        if (/^https?:\/\//i.test(baseUrl)) {
+            const u = new URL(baseUrl);
+            return {
+                url: u.origin,
+                path: u.pathname,
+            };
+        }
+        // Relative URL (dev)
+        return {
+            url: '/',
+            path: baseUrl,
+        };
+    }
+    static async getInstance() {
+        if (!instance) {
+            const url = `${OpenAPI_1.OpenAPI.BASE}/realtime`;
+            instance = new SocketService(url);
+        }
+        return instance;
+    }
+    setToken(token) {
+        this.token = token;
+        this.socket.auth = { token };
+        // always force re-auth
+        if (this.socket.connected) {
+            this.socket.disconnect();
+        }
+        this.socket.connect();
+    }
+    clearToken() {
+        this.token = undefined;
+        if (!this.socket || !this.socket.auth)
+            return;
+        this.socket.auth = {};
+        this.disconnect();
+    }
     connect() {
         this.socket.connect();
     }
@@ -23,9 +60,6 @@ class SocketService {
     isConnected() {
         return this.socket.connected;
     }
-    isActive() {
-        return this.socket.active;
-    }
     on(event, cb) {
         this.socket.on(event, cb);
     }
@@ -40,60 +74,53 @@ class SocketService {
     emit(event, data) {
         this.socket.emit(event, data);
     }
-    // Custom methods
-    sendMessage(message) {
-        this.emit('message', { text: message });
-    }
-    onMessageReceived(cb) {
-        this.on('messageReceived', cb);
-    }
-    offMessageReceived(cb) {
-        this.off('messageReceived', cb);
-    }
-    updateLocation(data) {
-        this.emit('updateLocation', { ...data });
-    }
-    onLocationUpdated(cb) {
-        this.on('locationUpdated', cb);
-    }
-    offLocationUpdated(cb) {
-        this.off('locationUpdated', cb);
-    }
-    onAllLocations(cb) {
-        this.on('allLocations', cb);
-    }
-    offAllLocations(cb) {
-        this.off('allLocations', cb);
-    }
-    sendHeartbeat(clientID) {
-        this.emit('heartbeat', { clientID });
-    }
-    onHeartbeatReceived(cb) {
-        this.on('heartbeatReceived', cb);
+    // Additional methods for specific events can be added here
+    onConnected(cb) {
+        this.socket.on('connected', cb);
     }
-    offHeartbeatReceived(cb) {
-        this.off('heartbeatReceived', cb);
+    offConnected(cb) {
+        if (cb) {
+            this.socket.off('connected', cb);
+        }
+        else {
+            this.socket.removeAllListeners('connected');
+        }
     }
-    onAllHeartbeats(cb) {
-        this.on('allHeartbeats', cb);
+    onDisconnected(cb) {
+        this.socket.on('disconnected', cb);
     }
-    offAllHeartbeats(cb) {
-        this.off('allHeartbeats', cb);
+    offDisconnected(cb) {
+        if (cb) {
+            this.socket.off('disconnected', cb);
+        }
+        else {
+            this.socket.removeAllListeners('disconnected');
+        }
     }
-    updateServiceOrderStatus(orderID, status) {
-        this.emit('serviceOrderStatusUpdate', { orderID, status });
+    onDriverStatusUpdate(cb) {
+        this.socket.on('driverStatusUpdate', cb);
     }
-    onServiceOrderStatusUpdated(callback) {
-        this.on('serviceOrderStatusUpdated', callback);
+    offDriverStatusUpdate(cb) {
+        if (cb) {
+            this.socket.off('driverStatusUpdate', cb);
+        }
+        else {
+            this.socket.removeAllListeners('driverStatusUpdate');
+        }
     }
-    offServiceOrderStatusUpdated(callback) {
-        this.off('serviceOrderStatusUpdated', callback);
+    onTripUpdate(cb) {
+        this.socket.on('tripUpdate', cb);
     }
-    onAllServiceOrderStatuses(callback) {
-        this.on('allServiceOrderStatuses', callback);
+    offTripUpdate(cb) {
+        if (cb) {
+            this.socket.off('tripUpdate', cb);
+        }
+        else {
+            this.socket.removeAllListeners('tripUpdate');
+        }
     }
-    offAllServiceOrderStatuses(callback) {
-        this.off('allServiceOrderStatuses', callback);
+    updateDriverStatus(data) {
+        this.emit('updateDriverStatus', { ...data });
     }
 }
 exports.SocketService = SocketService;