From f4be4318c47075ea7cbe46404f6427ef687b4995 Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Fri, 20 Oct 2023 01:35:16 -0700 Subject: [PATCH] chore: refactor includes --- packages/daemon/src/server.ts | 6 +++--- packages/daemon/src/services/FtpService/PhFs.ts | 4 ++-- .../FtpService/{FtpService.ts => index.ts} | 0 .../{InstanceService.ts => index.ts} | 11 +++++++---- .../src/services/IpWhitelistService/index.ts | 2 +- .../{PocketBaseService.ts => index.ts} | 11 +++-------- .../daemon/src/services/RpcService/commands.ts | 10 ++++++---- .../RpcService/{RpcService.ts => index.ts} | 0 .../{SqliteService.ts => index.ts} | 0 .../{UpdaterService.ts => index.ts} | 0 .../src/services/clientService/InstanceMIxin.ts | 4 ++-- .../daemon/src/services/clientService/index.ts | 2 ++ packages/daemon/src/services/index.ts | 17 ++++++++++------- packages/daemon/src/util/index.ts | 1 + 14 files changed, 37 insertions(+), 31 deletions(-) rename packages/daemon/src/services/FtpService/{FtpService.ts => index.ts} (100%) rename packages/daemon/src/services/InstanceService/{InstanceService.ts => index.ts} (98%) rename packages/daemon/src/services/PocketBaseService/{PocketBaseService.ts => index.ts} (95%) rename packages/daemon/src/services/RpcService/{RpcService.ts => index.ts} (100%) rename packages/daemon/src/services/SqliteService/{SqliteService.ts => index.ts} (100%) rename packages/daemon/src/services/UpdaterService/{UpdaterService.ts => index.ts} (100%) create mode 100644 packages/daemon/src/services/clientService/index.ts diff --git a/packages/daemon/src/server.ts b/packages/daemon/src/server.ts index 1b268bdf..1b4ce628 100644 --- a/packages/daemon/src/server.ts +++ b/packages/daemon/src/server.ts @@ -7,19 +7,19 @@ import { TRACE, } from '$constants' import { + centralDbService, clientService, ftpService, instanceService, + ipWhitelistService, pocketbaseService, proxyService, realtimeLog, rpcService, sqliteService, + updaterService, } from '$services' import { LoggerService } from '@pockethost/common' -import { centralDbService } from './services/CentralDbService' -import { ipWhitelistService } from './services/IpWhitelistService' -import { updaterService } from './services/UpdaterService/UpdaterService' // gen:import const [major, minor, patch] = process.versions.node.split('.').map(Number) diff --git a/packages/daemon/src/services/FtpService/PhFs.ts b/packages/daemon/src/services/FtpService/PhFs.ts index 0e082060..6ea22ff8 100644 --- a/packages/daemon/src/services/FtpService/PhFs.ts +++ b/packages/daemon/src/services/FtpService/PhFs.ts @@ -1,4 +1,5 @@ import { DAEMON_PB_DATA_DIR } from '$constants' +import { PocketbaseClientApi } from '$services' import { assert } from '$util' import { InstanceFields, Logger } from '@pockethost/common' import { compact, map } from '@s-libs/micro-dash' @@ -13,13 +14,12 @@ import { import { FileStat, FileSystem, FtpConnection } from 'ftp-srv' import { customAlphabet } from 'nanoid' import { isAbsolute, join, normalize, resolve, sep } from 'path' -import { PocketbaseClientApi } from '../clientService/PbClient' import { FolderNames, INSTANCE_ROOT_FOLDER_NAMES, MAINTENANCE_ONLY_FOLDER_NAMES, isInstanceRootFolder, -} from './FtpService' +} from '.' import * as fsAsync from './fs-async' const nanoid = customAlphabet(`abcdefghijklmnop`) diff --git a/packages/daemon/src/services/FtpService/FtpService.ts b/packages/daemon/src/services/FtpService/index.ts similarity index 100% rename from packages/daemon/src/services/FtpService/FtpService.ts rename to packages/daemon/src/services/FtpService/index.ts diff --git a/packages/daemon/src/services/InstanceService/InstanceService.ts b/packages/daemon/src/services/InstanceService/index.ts similarity index 98% rename from packages/daemon/src/services/InstanceService/InstanceService.ts rename to packages/daemon/src/services/InstanceService/index.ts index 7f3fe86e..c0443b4d 100644 --- a/packages/daemon/src/services/InstanceService/InstanceService.ts +++ b/packages/daemon/src/services/InstanceService/index.ts @@ -4,7 +4,13 @@ import { mkDocUrl, PUBLIC_MOTHERSHIP_NAME, } from '$constants' -import { clientService, proxyService } from '$services' +import { + clientService, + InstanceLogger, + pocketbaseService, + port, + proxyService, +} from '$services' import { mkInternalUrl, now } from '$util' import { assertTruthy, @@ -22,9 +28,6 @@ import { map, values } from '@s-libs/micro-dash' import Bottleneck from 'bottleneck' import { ClientResponseError } from 'pocketbase' import { AsyncReturnType } from 'type-fest' -import { InstanceLogger } from '../InstanceLoggerService' -import { pocketbaseService } from '../PocketBaseService/PocketBaseService' -import { port } from '../PortManager' enum InstanceApiStatus { Starting = 'starting', diff --git a/packages/daemon/src/services/IpWhitelistService/index.ts b/packages/daemon/src/services/IpWhitelistService/index.ts index e7898cfc..e18d3214 100644 --- a/packages/daemon/src/services/IpWhitelistService/index.ts +++ b/packages/daemon/src/services/IpWhitelistService/index.ts @@ -1,4 +1,5 @@ import { DAEMON_IPCIDR_LIST } from '$constants' +import { proxyService } from '$services' import { assert } from '$util' import { LoggerService, @@ -6,7 +7,6 @@ import { SingletonBaseConfig, } from '@pockethost/common' import IPCIDR from 'ip-cidr' -import { proxyService } from '../ProxyService' export type IpWhitelistServiceConfig = SingletonBaseConfig & { ipRanges: string[] } diff --git a/packages/daemon/src/services/PocketBaseService/PocketBaseService.ts b/packages/daemon/src/services/PocketBaseService/index.ts similarity index 95% rename from packages/daemon/src/services/PocketBaseService/PocketBaseService.ts rename to packages/daemon/src/services/PocketBaseService/index.ts index 4c2eb5ed..d53edb18 100644 --- a/packages/daemon/src/services/PocketBaseService/PocketBaseService.ts +++ b/packages/daemon/src/services/PocketBaseService/index.ts @@ -4,17 +4,15 @@ import { mkInstanceDataPath, PUBLIC_DEBUG, } from '$constants' -import { port as getPort } from '$services' -import { assert, mkInternalUrl, tryFetch } from '$util' +import { port as getPort, InstanceLogger, updaterService } from '$services' +import { assert, AsyncContext, mkInternalUrl, tryFetch } from '$util' import { createCleanupManager, createTimerManager, InvocationPid, -} from '@pockethost/common' -import { mkSingleton, SingletonBaseConfig, -} from '@pockethost/common/src/mkSingleton' +} from '@pockethost/common' import { map } from '@s-libs/micro-dash' import Docker, { Container, ContainerCreateOptions } from 'dockerode' import { existsSync } from 'fs' @@ -22,9 +20,6 @@ import MemoryStream from 'memorystream' import { dirname } from 'path' import { gte } from 'semver' import { AsyncReturnType } from 'type-fest' -import { AsyncContext } from '../../util/AsyncContext' -import { InstanceLogger } from '../InstanceLoggerService' -import { updaterService } from '../UpdaterService/UpdaterService' export type PocketbaseCommand = 'serve' | 'migrate' export type Env = { [_: string]: string } diff --git a/packages/daemon/src/services/RpcService/commands.ts b/packages/daemon/src/services/RpcService/commands.ts index e6365680..39734b2a 100644 --- a/packages/daemon/src/services/RpcService/commands.ts +++ b/packages/daemon/src/services/RpcService/commands.ts @@ -1,3 +1,9 @@ +import { + clientService, + instanceService, + rpcService, + updaterService, +} from '$services' import { CreateInstancePayload, CreateInstancePayloadSchema, @@ -20,10 +26,6 @@ import { type SetInstanceMaintenanceResult, } from '@pockethost/common' import { valid, validRange } from 'semver' -import { instanceService } from '../InstanceService/InstanceService' -import { updaterService } from '../UpdaterService/UpdaterService' -import { clientService } from '../clientService/clientService' -import { rpcService } from './RpcService' export const registerRpcCommands = async (logger: Logger) => { const { client } = await clientService() diff --git a/packages/daemon/src/services/RpcService/RpcService.ts b/packages/daemon/src/services/RpcService/index.ts similarity index 100% rename from packages/daemon/src/services/RpcService/RpcService.ts rename to packages/daemon/src/services/RpcService/index.ts diff --git a/packages/daemon/src/services/SqliteService/SqliteService.ts b/packages/daemon/src/services/SqliteService/index.ts similarity index 100% rename from packages/daemon/src/services/SqliteService/SqliteService.ts rename to packages/daemon/src/services/SqliteService/index.ts diff --git a/packages/daemon/src/services/UpdaterService/UpdaterService.ts b/packages/daemon/src/services/UpdaterService/index.ts similarity index 100% rename from packages/daemon/src/services/UpdaterService/UpdaterService.ts rename to packages/daemon/src/services/UpdaterService/index.ts diff --git a/packages/daemon/src/services/clientService/InstanceMIxin.ts b/packages/daemon/src/services/clientService/InstanceMIxin.ts index 190a0d5b..e13ac47b 100644 --- a/packages/daemon/src/services/clientService/InstanceMIxin.ts +++ b/packages/daemon/src/services/clientService/InstanceMIxin.ts @@ -1,3 +1,5 @@ +import { MixinContext } from '$services' +import { AsyncContext } from '$util' import { INSTANCE_COLLECTION, InstanceFields, @@ -9,8 +11,6 @@ import { } from '@pockethost/common' import { reduce } from '@s-libs/micro-dash' import Bottleneck from 'bottleneck' -import { AsyncContext } from '../../util/AsyncContext' -import { MixinContext } from './PbClient' export type InstanceApi = ReturnType diff --git a/packages/daemon/src/services/clientService/index.ts b/packages/daemon/src/services/clientService/index.ts new file mode 100644 index 00000000..3a9051a3 --- /dev/null +++ b/packages/daemon/src/services/clientService/index.ts @@ -0,0 +1,2 @@ +export * from './PbClient' +export * from './clientService' diff --git a/packages/daemon/src/services/index.ts b/packages/daemon/src/services/index.ts index 667934ce..6810329d 100644 --- a/packages/daemon/src/services/index.ts +++ b/packages/daemon/src/services/index.ts @@ -1,10 +1,13 @@ -export * from './FtpService/FtpService' -export * from './InstanceService/InstanceService' -export * from './PocketBaseService/PocketBaseService' +export * from './CentralDbService' +export * from './FtpService' +export * from './InstanceLoggerService' +export * from './InstanceService' +export * from './IpWhitelistService' +export * from './PocketBaseService' export * from './PortManager' export * from './ProxyService' export * from './RealtimeLog' -export * from './RpcService/RpcService' -export * from './SqliteService/SqliteService' -export * from './clientService/PbClient' -export * from './clientService/clientService' +export * from './RpcService' +export * from './SqliteService' +export * from './UpdaterService' +export * from './clientService' diff --git a/packages/daemon/src/util/index.ts b/packages/daemon/src/util/index.ts index ded94528..4e8ae049 100644 --- a/packages/daemon/src/util/index.ts +++ b/packages/daemon/src/util/index.ts @@ -1,3 +1,4 @@ +export * from './AsyncContext' export * from './PromiseAllocator' export * from './assert' export * from './downloadAndExtract'