@zhin.js/plugin-short-url 1.0.1 → 1.1.1

package/README.md

@@ -0,0 +1,28 @@
+# @zhin.js/plugin-short-url
+
+Zhin.js plugin for short-url functionality.
+
+## Installation
+
+```bash
+pnpm add @zhin.js/plugin-short-url
+```
+
+## Usage
+
+Add the plugin to your `zhin.config.yml`:
+
+```yaml
+plugins:
+  - @zhin.js/plugin-short-url
+```
+
+Or via CLI:
+
+```bash
+zhin install @zhin.js/plugin-short-url
+```
+
+## Configuration
+
+Configure in `zhin.config.yml` under the plugin's key. Refer to the plugin source for available options.

package/commands/expand/[url]/index.js

@@ -0,0 +1,19 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineCommand } from 'zhin.js/command';
+import { expandUrl, isValidUrl } from "../../../lib/short-url-lib.js";
+export default defineCommand({
+    description: '展开一个短链接，显示原始地址',
+    params: { url: { type: 'string' } },
+    async execute({ params }) {
+        const url = String(params.url ?? '');
+        if (!isValidUrl(url))
+            return '请提供有效的 HTTP/HTTPS 链接';
+        try {
+            const original = await expandUrl(url);
+            return `原始链接: ${original}`;
+        }
+        catch (e) {
+            return `展开失败: ${e instanceof Error ? e.message : String(e)}`;
+        }
+    },
+});

package/commands/expand/[url]/index.ts

@@ -0,0 +1,17 @@
+import { defineCommand } from 'zhin.js/command';
+import { expandUrl, isValidUrl } from '../../../src/short-url-lib.js';
+
+export default defineCommand({
+  description: '展开一个短链接，显示原始地址',
+  params: { url: { type: 'string' } },
+  async execute({ params }) {
+    const url = String(params.url ?? '');
+    if (!isValidUrl(url)) return '请提供有效的 HTTP/HTTPS 链接';
+    try {
+      const original = await expandUrl(url);
+      return `原始链接: ${original}`;
+    } catch (e: unknown) {
+      return `展开失败: ${e instanceof Error ? e.message : String(e)}`;
+    }
+  },
+});

package/commands/shorten/[url]/index.js

@@ -0,0 +1,19 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineCommand } from 'zhin.js/command';
+import { isValidUrl, shortenUrl } from "../../../lib/short-url-lib.js";
+export default defineCommand({
+    description: '缩短一个 URL',
+    params: { url: { type: 'string' } },
+    async execute({ params }) {
+        const url = String(params.url ?? '');
+        if (!isValidUrl(url))
+            return '请提供有效的 HTTP/HTTPS 链接';
+        try {
+            const short = await shortenUrl(url);
+            return `短链接: ${short}`;
+        }
+        catch (e) {
+            return `缩短失败: ${e instanceof Error ? e.message : String(e)}`;
+        }
+    },
+});

package/commands/shorten/[url]/index.ts

@@ -0,0 +1,17 @@
+import { defineCommand } from 'zhin.js/command';
+import { isValidUrl, shortenUrl } from '../../../src/short-url-lib.js';
+
+export default defineCommand({
+  description: '缩短一个 URL',
+  params: { url: { type: 'string' } },
+  async execute({ params }) {
+    const url = String(params.url ?? '');
+    if (!isValidUrl(url)) return '请提供有效的 HTTP/HTTPS 链接';
+    try {
+      const short = await shortenUrl(url);
+      return `短链接: ${short}`;
+    } catch (e: unknown) {
+      return `缩短失败: ${e instanceof Error ? e.message : String(e)}`;
+    }
+  },
+});

package/lib/index.d.ts

@@ -1,2 +1,2 @@
-export {};
+export { expandUrl, isValidUrl, shortenUrl } from './short-url-lib.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC"}

package/lib/index.js

