dsh-plugin-manager-plus 1.3.0 → 1.3.2

package/README.md

@@ -79,6 +79,8 @@ dsh plugin --profile web add dsh-plugin-manager-plus
 >       name: dsh-plugin-manager-plus
 > ```
 
+**bundle 形态插件（自带 `dsh.bundle.patch` 的包）**：v1.3.1 起自动识别——安装时**不再**写入家级插入行（bundle 层已由官方 CLI 自动挂载，再写一条会触发同包双 Loader 源致命错误），只记录到 manifest 供 UI 管理。此类插件在「插件管理」中显示为社区来源、可启停/卸载，其激活行随包安装/卸载自动存在/消失。
+
 ### 方式二：git clone + 接线脚本（本地开发）
 
 ```powershell

package/lib/client.js

@@ -74,7 +74,24 @@ window.__ModuleLoader__.load({
       "func.ui": "界面增强",
       "func.net": "网络接入",
       "func.infra": "系统底层",
-      "func.other": "其他"
+      "func.other": "其他",
+
+      // 技术路线与版本兼容（v1.3.2）
+      "route.bundle": "自动激活",
+      "route.dual": "需登记",
+      "route.host": "纯宿主",
+      "route.local": "本地",
+      "route.unknown": "",
+      "route.hint.bundle": "自带 bundle 补丁：官方 CLI 安装后自动挂载激活行，无需手动登记",
+      "route.hint.dual": "无 bundle 补丁：需在补丁层登记激活行（插件管理器会自动登记）",
+      "route.hint.host": "纯宿主插件（无浏览器半）",
+      "route.hint.local": "本地 file:// 加载",
+      "verdict.ok": "✓ 适配",
+      "verdict.no": "⚠ 可能不兼容",
+      "verdict.unknown": "未声明版本",
+      "verdict.range": "声明 DSH:",
+      "tested.label": "实测",
+      "tested.title": "作者实测通过的 DSH 版本"
     };
 
     const en = {
@@ -132,7 +149,24 @@ window.__ModuleLoader__.load({
       "func.ui": "UI & Display",
       "func.net": "Network & Web",
       "func.infra": "Infrastructure",
-      "func.other": "Other"
+      "func.other": "Other",
+
+      // route & verdict (v1.3.2)
+      "route.bundle": "auto-activate",
+      "route.dual": "needs row",
+      "route.host": "host-only",
+      "route.local": "local",
+      "route.unknown": "",
+      "route.hint.bundle": "Ships a bundle patch: the row mounts automatically on official CLI install",
+      "route.hint.dual": "No bundle patch: an activation row is required (the manager registers it)",
+      "route.hint.host": "Host-only plugin (no browser half)",
+      "route.hint.local": "Loaded via local file://",
+      "verdict.ok": "✓ compatible",
+      "verdict.no": "⚠ maybe incompatible",
+      "verdict.unknown": "no version declared",
+      "verdict.range": "Declared DSH:",
+      "tested.label": "tested",
+      "tested.title": "DSH versions the author tested"
     };
 
     /** 模块短名提取 */
@@ -208,6 +242,58 @@ window.__ModuleLoader__.load({
       { id: "disabled", labelKey: "status.disabled" }
     ];
 
+    /**
+     * 技术路线徽章配色（bundle=绿 / dual=橙 / host=蓝 / local=紫）
+     */
+    function routeColor(route) {
+      switch (route) {
+        case "bundle": return { fg: "#1a7f37", bg: "rgba(26,127,55,0.12)" };
+        case "dual": return { fg: "#bc4c00", bg: "rgba(188,76,0,0.13)" };
+        case "host": return { fg: "#0a66c2", bg: "rgba(10,102,194,0.12)" };
+        case "local": return { fg: "#8250df", bg: "rgba(130,80,223,0.12)" };
+        default: return { fg: "var(--dsw-alias-label-tertiary)", bg: "var(--dsw-alias-bg-layer-1)" };
+      }
+    }
+
+    /** 版本兼容徽章配色（ok=绿 / no=红 / unknown=灰） */
+    function verdictColor(verdict) {
+      switch (verdict) {
+        case "ok": return { fg: "#1a7f37", bg: "rgba(26,127,55,0.12)" };
+        case "no": return { fg: "#cf222e", bg: "rgba(207,34,46,0.13)" };
+        default: return { fg: "var(--dsw-alias-label-tertiary)", bg: "var(--dsw-alias-bg-layer-1)" };
+      }
+    }
+
+    /** 路由+版本徽章小工具（市场搜索结果与已安装列表共用） */
+    function badgePair(t, pkg, options) {
+      return [
+        pkg.route && pkg.route !== "unknown" ? _jsx("span", {
+          title: t("route.hint." + pkg.route) || "",
+          style: {
+            fontSize: "11px",
+            padding: "1px 5px",
+            borderRadius: "4px",
+            color: routeColor(pkg.route).fg,
+            background: routeColor(pkg.route).bg,
+            border: "1px solid " + routeColor(pkg.route).bg
+          },
+          children: t("route." + pkg.route)
+        }, "r") : null,
+        pkg.verdict ? _jsx("span", {
+          title: pkg.dshRange ? `${t("verdict.range")} ${pkg.dshRange}` : t("verdict.noRange"),
+          style: {
+            fontSize: "11px",
+            padding: "1px 5px",
+            borderRadius: "4px",
+            color: verdictColor(pkg.verdict).fg,
+            background: verdictColor(pkg.verdict).bg,
+            border: "1px solid " + verdictColor(pkg.verdict).bg
+          },
+          children: t("verdict." + pkg.verdict)
+        }, "v") : null
+      ];
+    }
+
     /**
      * =========================================================================
      * 1. 插件管理标签页组件 (ManagerTab)
@@ -773,6 +859,25 @@ window.__ModuleLoader__.load({
                     ]
                   }),
 
+                  // 技术路线 + 版本兼容徽章（v1.3.2）
+                  entry.route || entry.verdict ? _jsxs("div", {
+                    style: { display: "flex", alignItems: "center", gap: "6px", flexWrap: "wrap" },
+                    children: [
+                      ...badgePair(t, entry),
+                      entry.tested && entry.tested.length ? _jsx("span", {
+                        title: t("tested.title"),
+                        style: {
+                          fontSize: "11px",
+                          color: "var(--dsw-alias-label-tertiary)",
+                          background: "var(--dsw-alias-bg-layer-1)",
+                          padding: "1px 5px",
+                          borderRadius: "4px"
+                        },
+                        children: `${t("tested.label")} ${entry.tested.join(", ")}`
+                      }) : null
+                    ]
+                  }) : null,
+
                   // 标识与双分类标签
                   _jsxs("div", {
                     style: { display: "flex", alignItems: "center", justifyContent: "space-between", fontSize: "11px" },
@@ -1146,6 +1251,7 @@ window.__ModuleLoader__.load({
                             },
                             children: `v${pkg.version}`
                           }),
+                          ...badgePair(t, pkg),
                           pkg.date ? _jsx("span", {
                             style: { fontSize: "11px", color: "var(--dsw-alias-label-tertiary)" },
                             children: pkg.date.slice(0, 10)

package/lib/index.mjs

@@ -15,7 +15,7 @@ import { homedir } from 'node:os';
 export const name = 'dsh-plugin-manager-plus';
 export const inject = ['loader', 'webServer'];
 
-const PLUGIN_VERSION = '1.3.0';
+const PLUGIN_VERSION = '1.3.2';
 
 /** 读取宿主 dsh 包版本（后端进程 argv[1] 即 dsh 的 bin.js，其上级即包根） */
 function readHostDshVersion() {
@@ -33,6 +33,174 @@ function readHostDshVersion() {
 }
 const HOST_DSH_VERSION = readHostDshVersion();
 
+// =========================================================================
+// 版本工具：社区插件的技术路线（route）与 DSH 版本兼容性（verdict）识别。
+// 无第三方依赖，实现 npm semver 范围判断的实用子集（精确/^/~/>=/<=/>/</
+// | |/x 通配/空格且），对无法解析的声明一律判 unknown 而非误报。
+// =========================================================================
+
+/** 解析 '1.2.3-alpha.1' → {major, minor, patch, pre}；失败返回 null */
+function parseSemver(v) {
+  const m = /^v?(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:-([0-9A-Za-z.-]+))?/.exec(String(v ?? '').trim());
+  if (!m) return null;
+  return { major: +m[1] || 0, minor: +m[2] || 0, patch: +m[3] || 0, pre: m[4] || '' };
+}
+
+/** 比较两个已解析版本：a > b → 1，a < b → -1，相等 → 0 */
+function compareSemver(a, b) {
+  if (!a || !b) return 0;
+  for (const k of ['major', 'minor', 'patch']) {
+    if (a[k] !== b[k]) return a[k] > b[k] ? 1 : -1;
+  }
+  if (a.pre === b.pre) return 0;
+  if (!a.pre) return 1; // 正式版 > pre-release
+  if (!b.pre) return -1;
+  const pa = a.pre.split(/[.-]/).map(s => (/^\d+$/.test(s) ? Number(s) : s));
+  const pb = b.pre.split(/[.-]/).map(s => (/^\d+$/.test(s) ? Number(s) : s));
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const x = pa[i], y = pb[i];
+    if (x === undefined) return -1;
+    if (y === undefined) return 1;
+    if (x === y) continue;
+    if (typeof x === 'number' && typeof y === 'number') return x > y ? 1 : -1;
+    if (typeof x === 'number') return 1; // 数字段 < 字母段（npm 规则相反，此处从简）
+    if (typeof y === 'number') return -1;
+    return x > y ? 1 : -1;
+  }
+  return 0;
+}
+
+/** 单个比较器（>=、^、~、=、精确、x 通配）是否满足 */
+function cmpSatisfies(v, cmpRaw) {
+  const vp = parseSemver(v);
+  if (!vp) return false;
+  let m = /^(>=|<=|>|<|\^|~|=)?\s*(.*)$/.exec(String(cmpRaw || '').trim());
+  const op = m[1] || '=';
+  let spec = (m[2] || '').trim();
+  if (!spec || spec === '*' || spec === 'x' || spec === 'X') return true;
+  // x 通配（如 1.x、1.2.x）
+  if (/^(\d+)(?:\.(\d+))?\.x$/i.test(spec) || /^(\d+)$/.test(spec) && op === '=' || /^(\d+)\.(\d+)$/.test(spec) && op === '=') {
+    const parts = spec.split('.');
+    const wantMaj = +parts[0];
+    if (vp.major !== wantMaj) return false;
+    if (parts.length >= 2 && parts[1] !== 'x' && parts[1] !== 'X' && vp.minor !== +parts[1]) return false;
+    if (parts.length >= 3 && parts[2] !== 'x' && parts[2] !== 'X' && vp.patch !== +parts[2]) return false;
+    if (op === '>') return false; // 对 x 通配不做精细上界，从宽
+    return true;
+  }
+  // 处理组合范围如 ">=1.2.3 <2.0.0"（外层已按空格拆分）
+  const sp = parseSemver(spec);
+  if (!sp) return false;
+  switch (op) {
+    case '=': return compareSemver(vp, sp) === 0;
+    case '>': return compareSemver(vp, sp) > 0;
+    case '<': return compareSemver(vp, sp) < 0;
+    case '>=': return compareSemver(vp, sp) >= 0;
+    case '<=': return compareSemver(vp, sp) <= 0;
+    case '~': return vp.major === sp.major && vp.minor === sp.minor && compareSemver(vp, sp) >= 0;
+    case '^': {
+      const lower = compareSemver(vp, sp) >= 0;
+      if (!lower) return false;
+      if (sp.major > 0) return vp.major === sp.major;
+      if (sp.minor > 0) return vp.minor === sp.minor; // 0.x.y 系列
+      return vp.patch === sp.patch; // 0.0.x
+    }
+    default: return false;
+  }
+}
+
+/** 版本是否满足范围（支持 || 与空格分隔的多个比较器） */
+function versionSatisfies(version, range) {
+  const r = String(range ?? '').trim();
+  if (!r || r === '*' || r === 'latest' || /^[a-zA-Z]/.test(r)) return true; // tag/无约束
+  const v = parseSemver(version);
+  if (!v) return false;
+  for (const or of r.split('||')) {
+    const parts = or.trim().split(/\s+/).filter(Boolean);
+    if (parts.length === 0) continue;
+    let ok = true;
+    for (const part of parts) {
+      if (part !== '' && !cmpSatisfies(version, part)) { ok = false; break; }
+    }
+    if (ok) return true;
+  }
+  return false;
+}
+
+/**
+ * 提取包的 DSH 版本约束（多个声明源，按优先级取首个非空）。
+ * 0 = dsh.compatibility.dsh（自定义声明，最明确）
+ * 1 = peerDependencies['@deepseek-ai/dsh']
+ * 2 = peerDependencies['@deepseek-ai/dsh-settings']（dshmarket 风格）
+ * 3 = peerDependencies['@deepseek-ai/cordis']（仅作参考，不判 verdict）
+ */
+function extractDshRange(pkg) {
+  if (!pkg || typeof pkg !== 'object') return null;
+  if (pkg.dsh?.compatibility?.dsh) return String(pkg.dsh.compatibility.dsh);
+  const peer = pkg.peerDependencies || {};
+  if (peer['@deepseek-ai/dsh']) return String(peer['@deepseek-ai/dsh']);
+  if (peer['@deepseek-ai/dsh-settings']) return String(peer['@deepseek-ai/dsh-settings']);
+  return null;
+}
+
+/**
+ * 判定社区插件安装技术路线：
+ * 'bundle'  — 带 dsh.bundle.patch，官方 CLI add 后 bundle 层自动挂载激活行，
+ *             插件管理器安装时**不写**家级行（写则双源致命错误）
+ * 'dual'    — 有 dsh.client（浏览器半）但无 bundle patch，需在 patch 层登记
+ *             激活行（裸包名或 file:// + client 行），插件管理器会登记
+ * 'host'    — 纯宿主插件（无 dsh.client），仅需宿主激活行
+ * 'local'   — file:// 本地加载（非 npm 包）
+ */
+function detectRoute(moduleName, pkg) {
+  if (typeof moduleName === 'string' && moduleName.startsWith('file://')) return 'local';
+  if (pkg?.dsh?.bundle?.patch) return 'bundle';
+  if (pkg?.dsh?.client?.platform) return 'dual';
+  if (pkg && typeof pkg === 'object') return 'host';
+  return 'unknown';
+}
+
+/**
+ * 组装某包的路线 + 版本兼容信息。
+ * @param {string} moduleName 加载 specifier（可能为 file:// URL）
+ * @param {object|null} pkg 已解析的 package.json（无则为 null）
+ * @returns {{route, dshRange, tested, enginesNode, verdict}}
+ */
+function assessPackage(moduleName, pkg) {
+  const route = detectRoute(moduleName, pkg);
+  const tested = pkg?.dsh?.compatibility?.tested?.length
+    ? pkg.dsh.compatibility.tested.map(String)
+    : null;
+  const enginesNode = pkg?.engines?.node ? String(pkg.engines.node) : null;
+  const dshRange = extractDshRange(pkg);
+  let verdict = 'unknown';
+  if (dshRange && HOST_DSH_VERSION) {
+    verdict = versionSatisfies(HOST_DSH_VERSION, dshRange) ? 'ok' : 'no';
+  }
+  return { route, dshRange, tested, enginesNode, verdict };
+}
+
+/** 从已安装目录读取包 metadata（读不到返回 null）；支持 file:// 本地插件向上找 package.json */
+function readInstalledPkg(moduleName) {
+  try {
+    if (typeof moduleName === 'string' && moduleName.startsWith('file://')) {
+      let dir = dirname(fileURLToPath(moduleName.split('?')[0]));
+      for (let i = 0; i < 4; i++) {
+        const cand = join(dir, 'package.json');
+        if (existsSync(cand)) return JSON.parse(readFileSync(cand, 'utf8'));
+        const parent = dirname(dir);
+        if (parent === dir) break;
+        dir = parent;
+      }
+      return null;
+    }
+    if (!moduleName || moduleName.startsWith('@deepseek-ai/')) return null; // 官方 bundle 行不读
+    const p = join(WEB_PROFILE_DIR, 'node_modules', ...String(moduleName).split('/'), 'package.json');
+    if (!existsSync(p)) return null;
+    return JSON.parse(readFileSync(p, 'utf8'));
+  } catch { return null; }
+}
+
 /** Fiber 状态常量映射 */
 const FIBER_PHASE = {
   0: 'pending',
@@ -935,7 +1103,11 @@ export function apply(ctx) {
         if (pathname === '/plugin-manager/api/inventory' && req.method === 'GET') {
           const { insertEntries, overrideEntries } = getHomePatchEntries();
           const manifest = readManifest();
-          const manifestEntryIds = new Set(manifest.map(m => m.entryId));
+          const manifestEntryIds = new Set();
+          for (const m of manifest) {
+            manifestEntryIds.add(m.entryId);
+            for (const rid of (m.bundleRowIds || [])) manifestEntryIds.add(rid);
+          }
 
           const list = [];
           const seenCleanIds = new Set();
@@ -965,6 +1137,9 @@ export function apply(ctx) {
               const source = isHomeInsert ? 'home' : 'builtin';
               const cat = determineCategory(source, cId || entryId, moduleName, manifestEntryIds);
               const funcCat = determineFuncCategory(moduleName);
+              // bundle 形态插件（行由包内 bundle 层挂载、经 manifest 跟踪）也可管理
+              const manifestTracked = manifestEntryIds.has(cId || entryId);
+              const assess = assessPackage(moduleName, readInstalledPkg(moduleName));
 
               list.push({
                 entryId: cId || entryId,
@@ -972,9 +1147,14 @@ export function apply(ctx) {
                 enabled,
                 phase: rawFiberPhase ?? 'unobserved',
                 source,
-                manageable: isHomeInsert,
+                manageable: isHomeInsert || manifestTracked,
                 category: cat,
-                funcCategory: funcCat
+                funcCategory: funcCat,
+                route: assess.route,
+                verdict: assess.verdict,
+                dshRange: assess.dshRange,
+                tested: assess.tested,
+                enginesNode: assess.enginesNode
               });
             }
           }
@@ -984,6 +1164,7 @@ export function apply(ctx) {
             if (!seenCleanIds.has(id) && !seenCleanIds.has(cleanId(id))) {
               const cat = determineCategory('home', id, item.name, manifestEntryIds);
               const funcCat = determineFuncCategory(item.name);
+              const assess = assessPackage(item.name, readInstalledPkg(item.name));
 
               list.push({
                 entryId: id,
@@ -993,7 +1174,12 @@ export function apply(ctx) {
                 source: 'home',
                 manageable: true,
                 category: cat,
-                funcCategory: funcCat
+                funcCategory: funcCat,
+                route: assess.route,
+                verdict: assess.verdict,
+                dshRange: assess.dshRange,
+                tested: assess.tested,
+                enginesNode: assess.enginesNode
               });
             }
           }
@@ -1030,15 +1216,41 @@ export function apply(ctx) {
           }
 
           const rawResults = data?.objects || [];
+          // 并发拉取候选包 metadata（npmmirror 快），用于判定技术路线与版本兼容；
+          // 单个失败不影响整体（unknown 兜底）。
+          const metaBy = new Map();
+          const NAMES = rawResults.map(i => i.package?.name).filter(Boolean).slice(0, 25);
+          await Promise.all(NAMES.map(async (n) => {
+            try {
+              const enc = n.split('/').map(encodeURIComponent).join('/');
+              const resp = await fetch(`https://registry.npmmirror.com/${enc}`, {
+                signal: AbortSignal.timeout(6000)
+              });
+              if (resp.ok) {
+                const meta = await resp.json();
+                const latest = meta['dist-tags']?.latest || meta.version;
+                const ver = meta.versions?.[latest] || meta;
+                metaBy.set(n, ver);
+              }
+            } catch {}
+          }));
+
           const results = rawResults.map((item) => {
             const pkg = item.package || {};
             const isInstalled = installedNames.has(pkg.name);
+            const meta = metaBy.get(pkg.name) || null;
+            const assess = assessPackage(pkg.name, meta);
             return {
               name: pkg.name,
               version: pkg.version,
               description: pkg.description || '',
               date: pkg.date || '',
-              installed: isInstalled
+              installed: isInstalled,
+              route: assess.route,
+              verdict: assess.verdict,
+              dshRange: assess.dshRange,
+              tested: assess.tested,
+              enginesNode: assess.enginesNode
             };
           });
 
@@ -1079,26 +1291,50 @@ export function apply(ctx) {
             }
 
             let installedVersion = version || '';
+            let isBundle = false;
+            let bundleRowIds = [];
             try {
               const installedPkg = JSON.parse(readFileSync(targetPkgJsonPath, 'utf8'));
               installedVersion = installedPkg.version || installedVersion;
+              // 探测 bundle 形态：包内 dsh.bundle.patch 由官方 CLI 自动挂载为
+              // profile 的 bundle 层，行随包安装/卸载自动存在/消失——此时
+              // **不得**再写家级插入行（同包双 Loader 源 = 致命错误）。
+              const bundlePatchRel = installedPkg?.dsh?.bundle?.patch;
+              if (typeof bundlePatchRel === 'string' && bundlePatchRel) {
+                const bundlePatchPath = join(WEB_PROFILE_DIR, 'node_modules', ...pkgName.split('/'), bundlePatchRel.replace(/^\.\//, ''));
+                if (existsSync(bundlePatchPath)) {
+                  const { blocks } = parsePatchYaml(readFileSync(bundlePatchPath, 'utf8'));
+                  for (const b of blocks) {
+                    if (b.type === 'insert') for (const e of b.entries) bundleRowIds.push(e.id);
+                  }
+                }
+                if (bundleRowIds.length > 0) isBundle = true;
+              }
             } catch {}
 
-            // 更新 Patch 文件
-            patchAddInstallEntry(pkgName, entryId);
+            if (!isBundle) {
+              // 非 bundle 形态：包装上没有激活行，需要插件管理器在家级补丁登记激活
+              patchAddInstallEntry(pkgName, entryId);
+              logger.info(`插件 ${pkgSpec} 已登记至家级补丁 (${entryId})`);
+            } else {
+              // bundle 形态：bundle 层已自动挂载激活行，绝不写家级插入行
+              logger.info(`插件 ${pkgSpec} 为 bundle 形态（bundle 层行 id: ${bundleRowIds.join(', ')}），跳过家级登记（避免双 Loader 源）`);
+            }
 
             // 更新 Manifest 记录
             const manifest = readManifest();
-            const filtered = manifest.filter(m => m.entryId !== entryId);
+            const filtered = manifest.filter(m => m.entryId !== entryId && !(m.bundleRowIds || []).includes(entryId));
             filtered.push({
               entryId,
               packageName: pkgName,
               version: installedVersion,
-              installedAt: new Date().toISOString()
+              installedAt: new Date().toISOString(),
+              bundle: isBundle,
+              bundleRowIds
             });
             saveManifest(filtered);
 
-            logger.info(`插件 ${pkgSpec} 安装成功并已登记至 cordis.patch.yml`);
+            logger.info(`插件 ${pkgSpec} 安装成功${isBundle ? '（bundle 形态，无家级登记）' : '并已登记至 cordis.patch.yml'}`);
             return { ok: true, version: installedVersion, log: installRes.log };
           });
 
@@ -1131,7 +1367,7 @@ export function apply(ctx) {
             const { insertEntries } = getHomePatchEntries();
             const homeEntry = insertEntries.get(entryId);
             const manifest = readManifest();
-            const manifestRecord = manifest.find(m => m.entryId === entryId);
+            const manifestRecord = manifest.find(m => m.entryId === entryId || (m.bundleRowIds || []).includes(entryId));
 
             // 1. 由插件管理器安装的 npm 包
             if (manifestRecord) {
@@ -1225,3 +1461,7 @@ export function apply(ctx) {
     mountRoutes(ctx);
   }
 }
+
+// 工具函数导出（供单测/外部复用；cordis 插件加载仅取 name/inject/apply，额外导出无害）
+export { versionSatisfies, extractDshRange, assessPackage, parseSemver };
+

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-plugin-manager-plus",
   "description": "DeepSeek Harness (DSH) 插件管理器：设置面板内的社区插件市场（npm 搜索一键安装）+ 已安装插件管理（来源/用途/状态三维筛选、启停热重载、一键卸载、持久化）。Plugin manager & marketplace for DeepSeek Harness.",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "type": "module",
   "main": "./lib/index.mjs",
   "exports": {
@@ -52,4 +52,4 @@
     "url": "git+https://github.com/new-256/dsh-plugin-manager.git"
   },
   "license": "MIT"
-}
+}