other path2 migrations (#2493)

Author: yujonglee

.github/actions/desktop-e2e-linux/action.yml

@@ -40,7 +40,7 @@ runs:
       id: e2e-test
       run: |
         # Run tests and capture output to log file
-        pnpm -F e2e-blackbox test 2>&1 | tee "${{ env.E2E_LOGS_DIR }}/e2e-test-output.log"
+        pnpm -F e2e-blackbox e2e 2>&1 | tee "${{ env.E2E_LOGS_DIR }}/e2e-test-output.log"
         exit ${PIPESTATUS[0]}
       env:
         APP_BINARY_PATH: ${{ env.APP_BINARY_PATH }}

Cargo.lock

@@ -5,8 +5,10 @@ import { SCHEMA, type Schemas } from "@hypr/store";
 
 import { createLocalPersister2 } from "./localPersister2";
 
-vi.mock("@tauri-apps/api/path", () => ({
-  appDataDir: vi.fn().mockResolvedValue("/mock/data/dir/"),
+vi.mock("@hypr/plugin-path2", () => ({
+  commands: {
+    base: vi.fn().mockResolvedValue("/mock/data/dir/"),
+  },
 }));
 
 vi.mock("@tauri-apps/plugin-fs", () => ({

apps/desktop/src/store/tinybase/localPersister2.test.ts

@@ -1,9 +1,9 @@
-import { appDataDir } from "@tauri-apps/api/path";
 import { exists, mkdir } from "@tauri-apps/plugin-fs";
 import { createCustomPersister } from "tinybase/persisters/with-schemas";
 import type { MergeableStore, OptionalSchemas } from "tinybase/with-schemas";
 
 import { commands, type JsonValue } from "@hypr/plugin-export";
+import { commands as path2Commands } from "@hypr/plugin-path2";
 import { type EnhancedNote, type Session } from "@hypr/store";
 import { isValidTiptapContent } from "@hypr/tiptap/shared";
 
@@ -28,7 +28,7 @@ export function createLocalPersister2<Schemas extends OptionalSchemas>(
       const batchItems: [JsonValue, string][] = [];
       const dirsToCreate = new Set<string>();
 
-      const dataDir = await appDataDir();
+      const dataDir = await path2Commands.base();
 
       for (const [id, row] of Object.entries(tables?.enhanced_notes ?? {})) {
         // @ts-ignore

apps/desktop/src/store/tinybase/localPersister2.ts

@@ -1,5 +1,4 @@
 import { getIdentifier } from "@tauri-apps/api/app";
-import { appDataDir } from "@tauri-apps/api/path";
 import { Effect, Exit } from "effect";
 import { create as mutate } from "mutative";
 import type { StoreApi } from "zustand";
@@ -18,6 +17,7 @@ import {
   commands as listener2Commands,
   events as listener2Events,
 } from "@hypr/plugin-listener2";
+import { commands as path2Commands } from "@hypr/plugin-path2";
 
 import { fromResult } from "../../../effect";
 import type { BatchActions, BatchState } from "./batch";
@@ -205,7 +205,7 @@ export const createGeneralSlice = <
       const [dataDirPath, micUsingApps, bundleId] = yield* Effect.tryPromise({
         try: () =>
           Promise.all([
-            appDataDir(),
+            path2Commands.base(),
             detectCommands
               .listMicUsingApplications()
               .then((r) =>
@@ -291,8 +291,8 @@ export const createGeneralSlice = <
         onSuccess: () => {
           if (sessionId) {
             void Promise.all([
-              appDataDir(),
-              getIdentifier().catch(() => "com.hyprnote.app"),
+              path2Commands.base(),
+              getIdentifier().catch(() => "com.hyprnote.stable"),
             ])
               .then(([dataDirPath, bundleId]) => {
                 const sessionPath = `${dataDirPath}/hyprnote/sessions/${sessionId}`;

apps/desktop/src/store/zustand/listener/general.ts

@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "test": "wdio run wdio.blackbox.conf.ts"
+    "e2e": "wdio run wdio.blackbox.conf.ts"
   },
   "devDependencies": {
     "@wdio/cli": "^9.21.1",

e2e/blackbox/package.json

@@ -17,6 +17,8 @@ tokio = { workspace = true, features = ["macros", "rt"] }
 hypr-docs = { workspace = true }
 
 [dependencies]
+tauri-plugin-path2 = { workspace = true }
+
 tauri = { workspace = true, features = ["test"] }
 tauri-specta = { workspace = true, features = ["derive", "typescript"] }
 
@@ -30,5 +32,3 @@ futures-util = { workspace = true }
 shellexpand = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["process", "time"] }
-
-tauri-plugin-path2 = { path = "../path2" }

plugins/hooks/Cargo.toml

@@ -14,6 +14,8 @@ tauri-plugin = { workspace = true, features = ["build"] }
 specta-typescript = { workspace = true }
 
 [dependencies]
+tauri-plugin-path2 = { workspace = true }
+
 hypr-audio-utils = { workspace = true }
 hypr-language = { workspace = true }
 
@@ -36,5 +38,3 @@ tokio-stream = { workspace = true }
 tracing = { workspace = true }
 
 aspasia = "0.2.1"
-
-tauri-plugin-path2 = { path = "../path2" }

plugins/listener2/Cargo.toml

@@ -16,12 +16,14 @@ indoc = { workspace = true }
 specta-typescript = { workspace = true }
 
 [dependencies]
+tauri-plugin-opener = { workspace = true }
+tauri-plugin-path2 = { workspace = true }
+
 hypr-audio-utils = { workspace = true }
 hypr-buffer = { workspace = true }
 hypr-host = { workspace = true }
 
 tauri = { workspace = true, features = ["test"] }
-tauri-plugin-opener = { workspace = true }
 tauri-specta = { workspace = true, features = ["derive", "typescript"] }
 
 dirs = { workspace = true }
@@ -31,5 +33,3 @@ rodio = { workspace = true, features = ["wav"] }
 specta = { workspace = true }
 sysinfo = { workspace = true }
 thiserror = { workspace = true }
-
-tauri-plugin-path2 = { path = "../path2" }

plugins/misc/Cargo.toml

@@ -6,13 +6,8 @@
 
 
 export const commands = {
-async base() : Promise<Result<string, string>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("plugin:path2|base") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
+async base() : Promise<string> {
+    return await TAURI_INVOKE("plugin:path2|base");
 }
 }