@@ -1,80 +1,2 @@
-import { formatCompact, MessageCommand, usePlugin, ZhinTool } from 'zhin.js';
-const { addCommand, addTool, logger } = usePlugin();
-// ── helpers ──────────────────────────────────────────────
-function isValidUrl(input) {
-    try {
-        const u = new URL(input);
-        return u.protocol === 'http:' || u.protocol === 'https:';
-    }
-    catch {
-        return false;
-    }
-}
-async function shortenUrl(url) {
-    const api = `https://is.gd/create.php?format=json&url=${encodeURIComponent(url)}`;
-    const res = await fetch(api);
-    if (!res.ok)
-        throw new Error(`is.gd 返回 ${res.status}`);
-    const data = (await res.json());
-    if (data.errorcode)
-        throw new Error(data.errormessage ?? '缩短失败');
-    return data.shorturl;
-}
-async function expandUrl(url) {
-    const res = await fetch(url, { redirect: 'manual' });
-    const location = res.headers.get('location');
-    if (location)
-        return location;
-    if (res.ok)
-        return url;
-    throw new Error(`无法展开链接 (${res.status})`);
-}
-// ── commands ─────────────────────────────────────────────
-addCommand(new MessageCommand('短链 <url:text>')
-    .desc('缩短一个 URL')
-    .action(async (_message, result) => {
-    const url = result.params.url;
-    if (!isValidUrl(url))
-        return '请提供有效的 HTTP/HTTPS 链接';
-    try {
-        const short = await shortenUrl(url);
-        return `短链接: ${short}`;
-    }
-    catch (e) {
-        logger.warn(formatCompact({ op: 'shorten', ok: false, error: e instanceof Error ? e.message : String(e) }));
-        return `缩短失败: ${e instanceof Error ? e.message : String(e)}`;
-    }
-}));
-addCommand(new MessageCommand('展开 <url:text>')
-    .desc('展开一个短链接，显示原始地址')
-    .action(async (_message, result) => {
-    const url = result.params.url;
-    if (!isValidUrl(url))
-        return '请提供有效的 HTTP/HTTPS 链接';
-    try {
-        const original = await expandUrl(url);
-        return `原始链接: ${original}`;
-    }
-    catch (e) {
-        logger.warn(formatCompact({ op: 'expand', ok: false, error: e instanceof Error ? e.message : String(e) }));
-        return `展开失败: ${e instanceof Error ? e.message : String(e)}`;
-    }
-}));
-// ── AI tool ──────────────────────────────────────────────
-addTool(new ZhinTool('short_url')
-    .desc('缩短一个 URL，返回短链接')
-    .keyword('短链', '缩短', 'shorten', 'short url')
-    .param('url', { type: 'string', description: '要缩短的完整 URL' }, true)
-    .execute(async (args) => {
-    const url = args.url;
-    if (!isValidUrl(url))
-        return '无效的 URL，需要 http:// 或 https:// 开头';
-    try {
-        return await shortenUrl(url);
-    }
-    catch (e) {
-        return `缩短失败: ${e instanceof Error ? e.message : String(e)}`;
-    }
-})
-    .toTool());
+export { expandUrl, isValidUrl, shortenUrl } from './short-url-lib.js';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC"}

package/lib/short-url-lib.d.ts

@@ -0,0 +1,4 @@
+export declare function isValidUrl(input: string): boolean;
+export declare function shortenUrl(url: string): Promise<string>;
+export declare function expandUrl(url: string): Promise<string>;
+//# sourceMappingURL=short-url-lib.d.ts.map

package/lib/short-url-lib.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"short-url-lib.d.ts","sourceRoot":"","sources":["../src/short-url-lib.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAOjD;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO7D;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO5D"}

package/lib/short-url-lib.js

