From c205de9bbd8c13355b33ec89776ff6af8e61137e Mon Sep 17 00:00:00 2001
From: Ben Allfree <ben@benallfree.com>
Date: Fri, 15 Nov 2024 03:46:02 -0800
Subject: [PATCH] redo pockethost package entry point

---
 cspell.json                                        |  1 +
 .../src/routes/(app)/account/+page.svelte          |  2 +-
 .../src/routes/(app)/account/FlounderCard.svelte   |  2 +-
 .../src/routes/(app)/dashboard/+page.svelte        |  2 +-
 .../src/routes/(app)/dashboard/InstanceList.svelte |  6 +++---
 .../instances/[instanceId]/secrets/List.svelte     |  2 +-
 .../src/routes/(static)/pricing/+page.svelte       |  2 +-
 packages/pockethost/common.ts                      |  1 -
 packages/pockethost/core.ts                        |  2 --
 packages/pockethost/package.json                   | 10 ++++++++--
 .../DaemonCommand/ServeCommand/daemon.ts           |  4 ++--
 .../DaemonCommand/ServeCommand/index.ts            |  2 +-
 .../EdgeCommand/FtpCommand/FtpService/PhFs.ts      |  2 +-
 .../EdgeCommand/FtpCommand/FtpService/index.ts     | 14 +++++++-------
 .../EdgeCommand/FtpCommand/ServeCommand/ftp.ts     |  6 +-----
 .../EdgeCommand/FtpCommand/ServeCommand/index.ts   |  2 +-
 .../ServeCommand/firewall/server.ts                |  4 ++--
 .../src/cli/commands/FirewallCommand/index.ts      |  2 +-
 .../src/cli/commands/HealthCommand/checkHealth.ts  |  2 +-
 .../src/cli/commands/HealthCommand/compact.ts      |  3 +--
 .../src/cli/commands/HealthCommand/index.ts        |  2 +-
 .../MothershipCommand/SchemaCommand/schema.ts      |  2 +-
 .../MothershipCommand/ServeCommand/mothership.ts   |  2 +-
 .../UpdateCommand/freshenPocketbaseVersions.ts     |  2 +-
 .../src/cli/commands/SendMailCommand/sendmail.ts   |  4 ++--
 .../src/cli/commands/ServeCommand/index.ts         |  2 +-
 packages/pockethost/src/cli/index.ts               |  2 +-
 packages/pockethost/src/cli/ioc.ts                 |  2 +-
 packages/pockethost/src/constants.ts               |  6 ++----
 packages/pockethost/src/core/index.ts              |  2 ++
 packages/pockethost/src/index.ts                   |  1 +
 .../src/services/InstanceLoggerService/index.ts    |  2 +-
 .../src/services/InstanceService/index.ts          |  2 +-
 .../services/InstanceService/mkInstanceCache.ts    |  2 +-
 .../MothershipAdminClientService/InstanceMIxin.ts  |  2 +-
 .../createAdminPbClient.ts                         |  2 +-
 .../services/MothershipAdminClientService/index.ts |  2 +-
 .../src/services/PocketBaseService/index.ts        |  2 +-
 packages/pockethost/src/services/ProxyService.ts   |  2 +-
 packages/pockethost/src/services/RealtimeLog.ts    |  2 +-
 40 files changed, 58 insertions(+), 58 deletions(-)
 delete mode 100644 packages/pockethost/common.ts
 delete mode 100644 packages/pockethost/core.ts

diff --git a/cspell.json b/cspell.json
index 5816dc59..7f01aed7 100644
--- a/cspell.json
+++ b/cspell.json
@@ -35,6 +35,7 @@
     "mothership",
     "multitenancy",
     "multitenant",
+    "neverending",
     "noaxis",
     "nofile",
     "nohup",
