@leeoohoo/ui-apps-devkit 0.1.0

package/README.md

@@ -0,0 +1,70 @@
+# ChatOS UI Apps DevKit
+
+一个可通过 npm 安装的 DevKit，用来：
+
+- 生成 UI Apps 插件工程（脚手架）
+- 在本地沙箱里运行/调试 `module` 应用（Host API mock）
+- 校验 `plugin.json` 与路径边界
+- 打包/安装到本机 ChatOS（`~/.deepseek_cli/chatos/ui_apps/plugins`）
+
+## 安装
+
+```bash
+npm i -g @leeoohoo/ui-apps-devkit
+```
+
+或直接用 npx：
+
+```bash
+npx @leeoohoo/ui-apps-devkit chatos-uiapp --help
+```
+
+## 快速开始
+
+```bash
+chatos-uiapp init my-first-uiapp
+cd my-first-uiapp
+npm install
+npm run dev
+```
+
+## 模板
+
+```bash
+chatos-uiapp init --list-templates
+chatos-uiapp init my-app --template basic
+chatos-uiapp init my-app --template notepad
+```
+
+- `basic`：最小可运行骨架（含 `host.chat.*` / `ctx.llm.complete()` 示例）
+- `notepad`：完整示例应用（文件夹/标签/搜索/后端持久化）
+
+完成开发后：
+
+```bash
+npm run validate
+npm run pack
+npm run install:chatos
+```
+
+## 生成项目结构（约定）
+
+生成的工程里，**可安装产物**固定在 `plugin/` 目录：
+
+```
+my-first-uiapp/
+  docs/                # 协议文档（随工程分发）
+  chatos.config.json   # DevKit 配置（pluginDir/appId）
+  plugin/              # 直接导入/安装到 ChatOS 的插件目录
+    plugin.json
+    backend/           # (可选) Electron main 进程后端
+    apps/<appId>/      # module 前端 + AI 贡献（MCP/Prompt）
+```
+
+## CLI
+
+- `chatos-uiapp init <dir>`：生成工程
+- `chatos-uiapp dev`：启动本地运行沙箱（支持文件变更自动重载）
+- `chatos-uiapp validate`：校验 manifest 与路径边界
+- `chatos-uiapp pack`：打包 `.zip`（用于 ChatOS 导入）
+- `chatos-uiapp install`：复制到本机 ChatOS 用户插件目录

package/bin/chatos-uiapp.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+import { runCli } from '../src/cli.js';
+
+await runCli(process.argv);
+

package/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "@leeoohoo/ui-apps-devkit",
+  "version": "0.1.0",
+  "description": "ChatOS UI Apps DevKit (CLI + templates + sandbox) for building installable ChatOS UI Apps plugins.",
+  "license": "MIT",
+  "type": "module",
+  "bin": {
+    "chatos-uiapp": "bin/chatos-uiapp.js"
+  },
+  "files": [
+    "bin/**",
+    "src/**",
+    "templates/**",
+    "README.md"
+  ],
+  "engines": {
+    "node": ">=18"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}

package/src/cli.js

