chore(common,pockethost): refactor mergeConfig to common

packages/common/src/Logger.ts

@@ -2,7 +2,7 @@
 
 import chalk from 'chalk'
 import stringify from 'json-stringify-safe'
-import { mergeConfig } from '../../pockethost/src/util/mergeConfig'
+import { mergeConfig } from './mergeConfig'
 import { mkSingleton } from './mkSingleton'
 import { PocketHostAction, action } from './plugin'
 

packages/common/src/index.ts

@@ -5,6 +5,7 @@ export * from './assert'
 export * from './asyncExecutionGuard'
 export * from './events'
 export * from './ioc'
+export * from './mergeConfig'
 export * from './mkSingleton'
 export * from './newId'
 export * from './plugin'

packages/pockethost/src/services/FtpService/index.ts

@@ -7,8 +7,13 @@ import {
   SSL_CERT,
   SSL_KEY,
 } from '$constants'
-import { exitHook, mergeConfig } from '$util'
+import { exitHook } from '$util'
-import { LoggerService, PocketBase, mkSingleton } from '@pockethost/common'
+import {
+  LoggerService,
+  PocketBase,
+  mergeConfig,
+  mkSingleton,
+} from '@pockethost/common'
 import { keys, values } from '@s-libs/micro-dash'
 import { readFileSync } from 'fs'
 import { FtpSrv } from 'ftp-srv'

packages/pockethost/src/services/InstanceLoggerService/index.ts

@@ -1,8 +1,9 @@
 import { mkInstanceDataPath } from '$constants'
-import { asyncExitHook, mergeConfig } from '$util'
+import { asyncExitHook } from '$util'
 import {
   LoggerService,
   createCleanupManager,
+  mergeConfig,
   stringify,
 } from '@pockethost/common'
 import * as fs from 'fs'

packages/pockethost/src/services/MothershipAdminClientService/index.ts

@@ -3,11 +3,11 @@ import {
   MOTHERSHIP_ADMIN_USERNAME,
   MOTHERSHIP_URL,
 } from '$constants'
-import { mergeConfig } from '$util'
 import {
   Logger,
   LoggerService,
   PocketBase,
+  mergeConfig,
   mkSingleton,
 } from '@pockethost/common'
 import { createAdminPbClient } from './createAdminPbClient'

packages/pockethost/src/services/PortService.ts

@@ -1,6 +1,6 @@
 import { INITIAL_PORT_POOL_SIZE } from '$constants'
-import { mergeConfig, PromiseAllocator } from '$util'
+import { PromiseAllocator } from '$util'
-import { mkSingleton } from '@pockethost/common'
+import { mergeConfig, mkSingleton } from '@pockethost/common'
 import getPort from 'get-port'
 
 export type Config = { maxPorts: number }

packages/pockethost/src/util/index.ts

@@ -6,7 +6,6 @@ export * from './discordAlert'
 export * from './env'
 export * from './exit'
 export * from './internal'
-export * from './mergeConfig'
 export * from './now'
 export * from './process'
 export * from './smartFetch'