pockethost 1.0.0 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pockethost",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "author": {
     "name": "Ben Allfree",
     "url": "https://github.com/benallfree"

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,23 @@ 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)
+              console.log({ pkg })
+              info(`${plugin}@${pkg.version} - ${pkg?.description}`)
+            }
+          } catch (e) {
+            error(`${e}`)
+          }
+        }),
+    )
+
     .addCommand(
       new Command(`remove`)
         .alias(`rm`)
@@ -65,12 +83,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 +102,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,5 +1,6 @@
 #!/usr/bin/env tsx
 
+import { uniq } from '@s-libs/micro-dash'
 import { Command, program } from 'commander'
 import {
   DEBUG,
@@ -10,8 +11,8 @@ import {
   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,7 +20,7 @@ export const { dbg, info, error } = LoggerService({
 })
 
 export const main = async () => {
-  await loadPlugins(PH_PLUGINS())
+  await loadPlugins(uniq(PH_PLUGINS()))
 
   program.name('pockethost').description('Multitenant PocketBase hosting')