@qic-9821/dsh-plugin-sync 0.0.0-stage → 0.1.1

package/lib/patch.js

@@ -0,0 +1,192 @@
+import { copyFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { dirname } from 'node:path'
+
+/**
+ * Minimal reader/writer for the top-level rows of a DSH `cordis.patch.yml`.
+ *
+ * Only the top-level `- id: <row>` rows are touched; nested `- insert:` blocks
+ * and comments are carried through byte for byte. Values are written as YAML
+ * flow mappings (`config: {"a":1}`), which is valid YAML and keeps the writer
+ * free of a yaml dependency.
+ */
+
+const ROW_START = /^-\s+id:\s*(.+?)\s*$/
+const NAME_LINE = /^\s+name:\s*(.+?)\s*$/
+const DISABLED_LINE = /^\s+disabled:\s*(true|false)\s*$/
+const CONFIG_LINE = /^\s+config:\s*(.*)$/
+
+export function parseRows(text) {
+  const lines = String(text ?? '').split('\n')
+  const rows = []
+  let current = null
+  for (let index = 0; index < lines.length; index += 1) {
+    const line = lines[index]
+    const start = ROW_START.exec(line)
+    if (start) {
+      current = { id: unquote(start[1]), name: null, disabled: null, startLine: index, endLine: index, configLines: null }
+      rows.push(current)
+      continue
+    }
+    if (!current) continue
+    if (line.trim().length === 0) {
+      // blank lines inside a row block: keep the block alive only if the next
+      // non-blank line is still indented
+      current.endLine = index
+      continue
+    }
+    if (!/^\s/.test(line)) {
+      current.endLine = index - 1
+      current = null
+      continue
+    }
+    const name = NAME_LINE.exec(line)
+    if (name && current.name === null) current.name = unquote(name[1])
+    const disabled = DISABLED_LINE.exec(line)
+    if (disabled) current.disabled = disabled[1] === 'true'
+    current.endLine = index
+  }
+  return rows
+}
+
+export function findRow(rows, { id, moduleName }) {
+  if (id) {
+    const byId = rows.find((row) => row.id === id)
+    if (byId) return byId
+  }
+  if (moduleName) return rows.find((row) => row.name === moduleName) || null
+  return null
+}
+
+export function rowConfig(text, row) {
+  const lines = String(text ?? '').split('\n')
+  const match = CONFIG_LINE.exec(lines[row.startLine] ?? '')
+  void match
+  for (let index = row.startLine; index <= row.endLine; index += 1) {
+    const hit = CONFIG_LINE.exec(lines[index])
+    if (!hit) continue
+    const inline = hit[1].trim()
+    if (inline && inline !== '|' && inline !== '>') {
+      try {
+        return JSON.parse(inline)
+      } catch {
+        const relaxed = parseFlowMapping(inline)
+        if (relaxed !== null) return relaxed
+        // Anything we cannot read stays opaque: config sync must never invent a value.
+        return { __raw: inline }
+      }
+    }
+    const block = []
+    for (let cursor = index + 1; cursor <= row.endLine; cursor += 1) {
+      const line = lines[cursor]
+      if (!/^\s{3,}/.test(line)) break
+      block.push(line.replace(/^\s{0,4}/, ''))
+    }
+    return block.length > 0 ? { __raw: block.join('\n') } : null
+  }
+  return null
+}
+
+export function setRowDisabled(text, rowId, disabled) {
+  const source = String(text ?? '')
+  const rows = parseRows(source)
+  const row = findRow(rows, { id: rowId })
+  const lines = source.split('\n')
+  if (!row) {
+    if (!disabled) return source
+    const tail = source.endsWith('\n') || source.length === 0 ? '' : '\n'
+    return `${source}${tail}- id: ${rowId}\n  disabled: true\n`
+  }
+  const value = disabled ? 'true' : 'false'
+  for (let index = row.startLine; index <= row.endLine; index += 1) {
+    if (DISABLED_LINE.test(lines[index])) {
+      lines[index] = `  disabled: ${value}`
+      return lines.join('\n')
+    }
+  }
+  // insert after the name line, else right after the id line
+  let anchor = row.startLine
+  for (let index = row.startLine; index <= row.endLine; index += 1) {
+    if (NAME_LINE.test(lines[index])) {
+      anchor = index
+      break
+    }
+  }
+  lines.splice(anchor + 1, 0, `  disabled: ${value}`)
+  return lines.join('\n')
+}
+
+export function setRowConfig(text, rowId, config) {
+  const source = String(text ?? '')
+  const rows = parseRows(source)
+  const row = findRow(rows, { id: rowId })
+  if (!row) return { text: source, changed: false, reason: 'row-not-found' }
+  const lines = source.split('\n')
+  let configStart = -1
+  for (let index = row.startLine; index <= row.endLine; index += 1) {
+    if (CONFIG_LINE.test(lines[index])) {
+      configStart = index
+      break
+    }
+  }
+  const block = `  config: ${JSON.stringify(config ?? {})}`
+  if (configStart === -1) {
+    lines.splice(row.endLine + 1, 0, block)
+    return { text: lines.join('\n'), changed: true }
+  }
+  let configEnd = configStart
+  for (let cursor = configStart + 1; cursor <= row.endLine; cursor += 1) {
+    if (!/^\s{3,}/.test(lines[cursor])) break
+    configEnd = cursor
+  }
+  lines.splice(configStart, configEnd - configStart + 1, block)
+  return { text: lines.join('\n'), changed: true }
+}
+
+export function readPatchText(profileDir) {
+  if (!profileDir) return ''
+  const path = `${profileDir}/cordis.patch.yml`
+  try {
+    return readFileSync(path, 'utf8')
+  } catch {
+    return ''
+  }
+}
+
+export function backupPatch(profileDir, backupRoot, stamp = new Date()) {
+  if (!profileDir) return null
+  const path = `${profileDir}/cordis.patch.yml`
+  if (!existsSync(path)) return null
+  mkdirSync(backupRoot, { recursive: true })
+  const tag = stamp.toISOString().replace(/[-:]/g, '').replace(/\..*$/, '')
+  const target = `${backupRoot}/cordis.patch.yml.${tag}.bak`
+  copyFileSync(path, target)
+  return target
+}
+
+export function writePatchText(profileDir, text) {
+  const path = `${profileDir}/cordis.patch.yml`
+  mkdirSync(dirname(path), { recursive: true })
+  writeFileSync(path, text, 'utf8')
+  return path
+}
+
+/** Read `{ appId: 1, nested: { a: 'b' } }` — JSON once bare keys are quoted. */
+function parseFlowMapping(text) {
+  const quotedKeys = String(text).replace(/([{,]\s*)([A-Za-z_$][\w$-]*)\s*:/g, '$1"$2":')
+  for (const candidate of [quotedKeys, String(text).replace(/'/g, '"')]) {
+    try {
+      const value = JSON.parse(candidate)
+      return value && typeof value === 'object' ? value : null
+    } catch {
+      // try next form
+    }
+  }
+  return null
+}
+
+function unquote(value) {  const trimmed = String(value ?? '').trim()
+  if ((trimmed.startsWith('"') && trimmed.endsWith('"')) || (trimmed.startsWith("'") && trimmed.endsWith("'"))) {
+    return trimmed.slice(1, -1)
+  }
+  return trimmed
+}

package/lib/snapshot.js

@@ -0,0 +1,117 @@
+import { existsSync } from 'node:fs'
+import { hostname, platform } from 'node:os'
+import { join } from 'node:path'
+
+import { PACKAGE_NAME, filterConfig } from './config.js'
+import { parseRows, readPatchText, rowConfig } from './patch.js'
+
+export const SNAPSHOT_SCHEMA = 1
+
+export function pluginManagerOf(ctx) {
+  const pm = ctx?.get?.('pluginManager')
+  if (!pm || typeof pm.listBundles !== 'function' || typeof pm.listPlugins !== 'function') {
+    throw new Error('pluginManager service unavailable (host too old or plugin not loaded in the app scope)')
+  }
+  return pm
+}
+
+function localSpecOf(bundle) {
+  const spec = bundle?.installTarget?.spec || bundle?.source || bundle?.spec || null
+  if (typeof spec !== 'string' || !spec.trim()) return null
+  return spec.trim()
+}
+
+/** Turn `file:D:/x/y`, `file:///D:/x/y` or a bare absolute path into a directory. */
+export function localDirOf(spec) {
+  if (!spec) return null
+  let value = spec.trim()
+  if (value.startsWith('file:')) value = value.slice(5)
+  if (value.startsWith('//')) value = value.slice(2)
+  if (/^\/[A-Za-z]:\//.test(value)) value = value.slice(1)
+  if (!/^([A-Za-z]:[\\/]|\/)/.test(value)) return null
+  return value.replace(/\\/g, '/')
+}
+
+export async function buildSnapshot({ ctx, cfg, profileDir, includeConfig = false, includeSources = false }) {
+  const pm = pluginManagerOf(ctx)
+  const rawBundles = await pm.listBundles()
+  const rawPlugins = await pm.listPlugins()
+  const bundles = Array.isArray(rawBundles) ? rawBundles : []
+  const plugins = Array.isArray(rawPlugins) ? rawPlugins : []
+  const patchText = readPatchText(profileDir)
+  const rows = parseRows(patchText)
+
+  const bundleViews = bundles.map((bundle) => {
+    const spec = localSpecOf(bundle)
+    return {
+      name: String(bundle.name),
+      version: bundle.version ?? null,
+      spec,
+      enabled: bundle.enabled !== false,
+      official: Boolean(bundle.official),
+      optional: Boolean(bundle.optional),
+      availability: bundle.availability ?? null,
+      updatable: Boolean(bundle.updatable),
+    }
+  })
+
+  const configs = {}
+  const sources = {}
+  if (includeConfig) {
+    for (const row of rows) {
+      if (!row.name) continue
+      const value = rowConfig(patchText, row)
+      if (!value || typeof value !== 'object' || '__raw' in value) continue
+      configs[row.name] = {
+        rowId: row.id,
+        config: filterConfig(value, { includeSecrets: Boolean(cfg.capSecrets) }),
+      }
+    }
+  }
+  if (includeSources) {
+    for (const bundle of bundleViews) {
+      const dir = localDirOf(bundle.spec)
+      if (dir && existsSync(join(dir, 'package.json'))) {
+        sources[bundle.name] = { kind: 'dir', path: dir }
+      }
+    }
+  }
+
+  return {
+    schema: SNAPSHOT_SCHEMA,
+    at: new Date().toISOString(),
+    node: {
+      name: cfg.localName || hostname(),
+      hostname: hostname(),
+      platform: platform(),
+      profile: profileDir ? profileDir.replace(/\\/g, '/').split('/').pop() : null,
+      plugin: PACKAGE_NAME,
+      version: cfg.__version || null,
+    },
+    bundles: bundleViews,
+    plugins: plugins.map((plugin) => ({
+      entryId: String(plugin.entryId ?? ''),
+      moduleName: String(plugin.moduleName ?? ''),
+      enabled: plugin.enabled !== false,
+      phase: plugin.fiberPhase ?? null,
+    })),
+    configs,
+    sources,
+  }
+}
+
+export function summarizeSnapshot(snapshot) {
+  if (!snapshot || typeof snapshot !== 'object') {
+    return { node: null, bundles: 0, plugins: 0, enabled: 0, configs: 0 }
+  }
+  const bundles = Array.isArray(snapshot.bundles) ? snapshot.bundles : []
+  return {
+    node: snapshot.node?.name ?? null,
+    profile: snapshot.node?.profile ?? null,
+    at: snapshot.at ?? null,
+    bundles: bundles.length,
+    plugins: Array.isArray(snapshot.plugins) ? snapshot.plugins.length : 0,
+    enabled: bundles.filter((bundle) => bundle.enabled).length,
+    configs: Object.keys(snapshot.configs || {}).length,
+  }
+}

package/lib/transfer.js

@@ -0,0 +1,85 @@
+import { spawn } from 'node:child_process'
+import { existsSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
+import { basename, dirname, join } from 'node:path'
+
+/** Tar-based copy of a local `file:` bundle so the peer can install it too. */
+
+export function packDirectory(dir, { maxBytes = 48 * 1024 * 1024, excludes = ['node_modules', '.git'] } = {}) {
+  return new Promise((resolve, reject) => {
+    if (!existsSync(dir)) {
+      reject(new Error(`目录不存在: ${dir}`))
+      return
+    }
+    const parent = dirname(dir)
+    const base = basename(dir)
+    const args = ['-cf', '-', '-C', parent]
+    for (const item of excludes) args.push(`--exclude=${item}`)
+    args.push(base)
+    const child = spawn(tarExecutable(), args, { stdio: ['ignore', 'pipe', 'pipe'], windowsHide: true })
+    const chunks = []
+    let size = 0
+    let stderr = ''
+    child.stdout.on('data', (chunk) => {
+      size += chunk.length
+      if (size > maxBytes) {
+        try {
+          child.kill()
+        } catch {
+          // ignore
+        }
+        reject(new Error(`目录太大（>${Math.round(maxBytes / 1024 / 1024)}MB），已跳过: ${dir}`))
+        return
+      }
+      chunks.push(chunk)
+    })
+    child.stderr.on('data', (chunk) => {
+      stderr += String(chunk)
+    })
+    child.on('error', (error) => reject(new Error(`tar 不可用: ${error.message}`)))
+    child.on('exit', (code) => {
+      if (size > maxBytes) return
+      if (code !== 0) {
+        reject(new Error(`tar 打包失败 (${code}): ${stderr.trim().slice(-300)}`))
+        return
+      }
+      resolve(Buffer.concat(chunks))
+    })
+  })
+}
+
+export function unpackDirectory(buffer, destRoot, name) {
+  return new Promise((resolve, reject) => {
+    const safe = String(name).replace(/[^A-Za-z0-9._@-]/g, '_')
+    const dest = join(destRoot, safe)
+    mkdirSync(destRoot, { recursive: true })
+    rmSync(dest, { recursive: true, force: true })
+    mkdirSync(dest, { recursive: true })
+    const archive = join(destRoot, `${safe}.tar`)
+    writeFileSync(archive, buffer)
+    const child = spawn(tarExecutable(), ['-xf', archive, '-C', destRoot], {
+      stdio: ['ignore', 'ignore', 'pipe'],
+      windowsHide: true,
+    })
+    let stderr = ''
+    child.stderr.on('data', (chunk) => {
+      stderr += String(chunk)
+    })
+    child.on('error', (error) => reject(new Error(`tar 不可用: ${error.message}`)))
+    child.on('exit', (code) => {
+      try {
+        rmSync(archive, { force: true })
+      } catch {
+        // ignore
+      }
+      if (code !== 0) {
+        reject(new Error(`解包失败 (${code}): ${stderr.trim().slice(-300)}`))
+        return
+      }
+      resolve(dest)
+    })
+  })
+}
+
+function tarExecutable() {
+  return process.platform === 'win32' ? 'tar' : 'tar'
+}

package/lib/transport.js

@@ -0,0 +1,168 @@
+import { spawn } from 'node:child_process'
+import { createServer } from 'node:net'
+
+/**
+ * Talks to the peer's `/plugin-sync/peer/*` namespace.
+ * Two drivers, one wire protocol:
+ *  - http: talk to the peer's web server directly
+ *  - ssh:  open a local forward (`ssh -N -L`) and then talk HTTP through it
+ * That keeps merge/apply logic identical on both machines.
+ */
+export class PeerLink {
+  constructor(cfg, { log = () => {} } = {}) {
+    // Callers normally hand over a normalized config; stand-alone callers
+    // (scripts, tests) may hand over a raw state file, so fill the two ports.
+    this.cfg = {
+      ...cfg,
+      peerPort: Number(cfg?.peerPort) || 22,
+      peerHttpPort: Number(cfg?.peerHttpPort) || 18777,
+    }
+    this.log = log
+    this.child = null
+    this.baseUrl = null
+    this.localPort = null
+  }
+
+  get configured() {
+    if (this.cfg.peerMode === 'http') return Boolean(this.cfg.peerUrl)
+    if (this.cfg.peerMode === 'ssh') return Boolean(this.cfg.peerHost && this.cfg.peerUser)
+    return false
+  }
+
+  describe() {
+    if (this.cfg.peerMode === 'http') return this.cfg.peerUrl || '(未设置地址)'
+    if (this.cfg.peerMode === 'ssh') return `${this.cfg.peerUser}@${this.cfg.peerHost}:${this.cfg.peerPort} → 127.0.0.1:${this.cfg.peerHttpPort}`
+    return '(未配置对端)'
+  }
+
+  async ensure() {
+    if (this.baseUrl) return this.baseUrl
+    if (this.cfg.peerMode === 'http') {
+      if (!this.cfg.peerUrl) throw new Error('对端地址为空')
+      this.baseUrl = this.cfg.peerUrl.replace(/\/+$/, '')
+      return this.baseUrl
+    }
+    if (this.cfg.peerMode === 'ssh') return this.ensureTunnel()
+    throw new Error('未配置对端（设置里选择 http 或 ssh）')
+  }
+
+  async ensureTunnel() {
+    if (this.child && this.baseUrl) return this.baseUrl
+    const port = await freePort()
+    const args = [
+      '-N',
+      '-L',
+      `127.0.0.1:${port}:127.0.0.1:${this.cfg.peerHttpPort}`,
+      `${this.cfg.peerUser}@${this.cfg.peerHost}`,
+      '-p',
+      String(this.cfg.peerPort),
+      '-o',
+      'BatchMode=yes',
+      '-o',
+      'ExitOnForwardFailure=yes',
+      '-o',
+      'ServerAliveInterval=15',
+      '-o',
+      'ServerAliveCountMax=3',
+      '-o',
+      'StrictHostKeyChecking=accept-new',
+      '-o',
+      'ConnectTimeout=10',
+    ]
+    if (this.cfg.peerKey) args.push('-i', this.cfg.peerKey)
+    this.log(`ssh tunnel: 127.0.0.1:${port} → ${this.cfg.peerHost}:${this.cfg.peerHttpPort}`)
+    const child = spawn('ssh', args, { stdio: ['ignore', 'ignore', 'pipe'], windowsHide: true })
+    this.child = child
+    this.localPort = port
+    let stderr = ''
+    child.stderr?.on('data', (chunk) => {
+      stderr += String(chunk)
+    })
+    child.on('exit', (code) => {
+      if (this.child === child && code !== 0) {
+        this.log(`ssh tunnel exited (${code}): ${stderr.trim().slice(-400)}`)
+      }
+      if (this.child === child) {
+        this.child = null
+        this.baseUrl = null
+      }
+    })
+    const base = `http://127.0.0.1:${port}`
+    const deadline = Date.now() + 25000
+    while (Date.now() < deadline) {
+      await sleep(500)
+      try {
+        await this.call('/plugin-sync/peer/ping', { timeoutMs: 3000, baseUrl: base })
+        this.baseUrl = base
+        return base
+      } catch {
+        if (!this.child) break
+      }
+    }
+    this.dispose()
+    throw new Error(`ssh 隧道未就绪${stderr ? `：${stderr.trim().slice(-300)}` : ''}`)
+  }
+
+  async call(path, options = {}) {
+    const baseUrl = options.baseUrl || (await this.ensure())
+    const headers = { accept: 'application/json', ...(options.headers || {}) }
+    if (this.cfg.peerToken) headers['x-plugin-sync-token'] = this.cfg.peerToken
+    let body
+    if (options.raw !== undefined) {
+      body = options.raw
+      headers['content-type'] = headers['content-type'] || 'application/octet-stream'
+    } else if (options.body !== undefined) {
+      body = JSON.stringify(options.body)
+      headers['content-type'] = 'application/json'
+    }
+    const timeout = options.timeoutMs ?? this.cfg.timeoutMs
+    const response = await fetch(`${baseUrl}${path}`, {
+      method: options.method || 'GET',
+      headers,
+      body,
+      signal: AbortSignal.timeout(Math.max(1000, timeout)),
+    })
+    const text = await response.text()
+    if (!response.ok) {
+      throw new Error(`${path} → HTTP ${response.status}: ${text.slice(0, 300)}`)
+    }
+    if (!text) return null
+    try {
+      return JSON.parse(text)
+    } catch {
+      const error = new Error(`${path} 返回的不是 JSON`)
+      error.raw = text.slice(0, 300)
+      throw error
+    }
+  }
+
+  dispose() {
+    if (this.child) {
+      try {
+        this.child.kill()
+      } catch {
+        // ignore
+      }
+      this.child = null
+    }
+    this.baseUrl = null
+    this.localPort = null
+  }
+}
+
+export function freePort() {
+  return new Promise((resolve, reject) => {
+    const server = createServer()
+    server.unref()
+    server.on('error', reject)
+    server.listen(0, '127.0.0.1', () => {
+      const address = server.address()
+      const port = typeof address === 'object' && address ? address.port : 0
+      server.close(() => (port ? resolve(port) : reject(new Error('no free port'))))
+    })
+  })
+}
+
+export function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}

package/package.json

@@ -1,6 +1,60 @@
 {
   "name": "@qic-9821/dsh-plugin-sync",
-  "version": "0.0.0-stage",
-  "stub": true,
-  "description": "Temporary package placeholder for staged publishing"
+  "version": "0.1.1",
+  "description": "Keep the DSH plugin set (inventory, configs, enable state, package installs, local bundle binaries) in sync between two machines, with per-capability switches, schedule controls and a settings/panel UI.",
+  "license": "MIT",
+  "author": "QIC-9821",
+  "type": "module",
+  "private": false,
+  "main": "./index.js",
+  "engines": {
+    "node": ">=22"
+  },
+  "exports": {
+    ".": "./index.js",
+    "./client": "./client.js",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "index.js",
+    "client.js",
+    "lib/",
+    "README.md",
+    "cordis.patch.yml",
+    "LICENSE"
+  ],
+  "keywords": [
+    "dsh",
+    "deepseek-harness",
+    "cordis",
+    "plugin",
+    "sync",
+    "profile"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/QIC-9821/dsh-plugin-sync.git"
+  },
+  "homepage": "https://github.com/QIC-9821/dsh-plugin-sync#readme",
+  "bugs": {
+    "url": "https://github.com/QIC-9821/dsh-plugin-sync/issues"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "immediately": true,
+      "inject": [
+        "@deepseek-ai/dsh-client-ui-settings"
+      ]
+    }
+  },
+  "scripts": {
+    "test": "node --test test/*.test.js"
+  }
 }