@zhin.js/plugin-short-url 3.0.4 → 3.0.6

package/commands/expand/[url:string].js

@@ -0,0 +1,18 @@
+// 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: '展开一个短链接，显示原始地址',
+    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/shorten/[url:string].js

@@ -0,0 +1,18 @@
+// 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',
+    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/lib/short-url-lib.d.ts.map

@@ -1 +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,CAM5D"}
+{"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

@@ -18,10 +18,11 @@ export async function shortenUrl(url) {
     return data.shorturl;
 }
 export async function expandUrl(url) {
-    const res = await fetch(url, { redirect: 'manual' });
-    const location = res.headers.get('location');
-    if (location)
-        return location;
+    // 不能用 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})`);

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

@@ -1 +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,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC7C,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,IAAI,GAAG,CAAC,EAAE;QAAE,OAAO,GAAG,CAAC;IACvB,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;AAC5C,CAAC"}
+{"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,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-short-url",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "URL shortener plugin for Zhin.js — shorten & expand URLs (Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
@@ -14,7 +14,7 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "plugin.ts",
+    "plugin.js",
     "schema.json",
     "commands",
     "src",
@@ -37,18 +37,18 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@zhin.js/plugin-runtime": "1.1.0",
-    "@zhin.js/command": "1.0.2"
+    "@zhin.js/command": "1.0.4",
+    "@zhin.js/plugin-runtime": "1.1.1"
   },
   "devDependencies": {
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.0.5"
+    "@zhin.js/agent": "1.0.7"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/agent": "1.0.5"
+    "@zhin.js/agent": "1.0.7"
   },
   "peerDependenciesMeta": {
     "@zhin.js/agent": {
@@ -73,7 +73,7 @@
   "zhin": {
     "protocol": 1,
     "type": "plugin",
-    "entry": "./plugin.ts",
+    "entry": "./plugin.js",
     "engine": "^1.0.0",
     "runtime": "trusted",
     "features": [

package/plugin.js

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

package/src/short-url-lib.ts

@@ -17,9 +17,10 @@ export async function shortenUrl(url: string): Promise<string> {
 }
 
 export async function expandUrl(url: string): Promise<string> {
-  const res = await fetch(url, { redirect: 'manual' });
-  const location = res.headers.get('location');
-  if (location) return location;
+  // 不能用 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})`);
 }

package/plugin.ts

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