@spytecgps/nova-orm 1.0.108 → 1.0.109

package/dist/repositories/deviceStatus/extendedDeviceStatus.d.ts

@@ -0,0 +1,12 @@
+import { Device } from '../../entities';
+import { ConnectionStatusInfo, DeviceStatusEntity, DeviceStatusRecord, GetDeviceStatusesParams } from '../../types/deviceStatus';
+import { Logger } from '../../types/logger';
+export declare const getExtendedDeviceStatus: (deviceStatus: DeviceStatusEntity, deviceInfo: Device) => ConnectionStatusInfo[];
+export declare const addOnlineStatus: (deviceStatus: DeviceStatusEntity) => string | undefined;
+export declare const adjustDeviceStatusProperties: (params: GetDeviceStatusesParams) => void;
+export declare const tryExtendDeviceStatus: (params: {
+    logger: Logger;
+    deviceStatus: DeviceStatusRecord;
+    withConnectionStatusInfo?: boolean;
+    withOnlineStatus?: boolean;
+}) => void;

package/dist/repositories/deviceStatus/extendedDeviceStatus.js

@@ -0,0 +1,207 @@
+// threshold since exodus was created start ~ 2019-01-01
+const ALWAYS_ON_THRESHOLD = new Date().getTime() - new Date(2019, 0, 1).getTime();
+const THRESHOLD_24HRS = 24 * 60 * 60 * 1000; //24hrs
+const CELL_THRESHOLD_MS = 300000; // 1000*60*5 // 5mins
+const CELL_STOPPED_THRESHOLD_MS = 10800000; // 200*60*1000 //  200min - 3:20 - 3hr and 20 min
+//add 100% padding for moving reporting  frequency
+const PADDING_MOVING = 2;
+//add 20% padding for stopped reporting  frequency
+const PADDING_STOPPED = 1.2;
+const HOUR_IN_MS = 60 * 60 * 1000;
+const assetTrackerIdsList = [8, 9, 13, 20, 31, 32];
+// Custom workflow only applies to Device Extanded Status
+/*
+  We Had conversations of centralizing this flow .. but it is only consumed by deviceExt status so we only populate here
+*/
+const getConfidenceValue = (dateDiffInMs, thresholdWindowMS) => {
+    let confidenceValue = 0;
+    if (dateDiffInMs > thresholdWindowMS) {
+        confidenceValue = 0;
+    }
+    else {
+        if (dateDiffInMs === 0) {
+            confidenceValue = 1;
+        }
+        else {
+            confidenceValue = dateDiffInMs / thresholdWindowMS;
+        }
+    }
+    return confidenceValue;
+};
+const isDeviceSettingsCalculationMethod = (deviceInfo) => {
+    return !!(deviceInfo?.clientDeviceSetting?.fixedStatus ||
+        (deviceInfo.clientDeviceSetting?.movingPingFrequency &&
+            deviceInfo.clientDeviceSetting?.movingPingFrequency > 0));
+};
+const getThresholdInMS = (devStatus, deviceInfo) => {
+    const { speed, deviceTypeId } = devStatus;
+    const isDeviceStopped = Number(speed) < 2;
+    if (isDeviceSettingsCalculationMethod(deviceInfo)) {
+        //new calculation using device settings
+        const { fixedStatus, movingPingFrequency, stoppedPingFrequency, } = deviceInfo.clientDeviceSetting;
+        //manual override/ fixed status
+        return fixedStatus
+            ? fixedStatus === 'ON'
+                ? ALWAYS_ON_THRESHOLD // always on, device status will never be older than this threshold
+                : 0
+            : isDeviceStopped
+                ? movingPingFrequency * 1000 * PADDING_STOPPED // value stored in seconds. threshold add 20% to reporting freq
+                : stoppedPingFrequency * 1000 * PADDING_MOVING; // value stored in seconds. threshold add 100% to reporting freq (values are smaller add room for delays)
+    }
+    // old legacy calculation method by deviceType
+    switch (deviceTypeId) {
+        case 8:
+        case 9:
+            return THRESHOLD_24HRS; //24hr
+        default:
+            return isDeviceStopped ? CELL_STOPPED_THRESHOLD_MS : CELL_THRESHOLD_MS;
+    }
+};
+// Extended Statuses
+const deviceStatusCellularNetwork = (devStatus, deviceInfo) => {
+    const resp = {
+        name: 'cellularNetwork',
+    };
+    try {
+        const thresholdMS = getThresholdInMS(devStatus, deviceInfo);
+        // move to helper
+        const nowMS = new Date().getTime();
+        const thresholdDateMS = nowMS - thresholdMS;
+        const created = new Date(devStatus.created);
+        const createdMS = created.getTime();
+        //connection
+        resp.ok = createdMS >= thresholdDateMS;
+        resp.msg = `${devStatus.deviceTypeId}`;
+        //confidence
+        const dateDiffInMs = Math.abs(nowMS - createdMS);
+        resp.confidence = getConfidenceValue(dateDiffInMs, thresholdMS);
+    }
+    catch (err) {
+        resp.msg = JSON.stringify(err);
+    }
+    return resp;
+};
+const deviceStatusGPSNetwork = (devStatus, deviceInfo, cellularNetworkConnected) => {
+    const resp = {
+        name: 'gpsNetwork',
+    };
+    try {
+        if (!cellularNetworkConnected) {
+            // no cellular network, then no gps connection
+            resp.ok = false;
+            resp.confidence = 1;
+        }
+        else {
+            // there is cellularNetowkr connection, then check if GPS connected
+            //const gps:Date = new Date(devStatus.gpsUTCTime)
+            // gpsDate format -> "yyyyMMddHHmmss"
+            let gpsDateTime = new Date(0); //1970-01-01 very old date
+            if (devStatus.gpsUTCTime) {
+                const gpsYear = Number(devStatus.gpsUTCTime.substring(0, 4));
+                const gpsMonth = Number(devStatus.gpsUTCTime.substring(4, 6)) - 1; // the month is 0-indexed
+                const gpsDay = Number(devStatus.gpsUTCTime.substring(6, 8));
+                const gpsHour = Number(devStatus.gpsUTCTime.substring(8, 10));
+                const gpsMin = Number(devStatus.gpsUTCTime.substring(10, 12));
+                const gpsSec = Number(devStatus.gpsUTCTime.substring(12));
+                gpsDateTime = new Date(gpsYear, gpsMonth, gpsDay, gpsHour, gpsMin, gpsSec);
+            }
+            const sendTime = new Date(devStatus.sendTime);
+            const thresholdMS = getThresholdInMS(devStatus, deviceInfo);
+            const gpsMS = gpsDateTime.getTime();
+            const sendMS = sendTime.getTime();
+            const diff = Math.abs(sendMS - gpsMS);
+            //connection
+            resp.ok = diff < thresholdMS;
+            //confidence
+            resp.confidence = getConfidenceValue(diff, thresholdMS);
+            //resp.msg = ` GPS:${gpsDateTime.toISOString()} Send:${sendTime.toISOString()} sendT:${sendTime.getTime()} `
+        }
+    }
+    catch (err) {
+        resp.msg = JSON.stringify(err);
+    }
+    return resp;
+};
+const deviceStatusBatteryCharge = (devStatus) => {
+    const resp = {
+        name: 'batteryCharge',
+    };
+    try {
+        const batteryCharge = Number(devStatus.batteryPercentage);
+        resp.ok = !!batteryCharge === true;
+        resp.confidence = batteryCharge;
+    }
+    catch (err) {
+        resp.msg = JSON.stringify(err);
+    }
+    return resp;
+};
+export const getExtendedDeviceStatus = (deviceStatus, deviceInfo) => {
+    const result = [];
+    if (!(deviceStatus && deviceInfo))
+        return result;
+    // read from config
+    const extendedStatus = true;
+    const { deviceTypeId } = deviceInfo;
+    const validatedStatus = { ...deviceStatus, deviceTypeId };
+    //cell network
+    if (extendedStatus) {
+        //cellular net
+        const cellNetworkData = deviceStatusCellularNetwork(validatedStatus, deviceInfo);
+        result.push(cellNetworkData);
+        //gps net
+        const gpsNetworkData = deviceStatusGPSNetwork(validatedStatus, deviceInfo, !!cellNetworkData.ok);
+        result.push(gpsNetworkData);
+        //battery charge //BatteryCharge, only if it is not undefined, there are devices that do not report battery
+        const { batteryPercentage } = validatedStatus;
+        if (typeof batteryPercentage !== 'undefined') {
+            const batteryChargeData = deviceStatusBatteryCharge(validatedStatus);
+            result.push(batteryChargeData);
+        }
+    }
+    return result;
+};
+export const addOnlineStatus = (deviceStatus) => {
+    let offlineTime = 3.5 * HOUR_IN_MS;
+    if (assetTrackerIdsList.some((i) => i == deviceStatus.deviceTypeId)) {
+        offlineTime = 25 * HOUR_IN_MS;
+    }
+    if (deviceStatus?.restFrequency && deviceStatus?.restFrequency * 1000 > offlineTime) {
+        offlineTime = deviceStatus.restFrequency * 1000 + HOUR_IN_MS;
+    }
+    const sendTime = new Date(deviceStatus.sendTime);
+    const isOnline = new Date().getTime() - sendTime.getTime() < offlineTime;
+    return `${isOnline}`;
+};
+export const adjustDeviceStatusProperties = (params) => {
+    if (!params?.projectionOptions?.deviceStatusProperties?.length) {
+        return;
+    }
+    if (params?.projectionOptions?.deviceStatusProperties?.includes('connectionStatus')) {
+        params?.projectionOptions?.deviceStatusProperties?.push('deviceTypeId');
+        params?.projectionOptions?.deviceStatusProperties?.push('created');
+        params?.projectionOptions?.deviceStatusProperties?.push('speed');
+        params?.projectionOptions?.deviceStatusProperties?.push('gpsUTCTime');
+        params?.projectionOptions?.deviceStatusProperties?.push('sendTime');
+        params?.projectionOptions?.deviceStatusProperties?.push('batteryPercentage');
+    }
+    if (params?.projectionOptions?.deviceStatusProperties?.includes('isOnline')) {
+        params?.projectionOptions?.deviceStatusProperties?.push('sendTime');
+        params?.projectionOptions?.deviceStatusProperties?.push('restFrequency');
+    }
+};
+export const tryExtendDeviceStatus = (params) => {
+    const { logger, deviceStatus, withConnectionStatusInfo, withOnlineStatus } = params;
+    try {
+        if (withConnectionStatusInfo) {
+            deviceStatus.data.connectionStatus = getExtendedDeviceStatus(deviceStatus.data, deviceStatus.device);
+        }
+        if (withOnlineStatus) {
+            deviceStatus.data.isOnline = addOnlineStatus(deviceStatus.data);
+        }
+    }
+    catch (err) {
+        logger.error(err, 'Error while extending device status properties');
+    }
+};
+//# sourceMappingURL=extendedDeviceStatus.js.map

