@morehao/dsh-github-trending 0.7.8 → 0.7.9

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [v0.7.9] - 2026-11-01
+
+> 内部重构：把重复的通用实现收敛到共享底座 `@morehao/dsh-plugin-kit@^0.3.1`。对外接口与业务语义保持不变。
+
+### 改进 — 迁移到 dsh-plugin-kit 0.3.1
+
+- **子进程执行**：`src/core/exec.ts` 收敛到 kit `./exec` 的 `spawnCollect` / `sanitizedEnv`，删除本地实现；握手阶段改为判 `result.error` 抛 `CORE_SPAWN_FAILED`（kit 的 `spawnCollect` 永不 reject）。
+- **插件身份**：`plugin-info.ts` 的仓库地址规范化与读包改用 kit `./github` + `./meta`（`createPluginMeta`），保留 `readPluginInfo` / `normalizeRepositoryUrl` 导出面与返回形状。
+- **HTTP 路由**：`routes.ts` 的 `sendJson` / `readBody` / 头校验改用 kit `./http` 的 `createRouteHandler`；业务 `dispatch`、`IpcError` 错误码与 `PluginUpdateError→409` 映射保持不变，错误码翻译仍留在插件侧。
+- 对外路由响应形状、读包字段、错误码/映射均无变化（行为等价）。
+
 ## [v0.7.8] - 2026-11-01
 
 > 统一「订阅」口径：这个功能不再叫「发版」，运行记录、概览、设置、订阅页与提示文案一致；顺带修好运行记录里的类型胶囊样式。

package/lib/{chunk-HYVMRVGP.js → chunk-YJ5GF3MW.js}

@@ -1,8 +1,8 @@
-import {
-  __export,
-  execCapture,
-  sanitizedEnv
-} from "./chunk-R7BK7SJK.js";
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 
 // src/config.ts
 var config_exports = {};
@@ -1148,16 +1148,15 @@ __export(handshake_exports, {
   DEFAULT_PROVIDERS: () => DEFAULT_PROVIDERS,
   handshake: () => handshake
 });