@@ -0,0 +1,53 @@
+import { cmdInit } from './commands/init.js';
+import { cmdValidate } from './commands/validate.js';
+import { cmdPack } from './commands/pack.js';
+import { cmdInstall } from './commands/install.js';
+import { cmdDev } from './commands/dev.js';
+
+import { parseArgs } from './lib/args.js';
+
+function printHelp() {
+  // Keep it short; detailed docs live in README and generated project.
+  // eslint-disable-next-line no-console
+  console.log(`chatos-uiapp
+
+Usage:
+  chatos-uiapp init <dir> [--template <name>] [--force] [--plugin-id <id>] [--name <name>] [--app-id <appId>] [--version <semver>]
+  chatos-uiapp init --list-templates
+  chatos-uiapp dev [--port 4399] [--app <appId>] [--plugin-dir <path>]
+  chatos-uiapp validate [--plugin-dir <path>]
+  chatos-uiapp pack [--out <zipPath>] [--plugin-dir <path>]
+  chatos-uiapp install [--host-app chatos] [--state-dir <path>] [--plugin-dir <path>]
+
+Examples:
+  chatos-uiapp init my-app
+  chatos-uiapp init my-app --template notepad
+  chatos-uiapp init --list-templates
+  chatos-uiapp dev --port 4399
+  chatos-uiapp install --host-app chatos
+`);
+}
+
+export async function runCli(argv) {
+  const { positionals, flags } = parseArgs(argv);
+  const cmd = String(positionals[0] || '').trim();
+
+  if (!cmd || cmd === 'help' || cmd === '--help' || flags.help) {
+    printHelp();
+    return;
+  }
+
+  try {
+    if (cmd === 'init') return await cmdInit({ positionals: positionals.slice(1), flags });
+    if (cmd === 'dev') return await cmdDev({ positionals: positionals.slice(1), flags });
+    if (cmd === 'validate') return await cmdValidate({ positionals: positionals.slice(1), flags });
+    if (cmd === 'pack') return await cmdPack({ positionals: positionals.slice(1), flags });
+    if (cmd === 'install') return await cmdInstall({ positionals: positionals.slice(1), flags });
+
+    throw new Error(`Unknown command: ${cmd}`);
+  } catch (err) {
+    // eslint-disable-next-line no-console
+    console.error(`[chatos-uiapp] ${err?.message || String(err)}`);
+    process.exitCode = 1;
+  }
+}

package/src/commands/dev.js

@@ -0,0 +1,14 @@
+import { loadDevkitConfig } from '../lib/config.js';
+import { findPluginDir } from '../lib/plugin.js';
+import { startSandboxServer } from '../sandbox/server.js';
+
+export async function cmdDev({ flags }) {
+  const { config } = loadDevkitConfig(process.cwd());
+  const pluginDir = findPluginDir(process.cwd(), flags['plugin-dir'] || flags.pluginDir || config?.pluginDir);
+  const portRaw = String(flags.port || flags.p || '').trim();
+  const port = portRaw ? Number(portRaw) : 4399;
+  const appId = String(flags.app || flags['app-id'] || flags.appId || config?.appId || '').trim();
+
+  await startSandboxServer({ pluginDir, port, appId });
+}
+

package/src/commands/init.js