diff --git a/packages/dashboard/src/routes/(app)/account/+page.svelte b/packages/dashboard/src/routes/(app)/account/+page.svelte
index 840a0303..3a68d227 100644
--- a/packages/dashboard/src/routes/(app)/account/+page.svelte
+++ b/packages/dashboard/src/routes/(app)/account/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { userSubscriptionType } from '$util/stores'
-  import { PLAN_NAMES, SubscriptionType } from 'pockethost'
+  import { PLAN_NAMES, SubscriptionType } from 'pockethost/common'
   import { userStore } from '$util/stores'
   import { onMount } from 'svelte'
   import FlounderCard from './FlounderCard.svelte'
diff --git a/packages/dashboard/src/routes/(app)/account/FlounderCard.svelte b/packages/dashboard/src/routes/(app)/account/FlounderCard.svelte
index 46e5e209..ddf684f0 100644
--- a/packages/dashboard/src/routes/(app)/account/FlounderCard.svelte
+++ b/packages/dashboard/src/routes/(app)/account/FlounderCard.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { PLAN_NAMES, SubscriptionType } from 'pockethost'
+  import { PLAN_NAMES, SubscriptionType } from 'pockethost/common'
   import { stats, userStore } from '$util/stores'
   import PricingCard from '$src/routes/(static)/pricing/PricingCard.svelte'
 
diff --git a/packages/dashboard/src/routes/(app)/dashboard/+page.svelte b/packages/dashboard/src/routes/(app)/dashboard/+page.svelte
index cf71b0a4..9284f281 100644
--- a/packages/dashboard/src/routes/(app)/dashboard/+page.svelte
+++ b/packages/dashboard/src/routes/(app)/dashboard/+page.svelte
@@ -3,7 +3,7 @@
   import { globalInstancesStore, userSubscriptionType } from '$util/stores'
   import { values } from '@s-libs/micro-dash'
   import InstanceList from './InstanceList.svelte'
-  import { SubscriptionType } from 'pockethost'
+  import { SubscriptionType } from 'pockethost/common'
   import { faPlus } from '@fortawesome/free-solid-svg-icons'
   import Fa from 'svelte-fa'
 
diff --git a/packages/dashboard/src/routes/(app)/dashboard/InstanceList.svelte b/packages/dashboard/src/routes/(app)/dashboard/InstanceList.svelte
index 3f57c062..1d7d62c2 100644
--- a/packages/dashboard/src/routes/(app)/dashboard/InstanceList.svelte
+++ b/packages/dashboard/src/routes/(app)/dashboard/InstanceList.svelte
@@ -5,7 +5,7 @@
   import { globalInstancesStore } from '$util/stores'
   import { faCircleInfo } from '@fortawesome/free-solid-svg-icons'
   import { values } from '@s-libs/micro-dash'
-  import { type InstanceId } from 'pockethost'
+  import { type InstanceId } from 'pockethost/common'
   import Fa from 'svelte-fa'
 
   const { updateInstance } = client()
@@ -26,7 +26,7 @@
 {#each values($globalInstancesStore).sort( (a, b) => a.subdomain.localeCompare(b.subdomain), ) as instance, index}
   <button
     class={`card min-w-80 lg:max-w-80 flex-1 m-4 transition hover:bg-base-300 ${instance.maintenance ? 'bg-base-200' : 'bg-neutral'}`}
-    on:click={_=>goto(`/instances/${instance.id}`)}
+    on:click={(_) => goto(`/instances/${instance.id}`)}
   >
     <div class="card-body w-full">
       <div class="card-title">
@@ -38,7 +38,7 @@
               ? 'bg-red-500 hover:bg-red-500'
               : 'toggle-success'}"
             checked={!instance.maintenance}
-            on:click={e=>e.stopPropagation()}
+            on:click={(e) => e.stopPropagation()}
             on:change={handleMaintenanceChange(instance.id)}
           />
         </div>
