move timers map to be declared within HOF closure

dallen4 · Dec 15, 2023 · e234cd5 · e234cd5
1 parent df2af36
commit e234cd5
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 11 deletions.
diff --git a/cli/actions/drop.ts b/cli/actions/drop.ts
@@ -19,7 +19,6 @@ type DropOptions = {
 
 export const drop = async (input: string | undefined, options: DropOptions) => {
     const ctx = initDropContext();
-    const timers = new Map<MessageType, NodeJS.Timeout>();
 
     let currState = dropMachine.initialState;
 
@@ -32,7 +31,6 @@ export const drop = async (input: string | undefined, options: DropOptions) => {
 
     const { init, stagePayload } = createDropHandlers({
         ctx,
-        timers,
         sendEvent,
         logger: {
             info: logInfo,

diff --git a/cli/actions/grab.ts b/cli/actions/grab.ts
@@ -10,7 +10,6 @@ import { DropContext } from '@shared/types/drop';
 
 export const grab = async (id: string) => {
     const ctx = initGrabContext();
-    const timers = new Map<MessageType, NodeJS.Timeout>();
 
     let currState = grabMachine.initialState;
 
@@ -30,7 +29,6 @@ export const grab = async (id: string) => {
 
     const { init } = createGrabHandlers({
         ctx,
-        timers,
         sendEvent,
         logger: {
             info: logInfo,

diff --git a/shared/handlers/drop.ts b/shared/handlers/drop.ts
@@ -32,7 +32,6 @@ import { DROP_API_PATH } from '../config/paths';
 
 export const createDropHandlers = <FileType extends string | File = string>({
     ctx,
-    timers,
     sendEvent,
     logger,
     file,
@@ -42,6 +41,7 @@ export const createDropHandlers = <FileType extends string | File = string>({
     initPeer,
 }: DropHandlerInputs<FileType>) => {
     const dropApiUrl = apiUri + DROP_API_PATH;
+    const timers = new Map<MessageType, NodeJS.Timeout>();
 
     const clearTimer = (msgType: MessageType) => {
         const timerId = timers.get(msgType);

diff --git a/shared/handlers/grab.ts b/shared/handlers/grab.ts
@@ -30,7 +30,6 @@ import { withMessageLock } from '../lib/messages';
 
 export const createGrabHandlers = <FileType extends string | File = string>({
     ctx,
-    timers,
     sendEvent,
     logger,
     file,
@@ -40,6 +39,7 @@ export const createGrabHandlers = <FileType extends string | File = string>({
     onRetryExceeded,
 }: GrabHandlerInputs<FileType>) => {
     const dropApiUrl = apiUri + DROP_API_PATH;
+    const timers = new Map<MessageType, NodeJS.Timeout>();
 
     const clearTimer = (msgType: MessageType) => {
         const timerId = timers.get(msgType);

diff --git a/shared/types/common.ts b/shared/types/common.ts
@@ -57,7 +57,6 @@ export type HashFile<InputType = string> = (
 
 export type BaseHandlerInputs<Context, Event> = {
     ctx: Context;
-    timers: Map<MessageType, NodeJS.Timeout>;
     sendEvent: (event: Event) => unknown;
     logger: {
         info: (message: string) => void;

diff --git a/web/hooks/use-drop.tsx b/web/hooks/use-drop.tsx
@@ -14,7 +14,6 @@ import { cleanupSession } from 'lib/session';
 export const useDrop = () => {
     const logsRef = useRef<Array<string>>([]);
     const contextRef = useRef<DropContext>(initDropContext());
-    const timersRef = useRef(new Map<MessageType, NodeJS.Timeout>());
 
     const [{ value: state }, send] = useMachine(dropMachine);
 
@@ -38,7 +37,6 @@ export const useDrop = () => {
         () =>
             createDropHandlers({
                 ctx: contextRef.current,
-                timers: timersRef.current,
                 sendEvent: send,
                 logger: {
                     info: pushLog,

diff --git a/web/hooks/use-grab.tsx b/web/hooks/use-grab.tsx
@@ -16,7 +16,6 @@ export const useGrab = () => {
 
     const logsRef = useRef<Array<string>>([]);
     const contextRef = useRef<GrabContext>(initGrabContext());
-    const timersRef = useRef(new Map<MessageType, NodeJS.Timeout>());
 
     const [{ value: state }, send] = useMachine(grabMachine);
 
@@ -35,7 +34,6 @@ export const useGrab = () => {
         () =>
             createGrabHandlers<File>({
                 ctx: contextRef.current,
-                timers: timersRef.current,
                 sendEvent: send,
                 logger: {
                     info: pushLog,