@@ -0,0 +1,141 @@
+import path from 'path';
+import readline from 'readline';
+
+import { ensureDir, isDirectory, isFile, rmForce, writeText } from '../lib/fs.js';
+import {
+  copyTemplate,
+  listTemplates,
+  readTemplateMeta,
+  maybeReplaceTokensInFile,
+  writeScaffoldConfig,
+  writeScaffoldManifest,
+  writeScaffoldPackageJson,
+} from '../lib/template.js';
+
+function canPrompt() {
+  return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+}
+
+async function promptLine(question, { defaultValue = '' } = {}) {
+  if (!canPrompt()) throw new Error(`Missing required value: ${question}`);
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  try {
+    const answer = await new Promise((resolve) => rl.question(question, resolve));
+    const v = String(answer || '').trim();
+    return v || defaultValue;
+  } finally {
+    rl.close();
+  }
+}
+
+export async function cmdInit({ positionals, flags }) {
+  const list = Boolean(flags['list-templates'] || flags.listTemplates);
+  if (list) {
+    const templates = listTemplates();
+    if (templates.length === 0) {
+      // eslint-disable-next-line no-console
+      console.log('No templates found.');
+      return;
+    }
+    const lines = templates.map((t) => `- ${t.name}${t.description ? `: ${t.description}` : ''}`).join('\n');
+    // eslint-disable-next-line no-console
+    console.log(`Templates:\n${lines}\n\nUse:\n  chatos-uiapp init my-app --template <name>\n`);
+    return;
+  }
+
+  const dirArg = String(positionals[0] || '').trim();
+  if (!dirArg) throw new Error('init requires <dir>');
+
+  const templateName = String(flags.template || flags.t || '').trim() || 'basic';
+  const templateMeta = readTemplateMeta(templateName);
+
+  const destDir = path.resolve(process.cwd(), dirArg);
+  const force = Boolean(flags.force);
+
+  if (isDirectory(destDir)) {
+    const entries = await (async () => {
+      try {
+        return (await import('fs')).default.readdirSync(destDir);
+      } catch {
+        return [];
+      }
+    })();
+    if (entries.length > 0 && !force) {
+      throw new Error(`Target directory is not empty: ${destDir} (use --force to overwrite)`);
+    }
+    if (force) rmForce(destDir);
+  }
+
+  ensureDir(destDir);
+  copyTemplate({ templateName, destDir });
+
+  const pluginId =
+    String(flags['plugin-id'] || flags.pluginId || '').trim() || (await promptLine('pluginId (e.g. com.example.myapp): '));
+  const pluginName =
+    String(flags.name || '').trim() ||
+    (await promptLine('plugin name (display): ', { defaultValue: String(templateMeta?.defaults?.pluginName || '').trim() || pluginId }));
+
+  const defaultAppId = String(templateMeta?.defaults?.appId || '').trim() || 'app';
+  const appId =
+    String(flags['app-id'] || flags.appId || '').trim() ||
+    (await promptLine('appId (e.g. manager): ', { defaultValue: defaultAppId }));
+
+  const version = String(flags.version || '').trim() || String(templateMeta?.defaults?.version || '').trim() || '0.1.0';
+
+  const pluginDir = path.join(destDir, 'plugin');
+  ensureDir(pluginDir);
+
+  if (!isFile(path.join(pluginDir, 'plugin.json'))) {
+    const withBackend = templateMeta?.defaults?.withBackend !== false;
+    writeScaffoldManifest({ destPluginDir: pluginDir, pluginId, pluginName, version, appId, withBackend });
+  }
+  writeScaffoldPackageJson({ destDir, projectName: path.basename(destDir) });
+  writeScaffoldConfig({ destDir, pluginDir: 'plugin', appId });
+
+  // rename template app folder "app" -> actual appId
+  const srcAppDir = path.join(pluginDir, 'apps', 'app');
+  const dstAppDir = path.join(pluginDir, 'apps', appId);
+  try {
+    const fs = (await import('fs')).default;
+    if (fs.existsSync(srcAppDir) && fs.statSync(srcAppDir).isDirectory()) {
+      ensureDir(path.dirname(dstAppDir));
+      fs.renameSync(srcAppDir, dstAppDir);
+    }
+  } catch {
+    // ignore
+  }
+
+  // Token replacements inside README/template code.
+  const replacements = {
+    __PLUGIN_ID__: pluginId,
+    __PLUGIN_NAME__: pluginName,
+    __APP_ID__: appId,
+    __VERSION__: version,
+  };
+
+  maybeReplaceTokensInFile(path.join(destDir, 'README.md'), replacements);
+  maybeReplaceTokensInFile(path.join(destDir, 'chatos.config.json'), replacements);
+  if (isFile(path.join(pluginDir, 'plugin.json'))) {
+    maybeReplaceTokensInFile(path.join(pluginDir, 'plugin.json'), replacements);
+  }
+  maybeReplaceTokensInFile(path.join(pluginDir, 'backend', 'index.mjs'), replacements);
+  maybeReplaceTokensInFile(path.join(dstAppDir, 'index.mjs'), replacements);
+  maybeReplaceTokensInFile(path.join(dstAppDir, 'mcp-server.mjs'), replacements);
+  maybeReplaceTokensInFile(path.join(dstAppDir, 'mcp-prompt.zh.md'), replacements);
+  maybeReplaceTokensInFile(path.join(dstAppDir, 'mcp-prompt.en.md'), replacements);
+
+  // Ensure a helpful note exists even if template is edited later.
+  writeText(
+    path.join(destDir, '.gitignore'),
+    `node_modules/\n.DS_Store\n.chatos/\n*.log\n\n# build outputs (if you add bundling later)\ndist/\n`
+  );
+
+  // eslint-disable-next-line no-console
+  console.log(`Created: ${destDir}
+
+Next:
+  cd ${dirArg}
+  npm install
+  npm run dev
+`);
+}

package/src/commands/install.js