diff --git a/packages/dashboard/src/routes/(app)/instances/[instanceId]/secrets/List.svelte b/packages/dashboard/src/routes/(app)/instances/[instanceId]/secrets/List.svelte
index 12e30ba0..912c65fa 100644
--- a/packages/dashboard/src/routes/(app)/instances/[instanceId]/secrets/List.svelte
+++ b/packages/dashboard/src/routes/(app)/instances/[instanceId]/secrets/List.svelte
@@ -4,7 +4,7 @@
   import { client } from '$src/pocketbase-client'
   import { instance } from '../store'
   import { reduce } from '@s-libs/micro-dash'
-  import { logger, type UpdateInstancePayload } from 'pockethost'
+  import { logger, type UpdateInstancePayload } from 'pockethost/common'
   import Fa from 'svelte-fa'
   import { faTrash } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/packages/dashboard/src/routes/(static)/pricing/+page.svelte b/packages/dashboard/src/routes/(static)/pricing/+page.svelte
index 6178a891..1492374e 100644
--- a/packages/dashboard/src/routes/(static)/pricing/+page.svelte
+++ b/packages/dashboard/src/routes/(static)/pricing/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import PricingCard from '$src/routes/(static)/pricing/PricingCard.svelte'
-  import { PLAN_NAMES, SubscriptionType } from 'pockethost'
+  import { PLAN_NAMES, SubscriptionType } from 'pockethost/common'
   import PricingTable from './PricingTable.svelte'
   import { userStore } from '$util/stores'
   import FlounderCard from '$src/routes/(app)/account/FlounderCard.svelte'
diff --git a/packages/pockethost/common.ts b/packages/pockethost/common.ts
deleted file mode 100644
index 12ca7d42..00000000
--- a/packages/pockethost/common.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './src/common'
diff --git a/packages/pockethost/core.ts b/packages/pockethost/core.ts
deleted file mode 100644
index 95d6da4b..00000000
--- a/packages/pockethost/core.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './src/common'
-export * from './src/core'
diff --git a/packages/pockethost/package.json b/packages/pockethost/package.json
index a38774fc..02f4b46a 100644
--- a/packages/pockethost/package.json
+++ b/packages/pockethost/package.json
@@ -6,8 +6,14 @@
     "url": "https://github.com/benallfree"
   },
   "license": "MIT",
