@xingwangzhe/stalux 1.11.0 → 1.13.0

package/README.md

@@ -171,12 +171,15 @@ extension) interact with your blog directly — **no backend required**.
 
 When a WebMCP-aware browser opens your site, these read-only tools are registered:
 
-| Tool                  | What it does                                                            | Backing data              |
-| --------------------- | ----------------------------------------------------------------------- | ------------------------- |
-| `stalux_list_posts`   | Paginated list of all posts                                             | `/api/post.abbrlink.json` |
-| `stalux_search_posts` | Full-text search across posts                                           | Pagefind `/pagefind/`     |
-| `stalux_read_post`    | Fetch a post's raw Markdown                                             | `/posts/{abbrlink}.md`    |
-| `stalux_site_info`    | Site title, URL, description + pointers to `llms.txt` / `llms-full.txt` | `site.yml` (build-time)   |
+| Tool                  | What it does                                                            | Backing data            |
+| --------------------- | ----------------------------------------------------------------------- | ----------------------- |
+| `stalux_list_posts`   | Paginated list of all posts (with meta)                                 | `/api/posts.json`       |
+| `stalux_get_post`     | Fetch one post's metadata by abbrlink or title keyword                  | `/api/posts.json`       |
+| `stalux_current_post` | Metadata of the post currently being viewed                             | `/api/posts.json`       |
+| `stalux_random_post`  | Pick a random post's metadata                                           | `/api/posts.json`       |
+| `stalux_search_posts` | Full-text search across posts                                           | Pagefind `/pagefind/`   |
+| `stalux_read_post`    | Fetch a post's raw Markdown                                             | `/posts/{abbrlink}.md`  |
+| `stalux_site_info`    | Site title, URL, description + pointers to `llms.txt` / `llms-full.txt` | `site.yml` (build-time) |
 
 All tools are `readOnlyHint: true` — they never modify any state.
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xingwangzhe/stalux",
-    "version": "1.11.0",
+    "version": "1.13.0",
     "description": "A powerful, modern Astro blog theme — use as template or install as plugin",
     "keywords": [
         "astro",

package/src/index.ts

@@ -68,6 +68,10 @@ function getRoutes(baseDir: URL): RouteEntry[] {
             pattern: "/api/post.abbrlink.json",
             entrypoint: resolvePage("./pages/api/post.abbrlink.json.ts"),
         },
+        {
+            pattern: "/api/posts.json",
+            entrypoint: resolvePage("./pages/api/posts.json.ts"),
+        },
 
         // ---- Markdown 导出端点 ----
         { pattern: "/index.md", entrypoint: resolvePage("./pages/index.md.ts") },

package/src/layouts/Stalux.astro

@@ -87,9 +87,15 @@ const llmPromote = llmPromoteRaw
             siteTitle: siteConfig.title,
             siteUrl: siteConfig.url,
             siteDesc: siteConfig.description,
+            siteLang: siteConfig.lang,
           }}
         >
-          window.__STALUX_SITE_INFO__ = { title: siteTitle, url: siteUrl, description: siteDesc };
+          window.__STALUX_SITE_INFO__ = {
+            title: siteTitle,
+            url: siteUrl,
+            description: siteDesc,
+            lang: siteLang,
+          };
         </script>
         <script>
           import "../scripts/webmcp.ts";

package/src/pages/api/posts.json.ts

@@ -0,0 +1,33 @@
+import type { APIRoute } from "astro";
+import { getCollection } from "astro:content";
+
+export const prerender = true;
+
+/**
+ * 文章元信息索引（供 WebMCP 工具与外部消费）
+ *
+ * 相比 /api/post.abbrlink.json，包含完整元信息（日期/分类/标签/摘要/字数），
+ * 是 stalux_get_post / stalux_random_post 等 WebMCP 工具的廉价数据源。
+ */
+export const GET: APIRoute = async () => {
+    const posts = await getCollection("posts", ({ data }) => !data.draft);
+
+    const payload = posts.map((post) => ({
+        title: post.data.title,
+        abbrlink: String(post.data.abbrlink),
+        date: post.data.date ?? undefined,
+        updated: post.data.updated ?? undefined,
+        tags: post.data.tags ?? [],
+        categories: post.data.categories ?? [],
+        desc: post.data.desc ?? "",
+        wordCount: post.data.wordCount ?? undefined,
+        url: `/posts/${post.data.abbrlink}/`,
+    }));
+
+    return new Response(JSON.stringify(payload), {
+        status: 200,
+        headers: {
+            "Content-Type": "application/json; charset=utf-8",
+        },
+    });
+};