@@ -0,0 +1,55 @@
+import os from 'os';
+import path from 'path';
+
+import { copyDir, ensureDir, isDirectory, rmForce, sanitizeDirComponent } from '../lib/fs.js';
+import { loadDevkitConfig } from '../lib/config.js';
+import { findPluginDir, loadPluginManifest } from '../lib/plugin.js';
+
+function defaultStateDir(hostApp) {
+  const app = typeof hostApp === 'string' && hostApp.trim() ? hostApp.trim() : 'chatos';
+  return path.join(os.homedir(), '.deepseek_cli', app);
+}
+
+function copyPluginDir(srcDir, destDir) {
+  ensureDir(path.dirname(destDir));
+  rmForce(destDir);
+  copyDir(srcDir, destDir, {
+    filter: (src) => {
+      const base = path.basename(src);
+      if (base === 'node_modules') return false;
+      if (base === '.git') return false;
+      if (base === '.DS_Store') return false;
+      if (base.endsWith('.map')) return false;
+      return true;
+    },
+  });
+}
+
+export async function cmdInstall({ flags }) {
+  const { config } = loadDevkitConfig(process.cwd());
+  const pluginDir = findPluginDir(process.cwd(), flags['plugin-dir'] || flags.pluginDir || config?.pluginDir);
+  const { pluginId, name, version } = loadPluginManifest(pluginDir);
+
+  const hostApp = String(flags['host-app'] || flags.hostApp || 'chatos').trim() || 'chatos';
+  const stateDir = String(flags['state-dir'] || flags.stateDir || defaultStateDir(hostApp)).trim();
+  if (!stateDir) throw new Error('stateDir is required');
+
+  const pluginsRoot = path.join(stateDir, 'ui_apps', 'plugins');
+  ensureDir(pluginsRoot);
+
+  const dirName = sanitizeDirComponent(pluginId);
+  if (!dirName) throw new Error(`Invalid plugin id: ${pluginId}`);
+
+  const destDir = path.join(pluginsRoot, dirName);
+  const replaced = isDirectory(destDir);
+  copyPluginDir(pluginDir, destDir);
+
+  // eslint-disable-next-line no-console
+  console.log(
+    `Installed: ${pluginId} (${name}@${version})\n` +
+      `  -> ${destDir}\n` +
+      `  replaced: ${replaced}\n\n` +
+      `Open ChatOS -> 应用 -> 刷新（同 id 覆盖生效）。`
+  );
+}
+

package/src/commands/pack.js

@@ -0,0 +1,72 @@
+import os from 'os';
+import path from 'path';
+import { spawnSync } from 'child_process';
+
+import { copyDir, ensureDir, rmForce } from '../lib/fs.js';
+import { loadDevkitConfig } from '../lib/config.js';
+import { findPluginDir, loadPluginManifest } from '../lib/plugin.js';
+
+function hasCmd(cmd) {
+  const res = spawnSync('sh', ['-lc', `command -v ${cmd} >/dev/null 2>&1`], { stdio: 'ignore' });
+  return res.status === 0;
+}
+
+function packWithZip({ cwd, srcDir, outFile }) {
+  // zip -r out.zip .  (from within srcDir)
+  const res = spawnSync('zip', ['-r', outFile, '.'], { cwd: srcDir, stdio: 'inherit' });
+  if (res.status !== 0) throw new Error('zip failed');
+}
+
+function packWithPowershell({ srcDir, outFile }) {
+  const script = `Compress-Archive -Path "${srcDir}\\*" -DestinationPath "${outFile}" -Force`;
+  const res = spawnSync('powershell', ['-NoProfile', '-Command', script], { stdio: 'inherit' });
+  if (res.status !== 0) throw new Error('powershell Compress-Archive failed');
+}
+
+export async function cmdPack({ flags }) {
+  const { config } = loadDevkitConfig(process.cwd());
+  const pluginDir = findPluginDir(process.cwd(), flags['plugin-dir'] || flags.pluginDir || config?.pluginDir);
+  const { pluginId, version } = loadPluginManifest(pluginDir);
+
+  const outArg = String(flags.out || '').trim();
+  const outDir = outArg ? path.dirname(path.resolve(process.cwd(), outArg)) : path.join(process.cwd(), 'dist');
+  ensureDir(outDir);
+
+  const outFile = outArg
+    ? path.resolve(process.cwd(), outArg)
+    : path.join(outDir, `${pluginId.replace(/[^a-zA-Z0-9._-]+/g, '-')}-${version || '0.0.0'}.zip`);
+
+  rmForce(outFile);
+
+  const stagingBase = path.join(os.tmpdir(), `chatos-uiapp-pack-${Date.now()}-${Math.random().toString(16).slice(2)}`);
+  ensureDir(stagingBase);
+  try {
+    // mimic ChatOS importer: exclude node_modules/.git/*.map/.DS_Store
+    copyDir(pluginDir, stagingBase, {
+      filter: (src) => {
+        const base = path.basename(src);
+        if (base === 'node_modules') return false;
+        if (base === '.git') return false;
+        if (base === '.DS_Store') return false;
+        if (base.endsWith('.map')) return false;
+        return true;
+      },
+    });
+
+  const platform = process.platform;
+  if (hasCmd('zip')) {
+      packWithZip({ cwd: process.cwd(), srcDir: stagingBase, outFile });
+  } else if (platform === 'win32') {
+      packWithPowershell({ srcDir: stagingBase, outFile });
+  } else {
+    throw new Error('zip command not found (install "zip" or run on Windows with powershell)');
+  }
+
+  // eslint-disable-next-line no-console
+  console.log(`Packed: ${outFile}
+
+ChatOS -> 应用 -> 导入应用包 -> 选择该 zip`);
+  } finally {
+    rmForce(stagingBase);
+  }
+}