@@ -0,0 +1,30 @@
+export function isValidUrl(input) {
+    try {
+        const u = new URL(input);
+        return u.protocol === 'http:' || u.protocol === 'https:';
+    }
+    catch {
+        return false;
+    }
+}
+export async function shortenUrl(url) {
+    const api = `https://is.gd/create.php?format=json&url=${encodeURIComponent(url)}`;
+    const res = await fetch(api);
+    if (!res.ok)
+        throw new Error(`is.gd 返回 ${res.status}`);
+    const data = (await res.json());
+    if (!data.shorturl)
+        throw new Error(data.errormessage ?? '缩短失败');
+    return data.shorturl;
+}
+export async function expandUrl(url) {
+    // 不能用 redirect:'manual'：undici 下返回 opaqueredirect（status 0、headers 空），
+    // 拿不到 location。改为跟随重定向后比较最终 URL。
+    const res = await fetch(url, { redirect: 'follow' });
+    if (res.url && res.url !== url)
+        return res.url;
+    if (res.ok)
+        return url;
+    throw new Error(`无法展开链接 (${res.status})`);
+}
+//# sourceMappingURL=short-url-lib.js.map

package/lib/short-url-lib.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"short-url-lib.js","sourceRoot":"","sources":["../src/short-url-lib.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,UAAU,CAAC,KAAa;IACtC,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QACzB,OAAO,CAAC,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAW;IAC1C,MAAM,GAAG,GAAG,4CAA4C,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClF,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,GAAG,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,YAAY,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IACvD,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAqE,CAAC;IACpG,IAAI,CAAC,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC,CAAC;IACjE,OAAO,IAAI,CAAC,QAAQ,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAW;IACzC,uEAAuE;IACvE,iCAAiC;IACjC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IACrD,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,KAAK,GAAG;QAAE,OAAO,GAAG,CAAC,GAAG,CAAC;IAC/C,IAAI,GAAG,CAAC,EAAE;QAAE,OAAO,GAAG,CAAC;IACvB,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;AAC5C,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zhin.js/plugin-short-url",
-  "version": "1.0.1",
-  "description": "URL shortener plugin for Zhin.js — shorten & expand URLs",
+  "version": "1.1.1",
+  "description": "URL shortener plugin for Zhin.js — shorten & expand URLs (Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -14,8 +14,13 @@
     "./package.json": "./package.json"
   },
   "files": [
+    "plugin.js",
+    "schema.json",
+    "commands",
     "src",
     "lib",
+    "tools",
+    "skills",
     "README.md"
   ],
   "keywords": [
@@ -32,13 +37,24 @@
     "url": "https://github.com/lc-cn"
   },
   "license": "MIT",
-  "dependencies": {},
   "devDependencies": {
     "typescript": "^6.0.3",
-    "zhin.js": "2.0.1"
+    "vitest": "^4.1.10",
+    "zod": "^4.4.3",
+    "zhin.js": "1.1.2"
   },
   "peerDependencies": {
-    "zhin.js": "2.0.1"
+    "zod": "^4.0.0",
+    "@zhin.js/command": "^1.1.1",
+    "zhin.js": "^1.1.2"
+  },
+  "peerDependenciesMeta": {
+    "@zhin.js/command": {
+      "optional": true
+    },
+    "zod": {
+      "optional": true
+    }
   },
   "repository": {
     "type": "git",
@@ -49,8 +65,38 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  },
+  "zhin": {
+    "protocol": 1,
+    "type": "plugin",
+    "entry": "./plugin.js",
+    "engine": "^1.0.0",
+    "runtime": "trusted",
+    "features": [
+      {
+        "package": "@zhin.js/command",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/tool",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/skill",
+        "api": "^1.0.0"
+      }
+    ],
+    "plugins": []
+  },
+  "dependencies": {
+    "@zhin.js/tool": "1.1.1",
+    "@zhin.js/skill": "1.1.1"
+  },
   "scripts": {
-    "build": "tsc --build",
-    "clean": "rimraf lib"
+    "build": "tsc",
+    "clean": "rimraf lib",
+    "test": "NODE_OPTIONS=--experimental-strip-types vitest run --root ../../.. plugins/utils/short-url/tests"
   }
 }