+import { spawnCollect as execCapture } from "@morehao/dsh-plugin-kit/exec";
 var DEFAULT_PROVIDERS = ["deepseek", "openai-compatible"];
 async function handshake(core, options = {}) {
-  let result;
-  try {
-    result = await execCapture(core.path, ["version", "--json"], {
-      timeoutMs: options.timeoutMs ?? 5e3,
-      signal: options.signal
-    });
-  } catch (error) {
-    const detail = error instanceof Error ? error.message : String(error);
+  const result = await execCapture(core.path, ["version", "--json"], {
+    timeoutMs: options.timeoutMs ?? 5e3,
+    signal: options.signal
+  });
+  if (result.error !== void 0) {
+    const detail = result.error.message;
     throw new IpcError("CORE_SPAWN_FAILED", `\u65E0\u6CD5\u6267\u884C\u6838\u5FC3 ${core.path}\uFF1A${detail}`);
   }
   if (result.aborted || options.signal?.aborted === true) {
@@ -1590,6 +1589,7 @@ __export(run_exports, {
   runCore: () => runCore
 });
 import { spawn as spawn2 } from "child_process";
+import { sanitizedEnv } from "@morehao/dsh-plugin-kit/exec";
 var DEFAULT_RUN_TIMEOUT_MS = 12e4;
 var MAX_STDOUT = 16 * 1024 * 1024;
 var MAX_STDERR = 2 * 1024 * 1024;
@@ -1772,6 +1772,7 @@ __export(core_exports, {
 });
 import { accessSync as accessSync2, constants as constants3, statSync as statSync4 } from "fs";
 import path7 from "path";
+import { spawnCollect as execCapture2 } from "@morehao/dsh-plugin-kit/exec";
 function coreRepoFromSource(repo) {
   let ownerRepo = repo;
   if (ownerRepo === void 0) {
@@ -1876,7 +1877,7 @@ async function detectCoexistence(ownPath, options = {}) {
   }
   let status;
   try {
-    const result = await execCapture(found, ["version", "--json"], { timeoutMs: 3e3 });
+    const result = await execCapture2(found, ["version", "--json"], { timeoutMs: 3e3 });
     if (result.code !== 0) {
       status = {
         found: true,
@@ -1970,8 +1971,8 @@ async function defaultGhToken(fresh = false) {
   if (!fresh && ghTokenCache !== void 0 && Date.now() - ghTokenCache.at < GH_TOKEN_TTL_MS) {
     return ghTokenCache.value;
   }
-  const { execCapture: execCapture2 } = await import("./exec-VMDINNX5.js");
-  const result = await execCapture2("gh", ["auth", "token"], { timeoutMs: 2e3 });
+  const { spawnCollect: execCapture6 } = await import("@morehao/dsh-plugin-kit/exec");
+  const result = await execCapture6("gh", ["auth", "token"], { timeoutMs: 2e3 });
   const token = result.code === 0 ? result.stdout.trim() : "";
   const value = token === "" ? void 0 : token;
   ghTokenCache = { value, at: Date.now() };
@@ -2660,6 +2661,7 @@ __export(subscribe_exports, {
 import { mkdtempSync as mkdtempSync2, writeFileSync as writeFileSync2, rmSync as rmSync2 } from "fs";
 import os3 from "os";
 import path8 from "path";
+import { spawnCollect as execCapture3, sanitizedEnv as sanitizedEnv2 } from "@morehao/dsh-plugin-kit/exec";
 var SUBSCRIBE_TIMEOUT_MS = 8e3;
 var RELEASES_TIMEOUT_MS = 3e4;
 var REPO_PATTERN2 = /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/;
@@ -2709,8 +2711,8 @@ async function runSubscribe(input, deps) {
       configPath: file
     };
     const timeoutMs = input.action === "releases" ? RELEASES_TIMEOUT_MS : SUBSCRIBE_TIMEOUT_MS;
-    const result = await execCapture(corePath, ["subscribe", "--json"], {
-      env: sanitizedEnv(env),
+    const result = await execCapture3(corePath, ["subscribe", "--json"], {
+      env: sanitizedEnv2(env),
       input: JSON.stringify(request),
       timeoutMs
     });
@@ -3411,40 +3413,17 @@ __export(plugin_info_exports, {
   normalizeRepositoryUrl: () => normalizeRepositoryUrl,
   readPluginInfo: () => readPluginInfo
 });
-import { createRequire as createRequire2 } from "module";
+import { normalizeRepositoryUrl } from "@morehao/dsh-plugin-kit/github";
+import { createPluginMeta } from "@morehao/dsh-plugin-kit/meta";
 var DEFAULT_NAME = "@morehao/dsh-github-trending";
-function normalizeRepositoryUrl(value) {
-  if (typeof value !== "string") return void 0;
-  let url = value.trim();
-  if (url === "") return void 0;
-  url = url.replace(/^git\+/i, "");
-  const ssh = /^git@github\.com:([^/]+)\/(.+?)(?:\.git)?$/i.exec(url);
-  if (ssh !== null) url = `https://github.com/${ssh[1]}/${ssh[2]}`;
-  url = url.replace(/\.git$/i, "");
-  try {
-    const parsed = new URL(url);
-    if (parsed.protocol !== "https:" && parsed.protocol !== "http:") return void 0;
-    if (parsed.hostname.toLowerCase() !== "github.com") return void 0;
-    const pathname = parsed.pathname.replace(/\/+$/, "");
-    if (pathname === "") return void 0;
-    return `https://github.com${pathname}`;
-  } catch {
-    return void 0;
-  }
-}
+var PKG_URL = new URL("../package.json", import.meta.url);
 function readPluginInfo() {
-  try {
-    const require2 = createRequire2(import.meta.url);
-    const pkg = require2("../package.json");
-    const repository = typeof pkg.repository === "string" ? normalizeRepositoryUrl(pkg.repository) : typeof pkg.repository === "object" && pkg.repository !== null ? normalizeRepositoryUrl(pkg.repository.url) : void 0;
-    return {
-      name: typeof pkg.name === "string" && pkg.name !== "" ? pkg.name : DEFAULT_NAME,
-      version: typeof pkg.version === "string" ? pkg.version : "0.0.0",
-      ...repository === void 0 ? {} : { repository }
-    };
-  } catch {
-    return { name: DEFAULT_NAME, version: "0.0.0" };
-  }
+  const meta = createPluginMeta({ pkgUrl: PKG_URL, defaultName: DEFAULT_NAME });
+  return {
+    name: meta.name,
+    version: meta.version,
+    ...meta.repository === void 0 ? {} : { repository: meta.repository }
+  };
 }
 
 // src/host/github.ts
@@ -3958,6 +3937,7 @@ __export(repo_exports, {
 });
 import { statSync as statSync6 } from "fs";
 import path11 from "path";
+import { spawnCollect as execCapture4 } from "@morehao/dsh-plugin-kit/exec";
 function isDirectory(dir) {
   try {
     return statSync6(dir).isDirectory();
@@ -3967,7 +3947,7 @@ function isDirectory(dir) {
 }
 async function git(dir, args, env) {
   try {
-    const result = await execCapture("git", ["-C", dir, ...args], { env, timeoutMs: 5e3 });
+    const result = await execCapture4("git", ["-C", dir, ...args], { env, timeoutMs: 5e3 });
     return result.code === 0 ? result.stdout.trim() : void 0;
   } catch {
     return void 0;
@@ -3998,77 +3978,53 @@ __export(routes_exports, {
   ROUTE_PREFIX: () => ROUTE_PREFIX,
   createRoutes: () => createRoutes
 });
+import { createRouteHandler, HttpError } from "@morehao/dsh-plugin-kit/http";
 import { PluginUpdateError } from "@morehao/dsh-plugin-kit/update";
 var ROUTE_PREFIX = "/api/morehao/github-trending";
 var HEADER = "x-dsh-github-trending";
 var MAX_BODY2 = 512 * 1024;
-function sendJson2(response, status, payload) {
-  const body = JSON.stringify(payload);
-  response.writeHead(status, {
-    "content-type": "application/json; charset=utf-8",
-    "cache-control": "no-store",
-    "content-length": Buffer.byteLength(body)
-  });
-  response.end(body);
-}
-async function readBody2(request) {
-  const chunks = [];
-  let size = 0;
-  for await (const chunk of request) {
-    size += chunk.length;
-    if (size > MAX_BODY2) throw new IpcError("PAYLOAD_TOO_LARGE", "\u8BF7\u6C42\u4F53\u8FC7\u5927");
-    chunks.push(chunk);
-  }
-  if (chunks.length === 0) return {};
-  const text = Buffer.concat(chunks).toString("utf8").trim();
-  if (text === "") return {};
-  try {
-    const value = JSON.parse(text);
-    if (typeof value !== "object" || value === null || Array.isArray(value)) {
-      throw new Error("body must be a JSON object");
-    }
-    return value;
-  } catch (error) {
-    throw new IpcError("CONFIG_INVALID", `\u8BF7\u6C42\u4F53\u4E0D\u662F JSON \u5BF9\u8C61\uFF1A${error instanceof Error ? error.message : String(error)}`);
-  }
-}
 function createRoutes(deps) {
-  return async function handler(request, response) {
-    if (request.headers[HEADER] !== "1") {
-      sendJson2(response, 403, { ok: false, code: "FORBIDDEN", message: `\u7F3A\u5C11 ${HEADER}: 1 \u5934` });
-      return;
-    }
-    const url = new URL(request.url ?? "/", "http://127.0.0.1");
-    const pathname = url.pathname.startsWith(ROUTE_PREFIX) ? url.pathname.slice(ROUTE_PREFIX.length) || "/" : url.pathname;
-    const method = (request.method ?? "GET").toUpperCase();
-    try {
-      const result = await dispatch(method, pathname, url, request, deps);
-      if (!response.writableEnded) sendJson2(response, 200, { ok: true, ...result });
-    } catch (error) {
-      if (response.writableEnded) return;
+  const logger = deps.logger;
+  let current = { method: "GET", pathname: "/" };
+  const handler = createRouteHandler({
+    prefix: ROUTE_PREFIX,
+    header: HEADER,
+    maxBodyBytes: MAX_BODY2,
+    dispatch: async ({ method, pathname, url, body }) => {
+      current = { method, pathname };
+      return dispatch(method, pathname, url, body, deps);
+    },
+    // 错误码翻译留在插件侧（dispatcher 不做映射）：保持与原实现的响应形状逐字一致。
+    onError: (error) => {
       if (error instanceof PluginUpdateError) {
-        deps.logger?.("update.failed", { code: error.code, message: error.message });
-        sendJson2(response, 409, {
-          ok: false,
+        logger?.("update.failed", { code: error.code, message: error.message });
+        return {
+          status: 409,
           code: "UPDATE_FAILED",
-          updateCode: error.code,
           message: redact(error.message),
-          update: deps.update?.view() ?? null
-        });
-        return;
+          extra: { updateCode: error.code, update: deps.update?.view() ?? null }
+        };
+      }
+      if (error instanceof HttpError) {
+        const code2 = error.code === "PAYLOAD_TOO_LARGE" ? "PAYLOAD_TOO_LARGE" : "CONFIG_INVALID";
+        return { status: 400, code: code2, message: redact(error.message) };
       }
       const code = error instanceof IpcError ? error.code : "INTERNAL";
       const message = redact(error instanceof Error ? error.message : String(error));
-      deps.logger?.("route.error", { pathname, method, code, message });
+      logger?.("route.error", { pathname: current.pathname, method: current.method, code, message });
       const status = code === "CONFIG_INVALID" ? (
         // 「已有一次运行在进行中」是并发冲突而非参数错误：用 409，前端据此禁用按钮并提示。
         message.includes("\u8FD0\u884C\u5728\u8FDB\u884C\u4E2D") ? 409 : 400
       ) : code === "NOT_FOUND" ? 404 : 500;
-      sendJson2(response, status, { ok: false, code, message });
-    }
+      return { status, code, message };
+    },
+    logger
+  });
+  return async function routeHandler(request, response) {
+    await handler(request, response);
   };
 }
-async function dispatch(method, pathname, url, request, deps) {
+async function dispatch(method, pathname, url, body, deps) {
   const env = deps.env ?? process.env;
   const settings = deps.store.readSettings();
   if (method === "GET" && pathname === "/state") return statePayload(deps, settings);
@@ -4079,7 +4035,6 @@ async function dispatch(method, pathname, url, request, deps) {
   }
   if (method === "POST" && pathname === "/update") {
     if (deps.update === void 0) throw new IpcError("NOT_FOUND", "\u81EA\u66F4\u65B0\u670D\u52A1\u4E0D\u53EF\u7528");
-    const body = await readBody2(request);
     const version = typeof body.version === "string" && body.version.trim() !== "" ? body.version.trim() : void 0;
     const result = await deps.update.apply(version === void 0 ? {} : { version });
     return { result, update: deps.update.view() };
@@ -4095,7 +4050,6 @@ async function dispatch(method, pathname, url, request, deps) {
     return { downloaded: true, path: core.path, tag: core.tag ?? null, core: status };
   }
   if (method === "POST" && pathname === "/config") {
-    const body = await readBody2(request);
     const incoming = normalizeSettings(body.settings ?? body);
     const section = typeof body.section === "string" && SETTINGS_SECTIONS.includes(body.section) ? body.section : void 0;
     let next = section === void 0 ? incoming : mergeSettingsSection(settings, incoming, section);
@@ -4114,7 +4068,6 @@ async function dispatch(method, pathname, url, request, deps) {
     return { saved: true, settings: next, problems: [] };
   }
   if (method === "POST" && pathname === "/preflight") {
-    const body = await readBody2(request);
     const candidate = body.settings === void 0 ? settings : normalizeSettings(body.settings);
     const result = await preflightModel({
       settings: candidate,
@@ -4125,7 +4078,6 @@ async function dispatch(method, pathname, url, request, deps) {
     return { preflight: result };
   }
   if (method === "POST" && pathname === "/run") {
-    const body = await readBody2(request);
     const base = {
       dryRun: body.dryRun === true,
       ...typeof body.date === "string" && body.date !== "" ? { date: body.date } : {},
@@ -4143,7 +4095,6 @@ async function dispatch(method, pathname, url, request, deps) {
     return { cancelled: deps.runner.cancel() };
   }
   if (method === "POST" && pathname === "/releases/run") {
-    const body = await readBody2(request);
     let repo;
     if (body.repo !== void 0) {
       if (typeof body.repo !== "string" || !isValidRepo(body.repo.trim())) {
@@ -4191,7 +4142,6 @@ async function dispatch(method, pathname, url, request, deps) {
     return { ...result.doc };
   }
   if (method === "POST" && pathname === "/subscriptions") {
-    const body = await readBody2(request);
     const action = body.action === "add" || body.action === "remove" ? body.action : void 0;
     if (action === void 0) throw new IpcError("CONFIG_INVALID", "action \u5FC5\u987B\u662F add \u6216 remove");
     const repos = Array.isArray(body.repos) ? body.repos.filter((item) => typeof item === "string" && item.trim() !== "").map((item) => item.trim()) : typeof body.repo === "string" && body.repo.trim() !== "" ? [body.repo.trim()] : [];
@@ -4206,7 +4156,6 @@ async function dispatch(method, pathname, url, request, deps) {
     return { repos: latest.ok ? latest.repos : [], items: latest.ok ? latest.items ?? [] : [] };
   }
   if (method === "POST" && pathname === "/github/test") {
-    const body = await readBody2(request);
     const candidate = body.settings === void 0 ? settings : normalizeSettings(body.settings);
     const probe = await probeGithubAuth({
       credentials: credentialServices(deps.get),
@@ -4225,7 +4174,6 @@ async function dispatch(method, pathname, url, request, deps) {
     return { providers: candidates, defaultSelection: readDefaultSelection(deps.get) ?? null };
   }
   if (method === "POST" && pathname === "/quickfill") {
-    const body = await readBody2(request);
     const candidates = await listProviderCandidates({
       llm: llmServices(deps.get),
       credentials: credentialServices(deps.get),
@@ -4357,6 +4305,7 @@ __export(update_exports, {
 });
 import { normalizeProfile } from "@morehao/dsh-plugin-kit";
 import { createPluginUpdater } from "@morehao/dsh-plugin-kit/update";
+import { spawnCollect as execCapture5, sanitizedEnv as sanitizedEnv3 } from "@morehao/dsh-plugin-kit/exec";
 function pnpmViewRunner(get, env, exec) {
   return async (spec) => {
     const profile = normalizeProfile(get("profileContext"));
@@ -4367,7 +4316,7 @@ function pnpmViewRunner(get, env, exec) {
     try {
       result = await exec(command, [...prefix, "view", spec, "version", "--json"], {
         cwd: profile.dir,
-        env: sanitizedEnv(env),
+        env: sanitizedEnv3(env),
         timeoutMs: 8e3,
         maxStdout: 64 * 1024,
         maxStderr: 16 * 1024
@@ -4389,7 +4338,7 @@ function pnpmViewRunner(get, env, exec) {
   };
 }
 function createUpdateService(deps) {
-  const exec = deps.exec ?? execCapture;
+  const exec = deps.exec ?? execCapture5;
   return createPluginUpdater({
     meta: deps.meta,
     getPluginManager: () => deps.get("pluginManager"),

package/lib/index.js

@@ -8,8 +8,7 @@ import {
   createTrendingRunTool,
   createUpdateService,
   readPluginInfo
-} from "./chunk-HYVMRVGP.js";
-import "./chunk-R7BK7SJK.js";
+} from "./chunk-YJ5GF3MW.js";
 
 // src/index.ts
 var name = "dsh-github-trending";

package/lib/internal.d.ts

@@ -1,4 +1,8 @@
 import { ErrorCode, FileArtifact, Usage, ReleasesReport, SubscriptionItem, SubscriptionDoc, SubscriptionStatus, ErrorInfo, RunRequest, RunResult, State, StateRun, SubscriptionList, SubscriptionVolume } from '@morehao/trendradar-contract';
+import { ExecOptions, ExecResult } from '@morehao/dsh-plugin-kit/exec';
+import * as exec from '@morehao/dsh-plugin-kit/exec';
+export { exec };
+import { normalizeRepositoryUrl } from '@morehao/dsh-plugin-kit/github';
 import http from 'node:http';
 import { Updater, PluginMeta, Logger } from '@morehao/dsh-plugin-kit/update';
 
@@ -930,40 +934,6 @@ declare namespace channel {
   export { type channel_ChannelKind as ChannelKind, type channel_ConfigChannel as ConfigChannel, channel_WRITE_TIMEOUT_MS as WRITE_TIMEOUT_MS, channel_openConfigChannel as openConfigChannel, channel_removeChannelDir as removeChannelDir };
 }
 
-interface ExecResult {
-    code: number | null;
-    signal: NodeJS.Signals | null;
-    stdout: string;
-    stderr: string;
-    timedOut: boolean;
-    aborted: boolean;
-    durationMs: number;
-}
-declare function sanitizedEnv(source?: NodeJS.ProcessEnv, extra?: Record<string, string | undefined>): Record<string, string>;
-interface ExecOptions {
-    env?: NodeJS.ProcessEnv;
-    cwd?: string;
-    timeoutMs?: number;
-    signal?: AbortSignal;
-    maxStdout?: number;
-    maxStderr?: number;
-    /** 写入子进程 stdin 的内容（写完即关闭）；省略则 stdin 为 ignore。 */
-    input?: string;
-}
-/**
- * 执行一次短命令并收集输出（握手、共存探测都走这里）。
- * 超时与取消都先 SIGTERM、3 s 后 SIGKILL——核心是单进程，不需要 process group。
- */
-declare function execCapture(file: string, args: string[], options?: ExecOptions): Promise<ExecResult>;
-
-type exec_ExecOptions = ExecOptions;
-type exec_ExecResult = ExecResult;
-declare const exec_execCapture: typeof execCapture;
-declare const exec_sanitizedEnv: typeof sanitizedEnv;
-declare namespace exec {
-  export { type exec_ExecOptions as ExecOptions, type exec_ExecResult as ExecResult, exec_execCapture as execCapture, exec_sanitizedEnv as sanitizedEnv };
-}
-
 declare const DEFAULT_RUN_TIMEOUT_MS = 120000;
 interface RunCoreOptions {
     core: CoreLocation;
@@ -1654,13 +1624,24 @@ declare namespace subscribe {
   export { subscribe_RELEASES_TIMEOUT_MS as RELEASES_TIMEOUT_MS, subscribe_SUBSCRIBE_TIMEOUT_MS as SUBSCRIBE_TIMEOUT_MS, type subscribe_SubscribeDeps as SubscribeDeps, subscribe_isValidRepo as isValidRepo, subscribe_runSubscribe as runSubscribe };
 }
 
+/**
+ * 插件自身元数据：包名、版本、仓库地址。
+ *
+ * `/state.plugin` 是界面上「关于」的唯一来源：版本不能硬编码在客户端，仓库地址
+ * 也不能从客户端猜。`package.json.repository.url` 常见形态是
+ * `git+https://github.com/o/r.git` 或 `git@github.com:o/r.git`，统一规范化成
+ * `https://github.com/o/r`；解析不了就返回 undefined，界面隐藏外链而不是猜。
+ *
+ * 读包与规范化仓库地址都交给 `@morehao/dsh-plugin-kit` 的 `./meta` + `./github`；
+ * 这里保留 `readPluginInfo()` / `normalizeRepositoryUrl()` 两个对内部（测试与 index）
+ * 的既有导出面，形状不变。
+ */
+
 interface PluginInfo {
     name: string;
     version: string;
     repository?: string;
 }
-/** 只放行 GitHub 的 http(s) 地址；ssh / git+ 前缀先归一化。 */
-declare function normalizeRepositoryUrl(value: unknown): string | undefined;
 declare function readPluginInfo(): PluginInfo;
 
 type pluginInfo_PluginInfo = PluginInfo;
@@ -2164,4 +2145,4 @@ declare namespace tools {
   export { tools_createTrendingHistoryTool as createTrendingHistoryTool, tools_createTrendingRunTool as createTrendingRunTool };
 }
 
-export { channel, config, core, credentials, errors, exec, github, handshake$1 as handshake, importCli, ipc, locate, paths, pendingPr, pluginInfo, preflight, proxy, quickfill, release, repo, routes, run, runner, schedule, state, subscribe, tools, update as updateService, version };
+export { channel, config, core, credentials, errors, github, handshake$1 as handshake, importCli, ipc, locate, paths, pendingPr, pluginInfo, preflight, proxy, quickfill, release, repo, routes, run, runner, schedule, state, subscribe, tools, update as updateService, version };

package/lib/internal.js

@@ -26,17 +26,17 @@ import {
   tools_exports,
   update_exports,
   version_exports
-} from "./chunk-HYVMRVGP.js";
-import {
-  exec_exports
-} from "./chunk-R7BK7SJK.js";
+} from "./chunk-YJ5GF3MW.js";
+
+// src/internal.ts
+import * as exec from "@morehao/dsh-plugin-kit/exec";
 export {
   channel_exports as channel,
   config_exports as config,
   core_exports as core,
   credentials_exports as credentials,
   errors_exports as errors,
-  exec_exports as exec,
+  exec,
   github_exports as github,
   handshake_exports as handshake,
   import_cli_exports as importCli,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morehao/dsh-github-trending",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "description": "GitHub 趋势日报插件：每天定时 spawn 本地 trendradar 核心，抓取 Trending、生成中文简介与总结，提交到你的仓库并自动合并 PR。",
   "type": "module",
   "main": "lib/index.js",
@@ -50,7 +50,7 @@
     }
   },
   "dependencies": {
-    "@morehao/dsh-plugin-kit": "0.2.1",
+    "@morehao/dsh-plugin-kit": "^0.3.1",
     "@morehao/trendradar-contract": "0.5.0"
   },
   "dsh": {

package/lib/chunk-R7BK7SJK.js

@@ -1,121 +0,0 @@
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-
-// src/core/exec.ts
-var exec_exports = {};
-__export(exec_exports, {
-  execCapture: () => execCapture,
-  sanitizedEnv: () => sanitizedEnv
-});
-import { spawn } from "child_process";
-var ENV_KEYS = [
-  "PATH",
-  "HOME",
-  "USER",
-  "LOGNAME",
-  "SHELL",
-  "TMPDIR",
-  "TMP",
-  "TEMP",
-  "LANG",
-  "LC_ALL",
-  "LC_CTYPE",
-  "SSL_CERT_FILE",
-  "SSL_CERT_DIR",
-  "GIT_AUTHOR_NAME",
-  "GIT_AUTHOR_EMAIL",
-  "GIT_COMMITTER_NAME",
-  "GIT_COMMITTER_EMAIL",
-  "GIT_CONFIG_GLOBAL",
-  "GIT_SSH_COMMAND"
-];
-var PROXY_KEYS = [
-  "HTTP_PROXY",
-  "HTTPS_PROXY",
-  "NO_PROXY",
-  "ALL_PROXY",
-  "http_proxy",
-  "https_proxy",
-  "no_proxy",
-  "all_proxy"
-];
-function sanitizedEnv(source = process.env, extra = {}) {
-  const env = {};
-  for (const key of [...ENV_KEYS, ...PROXY_KEYS]) {
-    const value = source[key];
-    if (typeof value === "string" && value !== "") env[key] = value;
-  }
-  for (const [key, value] of Object.entries(extra)) {
-    if (typeof value === "string" && value !== "") env[key] = value;
-  }
-  return env;
-}
-function killTree(child, signal) {
-  try {
-    child.kill(signal);
-  } catch {
-  }
-}
-async function execCapture(file, args, options = {}) {
-  const started = Date.now();
-  const timeoutMs = options.timeoutMs ?? 1e4;
-  const maxStdout = options.maxStdout ?? 1024 * 1024;
-  const maxStderr = options.maxStderr ?? 1024 * 1024;
-  const child = spawn(file, args, {
-    cwd: options.cwd,
-    env: options.env ?? process.env,
-    stdio: [options.input === void 0 ? "ignore" : "pipe", "pipe", "pipe"],
-    windowsHide: true
-  });
-  if (options.input !== void 0) {
-    child.stdin?.on("error", () => void 0);
-    child.stdin?.end(options.input);
-  }
-  let stdout = "";
-  let stderr = "";
-  let timedOut = false;
-  let aborted = false;
-  const hardKill = setTimeout(() => killTree(child, "SIGKILL"), timeoutMs + 3e3);
-  const timer = setTimeout(() => {
-    timedOut = true;
-    killTree(child, "SIGTERM");
-  }, timeoutMs);
-  const onAbort = () => {
-    aborted = true;
-    killTree(child, "SIGTERM");
-  };
-  options.signal?.addEventListener("abort", onAbort, { once: true });
-  child.stdout?.setEncoding("utf8");
-  child.stdout?.on("data", (chunk) => {
-    if (stdout.length < maxStdout) stdout += chunk;
-  });
-  child.stderr?.setEncoding("utf8");
-  child.stderr?.on("data", (chunk) => {
-    if (stderr.length < maxStderr) stderr += chunk;
-  });
-  const result = await new Promise((resolve, reject) => {
-    child.on("error", (error) => reject(error));
-    child.on("close", (code, signal) => resolve({ code, signal }));
-  });
-  clearTimeout(timer);
-  clearTimeout(hardKill);
-  options.signal?.removeEventListener("abort", onAbort);
-  return {
-    ...result,
-    stdout,
-    stderr,
-    timedOut,
-    aborted,
-    durationMs: Date.now() - started
-  };
-}
-
-export {
-  __export,
-  sanitizedEnv,
-  execCapture,
-  exec_exports
-};

package/lib/exec-VMDINNX5.js

@@ -1,8 +0,0 @@
-import {
-  execCapture,
-  sanitizedEnv
-} from "./chunk-R7BK7SJK.js";
-export {
-  execCapture,
-  sanitizedEnv
-};