dsh-skill-browser 1.8.7 → 1.9.9

package/lib/index.js

@@ -11,15 +11,42 @@ import { existsSync, readFileSync, mkdirSync, writeFileSync, appendFileSync, rea
 import { join, dirname } from "node:path";
 import { homedir } from "node:os";
 import { spawn } from "node:child_process";
-import { scanSkills, categoriesMeta, readSkillBody, parseLedgerTable, parseLedgerDetail, findLedgerFile, readLedgerAtPath, ledgerDefaultPath, setSkillDisabled } from "./scan.js";
-import {
-  createLedgerState, setLedgerRoot, setLedgerPath, recordSkillResult, reportFailure,
-  flushNow, initializeLedger, ledgerFilePath, autoLogFilePath, readAutoLog
-} from "./ledger-writer.js";
-import { ZH, UI_TEXT } from "./zh.js";
+
+// ── v1.9.4 热加载：子模块走「带版本查询串的动态 import」 ───────────────
+// 首次加载 RELOAD_V 为空串（等价静态 import）；/reload 用 ?v=<ts> 重新导入本
+// 模块时，RELOAD_V 跟着变成 ?v=<ts>，五个子模块也一并换新，而不是命中 ESM
+// 缓存里的旧代码。解构出来的仍是原来的裸标识符，下游调用点一个都不用改。
+var RELOAD_V = new URL(import.meta.url).search || "";
+var scanMod = await import("./scan.js" + RELOAD_V);
+var lwMod = await import("./ledger-writer.js" + RELOAD_V);
+var lsMod = await import("./ledger-stats.js" + RELOAD_V);
+var zhMod = await import("./zh.js" + RELOAD_V);
+var grMod = await import("./groups.js" + RELOAD_V);
+var kwMod = await import("./keyword-groups.js" + RELOAD_V);
+
+var scanSkills = scanMod.scanSkills, categoriesMeta = scanMod.categoriesMeta,
+  readSkillBody = scanMod.readSkillBody, parseLedgerTable = scanMod.parseLedgerTable,
+  parseLedgerDetail = scanMod.parseLedgerDetail, findLedgerFile = scanMod.findLedgerFile,
+  readLedgerAtPath = scanMod.readLedgerAtPath, ledgerDefaultPath = scanMod.ledgerDefaultPath,
+  setSkillDisabled = scanMod.setSkillDisabled;
+var createLedgerState = lwMod.createLedgerState, setLedgerRoot = lwMod.setLedgerRoot,
+  setLedgerPath = lwMod.setLedgerPath, recordSkillResult = lwMod.recordSkillResult,
+  reportFailure = lwMod.reportFailure, flushNow = lwMod.flushNow,
+  initializeLedger = lwMod.initializeLedger, ledgerFilePath = lwMod.ledgerFilePath,
+  autoLogFilePath = lwMod.autoLogFilePath, readAutoLog = lwMod.readAutoLog,
+  autoLogStat = lwMod.autoLogStat, readAutoLogTail = lwMod.readAutoLogTail;
+var buildStats = lsMod.buildStats;
+var ZH = zhMod.ZH, UI_TEXT = zhMod.UI_TEXT;
+var listGroups = grMod.listGroups, createGroup = grMod.createGroup,
+  renameGroup = grMod.renameGroup, deleteGroup = grMod.deleteGroup,
+  moveGroup = grMod.moveGroup, assignSkill = grMod.assignSkill,
+  assignSkills = grMod.assignSkills, aiClassify = grMod.aiClassify,
+  applyPlan = grMod.applyPlan, aiCover = grMod.aiCover, storePath = grMod.storePath,
+  describeModelRoute = grMod.describeModelRoute;
+var keywordClassify = kwMod.keywordClassify;
 
 var PREFIX = "/dsh-skill-browser";
-var VERSION = "1.8.5";
+export var VERSION = "1.9.9";
 var CACHE_TTL_MS = 30 * 1000;
 var DIAG_FILE = join(homedir(), ".dsh", "data", "dsh-skill-browser", "diag.log");
 var CONFIG_FILE = join(homedir(), ".dsh", "data", "dsh-skill-browser", "config.json");
@@ -28,6 +55,11 @@ var CONFIG_FILE = join(homedir(), ".dsh", "data", "dsh-skill-browser", "config.j
 var BATCH_MAX = 2000;
 
 export var name = "dsh-skill-browser";
+// v1.9.0: "llm" is required for the two AI features (auto-classify into
+// groups / one-click group cover art). Without it those endpoints return a
+// clear "宿主未提供 llm 服务" error instead of silently doing nothing.
+// llm is an OPTIONAL capability: NOT declared here, so the panel still loads
+// on a host/profile without it. groups.js reads it through ctx.get("llm").
 export var inject = ["webServer"];
 
 function isLoopback(req) {
@@ -154,7 +186,54 @@ function pickDirViaPowerShell() {
   });
 }
 
+// ── v1.9.4 热加载：当前生效的 API 实例（挂在 globalThis 上） ──────────
+// 必须跨模块实例共享：热重载会造出新的模块实例，如果 LIVE 是模块级变量，
+// 新实例的 handler 会读到自己那份空 LIVE，第二次重载就断链。
+var LIVE = globalThis.__DSB_LIVE__ || (globalThis.__DSB_LIVE__ = { api: null, gen: 0 });
+
+/** 用 ?v=<ts> 重新导入自身模块，换掉正在服务的 handler（host 半热重载）。 */
+async function selfReload(ctx, config) {
+  var base = new URL(import.meta.url);
+  base.search = "";
+  var fresh = await import(base.href + "?v=" + Date.now());
+  if (!fresh || typeof fresh.createApi !== "function") throw new Error("重新导入的模块没有 createApi()");
+  var api = fresh.createApi(ctx, config);
+  var old = LIVE.api;
+  LIVE.api = api;
+  LIVE.gen += 1;
+  if (old && typeof old.dispose === "function") { try { old.dispose(); } catch (e) {} }
+  // client 半：让 client-modules 重新从磁盘读 client.js，浏览器刷新即新界面
+  try {
+    var cm = typeof ctx.get === "function" ? ctx.get("clientModules") : null;
+    if (cm && typeof cm.rebuilt === "function") cm.rebuilt("dsh-skill-browser");
+  } catch (e) { /* client 半刷新失败不影响 host 半 */ }
+  return { version: fresh.VERSION || VERSION, gen: LIVE.gen };
+}
+
 export function apply(ctx, config) {
+  ctx.effect(function () {
+    var api = createApi(ctx, config);
+    LIVE.api = api;
+    var dispose = ctx.webServer.register({
+      kind: "prefix",
+      path: PREFIX,
+      handler: function (req, res) {
+        var cur = LIVE.api;
+        if (!cur) { res.writeHead(503); res.end(); return; }
+        return cur.handler(req, res);
+      }
+    });
+    return function () {
+      try { dispose(); } catch (e) {}
+      // 释放「当前生效」的那一份（热重载后已换新，不能只放最初那个实例）
+      try { if (LIVE.api && LIVE.api.dispose) LIVE.api.dispose(); } catch (e) {}
+      try { if (api.dispose) api.dispose(); } catch (e) {}
+    };
+  }, "dsh-skill-browser: api routes");
+}
+
+/** 构造一套完整 API（配置/根/台账/监听/全部路由）。热重载靠它换新。 */
+export function createApi(ctx, config) {
   var runtime = loadRuntimeConfig();
   var detected = detectRoot(config, runtime);
   var root = detected.root;
@@ -186,8 +265,9 @@ export function apply(ctx, config) {
     return ledgerFile;
   }
   if (root) resolveLedger(false);
+  var offTools = null;
   try {
-    ctx.on("tools/result", function (exec, result) {
+    offTools = ctx.on("tools/result", function (exec, result) {
       try {
         if (runtime.ledgerEnabled === false) return;
         recordSkillResult(ledger, exec, result);
@@ -241,7 +321,46 @@ export function apply(ctx, config) {
     return cache.payload;
   }
 
-  function getLedgerPayload(force) {
+  // 查询串取值（query 是去掉前导 ? 的串）
+function qp(query, key) {
+  var re = new RegExp("(^|&)" + key + "=([^&]*)");
+  var m = re.exec(String(query || ""));
+  if (!m) return "";
+  try { return decodeURIComponent(m[2]); } catch (e) { return m[2]; }
+}
+
+// 调用台账统计（带 30s 缓存，键含全部参数）
+var cacheStats = { key: "", ts: 0, payload: null };
+function getLedgerStats(opts) {
+  var o = opts || {};
+  var now = Date.now();
+  // v1.9.6 性能：把 jsonl 的 size+mtime 拼进缓存键 —— 文件没变就直接命中，
+  // 不再因为"切粒度/改排序"而重读整个 jsonl（原实现只按参数缓存，跨参数必重读）。
+  var probe = { exists: false, size: 0, mtimeMs: 0 };
+  try { probe = autoLogStat(root); } catch (e0) {}
+  var key = [o.from || "", o.to || "", o.gran || "", o.sort || "", o.top || "",
+    probe.exists ? probe.size : -1, probe.exists ? Math.round(probe.mtimeMs) : -1].join("|");
+  if (cacheStats.payload && cacheStats.key === key && now - cacheStats.ts < CACHE_TTL_MS) {
+    return cacheStats.payload;
+  }
+  // 同一份 jsonl 只解析一次：文件未变时，不同参数复用同一次解析结果
+  var records;
+  if (cacheStats.records && cacheStats.recSize === probe.size && cacheStats.recMtime === Math.round(probe.mtimeMs)) {
+    records = cacheStats.records;
+  } else {
+    try { records = readAutoLog(root); } catch (e) { records = []; }
+    cacheStats.records = records;
+    cacheStats.recSize = probe.size;
+    cacheStats.recMtime = Math.round(probe.mtimeMs);
+  }
+  var out = buildStats(records, {
+    from: o.from, to: o.to, gran: o.gran, sort: o.sort, top: o.top
+  });
+  out.autoLogPath = root ? autoLogFilePath(root) : null;
+  cacheStats.key = key; cacheStats.ts = now; cacheStats.payload = out;
+  return out;
+}
+function getLedgerPayload(force) {
     var now = Date.now();
     if (!force && cacheLedger.payload && now - cacheLedger.ts < CACHE_TTL_MS) return cacheLedger.payload;
     if (!ledgerFile && root) resolveLedger(force);
@@ -251,9 +370,16 @@ export function apply(ctx, config) {
     for (var z = 0; z < entries.length; z++) {
       if (entries[z].fails > 0) { failCount++; totalFail += entries[z].fails; }
     }
-    var allAuto = readAutoLog(root);
-    var autoTotal = allAuto.length, autoFailTotal = 0;
-    for (var a = 0; a < allAuto.length; a++) { if (!allAuto[a].ok) autoFailTotal++; }
+    // v1.9.6 性能：统计总数用轻量计数（不保留整表），最近 30 条只从文件尾部读
+    var autoTotal = 0, autoFailTotal = 0;
+    try {
+      var allAuto = readAutoLog(root);
+      autoTotal = allAuto.length;
+      for (var a = 0; a < allAuto.length; a++) { if (!allAuto[a].ok) autoFailTotal++; }
+      allAuto = null;
+    } catch (e) {}
+    var autoRecent = [];
+    try { autoRecent = readAutoLogTail(root, 30).slice().reverse(); } catch (e) {}
     cacheLedger.payload = {
       ok: true,
       ledgerPath: ledgerFile || (root ? ledgerDefaultPath(root) : null),
@@ -264,7 +390,7 @@ export function apply(ctx, config) {
       entries: entries,
       autoTotal: autoTotal,
       autoFailTotal: autoFailTotal,
-      autoRecent: allAuto.slice(-30).reverse()
+      autoRecent: autoRecent
     };
     cacheLedger.ts = now;
     return cacheLedger.payload;
@@ -355,8 +481,180 @@ export function apply(ctx, config) {
     });
   }
 
-  ctx.effect(function () {
-    var handler = function (req, res) {
+  // ── v1.9.0 视图分组（groups）──────────────────────────────
+  // 分组只是"视图层归档"：写入 ~/.dsh/data/dsh-skill-browser/groups.json，
+  // 技能目录本身既不移动也不改名，绝不触碰任何 SKILL.md。
+  function readBody(req, done) {
+    var chunks = [];
+    req.on("data", function (c) { chunks.push(c); });
+    req.on("end", function () {
+      try { done(JSON.parse(Buffer.concat(chunks).toString("utf8")) || {}); }
+      catch (e) { done({}); }
+    });
+  }
+
+  function handleGroupsList(res) {
+    var validDirs = [];
+    try {
+      var sk = scanSkills(root, ZH);
+      for (var i = 0; i < sk.length; i++) validDirs.push(sk[i].dir);
+    } catch (e) { /* root 不可用时不清空，只返回已有分组 */ }
+    var out = listGroups(validDirs.length ? validDirs : null);
+    out.storePath = storePath();
+    sendJson(res, 200, out);
+  }
+
+  // POST /groups {action, ...}
+  //   create   {name, emoji?, color?, parent?}   parent 为空 = 大类
+  //   rename   {id, name?, emoji?, color?}
+  //   move     {id, parent}          两级结构里调整归属（""=升为大类）
+  //   delete   {id}                  删大类会连带删掉它的子类
+  //   assign   {dir, gid}            gid 为空字符串 = 移出分组
+  //   assign-batch {dirs:[...], gid}
+  //   ai-classify {mode?}            AI 出「大类→子类」两级方案，**不落盘**
+  //   ai-apply {plan, mode?}         用户确认后落盘（replace 覆盖旧 AI 组 / merge 只追加）
+  //   ai-cover {id}                   AI 一键生成该分组封面图
+  // Skill dirs must be plain single-segment names AND actually exist in the
+  // current library. A group assignment is view-only, so an unknown dir is
+  // always a client bug - reject it instead of polluting groups.json.
+  var SAFE_SKILL_DIR_RE = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
+  function knownSkillDirs() {
+    var out = {};
+    try {
+      var list = scanSkills(root, ZH) || [];
+      for (var i = 0; i < list.length; i++) out[list[i].dir] = true;
+    } catch (e) { /* an unreadable root yields an empty set -> all dirs rejected */ }
+    return out;
+  }
+  function validateDirs(dirs) {
+    var known = knownSkillDirs();
+    var good = [], bad = [];
+    for (var i = 0; i < dirs.length; i++) {
+      var d = String(dirs[i] || "");
+      if (!d || !SAFE_SKILL_DIR_RE.test(d) || d === "." || d === "..") { bad.push(d); continue; }
+      if (!known[d]) { bad.push(d); continue; }
+      good.push(d);
+    }
+    return { good: good, bad: bad };
+  }
+
+  function handleGroupsPost(req, res) {
+    readBody(req, function (body) {
+      var action = String(body.action || "");
+      try {
+        if (action === "create") {
+          var cg = createGroup(body.name, body.emoji, body.color, body.parent);
+          sendJson(res, cg.ok ? 200 : 400, cg);
+          return;
+        }
+        if (action === "rename") {
+          var rg = renameGroup(String(body.id || ""), body.name, body.emoji, body.color);
+          sendJson(res, rg.ok ? 200 : 400, rg);
+          return;
+        }
+        if (action === "move") {
+          var mg = moveGroup(String(body.id || ""), body.parent);
+          sendJson(res, mg.ok ? 200 : 400, mg);
+          return;
+        }
+        if (action === "delete") {
+          var dg = deleteGroup(String(body.id || ""));
+          sendJson(res, dg.ok ? 200 : 400, dg);
+          return;
+        }
+        if (action === "assign") {
+          var one = validateDirs([body.dir]);
+          if (!one.good.length) { sendJson(res, 400, { ok: false, error: "无效的技能目录名：" + String(body.dir || "") }); return; }
+          var as = assignSkill(one.good[0], body.gid);
+          sendJson(res, as.ok ? 200 : 400, as);
+          return;
+        }
+        // Kept for bulk moves from the client (not wired to a button yet).
+        if (action === "assign-batch") {
+          var dirs = Object.prototype.toString.call(body.dirs) === "[object Array]" ? body.dirs : [];
+          var v = validateDirs(dirs.slice(0, BATCH_MAX));
+          if (!v.good.length) { sendJson(res, 400, { ok: false, error: "没有有效的技能目录名" }); return; }
+          var bulk = assignSkills(v.good, body.gid);
+          bulk.rejected = v.bad;
+          sendJson(res, 200, bulk);
+          return;
+        }
+        // v1.9.9 模型发现探针：告诉面板「AI 分组会用哪个模型」，
+        // 让别人装完插件零配置就知道能不能用、用的是哪个。
+        // 不触发任何模型调用，只解析路由。
+        if (action === "model-info") {
+          describeModelRoute(ctx, runtime).then(function (r) {
+            sendJson(res, 200, r);
+          }).catch(function (e) {
+            sendJson(res, 200, { ok: false, provider: "", model: "", source: "", error: String((e && e.message) || e) });
+          });
+          return;
+        }
+        // v1.9.7 关键词快速分组：零 token、毫秒级、完全确定。
+        // 与 ai-classify 一样只出方案不落盘，用户确认后仍走 ai-apply。
+        if (action === "kw-classify") {
+          var kwSkills = scanSkills(root, ZH);
+          if (!kwSkills.length) { sendJson(res, 400, { ok: false, error: "技能库为空或未找到技能" }); return; }
+          try {
+            sendJson(res, 200, keywordClassify(kwSkills));
+          } catch (e) {
+            ctx.logger.warn("dsh-skill-browser: kw-classify failed: " + (e && e.message));
+            sendJson(res, 500, { ok: false, error: String((e && e.message) || e) });
+          }
+          return;
+        }
+        if (action === "ai-classify") {
+          var skills = scanSkills(root, ZH);
+          if (!skills.length) { sendJson(res, 400, { ok: false, error: "技能库为空或未找到技能" }); return; }
+          // Build a PLAN only - nothing is written until the user confirms via
+          // ai-apply. Replacing existing groups must be an explicit choice.
+          aiClassify(ctx, runtime, skills, { mode: body.mode }).then(function (r) {
+            sendJson(res, r && r.ok ? 200 : 500, r);
+          }).catch(function (e) {
+            ctx.logger.warn("dsh-skill-browser: ai-classify failed: " + (e && e.message));
+            sendJson(res, 500, { ok: false, error: String((e && e.message) || e) });
+          });
+          return;
+        }
+        if (action === "ai-apply") {
+          var plan = body.plan;
+          if (!plan || typeof plan !== "object") { sendJson(res, 400, { ok: false, error: "缺少分组方案 plan" }); return; }
+          var skillsForPlan = scanSkills(root, ZH);
+          if (!skillsForPlan.length) { sendJson(res, 400, { ok: false, error: "技能库为空或未找到技能" }); return; }
+          var applied = applyPlan(plan, skillsForPlan, body.mode);
+          sendJson(res, applied.ok ? 200 : 400, applied);
+          return;
+        }
+        if (action === "ai-cover") {
+          var gid = String(body.id || "");
+          var listed = listGroups(null);
+          var g = null;
+          for (var i = 0; i < listed.groups.length; i++) {
+            if (listed.groups[i].id === gid) { g = listed.groups[i]; break; }
+          }
+          if (!g) { sendJson(res, 404, { ok: false, error: "分组不存在：" + gid }); return; }
+          var sample = [];
+          for (var j = 0; j < g.members.length && sample.length < 12; j++) {
+            var d = g.members[j];
+            sample.push(ZH[d] ? d + "（" + ZH[d] + "）" : d);
+          }
+          aiCover(ctx, runtime, g, sample).then(function (r) {
+            sendJson(res, r && r.ok ? 200 : 500, r);
+          }).catch(function (e) {
+            ctx.logger.warn("dsh-skill-browser: ai-cover failed: " + (e && e.message));
+            sendJson(res, 500, { ok: false, error: String((e && e.message) || e) });
+          });
+          return;
+        }
+        sendJson(res, 400, { ok: false, error: "unknown action: " + action });
+      } catch (e) {
+        ctx.logger.warn("dsh-skill-browser: groups action failed: " + (e && e.message));
+        sendJson(res, 500, { ok: false, error: String((e && e.message) || e) });
+      }
+    });
+  }
+
+  var handler = function (req, res) {
       if (!isLoopback(req)) { res.writeHead(403); res.end(); return; }
       var url = req.url || "/";
       var path = url.slice(0, url.indexOf("?") >= 0 ? url.indexOf("?") : url.length);
@@ -375,7 +673,7 @@ export function apply(ctx, config) {
         return;
       }
       if (path === PREFIX + "/health") {
-        sendJson(res, 200, { ok: true, plugin: "dsh-skill-browser", version: VERSION, root: root, source: detected.source });
+        sendJson(res, 200, { ok: true, plugin: "dsh-skill-browser", version: VERSION, gen: LIVE.gen, root: root, source: detected.source });
         return;
       }
 
@@ -458,6 +756,34 @@ export function apply(ctx, config) {
         return;
       }
 
+      if (path === PREFIX + "/groups" && req.method === "POST") {
+        handleGroupsPost(req, res);
+        return;
+      }
+      if (path === PREFIX + "/groups") {
+        try { handleGroupsList(res); }
+        catch (e) { sendJson(res, 500, { ok: false, error: String((e && e.message) || e) }); }
+        return;
+      }
+
+      // 调用台账统计：GET /ledger/stats?from=&to=&gran=day|week|month|year&sort=&top=
+      // 服务端聚合，只回聚合结果（不把上千条原始流水塞给前端）
+      if (path === PREFIX + "/ledger/stats") {
+        try {
+          var stats = getLedgerStats({
+            from: qp(query, "from"),
+            to: qp(query, "to"),
+            gran: qp(query, "gran"),
+            sort: qp(query, "sort"),
+            top: qp(query, "top")
+          });
+          sendJson(res, 200, stats);
+        } catch (e) {
+          ctx.logger.warn("dsh-skill-browser: ledger stats failed " + (e && e.message));
+          sendJson(res, 500, { ok: false, error: String((e && e.message) || e) });
+        }
+        return;
+      }
       if (path === PREFIX + "/ledger") {
         try {
           sendJson(res, 200, getLedgerPayload(/(^|&)refresh=1(&|$)/.test(query)));
@@ -497,8 +823,16 @@ export function apply(ctx, config) {
         if (!ledgerFile && root) resolveLedger(false);
         var text2 = ledgerFile ? readLedgerAtPath(ledgerFile) : null;
         var detail = text2 == null ? "" : (parseLedgerDetail(text2, skill) || "");
-        var autoEntries = readAutoLog(root, skill);
-        sendJson(res, 200, { ok: true, skill: skill, detail: detail, autoEntries: autoEntries });
+        // v1.9.6 性能：详情页默认只回最近 200 条（含总数），避免单技能上千条记录一次性塞给前端
+        var m3 = /(^|&)limit=([^&]*)/.exec(query);
+        var lim = m3 ? parseInt(decodeURIComponent(m3[2]), 10) : 200;
+        if (!(lim > 0)) lim = 200;
+        var allEntries = readAutoLog(root, skill);
+        var autoEntries = allEntries.length > lim ? allEntries.slice(allEntries.length - lim) : allEntries;
+        sendJson(res, 200, {
+          ok: true, skill: skill, detail: detail,
+          autoEntries: autoEntries, autoTotal: allEntries.length, autoLimit: lim
+        });
         return;
       }
 
@@ -546,10 +880,31 @@ export function apply(ctx, config) {
         return;
       }
 
+      // ── v1.9.4 热加载：POST /reload ──────────────────────────
+      // 必须先回包再重载：重载会 dispose 当前实例，回包前做会断连接。
+      if (path === PREFIX + "/reload" && req.method === "POST") {
+        sendJson(res, 200, { ok: true, version: VERSION, gen: LIVE.gen, reloading: true });
+        setTimeout(function () {
+          selfReload(ctx, config).then(function (r) {
+            ctx.logger.info("dsh-skill-browser: hot-reloaded (host half) -> " + r.version + " gen " + r.gen);
+          }).catch(function (e) {
+            ctx.logger.warn("dsh-skill-browser: hot reload failed: " + (e && e.message ? e.message : e));
+          });
+        }, 120);
+        return;
+      }
+
+      // ── v1.9.4 热加载探针：GET /rev（gen 变了 = 宿主半已换新）──
+      if (path === PREFIX + "/rev") {
+        sendJson(res, 200, { ok: true, version: VERSION, gen: LIVE.gen, ts: Date.now() });
+        return;
+      }
+
       sendJson(res, 404, { ok: false, error: "unknown path" });
     };
 
-    var dispose = ctx.webServer.register({ kind: "prefix", path: PREFIX, handler: handler });
-    return function () { try { dispose(); } catch (e) {} };
-  }, "dsh-skill-browser: api routes");
-}
+    return {
+      handler: handler,
+      dispose: function () { try { if (offTools) offTools(); } catch (e) {} }
+    };
+  }