pockethost 1.0.0 → 1.2.0

package/CHANGELOG.md

@@ -0,0 +1,25 @@
+# pockethost
+
+## 1.2.0
+
+### Minor Changes
+
+- 72a6c6d: --version now displays version number
+- ac10d1f: Display notification when new pockethost update is available.
+- f9aea10: Debugging info removed from `plugin ls`
+
+### Patch Changes
+
+- 76d57f6: CHANGELOG.md is now published with package.
+- 3783447: plugin-console-logger and plugin-launcher-spawn are now automatically installed.
+
+## 1.1.0
+
+### Minor Changes
+
+- 1695b59: New feature: list plugins (pockethost plugin ls)
+
+### Patch Changes
+
+- 2514c09: Fix: make sure PH_PLUGINS contains only unique values.
+- 1228840: Fixed extra newline when listing configs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pockethost",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "author": {
     "name": "Ben Allfree",
     "url": "https://github.com/benallfree"
@@ -37,7 +37,10 @@
     "tsx": "^4.15.7",
     "type-fest": "^4.6.0",
     "typescript": "^5.4.5",
-    "url-pattern": "^1.0.3"
+    "update-notifier": "^7.0.0",
+    "url-pattern": "^1.0.3",
+    "@pockethost/plugin-console-logger": "^0.0.1",
+    "@pockethost/plugin-launcher-spawn": "^0.0.1"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",
@@ -45,7 +48,10 @@
     "@types/json-stringify-safe": "^5.0.2",
     "@types/node": "^20.8.10",
     "@types/semver": "^7.5.4",
-    "@types/tmp": "^0.2.5"
+    "@types/tmp": "^0.2.5",
+    "@types/update-notifier": "^6.0.8",
+    "@pockethost/plugin-launcher-spawn": "0.0.1",
+    "@pockethost/plugin-console-logger": "0.0.1"
   },
   "scripts": {
     "check-types": "tsc --noEmit ",

package/src/cli/commands/ConfigCommand/index.ts

@@ -71,12 +71,12 @@ export const ConfigCommand = () => {
           const values = _parse()
 
           if (keys(values).length > 0) {
-            info(`\n`)
+            info()
             info(`Config values from ${envFile()}:`)
             forEach(values, (v, k) => {
               info(`\t${k}=${v}`)
             })
-            info(`\n`)
+            info()
           } else {
             info(`No config values found in ${envFile()}`)
           }

package/src/cli/{PluginCommand → commands/PluginCommand}/index.ts

@@ -1,9 +1,10 @@
+import { uniq } from '@s-libs/micro-dash'
 import { Command } from 'commander'
 import { parse } from 'dotenv'
 import { existsSync, readFileSync, writeFileSync } from 'fs'
-import { error, info } from '..'
-import { PH_HOME, PH_PLUGINS, PH_PROJECT_DIR } from '../../constants'
-import { getCompatibleVersions, removePackage } from './util'
+import { error, info } from '../..'
+import { PH_HOME, PH_PLUGINS, PH_PROJECT_DIR } from '../../../constants'
+import { getCompatibleVersions, getPackageJson, removePackage } from './util'
 
 const envFile = () => {
   const envFile = PH_HOME(`.env`)
@@ -33,13 +34,13 @@ export const PluginCommand = () => {
             await getCompatibleVersions(`pockethost`, version, [name])
 
             const values = _parse()
-            values[`PH_PLUGINS`] = [
+            values[`PH_PLUGINS`] = uniq([
               ...(values[`PH_PLUGINS`]
                 ?.split(/,/)
                 .map((v) => v.trim())
                 .filter((v) => !!v) || []),
               name,
-            ].join(`,`)
+            ]).join(`,`)
             writeFileSync(
               envFile(),
               Object.entries(values)
@@ -54,6 +55,22 @@ export const PluginCommand = () => {
         }),
     )
 
+    .addCommand(
+      new Command(`list`)
+        .alias(`ls`)
+        .description(`List plugins`)
+        .action(async (name: string) => {
+          try {
+            for (const plugin of PH_PLUGINS()) {
+              const pkg = await getPackageJson(plugin)
+              info(`${plugin}@${pkg.version} - ${pkg?.description}`)
+            }
+          } catch (e) {
+            error(`${e}`)
+          }
+        }),
+    )
+
     .addCommand(
       new Command(`remove`)
         .alias(`rm`)
@@ -65,12 +82,12 @@ export const PluginCommand = () => {
           try {
             await removePackage(name)
             const values = _parse()
-            values[`PH_PLUGINS`] = [
+            values[`PH_PLUGINS`] = uniq([
               ...(values[`PH_PLUGINS`]
                 ?.split(/,/)
                 .map((v) => v.trim())
                 .filter((v) => v !== name) || []),
-            ].join(`,`)
+            ]).join(`,`)
             writeFileSync(
               envFile(),
               Object.entries(values)
@@ -84,6 +101,7 @@ export const PluginCommand = () => {
           }
         }),
     )
+
     .addCommand(
       new Command(`update`)
         .alias(`up`)

package/src/cli/{PluginCommand → commands/PluginCommand}/util.ts

@@ -9,7 +9,7 @@ import util from 'util'
 const execPromise = util.promisify(exec)
 const require = createRequire(import.meta.url)
 
-async function getPackageJson(packageName: string): Promise<any | null> {
+export async function getPackageJson(packageName: string): Promise<any | null> {
   try {
     const packageJsonPath = require.resolve(`${packageName}/package.json`)
     const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'))
@@ -19,7 +19,9 @@ async function getPackageJson(packageName: string): Promise<any | null> {
   }
 }
 
-async function fetchPackageData(packageName: string): Promise<any | null> {
+export async function fetchPackageData(
+  packageName: string,
+): Promise<any | null> {
   const npmRegistryUrl = `https://registry.npmjs.org/${packageName}`
   try {
     const response = await fetch(npmRegistryUrl)

package/src/cli/index.ts

@@ -1,17 +1,21 @@
 #!/usr/bin/env tsx
 
+import { uniq } from '@s-libs/micro-dash'
 import { Command, program } from 'commander'
+import { readFileSync } from 'fs'
+import updateNotifier from 'update-notifier'
 import {
   DEBUG,
   LogLevelName,
   LoggerService,
   PH_PLUGINS,
+  PH_PROJECT_DIR,
   PocketHostFilter,
   filter,
   loadPlugins,
 } from '../../core'
-import { PluginCommand } from './PluginCommand'
 import { ConfigCommand } from './commands/ConfigCommand'
+import { PluginCommand } from './commands/PluginCommand'
 import { ServeCommand } from './commands/ServeCommand'
 
 export const { dbg, info, error } = LoggerService({
@@ -19,9 +23,18 @@ export const { dbg, info, error } = LoggerService({
 })
 
 export const main = async () => {
-  await loadPlugins(PH_PLUGINS())
+  await loadPlugins(uniq(PH_PLUGINS()))
+  const pkg = await JSON.parse(
+    readFileSync(PH_PROJECT_DIR(`package.json`), 'utf8').toString(),
+  )
+  updateNotifier({ pkg }).notify()
 
-  program.name('pockethost').description('Multitenant PocketBase hosting')
+  const { version } = pkg
+
+  program
+    .name('pockethost')
+    .description('Multitenant PocketBase hosting')
+    .version(version)
 
   const commands = await filter<Command[]>(PocketHostFilter.Core_CliCommands, [
     ServeCommand(),