@os1-platform/dispatch-mobile 3.1.9 → 3.2.1

package/src/manager/syncmanager/events/ETEventsManager.ts

@@ -3,7 +3,6 @@ import {
   BulkEvent,
   CustodyData,
   DispatchSyncType,
-  EventETData,
   EventRow,
   EVENTS_COLUMNS,
   EVENTS_TABLE,
@@ -11,18 +10,15 @@ import {
   ExecEngineSyncType,
   WFUpdateBulkEventData,
   WIUpdateOutputPayload,
-  WORKFLOW_INSTANCE_COLUMNS,
-  WORKFLOW_INSTANCE_TABLE,
 } from '../DBConfig';
-import type { ExecQuery } from '../database';
-import * as Database from '../database';
+import type { ExecQuery } from "../../../utils/Constants";
+import Database from '../database';
 import { BaseError } from '../../../errors/BaseError';
 import BaseErrorCodes, {
   InvalidArgumentsError,
 } from '../../../errors/ErrorCodes';
 import Logger, { LOG_TYPE } from '../../../utils/Logger';
 import { BULK_DATA_LIMIT, MAX_RETRY_COUNT, PROCESS_MAX_RETRIED_ROWS } from '../constants';
-import Storage from '../../../utils/storage';
 
 // NEW CODE
 import {
@@ -36,7 +32,7 @@ export default class ETEventsManager {
   private maxRetryCount: number = MAX_RETRY_COUNT;
   private _retries = 0;
 
-  private constructor() {}
+  private constructor() { }
 
   public static async getInstance(): Promise<ETEventsManager> {
     if (!ETEventsManager.instance) {
@@ -49,7 +45,7 @@ export default class ETEventsManager {
 
   // NEED TO REMOVE SYNCED, CONFIG, OBJECTIVE_REF
   private static async init(): Promise<void> {
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `CREATE TABLE IF NOT EXISTS ${EVENTS_TABLE} (\
                 ${EVENTS_COLUMNS.ID} INTEGER PRIMARY KEY AUTOINCREMENT,\
                 ${EVENTS_COLUMNS.DISPATCH_ID} TEXT NOT NULL,\
@@ -67,7 +63,7 @@ export default class ETEventsManager {
 
   // This is the function to insert POD_DOC type event in event table.
   async insertPODDocEvent(dspID: string, syncType: string): Promise<void> {
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `INSERT INTO ${EVENTS_TABLE}(${EVENTS_COLUMNS.DISPATCH_ID},${EVENTS_COLUMNS.SYNC_TYPE},${EVENTS_COLUMNS.PAYLOAD},${EVENTS_COLUMNS.DATA_LENGTH},${EVENTS_COLUMNS.META},${EVENTS_COLUMNS.SYNCED},${EVENTS_COLUMNS.CONFIG},${EVENTS_COLUMNS.SYNC_ERROR}) values (?,?,?,?,?,?,?,?)`,
       [dspID, syncType, '', 1, '', 0, '', '']
     );
@@ -81,7 +77,7 @@ export default class ETEventsManager {
     objectiveRef: string,
     config?: string
   ): Promise<void> {
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `INSERT INTO ${EVENTS_TABLE}(\
                 ${EVENTS_COLUMNS.PAYLOAD},\
                 ${EVENTS_COLUMNS.DISPATCH_ID},\
@@ -287,8 +283,6 @@ export default class ETEventsManager {
         _eventData.dispatchId,
         _eventData.syncType,
         _meta
-        // ? _evData.meta.jobId + _evData.meta.objectiveReference
-        // : 'NO_REF_FOUND'
       );
       queryData.push({
         query: `INSERT INTO ${EVENTS_TABLE}(\
@@ -444,13 +438,14 @@ export default class ETEventsManager {
         await Database.executeBulkQuery(queryData);
         this._retries = 0;
       }
-    } catch (err) {
+    } catch (err: any) {
+      Logger.getInstance().logEvent(
+        'insertBulkEvent-error',
+        err.message,
+        LOG_TYPE.SDK_DEBUG
+      );
+
       if (this._retries < this.maxRetryCount) {
-        Logger.getInstance().logEvent(
-          'insertBulkEvent ',
-          this._retries.toString(),
-          LOG_TYPE.SDK_DEBUG
-        );
         this._retries++;
         await this.insertBulkEvent(_eventData);
       } else {
@@ -528,14 +523,14 @@ export default class ETEventsManager {
 
   async getAllEvents(dispatchID?: string): Promise<EventRow[]> {
     if (dispatchID) {
-      const resultSet = await Database.executeQuery(
+      const resultSet = await Database.executeGetDataQuery(
         `SELECT * FROM ${EVENTS_TABLE}\
             WHERE ${EVENTS_COLUMNS.DISPATCH_ID} = ?;`,
         [dispatchID]
       );
       return resultSet.rows._array;
     } else {
-      const resultSet = await Database.executeQuery(
+      const resultSet = await Database.executeGetDataQuery(
         `SELECT * FROM ${EVENTS_TABLE};`,
         []
       );
@@ -544,7 +539,7 @@ export default class ETEventsManager {
   }
 
   async getAllUnsyncedEvents(): Promise<EventRow[]> {
-    let resultSet = await Database.executeQuery(
+    let resultSet = await Database.executeGetDataQuery(
       `SELECT * FROM ${EVENTS_TABLE} \
             where ${EVENTS_COLUMNS.SYNCED} = 0;`,
       []
@@ -571,7 +566,7 @@ export default class ETEventsManager {
 
   async updateError(id: number, syncError: string): Promise<void> {
     if (!id) throw new TypeError('Event ID cannot be null');
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `UPDATE ${EVENTS_TABLE} \
             SET \
             ${EVENTS_COLUMNS.SYNC_ERROR} = ?  WHERE ${EVENTS_COLUMNS.ID} = ?;`,
@@ -580,24 +575,24 @@ export default class ETEventsManager {
   }
 
   // This function will actualy update the POD_DOC type of event as sync along with attempt count.
-  async markPODDocEventSynced(sync: number, attempt:number, podDocId: String): Promise<void> {
+  async markPODDocEventSynced(sync: number, attempt: number, podDocId: String): Promise<void> {
     if (!podDocId) throw new TypeError('podDocId cannot be null');
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `UPDATE ${EVENTS_TABLE} SET ${EVENTS_COLUMNS.SYNCED} = ?, ${EVENTS_COLUMNS.ATTEMPT_COUNT} = ? WHERE ${EVENTS_COLUMNS.SYNC_TYPE} = ?;`,
-      [sync,attempt,podDocId]
+      [sync, attempt, podDocId]
     );
   }
 
   async markEventSynced(id: number): Promise<void> {
     if (!id) throw new TypeError('Event ID cannot be null');
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `UPDATE ${EVENTS_TABLE} SET ${EVENTS_COLUMNS.SYNCED} = 1 WHERE ${EVENTS_COLUMNS.ID} = ?;`,
       [id]
     );
   }
 
   async getWorkflowUpdateEvents(syncType: string): Promise<EventRow[]> {
-    let sqlResultSet = await Database.executeQuery(
+    let sqlResultSet = await Database.executeGetDataQuery(
       `SELECT * from ${EVENTS_TABLE}\
             WHERE ${EVENTS_COLUMNS.SYNCED} = 0\
             and ${EVENTS_COLUMNS.SYNC_TYPE} = ?\
@@ -607,7 +602,7 @@ export default class ETEventsManager {
     return sqlResultSet.rows._array;
   }
   async getJobRemovalEvents(syncType: string): Promise<EventRow[]> {
-    let sqlResultSet = await Database.executeQuery(
+    let sqlResultSet = await Database.executeGetDataQuery(
       `SELECT * from ${EVENTS_TABLE}\
             WHERE ${EVENTS_COLUMNS.SYNCED} = 0\
             and ${EVENTS_COLUMNS.SYNC_TYPE} = ?\
@@ -617,7 +612,7 @@ export default class ETEventsManager {
     return sqlResultSet.rows._array;
   }
   async getCustodyBatch(dispatchID: string): Promise<EventRow[]> {
-    const sqlResult = await Database.executeQuery(
+    const sqlResult = await Database.executeGetDataQuery(
       `SELECT * from ${EVENTS_TABLE}\
             WHERE ${EVENTS_COLUMNS.SYNCED} = 0 and \
             (${EVENTS_COLUMNS.SYNC_TYPE} = ? or ${EVENTS_COLUMNS.SYNC_TYPE} = ?) \
@@ -628,7 +623,7 @@ export default class ETEventsManager {
     return sqlResult.rows._array;
   }
   async getObjectiveDetails(objectiveRef: string): Promise<EventRow[]> {
-    let rs = await Database.executeQuery(
+    let rs = await Database.executeGetDataQuery(
       `SELECT * from ${EVENTS_TABLE} WHERE ${EVENTS_COLUMNS.META} = ?;`,
       [objectiveRef]
     );
@@ -636,7 +631,7 @@ export default class ETEventsManager {
   }
 
   async getRowToSync(id: string, dispatchId: string): Promise<EventRow[]> {
-    const sqlResult = await Database.executeQuery(
+    const sqlResult = await Database.executeGetDataQuery(
       `SELECT * from ${EVENTS_TABLE}\
             WHERE ${EVENTS_COLUMNS.DISPATCH_ID} = ? and \
             ${EVENTS_COLUMNS.SYNCED} = 0 \
@@ -648,7 +643,7 @@ export default class ETEventsManager {
 
   async getBulkRowsToSync(id: string, dispatchId: string): Promise<EventRow[]> {
     // If it is allowed max_retried_rows are allowed to process then it will refetch those data which are even have tried max attempt otherwise it will skip those events.
-    if(PROCESS_MAX_RETRIED_ROWS){
+    if (PROCESS_MAX_RETRIED_ROWS) {
       const query = `SELECT * FROM \
       (SELECT *, \ 
         (SELECT SUM(${EVENTS_COLUMNS.DATA_LENGTH}) \
@@ -660,9 +655,9 @@ export default class ETEventsManager {
               WHERE ${EVENTS_COLUMNS.DISPATCH_ID} \ = '${dispatchId}' and ${EVENTS_COLUMNS.DATA_LENGTH} > 0 and ${EVENTS_COLUMNS.SYNCED} = 0 and total <= ${BULK_DATA_LIMIT} \
               ORDER BY ${EVENTS_COLUMNS.ID};`;
 
-      const sqlResult = await Database.executeQuery(query, []);
+      const sqlResult = await Database.executeGetDataQuery(query, []);
       return sqlResult.rows._array;
-    }else{
+    } else {
       const query = `SELECT * FROM \
       (SELECT *, \ 
         (SELECT SUM(${EVENTS_COLUMNS.DATA_LENGTH}) \
@@ -674,7 +669,7 @@ export default class ETEventsManager {
               WHERE ${EVENTS_COLUMNS.DISPATCH_ID} \ = '${dispatchId}' and ${EVENTS_COLUMNS.DATA_LENGTH} > 0 and ${EVENTS_COLUMNS.SYNCED} = 0 and ${EVENTS_COLUMNS.ATTEMPT_COUNT} < ${MAX_RETRY_COUNT} and total <= ${BULK_DATA_LIMIT} \
               ORDER BY ${EVENTS_COLUMNS.ID};`;
 
-      const sqlResult = await Database.executeQuery(query, []);
+      const sqlResult = await Database.executeGetDataQuery(query, []);
       return sqlResult.rows._array;
     }
   }

package/src/manager/syncmanager/events/EventsSyncManager.ts

@@ -276,7 +276,7 @@ export default class EventsSyncManager {
   /**
    * force sync events who retry count >3 This function can be called from app UI to sync the events forcefully
    */
-  public async forceSync() {
+public async forceSync() {
     if (!this.eventsManager)
       this.eventsManager = await ETEventsManager.getInstance();
     this._retries = 0;

package/src/models/sdk.ts

@@ -28,14 +28,10 @@ export interface DispatchSDKConfig {
   eventMapping?: EventCodes[];
   debugLevelLog?: Boolean;
   callbacks?: {
-    fetchPhoneNumbersCallback?: (
-      sdsIds: string[]
-    ) => Promise<{ key: string; value: string[] }>;
+    fetchPhoneNumbersCallback?: (sdsIds: string[]) => Promise<{ key: string; value: string[] }>;
     fetchDateTimeCallback?: () => Promise<string>;
     tokenRefreshCallback?: () => Promise<string>;
-    fetchSDSEmailAndPhoneNumbersCallback: (
-      sdsIds: string[]
-    ) => Promise<Record<string, EmailAndPhoneResponse>>;
+    fetchSDSEmailAndPhoneNumbersCallback: (sdsIds: string[]) => Promise<Record<string, EmailAndPhoneResponse>>;
   };
   etConfig: {
     phoneCode: string;

package/src/native/signature/SignatureCapture.tsx

@@ -7,7 +7,7 @@ import {
   ViewProps,
 } from 'react-native';
 
-const RSSignatureView = requireNativeComponent('RSSignatureView');
+const RSSignatureViewComp = requireNativeComponent('RSSignatureView');
 
 class SignatureCapture extends React.Component<SignatureProps, any> {
   subscriptions: any[];
@@ -62,9 +62,10 @@ class SignatureCapture extends React.Component<SignatureProps, any> {
 
   render() {
     return (
-      <RSSignatureView
+      <RSSignatureViewComp
         style={{ flex: 1 }}
-        {...this.props} // @ts-ignore
+        {...this.props} 
+        // @ts-ignore
         onChange={this.onChange}
       />
     );

package/src/network/client.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
+import axios, { AxiosInstance, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
 import StatusCode from '../constants/statuscode';
 import Logger from '../utils/Logger';
 // import { handleAccessTokenExpiry } from './utils/helper';
@@ -25,7 +25,7 @@ export default abstract class HttpClient {
     );
   };
 
-  protected _handleRequest = (request: AxiosRequestConfig) => {
+  protected _handleRequest = (request: InternalAxiosRequestConfig) => {
     Logger.getInstance().logCora("Info", `API:Request: ${JSON.stringify(request)}`);
     return request;
   };

package/src/ui/screens/ValidateOTPScreen.tsx

@@ -136,9 +136,7 @@ const ValidateOTPScreen = ({
         );
 
         // Fetch contact details and generate contact list
-        const contactDetails = await callbackHandler.getEmailAndPhoneNumbers(
-          contact
-        );
+        const contactDetails = await callbackHandler.getEmailAndPhoneNumbers(contact);
 
         // Fetch and set order data
         const data = await DispatchExecutor.filterWFIData(
@@ -159,7 +157,7 @@ const ValidateOTPScreen = ({
           );
           setContactList(mappedContacts);
         }
-      } catch (error) {
+      } catch (error: any) {
         // Handle any unexpected errors in the process
         console.error('Error fetching contact details:', error);
       }

package/src/utils/Constants.ts

@@ -1,4 +1,9 @@
 
 const KEY_STORAGE_PREFIX = '@Dsp_Executor_';
 export const PROGRESS_GROUP = KEY_STORAGE_PREFIX + 'progressGroup';
-export const EXPIRY_TIME = 21600; // 6 hours
+export const EXPIRY_TIME = 21600; // 6 hours
+
+export interface ExecQuery {
+    query: string;
+    args: any[];
+}

package/src/utils/Logger.ts

@@ -42,7 +42,8 @@ class Logger {
       logType === LOG_TYPE.SDK_WARNING ||
       logType === LOG_TYPE.SDK_ERROR ||
       logType === LOG_TYPE.APP_ERROR ||
-      logType === LOG_TYPE.APP_WARNING
+      logType === LOG_TYPE.APP_WARNING ||
+      logType === LOG_TYPE.SDK_DEBUG
     ) {
       crashlytics().recordError(new Error(message), TAG);
     }

package/src/utils/SdkUtils.ts

@@ -1,6 +1,5 @@
 import remoteConfig from '@react-native-firebase/remote-config';
 import Logger, { LOG_TYPE } from './Logger';
-import type { DownloadProgressData } from 'expo-file-system';
 import * as FileSystem from 'expo-file-system';
 import { NativeModules, Platform } from 'react-native';
 import * as Location from 'expo-location';
@@ -116,9 +115,7 @@ export default class SdkUtils {
       }
       return;
     }
-    const dateTimeCheck = await (
-      DispatchSdkUtils as DispatchUtilsInterface
-    ).isAutomaticDateTimeEnabled();
+    const dateTimeCheck = await (DispatchSdkUtils as DispatchUtilsInterface).isAutomaticDateTimeEnabled();
     if (!dateTimeCheck) {
       throw new BaseError(
         ErrorCodes.SYSTEM_TIME_CHECK_FAILED,
@@ -127,12 +124,14 @@ export default class SdkUtils {
     }
     if (Platform.OS === 'android') {
       await PermissionModule.requestWakeLockPermissions();
-      await Location.enableNetworkProviderAsync();
       let locationServicesCheck = await Location.hasServicesEnabledAsync();
       const foregroundLocation = await PermissionModule.requestForegroundPermissions();
-      // await Location.requestForegroundPermissionsAsync(); //permission code using expo module
       const bgLocation = await PermissionModule.requestBackgroundPermissions();
-      // await Location.requestBackgroundPermissionsAsync(); //permission code using expo module
+      Location.enableNetworkProviderAsync().then(() => {
+        console.log('Location services enabled');
+      }).catch((error : any) => {
+        console.log('Location services not enabled', error);
+      });
       if (!(locationServicesCheck && foregroundLocation && bgLocation)) {
         throw new BaseError(
           ErrorCodes.LOCATION_OR_GPS_NOT_ENABLED,

package/src/utils/SyncManagerUtils.ts

@@ -23,6 +23,7 @@ const cache = DispatchSdkCache.getInstance();
 
 const TAG = 'SaveEventDB';
 
+//NOT GETTING USED
 export async function pushEventForSync(
   syncType: ExecEngineSyncType,
   dspID: string,

package/tsconfig.build.json

@@ -1,4 +1,4 @@
 {
   "extends": "./tsconfig",
-  "exclude": ["example"]
+  "exclude": ["example", "lib"]
 }

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "baseUrl": "./",
+    "rootDir":".",
     "paths": {
       "@os1-platform/dispatch-mobile": ["./src/index"]
     },
@@ -26,6 +26,5 @@
     "target": "esnext",
     "noImplicitThis": true
   },
-  "include": ["src"],
-  "exclude": ["node_modules", "scripts"]
+  "exclude": ["node_modules", "scripts", "__tests__"]
 }

package/lib/typescript/components/widgets/Timer.d.ts

@@ -1,7 +0,0 @@
-import React from 'react';
-export declare const Timer: React.ForwardRefExoticComponent<Pick<{
-    ref: any;
-    singleValue?: boolean;
-    timer?: number;
-    onTimerEnd?: () => void;
-}, "timer" | "singleValue" | "onTimerEnd"> & React.RefAttributes<unknown>>;

package/lib/typescript/manager/syncmanager/database.d.ts

@@ -1,7 +0,0 @@
-import type { SQLResultSet } from 'expo-sqlite';
-export interface ExecQuery {
-    query: string;
-    args: any[];
-}
-export declare function executeQuery(query: string, args: any[]): Promise<SQLResultSet>;
-export declare function executeBulkQuery(_queryData: ExecQuery[]): Promise<boolean>;