Add cli2 plugin wrapping official cli plugin

.cursor/commands/manage-cli.md

@@ -0,0 +1,5 @@
+Based on `plugins/cli`, you might need to update:
+- `apps/web/content/docs/cli.mdx`
+- `apps/desktop/src-tauri/tauri.conf.json`
+
+Ref: https://v2.tauri.app/plugin/cli

Cargo.toml

@@ -111,6 +111,7 @@ tauri-plugin-updater = "2.9"
 tauri-plugin-analytics = { path = "plugins/analytics" }
 tauri-plugin-apple-calendar = { path = "plugins/apple-calendar" }
 tauri-plugin-auth = { path = "plugins/auth" }
+tauri-plugin-cli2 = { path = "plugins/cli2" }
 tauri-plugin-db = { path = "plugins/db" }
 tauri-plugin-db2 = { path = "plugins/db2" }
 tauri-plugin-detect = { path = "plugins/detect" }
@@ -157,6 +158,7 @@ indoc = "2"
 itertools = "0.14.0"
 lazy_static = "1.5.0"
 once_cell = "1.20.3"
+open = "5"
 regex = "1.11.1"
 schemars = "0.8.21"
 serde = "1"

apps/desktop/package.json

@@ -30,6 +30,7 @@
     "@hypr/codemirror": "workspace:^",
     "@hypr/db": "workspace:*",
     "@hypr/plugin-analytics": "workspace:*",
+    "@hypr/plugin-cli2": "workspace:*",
     "@hypr/plugin-db2": "workspace:*",
     "@hypr/plugin-detect": "workspace:*",
     "@hypr/plugin-hooks": "workspace:*",

apps/desktop/src-tauri/Cargo.toml

@@ -24,6 +24,7 @@ tauri-plugin-analytics = { workspace = true }
 tauri-plugin-auth = { workspace = true }
 tauri-plugin-autostart = { workspace = true }
 tauri-plugin-cli = { workspace = true }
+tauri-plugin-cli2 = { workspace = true }
 tauri-plugin-clipboard-manager = { workspace = true }
 tauri-plugin-db2 = { workspace = true }
 tauri-plugin-deep-link = { workspace = true }

apps/desktop/src-tauri/capabilities/default.json

@@ -75,6 +75,7 @@
     "tray:default",
     "auth:default",
     "analytics:default",
+    "cli2:default",
     "updater:default",
     "deep-link:default",
     "store:default",

apps/desktop/src-tauri/src/lib.rs

@@ -5,7 +5,6 @@ mod store;
 use ext::*;
 use store::*;
 
-use tauri_plugin_cli::CliExt;
 use tauri_plugin_windows::{AppWindow, WindowsPluginExt};
 
 #[tokio::main]
@@ -46,6 +45,7 @@ pub async fn main() {
 
     builder = builder
         .plugin(tauri_plugin_cli::init())
+        .plugin(tauri_plugin_cli2::init())
         .plugin(tauri_plugin_opener::init())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_auth::init())
