fix pagefind powered search infra

yujonglee · yujonglee · commit c9f870d4c873 · 2026-01-01T18:28:07.000+09:00
diff --git a/plugins/pagefind/build.rs b/plugins/pagefind/build.rs
@@ -1,4 +1,4 @@
-const COMMANDS: &[&str] = &["search", "index"];
+const COMMANDS: &[&str] = &["build_index", "get_bundle_path", "clear_index"];
 
 fn main() {
     tauri_plugin::Builder::new(COMMANDS).build();
diff --git a/plugins/pagefind/permissions/autogenerated/commands/build_index.toml b/plugins/pagefind/permissions/autogenerated/commands/build_index.toml
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-build-index"
+description = "Enables the build_index command without any pre-configured scope."
+commands.allow = ["build_index"]
+
+[[permission]]
+identifier = "deny-build-index"
+description = "Denies the build_index command without any pre-configured scope."
+commands.deny = ["build_index"]
diff --git a/plugins/pagefind/permissions/autogenerated/commands/clear_index.toml b/plugins/pagefind/permissions/autogenerated/commands/clear_index.toml
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-clear-index"
+description = "Enables the clear_index command without any pre-configured scope."
+commands.allow = ["clear_index"]
+
+[[permission]]
+identifier = "deny-clear-index"
+description = "Denies the clear_index command without any pre-configured scope."
+commands.deny = ["clear_index"]
diff --git a/plugins/pagefind/permissions/autogenerated/commands/get_bundle_path.toml b/plugins/pagefind/permissions/autogenerated/commands/get_bundle_path.toml
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-get-bundle-path"
+description = "Enables the get_bundle_path command without any pre-configured scope."
+commands.allow = ["get_bundle_path"]
+
+[[permission]]
+identifier = "deny-get-bundle-path"
+description = "Denies the get_bundle_path command without any pre-configured scope."
+commands.deny = ["get_bundle_path"]
diff --git a/plugins/pagefind/permissions/autogenerated/commands/index.toml b/plugins/pagefind/permissions/autogenerated/commands/index.toml
diff --git a/plugins/pagefind/permissions/autogenerated/commands/search.toml b/plugins/pagefind/permissions/autogenerated/commands/search.toml
diff --git a/plugins/pagefind/permissions/autogenerated/reference.md b/plugins/pagefind/permissions/autogenerated/reference.md
@@ -4,8 +4,9 @@ Default permissions for the plugin
 
 #### This default permission set includes the following:
 
-- `allow-search`
-- `allow-index`
+- `allow-build-index`
+- `allow-get-bundle-path`
+- `allow-clear-index`
 
 ## Permission Table
 
@@ -19,51 +20,77 @@ Default permissions for the plugin
 <tr>
 <td>
 
-`pagefind:allow-index`
+`pagefind:allow-build-index`
 
 </td>
 <td>
 
-Enables the index command without any pre-configured scope.
+Enables the build_index command without any pre-configured scope.
 
 </td>
 </tr>
 
 <tr>
 <td>
 
-`pagefind:deny-index`
+`pagefind:deny-build-index`
 
 </td>
 <td>
 
-Denies the index command without any pre-configured scope.
+Denies the build_index command without any pre-configured scope.
 
 </td>
 </tr>
 
 <tr>
 <td>
 
-`pagefind:allow-search`
+`pagefind:allow-clear-index`
 
 </td>
 <td>
 
-Enables the search command without any pre-configured scope.
+Enables the clear_index command without any pre-configured scope.
 
 </td>
 </tr>
 
 <tr>
 <td>
 
-`pagefind:deny-search`
+`pagefind:deny-clear-index`
 
 </td>
 <td>
 
-Denies the search command without any pre-configured scope.
+Denies the clear_index command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`pagefind:allow-get-bundle-path`
+
+</td>
+<td>
+
+Enables the get_bundle_path command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`pagefind:deny-get-bundle-path`
+
+</td>
+<td>
+
+Denies the get_bundle_path command without any pre-configured scope.
 
 </td>
 </tr>
diff --git a/plugins/pagefind/permissions/default.toml b/plugins/pagefind/permissions/default.toml
@@ -1,3 +1,3 @@
 [default]
 description = "Default permissions for the plugin"
-permissions = ["allow-search", "allow-index"]
+permissions = ["allow-build-index", "allow-get-bundle-path", "allow-clear-index"]
diff --git a/plugins/pagefind/permissions/schemas/schema.json b/plugins/pagefind/permissions/schemas/schema.json
@@ -295,34 +295,46 @@
       "type": "string",
       "oneOf": [
         {
-          "description": "Enables the index command without any pre-configured scope.",
+          "description": "Enables the build_index command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-index",
-          "markdownDescription": "Enables the index command without any pre-configured scope."
+          "const": "allow-build-index",
+          "markdownDescription": "Enables the build_index command without any pre-configured scope."
         },
         {
-          "description": "Denies the index command without any pre-configured scope.",
+          "description": "Denies the build_index command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-index",
-          "markdownDescription": "Denies the index command without any pre-configured scope."
+          "const": "deny-build-index",
+          "markdownDescription": "Denies the build_index command without any pre-configured scope."
         },
         {
-          "description": "Enables the search command without any pre-configured scope.",
+          "description": "Enables the clear_index command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-search",
-          "markdownDescription": "Enables the search command without any pre-configured scope."
+          "const": "allow-clear-index",
+          "markdownDescription": "Enables the clear_index command without any pre-configured scope."
         },
         {
-          "description": "Denies the search command without any pre-configured scope.",
+          "description": "Denies the clear_index command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-search",
-          "markdownDescription": "Denies the search command without any pre-configured scope."
+          "const": "deny-clear-index",
+          "markdownDescription": "Denies the clear_index command without any pre-configured scope."
         },
         {
-          "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-search`\n- `allow-index`",
+          "description": "Enables the get_bundle_path command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-get-bundle-path",
+          "markdownDescription": "Enables the get_bundle_path command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the get_bundle_path command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-get-bundle-path",
+          "markdownDescription": "Denies the get_bundle_path command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-build-index`\n- `allow-get-bundle-path`\n- `allow-clear-index`",
           "type": "string",
           "const": "default",
-          "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-search`\n- `allow-index`"
+          "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-build-index`\n- `allow-get-bundle-path`\n- `allow-clear-index`"
         }
       ]
     }
