From 1a97e94188e334a21f4f1d712fb53432a47b9ead Mon Sep 17 00:00:00 2001 From: Jakub Butkiewicz Date: Mon, 18 Sep 2023 10:02:32 +0200 Subject: [PATCH 1/2] ref: moved Firebase lib to TS --- src/libs/Firebase/index.js | 6 ----- .../{index.native.js => index.native.ts} | 23 +++++++------------ src/libs/Firebase/index.ts | 10 ++++++++ src/libs/Firebase/types.ts | 11 +++++++++ 4 files changed, 29 insertions(+), 21 deletions(-) delete mode 100644 src/libs/Firebase/index.js rename src/libs/Firebase/{index.native.js => index.native.ts} (71%) create mode 100644 src/libs/Firebase/index.ts create mode 100644 src/libs/Firebase/types.ts diff --git a/src/libs/Firebase/index.js b/src/libs/Firebase/index.js deleted file mode 100644 index a8c7a34f869f..000000000000 --- a/src/libs/Firebase/index.js +++ /dev/null @@ -1,6 +0,0 @@ -/** Web does not use Firebase for performance tracing */ - -export default { - startTrace() {}, - stopTrace() {}, -}; diff --git a/src/libs/Firebase/index.native.js b/src/libs/Firebase/index.native.ts similarity index 71% rename from src/libs/Firebase/index.native.js rename to src/libs/Firebase/index.native.ts index 0fc452a523ec..17f2b2eb985a 100644 --- a/src/libs/Firebase/index.native.js +++ b/src/libs/Firebase/index.native.ts @@ -1,15 +1,11 @@ /* eslint-disable no-unused-vars */ import perf from '@react-native-firebase/perf'; -import lodashGet from 'lodash/get'; import * as Environment from '../Environment/Environment'; -import Log from '../Log'; +import {StartTrace, StopTrace, TraceMap} from './types'; -const traceMap = {}; +const traceMap: TraceMap = {}; -/** - * @param {String} customEventName - */ -function startTrace(customEventName) { +const startTrace: StartTrace = (customEventName) => { const start = global.performance.now(); if (Environment.isDevelopment()) { return; @@ -27,18 +23,15 @@ function startTrace(customEventName) { start, }; }); -} +}; -/** - * @param {String} customEventName - */ -function stopTrace(customEventName) { - const stop = global.performance.now(); +const stopTrace: StopTrace = (customEventName) => { + // const stop = global.performance.now(); if (Environment.isDevelopment()) { return; } - const trace = lodashGet(traceMap, [customEventName, 'trace']); + const trace = traceMap[customEventName].trace; if (!trace) { return; } @@ -50,7 +43,7 @@ function stopTrace(customEventName) { // Log.info(`sidebar_loaded: ${stop - start} ms`, true); delete traceMap[customEventName]; -} +}; export default { startTrace, diff --git a/src/libs/Firebase/index.ts b/src/libs/Firebase/index.ts new file mode 100644 index 000000000000..3048cf1d9bd8 --- /dev/null +++ b/src/libs/Firebase/index.ts @@ -0,0 +1,10 @@ +import {StartTrace, StopTrace} from './types'; + +/** Web does not use Firebase for performance tracing */ +const startTrace: StartTrace = () => {}; +const stopTrace: StopTrace = () => {}; + +export default { + startTrace, + stopTrace, +}; diff --git a/src/libs/Firebase/types.ts b/src/libs/Firebase/types.ts new file mode 100644 index 000000000000..3822f7072a7f --- /dev/null +++ b/src/libs/Firebase/types.ts @@ -0,0 +1,11 @@ +import {FirebasePerformanceTypes} from '@react-native-firebase/perf'; + +type Trace = { + trace: FirebasePerformanceTypes.Trace; + start: number; +}; +type TraceMap = Record; +type StartTrace = (customEventName: string) => void; +type StopTrace = (customEventName: string) => void; + +export type {StartTrace, StopTrace, TraceMap}; From 51b6f4a1bfa4527293c4ee64781d608c03ee811f Mon Sep 17 00:00:00 2001 From: Jakub Butkiewicz Date: Wed, 20 Sep 2023 12:36:50 +0200 Subject: [PATCH 2/2] fix: added comment explaining why code is commented --- src/libs/Firebase/index.native.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/Firebase/index.native.ts b/src/libs/Firebase/index.native.ts index 17f2b2eb985a..2014e2b8bd3e 100644 --- a/src/libs/Firebase/index.native.ts +++ b/src/libs/Firebase/index.native.ts @@ -26,6 +26,7 @@ const startTrace: StartTrace = (customEventName) => { }; const stopTrace: StopTrace = (customEventName) => { + // Uncomment to inspect logs on release builds // const stop = global.performance.now(); if (Environment.isDevelopment()) { return;