From 62d3d7cc422a66008e2f06f4f3e9a62b8aadeb4b Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Sun, 23 Jul 2023 10:07:49 +0200
Subject: [PATCH] [Refactoring] API: Refactor worker provider directory

---
 src/api/gramjs/index.ts                       |  4 +-
 .../gramjs/{provider.ts => methods/init.ts}   | 38 +++++++++----------
 src/api/gramjs/worker/__mocks__/provider.ts   |  2 +-
 .../worker/{provider.ts => connector.ts}      |  2 -
 src/api/gramjs/worker/worker.ts               |  2 +-
 5 files changed, 23 insertions(+), 25 deletions(-)
 rename src/api/gramjs/{provider.ts => methods/init.ts} (65%)
 rename src/api/gramjs/worker/{provider.ts => connector.ts} (99%)

diff --git a/src/api/gramjs/index.ts b/src/api/gramjs/index.ts
index 22f8207d1..ee70b21b2 100644
--- a/src/api/gramjs/index.ts
+++ b/src/api/gramjs/index.ts
@@ -1,4 +1,4 @@
-// export { initApi, callApi, cancelApiProgress } from './provider';
+// export { initApi, callApi, cancelApiProgress } from './methods/init';
 export {
   initApi, callApi, cancelApiProgress, cancelApiProgressMaster, callApiLocal,
   handleMethodCallback,
@@ -6,4 +6,4 @@ export {
   updateFullLocalDb,
   updateLocalDb,
   setShouldEnableDebugLog,
-} from './worker/provider';
+} from './worker/connector';
diff --git a/src/api/gramjs/provider.ts b/src/api/gramjs/methods/init.ts
similarity index 65%
rename from src/api/gramjs/provider.ts
rename to src/api/gramjs/methods/init.ts
index c99abc33b..1d89d829f 100644
--- a/src/api/gramjs/provider.ts
+++ b/src/api/gramjs/methods/init.ts
@@ -3,26 +3,26 @@ import type {
   ApiInitialArgs,
   ApiUpdate,
   ApiOnProgress,
-} from '../types';
-import type { Methods, MethodArgs, MethodResponse } from './methods/types';
-import type { LocalDb } from './localDb';
+} from '../../types';
+import type { Methods, MethodArgs, MethodResponse } from './types';
+import type { LocalDb } from '../localDb';
 
-import { API_THROTTLE_RESET_UPDATES, API_UPDATE_THROTTLE } from '../../config';
-import { throttle, throttleWithTickEnd } from '../../util/schedulers';
-import { updateFullLocalDb } from './localDb';
-import { init as initUpdater } from './updater';
-import { init as initAuth } from './methods/auth';
-import { init as initChats } from './methods/chats';
-import { init as initMessages } from './methods/messages';
-import { init as initUsers } from './methods/users';
-import { init as initClient } from './methods/client';
-import { init as initStickers } from './methods/symbols';
-import { init as initManagement } from './methods/management';
-import { init as initTwoFaSettings } from './methods/twoFaSettings';
-import { init as initBots } from './methods/bots';
-import { init as initCalls } from './methods/calls';
-import { init as initPayments } from './methods/payments';
-import * as methods from './methods';
+import { API_THROTTLE_RESET_UPDATES, API_UPDATE_THROTTLE } from '../../../config';
+import { throttle, throttleWithTickEnd } from '../../../util/schedulers';
+import { updateFullLocalDb } from '../localDb';
+import { init as initUpdater } from '../updater';
+import { init as initAuth } from './auth';
+import { init as initChats } from './chats';
+import { init as initMessages } from './messages';
+import { init as initUsers } from './users';
+import { init as initClient } from './client';
+import { init as initStickers } from './symbols';
+import { init as initManagement } from './management';
+import { init as initTwoFaSettings } from './twoFaSettings';
+import { init as initBots } from './bots';
+import { init as initCalls } from './calls';
+import { init as initPayments } from './payments';
+import * as methods from './index';
 
 let onUpdate: OnApiUpdate;
 
diff --git a/src/api/gramjs/worker/__mocks__/provider.ts b/src/api/gramjs/worker/__mocks__/provider.ts
index d4ef03c26..03f70a607 100644
--- a/src/api/gramjs/worker/__mocks__/provider.ts
+++ b/src/api/gramjs/worker/__mocks__/provider.ts
@@ -1 +1 @@
-export * from '../../provider';
+export * from '../../methods/init';
diff --git a/src/api/gramjs/worker/provider.ts b/src/api/gramjs/worker/connector.ts
similarity index 99%
rename from src/api/gramjs/worker/provider.ts
rename to src/api/gramjs/worker/connector.ts
index 23ef43385..a5c013bf1 100644
--- a/src/api/gramjs/worker/provider.ts
+++ b/src/api/gramjs/worker/connector.ts
@@ -40,8 +40,6 @@ const savedLocalDb: LocalDb = {
   channelPtsById: {},
 };
 
-// TODO Re-use `util/WorkerConnector.ts`
-
 let isMasterTab = true;
 subscribeToMasterChange((isMasterTabNew) => {
   isMasterTab = isMasterTabNew;
diff --git a/src/api/gramjs/worker/worker.ts b/src/api/gramjs/worker/worker.ts
index e87abfce9..59319f2b1 100644
--- a/src/api/gramjs/worker/worker.ts
+++ b/src/api/gramjs/worker/worker.ts
@@ -4,7 +4,7 @@ import type { ApiOnProgress, ApiUpdate } from '../../types';
 import type { OriginMessageEvent, WorkerMessageData } from './types';
 
 import { DEBUG } from '../../../config';
-import { callApi, cancelApiProgress, initApi } from '../provider';
+import { callApi, cancelApiProgress, initApi } from '../methods/init';
 import { log } from '../helpers';
 import type { DebugLevel } from '../../../util/debugConsole';
 import { DEBUG_LEVELS } from '../../../util/debugConsole';