package/plugin.js

@@ -0,0 +1,8 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { definePlugin } from 'zhin.js';
+export default definePlugin({
+    name: 'short-url',
+    metadata: {
+        displayName: 'Short URL',
+    },
+});

package/schema.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {}
+}

package/skills/short-url/SKILL.md

@@ -0,0 +1,40 @@
+---
+name: short-url
+description: >-
+  短链接生成能力。当用户想缩短一个长 URL 或生成短链时使用。
+  用户说「帮我缩短这个链接」「转成短链」或给了一个很长的 URL 时应触发。
+keywords:
+  - short-url
+  - 短链
+  - shorten
+  - URL
+  - 链接
+  - 缩短
+tags:
+  - short-url
+  - utility
+tools:
+  - short_url
+---
+
+# 短链接生成技能
+
+## 工具
+
+| 工具 | 用途 | 参数 |
+|------|------|------|
+| `short_url` | 缩短 URL | `url`（原始链接，必须是 http/https） |
+
+**Example:**
+```
+用户: 帮我缩短 https://very-long-domain.com/path/to/something?with=params&and=more
+→ short_url(url="https://very-long-domain.com/path/to/something?with=params&and=more")
+→ 返回: https://is.gd/xxxxx
+```
+
+使用 is.gd 服务生成短链接。
+
+## 注意
+
+- 输入必须是合法的 http/https URL。
+- 展开短链查看原始地址的功能通过聊天命令 `展开 <url>` 使用。

package/skills/short-url/tools/short_url/index.js

@@ -0,0 +1,19 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineAgentTool } from '@zhin.js/tool';
+import { z } from 'zod';
+import { isValidUrl, shortenUrl } from "../../../../lib/short-url-lib.js";
+export default defineAgentTool({
+    description: '缩短一个 URL，返回短链接',
+    inputSchema: z.object({ url: z.string().min(1) }),
+    keywords: ['短链', '缩短', 'shorten', 'short url'],
+    async execute({ url }) {
+        if (!isValidUrl(url))
+            return '无效的 URL，需要 http:// 或 https:// 开头';
+        try {
+            return await shortenUrl(url);
+        }
+        catch (e) {
+            return `缩短失败: ${e instanceof Error ? e.message : String(e)}`;
+        }
+    },
+});

package/skills/short-url/tools/short_url/index.ts

@@ -0,0 +1,17 @@
+import { defineAgentTool } from '@zhin.js/tool';
+import { z } from 'zod';
+import { isValidUrl, shortenUrl } from '../../../../src/short-url-lib.js';
+
+export default defineAgentTool<{ url: string }>({
+  description: '缩短一个 URL，返回短链接',
+  inputSchema: z.object({ url: z.string().min(1) }),
+  keywords: ['短链', '缩短', 'shorten', 'short url'],
+  async execute({ url }) {
+    if (!isValidUrl(url)) return '无效的 URL，需要 http:// 或 https:// 开头';
+    try {
+      return await shortenUrl(url);
+    } catch (e: unknown) {
+      return `缩短失败: ${e instanceof Error ? e.message : String(e)}`;
+    }
+  },
+});

package/src/index.ts

