fix: cli encoding issue

screenpipe-js/cli/package.json

@@ -13,8 +13,7 @@
     "dev": "bun run src/index.ts"
   },
   "dependencies": {
-    "@drizzle-team/brocli": "^0.11.0",
-    "@screenpipe/browser": "^0.1.24",
+    "@screenpipe/browser": "^0.1.26",
     "@screenpipe/js": "^1.0.7",
     "archiver": "^7.0.1",
     "chalk": "^5.4.1",
@@ -24,16 +23,16 @@
     "fs-extra": "^11.3.0",
     "ignore": "^7.0.3",
     "inquirer": "^12.3.2",
-    "kleur": "^4.1.5",
+    "lodash": "^4.17.21",
     "ora": "^8.1.1",
-    "prompts": "^2.4.2",
     "simple-git": "^3.27.0",
     "unzip-stream": "^0.3.4",
     "zod": "^3.24.1"
   },
   "devDependencies": {
     "@types/archiver": "^6.0.3",
     "@types/fs-extra": "^11.0.4",
+    "@types/lodash": "^4.17.15",
     "@types/node": "^20.11.5",
     "@types/prompts": "^2.4.9",
     "@types/unzip-stream": "^0.3.4",

screenpipe-js/cli/src/commands/app/create.ts

@@ -0,0 +1,80 @@
+#!/usr/bin/env node
+import { input } from "@inquirer/prompts"; // Import select from inquirer prompts
+import { Command } from "commander";
+import inquirer from "inquirer";
+import simpleGit from "simple-git";
+import { logger, spinner } from "../components/commands/add/utils/logger";
+import { handleError } from "../components/commands/add/utils/handle-error";
+
+const TEMPLATE_REPOS = {
+  electron: "https://github.com/neo773/screenpipe-electron",
+  tauri: "https://github.com/LorenzoBloedow/screenpipe-tauri-template-dev",
+};
+
+export const createAppCommand = new Command()
+  .name("create")
+  .description("create a new desktop app project")
+  .option(
+    "-a, --name <name>",
+    "the name of your app (optional)",
+  )
+  .option(
+    "-t, --appType <type>",
+    "the type of desktop app (electron or tauri)",
+  )
+  .action(async (options) => {
+    let { name, appType } = options;
+
+    if (!appType) {
+      let { appTypePrompt } = await inquirer.prompt({
+        name: "appTypePrompt",
+        type: "select",
+        message: "what type of desktop app would you like to create?",
+        choices: [
+          { name: "electron", value: "electron"},
+          { name: "tauri", value: "tauri"}
+        ],
+        default: "tauri"
+      });
+
+      appType = appTypePrompt
+    }
+
+
+    if (!name || name.length === 0) {
+      name = await input({
+        message: "What is your project name?",
+        default: "my-desktop-app",
+        validate: (input) => {
+          if (input.trim().length === 0) return "project name is required.";
+          return true;
+        },
+      });
+    }
+
+    const loadingSpinner = spinner("creating your desktop app...");
+
+    try {
+      loadingSpinner.start();
+
+      await simpleGit().clone(TEMPLATE_REPOS[appType as "electron" | "tauri"], name);
+      loadingSpinner.succeed("Project created successfully! 🎉");
+
+      logger.info("\ncredits to the template authors:");
+      if (appType === "electron") {
+        logger.info("electron template by: Neo @ https://github.com/neo773");
+      } else {
+        logger.info("tauri template by: Lorenzo @ https://github.com/LorenzoBloedow");
+      }
+
+      logger.info("\nto get started:");
+      logger.info(`cd ${name}`);
+      logger.info("npm install     # or bun install, pnpm install, yarn");
+      logger.info("npm run dev     # or bun dev, pnpm dev, yarn dev");
+
+      logger.info("\nwhen you're ready, you can deploy your app following the documentation for the respective framework.\n");
+    } catch (error) {
+      loadingSpinner.fail("failed to create project");
+      handleError(error instanceof Error ? error.message : String(error));
+    }
+  });

screenpipe-js/cli/src/commands/app/index.ts

@@ -0,0 +1,8 @@
+import { Command } from "commander";
+import { createAppCommand } from "./create";
+
+export const appCommands = new Command()
+  .name("app")
+  .description("create a new screenpipe application using default templates")
+
+appCommands.addCommand(createAppCommand)

screenpipe-js/cli/src/commands/components/commands/add/add.ts

@@ -1,61 +1,42 @@
-import {
-  boolean,
-  command,
-  GenericCommandHandler,
-  OutputType,
-  positional,
-  string,
-} from "@drizzle-team/brocli";
 import { logger } from "./utils/logger";
 import { ERRORS, handleError } from "./utils/handle-error";
 import { promptForRegistryComponents } from "./utils/prompt-for-component";
 import { preFlightAdd } from "./preflights/preflight-add";
 import { addComponents } from "./utils/add-components";
+import { Command } from "commander";
 
-export const addComponentCommand = command({
-  name: "add",
-  desc: "add components and dependencies to your pipe",
-  options: {
-    components: positional().desc("list of components by name"),
-    path: string().desc("the path to add the component to."),
-    silent: boolean().desc("mute output.").default(false),
-    overwrite: boolean().desc("overwrite existing files.").default(false),
-    cwd: string()
-      .desc("the working directory. defaults to the current directory.")
-      .default(process.cwd()),
-  },
-  handler: async (opts) => {
+export const addComponentCommand = new Command()
+  .name("add")
+  .description("add components and dependencies to your pipe")
+  .argument('[components...]', 'List of components by name')
+  .option('--path <path>', 'The path to add the component to.')
+  .option('--silent', 'Mute output.', false)
+  .option('--overwrite', 'Overwrite existing files.', false)
+  .option('--cwd <cwd>', 'The working directory. Defaults to the current directory.', process.cwd())
+  .action(async (comps, opts) => {
     try {
-      let components;
+      let components
 
       // If there are no components, ask the user which ones they want.
-      if (!opts?.components?.length) {
-        components = await promptForRegistryComponents();
+      if (!comps?.length) {
+        components = await promptForRegistryComponents()
       } else {
-        components = [opts.components];
+        components = [comps]
       }
 
       // Before addig check a few things
-      const result = await preFlightAdd(opts.cwd);
+      const result = preFlightAdd(opts.cwd)
 
       // If the current directory is not a pipe, create one
       if (result?.errors[ERRORS.MISSING_DIR_OR_EMPTY_PIPE]) {
-        logger.warn(
-          "you need to create a pipe first. run bunx @screenpipe/dev@latest create or visit https://docs.screenpi.pe/docs/plugins for more information."
-        );
-        process.exit(1);
-        // await createPipe(options)
+        logger.warn('you need to create a pipe first. run bunx @screenpipe/dev create or visit https://docs.screenpi.pe/docs/plugins for more information.')
+        process.exit(1)
       }
 
       // Add components to the directory
-      await addComponents(components, {
-        silent: opts.silent,
-        cwd: opts.cwd,
-        overwrite: opts.overwrite,
-      });
+      await addComponents(components, {silent: opts.silent, cwd: opts.cwd, overwrite: opts.overwrite})
     } catch (error) {
-      logger.break();
-      handleError(error);
+      logger.break()
+      handleError(error)
     }
-  },
-});
+  })

screenpipe-js/cli/src/commands/components/commands/add/preflights/preflight-add.ts

@@ -1,9 +1,8 @@
 import fs from 'fs';
 import path from 'path';
-import { z } from 'zod';
 import { ERRORS } from '../utils/handle-error';
 
-export async function preFlightAdd(cwd: string) {
+export function preFlightAdd(cwd: string) {
   const errors: Record<string, boolean> = {}
 
   // Ensure target directory exists.

screenpipe-js/cli/src/commands/components/commands/add/registry/api.ts

@@ -4,23 +4,23 @@ import { registryResolvedComponentsTreeSchema, RegistrySchema, registrySchema }
 import registry from "./registry.json";
 import deepmerge from "deepmerge";
 
-export async function getRegistry() {
+export function getRegistry() {
     try {
       const parsedRegistry = registrySchema.parse(registry)
       return parsedRegistry
     } catch (error) {
-      logger.error("\n")
+      logger.break()
       handleError(error)
     }
 }
 
-async function resolveRegistryItems(names: string[]) {
+function resolveRegistryItems(names: string[]) {
   let registryDependencies: RegistrySchema = {}
-  const registry = await getRegistry()
+  const registry = getRegistry()
   if(!registry) return
 
   for (const name of names) {
-    const itemRegistryDependencies = await resolveRegistryDependencies(
+    const itemRegistryDependencies = resolveRegistryDependencies(
       name,
       registry
     )
@@ -34,75 +34,66 @@ async function resolveRegistryItems(names: string[]) {
   return registryDependencies
 }
 
-async function resolveRegistryDependencies(
+function resolveRegistryDependencies(
   name: string,
   registry: RegistrySchema
-): Promise<RegistrySchema> {
+): RegistrySchema {
   const components: RegistrySchema = {}
 
 
-  async function resolveDependencies(componentName: string) {
-    try {
+  function resolveDependencies(componentName: string) {
       if (registry[componentName]) {
         components[componentName] = registry[componentName]
       } else {
-        throw Error(componentName)
+        logger.break()
+        handleError(
+          `Component ${componentName} not found.`,
+        )
       }
 
       if (registry[componentName].registryDependencies) {
         for (const dependency of registry[componentName].registryDependencies) {
-          await resolveDependencies(dependency)
+          resolveDependencies(dependency)
         }
       }
-    } catch (error: any) {
-      console.error(
-        `Component ${error.message} not found.`,
-        error
-      )
-    }
   }
 
-  await resolveDependencies(name)
+  resolveDependencies(name)
   return components
 }
 
-export async function registryResolveItemsTree(
+export function registryResolveItemsTree(
   names: RegistrySchema['']["name"][],
 ) {
-  try {
-    let relevantItemsRegistry = await resolveRegistryItems(names)
-    const payload = registrySchema.parse(relevantItemsRegistry)
+  let relevantItemsRegistry = resolveRegistryItems(names)
+  const payload = registrySchema.parse(relevantItemsRegistry)
 
-    if (!payload) {
-      return null
-    }
+  if (!payload) {
+    return null
+  }
 
-    const componentArray = Object.values(payload)
+  const componentArray = Object.values(payload)
 
-    let docs = ""
-    componentArray.forEach((item) => {
-      if (item.docs) {
-        docs += `${item.docs}\n`
-      }
-    })
+  let docs = ""
+  componentArray.forEach((item) => {
+    if (item.docs) {
+      docs += `${item.docs}\n`
+    }
+  })
 
-    return registryResolvedComponentsTreeSchema.parse({
-      dependencies: deepmerge.all(
-        componentArray.map((item) => item.dependencies ?? [])
-      ),
-      devDependencies: deepmerge.all(
-        componentArray.map((item) => item.devDependencies ?? [])
-      ),
-      files: componentArray.map((item) => {
-        return {
-          src: item.src, 
-          target: item.target
-        }
-      }),
-      docs,
-    })
-  } catch (error) {
-    handleError(error)
-    return null
-  }
+  return registryResolvedComponentsTreeSchema.parse({
+    dependencies: deepmerge.all(
+      componentArray.map((item) => item.dependencies ?? [])
+    ),
+    devDependencies: deepmerge.all(
+      componentArray.map((item) => item.devDependencies ?? [])
+    ),
+    files: componentArray.map((item) => {
+      return {
+        src: item.src, 
+        target: item.target
+      }
+    }),
+    docs,
+  })
 }

screenpipe-js/cli/src/commands/components/commands/add/registry/registry.json

@@ -71,7 +71,7 @@
     "dependencies": [
       "@screenpipe/browser"
     ],
-    "devDependencies": [],
-    "registryDependencies": []
+    "registryDependencies": [],
+    "devDependencies": []
   }
 }

screenpipe-js/cli/src/commands/components/commands/add/utils/add-components.ts

@@ -16,7 +16,7 @@ export async function addComponents(
       silent: options.silent,
     })?.start()
 
-    const tree = await registryResolveItemsTree(components)
+    const tree = registryResolveItemsTree(components)
 
     if (!tree) {
       registrySpinner?.fail()