package/dist/repositories/deviceStatus/extendedDeviceStatus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extendedDeviceStatus.js","sourceRoot":"","sources":["../../../src/repositories/deviceStatus/extendedDeviceStatus.ts"],"names":[],"mappings":"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"}

package/dist/repositories/deviceStatus/getDeviceStatuses.d.ts

@@ -1,5 +1,4 @@
-import { DeviceStatus } from '../../entities/deviceStatus';
 import { NovaDataSource } from '../../novaDataSource';
-import { GetDeviceStatusesParams } from '../../types/deviceStatus';
+import { DeviceStatusRecord, GetDeviceStatusesParams } from '../../types/deviceStatus';
 import { Logger } from '../../types/logger';
-export declare const getDeviceStatuses: (novaDataSource: NovaDataSource, params: GetDeviceStatusesParams, logger: Logger) => Promise<DeviceStatus[]>;
+export declare const getDeviceStatuses: (novaDataSource: NovaDataSource, params: GetDeviceStatusesParams, logger: Logger) => Promise<DeviceStatusRecord[]>;

package/dist/repositories/deviceStatus/getDeviceStatuses.js

@@ -28,7 +28,10 @@ export const getDeviceStatuses = async (novaDataSource, params, logger) => {
                 sendTimeMin: params.filters.minSendTime,
             });
         }