@@ -1,84 +1 @@
-import { formatCompact, MessageCommand, usePlugin, ZhinTool } from 'zhin.js'
-
-const { addCommand, addTool, logger } = usePlugin()
-
-// ── helpers ──────────────────────────────────────────────
-
-function isValidUrl(input: string): boolean {
-  try {
-    const u = new URL(input)
-    return u.protocol === 'http:' || u.protocol === 'https:'
-  } catch {
-    return false
-  }
-}
-
-async function shortenUrl(url: string): Promise<string> {
-  const api = `https://is.gd/create.php?format=json&url=${encodeURIComponent(url)}`
-  const res = await fetch(api)
-  if (!res.ok) throw new Error(`is.gd 返回 ${res.status}`)
-  const data = (await res.json()) as { shorturl?: string; errorcode?: number; errormessage?: string }
-  if (data.errorcode) throw new Error(data.errormessage ?? '缩短失败')
-  return data.shorturl!
-}
-
-async function expandUrl(url: string): Promise<string> {
-  const res = await fetch(url, { redirect: 'manual' })
-  const location = res.headers.get('location')
-  if (location) return location
-  if (res.ok) return url
-  throw new Error(`无法展开链接 (${res.status})`)
-}
-
-// ── commands ─────────────────────────────────────────────
-
-addCommand(
-  new MessageCommand('短链 <url:text>')
-    .desc('缩短一个 URL')
-    .action(async (_message, result) => {
-      const url = result.params.url as string
-      if (!isValidUrl(url)) return '请提供有效的 HTTP/HTTPS 链接'
-      try {
-        const short = await shortenUrl(url)
-        return `短链接: ${short}`
-      } catch (e: unknown) {
-        logger.warn(formatCompact( { op: 'shorten', ok: false, error: e instanceof Error ? e.message : String(e) }))
-        return `缩短失败: ${e instanceof Error ? e.message : String(e)}`
-      }
-    }),
-)
-
-addCommand(
-  new MessageCommand('展开 <url:text>')
-    .desc('展开一个短链接，显示原始地址')
-    .action(async (_message, result) => {
-      const url = result.params.url as string
-      if (!isValidUrl(url)) return '请提供有效的 HTTP/HTTPS 链接'
-      try {
-        const original = await expandUrl(url)
-        return `原始链接: ${original}`
-      } catch (e: unknown) {
-        logger.warn(formatCompact( { op: 'expand', ok: false, error: e instanceof Error ? e.message : String(e) }))
-        return `展开失败: ${e instanceof Error ? e.message : String(e)}`
-      }
-    }),
-)
-
-// ── AI tool ──────────────────────────────────────────────
-
-addTool(
-  new ZhinTool('short_url')
-    .desc('缩短一个 URL，返回短链接')
-    .keyword('短链', '缩短', 'shorten', 'short url')
-    .param('url', { type: 'string', description: '要缩短的完整 URL' }, true)
-    .execute(async (args) => {
-      const url = args.url as string
-      if (!isValidUrl(url)) return '无效的 URL，需要 http:// 或 https:// 开头'
-      try {
-        return await shortenUrl(url)
-      } catch (e: unknown) {
-        return `缩短失败: ${e instanceof Error ? e.message : String(e)}`
-      }
-    })
-    .toTool(),
-)
+export { expandUrl, isValidUrl, shortenUrl } from './short-url-lib.js';

package/src/short-url-lib.ts

@@ -0,0 +1,26 @@
+export function isValidUrl(input: string): boolean {
+  try {
+    const u = new URL(input);
+    return u.protocol === 'http:' || u.protocol === 'https:';
+  } catch {
+    return false;
+  }
+}
+
+export async function shortenUrl(url: string): Promise<string> {
+  const api = `https://is.gd/create.php?format=json&url=${encodeURIComponent(url)}`;
+  const res = await fetch(api);
+  if (!res.ok) throw new Error(`is.gd 返回 ${res.status}`);
+  const data = (await res.json()) as { shorturl?: string; errorcode?: number; errormessage?: string };
+  if (!data.shorturl) throw new Error(data.errormessage ?? '缩短失败');
+  return data.shorturl;
+}
+
+export async function expandUrl(url: string): Promise<string> {
+  // 不能用 redirect:'manual'：undici 下返回 opaqueredirect（status 0、headers 空），
+  // 拿不到 location。改为跟随重定向后比较最终 URL。
+  const res = await fetch(url, { redirect: 'follow' });
+  if (res.url && res.url !== url) return res.url;
+  if (res.ok) return url;
+  throw new Error(`无法展开链接 (${res.status})`);
+}