chore: refactor clientService

packages/daemon/src/server.ts

@@ -1,7 +1,7 @@
 import { logger } from '@pockethost/common'
-import { clientService } from './clientService/clientService'
 import { DEBUG, PH_BIN_CACHE, PUBLIC_PB_SUBDOMAIN } from './constants'
 import { backupService } from './services/BackupService'
+import { clientService } from './services/clientService/clientService'
 import { ftpService } from './services/FtpService/FtpService'
 import { instanceService } from './services/InstanceService'
 import { pocketbase } from './services/PocketBaseService'

packages/daemon/src/services/BackupService.ts

@@ -14,8 +14,8 @@ import {
   RpcCommands,
 } from '@pockethost/common'
 import Bottleneck from 'bottleneck'
-import { clientService } from '../clientService/clientService'
 import { backupInstance } from '../util/backupInstance'
+import { clientService } from './clientService/clientService'
 import { rpcService } from './RpcService'
 
 export const backupService = mkSingleton(async () => {

packages/daemon/src/services/FtpService/FtpService.ts

@@ -1,8 +1,6 @@
 import { logger, mkSingleton } from '@pockethost/common'
 import { readFileSync } from 'fs'
 import { FtpSrv } from 'ftp-srv'
-import { clientService } from '../../clientService/clientService'
-import { createPbClient } from '../../clientService/PbClient'
 import {
   PH_FTP_PASV_IP,
   PH_FTP_PASV_PORT_MAX,
@@ -11,6 +9,8 @@ import {
   SSL_CERT,
   SSL_KEY,
 } from '../../constants'
+import { clientService } from '../clientService/clientService'
+import { createPbClient } from '../clientService/PbClient'
 import { PhFs } from './PhFs'
 
 export type FtpConfig = {}

packages/daemon/src/services/FtpService/PhFs.ts

@@ -3,8 +3,8 @@ import { existsSync, mkdirSync } from 'fs'
 import { FileStat, FileSystem, FtpConnection } from 'ftp-srv'
 import { join } from 'path'
 import { Readable } from 'stream'
-import { PocketbaseClientApi } from '../../clientService/PbClient'
 import { DAEMON_PB_DATA_DIR } from '../../constants'
+import { PocketbaseClientApi } from '../clientService/PbClient'
 import {
   FOLDER_NAMES,
   isFolder,

packages/daemon/src/services/InstanceService.ts

@@ -14,7 +14,6 @@ import { forEachRight, map } from '@s-libs/micro-dash'
 import Bottleneck from 'bottleneck'
 import getPort from 'get-port'
 import { AsyncReturnType } from 'type-fest'
-import { clientService } from '../clientService/clientService'
 import {
   DAEMON_PB_IDLE_TTL,
   DAEMON_PB_PORT_BASE,
@@ -24,6 +23,7 @@ import {
 import { mkInternalUrl } from '../util/internal'
 import { now } from '../util/now'
 import { safeCatch } from '../util/promiseHelper'
+import { clientService } from './clientService/clientService'
 import { pocketbase, PocketbaseProcess } from './PocketBaseService'
 import { rpcService } from './RpcService'
 

packages/daemon/src/services/RpcService.ts

@@ -13,7 +13,7 @@ import Bottleneck from 'bottleneck'
 import { default as knexFactory } from 'knex'
 import pocketbaseEs from 'pocketbase'
 import { AsyncReturnType, JsonObject } from 'type-fest'
-import { clientService } from '../clientService/clientService'
+import { clientService } from './clientService/clientService'
 
 export type RpcServiceApi = AsyncReturnType<typeof rpcService>
 

packages/daemon/src/services/clientService/BackupMixin.ts

@@ -8,7 +8,7 @@ import {
   InstanceId,
   logger,
 } from '@pockethost/common'
-import { safeCatch } from '../util/promiseHelper'
+import { safeCatch } from '../../util/promiseHelper'
 import { MixinContext } from './PbClient'
 
 export type BackupApi = ReturnType<typeof createBackupMixin>

packages/daemon/src/services/clientService/InstanceMIxin.ts

@@ -10,7 +10,7 @@ import {
 import { reduce } from '@s-libs/micro-dash'
 import Bottleneck from 'bottleneck'
 import { endOfMonth, startOfMonth } from 'date-fns'
-import { safeCatch } from '../util/promiseHelper'
+import { safeCatch } from '../../util/promiseHelper'
 import { MixinContext } from './PbClient'
 
 export type InstanceApi = ReturnType<typeof createInstanceMixin>

packages/daemon/src/services/clientService/InvocationMixin.ts

@@ -4,7 +4,7 @@ import {
   logger,
   pocketNow,
 } from '@pockethost/common'
-import { safeCatch } from '../util/promiseHelper'
+import { safeCatch } from '../../util/promiseHelper'
 import { InstanceApi } from './InstanceMIxin'
 import { MixinContext } from './PbClient'
 

packages/daemon/src/services/clientService/PbClient.ts

@@ -5,9 +5,9 @@ import {
   default as PocketBase,
   default as pocketbaseEs,
 } from 'pocketbase'
-import { DAEMON_PB_DATA_DIR, PUBLIC_PB_SUBDOMAIN } from '../constants'
-import { Collection_Serialized } from '../migrate/schema'
-import { safeCatch } from '../util/promiseHelper'
+import { DAEMON_PB_DATA_DIR, PUBLIC_PB_SUBDOMAIN } from '../../constants'
+import { Collection_Serialized } from '../../migrate/schema'
+import { safeCatch } from '../../util/promiseHelper'
 import { createBackupMixin } from './BackupMixin'
 import { createInstanceMixin } from './InstanceMIxin'
 import { createInvocationMixin } from './InvocationMixin'

packages/daemon/src/services/clientService/RpcHelper.ts

@@ -1,6 +1,6 @@
 import { RpcFields, RpcStatus, RPC_COLLECTION } from '@pockethost/common'
 import { JsonObject } from 'type-fest'
-import { safeCatch } from '../util/promiseHelper'
+import { safeCatch } from '../../util/promiseHelper'
 import { MixinContext } from './PbClient'
 
 export enum RecordSubscriptionActions {

packages/daemon/src/services/clientService/clientService.ts

@@ -5,7 +5,7 @@ import {
   PUBLIC_PB_DOMAIN,
   PUBLIC_PB_PROTOCOL,
   PUBLIC_PB_SUBDOMAIN,
-} from '../constants'
+} from '../../constants'
 import { createPbClient } from './PbClient'
 
 export const clientService = mkSingleton(async (url: string) => {