-        if (params.filters.deviceStatus || params.projectionOptions?.withDevice) {
+        if (params.filters.deviceStatus ||
+            params.projectionOptions?.withDevice ||
+            params.projectionOptions?.deviceStatusProperties?.includes('connectionStatus') ||
+            params.projectionOptions?.withConnectionStatus) {
             queryBuilder = queryBuilder.leftJoinAndMapOne('deviceStatus.device', Device, 'device', 'deviceStatus.imei = device.imei and deviceStatus.clientId = device.clientId');
             if (params.filters.deviceStatus) {
                 queryBuilder = queryBuilder.andWhere('device.status = :status', {
@@ -39,7 +42,9 @@ export const getDeviceStatuses = async (novaDataSource, params, logger) => {
         if (params.projectionOptions?.withClient) {
             queryBuilder = queryBuilder.leftJoinAndSelect('deviceStatus.client', 'client');
         }
-        if (params.projectionOptions?.withClientDeviceSettings) {
+        if (params.projectionOptions?.withClientDeviceSettings ||
+            params.projectionOptions?.deviceStatusProperties?.includes('connectionStatus') ||
+            params.projectionOptions?.withConnectionStatus) {
             queryBuilder = queryBuilder.leftJoinAndMapOne('deviceStatus.clientDeviceSetting', ClientDeviceSetting, 'clientDeviceSetting', 'deviceStatus.imei = clientDeviceSetting.imei and deviceStatus.clientId = clientDeviceSetting.clientId');
         }
         queryBuilder = queryBuilder

package/dist/repositories/deviceStatus/getDeviceStatuses.js.map

@@ -1 +1 @@
-{"version":3,"file":"getDeviceStatuses.js","sourceRoot":"","sources":["../../../src/repositories/deviceStatus/getDeviceStatuses.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getDeviceStatuses.js","sourceRoot":"","sources":["../../../src/repositories/deviceStatus/getDeviceStatuses.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAK1D,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,cAA8B,EAC9B,MAA+B,EAC/B,MAAc,EACiB,EAAE;IACjC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QACpE,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,+DAA+D,CAAC,CAAA;QACxF,OAAO,EAAE,CAAA;KACV;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,SAAS,CAC7C,KAAK,EAAE,UAA0B,EAAE,WAAyB,EAA2B,EAAE;QACvF,MAAM,sBAAsB,GAAG,UAAU,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;QAErE,IAAI,YAAY,GAAG,sBAAsB,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;QAE5E,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE;YACnC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,kCAAkC,EAAE;gBACvE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;aAC/B,CAAC,CAAA;SACH;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC3B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,mCAAmC,EAAE;gBACxE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;aAClC,CAAC,CAAA;SACH;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE;YAC9B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,sCAAsC,EAAE;gBAC3E,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW;aACxC,CAAC,CAAA;SACH;QAED,IACE,MAAM,CAAC,OAAO,CAAC,YAAY;YAC3B,MAAM,CAAC,iBAAiB,EAAE,UAAU;YACpC,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,EAAE,QAAQ,CAAC,kBAAkB,CAAC;YAC9E,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,EAC9C;YACA,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAC3C,qBAAqB,EACrB,MAAM,EACN,QAAQ,EACR,6EAA6E,CAC9E,CAAA;YACD,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE;gBAC/B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,yBAAyB,EAAE;oBAC9D,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY;iBACpC,CAAC,CAAA;aACH;SACF;QAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,UAAU,EAAE;YACxC,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAA;SAC/E;QAED,IACE,MAAM,CAAC,iBAAiB,EAAE,wBAAwB;YAClD,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,EAAE,QAAQ,CAAC,kBAAkB,CAAC;YAC9E,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,EAC9C;YACA,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAC3C,kCAAkC,EAClC,mBAAmB,EACnB,qBAAqB,EACrB,uGAAuG,CACxG,CAAA;SACF;QAED,YAAY,GAAG,YAAY;aACxB,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,IAAI,GAAG,CAAC;aACzC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,IAAI,CAAC,CAAC,CAAA;QAE5C,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAEnD,OAAO,cAAc,CAAA;IACvB,CAAC,EACD,mCAAmC,EACnC,aAAa,CACd,CAAA;IAED,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACpB,IAAI,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,EAAE;YAC5D,KAAK,MAAM,GAAG,IAAI,EAAE,CAAC,IAAI,EAAE;gBACzB,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,EAAE;oBAC1E,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;iBACpB;aACF;SACF;QACD,IAAI,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,EAAE;YACtD,KAAK,MAAM,GAAG,IAAI,EAAE,CAAC,MAAM,EAAE;gBAC3B,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,EAAE;oBACpE,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;iBACtB;aACF;SACF;QACD,IAAI,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,EAAE;YACtD,KAAK,MAAM,GAAG,IAAI,EAAE,CAAC,MAAM,EAAE;gBAC3B,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,EAAE;oBACpE,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;iBACtB;aACF;SACF;QACD,IAAI,MAAM,CAAC,iBAAiB,EAAE,8BAA8B,EAAE,MAAM,EAAE;YACpE,KAAK,MAAM,GAAG,IAAI,EAAE,CAAC,mBAAmB,EAAE;gBACxC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,8BAA8B,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,EAAE;oBAClF,OAAO,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAA;iBACnC;aACF;SACF;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,QAAgC,CAAA;AACzC,CAAC,CAAA"}

package/dist/repositories/deviceStatus/index.d.ts

@@ -1,5 +1,4 @@
-import { DeviceStatus } from '../../entities/deviceStatus';
-import { GetDeviceStatusesCountParams, GetDeviceStatusesParams, UpsertDeviceStatusesParams } from '../../types/deviceStatus';
+import { DeviceStatusRecord, GetDeviceStatusesCountParams, GetDeviceStatusesParams, UpsertDeviceStatusesParams } from '../../types/deviceStatus';
 import { BaseRepository } from './../baseRepository';
 export declare class DeviceStatusRepository extends BaseRepository {
     /**
@@ -17,7 +16,7 @@ export declare class DeviceStatusRepository extends BaseRepository {
      * - projectionOptions.withClientDeviceSettings: Whether to get the client device settings
      * - projectionOptions.clientDeviceSettingsProperties: The client device settings properties to get
      */
-    getDeviceStatuses(params: GetDeviceStatusesParams): Promise<DeviceStatus[]>;
+    getDeviceStatuses(params: GetDeviceStatusesParams): Promise<DeviceStatusRecord[]>;
     /**
      * Get total count of device statuses based on the filters
      * @param  {GetDeviceStatusesCountParams} params containing information to get device statuses count

package/dist/repositories/deviceStatus/index.js

@@ -1,5 +1,6 @@
 import { NovaDataSource } from '../../novaDataSource';
 import { BaseRepository } from './../baseRepository';
+import { adjustDeviceStatusProperties, tryExtendDeviceStatus } from './extendedDeviceStatus';
 import { getDeviceStatuses } from './getDeviceStatuses';
 import { getDeviceStatusesCount } from './getDeviceStatusesCount';
 import { upsertDeviceStatuses } from './upsertDeviceStatuses';
@@ -22,7 +23,16 @@ export class DeviceStatusRepository extends BaseRepository {
     async getDeviceStatuses(params) {
         this.logger.trace(params, 'DeviceStatusRepository::getDeviceStatus started with params');
         const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger, this.replicaNovaDataSourceConfig);
+        adjustDeviceStatusProperties(params);
         const result = await getDeviceStatuses(novaDataSource, params, this.logger);
+        result?.forEach(deviceStatus => tryExtendDeviceStatus({
+            logger: this.logger,
+            deviceStatus,
+            withConnectionStatusInfo: params.projectionOptions?.withConnectionStatus ||
+                params.projectionOptions?.deviceStatusProperties?.includes('connectionStatus'),
+            withOnlineStatus: params.projectionOptions?.withOnlineStatus ||
+                params.projectionOptions?.deviceStatusProperties?.includes('isOnline'),
+        }));
         this.logger.trace(result, 'DeviceStatusRepository::getDeviceStatus result');
         return result;
     }

package/dist/repositories/deviceStatus/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repositories/deviceStatus/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAMrD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,OAAO,sBAAuB,SAAQ,cAAc;IACxD;;;;;;;;;;;;;;OAcG;IACH,KAAK,CAAC,iBAAiB,CAAC,MAA+B;QACrD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,6DAA6D,CAAC,CAAA;QAExF,MAAM,cAAc,GAAG,IAAI,cAAc,CACvC,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,2BAA2B,CACjC,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAE3E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,gDAAgD,CAAC,CAAA;QAE3E,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,sBAAsB,CAAC,MAAoC;QAC/D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAA;QAE/F,MAAM,cAAc,GAAG,IAAI,cAAc,CACvC,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,2BAA2B,CACjC,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEhF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,uDAAuD,CAAC,CAAA;QAEtF,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,oBAAoB,CAAC,MAAkC;QAC3D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,gEAAgE,CAAC,CAAA;QAE3F,MAAM,cAAc,GAAG,IAAI,cAAc,CACvC,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,2BAA2B,CACjC,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAE9E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,mDAAmD,CAAC,CAAA;QAElF,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repositories/deviceStatus/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAOrD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,OAAO,sBAAuB,SAAQ,cAAc;IACxD;;;;;;;;;;;;;;OAcG;IACH,KAAK,CAAC,iBAAiB,CAAC,MAA+B;QACrD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,6DAA6D,CAAC,CAAA;QAExF,MAAM,cAAc,GAAG,IAAI,cAAc,CACvC,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,2BAA2B,CACjC,CAAA;QAED,4BAA4B,CAAC,MAAM,CAAC,CAAA;QAEpC,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAE3E,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE,CAC7B,qBAAqB,CAAC;YACpB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY;YACZ,wBAAwB,EACtB,MAAM,CAAC,iBAAiB,EAAE,oBAAoB;gBAC9C,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,EAAE,QAAQ,CAAC,kBAAkB,CAAC;YAChF,gBAAgB,EACd,MAAM,CAAC,iBAAiB,EAAE,gBAAgB;gBAC1C,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,EAAE,QAAQ,CAAC,UAAU,CAAC;SACzE,CAAC,CACH,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,gDAAgD,CAAC,CAAA;QAE3E,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,sBAAsB,CAAC,MAAoC;QAC/D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAA;QAE/F,MAAM,cAAc,GAAG,IAAI,cAAc,CACvC,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,2BAA2B,CACjC,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEhF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,uDAAuD,CAAC,CAAA;QAEtF,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,oBAAoB,CAAC,MAAkC;QAC3D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,gEAAgE,CAAC,CAAA;QAE3F,MAAM,cAAc,GAAG,IAAI,cAAc,CACvC,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,2BAA2B,CACjC,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAE9E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,mDAAmD,CAAC,CAAA;QAElF,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}

package/dist/repositories/liveLinks/getLiveLinkData.js

@@ -1,6 +1,6 @@
 import { LiveLink } from '../../entities/liveLink';
 import { Enums } from '../../types';
-import { tryParseDate, tryParseFloat } from '../../utils/parsingTools';
+import { tryParseBoolean, tryParseDate, tryParseFloat } from '../../utils/parsingTools';
 import { uuidStringToBinaryBuffer } from '../../utils/uuidHelpers';
 export const getLiveLinkData = async (novaDataSource, params, logger, deviceStatusRepository) => {
     if (!params?.filters?.id || !params?.filters?.clientId) {
@@ -49,6 +49,7 @@ export const getLiveLinkData = async (novaDataSource, params, logger, deviceStat
                 withDevice: true,
                 deviceProperties: ['imei', 'name', 'description', 'deviceTypeId', 'color', 'icon'],
                 deviceStatusProperties: [
+                    'created',
                     'latitude',
                     'longitude',
                     'address',
@@ -60,6 +61,8 @@ export const getLiveLinkData = async (novaDataSource, params, logger, deviceStat
                     'batteryVoltage',
                     'externalPowerVoltage',
                     'reportType',
+                    'connectionStatus',
+                    'isOnline',
                 ],
             },
             pagingOptions: {
@@ -91,6 +94,8 @@ export const getLiveLinkData = async (novaDataSource, params, logger, deviceStat
                     batteryVoltage: tryParseFloat(data?.batteryVoltage) ?? undefined,
                     externalPowerVoltage: tryParseFloat(data?.externalPowerVoltage) ?? undefined,
                     reportType: tryParseFloat(data?.reportType) ?? undefined,
+                    connectionStatus: data?.connectionStatus ?? undefined,
+                    isOnline: tryParseBoolean(data?.isOnline) ?? undefined,
                 },
             };
         }));

package/dist/repositories/liveLinks/getLiveLinkData.js.map

@@ -1 +1 @@
-{"version":3,"file":"getLiveLinkData.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinkData.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getLiveLinkData.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinkData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGnC,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACvF,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAGlE,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,cAA8B,EAC9B,MAA6B,EAC7B,MAAc,EACd,sBAA8C,EACvB,EAAE;IACzB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QACtD,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,oEAAoE,CAAC,CAAA;QAC7F,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAA;KAClC;IAED,MAAM,YAAY,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;IAElE,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE;QACzB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,kEAAkE,CAAC,CAAA;QAC3F,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAA;KAClC;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EAAE,UAA0B,EAAE,WAAyB,EAAyB,EAAE;QACrF,MAAM,mBAAmB,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAE9D,MAAM,YAAY,GAAG,mBAAmB;aACrC,kBAAkB,CAAC,UAAU,CAAC;aAC9B,QAAQ,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC;aAC1C,QAAQ,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QAE1E,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,CAAA;QAE5C,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAA;SAClC;QAED,MAAM,MAAM,GAAiB;YAC3B,kBAAkB,EAAE,EAAE;SACvB,CAAA;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAmB,CAAA;QAE5C,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE;YAC3D,OAAO,MAAM,CAAA;SACd;QAED,MAAM,OAAO,GACX,QAAQ,CAAC,YAAY,KAAK,SAAS;YACjC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE;YACvB,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAA;QAErC,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,EAAE,QAAQ,IAAI,GAAG,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC,CAAA;QAEtD,MAAM,cAAc,GAAG,MAAM,sBAAsB,CAAC,iBAAiB,CAAC;YACpE,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW;gBACvC,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM;aACxC;YACD,iBAAiB,EAAE;gBACjB,UAAU,EAAE,IAAI;gBAChB,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC;gBAClF,sBAAsB,EAAE;oBACtB,SAAS;oBACT,UAAU;oBACV,WAAW;oBACX,SAAS;oBACT,UAAU;oBACV,YAAY;oBACZ,mBAAmB;oBACnB,OAAO;oBACP,kBAAkB;oBAClB,gBAAgB;oBAChB,sBAAsB;oBACtB,YAAY;oBACZ,kBAAkB;oBAClB,UAAU;iBACX;aACF;YACD,aAAa,EAAE;gBACb,KAAK,EAAE,QAAQ;gBACf,MAAM,EAAE,QAAQ,GAAG,SAAS;aAC7B;YACD,YAAY,EAAE;gBACZ,eAAe,EAAE,MAAM,CAAC,YAAY,EAAE,eAAe;aACtD;SACF,CAAC,CAAA;QAEF,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAC5B,GAAG,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACnC,MAAM,IAAI,GAAG,YAAY,EAAE,IAAW,CAAA;YAEtC,OAAO;gBACL,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,IAAI,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI;gBAC/B,WAAW,EAAE,YAAY,CAAC,MAAM,EAAE,WAAW;gBAC7C,YAAY,EAAE,YAAY,CAAC,MAAM,EAAE,YAAY;gBAC/C,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK;gBACjC,IAAI,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI;gBAC/B,MAAM,EAAE;oBACN,QAAQ,EAAE,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,SAAS;oBACpD,SAAS,EAAE,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,SAAS;oBACtD,OAAO,EAAE,IAAI,EAAE,OAAO,IAAI,SAAS;oBACnC,QAAQ,EAAE,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,SAAS;oBACnD,UAAU,EAAE,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,SAAS;oBACxD,iBAAiB,EAAE,aAAa,CAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,SAAS;oBACtE,KAAK,EAAE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,SAAS;oBAC9C,gBAAgB,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,SAAS;oBACpE,cAAc,EAAE,aAAa,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,SAAS;oBAChE,oBAAoB,EAAE,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC,IAAI,SAAS;oBAC5E,UAAU,EAAE,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,SAAS;oBACxD,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,IAAI,SAAS;oBACrD,QAAQ,EAAE,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,SAAS;iBACvD;aACF,CAAA;QACH,CAAC,CAAC,CACH,CAAA;QAED,OAAO,MAAM,CAAA;IACf,CAAC,EACD,sCAAsC,EACtC,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}

package/dist/types/deviceStatus.d.ts

@@ -1,11 +1,49 @@
-import { Client, ClientDeviceSetting, Device } from '../entities';
+import { Client, ClientDeviceSetting, Device, DeviceStatus } from '../entities';
 import { Enums } from '.';
 import { BaseSelectQueryParams } from './common';
-interface DeviceStatusEntity {
+export interface DeviceStatusEntity {
+    address: string;
     imei: string;
     clientId: number;
     created: string;
     sendTime: string;
+    latitude?: string;
+    longitude?: string;
+    speed?: string;
+    gpsUTCTime?: string;
+    batteryPercentage?: string;
+    azimuth?: string;
+    deviceTypeId?: number;
+    staleGPS?: string;
+    isStaleGPS?: boolean;
+    insideCellularRadio?: string;
+    isInsideCellularRadio?: boolean;
+    message_id?: string;
+    gpsMessageId?: string;
+    isOnline?: string;
+    lastGPSCellTower?: string;
+    mcc?: string;
+    mnc?: string;
+    cellId?: string;
+    lac?: string;
+    cellTowerLat?: number;
+    cellTowerLocationTime?: string;
+    cellTowerLon?: number;
+    cellTowerRange?: number;
+    restFrequency?: number;
+    connectionStatus?: ConnectionStatusInfo[];
+    odoMileage?: string;
+    batteryVoltage?: string;
+    externalPowerVoltage?: string;
+    externalPowerVoltage2?: string;
+    hoursOfOperation?: string;
+    reportType?: string;
+}
+export interface ConnectionStatusInfo {
+    name: string;
+    ok?: boolean;
+    confidence?: number;
+    msg?: string;
 }
 export interface GetDeviceStatusesParams extends BaseSelectQueryParams {
     filters: {
@@ -15,12 +53,14 @@ export interface GetDeviceStatusesParams extends BaseSelectQueryParams {
         deviceStatus?: Enums.DeviceStatus;
     };
     projectionOptions?: {
-        deviceStatusProperties?: string[];
         withClient?: boolean;
-        clientProperties?: (keyof Client)[];
         withDevice?: boolean;
-        deviceProperties?: (keyof Device)[];
         withClientDeviceSettings?: boolean;
+        withConnectionStatus?: boolean;
+        withOnlineStatus?: boolean;
+        deviceStatusProperties?: (keyof DeviceStatusEntity)[];
+        deviceProperties?: (keyof Device)[];
+        clientProperties?: (keyof Client)[];
         clientDeviceSettingsProperties?: (keyof ClientDeviceSetting)[];
     };
     pagingOptions?: {
@@ -39,4 +79,6 @@ export interface GetDeviceStatusesCountParams extends BaseSelectQueryParams {
 export interface UpsertDeviceStatusesParams {
     items: DeviceStatusEntity[];
 }
-export {};
+export interface DeviceStatusRecord extends Omit<DeviceStatus, 'data'> {
+    data: DeviceStatusEntity;
+}

package/dist/types/liveLinks.d.ts

@@ -1,4 +1,5 @@
 import { BaseSelectQueryParams, OptionalReportPagination } from './common';
+import { ConnectionStatusInfo } from './deviceStatus';
 export interface CreateLiveLinkParams {
     id: string;
     name: string;
@@ -81,6 +82,8 @@ export interface TrackerWithStatus {
         batteryVoltage?: number;
         externalPowerVoltage?: number;
         reportType?: number;
+        connectionStatus?: ConnectionStatusInfo[];
+        isOnline?: boolean;
     };
 }
 export interface LiveLinkData {

package/dist/utils/parsingTools.d.ts

@@ -1,2 +1,3 @@
 export declare const tryParseFloat: (valueToParse: any, defaultValue?: number | null) => number | null;
 export declare const tryParseDate: (anyDate: any, defaultValue?: Date | null) => Date;
+export declare const tryParseBoolean: (valueToParse: any, defaultValue?: boolean | null) => boolean | null;

package/dist/utils/parsingTools.js

@@ -10,4 +10,13 @@ export const tryParseDate = (anyDate, defaultValue = null) => {
         return defaultValue;
     }
 };
+export const tryParseBoolean = (valueToParse, defaultValue = null) => {
+    if (typeof valueToParse === 'boolean') {
+        return valueToParse;
+    }
+    if (typeof valueToParse === 'string') {
+        return valueToParse.toLowerCase() === 'true';
+    }
+    return defaultValue;
+};
 //# sourceMappingURL=parsingTools.js.map

package/dist/utils/parsingTools.js.map

@@ -1 +1 @@
-{"version":3,"file":"parsingTools.js","sourceRoot":"","sources":["../../src/utils/parsingTools.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,YAAiB,EACjB,eAA8B,IAAI,EACnB,EAAE;IACjB,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAA;IACnD,OAAO,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAY,EAAE,eAA4B,IAAI,EAAQ,EAAE;IACnF,IAAI;QACF,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;KAC7D;IAAC,OAAO,MAAM,EAAE;QACf,OAAO,YAAY,CAAA;KACpB;AACH,CAAC,CAAA"}
+{"version":3,"file":"parsingTools.js","sourceRoot":"","sources":["../../src/utils/parsingTools.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,YAAiB,EACjB,eAA8B,IAAI,EACnB,EAAE;IACjB,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAA;IACnD,OAAO,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAY,EAAE,eAA4B,IAAI,EAAQ,EAAE;IACnF,IAAI;QACF,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;KAC7D;IAAC,OAAO,MAAM,EAAE;QACf,OAAO,YAAY,CAAA;KACpB;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,YAAiB,EACjB,eAA+B,IAAI,EACnB,EAAE;IAClB,IAAI,OAAO,YAAY,KAAK,SAAS,EAAE;QACrC,OAAO,YAAY,CAAA;KACpB;IAED,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;QACpC,OAAO,YAAY,CAAC,WAAW,EAAE,KAAK,MAAM,CAAA;KAC7C;IAED,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spytecgps/nova-orm",
-  "version": "1.0.108",
+  "version": "1.0.109",
   "description": "ORM with PlanetScale",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",