@zhin.js/plugin-qrcode 3.0.2 → 3.0.3

package/agent/tools/qrcode_generate.ts

@@ -1,8 +1,8 @@
-import { defineTool } from '@zhin.js/agent/tools';
+import { defineAgentTool } from '@zhin.js/agent/tools';
 import { z } from 'zod';
 import { buildQrImageUrl } from '../../src/qrcode-lib.js';
 
-export default defineTool<{ text: string }>({
+export default defineAgentTool<{ text: string }>({
   description: '根据文本或 URL 生成二维码图片',
   inputSchema: z.object({ text: z.string().min(1) }),
   keywords: ['二维码', 'QR', 'qrcode'],

package/commands/[text:string].ts

@@ -0,0 +1,11 @@
+import { defineCommand } from '@zhin.js/command';
+import { raw } from '@zhin.js/core/runtime';
+import { buildQrImageUrl } from '../src/qrcode-lib.js';
+
+export default defineCommand({
+  description: '根据文本或链接生成二维码图片',
+  execute: ({ params }) => raw({
+    type: 'image',
+    data: { url: buildQrImageUrl(String(params.text)) },
+  }),
+});

package/commands/scan/[url:string].ts

@@ -0,0 +1,28 @@
+import { defineCommand } from '@zhin.js/command';
+
+const QR_API_BASE = 'https://api.qrserver.com/v1';
+
+export default defineCommand({
+  description: '识别图片中的二维码内容',
+  async execute({ params }) {
+    const imageUrl = String(params.url);
+    const apiUrl = `${QR_API_BASE}/read-qr-code/?fileurl=${encodeURIComponent(imageUrl)}`;
+    try {
+      const response = await fetch(apiUrl);
+      if (!response.ok) {
+        return '二维码识别服务请求失败';
+      }
+      const data = (await response.json()) as Array<{
+        symbol: Array<{ data: string | null; error: string | null }>;
+      }>;
+      const symbol = data?.[0]?.symbol?.[0];
+      if (!symbol || symbol.error || !symbol.data) {
+        return `未能识别二维码内容${symbol?.error ? `：${symbol.error}` : ''}`;
+      }
+      return `识别结果：${symbol.data}`;
+    } catch (e) {
+      console.warn(`[qrcode] scan failed: ${e instanceof Error ? e.message : String(e)}`);
+      return '二维码识别失败，请检查图片链接是否有效';
+    }
+  },
+});

package/lib/index.js

@@ -0,0 +1,2 @@
+export { buildQrImageUrl, qrImageSegment } from './qrcode-lib.js';
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC"}

package/lib/qrcode-lib.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"qrcode-lib.js","sourceRoot":"","sources":["../src/qrcode-lib.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,GAAG,6BAA6B,CAAC;AAElD,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,GAAG,WAAW,sCAAsC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;AACxF,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAgB,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;AAC5D,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zhin.js/plugin-qrcode",
-  "version": "3.0.2",
-  "description": "QR code generator & reader plugin for Zhin.js",
+  "version": "3.0.3",
+  "description": "QR code generator & reader plugin for Zhin.js (Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -14,6 +14,9 @@
     "./package.json": "./package.json"
   },
   "files": [
+    "plugin.ts",
+    "schema.json",
+    "commands",
     "src",
     "lib",
     "agent",
@@ -33,16 +36,28 @@
     "url": "https://github.com/lc-cn"
   },
   "license": "MIT",
+  "dependencies": {
+    "@zhin.js/command": "1.0.1",
+    "@zhin.js/plugin-runtime": "1.0.1",
+    "@zhin.js/core": "1.3.5"
+  },
   "devDependencies": {
     "typescript": "^6.0.3",
+    "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "zhin.js": "4.1.2",
-    "@zhin.js/agent": "1.0.3"
+    "@zhin.js/agent": "1.0.4"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "zhin.js": "4.1.2",
-    "@zhin.js/agent": "1.0.3"
+    "@zhin.js/agent": "1.0.4"
+  },
+  "peerDependenciesMeta": {
+    "@zhin.js/agent": {
+      "optional": true
+    },
+    "zod": {
+      "optional": true
+    }
   },
   "repository": {
     "type": "git",
@@ -53,17 +68,26 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "peerDependenciesMeta": {
-    "@zhin.js/agent": {
-      "optional": true
-    },
-    "zod": {
-      "optional": true
-    }
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  },
+  "zhin": {
+    "protocol": 1,
+    "type": "plugin",
+    "entry": "./plugin.ts",
+    "engine": "^1.0.0",
+    "runtime": "trusted",
+    "features": [
+      {
+        "package": "@zhin.js/command",
+        "api": "^1.0.0"
+      }
+    ],
+    "plugins": []
   },
   "scripts": {
     "build": "tsc",
     "clean": "rimraf lib",
-    "test": "sh -c 'cd ../../.. && vitest run plugins/utils/qrcode/tests'"
+    "test": "NODE_OPTIONS=--experimental-strip-types vitest run --root ../../.. plugins/utils/qrcode/tests"
   }
 }

package/plugin.ts

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

package/schema.json

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

package/src/index.ts

@@ -1,42 +1 @@
-import { formatCompact, MessageCommand, usePlugin } from 'zhin.js';
-import { qrImageSegment } from './qrcode-lib.js';
-
-const { addCommand, logger } = usePlugin();
-
-const QR_API_BASE = 'https://api.qrserver.com/v1';
-
-addCommand(
-  new MessageCommand('二维码 <text:text>')
-    .desc('根据文本或链接生成二维码图片')
-    .action(async (_message, result) => {
-      const text = result.params.text;
-      logger.debug(formatCompact({ op: 'generate', len: text.length }));
-      return qrImageSegment(text);
-    }),
-);
-
-addCommand(
-  new MessageCommand('扫码 <url:text>')
-    .desc('识别图片中的二维码内容')
-    .action(async (_message, result) => {
-      const imageUrl = result.params.url;
-      const apiUrl = `${QR_API_BASE}/read-qr-code/?fileurl=${encodeURIComponent(imageUrl)}`;
-      try {
-        const response = await fetch(apiUrl);
-        if (!response.ok) {
-          return '二维码识别服务请求失败';
-        }
-        const data = (await response.json()) as Array<{
-          symbol: Array<{ data: string | null; error: string | null }>;
-        }>;
-        const symbol = data?.[0]?.symbol?.[0];
-        if (!symbol || symbol.error || !symbol.data) {
-          return `未能识别二维码内容${symbol?.error ? `：${symbol.error}` : ''}`;
-        }
-        return `识别结果：${symbol.data}`;
-      } catch (e) {
-        logger.warn(formatCompact({ op: 'scan', ok: false, error: e instanceof Error ? e.message : String(e) }));
-        return '二维码识别失败，请检查图片链接是否有效';
-      }
-    }),
-);
+export { buildQrImageUrl, qrImageSegment } from './qrcode-lib.js';

package/lib/agent/tools/qrcode_generate.js

@@ -1,14 +0,0 @@
-import { defineTool } from '@zhin.js/agent/tools';
-import { z } from 'zod';
-import { buildQrImageUrl } from '../../src/qrcode-lib.js';
-export default defineTool({
-    description: '根据文本或 URL 生成二维码图片',
-    inputSchema: z.object({ text: z.string().min(1) }),
-    keywords: ['二维码', 'QR', 'qrcode'],
-    tags: ['qrcode', 'image'],
-    async execute({ text }) {
-        const qrUrl = buildQrImageUrl(text);
-        return JSON.stringify([{ type: 'image', data: { url: qrUrl } }]);
-    },
-});
-//# sourceMappingURL=qrcode_generate.js.map

package/lib/agent/tools/qrcode_generate.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"qrcode_generate.js","sourceRoot":"","sources":["../../../agent/tools/qrcode_generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,eAAe,UAAU,CAAmB;IAC1C,WAAW,EAAE,mBAAmB;IAChC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAClD,QAAQ,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC;IACjC,IAAI,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE;QACpB,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC;CACF,CAAC,CAAC"}

package/lib/src/index.js

@@ -1,34 +0,0 @@
-import { formatCompact, MessageCommand, usePlugin } from 'zhin.js';
-import { qrImageSegment } from './qrcode-lib.js';
-const { addCommand, logger } = usePlugin();
-const QR_API_BASE = 'https://api.qrserver.com/v1';
-addCommand(new MessageCommand('二维码 <text:text>')
-    .desc('根据文本或链接生成二维码图片')
-    .action(async (_message, result) => {
-    const text = result.params.text;
-    logger.debug(formatCompact({ op: 'generate', len: text.length }));
-    return qrImageSegment(text);
-}));
-addCommand(new MessageCommand('扫码 <url:text>')
-    .desc('识别图片中的二维码内容')
-    .action(async (_message, result) => {
-    const imageUrl = result.params.url;
-    const apiUrl = `${QR_API_BASE}/read-qr-code/?fileurl=${encodeURIComponent(imageUrl)}`;
-    try {
-        const response = await fetch(apiUrl);
-        if (!response.ok) {
-            return '二维码识别服务请求失败';
-        }
-        const data = (await response.json());
-        const symbol = data?.[0]?.symbol?.[0];
-        if (!symbol || symbol.error || !symbol.data) {
-            return `未能识别二维码内容${symbol?.error ? `：${symbol.error}` : ''}`;
-        }
-        return `识别结果：${symbol.data}`;
-    }
-    catch (e) {
-        logger.warn(formatCompact({ op: 'scan', ok: false, error: e instanceof Error ? e.message : String(e) }));
-        return '二维码识别失败，请检查图片链接是否有效';
-    }
-}));
-//# sourceMappingURL=index.js.map

package/lib/src/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;AAE3C,MAAM,WAAW,GAAG,6BAA6B,CAAC;AAElD,UAAU,CACR,IAAI,cAAc,CAAC,iBAAiB,CAAC;KAClC,IAAI,CAAC,gBAAgB,CAAC;KACtB,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;IACjC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;IAChC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAClE,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC;AAC9B,CAAC,CAAC,CACL,CAAC;AAEF,UAAU,CACR,IAAI,cAAc,CAAC,eAAe,CAAC;KAChC,IAAI,CAAC,aAAa,CAAC;KACnB,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;IACjC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;IACnC,MAAM,MAAM,GAAG,GAAG,WAAW,0BAA0B,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;IACtF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAEjC,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAC5C,OAAO,YAAY,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAC/D,CAAC;QACD,OAAO,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACzG,OAAO,qBAAqB,CAAC;IAC/B,CAAC;AACH,CAAC,CAAC,CACL,CAAC"}

package/lib/src/qrcode-lib.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"qrcode-lib.js","sourceRoot":"","sources":["../../src/qrcode-lib.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,GAAG,6BAA6B,CAAC;AAElD,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,GAAG,WAAW,sCAAsC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;AACxF,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAgB,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;AAC5D,CAAC"}