diff --git a/plugins/pagefind/src/commands.rs b/plugins/pagefind/src/commands.rs
@@ -2,12 +2,13 @@ use crate::{IndexRecord, PagefindPluginExt};
 
 #[tauri::command]
 #[specta::specta]
-pub(crate) fn build_index<R: tauri::Runtime>(
+pub(crate) async fn build_index<R: tauri::Runtime>(
     app: tauri::AppHandle<R>,
     records: Vec<IndexRecord>,
 ) -> Result<(), String> {
-    app.pagefind()
-        .build_index(records)
+    let pagefind_dir = app.pagefind().pagefind_dir().map_err(|e| e.to_string())?;
+    crate::build_index_inner(pagefind_dir, records)
+        .await
         .map_err(|e| e.to_string())
 }
 
diff --git a/plugins/pagefind/src/ext.rs b/plugins/pagefind/src/ext.rs
@@ -13,68 +13,14 @@ pub struct Pagefind<'a, R: tauri::Runtime, M: tauri::Manager<R>> {
 }
 
 impl<'a, R: tauri::Runtime, M: tauri::Manager<R>> Pagefind<'a, R, M> {
-    fn pagefind_dir(&self) -> Result<PathBuf, crate::Error> {
+    pub fn pagefind_dir(&self) -> Result<PathBuf, crate::Error> {
         let app_data_dir = self.manager.path().app_data_dir()?;
         Ok(app_data_dir.join("pagefind"))
     }
 
-    pub fn build_index(&self, records: Vec<IndexRecord>) -> Result<(), crate::Error> {
-        use pagefind::api::PagefindIndex;
-        use pagefind::options::PagefindServiceConfig;
-
+    pub async fn build_index(&self, records: Vec<IndexRecord>) -> Result<(), crate::Error> {
         let pagefind_dir = self.pagefind_dir()?;
-        std::fs::create_dir_all(&pagefind_dir)?;
-
-        let rt = tokio::runtime::Builder::new_current_thread()
-            .enable_all()
-            .build()
-            .map_err(|e| crate::Error::Pagefind(e.to_string()))?;
-
-        rt.block_on(async {
-            let options = PagefindServiceConfig::builder()
-                .keep_index_url(true)
-                .force_language("en".to_string())
-                .build();
-
-            let mut index =
-                PagefindIndex::new(Some(options)).map_err(|e| crate::Error::Anyhow(e))?;
-
-            for record in records {
-                let mut meta = std::collections::BTreeMap::new();
-                if let Some(t) = record.title {
-                    meta.insert("title".to_string(), t);
-                }
-
-                index
-                    .add_custom_record(
-                        record.url,
-                        record.content,
-                        "en".to_string(),
-                        Some(meta),
-                        None,
-                        None,
-                    )
-                    .await
-                    .map_err(|e| crate::Error::Anyhow(e))?;
-            }
-
-            let files = index
-                .get_files()
-                .await
-                .map_err(|e| crate::Error::Anyhow(e))?;
-
-            for file in files {
-                let file_path = pagefind_dir.join(&file.filename);
-                if let Some(parent) = file_path.parent() {
-                    std::fs::create_dir_all(parent)?;
-                }
-                std::fs::write(&file_path, &file.contents)?;
-            }
-
-            Ok::<(), crate::Error>(())
-        })?;
-
-        Ok(())
+        build_index_inner(pagefind_dir, records).await
     }
 
     pub fn get_bundle_path(&self) -> Result<String, crate::Error> {
@@ -92,6 +38,70 @@ impl<'a, R: tauri::Runtime, M: tauri::Manager<R>> Pagefind<'a, R, M> {
     }
 }
 
+pub async fn build_index_inner(
+    pagefind_dir: PathBuf,
+    records: Vec<IndexRecord>,
+) -> Result<(), crate::Error> {
+    tokio::task::spawn_blocking(move || build_index_sync(pagefind_dir, records))
+        .await
+        .map_err(|e| crate::Error::Pagefind(e.to_string()))?
+}
+
+fn build_index_sync(pagefind_dir: PathBuf, records: Vec<IndexRecord>) -> Result<(), crate::Error> {
+    use pagefind::api::PagefindIndex;
+    use pagefind::options::PagefindServiceConfig;
+
+    std::fs::create_dir_all(&pagefind_dir)?;
+
+    let rt = tokio::runtime::Builder::new_current_thread()
+        .enable_all()
+        .build()
+        .map_err(|e| crate::Error::Pagefind(e.to_string()))?;
+
+    rt.block_on(async {
+        let options = PagefindServiceConfig::builder()
+            .keep_index_url(true)
+            .force_language("en".to_string())
+            .build();
+
+        let mut index = PagefindIndex::new(Some(options)).map_err(|e| crate::Error::Anyhow(e))?;
+
+        for record in records {
+            let mut meta = std::collections::BTreeMap::new();
+            if let Some(t) = record.title {
+                meta.insert("title".to_string(), t);
+            }
+
+            index
+                .add_custom_record(
+                    record.url,
+                    record.content,
+                    "en".to_string(),
+                    Some(meta),
+                    None,
+                    None,
+                )
+                .await
+                .map_err(|e| crate::Error::Anyhow(e))?;
+        }
+
+        let files = index
+            .get_files()
+            .await
+            .map_err(|e| crate::Error::Anyhow(e))?;
+
+        for file in files {
+            let file_path = pagefind_dir.join(&file.filename);
+            if let Some(parent) = file_path.parent() {
+                std::fs::create_dir_all(parent)?;
+            }
+            std::fs::write(&file_path, &file.contents)?;
+        }
+
+        Ok::<(), crate::Error>(())
+    })
+}
+
 pub trait PagefindPluginExt<R: tauri::Runtime> {
     fn pagefind(&self) -> Pagefind<'_, R, Self>
     where

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const COMMANDS: &[&str] = &["search", "index"];`
	`1`	`+const COMMANDS: &[&str] = &["build_index", "get_bundle_path", "clear_index"];`
`2`	`2`
`3`	`3`	`fn main() {`
`4`	`4`	`tauri_plugin::Builder::new(COMMANDS).build();`