package/src/scripts/webmcp.ts

@@ -3,8 +3,12 @@
  *
  * 遵循 W3C webmachinelearning/webmcp 草案：网页通过 document.modelContext
  * 向浏览器/代理注册工具。所有数据源均为构建期静态产物——
- * /api/post.abbrlink.json（文章索引）、/posts/{id}.md（源码导出）、
- * /llms.txt / /llms-full.txt（站点信息镜像）、/pagefind/（全文索引）。
+ * /api/posts.json（文章元信息索引）、/api/post.abbrlink.json（兼容列表）、
+ * /posts/{id}.md（源码导出）、/llms.txt / /llms-full.txt（站点信息镜像）、
+ * /pagefind/（全文索引）。
+ *
+ * 工具描述跟随站点语言（site.yml 的 lang）：中文站显示中文说明，
+ * 英文站显示英文说明，保证 AI 代理与评审（如 webmcp.com）能读懂。
  *
  * 浏览器无原生 modelContext 时，由布局注入的 @mcp-b/webmcp-polyfill
  * 提供兜底实现；两者都没有则静默跳过注册，不影响普通访问者。
@@ -22,6 +26,7 @@ declare global {
             title?: string;
             url?: string;
             description?: string;
+            lang?: string;
         };
     }
 }
@@ -47,6 +52,22 @@ interface DocumentWithModelContext extends Document {
     modelContext?: ModelContext;
 }
 
+// ---------------------------------------------------------------------------
+// 语言选择（跟随站点 site.yml 的 lang）
+// ---------------------------------------------------------------------------
+
+const SITE_LANG = (
+    typeof window !== "undefined" ? (window.__STALUX_SITE_INFO__?.lang ?? "zh-CN") : "zh-CN"
+).toLowerCase();
+
+/** 站点为英文站时为 true */
+const IS_EN = SITE_LANG === "en" || SITE_LANG === "en-us" || SITE_LANG === "en-gb";
+
+/** 按站点语言选择文案：pick(中文, English) */
+function pick(zh: string, en: string): string {
+    return IS_EN ? en : zh;
+}
+
 // ---------------------------------------------------------------------------
 // 工具执行辅助
 // ---------------------------------------------------------------------------
@@ -87,33 +108,102 @@ const MAX_LIST_PAGE_SIZE = 50;
 const MAX_SEARCH_RESULTS = 10;
 
 // ---------------------------------------------------------------------------
-// 工具定义
+// 文章元信息数据层（/api/posts.json）
 // ---------------------------------------------------------------------------
 
