phio 0.0.2 → 0.1.1

package/README.md

@@ -4,6 +4,13 @@
 
 ```bash
 bunx phio login
+bunx phio whoami
+```
+
+**List instances**
+
+```bash
+bunx phio list
 ```
 
 **Watch and push local changes instantly**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phio",
-  "version": "0.0.2",
+  "version": "0.1.1",
   "description": "A CLI tool to manage your PocketHost instances",
   "repository": {
     "type": "git",
@@ -22,7 +22,8 @@
   "devDependencies": {
     "@types/bun": "latest",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.5.5"
+    "@types/node": "^22.5.5",
+    "prettier-plugin-organize-imports": "^4.0.0"
   },
   "peerDependencies": {
     "typescript": "^5.6.2"
@@ -39,8 +40,9 @@
   "dependencies": {
     "@inquirer/prompts": "^5.5.0",
     "@s-libs/micro-dash": "^18.0.0",
-    "@samkirkland/ftp-deploy": "^1.2.4",
+    "@samkirkland/ftp-deploy": "github:benallfree/ftp-deploy#glob",
     "@sentool/fetch-event-source": "^0.5.0",
+    "bottleneck": "^2.19.5",
     "chokidar": "^4.0.0",
     "commander": "^12.1.0",
     "email-validator": "^2.0.4",
@@ -48,8 +50,17 @@
     "env-var": "^7.5.0",
     "event-stream": "^4.0.1",
     "fs-extra": "^11.2.0",
+    "multimatch": "^7.0.0",
     "ora": "^8.1.0",
     "pocketbase": "^0.21.5",
     "tsx": "^4.19.1"
+  },
+  "prettier": {
+    "semi": false,
+    "singleQuote": true,
+    "trailingComma": "es5",
+    "plugins": [
+      "prettier-plugin-organize-imports"
+    ]
   }
 }

package/src/commands/DevCommand.ts

@@ -0,0 +1,108 @@
+import { debounce } from '@s-libs/micro-dash'
+import { deploy, excludeDefaults } from '@samkirkland/ftp-deploy'
+import Bottleneck from 'bottleneck'
+import { watch } from 'chokidar'
+import { Command } from 'commander'
+import { ensureDirSync } from 'fs-extra'
+import multimatch from 'multimatch'
+import { config } from '../lib/config'
+import { getInstanceBySubdomainCnameOrId } from '../lib/getClient'
+import { defaultInstanceId } from './../lib/defaultInstanceId'
+
+async function deployMyCode(
+  instanceName: string,
+  include: string[],
+  exclude: string[]
+) {
+  const cachePath = '.cache'
+  ensureDirSync(cachePath)
+
+  console.log('🚚 Deploy started')
+  await deploy({
+    server: 'ftp.pockethost.io',
+    username: `__auth__`,
+    password: config(`auth`)!.token,
+    'server-dir': `${instanceName}/`,
+    include,
+    exclude: [...excludeDefaults, ...exclude],
+    'state-name': '.cache/.ftp-deploy-sync-state.json',
+    'log-level': 'verbose',
+  })
+  console.log('🚀 Deploy done!')
+}
+
+export const DevCommand = () => {
+  return new Command('dev')
+    .argument(`[instanceId]`, `Instance name`, defaultInstanceId())
+    .description(`Watch for local modifications and sync to remote`)
+    .option(
+      '-i, --include <include...>',
+      'Files to include in the sync',
+      (val, prev) => [...prev, val],
+      [
+        `pb_*`,
+        'pb_*/**/*',
+        `package.json`,
+        `bun.lockb`,
+        `patches`,
+        `patches/**/*`,
+      ]
+    )
+    .option(
+      '-e, --exclude <exclude...>',
+      'Files to exclude from the sync',
+      (val, prev) => [...prev, val],
+      [`pb_data`, `pb_data/**/*`]
+    )
+    .action(async (_instanceId, { include, exclude }) => {
+      if (!_instanceId) {
+        console.error(
+          `No instance name provided and none was found in package.json or pockethost.json. Use 'phio link <instance>'`
+        )
+        process.exit(1)
+      }
+      console.log(`Dev mode`)
+      console.log({ include, exclude })
+
+      const instance = await getInstanceBySubdomainCnameOrId(_instanceId)
+
+      const limiter = new Bottleneck({ maxConcurrent: 1 })
+      const upload = debounce(
+        () =>
+          limiter.schedule(() =>
+            deployMyCode(instance.subdomain, include, exclude).catch(
+              console.error
+            )
+          ),
+        200
+      )
+
+      const watcher = watch('.', {
+        persistent: true,
+        ignored: (file) => {
+          if (file === '.') return false
+          const isIncluded = multimatch([file], include).length > 0
+          const isExcluded = multimatch([file], exclude).length > 0
+          const isIgnored = !isIncluded || isExcluded
+          console.log({
+            file,
+            include,
+            isIncluded,
+            exclude,
+            isExcluded,
+            isIgnored,
+          })
+          return isIgnored
+        },
+      })
+      console.log(
+        `Watching for changes in ${include.join(', ')} and excluding ${exclude.join(', ')}`
+      )
+      const handle = (path: string, details: any) => {
+        upload()
+        // internal
+        console.log(`Syncing ${path}`)
+      }
+      watcher.on('add', handle).on('change', handle).on('unlink', handle)
+    })
+}

package/src/commands/LinkCommand.ts

@@ -0,0 +1,21 @@
+import { Command } from 'commander'
+import { readJSONSync, writeJSONSync } from 'fs-extra/esm'
+import { getInstanceBySubdomainCnameOrId } from './../lib/getClient'
+
+export const LinkCommand = () => {
+  return new Command(`link`)
+    .argument(`<instance>`, `Instance name or ID`)
+    .description(`Link a local directory to a remote instance`)
+    .action(async (_anyName) => {
+      const instance = await getInstanceBySubdomainCnameOrId(_anyName)
+      if (!instance) {
+        console.error(`Instance not found`)
+        process.exit(1)
+      }
+      console.log(`Instance found: ${instance.subdomain}`)
+      const pkg = readJSONSync(`package.json`)
+      pkg.pockethost = { instanceId: instance.subdomain }
+      console.log(`Writing to package.json`)
+      writeJSONSync(`package.json`, pkg, { spaces: 2 })
+    })
+}

package/src/commands/ListCommand.ts

@@ -0,0 +1,21 @@
+import { Command } from 'commander'
+import { getClient } from './../lib/getClient'
+import { InstanceFields } from './../lib/InstanceFields'
+
+export const ListCommand = () => {
+  return new Command(`list`)
+    .description(`List all the logs`)
+    .action(async () => {
+      const client = getClient()
+      const instances = await client
+        .collection(`instances`)
+        .getFullList<InstanceFields>()
+      instances.forEach((instance) => {
+        console.log(
+          `- ${instance.subdomain} (${instance.id}) ${
+            instance.cname ? `(${instance.cname})` : ''
+          } (${instance.status.toUpperCase()})`
+        )
+      })
+    })
+}

package/src/{LoginCommand.ts → commands/LoginCommand.ts}

@@ -1,10 +1,9 @@
 import { input, password } from '@inquirer/prompts'
 import { Command } from 'commander'
 import * as EmailValidator from 'email-validator'
-//@ts-ignore
-import { runTasks } from './Task'
-import { config } from './config'
-import { getClient } from './getClient'
+import { config } from '../lib/config'
+import { getClient } from './../lib/getClient'
+import { runTasks } from './../lib/Task'
 
 export const LoginCommand = () =>
   new Command('login')
@@ -38,7 +37,6 @@ export const LoginCommand = () =>
                 const res = await client
                   .collection('users')
                   .authWithPassword(email, pw)
-                console.log({ res })
               },
             },
           ])

