phio 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phio",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A CLI tool to manage your PocketHost instances",
   "repository": {
     "type": "git",
@@ -22,6 +22,7 @@
   "type": "module",
   "types": "src/index.ts",
   "devDependencies": {
+    "@changesets/cli": "^2.27.10",
     "@types/bun": "latest",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^22.5.5",

package/src/commands/DevCommand.ts

@@ -1,5 +1,6 @@
 import { debounce } from '@s-libs/micro-dash'
 import { deploy, excludeDefaults } from '@samkirkland/ftp-deploy'
+import { IFtpDeployArguments } from '@samkirkland/ftp-deploy/src/types'
 import Bottleneck from 'bottleneck'
 import { watch } from 'chokidar'
 import { Command } from 'commander'
@@ -96,7 +97,7 @@ export async function deployMyCode(
   ensureDirSync(cachePath)
 
   console.log('🚚 Deploy started')
-  await deploy({
+  const args: IFtpDeployArguments = {
     server: 'ftp.pockethost.io',
     username: `__auth__`,
     password: config(`auth`)!.token,
@@ -104,7 +105,9 @@ export async function deployMyCode(
     include,
     exclude: [...excludeDefaults, ...exclude],
     'log-level': verbose ? 'verbose' : 'standard',
-  })
+  }
+
+  await deploy(args)
   console.log('🚀 Deploy done!')
 }
 

package/src/commands/LinkCommand.ts

@@ -1,12 +1,14 @@
 import { select } from '@inquirer/prompts'
 import { Command } from 'commander'
 import { config } from '../lib/config'
+import { saveInstanceId } from '../lib/defaultInstanceId'
 import { InstanceFields } from '../lib/InstanceFields'
 import { getClient, getInstanceBySubdomainCnameOrId } from './../lib/getClient'
 
 export const isLinked = () => !!config('instanceId')
 
 export const link = async (instanceNameOrId: string) => {
+  saveInstanceId(instanceNameOrId, 'package.json')
   const instance = await getInstanceBySubdomainCnameOrId(instanceNameOrId)
   if (!instance) {
     return

package/src/commands/LogsCommand.ts

@@ -2,6 +2,7 @@ import { fetchEventSource } from '@sentool/fetch-event-source'
 import { Command } from 'commander'
 import { config } from '../lib/config'
 import { savedInstanceId } from '../lib/defaultInstanceId'
+import { ensureLoggedIn } from './ensureLoggedIn'
 
 export enum StreamNames {
   StdOut = 'stdout',
@@ -13,13 +14,19 @@ export type InstanceLogFields = {
   time: string
   stream: StreamNames
 }
-const watchInstanceLog = (
+
+type Unsubscribe = () => void
+
+const watchInstanceLog = async (
   instanceId: string,
   update: (log: InstanceLogFields) => void,
   nInitial = 100
-): (() => void) => {
+): Promise<Unsubscribe> => {
   const controller = new AbortController()
   const signal = controller.signal
+
+  await ensureLoggedIn()
+
   const continuallyFetchFromEventSource = () => {
     const url = `https://${instanceId}.pockethost.io/logs`
     const body = {
@@ -37,14 +44,13 @@ const watchInstanceLog = (
       body: JSON.stringify(body),
       onmessage: (event: any) => {
         const { data } = event
-
+        if (!data) return
         update(data)
       },
       onopen: async (response: Response) => {
         // console.log(response)
       },
       onerror: (e: Error) => {
-        console.error(`got an error`, e)
         setTimeout(continuallyFetchFromEventSource, 100)
       },
       onclose: () => {
@@ -73,6 +79,8 @@ export const LogsCommand = () => {
         } else {
           console.log(`[${time}] ${message}`)
         }
+      }).catch((e) => {
+        console.error(`Error fetching logs`, e)
       })
     })
 }

package/src/lib/defaultInstanceId.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync } from 'fs'
+import { existsSync, readFileSync, writeFileSync } from 'fs'
 
 export const savedInstanceId = () => {
   if (existsSync('package.json')) {
@@ -15,3 +15,28 @@ export const savedInstanceId = () => {
   }
   return null
 }
+
+export const saveInstanceId = (
+  instanceId: string,
+  file: 'package.json' | 'pockethost.json'
+) => {
+  if (!existsSync(file)) {
+    // Create new file if it doesn't exist
+    const newContent =
+      file === 'package.json' ? { pockethost: { instanceId } } : { instanceId }
+    writeFileSync(file, JSON.stringify(newContent, null, 2))
+    return
+  }
+
+  // Update existing file
+  const content = JSON.parse(readFileSync(file).toString())
+
+  if (file === 'package.json') {
+    content.pockethost = content.pockethost || {}
+    content.pockethost.instanceId = instanceId
+  } else {
+    content.instanceId = instanceId
+  }
+
+  writeFileSync(file, JSON.stringify(content, null, 2))
+}

package/src/lib/ensureLoggedIn.ts

@@ -0,0 +1,18 @@
+import { config } from '../lib/config'
+import { getClient } from '../lib/getClient'
+
+export const ensureLoggedIn = async () => {
+  try {
+    const token = config(`auth`)!.token
+    const client = getClient()
+    client.authStore.loadFromCookie(token)
+    await client.collection(`users`).authRefresh()
+    config(`auth`, {
+      token: client.authStore.exportToCookie(),
+      record: client.authStore.model,
+    })
+  } catch (e) {
+    console.error(`You must be logged in first. Use 'phio login'`)
+    process.exit(1)
+  }
+}

package/src/lib/getClient.ts

@@ -10,7 +10,7 @@ export const getClient = () => {
     client.authStore.loadFromCookie(token)
     // console.log({ valid: client.authStore.isValid })
     client.authStore.onChange((token, record) => {
-      config('auth', { token, record })
+      config('auth', { token: client.authStore.exportToCookie(), record })
     })
   }
   return client