-  "main": "./common.ts",
-  "module": "./common.ts",
+  "exports": {
+    ".": {
+      "import": "./src/index.ts"
+    },
+    "./common": {
+      "import": "./src/common/index.ts"
+    }
+  },
   "type": "module",
   "bin": {
     "pockethost": "src/cli/index.ts"
diff --git a/packages/pockethost/src/cli/commands/EdgeCommand/DaemonCommand/ServeCommand/daemon.ts b/packages/pockethost/src/cli/commands/EdgeCommand/DaemonCommand/ServeCommand/daemon.ts
index 8a977be7..8351b611 100644
--- a/packages/pockethost/src/cli/commands/EdgeCommand/DaemonCommand/ServeCommand/daemon.ts
+++ b/packages/pockethost/src/cli/commands/EdgeCommand/DaemonCommand/ServeCommand/daemon.ts
@@ -1,14 +1,14 @@
 import Dockerode from 'dockerode'
 import { ErrorRequestHandler } from 'express'
-import { logger } from '../../../../../common'
 import {
   MOTHERSHIP_ADMIN_PASSWORD,
   MOTHERSHIP_ADMIN_USERNAME,
   MOTHERSHIP_URL,
   discordAlert,
+  logger,
   neverendingPromise,
   tryFetch,
-} from '../../../../../core'
+} from '../../../../..'
 import {
   DOCKER_INSTANCE_IMAGE_NAME,
   MothershipAdminClientService,
diff --git a/packages/pockethost/src/cli/commands/EdgeCommand/DaemonCommand/ServeCommand/index.ts b/packages/pockethost/src/cli/commands/EdgeCommand/DaemonCommand/ServeCommand/index.ts
index a1649757..b7218927 100644
--- a/packages/pockethost/src/cli/commands/EdgeCommand/DaemonCommand/ServeCommand/index.ts
+++ b/packages/pockethost/src/cli/commands/EdgeCommand/DaemonCommand/ServeCommand/index.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander'
-import { logger } from '../../../../../../common'
+import { logger } from '../../../../../common'
 import { daemon } from './daemon'
 
 type Options = {
diff --git a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/PhFs.ts b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/PhFs.ts
index 25b68c4d..263860f5 100644
--- a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/PhFs.ts
+++ b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/PhFs.ts
@@ -4,6 +4,7 @@ import { spawn } from 'child_process'
 import { Mode, constants, createReadStream, createWriteStream } from 'fs'
 import { FileStat, FileSystem, FtpConnection } from 'ftp-srv'
 import { dirname, isAbsolute, join, normalize, resolve, sep } from 'path'
+import { DATA_ROOT } from '../../../../..'
 import {
   InstanceFields,
   Logger,
@@ -11,7 +12,6 @@ import {
   assert,
   seqid,
 } from '../../../../../common'
-import { DATA_ROOT } from '../../../../../core'
 import {
   InstanceLogWriter,
   InstanceLogWriterApi,
diff --git a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/index.ts b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/index.ts
index b72b6a04..c1fb891d 100644
--- a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/index.ts
+++ b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/index.ts
@@ -1,11 +1,5 @@
 import { readFileSync } from 'fs'
 import { FtpSrv } from 'ftp-srv'
-import {
-  PocketBase,
-  logger,
-  mergeConfig,
-  mkSingleton,
-} from '../../../../../common'
 import {
   MOTHERSHIP_URL,
   PH_FTP_PASV_IP,
@@ -15,7 +9,13 @@ import {
   SSL_CERT,
   SSL_KEY,
   asyncExitHook,
-} from '../../../../../core'
+} from '../../../../..'
+import {
+  PocketBase,
+  logger,
+  mergeConfig,
+  mkSingleton,
+} from '../../../../../common'
 import { PhFs } from './PhFs'
 
 export type FtpConfig = { mothershipUrl: string }
diff --git a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/ServeCommand/ftp.ts b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/ServeCommand/ftp.ts
index c3f3107e..c5848366 100644
--- a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/ServeCommand/ftp.ts
+++ b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/ServeCommand/ftp.ts
@@ -1,9 +1,5 @@
+import { MOTHERSHIP_URL, neverendingPromise, tryFetch } from '../../../../..'
 import { logger } from '../../../../../common'
-import {
-  MOTHERSHIP_URL,
-  neverendingPromise,
-  tryFetch,
-} from '../../../../../core'
 import { ftpService } from '../FtpService'
 
 export async function ftp() {
diff --git a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/ServeCommand/index.ts b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/ServeCommand/index.ts
index 4c058456..690086c8 100644
--- a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/ServeCommand/index.ts
+++ b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/ServeCommand/index.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander'
-import { logger } from '../../../../../../common'
+import { logger } from '../../../../../common'
 import { ftp } from './ftp'
 
 type Options = {
diff --git a/packages/pockethost/src/cli/commands/FirewallCommand/ServeCommand/firewall/server.ts b/packages/pockethost/src/cli/commands/FirewallCommand/ServeCommand/firewall/server.ts
index 8589a28f..5e6314ce 100644
--- a/packages/pockethost/src/cli/commands/FirewallCommand/ServeCommand/firewall/server.ts
+++ b/packages/pockethost/src/cli/commands/FirewallCommand/ServeCommand/firewall/server.ts
@@ -7,7 +7,6 @@ import fs from 'fs'
 import http from 'http'
 import { createProxyMiddleware } from 'http-proxy-middleware'
 import https from 'https'
-import { logger } from '../../../../../common/Logger'
 import {
   APEX_DOMAIN,
   DAEMON_PORT,
@@ -18,7 +17,8 @@ import {
   neverendingPromise,
   SSL_CERT,
   SSL_KEY,
-} from '../../../../../core'
+} from '../../../../..'
+import { logger } from '../../../../../common/Logger'
 import { createIpWhitelistMiddleware } from './cidr'
 import { createVhostProxyMiddleware } from './createVhostProxyMiddleware'
 
diff --git a/packages/pockethost/src/cli/commands/FirewallCommand/index.ts b/packages/pockethost/src/cli/commands/FirewallCommand/index.ts
index 58c6bdf0..1afa089b 100644
--- a/packages/pockethost/src/cli/commands/FirewallCommand/index.ts
+++ b/packages/pockethost/src/cli/commands/FirewallCommand/index.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander'
-import { logger } from '../../../../common'
+import { logger } from '../../../common'
 import { ServeCommand } from './ServeCommand'
 
 type Options = {
diff --git a/packages/pockethost/src/cli/commands/HealthCommand/checkHealth.ts b/packages/pockethost/src/cli/commands/HealthCommand/checkHealth.ts
index 46b02ff2..e1fae039 100644
--- a/packages/pockethost/src/cli/commands/HealthCommand/checkHealth.ts
+++ b/packages/pockethost/src/cli/commands/HealthCommand/checkHealth.ts
@@ -9,7 +9,7 @@ import {
   LoggerService,
   MOTHERSHIP_PORT,
   stringify,
-} from '../../../../core'
+} from '../../..'
 
 export const checkHealth = async () => {
   const { cpu, drive } = osu
diff --git a/packages/pockethost/src/cli/commands/HealthCommand/compact.ts b/packages/pockethost/src/cli/commands/HealthCommand/compact.ts
index ee9ef46e..d48f98ee 100644
--- a/packages/pockethost/src/cli/commands/HealthCommand/compact.ts
+++ b/packages/pockethost/src/cli/commands/HealthCommand/compact.ts
@@ -1,7 +1,6 @@
 import { execSync } from 'child_process'
 import { globSync } from 'glob'
-import { DATA_ROOT } from '../../../../core'
-import { logger } from '../../../common/Logger'
+import { DATA_ROOT, logger } from '../../..'
 
 export const compact = async () => {
   const { info, error } = logger()
diff --git a/packages/pockethost/src/cli/commands/HealthCommand/index.ts b/packages/pockethost/src/cli/commands/HealthCommand/index.ts
index 6df3f3af..d31d776b 100644
--- a/packages/pockethost/src/cli/commands/HealthCommand/index.ts
+++ b/packages/pockethost/src/cli/commands/HealthCommand/index.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander'
-import { logger } from '../../../../core'
+import { logger } from '../../..'
 
 type Options = {
   debug: boolean
diff --git a/packages/pockethost/src/cli/commands/MothershipCommand/SchemaCommand/schema.ts b/packages/pockethost/src/cli/commands/MothershipCommand/SchemaCommand/schema.ts
index 806b210c..a9e11f12 100644
--- a/packages/pockethost/src/cli/commands/MothershipCommand/SchemaCommand/schema.ts
+++ b/packages/pockethost/src/cli/commands/MothershipCommand/SchemaCommand/schema.ts
@@ -5,7 +5,7 @@ import {
   MOTHERSHIP_DATA_ROOT,
   MOTHERSHIP_MIGRATIONS_DIR,
   MOTHERSHIP_SEMVER,
-} from '../../../../../core'
+} from '../../../..'
 import { GobotService } from '../../../../services/GobotService'
 
 export async function schema() {
diff --git a/packages/pockethost/src/cli/commands/MothershipCommand/ServeCommand/mothership.ts b/packages/pockethost/src/cli/commands/MothershipCommand/ServeCommand/mothership.ts
index a6841b14..a6523bb3 100644
--- a/packages/pockethost/src/cli/commands/MothershipCommand/ServeCommand/mothership.ts
+++ b/packages/pockethost/src/cli/commands/MothershipCommand/ServeCommand/mothership.ts
@@ -15,7 +15,7 @@ import {
   TEST_EMAIL,
   _MOTHERSHIP_APP_ROOT,
   mkContainerHomePath,
-} from '../../../../../core'
+} from '../../../..'
 import { GobotService } from '../../../../services/GobotService'
 
 export type MothershipConfig = {}
diff --git a/packages/pockethost/src/cli/commands/PocketBaseCommand/UpdateCommand/freshenPocketbaseVersions.ts b/packages/pockethost/src/cli/commands/PocketBaseCommand/UpdateCommand/freshenPocketbaseVersions.ts
index 50c11310..56f570d3 100644
--- a/packages/pockethost/src/cli/commands/PocketBaseCommand/UpdateCommand/freshenPocketbaseVersions.ts
+++ b/packages/pockethost/src/cli/commands/PocketBaseCommand/UpdateCommand/freshenPocketbaseVersions.ts
@@ -5,7 +5,7 @@ import {
   MOTHERSHIP_HOOKS_DIR,
   PH_ALLOWED_POCKETBASE_SEMVER,
   stringify,
-} from '../../../../../core'
+} from '../../../..'
 import { GobotService } from '../../../../services/GobotService'
 
 function compareSemVer(a: string, b: string): number {
diff --git a/packages/pockethost/src/cli/commands/SendMailCommand/sendmail.ts b/packages/pockethost/src/cli/commands/SendMailCommand/sendmail.ts
index d8d23da0..b503b33e 100644
--- a/packages/pockethost/src/cli/commands/SendMailCommand/sendmail.ts
+++ b/packages/pockethost/src/cli/commands/SendMailCommand/sendmail.ts
@@ -2,14 +2,14 @@ import { map } from '@s-libs/micro-dash'
 import Database from 'better-sqlite3'
 import Bottleneck from 'bottleneck'
 import { Command, InvalidArgumentError } from 'commander'
-import { PocketBase, UserFields, logger } from '../../../common'
 import {
   MOTHERSHIP_ADMIN_PASSWORD,
   MOTHERSHIP_ADMIN_USERNAME,
   MOTHERSHIP_DATA_DB,
   MOTHERSHIP_URL,
   TEST_EMAIL,
-} from '../../../core'
+} from '../../..'
+import { PocketBase, UserFields, logger } from '../../../common'
 
 const TBL_SENT_MESSAGES = `sent_messages`
 
diff --git a/packages/pockethost/src/cli/commands/ServeCommand/index.ts b/packages/pockethost/src/cli/commands/ServeCommand/index.ts
index 1ceb6a1b..87ce3a69 100644
--- a/packages/pockethost/src/cli/commands/ServeCommand/index.ts
+++ b/packages/pockethost/src/cli/commands/ServeCommand/index.ts
@@ -1,6 +1,6 @@
 import { Command } from 'commander'
+import { neverendingPromise } from '../../..'
 import { logger } from '../../../common'
-import { neverendingPromise } from '../../../core'
 import { daemon } from '../EdgeCommand/DaemonCommand/ServeCommand/daemon'
 import { firewall } from '../FirewallCommand/ServeCommand/firewall/server'
 import { mothership } from '../MothershipCommand/ServeCommand/mothership'
diff --git a/packages/pockethost/src/cli/index.ts b/packages/pockethost/src/cli/index.ts
index 672fd5a2..eb95ae1e 100755
--- a/packages/pockethost/src/cli/index.ts
+++ b/packages/pockethost/src/cli/index.ts
@@ -2,7 +2,7 @@
 
 import { program } from 'commander'
 import EventSource from 'eventsource'
-import { LogLevelName, gracefulExit, logger } from '../../core'
+import { LogLevelName, gracefulExit, logger } from '..'
 import { version } from '../../package.json'
 import { EdgeCommand } from './commands/EdgeCommand'
 import { FirewallCommand } from './commands/FirewallCommand'
diff --git a/packages/pockethost/src/cli/ioc.ts b/packages/pockethost/src/cli/ioc.ts
index f1134017..a0ef2d8f 100644
--- a/packages/pockethost/src/cli/ioc.ts
+++ b/packages/pockethost/src/cli/ioc.ts
@@ -1,7 +1,7 @@
+import { WinstonLoggerService } from '..'
 import { version } from '../../package.json'
 import { ioc } from '../common'
 import { RegisterEnvSettingsService } from '../constants'
-import { WinstonLoggerService } from '../core/winston'
 import { GobotService } from '../services/GobotService'
 
 export const initIoc = async () => {
diff --git a/packages/pockethost/src/constants.ts b/packages/pockethost/src/constants.ts
index 7966d3a2..6044be0c 100644
--- a/packages/pockethost/src/constants.ts
+++ b/packages/pockethost/src/constants.ts
@@ -12,15 +12,13 @@ import {
   SettingsHandlerFactory,
   SettingsService,
   ioc,
-} from '../core'
-import {
   mkBoolean,
   mkCsvString,
   mkNumber,
   mkPath,
   mkString,
-} from './core/Settings'
-import { settings } from './core/ioc'
+  settings,
+} from '.'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 
diff --git a/packages/pockethost/src/core/index.ts b/packages/pockethost/src/core/index.ts
index 351cb5f5..68dddef8 100644
--- a/packages/pockethost/src/core/index.ts
+++ b/packages/pockethost/src/core/index.ts
@@ -5,7 +5,9 @@ export * from './discordAlert'
 export * from './env'
 export * from './exit'
 export * from './internal'
+export * from './ioc'
 export * from './process'
 export * from './Settings'
 export * from './smartFetch'
 export * from './tryFetch'
+export * from './winston'
diff --git a/packages/pockethost/src/index.ts b/packages/pockethost/src/index.ts
index 46d458ad..81429a46 100644
--- a/packages/pockethost/src/index.ts
+++ b/packages/pockethost/src/index.ts
@@ -1 +1,2 @@
+export * from './common'
 export * from './core'
diff --git a/packages/pockethost/src/services/InstanceLoggerService/index.ts b/packages/pockethost/src/services/InstanceLoggerService/index.ts
index 4c97539b..fa028486 100644
--- a/packages/pockethost/src/services/InstanceLoggerService/index.ts
+++ b/packages/pockethost/src/services/InstanceLoggerService/index.ts
@@ -5,7 +5,7 @@ import {
   LoggerService,
   mkInstanceDataPath,
   stringify,
-} from '../../../core'
+} from '../..'
 
 type UnsubFunc = () => void
 
diff --git a/packages/pockethost/src/services/InstanceService/index.ts b/packages/pockethost/src/services/InstanceService/index.ts
index 7e9a8ddf..53671f96 100644
--- a/packages/pockethost/src/services/InstanceService/index.ts
+++ b/packages/pockethost/src/services/InstanceService/index.ts
@@ -23,7 +23,7 @@ import {
   now,
   stringify,
   tryFetch,
-} from '../../../core'
+} from '../..'
 import {
   InstanceLogWriter,
   MothershipAdminClientService,
diff --git a/packages/pockethost/src/services/InstanceService/mkInstanceCache.ts b/packages/pockethost/src/services/InstanceService/mkInstanceCache.ts
index 768e0a9a..89ee9545 100644
--- a/packages/pockethost/src/services/InstanceService/mkInstanceCache.ts
+++ b/packages/pockethost/src/services/InstanceService/mkInstanceCache.ts
@@ -8,7 +8,7 @@ import {
   PocketBase,
   UserFields,
   UserId,
-} from '../../../core'
+} from '../..'
 
 export const mkInstanceCache = (client: PocketBase) => {
   const { dbg } = LoggerService().create(`InstanceCache`)
diff --git a/packages/pockethost/src/services/MothershipAdminClientService/InstanceMIxin.ts b/packages/pockethost/src/services/MothershipAdminClientService/InstanceMIxin.ts
index ce63c357..bb63dcdc 100644
--- a/packages/pockethost/src/services/MothershipAdminClientService/InstanceMIxin.ts
+++ b/packages/pockethost/src/services/MothershipAdminClientService/InstanceMIxin.ts
@@ -6,7 +6,7 @@ import {
   InstanceId,
   InstanceStatus,
   WithUser,
-} from '../../../core'
+} from '../..'
 
 export type InstanceApi = ReturnType<typeof createInstanceMixin>
 
diff --git a/packages/pockethost/src/services/MothershipAdminClientService/createAdminPbClient.ts b/packages/pockethost/src/services/MothershipAdminClientService/createAdminPbClient.ts
index adebc6f4..907f1392 100644
--- a/packages/pockethost/src/services/MothershipAdminClientService/createAdminPbClient.ts
+++ b/packages/pockethost/src/services/MothershipAdminClientService/createAdminPbClient.ts
@@ -9,7 +9,7 @@ import {
   RestMethods,
   createRestHelper,
   stringify,
-} from '../../../core'
+} from '../..'
 import { createInstanceMixin } from './InstanceMIxin'
 
 export type PocketbaseClientApi = ReturnType<typeof createAdminPbClient>
diff --git a/packages/pockethost/src/services/MothershipAdminClientService/index.ts b/packages/pockethost/src/services/MothershipAdminClientService/index.ts
index 49db74f8..08433fea 100644
--- a/packages/pockethost/src/services/MothershipAdminClientService/index.ts
+++ b/packages/pockethost/src/services/MothershipAdminClientService/index.ts
@@ -7,7 +7,7 @@ import {
   PocketBase,
   mergeConfig,
   mkSingleton,
-} from '../../../core'
+} from '../..'
 import { createAdminPbClient } from './createAdminPbClient'
 
 export type ClientServiceConfig = {
diff --git a/packages/pockethost/src/services/PocketBaseService/index.ts b/packages/pockethost/src/services/PocketBaseService/index.ts
index c535bfbf..a62965db 100644
--- a/packages/pockethost/src/services/PocketBaseService/index.ts
+++ b/packages/pockethost/src/services/PocketBaseService/index.ts
@@ -15,7 +15,7 @@ import {
   mkInstanceDataPath,
   mkInternalUrl,
   mkSingleton,
-} from '../../../core'
+} from '../..'
 import { GobotService } from '../GobotService'
 import { InstanceLogWriter } from '../InstanceLoggerService'
 
diff --git a/packages/pockethost/src/services/ProxyService.ts b/packages/pockethost/src/services/ProxyService.ts
index da482865..78d194bb 100644
--- a/packages/pockethost/src/services/ProxyService.ts
+++ b/packages/pockethost/src/services/ProxyService.ts
@@ -11,7 +11,7 @@ import {
   asyncExitHook,
   mkSingleton,
   seqid,
-} from '../../core'
+} from '..'
 
 export type ProxyServiceApi = AsyncReturnType<typeof proxyService>
 
diff --git a/packages/pockethost/src/services/RealtimeLog.ts b/packages/pockethost/src/services/RealtimeLog.ts
index d70fa225..80778375 100644
--- a/packages/pockethost/src/services/RealtimeLog.ts
+++ b/packages/pockethost/src/services/RealtimeLog.ts
@@ -7,7 +7,7 @@ import {
   PocketBase,
   SingletonBaseConfig,
   stringify,
-} from '../../core'
+} from '..'
 import { InstanceLogReader } from './InstanceLoggerService'
 import { proxyService } from './ProxyService'