-interface PostIndexEntry {
+interface PostMeta {
     title: string;
-    abbrlink: string | number;
+    abbrlink: string;
+    date?: string;
+    updated?: string;
+    tags?: string[];
+    categories?: string[];
+    desc?: string;
+    wordCount?: number;
+    url: string;
+}
+
+let postsMetaPromise: Promise<PostMeta[] | null> | null = null;
+
+/** 加载文章元信息索引（惰性 + 缓存） */
+function loadPostsMeta(): Promise<PostMeta[] | null> {
+    if (!postsMetaPromise) {
+        postsMetaPromise = fetchJSON("/api/posts.json").then((data) =>
+            Array.isArray(data) ? (data as PostMeta[]) : null,
+        );
+    }
+    return postsMetaPromise;
+}
+
+/** 按 abbrlink 精确查找 */
+function findById(list: PostMeta[], id: string): PostMeta | undefined {
+    return list.find((p) => p.abbrlink === id);
+}
+
+/** 按标题/标签关键词模糊查找（取第一条） */
+function findByKeyword(list: PostMeta[], keyword: string): PostMeta | undefined {
+    const kw = keyword.toLowerCase();
+    return (
+        list.find((p) => p.title.toLowerCase().includes(kw)) ??
+        list.find((p) => (p.tags ?? []).some((t) => t.toLowerCase().includes(kw)))
+    );
+}
+
+/** 简化为输出用的元信息视图 */
+function briefMeta(p: PostMeta): Record<string, unknown> {
+    return {
+        title: p.title,
+        abbrlink: p.abbrlink,
+        date: p.date ?? undefined,
+        tags: p.tags ?? [],
+        categories: p.categories ?? [],
+        desc: p.desc ?? undefined,
+        wordCount: p.wordCount ?? undefined,
+        url: p.url,
+    };
+}
+
+/** 从当前 URL 解析 abbrlink（/posts/{abbrlink}/ 或 /posts/{abbrlink}.md） */
+function currentAbbrlinkFromPath(): string | null {
+    const m = location.pathname.match(/^\/posts\/([^/]+?)(?:\.md)?\/?$/);
+    return m ? decodeURIComponent(m[1]) : null;
 }
 
+// ---------------------------------------------------------------------------
+// 工具定义（描述中英双语，随站点语言切换）
+// ---------------------------------------------------------------------------
+
 function listPostsTool(): WebMCPTool {
     return {
         name: "stalux_list_posts",
-        title: "列出博客文章",
-        description:
-            "分页列出博客的全部已发布文章，返回标题、永久链接（abbrlink）、文章页 URL。" +
-            "需要浏览全站文章、确认某篇文章的 abbrlink 时使用；不返回正文，" +
-            "正文请用 stalux_read_post。",
+        title: pick("列出博客文章", "List blog posts"),
+        description: pick(
+            "分页列出博客的全部已发布文章，返回标题、永久链接（abbrlink）、日期、分类、标签、摘要与文章页 URL。" +
+                "需要浏览全站文章、确认某篇文章的 abbrlink 时使用；不返回正文，" +
+                "只要某篇元信息用 stalux_get_post，读正文请用 stalux_read_post。",
+            "Paginated list of all published posts, returning title, permanent link (abbrlink), date, categories, tags, description and post page URL. " +
+                "Use it to browse the whole blog or find a post's abbrlink; it does not return body content — " +
+                "use stalux_get_post for one post's metadata, or stalux_read_post for the full body.",
+        ),
         annotations: { readOnlyHint: true, untrustedContentHint: false },
         inputSchema: {
             type: "object",
             properties: {
-                page: { type: "integer", minimum: 1, default: 1, description: "页码，从 1 开始" },
+                page: {
+                    type: "integer",
+                    minimum: 1,
+                    default: 1,
+                    description: pick("页码，从 1 开始", "Page number, starting at 1"),
+                },
                 pageSize: {
                     type: "integer",
                     minimum: 1,
                     maximum: MAX_LIST_PAGE_SIZE,
                     default: 10,
-                    description: "每页条数，最大 " + MAX_LIST_PAGE_SIZE,
+                    description: pick(
+                        "每页条数，最大 " + MAX_LIST_PAGE_SIZE,
+                        "Items per page, max " + MAX_LIST_PAGE_SIZE,
+                    ),
                 },
             },
             additionalProperties: false,
@@ -124,15 +214,22 @@ function listPostsTool(): WebMCPTool {
                 MAX_LIST_PAGE_SIZE,
                 Math.max(1, Number(input.pageSize) || 10),
             );
-            const index = (await fetchJSON("/api/post.abbrlink.json")) as PostIndexEntry[] | null;
-            if (!Array.isArray(index)) return err("INDEX_UNAVAILABLE", "无法获取文章列表");
-            const total = index.length;
+            const list = await loadPostsMeta();
+            if (!list)
+                return err(
+                    "INDEX_UNAVAILABLE",
+                    pick("无法获取文章列表", "Unable to fetch post list"),
+                );
+            const total = list.length;
             const totalPages = Math.ceil(total / pageSize) || 1;
             const start = (page - 1) * pageSize;
             if (start >= total) {
                 return err(
                     "OUT_OF_RANGE",
-                    "第 " + page + " 页没有文章（共 " + totalPages + " 页）",
+                    pick(
+                        "第 " + page + " 页没有文章（共 " + totalPages + " 页）",
+                        "Page " + page + " has no posts (" + totalPages + " pages total)",
+                    ),
                     {
                         page,
                         totalPages,
@@ -140,34 +237,152 @@ function listPostsTool(): WebMCPTool {
                     },
                 );
             }
-            const posts = index.slice(start, start + pageSize).map((p) => ({
-                title: p.title,
-                abbrlink: String(p.abbrlink),
-                url: "/posts/" + p.abbrlink + "/",
-            }));
+            const posts = list.slice(start, start + pageSize).map(briefMeta);
             return { ok: true, page, pageSize, total, totalPages, posts };
         },
     };
 }
 
+function getPostTool(): WebMCPTool {
+    return {
+        name: "stalux_get_post",
+        title: pick("查看文章信息", "Get post info"),
+        description: pick(
+            "按 abbrlink 或标题关键词定位一篇文章，返回其元信息（标题、日期、分类、标签、摘要、字数、文章页 URL）。" +
+                "只要元信息时用它，比读取正文便宜得多；读正文请用 stalux_read_post。" +
+                "获取 abbrlink 可先用 stalux_list_posts 或 stalux_search_posts。",
+            "Locate a post by abbrlink or title keyword and return its metadata (title, date, categories, tags, description, word count, post page URL). " +
+                "Use it when only metadata is needed — cheaper than reading the full body; use stalux_read_post for the body. " +
+                "To get an abbrlink, first use stalux_list_posts or stalux_search_posts.",
+        ),
+        annotations: { readOnlyHint: true, untrustedContentHint: false },
+        inputSchema: {
+            type: "object",
+            properties: {
+                id: {
+                    type: "string",
+                    description: pick(
+                        "文章 abbrlink（如 f4442947）或标题关键词（模糊匹配，取第一条命中）",
+                        "Post abbrlink (e.g. f4442947) or a title keyword (fuzzy match, first hit wins)",
+                    ),
+                },
+            },
+            required: ["id"],
+            additionalProperties: false,
+        },
+        execute: async (input) => {
+            const id = String(input.id ?? "").trim();
+            if (!id) {
+                return err(
+                    "BAD_INPUT",
+                    pick(
+                        "请提供文章 abbrlink 或标题关键词",
+                        "Provide a post abbrlink or title keyword",
+                    ),
+                );
+            }
+            const list = await loadPostsMeta();
+            if (!list)
+                return err(
+                    "INDEX_UNAVAILABLE",
+                    pick("无法获取文章索引", "Unable to fetch post index"),
+                );
+            const post = findById(list, id) ?? findByKeyword(list, id);
+            if (!post) return err("NOT_FOUND", pick("未找到文章: ", "Post not found: ") + id);
+            return { ok: true, post: briefMeta(post) };
+        },
+    };
+}
+
+function currentPostTool(): WebMCPTool {
+    return {
+        name: "stalux_current_post",
+        title: pick("当前文章信息", "Current post info"),
+        description: pick(
+            "返回用户当前正在浏览的那篇文章的元信息。当用户说「这篇文章」「当前页面」时先调用它确定上下文，" +
+                "比读正文便宜得多。不在文章页时返回错误。",
+            "Return the metadata of the post the user is currently viewing. " +
+                "Call it first when the user says 'this post' or 'the current page' to establish context — cheaper than reading the body. " +
+                "Returns an error when not on a post page.",
+        ),
+        annotations: { readOnlyHint: true, untrustedContentHint: false },
+        inputSchema: { type: "object", properties: {}, additionalProperties: false },
+        execute: async () => {
+            const id = currentAbbrlinkFromPath();
+            if (!id) {
+                return err(
+                    "NOT_ON_POST_PAGE",
+                    pick("当前不在文章页（路径: ", "Not on a post page (path: ") +
+                        location.pathname +
+                        ")",
+                );
+            }
+            const list = await loadPostsMeta();
+            if (!list)
+                return err(
+                    "INDEX_UNAVAILABLE",
+                    pick("无法获取文章索引", "Unable to fetch post index"),
+                );
+            const post = findById(list, id);
+            if (!post)
+                return err("NOT_FOUND", pick("未找到当前文章: ", "Current post not found: ") + id);
+            return { ok: true, post: briefMeta(post) };
+        },
+    };
+}
+
+function randomPostTool(): WebMCPTool {
+    return {
+        name: "stalux_random_post",
+        title: pick("随机一篇文章", "Random post"),
+        description: pick(
+            "随机挑选一篇文章并返回其元信息（标题、abbrlink、日期、摘要、URL）。" +
+                "适合推荐、探索、或不确定从哪篇开始时使用；不返回正文，不导航。",
+            "Pick a random post and return its metadata (title, abbrlink, date, description, URL). " +
+                "Useful for recommendations, discovery, or when unsure where to start; it does not return body content and does not navigate.",
+        ),
+        annotations: { readOnlyHint: true, untrustedContentHint: false },
+        inputSchema: { type: "object", properties: {}, additionalProperties: false },
+        execute: async () => {
+            const list = await loadPostsMeta();
+            if (!list || list.length === 0) {
+                return err(
+                    "INDEX_UNAVAILABLE",
+                    pick("无法获取文章索引", "Unable to fetch post index"),
+                );
+            }
+            const post = list[Math.floor(Math.random() * list.length)];
+            return { ok: true, post: briefMeta(post) };
+        },
+    };
+}
+
 function searchPostsTool(): WebMCPTool {
     return {
         name: "stalux_search_posts",
-        title: "搜索博客文章",
-        description:
+        title: pick("搜索博客文章", "Search blog posts"),
+        description: pick(
             "用关键词搜索博客文章的标题、标签、分类与正文全文，返回命中文章的标题、链接与摘要片段。" +
-            "适合「博客里写过 X 吗」「帮我找一下关于 Y 的文章」这类问题。",
+                "适合「博客里写过 X 吗」「帮我找一下关于 Y 的文章」这类问题；" +
+                "定位到具体文章后再用 stalux_read_post 读正文、stalux_get_post 取元信息。",
+            "Search the full text of all posts (title, tags, categories, body) by keyword, returning matching posts with title, URL and excerpt snippets. " +
+                "Ideal for questions like 'has the blog covered X?' or 'find posts about Y'; " +
+                "once a post is located, use stalux_read_post for the body or stalux_get_post for metadata.",
+        ),
         annotations: { readOnlyHint: true, untrustedContentHint: false },
         inputSchema: {
             type: "object",
             properties: {
-                keyword: { type: "string", description: "搜索关键词" },
+                keyword: {
+                    type: "string",
+                    description: pick("搜索关键词", "Search keyword"),
+                },
                 limit: {
                     type: "integer",
                     minimum: 1,
                     maximum: MAX_SEARCH_RESULTS,
                     default: 10,
-                    description: "最多返回条数",
+                    description: pick("最多返回条数", "Maximum number of results to return"),
                 },
             },
             required: ["keyword"],
@@ -175,15 +390,24 @@ function searchPostsTool(): WebMCPTool {
         },
         execute: async (input) => {
             const keyword = String(input.keyword ?? "").trim();
-            if (!keyword) return err("BAD_INPUT", "请提供搜索关键词");
+            if (!keyword)
+                return err("BAD_INPUT", pick("请提供搜索关键词", "Provide a search keyword"));
             const limit = Math.min(MAX_SEARCH_RESULTS, Math.max(1, Number(input.limit) || 10));
             const pagefind = await loadPagefind();
-            if (!pagefind) return err("INDEX_UNAVAILABLE", "全文搜索索引不可用");
+            if (!pagefind) {
+                return err(
+                    "INDEX_UNAVAILABLE",
+                    pick("全文搜索索引不可用", "Full-text search index unavailable"),
+                );
+            }
             const res = (await pagefind.search(keyword)) as {
                 results?: Array<{ data: () => Promise<unknown> }>;
             };
             if (!res || !Array.isArray(res.results)) {
-                return err("SEARCH_FAILED", "搜索失败，请重试");
+                return err(
+                    "SEARCH_FAILED",
+                    pick("搜索失败，请重试", "Search failed, please retry"),
+                );
             }
             const items = await Promise.all(
                 res.results.slice(0, limit).map(async (r) => {
@@ -212,26 +436,44 @@ function searchPostsTool(): WebMCPTool {
 function readPostTool(): WebMCPTool {
     return {
         name: "stalux_read_post",
-        title: "读取文章 Markdown",
-        description:
+        title: pick("读取文章 Markdown", "Read post Markdown"),
+        description: pick(
             "按 abbrlink（文章永久链接 ID）读取一篇博客文章的原始 Markdown 全文，包含 frontmatter 与版权脚注。" +
-            "需要文章完整内容、引用或摘要时使用；获取 abbrlink 可先用 stalux_list_posts 或 stalux_search_posts。",
+                "需要文章完整内容、引用或摘要时使用；只要元信息用 stalux_get_post（更便宜）。" +
+                "获取 abbrlink 可先用 stalux_list_posts 或 stalux_search_posts。",
+            "Read the full raw Markdown of a post by abbrlink (permanent link ID), including frontmatter and copyright footer. " +
+                "Use it for full content, quotes or summarization; for metadata only, stalux_get_post is cheaper. " +
+                "To get an abbrlink, first use stalux_list_posts or stalux_search_posts.",
+        ),
         annotations: { readOnlyHint: true, untrustedContentHint: false },
         inputSchema: {
             type: "object",
             properties: {
-                id: { type: "string", description: "文章的 abbrlink，如 f4442947" },
+                id: {
+                    type: "string",
+                    description: pick(
+                        "文章的 abbrlink，如 f4442947",
+                        "Post abbrlink, e.g. f4442947",
+                    ),
+                },
             },
             required: ["id"],
             additionalProperties: false,
         },
         execute: async (input) => {
             const id = String(input.id ?? "").trim();
-            if (!id) return err("BAD_INPUT", "请提供文章 abbrlink");
+            if (!id)
+                return err("BAD_INPUT", pick("请提供文章 abbrlink", "Provide a post abbrlink"));
             const url = "/posts/" + encodeURIComponent(id) + ".md";
             const r = await fetch(url, { headers: { Accept: "text/markdown" } });
-            if (r.status === 404) return err("NOT_FOUND", "未找到文章: " + id);
-            if (!r.ok) return err("FETCH_FAILED", "无法获取文章 Markdown：" + url);
+            if (r.status === 404)
+                return err("NOT_FOUND", pick("未找到文章: ", "Post not found: ") + id);
+            if (!r.ok) {
+                return err(
+                    "FETCH_FAILED",
+                    pick("无法获取文章 Markdown：", "Failed to fetch post Markdown: ") + url,
+                );
+            }
             const markdown = await r.text();
             return { ok: true, url, markdown: markdown.slice(0, 50000) };
         },
@@ -241,11 +483,15 @@ function readPostTool(): WebMCPTool {
 function siteInfoTool(): WebMCPTool {
     return {
         name: "stalux_site_info",
-        title: "站点信息",
-        description:
+        title: pick("站点信息", "Site info"),
+        description: pick(
             "返回博客的站点信息（标题、简介、站点 URL），并给出更完整的机器可读内容入口：" +
-            "/llms.txt（站点导航与文章链接列表）与 /llms-full.txt（全站 Markdown 镜像，含全部文章正文）。" +
-            "适合需要了解博客主题、定位内容、或批量获取全站数据时使用。",
+                "/llms.txt（站点导航与文章链接列表）与 /llms-full.txt（全站 Markdown 镜像，含全部文章正文）。" +
+                "适合需要了解博客主题、定位内容、或批量获取全站数据时使用。",
+            "Return the blog's site info (title, description, site URL) plus pointers to machine-readable content: " +
+                "/llms.txt (site navigation and post link list) and /llms-full.txt (full-site Markdown mirror with all post bodies). " +
+                "Use it to understand the blog's topic, orient, or bulk-fetch all content.",
+        ),
         annotations: { readOnlyHint: true, untrustedContentHint: false },
         inputSchema: { type: "object", properties: {}, additionalProperties: false },
         execute: async () => {
@@ -255,6 +501,7 @@ function siteInfoTool(): WebMCPTool {
                 title: info.title ?? "",
                 url: info.url ?? "",
                 description: info.description ?? "",
+                lang: info.lang ?? "",
                 llms: (info.url ?? "") + "/llms.txt",
                 llmsFull: (info.url ?? "") + "/llms-full.txt",
             };
@@ -263,7 +510,15 @@ function siteInfoTool(): WebMCPTool {
 }
 
 function buildTools(): WebMCPTool[] {
-    return [listPostsTool(), searchPostsTool(), readPostTool(), siteInfoTool()];
+    return [
+        listPostsTool(),
+        getPostTool(),
+        currentPostTool(),
+        randomPostTool(),
+        searchPostsTool(),
+        readPostTool(),
+        siteInfoTool(),
+    ];
 }
 
 // ---------------------------------------------------------------------------