package/src/commands/validate.js

@@ -0,0 +1,103 @@
+import fs from 'fs';
+import path from 'path';
+
+import { isFile } from '../lib/fs.js';
+import { loadDevkitConfig } from '../lib/config.js';
+import { findPluginDir, loadPluginManifest } from '../lib/plugin.js';
+import { resolveInsideDir } from '../lib/path-boundary.js';
+
+function assert(cond, message) {
+  if (!cond) throw new Error(message);
+}
+
+function statSizeSafe(filePath) {
+  try {
+    return fs.statSync(filePath).size;
+  } catch {
+    return 0;
+  }
+}
+
+export async function cmdValidate({ flags }) {
+  const { config } = loadDevkitConfig(process.cwd());
+  const pluginDir = findPluginDir(process.cwd(), flags['plugin-dir'] || flags.pluginDir || config?.pluginDir);
+
+  const { manifestPath, manifest } = loadPluginManifest(pluginDir);
+
+  const manifestSize = statSizeSafe(manifestPath);
+  assert(manifestSize <= 256 * 1024, `plugin.json too large (>256KiB): ${manifestSize} bytes`);
+
+  assert(Number(manifest?.manifestVersion || 1) === 1, 'manifestVersion must be 1');
+  assert(typeof manifest?.id === 'string' && manifest.id.trim(), 'plugin.id is required');
+  assert(typeof manifest?.name === 'string' && manifest.name.trim(), 'plugin.name is required');
+
+  if (manifest?.backend?.entry) {
+    const backendAbs = resolveInsideDir(pluginDir, manifest.backend.entry);
+    assert(isFile(backendAbs), `backend.entry must be a file: ${manifest.backend.entry}`);
+  }
+
+  const apps = Array.isArray(manifest?.apps) ? manifest.apps : [];
+  assert(apps.length > 0, 'plugin.apps[] is required (>=1)');
+  const ids = new Set();
+  for (const app of apps) {
+    const appId = typeof app?.id === 'string' ? app.id.trim() : '';
+    assert(appId, 'apps[i].id is required');
+    assert(!ids.has(appId), `duplicate app.id: ${appId}`);
+    ids.add(appId);
+
+    assert(typeof app?.name === 'string' && app.name.trim(), `apps[${appId}].name is required`);
+    assert(app?.entry?.type === 'module', `apps[${appId}].entry.type must be "module"`);
+    const entryPath = typeof app?.entry?.path === 'string' ? app.entry.path.trim() : '';
+    assert(entryPath, `apps[${appId}].entry.path is required`);
+    const entryAbs = resolveInsideDir(pluginDir, entryPath);
+    assert(isFile(entryAbs), `apps[${appId}].entry.path must be a file: ${entryPath}`);
+
+    // Basic ai path boundary checks (full schema is defined in docs; this validates the security boundary).
+    const ai = app?.ai;
+    const aiObj =
+      typeof ai === 'string'
+        ? { config: ai }
+        : ai && typeof ai === 'object'
+          ? ai
+          : null;
+
+    if (aiObj?.config) {
+      const abs = resolveInsideDir(pluginDir, aiObj.config);
+      assert(isFile(abs), `apps[${appId}].ai.config must be a file: ${aiObj.config}`);
+      const size = statSizeSafe(abs);
+      assert(size <= 128 * 1024, `ai.config too large (>128KiB): ${aiObj.config}`);
+    }
+
+    if (aiObj?.mcp?.entry) {
+      const abs = resolveInsideDir(pluginDir, aiObj.mcp.entry);
+      assert(isFile(abs), `apps[${appId}].ai.mcp.entry must be a file: ${aiObj.mcp.entry}`);
+    }
+
+    const mcpPrompt = aiObj?.mcpPrompt;
+    const collectPromptPaths = () => {
+      if (!mcpPrompt) return [];
+      if (typeof mcpPrompt === 'string') return [mcpPrompt];
+      if (typeof mcpPrompt !== 'object') return [];
+      const zh = mcpPrompt.zh;
+      const en = mcpPrompt.en;
+      const out = [];
+      const pushSource = (src) => {
+        if (!src) return;
+        if (typeof src === 'string') out.push(src);
+        else if (typeof src === 'object' && typeof src.path === 'string') out.push(src.path);
+      };
+      pushSource(zh);
+      pushSource(en);
+      return out;
+    };
+    for (const rel of collectPromptPaths()) {
+      const abs = resolveInsideDir(pluginDir, rel);
+      assert(isFile(abs), `apps[${appId}].ai.mcpPrompt path must be a file: ${rel}`);
+      const size = statSizeSafe(abs);
+      assert(size <= 128 * 1024, `mcpPrompt too large (>128KiB): ${rel}`);
+    }
+  }
+
+  // eslint-disable-next-line no-console
+  console.log(`OK: ${path.relative(process.cwd(), pluginDir)} (apps=${apps.length})`);
+}