package/src/{LogsCommand.ts → commands/LogsCommand.ts}

@@ -1,7 +1,7 @@
-import { Command } from 'commander'
-import { config } from './config'
-//@ts-ignore
 import { fetchEventSource } from '@sentool/fetch-event-source'
+import { Command } from 'commander'
+import { config } from '../lib/config'
+import { defaultInstanceId } from '../lib/defaultInstanceId'
 
 export enum StreamNames {
   StdOut = 'stdout',
@@ -45,6 +45,7 @@ const watchInstanceLog = (
       },
       onerror: (e: Error) => {
         console.error(`got an error`, e)
+        setTimeout(continuallyFetchFromEventSource, 100)
       },
       onclose: () => {
         console.log(`closed`)
@@ -63,7 +64,7 @@ const watchInstanceLog = (
 export const LogsCommand = () => {
   return new Command('logs')
     .description(`Tail instance logs`)
-    .argument('<instance>', 'Instance ID')
+    .argument('[instance]', 'Instance ID', defaultInstanceId())
     .action((instance) => {
       watchInstanceLog(instance, (log) => {
         const { time, message, stream } = log

package/src/commands/WhoAmICommand.ts

@@ -0,0 +1,15 @@
+import { Command } from 'commander'
+import { config } from '../lib/config'
+
+export const WhoAmICommand = () => {
+  return new Command(`whoami`)
+    .description(`Show the current user`)
+    .action(() => {
+      const email = config(`email`)
+      if (email) {
+        console.log(`Current user is: ${email}`)
+        return
+      }
+      console.log(`No user is currently logged in`)
+    })
+}

package/src/global.d.ts

@@ -1,6 +1,3 @@
-declare module 'fs-extra/esm' {
-  function readJSONSync(path: string): any
-  function writeJSONSync(path: string, data: any): void
-  function ensureDirSync(path: string): void
-  export { readJSONSync, writeJSONSync, ensureDirSync }
+declare module '@sentool/fetch-event-source' {
+  export function fetchEventSource(url: string, options: any): void
 }

package/src/index.ts

@@ -1,9 +1,12 @@
 #!/usr/bin/env tsx
 import { program } from 'commander'
-import { LoginCommand } from './LoginCommand'
 import { version } from '../package.json'
-import { LogsCommand } from './LogsCommand'
-import { DevCommand } from './DevCommand'
+import { DevCommand } from './commands/DevCommand'
+import { LinkCommand } from './commands/LinkCommand'
+import { ListCommand } from './commands/ListCommand'
+import { LoginCommand } from './commands/LoginCommand'
+import { LogsCommand } from './commands/LogsCommand'
+import { WhoAmICommand } from './commands/WhoAmICommand'
 
 program
   .name(`PocketHost CLI`)
@@ -12,5 +15,8 @@ program
   .addCommand(LoginCommand())
   .addCommand(LogsCommand())
   .addCommand(DevCommand())
+  .addCommand(WhoAmICommand())
+  .addCommand(ListCommand())
+  .addCommand(LinkCommand())
 
 program.parseAsync(process.argv).catch(console.error)

package/src/lib/InstanceFields.ts

@@ -0,0 +1,6 @@
+export type InstanceFields = {
+  id: string
+  subdomain: string
+  cname: string
+  status: string
+}

package/src/{getClient.ts → lib/getClient.ts}

@@ -15,3 +15,12 @@ export const getClient = () => {
   }
   return client
 }
+
+export const getInstanceBySubdomainCnameOrId = async (search: string) => {
+  const client = getClient()
+  return await client
+    .collection(`instances`)
+    .getFirstListItem(
+      `id='${search}' || subdomain='${search}' || cname='${search}'`
+    )
+}

package/src/DevCommand.ts

@@ -1,67 +0,0 @@
-import { Command } from 'commander'
-import { config } from './config'
-import { deploy, excludeDefaults } from '@samkirkland/ftp-deploy'
-import { getClient } from './getClient'
-import { ensureDirSync } from 'fs-extra'
-import { defaultInstanceId } from './defaultInstanceId'
-import { watch } from 'chokidar'
-import { file } from 'bun'
-import { basename, dirname } from 'path'
-import { debounce } from '@s-libs/micro-dash'
-
-async function deployMyCode(instanceName: string) {
-  const cachePath = '.cache'
-  ensureDirSync(cachePath)
-
-  console.log('🚚 Deploy started')
-  await deploy({
-    server: 'ftp.pockethost.io',
-    username: `__auth__`,
-    password: config(`auth`)!.token,
-    'server-dir': `${instanceName}/`,
-    exclude: ['*', '!pb_*/**/*'],
-    'state-name': '.cache/.ftp-deploy-sync-state.json',
-    'log-level': 'verbose',
-  })
-  console.log('🚀 Deploy done!')
-}
-
-export const DevCommand = () => {
-  return new Command('dev')
-    .argument(`[instanceId]`, `Instance name`, defaultInstanceId())
-    .description(`Watch for local modifications and sync to remote`)
-    .action(async (_instanceId) => {
-      if (!_instanceId) {
-        console.error(
-          'No instance name provided and none was found in package.json or pockethost.json'
-        )
-        process.exit(1)
-      }
-
-      const client = getClient()
-
-      const instance = await client
-        .collection(`instances`)
-        .getFirstListItem(`id='${_instanceId}' || subdomain='${_instanceId}'`)
-
-      const upload = debounce(() => {
-        deployMyCode(instance.subdomain).catch(console.error)
-      }, 200)
-
-      const watcher = watch(['.'], {
-        persistent: true,
-        ignored: (file) => {
-          const isIgnored = file !== '.' && !file.startsWith('pb_')
-          // console.log({ file, isIgnored })
-          return isIgnored
-        },
-      })
-      console.log(`Watching for changes in pb_*/**/*`)
-      const handle = (path: string, details: any) => {
-        upload()
-        // internal
-        console.log({ path, details })
-      }
-      watcher.on('add', handle).on('change', handle).on('unlink', handle)
-    })
-}