@@ -90,15 +90,6 @@ pub async fn main() {
         .invoke_handler(specta_builder.invoke_handler())
         .on_window_event(tauri_plugin_windows::on_window_event)
         .setup(move |app| {
-            match app.cli().matches() {
-                Ok(matches) => {
-                    println!("{matches:?}");
-                }
-                Err(error) => {
-                    println!("failed to read CLI matches: {error}");
-                }
-            }
-
             let app_handle = app.handle().clone();
 
             let app_clone = app_handle.clone();

apps/desktop/src-tauri/tauri.conf.json

@@ -52,6 +52,15 @@
     }
   },
   "plugins": {
+    "cli": {
+      "description": "Hyprnote",
+      "args": [],
+      "subcommands": {
+        "hello": {
+          "description": "Open https://hyprnote.com"
+        }
+      }
+    },
     "deep-link": {
       "desktop": {
         "schemes": [

apps/web/content/docs/cli.mdx

@@ -0,0 +1,4 @@
+---
+title: CLI
+description: Learn how to use CLI in Hyprnote
+---

plugins/cli2/.gitignore

@@ -0,0 +1,17 @@
+/.vs
+.DS_Store
+.Thumbs.db
+*.sublime*
+.idea/
+debug.log
+package-lock.json
+.vscode/settings.json
+yarn.lock
+
+/.tauri
+/target
+Cargo.lock
+node_modules/
+
+dist-js
+dist

plugins/cli2/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "tauri-plugin-cli2"
+version = "0.1.0"
+authors = ["You"]
+edition = "2021"
+exclude = ["/js", "/node_modules"]
+links = "tauri-plugin-cli2"
+description = ""
+
+[build-dependencies]
+tauri-plugin = { workspace = true, features = ["build"] }
+
+[dev-dependencies]
+specta-typescript = { workspace = true }
+
+[dependencies]
+tauri = { workspace = true, features = ["test"] }
+tauri-plugin-cli = { workspace = true }
+tauri-specta = { workspace = true, features = ["derive", "typescript"] }
+
+serde = { workspace = true }
+specta = { workspace = true }
+
+open = { workspace = true }
+thiserror = { workspace = true }
+tracing = { workspace = true }

plugins/cli2/build.rs

@@ -0,0 +1,5 @@
+const COMMANDS: &[&str] = &["install_cli", "uninstall_cli", "check_cli_status"];
+
+fn main() {
+    tauri_plugin::Builder::new(COMMANDS).build();
+}

plugins/cli2/js/bindings.gen.ts

@@ -0,0 +1,106 @@
+// @ts-nocheck
+
+
+// This file was generated by [tauri-specta](https://github.com/oscartbeaumont/tauri-specta). Do not edit this file manually.
+
+/** user-defined commands **/
+
+
+export const commands = {
+async installCli() : Promise<Result<null, string>> {
+    try {
+    return { status: "ok", data: await TAURI_INVOKE("plugin:cli2|install_cli") };
+} catch (e) {
+    if(e instanceof Error) throw e;
+    else return { status: "error", error: e  as any };
+}
+},
+async uninstallCli() : Promise<Result<null, string>> {
+    try {
+    return { status: "ok", data: await TAURI_INVOKE("plugin:cli2|uninstall_cli") };
+} catch (e) {
+    if(e instanceof Error) throw e;
+    else return { status: "error", error: e  as any };
+}
+},
+async checkCliStatus() : Promise<Result<CliStatus, string>> {
+    try {
+    return { status: "ok", data: await TAURI_INVOKE("plugin:cli2|check_cli_status") };
+} catch (e) {
+    if(e instanceof Error) throw e;
+    else return { status: "error", error: e  as any };
+}
+}
+}
+
+/** user-defined events **/
+
+
+
+/** user-defined constants **/
+
+
+
+/** user-defined types **/
+
+export type CliStatus = { isInstalled: boolean; symlinkPath: string | null; targetPath: string | null }
+
+/** tauri-specta globals **/
+
+import {
+	invoke as TAURI_INVOKE,
+	Channel as TAURI_CHANNEL,
+} from "@tauri-apps/api/core";
+import * as TAURI_API_EVENT from "@tauri-apps/api/event";
+import { type WebviewWindow as __WebviewWindow__ } from "@tauri-apps/api/webviewWindow";
+
+type __EventObj__<T> = {
+	listen: (
+		cb: TAURI_API_EVENT.EventCallback<T>,
+	) => ReturnType<typeof TAURI_API_EVENT.listen<T>>;
+	once: (
+		cb: TAURI_API_EVENT.EventCallback<T>,
+	) => ReturnType<typeof TAURI_API_EVENT.once<T>>;
+	emit: null extends T
+		? (payload?: T) => ReturnType<typeof TAURI_API_EVENT.emit>
+		: (payload: T) => ReturnType<typeof TAURI_API_EVENT.emit>;
+};
+
+export type Result<T, E> =
+	| { status: "ok"; data: T }
+	| { status: "error"; error: E };
+
+function __makeEvents__<T extends Record<string, any>>(
+	mappings: Record<keyof T, string>,
+) {
+	return new Proxy(
+		{} as unknown as {
+			[K in keyof T]: __EventObj__<T[K]> & {
+				(handle: __WebviewWindow__): __EventObj__<T[K]>;
+			};
+		},
+		{
+			get: (_, event) => {
+				const name = mappings[event as keyof T];
+
+				return new Proxy((() => {}) as any, {
+					apply: (_, __, [window]: [__WebviewWindow__]) => ({
+						listen: (arg: any) => window.listen(name, arg),
+						once: (arg: any) => window.once(name, arg),
+						emit: (arg: any) => window.emit(name, arg),
+					}),
+					get: (_, command: keyof __EventObj__<any>) => {
+						switch (command) {
+							case "listen":
+								return (arg: any) => TAURI_API_EVENT.listen(name, arg);
+							case "once":
+								return (arg: any) => TAURI_API_EVENT.once(name, arg);
+							case "emit":
+								return (arg: any) => TAURI_API_EVENT.emit(name, arg);
+						}
+					},
+				});
+			},
+		},
+	);
+}

plugins/cli2/js/index.ts

@@ -0,0 +1 @@
+export * from "./bindings.gen";

plugins/cli2/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "@hypr/plugin-cli2",
+  "private": true,
+  "main": "./js/index.ts",
+  "scripts": {
+    "codegen": "cargo test -p tauri-plugin-cli2"
+  },
+  "dependencies": {
+    "@tauri-apps/api": "^2.9.0"
+  }
+}

plugins/cli2/permissions/autogenerated/commands/check_cli_status.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-check-cli-status"
+description = "Enables the check_cli_status command without any pre-configured scope."
+commands.allow = ["check_cli_status"]
+
+[[permission]]
+identifier = "deny-check-cli-status"
+description = "Denies the check_cli_status command without any pre-configured scope."
+commands.deny = ["check_cli_status"]

plugins/cli2/permissions/autogenerated/commands/install_cli.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-install-cli"
+description = "Enables the install_cli command without any pre-configured scope."
+commands.allow = ["install_cli"]
+
+[[permission]]
+identifier = "deny-install-cli"
+description = "Denies the install_cli command without any pre-configured scope."
+commands.deny = ["install_cli"]

plugins/cli2/permissions/autogenerated/commands/uninstall_cli.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-uninstall-cli"
+description = "Enables the uninstall_cli command without any pre-configured scope."
+commands.allow = ["uninstall_cli"]
+
+[[permission]]
+identifier = "deny-uninstall-cli"
+description = "Denies the uninstall_cli command without any pre-configured scope."
+commands.deny = ["uninstall_cli"]