package/src/lib/args.js

@@ -0,0 +1,49 @@
+export function parseArgs(argv) {
+  const raw = Array.isArray(argv) ? argv.slice(2) : [];
+  const flags = {};
+  const positionals = [];
+
+  for (let i = 0; i < raw.length; i += 1) {
+    const token = raw[i];
+    if (!token) continue;
+
+    if (token === '--') {
+      positionals.push(...raw.slice(i + 1));
+      break;
+    }
+
+    if (token.startsWith('--')) {
+      const eq = token.indexOf('=');
+      const key = (eq >= 0 ? token.slice(2, eq) : token.slice(2)).trim();
+      const value = eq >= 0 ? token.slice(eq + 1) : raw[i + 1];
+      if (!key) continue;
+
+      if (eq < 0 && value && !value.startsWith('-')) {
+        flags[key] = value;
+        i += 1;
+      } else if (eq >= 0) {
+        flags[key] = value;
+      } else {
+        flags[key] = true;
+      }
+      continue;
+    }
+
+    if (token.startsWith('-') && token.length > 1) {
+      const key = token.slice(1).trim();
+      const value = raw[i + 1];
+      if (value && !value.startsWith('-')) {
+        flags[key] = value;
+        i += 1;
+      } else {
+        flags[key] = true;
+      }
+      continue;
+    }
+
+    positionals.push(token);
+  }
+
+  return { positionals, flags };
+}
+

package/src/lib/config.js

@@ -0,0 +1,29 @@
+import fs from 'fs';
+import path from 'path';
+
+import { isFile, readJson } from './fs.js';
+
+export function loadDevkitConfig(cwd) {
+  const root = typeof cwd === 'string' ? cwd : process.cwd();
+  const cfgPath = path.join(root, 'chatos.config.json');
+  if (!isFile(cfgPath)) return { path: cfgPath, config: null };
+  try {
+    const cfg = readJson(cfgPath);
+    return { path: cfgPath, config: cfg };
+  } catch {
+    return { path: cfgPath, config: null };
+  }
+}
+
+export function readOptionalJson(filePath) {
+  const normalized = typeof filePath === 'string' ? filePath.trim() : '';
+  if (!normalized) return null;
+  if (!fs.existsSync(normalized)) return null;
+  try {
+    const raw = fs.readFileSync(normalized, 'utf8');
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
+