onepage-cli 1.0.2 → 1.1.0

package/bin/op.js

@@ -235,6 +235,9 @@ async function cmdPush() {
   if (!files.some((f) => f.rel.toLowerCase() === 'index.html')) {
     die('缺少 index.html（网站入口文件），无法部署');
   }
+  if (files.some((f) => f.rel.split('/').pop().toLowerCase() === 'theme.json')) {
+    die('检测到 theme.json：这是博客主题包，请改用 op blog theme push <主题包.zip> 上传（不要解压后当静态站部署）');
+  }
 
   // 默认短链名：目录名
   const dirName = path.basename(process.cwd()).replace(/[^A-Za-z0-9_\-]/g, '-').toLowerCase() || 'site';
@@ -392,6 +395,10 @@ function cmdHelp() {
   console.log('  op delete <name>  删除指定站点');
   console.log('  op open <name>    在浏览器打开站点');
   console.log('');
+  console.log('博客（op blog <子命令>，详情 op blog help）：');
+  console.log('  op blog init / write / push / pull   文章写作与双向同步');
+  console.log('  op blog config / categories / theme  配置、分类与主题');
+  console.log('');
   console.log('示例：');
   console.log('  op login && op init && op add . && op push');
   console.log('  op clone https://app1.cloudstudio.site/demo/');
@@ -415,6 +422,7 @@ async function main() {
       case 'list': case 'ls': return await cmdList();
       case 'delete': case 'rm': return await cmdDelete(args);
       case 'open': return await cmdOpen(args);
+      case 'blog': return await require('../lib/blog')(args, conf.load());
       case 'help': case '--help': case '-h': return cmdHelp();
       default:
         err('未知命令：' + cmd);

package/lib/blog.js

@@ -0,0 +1,386 @@
+'use strict';
+// op blog —— 博客模块命令组（文章 Markdown 双向同步 / 配置 / 分类 / 主题）
+const fs = require('fs');
+const path = require('path');
+const { api } = require('./api');
+const { ok, err, info, warn, table } = require('./util');
+
+const BLOG_DIR = path.join('.onepage', 'blog');
+const CFG_YML = path.join(BLOG_DIR, 'config.yml');
+const POSTS_DIR = path.join(BLOG_DIR, 'posts');
+const THEMES_DIR = path.join(BLOG_DIR, 'themes');
+
+function die(msg) { err(msg); process.exit(1); }
+
+/* ---------- 极简扁平 YAML（与 op.js preview.yml 同一套约定） ---------- */
+function parseSimpleYaml(text) {
+  const out = {};
+  for (let line of String(text).split(/\r?\n/)) {
+    line = line.trim();
+    if (!line || line.startsWith('#')) continue;
+    const i = line.indexOf(':');
+    if (i < 1) continue;
+    const k = line.slice(0, i).trim();
+    let v = line.slice(i + 1).trim();
+    if ((v.startsWith('"') && v.endsWith('"') && v.length >= 2) ||
+        (v.startsWith("'") && v.endsWith("'") && v.length >= 2)) v = v.slice(1, -1);
+    out[k] = v;
+  }
+  return out;
+}
+
+/* ---------- front-matter ---------- */
+function parseFrontMatter(text) {
+  const m = String(text).match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/);
+  if (!m) return { meta: {}, body: String(text) };
+  return { meta: parseSimpleYaml(m[1]), body: m[2] };
+}
+
+function buildFrontMatter(meta, body) {
+  const lines = ['---'];
+  for (const [k, v] of Object.entries(meta)) {
+    if (v === '' || v == null) continue;
+    lines.push(`${k}: ${v}`);
+  }
+  lines.push('---', '');
+  return lines.join('\n') + '\n' + body;
+}
+
+function slugifyTitle(t) {
+  const s = String(t || '').trim().toLowerCase()
+    .replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 60);
+  return s || ('post-' + new Date().toISOString().slice(0, 10).replace(/-/g, ''));
+}
+
+function requireAuth(cfg) {
+  if (!cfg.token) die('尚未登录，请先执行 op login');
+}
+
+async function authed(cfg, method, pathname, body) {
+  const r = await api(cfg, method, pathname, body);
+  if (r.status === 401) die('登录已失效，请重新执行 op login');
+  return r;
+}
+
+function listLocalPosts() {
+  if (!fs.existsSync(POSTS_DIR)) return [];
+  return fs.readdirSync(POSTS_DIR).filter((f) => f.endsWith('.md')).map((f) => {
+    const full = path.join(POSTS_DIR, f);
+    const { meta, body } = parseFrontMatter(fs.readFileSync(full, 'utf8'));
+    return { file: f, path: full, meta, body };
+  });
+}
+
+/* ---------- init ---------- */
+function cmdInit() {
+  if (fs.existsSync(BLOG_DIR)) {
+    warn('博客工作区已存在（' + BLOG_DIR + '）');
+    return;
+  }
+  fs.mkdirSync(POSTS_DIR, { recursive: true });
+  fs.mkdirSync(THEMES_DIR, { recursive: true });
+  fs.writeFileSync(CFG_YML, [
+    '# OnePage 博客配置 —— 编辑后执行 op blog config push 应用到线上',
+    '# 值一律写在冒号后面；theme 留空表示不改动当前主题',
+    "site_title: ''        # 博客名称",
+    "description: ''       # 博客介绍（显示在首页与分享卡片）",
+    "theme: ''             # 主题 key（如 firefly / paper / illusion…）",
+    '# 主题选项（按所选主题的配置项填写，一行一项，前缀 option.）：',
+    '# option.accent: \'#0969da\'',
+  ].join('\n') + '\n');
+  fs.writeFileSync(path.join(POSTS_DIR, 'hello-world.md'), [
+    '---',
+    "title: 你好，世界",
+    'slug: hello-world',
+    'status: draft        # draft=草稿 published=发布',
+    "category: ''",
+    "description: ''",
+    '---',
+    '',
+    '这是第一篇文章的正文，支持 **Markdown** 与表格：',
+    '',
+    '| 表头A | 表头B |',
+    '| --- | --- |',
+    '| 1 | 2 |',
+    '',
+].join('\n'));
+  ok('已创建博客工作区 .onepage/blog/（config.yml + posts/ + themes/）');
+  console.log('  1. op blog write 文章标题   新建一篇文章');
+  console.log('  2. op blog push --publish  发布全部文章（自动过 AI 审核）');
+  console.log('  3. op blog config push     应用配置/主题修改');
+}
+
+/* ---------- config ---------- */
+async function cmdConfig(args, cfg) {
+  const sub = args[0] || 'pull';
+  if (sub === 'pull') {
+    const r = await authed(cfg, 'GET', '/api/cli/blog/config');
+    const c = r.data.config || {};
+    const lines = [
+      '# OnePage 博客配置（op blog config pull 生成）',
+      "site_title: '" + String(c.site_title || '').replace(/'/g, "''") + "'",
+      "description: '" + String(c.description || '').replace(/'/g, "''") + "'",
+      "theme: '" + String(c.theme || '') + "'",
+    ];
+    for (const [k, v] of Object.entries(c.options || {})) {
+      lines.push("option." + k + ": '" + String(v).replace(/'/g, "''") + "'");
+    }
+    fs.writeFileSync(CFG_YML, lines.join('\n') + '\n');
+    ok('已拉取线上配置 → ' + CFG_YML);
+    return;
+  }
+  if (sub === 'push') {
+    if (!fs.existsSync(CFG_YML)) die('未找到 ' + CFG_YML + '（先执行 op blog init 或 op blog config pull）');
+    const y = parseSimpleYaml(fs.readFileSync(CFG_YML, 'utf8'));
+    const body = {};
+    if (y.site_title !== undefined) body.site_title = y.site_title;
+    if (y.description !== undefined) body.description = y.description;
+    const options = {};
+    for (const [k, v] of Object.entries(y)) {
+      if (k.startsWith('option.')) options[k.slice(7)] = v;
+    }
+    if (y.theme) { body.theme = y.theme; if (Object.keys(options).length) body.options = options; }
+    const r = await authed(cfg, 'POST', '/api/cli/blog/config', body);
+    if (!r.data.ok) die(r.data.error || '保存失败');
+    ok('配置已应用' + (body.theme ? '（主题：' + body.theme + '，静态页已重建）' : ''));
+    return;
+  }
+  die('未知子命令：config ' + sub + '（可用：pull / push）');
+}
+
+/* ---------- write ---------- */
+function cmdWrite(args) {
+  const title = args.filter((a) => !a.startsWith('--')).join(' ') || '未命名文章';
+  if (!fs.existsSync(POSTS_DIR)) die('未找到博客工作区，请先执行 op blog init');
+  const slug = slugifyTitle(title);
+  let file = path.join(POSTS_DIR, slug + '.md');
+  let n = 2;
+  while (fs.existsSync(file)) file = path.join(POSTS_DIR, slug + '-' + n++ + '.md');
+  fs.writeFileSync(file, buildFrontMatter({
+    title, slug: path.basename(file, '.md'),
+    status: 'draft', category: '', description: '',
+  }, '正文从这里开始…\n'));
+  ok('已创建 ' + file);
+  console.log('  写完后执行 op blog push ' + path.basename(file) + ' --publish 发布');
+}
+
+/* ---------- list / status ---------- */
+async function cmdList(cfg) {
+  const r = await authed(cfg, 'GET', '/api/cli/blog/posts');
+  const posts = r.data.posts || [];
+  if (!posts.length) { info('博客还没有文章'); return; }
+  table(['SLUG', '状态', '分类', '更新时间'], posts.map((p) => [
+    p.slug, p.status === 'published' ? '已发布' : '草稿', p.category || '-', p.updated_at || p.date,
+  ]));
+  info('共 ' + posts.length + ' 篇');
+}
+
+async function cmdStatus(cfg) {
+  const r = await authed(cfg, 'GET', '/api/cli/blog/posts');
+  const remote = new Set((r.data.posts || []).map((p) => p.slug));
+  const local = listLocalPosts();
+  if (!local.length) { info('本地 posts/ 没有文章'); return; }
+  table(['本地文件', 'slug', '状态', '远端'], local.map((l) => [
+    l.file, l.meta.slug || path.basename(l.file, '.md'),
+    l.meta.status === 'published' ? '已发布' : '草稿',
+    remote.has(l.meta.slug || path.basename(l.file, '.md')) ? '已存在(更新)' : '新文章',
+  ]));
+  info('执行 op blog push 上传变更；--publish 同时发布');
+}
+
+/* ---------- push ---------- */
+async function cmdPush(args, cfg) {
+  const publishFlag = args.includes('--publish');
+  const targets = args.filter((a) => !a.startsWith('--'));
+  let files;
+  if (targets.length) {
+    files = targets.map((t) => (t.endsWith('.md') ? t : t + '.md'))
+      .map((t) => (fs.existsSync(t) ? t : path.join(POSTS_DIR, t)));
+    for (const f of files) if (!fs.existsSync(f)) die('文件不存在：' + f);
+  } else {
+    files = listLocalPosts().map((l) => l.path);
+    if (!files.length) { info('posts/ 没有可推送的文章'); return; }
+  }
+  let published = 0, saved = 0;
+  for (const f of files) {
+    const { meta, body } = parseFrontMatter(fs.readFileSync(f, 'utf8'));
+    if (!body.trim()) { warn('跳过空文件：' + f); continue; }
+    const publish = publishFlag || meta.status === 'published';
+    const r = await authed(cfg, 'POST', '/api/cli/blog/posts', {
+      slug: meta.slug || path.basename(f, '.md'),
+      title: meta.title || '',
+      markdown: body,
+      description: meta.description || '',
+      category: meta.category || '',
+      publish,
+    });
+    if (!r.data.ok) { warn((r.data.error || '推送失败') + ' ← ' + f); continue; }
+    if (publish) published++; else saved++;
+    console.log((publish ? '  ✓ 已发布' : '  ✓ 已保存草稿') + '  ' + r.data.slug +
+      (r.data.created ? '（新建）' : '（更新）'));
+  }
+  if (published) info(published + ' 篇已发布，将自动进行 AI 内容审核');
+  if (saved) info(saved + ' 篇存为草稿，发布执行 op blog push <文件> --publish 或到网页后台');
+}
+
+/* ---------- pull ---------- */
+async function cmdPull(args, cfg) {
+  const force = args.includes('-f') || args.includes('--force');
+  const targets = args.filter((a) => !a.startsWith('-'));
+  if (!fs.existsSync(POSTS_DIR)) die('未找到博客工作区，请先执行 op blog init');
+  let slugs;
+  if (!targets.length || targets[0] === 'all') {
+    const r = await authed(cfg, 'GET', '/api/cli/blog/posts');
+    slugs = (r.data.posts || []).map((p) => p.slug);
+    if (!slugs.length) { info('远端还没有文章'); return; }
+    info('拉取全部 ' + slugs.length + ' 篇');
+  } else {
+    slugs = targets;
+  }
+  let done = 0, skipped = 0;
+  for (const slug of slugs) {
+    const r = await authed(cfg, 'GET', '/api/cli/blog/post/' + encodeURIComponent(slug));
+    if (!r.data.ok) { warn(r.data.error); continue; }
+    const p = r.data.post;
+    let md = p.markdown || '';
+    // 服务端导出首行为 "# 标题"，标题已在 front-matter 中，去掉避免重复
+    md = md.replace(new RegExp('^# ' + p.title.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '\\r?\\n'), '');
+    const file = path.join(POSTS_DIR, p.slug + '.md');
+    const content = buildFrontMatter({
+      title: p.title, slug: p.slug, status: p.status,
+      category: p.category || '', description: p.description || '',
+    }, md);
+    if (fs.existsSync(file) && !force && fs.readFileSync(file, 'utf8') !== content) {
+      warn('本地有改动，跳过（用 -f 覆盖）：' + p.slug + '.md');
+      skipped++;
+      continue;
+    }
+    fs.writeFileSync(file, content);
+    console.log('  ✓ ' + p.slug + '.md' + (p.status === 'draft' ? '（草稿）' : ''));
+    done++;
+  }
+  info('拉取 ' + done + ' 篇' + (skipped ? '，跳过 ' + skipped + ' 篇（本地有改动）' : ''));
+}
+
+/* ---------- delete ---------- */
+async function cmdDelete(args, cfg) {
+  const slug = args.filter((a) => !a.startsWith('-'))[0];
+  if (!slug) die('用法：op blog delete <slug> [-y]');
+  const { ask } = require('./prompt');
+  if (!args.includes('-y') && !args.includes('--yes')) {
+    const ans = await ask('确认删除文章「' + slug + '」？(y/N) ');
+    if (ans.trim().toLowerCase() !== 'y') { info('已取消'); return; }
+  }
+  const r = await authed(cfg, 'DELETE', '/api/cli/blog/post/' + encodeURIComponent(slug));
+  if (!r.data.ok) die(r.data.error || '删除失败');
+  ok('已删除：' + slug);
+}
+
+/* ---------- categories ---------- */
+async function cmdCategories(args, cfg) {
+  const sub = args[0];
+  if (sub === 'add' || sub === 'rename' || sub === 'delete') {
+    const body = { action: sub, name: args[1] || '' };
+    if (sub === 'rename') body.new_name = args[2] || '';
+    const r = await authed(cfg, 'POST', '/api/cli/blog/categories', body);
+    if (!r.data.ok) die(r.data.error || '操作失败');
+    ok({ add: '已创建分类：', rename: '已重命名为：', delete: '已删除分类：' }[sub] +
+      (sub === 'rename' ? body.new_name : body.name));
+    return;
+  }
+  const r = await authed(cfg, 'GET', '/api/cli/blog/categories');
+  const cats = r.data.categories || [];
+  if (!cats.length) { info('还没有分类（op blog categories add <名称>）'); return; }
+  table(['分类', '文章数'], cats.map((c) => [c.name, String(c.count)]));
+}
+
+/* ---------- themes ---------- */
+async function cmdThemes(cfg) {
+  const r = await authed(cfg, 'GET', '/api/cli/blog/themes');
+  const themes = r.data.themes || [];
+  table(['KEY', '名称', '当前'], themes.map((t) => [t.key, t.name, t.current ? '✓' : '']));
+  info('应用：op blog theme apply <key> [--opt 选项名=值 ...]');
+}
+
+async function cmdThemeApply(args, cfg) {
+  const key = args.filter((a) => !a.startsWith('--'))[0];
+  if (!key) die('用法：op blog theme apply <key> [--opt 选项名=值 ...]');
+  const options = {};
+  const rest = args.filter((a) => !a.startsWith('--'));
+  for (const a of args) {
+    const m = a.match(/^--opt(?:ion)?[= ](.+?)=(.+)$/);
+    if (m) options[m[1]] = m[2];
+  }
+  if (rest[1]) options._hint = rest[1]; // 容错：位置参数不进 options
+  delete options._hint;
+  const r = await authed(cfg, 'POST', '/api/cli/blog/theme/apply', { theme: key, options });
+  if (!r.data.ok) die(r.data.error || '应用失败');
+  ok('主题已应用：' + key + '（静态页已重建）');
+}
+
+async function cmdThemePush(args, cfg) {
+  const zipPath = args.filter((a) => !a.startsWith('-'))[0];
+  if (!zipPath) die('用法：op blog theme push <主题包.zip> [--overwrite]');
+  if (!fs.existsSync(zipPath)) die('文件不存在：' + zipPath);
+  const form = new FormData();
+  form.append('file', new Blob([fs.readFileSync(zipPath)]), path.basename(zipPath));
+  if (args.includes('--overwrite')) form.append('overwrite', '1');
+  const res = await fetch(cfg.server + '/api/cli/blog/theme/import', {
+    method: 'POST',
+    headers: { Authorization: 'Bearer ' + cfg.token },
+    body: form,
+  });
+  const data = await res.json().catch(() => ({}));
+  if (res.status === 401) die('登录已失效，请重新执行 op login');
+  if (!data.ok) die(data.error || '导入失败');
+  ok('主题「' + data.key + '」导入成功，静态页已重建');
+}
+
+/* ---------- help ---------- */
+function cmdHelp() {
+  console.log([
+    '',
+    '用法：op blog <子命令> [参数]',
+    '',
+    '  init                     创建博客工作区 .onepage/blog/（config.yml + posts/ + themes/）',
+    '  write <标题>             新建带 front-matter 的 Markdown 文章模板',
+    '  status                   本地文章与远端对比',
+    '  push [文件] [--publish]  推送文章（--publish 直接发布，自动过 AI 审核）',
+    '  pull [slug|all] [-f]     拉取远端文章为 Markdown（-f 覆盖本地改动）',
+    '  list                     远端文章列表',
+    '  delete <slug> [-y]       删除文章',
+    '  config [pull|push]       拉取/推送博客配置（标题、介绍、主题及选项）',
+    '  categories [add|rename|delete ...]  分类管理',
+    '  themes                   主题列表',
+    '  theme apply <key> [--opt k=v]       应用主题',
+    '  theme push <zip> [--overwrite]      上传主题包',
+    '',
+  ].join('\n'));
+}
+
+/* ---------- 入口 ---------- */
+module.exports = async function (args, cfg) {
+  const sub = args[0] || 'help';
+  const rest = args.slice(1);
+  switch (sub) {
+    case 'init': return cmdInit();
+    case 'write': case 'new': return cmdWrite(rest);
+    case 'status': return await cmdStatus(cfg);
+    case 'push': return await cmdPush(rest, cfg);
+    case 'pull': return await cmdPull(rest, cfg);
+    case 'list': case 'ls': return await cmdList(cfg);
+    case 'delete': case 'rm': return await cmdDelete(rest, cfg);
+    case 'config': return await cmdConfig(rest, cfg);
+    case 'categories': case 'cat': return await cmdCategories(rest, cfg);
+    case 'themes': return await cmdThemes(cfg);
+    case 'theme': {
+      const action = rest[0];
+      if (action === 'apply') return await cmdThemeApply(rest.slice(1), cfg);
+      if (action === 'push' || action === 'import') return await cmdThemePush(rest.slice(1), cfg);
+      die('未知子命令：theme ' + (action || '') + '（可用：apply / push）');
+    }
+    case 'help': case '--help': case '-h': return cmdHelp();
+    default:
+      die('未知子命令：blog ' + sub + '（op blog help 查看用法）');
+  }
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "onepage-cli",
-  "version": "1.0.2",
-  "description": "OnePage 命令行工具：在终端生成、部署、管理你的静态网页（git 风格指令 op login / init / add / push / clone / list / delete）",
+  "version": "1.1.0",
+  "description": "OnePage 命令行工具：在终端部署管理静态网页与博客（op 静态站指令 + op blog 文章/配置/主题指令）",
   "bin": {
     "op": "bin/op.js"
   },
@@ -27,4 +27,4 @@
     "type": "url",
     "url": "https://app1.cloudstudio.site"
   }
-}
+}