@zhin.js/plugin-60s 1.1.0 → 1.1.2

package/src/handlers/moyu.ts

@@ -1,7 +1,8 @@
-import { asArray, asRecord, asString, fetchApi, type ApiPayload } from '../api.js';
+import { asArray, asRecord, asString, type ApiPayload } from '../api.js';
+import type { SixtySClient } from '../client.js';
 
-export default async function () {
-  const data = await fetchApi<ApiPayload | string>('/moyu');
+export default async function (client: SixtySClient) {
+  const data = await client.fetch<ApiPayload | string>('/moyu');
   if (typeof data === 'string') return `🐟 摸鱼日历\n\n${data}`;
   const lines = ['🐟 摸鱼日历', ''];
   const date = asRecord(data.date);

package/src/handlers/toutiao-hot.ts

@@ -1,6 +1,7 @@
-import { fetchApi, formatList, type ListItem } from '../api.js';
+import { formatList, type ListItem } from '../api.js';
+import type { SixtySClient } from '../client.js';
 
-export default async function (args: { limit?: number }) {
-  const data = await fetchApi<ListItem[]>('/toutiao');
+export default async function (client: SixtySClient, args: { limit?: number }) {
+  const data = await client.fetch<ListItem[]>('/toutiao');
   return ['🔥 头条热搜', '', formatList(data, args.limit || 10)].join('\n');
 }

package/src/handlers/translate.ts

@@ -1,9 +1,10 @@
-import { asRecord, asString, fetchApi } from '../api.js';
+import { asRecord, asString } from '../api.js';
+import type { SixtySClient } from '../client.js';
 
-export default async function (args: { text: string; to?: string }) {
+export default async function (client: SixtySClient, args: { text: string; to?: string }) {
   const params: Record<string, string> = { text: args.text };
   if (args.to) params.to = args.to;
-  const data = await fetchApi('/fanyi', params);
+  const data = await client.fetch('/fanyi', params);
   const source = asRecord(data.source);
   const target = asRecord(data.target);
   const srcText = asString(source.text) || args.text;

package/src/handlers/weather.ts

@@ -1,7 +1,8 @@
-import { asRecord, asString, fetchApi } from '../api.js';
+import { asRecord, asString } from '../api.js';
+import type { SixtySClient } from '../client.js';
 
-export default async function (args: { city: string }) {
-  const data = await fetchApi('/weather', { query: args.city });
+export default async function (client: SixtySClient, args: { city: string }) {
+  const data = await client.fetch('/weather', { query: args.city });
   const w = asRecord(data.weather);
   const aq = asRecord(data.air_quality);
   const loc = asRecord(data.location);

package/src/handlers/weibo-hot.ts

@@ -1,6 +1,7 @@
-import { fetchApi, formatList, type ListItem } from '../api.js';
+import { formatList, type ListItem } from '../api.js';
+import type { SixtySClient } from '../client.js';
 
-export default async function (args: { limit?: number }) {
-  const data = await fetchApi<ListItem[]>('/weibo');
+export default async function (client: SixtySClient, args: { limit?: number }) {
+  const data = await client.fetch<ListItem[]>('/weibo');
   return ['🔥 微博热搜', '', formatList(data, args.limit || 10)].join('\n');
 }

package/src/handlers/zhihu-hot.ts

@@ -1,6 +1,7 @@
-import { fetchApi, formatList, type ListItem } from '../api.js';
+import { formatList, type ListItem } from '../api.js';
+import type { SixtySClient } from '../client.js';
 
-export default async function (args: { limit?: number }) {
-  const data = await fetchApi<ListItem[]>('/zhihu');
+export default async function (client: SixtySClient, args: { limit?: number }) {
+  const data = await client.fetch<ListItem[]>('/zhihu');
   return ['🔥 知乎热榜', '', formatList(data, args.limit || 10)].join('\n');
 }

package/src/index.ts

@@ -2,7 +2,6 @@ export {
   asArray,
   asRecord,
   asString,
-  fetchApi,
   formatList,
 } from './api.js';
 export type { ApiPayload, ListItem } from './api.js';

package/agent/skills/60s.md

@@ -1,91 +0,0 @@
----
-name: "60s"
-description: >-
-  60s 聚合信息查询能力。当用户请求新闻、天气、热搜（微博/知乎/抖音/头条）、
-  金价、油价、汇率、翻译、一言/每日一句、摸鱼日历、KFC 文案、段子、
-  历史上的今天、IP 查询、Bing 每日壁纸时使用。即使用户没有提到 60s，
-  只要涉及上述日常信息查询，就应触发。
-keywords:
-  - 60s
-  - 新闻
-  - 天气
-  - 微博
-  - 知乎
-  - 抖音
-  - 头条
-  - 一言
-  - 摸鱼
-  - 金价
-  - 油价
-  - 汇率
-  - 翻译
-  - 历史
-  - kfc
-  - 段子
-  - 壁纸
-  - bing
-  - ip
-  - 热搜
-tags:
-  - 新闻
-  - 资讯
-  - 天气
-  - 热搜
-  - 生活
-  - 金融
-  - 娱乐
-  - 工具
-tools:
-  - 60s_news
-  - bing_image
-  - douyin_hot
-  - duanzi
-  - exchange_rate
-  - fuel_price
-  - gold_price
-  - history_today
-  - hitokoto
-  - ip_query
-  - kfc
-  - moyu
-  - toutiao_hot
-  - translate_60s
-  - weather
-  - weibo_hot
-  - zhihu_hot
----
-
-# 60s 聚合信息查询技能
-
-一站式日常信息查询，覆盖新闻、天气、热搜、金融、娱乐等 17 个工具。
-
-## 工具速查
-
-根据用户意图选择对应工具：
-
-| 用户说… | 用这个工具 |
-|---------|-----------|
-| 今天有什么新闻 / 60s 看世界 | `60s_news` |
-| XX 天气怎么样 | `weather` |
-| 微博热搜 | `weibo_hot` |
-| 知乎热搜 | `zhihu_hot` |
-| 抖音热搜 | `douyin_hot` |
-| 今日头条 | `toutiao_hot` |
-| 金价多少 | `gold_price` |
-| 油价多少 | `fuel_price` |
-| 美元汇率 / 人民币兑日元 | `exchange_rate` |
-| 翻译一下 XX | `translate_60s` |
-| 来句一言 / 每日一句 | `hitokoto` |
-| 摸鱼日历 / 今天摸鱼 | `moyu` |
-| KFC 文案 / 疯狂星期四 | `kfc` |
-| 来个段子 | `duanzi` |
-| 历史上的今天 | `history_today` |
-| 查 IP / 我的 IP | `ip_query` |
-| Bing 壁纸 / 每日壁纸 | `bing_image` |
-
-## 易错点
-
-1. **weather 需要城市名参数**，用户没说城市时需要先确认。
-2. **exchange_rate 需要币种参数**，如 USD、JPY、EUR 等。
-3. **translate_60s 是简易翻译**，对于复杂翻译任务应建议使用专业翻译工具。
-4. **热搜类工具不需要参数**，直接调用即可获取当前热搜列表。

package/agent/tools/bing_image.ts

@@ -1,13 +0,0 @@
-import { defineAgentTool } from '@zhin.js/agent/tools';
-import { z } from 'zod';
-
-export default defineAgentTool({
-  description: "获取 Bing 每日壁纸图片",
-  inputSchema: z.object({}),
-  keywords: ["bing", "必应", "壁纸", "每日壁纸"],
-  tags: ["图片", "壁纸", "Bing"],
-  async execute() {
-    const handler = (await import('../../src/handlers/bing-image.js')).default;
-    return handler();
-  },
-});

package/agent/tools/douyin_hot.ts

@@ -1,13 +0,0 @@
-import { defineAgentTool } from '@zhin.js/agent/tools';
-import { z } from 'zod';
-
-export default defineAgentTool<{ limit?: number }>({
-  description: "获取抖音热搜榜",
-  inputSchema: z.object({ limit: z.number().optional() }),
-  keywords: ["抖音", "热搜", "douyin", "dy"],
-  tags: ["热搜", "短视频", "抖音"],
-  async execute(input) {
-    const handler = (await import('../../src/handlers/douyin-hot.js')).default;
-    return handler(input);
-  },
-});

package/agent/tools/duanzi.ts

@@ -1,13 +0,0 @@
-import { defineAgentTool } from '@zhin.js/agent/tools';
-import { z } from 'zod';
-
-export default defineAgentTool({
-  description: "获取一个段子",
-  inputSchema: z.object({}),
-  keywords: ["段子", "笑话", "搞笑", "joke", "duanzi"],
-  tags: ["娱乐", "笑话", "段子"],
-  async execute() {
-    const handler = (await import('../../src/handlers/duanzi.js')).default;
-    return handler();
-  },
-});

package/agent/tools/fuel_price.ts

@@ -1,13 +0,0 @@
-import { defineAgentTool } from '@zhin.js/agent/tools';
-import { z } from 'zod';
-
-export default defineAgentTool<{ province?: string }>({
-  description: "查询今日油价",
-  inputSchema: z.object({ province: z.string().optional() }),
-  keywords: ["油价", "汽油", "柴油", "fuel"],
-  tags: ["生活", "油价", "价格"],
-  async execute(input) {
-    const handler = (await import('../../src/handlers/fuel-price.js')).default;
-    return handler(input);
-  },
-});

package/agent/tools/gold_price.ts

@@ -1,13 +0,0 @@
-import { defineAgentTool } from '@zhin.js/agent/tools';
-import { z } from 'zod';
-
-export default defineAgentTool({
-  description: "查询今日黄金价格",
-  inputSchema: z.object({}),
-  keywords: ["金价", "黄金", "黄金价格", "gold"],
-  tags: ["金融", "黄金", "价格"],
-  async execute() {
-    const handler = (await import('../../src/handlers/gold-price.js')).default;
-    return handler();
-  },
-});

package/agent/tools/history_today.ts

@@ -1,13 +0,0 @@
-import { defineAgentTool } from '@zhin.js/agent/tools';
-import { z } from 'zod';
-
-export default defineAgentTool({
-  description: "查看历史上的今天发生了什么",
-  inputSchema: z.object({}),
-  keywords: ["历史", "历史上的今天", "今天历史", "history"],
-  tags: ["历史", "知识", "日历"],
-  async execute() {
-    const handler = (await import('../../src/handlers/history-today.js')).default;
-    return handler();
-  },
-});

package/agent/tools/ip_query.ts

@@ -1,13 +0,0 @@
-import { defineAgentTool } from '@zhin.js/agent/tools';
-import { z } from 'zod';
-
-export default defineAgentTool<{ ip?: string }>({
-  description: "查询 IP 地址的地理位置信息",
-  inputSchema: z.object({ ip: z.string().optional() }),
-  keywords: ["ip", "IP", "IP查询", "ip查询"],
-  tags: ["网络", "查询", "IP"],
-  async execute(input) {
-    const handler = (await import('../../src/handlers/ip-query.js')).default;
-    return handler(input);
-  },
-});

package/agent/tools/kfc.ts

@@ -1,13 +0,0 @@
-import { defineAgentTool } from '@zhin.js/agent/tools';
-import { z } from 'zod';
-
-export default defineAgentTool({
-  description: "获取 KFC 疯狂星期四文案",
-  inputSchema: z.object({}),
-  keywords: ["kfc", "KFC", "疯狂星期四", "v50", "肯德基"],
-  tags: ["娱乐", "KFC", "文案"],
-  async execute() {
-    const handler = (await import('../../src/handlers/kfc.js')).default;
-    return handler();
-  },
-});

package/agent/tools/moyu.ts

@@ -1,13 +0,0 @@
-import { defineAgentTool } from '@zhin.js/agent/tools';
-import { z } from 'zod';
-
-export default defineAgentTool({
-  description: "获取摸鱼日历，查看今天适不适合摸鱼",
-  inputSchema: z.object({}),
-  keywords: ["摸鱼", "摸鱼日历", "moyu"],
-  tags: ["生活", "摸鱼", "日历"],
-  async execute() {
-    const handler = (await import('../../src/handlers/moyu.js')).default;
-    return handler();
-  },
-});

package/agent/tools/weibo_hot.ts

@@ -1,13 +0,0 @@
-import { defineAgentTool } from '@zhin.js/agent/tools';
-import { z } from 'zod';
-
-export default defineAgentTool<{ limit?: number }>({
-  description: "获取微博热搜榜",
-  inputSchema: z.object({ limit: z.number().optional() }),
-  keywords: ["微博", "热搜", "weibo", "wb"],
-  tags: ["热搜", "社交", "微博"],
-  async execute(input) {
-    const handler = (await import('../../src/handlers/weibo-hot.js')).default;
-    return handler(input);
-  },
-});

package/agent/tools/zhihu_hot.ts

@@ -1,13 +0,0 @@
-import { defineAgentTool } from '@zhin.js/agent/tools';
-import { z } from 'zod';
-
-export default defineAgentTool<{ limit?: number }>({
-  description: "获取知乎热榜",
-  inputSchema: z.object({ limit: z.number().optional() }),
-  keywords: ["知乎", "热榜", "zhihu", "zh"],
-  tags: ["热搜", "社交", "知乎"],
-  async execute(input) {
-    const handler = (await import('../../src/handlers/zhihu-hot.js')).default;
-    return handler(input);
-  },
-});

package/commands/60s.ts

@@ -1,7 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../src/handlers/60s-news.js';
-
-export default defineCommand({
-  description: '每日60秒新闻',
-  execute: () => handler(),
-});

package/commands/bing.ts

@@ -1,7 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../src/handlers/bing-image.js';
-
-export default defineCommand({
-  description: 'Bing 每日壁纸',
-  execute: () => handler(),
-});

package/commands/douyin/[[limit]].ts

@@ -1,8 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../../src/handlers/douyin-hot.js';
-
-export default defineCommand({
-  description: '抖音热搜',
-  params: { limit: { type: 'number', default: 10 } },
-  execute: ({ params }) => handler({ limit: Number(params.limit) }),
-});

package/commands/duanzi.ts

@@ -1,7 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../src/handlers/duanzi.js';
-
-export default defineCommand({
-  description: '随机段子',
-  execute: () => handler(),
-});

package/commands/fanyi/[text].js

@@ -1,8 +0,0 @@
-// Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { defineCommand } from 'zhin.js/command';
-import handler from "../../lib/handlers/translate.js";
-export default defineCommand({
-    description: '文本翻译',
-    params: { text: { type: 'string' } },
-    execute: ({ params, args }) => handler({ text: String(params.text), to: args[0] != null ? String(args[0]) : undefined }),
-});

package/commands/fanyi/[text].ts

@@ -1,8 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../../src/handlers/translate.js';
-
-export default defineCommand({
-  description: '文本翻译',
-  params: { text: { type: 'string' } },
-  execute: ({ params, args }) => handler({ text: String(params.text), to: args[0] != null ? String(args[0]) : undefined }),
-});

package/commands/fuel/[province].js

@@ -1,8 +0,0 @@
-// Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { defineCommand } from 'zhin.js/command';
-import handler from "../../lib/handlers/fuel-price.js";
-export default defineCommand({
-    description: '今日油价',
-    params: { province: { type: 'string' } },
-    execute: ({ params }) => handler({ province: params.province != null ? String(params.province) : undefined }),
-});

package/commands/fuel/[province].ts

@@ -1,8 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../../src/handlers/fuel-price.js';
-
-export default defineCommand({
-  description: '今日油价',
-  params: { province: { type: 'string' } },
-  execute: ({ params }) => handler({ province: params.province != null ? String(params.province) : undefined }),
-});

package/commands/gold.ts

@@ -1,7 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../src/handlers/gold-price.js';
-
-export default defineCommand({
-  description: '今日金价',
-  execute: () => handler(),
-});

package/commands/history.ts

@@ -1,7 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../src/handlers/history-today.js';
-
-export default defineCommand({
-  description: '历史上的今天',
-  execute: () => handler(),
-});

package/commands/hitokoto/[type].js

@@ -1,8 +0,0 @@
-// Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { defineCommand } from 'zhin.js/command';
-import handler from "../../lib/handlers/hitokoto.js";
-export default defineCommand({
-    description: '随机一言',
-    params: { type: { type: 'string' } },
-    execute: ({ params }) => handler({ type: params.type != null ? String(params.type) : undefined }),
-});

package/commands/hitokoto/[type].ts

@@ -1,8 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../../src/handlers/hitokoto.js';
-
-export default defineCommand({
-  description: '随机一言',
-  params: { type: { type: 'string' } },
-  execute: ({ params }) => handler({ type: params.type != null ? String(params.type) : undefined }),
-});

package/commands/ip/[ip].js

@@ -1,8 +0,0 @@
-// Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { defineCommand } from 'zhin.js/command';
-import handler from "../../lib/handlers/ip-query.js";
-export default defineCommand({
-    description: 'IP 查询',
-    params: { ip: { type: 'string' } },
-    execute: ({ params }) => handler({ ip: params.ip != null ? String(params.ip) : undefined }),
-});

package/commands/ip/[ip].ts

@@ -1,8 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../../src/handlers/ip-query.js';
-
-export default defineCommand({
-  description: 'IP 查询',
-  params: { ip: { type: 'string' } },
-  execute: ({ params }) => handler({ ip: params.ip != null ? String(params.ip) : undefined }),
-});

package/commands/kfc.ts

@@ -1,7 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../src/handlers/kfc.js';
-
-export default defineCommand({
-  description: 'KFC 文案',
-  execute: () => handler(),
-});

package/commands/moyu.ts

@@ -1,7 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../src/handlers/moyu.js';
-
-export default defineCommand({
-  description: '摸鱼日历',
-  execute: () => handler(),
-});

package/commands/toutiao/[[limit]].ts

@@ -1,8 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../../src/handlers/toutiao-hot.js';
-
-export default defineCommand({
-  description: '头条热搜',
-  params: { limit: { type: 'number', default: 10 } },
-  execute: ({ params }) => handler({ limit: Number(params.limit) }),
-});

package/commands/weather/[city].ts

@@ -1,8 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../../src/handlers/weather.js';
-
-export default defineCommand({
-  description: '查询城市天气',
-  params: { city: { type: 'string' } },
-  execute: ({ params }) => handler({ city: String(params.city) }),
-});

package/commands/weibo/[[limit]].ts

@@ -1,8 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../../src/handlers/weibo-hot.js';
-
-export default defineCommand({
-  description: '微博热搜',
-  params: { limit: { type: 'number', default: 10 } },
-  execute: ({ params }) => handler({ limit: Number(params.limit) }),
-});

package/commands/zhihu/[[limit]].ts

@@ -1,8 +0,0 @@
-import { defineCommand } from 'zhin.js/command';
-import handler from '../../src/handlers/zhihu-hot.js';
-
-export default defineCommand({
-  description: '知乎热榜',
-  params: { limit: { type: 'number', default: 10 } },
-  execute: ({ params }) => handler({ limit: Number(params.limit) }),
-});

package/lib/runtime-deps.js

@@ -1,22 +0,0 @@
-/**
- * 60s apiBase 运行时注入 — plugin setup 注册 getter，fetchApi 每次调用时求值。
- * 参考 lottery 的 registerLotteryAgentDeps：registration 模式，卸载时反注册，无 process.env 残留。
- */
-export const DEFAULT_API_BASE = 'https://60s.viki.moe';
-const registrations = [];
-/** Generation-owned apiBase binding used by Plugin Runtime setup(). Returns unregister. */
-export function registerSixtySApiBase(getter) {
-    const registration = Object.freeze({ value: getter });
-    registrations.push(registration);
-    return () => {
-        const index = registrations.lastIndexOf(registration);
-        if (index >= 0)
-            registrations.splice(index, 1);
-    };
-}
-/** Resolve the apiBase at call time so config patches take effect without reload. */
-export function resolveApiBase() {
-    const getter = registrations[registrations.length - 1]?.value;
-    return getter?.() || DEFAULT_API_BASE;
-}
-//# sourceMappingURL=runtime-deps.js.map

package/lib/runtime-deps.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"runtime-deps.js","sourceRoot":"","sources":["../src/runtime-deps.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,sBAAsB,CAAC;AAIvD,MAAM,aAAa,GAAmD,EAAE,CAAC;AAEzE,2FAA2F;AAC3F,MAAM,UAAU,qBAAqB,CAAC,MAA2B;IAC/D,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IACtD,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjC,OAAO,GAAG,EAAE;QACV,MAAM,KAAK,GAAG,aAAa,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,KAAK,IAAI,CAAC;YAAE,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC;AACJ,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,cAAc;IAC5B,MAAM,MAAM,GAAG,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC;IAC9D,OAAO,MAAM,EAAE,EAAE,IAAI,gBAAgB,CAAC;AACxC,CAAC"}

package/src/runtime-deps.ts

@@ -1,26 +0,0 @@
-/**
- * 60s apiBase 运行时注入 — plugin setup 注册 getter，fetchApi 每次调用时求值。
- * 参考 lottery 的 registerLotteryAgentDeps：registration 模式，卸载时反注册，无 process.env 残留。
- */
-
-export const DEFAULT_API_BASE = 'https://60s.viki.moe';
-
-export type SixtySApiBaseGetter = () => string;
-
-const registrations: Array<{ readonly value: SixtySApiBaseGetter }> = [];
-
-/** Generation-owned apiBase binding used by Plugin Runtime setup(). Returns unregister. */
-export function registerSixtySApiBase(getter: SixtySApiBaseGetter): () => void {
-  const registration = Object.freeze({ value: getter });
-  registrations.push(registration);
-  return () => {
-    const index = registrations.lastIndexOf(registration);
-    if (index >= 0) registrations.splice(index, 1);
-  };
-}
-
-/** Resolve the apiBase at call time so config patches take effect without reload. */
-export function resolveApiBase(): string {
-  const getter = registrations[registrations.length - 1]?.value;
-  return getter?.() || DEFAULT_API_BASE;
-}