@searchfe/openclaw-baiduapp 0.1.12-beta.2 → 0.1.12

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
     "id": "openclaw-baiduapp",
     "name": "Baidu App",
     "description": "百度App消息渠道插件（支持主动推送）",
-    "version": "0.1.12-beta.2",
+    "version": "0.1.12",
     "channels": ["openclaw-baiduapp"],
     "configSchema": {
         "type": "object",

package/package.json

@@ -1,14 +1,12 @@
 {
     "name": "@searchfe/openclaw-baiduapp",
-    "version": "0.1.12-beta.2",
+    "version": "0.1.12",
     "type": "module",
     "description": "OpenClaw Baidu App channel plugin (百度App消息渠道插件)",
     "license": "MIT",
     "files": [
         "dist",
-        "openclaw.plugin.json",
-        "cli.js",
-        "src/cli-qrcode.mjs"
+        "openclaw.plugin.json"
     ],
     "openclaw": {
         "extensions": [
@@ -73,9 +71,6 @@
             "defaultChoice": "npm"
         }
     },
-    "bin": {
-        "openclaw-baiduapp": "cli.js"
-    },
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "exports": {
@@ -95,8 +90,7 @@
         "release:major": "npm run build && npm version major && npm publish"
     },
     "dependencies": {
-        "@baiducloud/sdk": "^1.0.7",
-        "qrcode-terminal": "^0.12.0"
+        "@baiducloud/sdk": "^1.0.7"
     },
     "devDependencies": {
         "@types/node": "^22.0.0",

package/cli.js

@@ -1,405 +0,0 @@
-#!/usr/bin/env node
-
-import {execSync, spawnSync} from 'node:child_process';
-import {createRequire} from 'node:module';
-import readline from 'node:readline';
-import {Writable} from 'node:stream';
-
-import {printQRCode} from './src/cli-qrcode.mjs';
-
-const _require = createRequire(import.meta.url);
-const CLI_VERSION = _require('./package.json').version;
-
-const PLUGIN_SPEC = '@searchfe/openclaw-baiduapp';
-const CHANNEL_ID = 'openclaw-baiduapp';
-const QR_URL = 'https://www.baidu.com';
-
-function parseArgs(argv) {
-    const args = argv.slice(2);
-    let command;
-    let ak;
-    let sk;
-    let agent;
-    let yes = false;
-
-    for (let index = 0; index < args.length; index++) {
-        const token = args[index];
-
-        if (token === '--help' || token === '-h') {
-            if (!command) {
-                command = token;
-            }
-            continue;
-        }
-
-        if (token === '--yes' || token === '-y') {
-            yes = true;
-            continue;
-        }
-
-        if (token === '--ak') {
-            ak = args[index + 1];
-            index += 1;
-            continue;
-        }
-
-        if (token.startsWith('--ak=')) {
-            ak = token.slice('--ak='.length);
-            continue;
-        }
-
-        if (token === '--sk') {
-            sk = args[index + 1];
-            index += 1;
-            continue;
-        }
-
-        if (token.startsWith('--sk=')) {
-            sk = token.slice('--sk='.length);
-            continue;
-        }
-
-        if (token === '--agent') {
-            agent = args[index + 1];
-            index += 1;
-            continue;
-        }
-
-        if (token.startsWith('--agent=')) {
-            agent = token.slice('--agent='.length);
-            continue;
-        }
-
-        if (!token.startsWith('--') && !command) {
-            command = token;
-        }
-    }
-
-    return {command, ak, sk, agent, yes};
-}
-
-function prompt(question, {hidden = false} = {}) {
-    if (!process.stdin.isTTY) {
-        throw new Error('非交互环境：请通过 --ak/--sk 参数传入凭证');
-    }
-
-    const askOnce = () => new Promise(resolve => {
-        if (hidden) {
-            process.stdout.write(question);
-            const rl = readline.createInterface({
-                input: process.stdin,
-                output: new Writable({write(_chunk, _enc, cb) { cb(); }}),
-                terminal: true,
-            });
-            rl.on('SIGINT', () => { rl.close(); process.stdout.write('\n'); process.exit(1); });
-            rl.question('', answer => {
-                rl.close();
-                process.stdout.write('\n');
-                resolve(String(answer || '').trim());
-            });
-            return;
-        }
-
-        const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-            terminal: true,
-        });
-        rl.on('SIGINT', () => { rl.close(); process.exit(1); });
-        rl.question(question, answer => {
-            rl.close();
-            resolve(String(answer || '').trim());
-        });
-    });
-
-    return (async () => {
-        for (let attempt = 0; attempt < 3; attempt++) {
-            const answer = await askOnce();
-            if (answer) {
-                return answer;
-            }
-
-            if (attempt < 2) {
-                error('输入不能为空，请重试');
-            }
-        }
-
-        throw new Error('输入不能为空，已超过最大重试次数');
-    })();
-}
-
-function promptOptional(question) {
-    if (!process.stdin.isTTY) {
-        return Promise.resolve('');
-    }
-    return new Promise(resolve => {
-        const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-            terminal: true,
-        });
-        rl.on('SIGINT', () => {
-            rl.close();
-            process.exit(1);
-        });
-        rl.question(question, answer => {
-            rl.close();
-            resolve(String(answer || '').trim());
-        });
-    });
-}
-
-async function checkAndCreateAgent(agentId, {yes = false} = {}) {
-    let agentsList;
-    try {
-        const agentsJson = run('openclaw', ['agents', 'list', '--json']);
-        agentsList = JSON.parse(agentsJson);
-    } catch {
-        // 解析失败时假设 agent 不存在，继续后续流程
-        agentsList = [];
-    }
-
-    const exists = Array.isArray(agentsList) && agentsList.some(a => a.id === agentId);
-    if (exists) {
-        return;
-    }
-
-    log(`Agent "${agentId}" 不存在`);
-    console.log(`  你可以手动执行以下命令新建：`);
-    console.log(`  openclaw agents add ${agentId}`);
-    console.log();
-
-    let confirm;
-    if (yes) {
-        confirm = 'y';
-    } else {
-        try {
-            confirm = await prompt(`是否立即自动新建 agent "${agentId}"？[y/N]: `);
-        } catch {
-            confirm = '';
-        }
-    }
-
-    if (confirm.toLowerCase() !== 'y') {
-        error('已取消，请手动新建 agent 后重试');
-        process.exit(1);
-    }
-
-    log(`正在新建 agent "${agentId}"...`);
-    try {
-        run('openclaw', ['agents', 'add', agentId], {silent: false});
-    } catch {
-        error('新建 agent 失败，请手动执行：');
-        console.log(`  openclaw agents add ${agentId}`);
-        process.exit(1);
-    }
-}
-
-function run(cmd, args = [], {silent = true} = {}) {
-    const stdio = silent ? ['pipe', 'pipe', 'pipe'] : 'inherit';
-    const result = spawnSync(cmd, args, {encoding: 'utf-8', stdio});
-
-    if (result.error) {
-        const err = new Error(`Command failed: ${cmd}`);
-        err.stderr = silent ? String(result.stderr || result.error.message || '') : '';
-        throw err;
-    }
-
-    if (result.status !== 0) {
-        const err = new Error(`Command failed with exit code ${result.status}: ${cmd}`);
-        err.stderr = silent ? String(result.stderr || '') : '';
-        throw err;
-    }
-
-    return silent ? String(result.stdout || '').trim() : '';
-}
-
-function which(bin) {
-    const cmd = process.platform === 'win32' ? `where ${bin}` : `which ${bin}`;
-
-    try {
-        return execSync(cmd, {
-            encoding: 'utf-8',
-            shell: true,
-            stdio: ['pipe', 'pipe', 'pipe'],
-        }).trim();
-    } catch {
-        return null;
-    }
-}
-
-function log(msg) {
-    console.log(`\x1b[36m[openclaw-baiduapp]\x1b[0m ${msg}`);
-}
-
-function error(msg) {
-    console.error(`\x1b[31m[openclaw-baiduapp]\x1b[0m ${msg}`);
-}
-
-async function install() {
-    let {ak, sk, agent, yes} = parseArgs(process.argv);
-
-    if ((!ak || !sk) && !process.stdin.isTTY) {
-        error('非交互环境：请通过 --ak/--sk 参数传入凭证');
-        process.exit(1);
-    }
-
-    if (agent !== undefined && !agent.trim()) {
-        error('--agent 参数不能为空');
-        process.exit(1);
-    }
-    let agentId = agent?.trim();
-
-    if (!which('openclaw')) {
-        error('未找到 openclaw，请先安装：');
-        console.log('  npm install -g openclaw');
-        console.log('  详见 https://docs.openclaw.ai/install');
-        process.exit(1);
-    }
-    log('已找到本地安装的 openclaw');
-
-    log('正在检查插件版本...');
-    let installedVersion = null;
-    try {
-        const infoJson = run('openclaw', ['config', 'get', `plugins.installs.${CHANNEL_ID}`, '--json']);
-        const info = JSON.parse(infoJson);
-        installedVersion = info?.version ?? null;
-    } catch {
-        // 未安装或无法读取，后续走安装流程
-    }
-
-    if (installedVersion === null) {
-        log(`插件未安装，正在安装 ${PLUGIN_SPEC}@${CLI_VERSION}...`);
-        try {
-            run('openclaw', ['plugins', 'install', `${PLUGIN_SPEC}@${CLI_VERSION}`], {silent: false});
-        } catch (installErr) {
-            error('插件安装失败，请手动执行：');
-            console.log(`  openclaw plugins install "${PLUGIN_SPEC}@${CLI_VERSION}"`);
-            process.exit(1);
-        }
-    } else if (installedVersion !== CLI_VERSION) {
-        log(`插件版本不一致（已安装: ${installedVersion}，当前 CLI: ${CLI_VERSION}），正在更新...`);
-        try {
-            run('openclaw', ['config', 'set', `plugins.installs.${CHANNEL_ID}.spec`, `${PLUGIN_SPEC}@${CLI_VERSION}`]);
-            run('openclaw', ['config', 'unset', `plugins.installs.${CHANNEL_ID}.integrity`]);
-            run('openclaw', ['config', 'unset', `plugins.installs.${CHANNEL_ID}.shasum`]);
-            run('openclaw', ['plugins', 'update', CHANNEL_ID], {silent: false});
-            run('openclaw', ['gateway', 'restart'], {silent: false});
-        } catch (updateErr) {
-            error('插件更新失败，请手动执行：');
-            console.log(`  openclaw config set plugins.installs.${CHANNEL_ID}.spec ${PLUGIN_SPEC}@${CLI_VERSION}`);
-            console.log(`  openclaw config unset plugins.installs.${CHANNEL_ID}.integrity`);
-            console.log(`  openclaw config unset plugins.installs.${CHANNEL_ID}.shasum`);
-            console.log(`  openclaw plugins update ${CHANNEL_ID}`);
-            console.log(`  openclaw gateway restart`);
-            process.exit(1);
-        }
-    } else {
-        log(`插件版本已是最新（${CLI_VERSION}），跳过更新`);
-    }
-
-    try {
-        if (!ak) {
-            ak = await prompt('请输入 App Key (appKey): ');
-        }
-        if (!sk) {
-            sk = await prompt('请输入 App Secret (appSecret): ', {hidden: true});
-        }
-    } catch (promptErr) {
-        error(promptErr instanceof Error ? promptErr.message : String(promptErr));
-        process.exit(1);
-    }
-
-    if (!ak.trim() || !sk.trim()) {
-        error('appKey 和 appSecret 不能为空');
-        process.exit(1);
-    }
-
-    // 插件已确认安装，再询问/校验 agent
-    if (!agentId && process.stdin.isTTY) {
-        agentId = await promptOptional('请输入 Agent ID（可选，用于多 agent 配置，直接回车跳过）：') || undefined;
-    }
-
-    if (agentId) {
-        await checkAndCreateAgent(agentId, {yes});
-    }
-
-    log('正在写入配置...');
-    const akPath = agentId
-        ? `channels.${CHANNEL_ID}.accounts.${agentId}.appKey`
-        : `channels.${CHANNEL_ID}.appKey`;
-    const skPath = agentId
-        ? `channels.${CHANNEL_ID}.accounts.${agentId}.appSecret`
-        : `channels.${CHANNEL_ID}.appSecret`;
-    try {
-        run('openclaw', ['config', 'set', akPath, ak.trim()]);
-        run('openclaw', ['config', 'set', skPath, sk.trim()]);
-    } catch {
-        error('配置写入失败，请手动执行：');
-        console.log(`  openclaw config set ${akPath} <your-app-key>`);
-        console.log(`  openclaw config set ${skPath} <your-app-secret>`);
-        process.exit(1);
-    }
-    if (agentId) {
-        log(`配置写入成功（agent: ${agentId}）`);
-    } else {
-        log('配置写入成功');
-    }
-
-    log('正在重启 OpenClaw Gateway...');
-    try {
-        run('openclaw', ['gateway', 'restart'], {silent: false});
-    } catch {
-        error('重启失败，可手动执行：');
-        console.log('  openclaw gateway restart');
-    }
-
-    console.log();
-    log('安装完成！扫描下方二维码访问：');
-    console.log();
-    printQRCode(QR_URL);
-    console.log();
-    console.log(`  ${QR_URL}`);
-    console.log();
-}
-
-function help() {
-    console.log(`用法: npx @searchfe/openclaw-baiduapp <命令> [选项]
-
-命令:
-  install   安装百度App插件并配置 AK/SK
-
-选项:
-  --ak <appKey>       App Key（必填，缺省时交互输入）
-  --sk <appSecret>    App Secret（必填，缺省时交互输入，不回显）
-  --agent <agentId>   Agent ID（可选，指定后写入 accounts.<agentId> 以支持多 agent 配置）
-                      交互模式下也会提示输入，直接回车跳过（写入根路径）
-                      指定后自动校验 agent 是否存在，不存在时提示确认新建
-  --yes, -y           自动确认所有交互提示（如 agent 不存在时自动新建，适合 CI/脚本环境）
-  --help, -h          显示帮助信息
-
-示例:
-  npx @searchfe/openclaw-baiduapp install --ak your-key --sk your-secret
-  npx @searchfe/openclaw-baiduapp install --agent my-agent --ak your-key --sk your-secret
-  npx @searchfe/openclaw-baiduapp install --agent my-agent --ak your-key --sk your-secret --yes
-  npx @searchfe/openclaw-baiduapp install`);
-}
-
-const {command} = parseArgs(process.argv);
-
-switch (command) {
-    case 'install':
-        await install();
-        break;
-    case 'help':
-    case '--help':
-    case '-h':
-        help();
-        break;
-    default:
-        if (command) {
-            error(`未知命令: ${command}`);
-        }
-        help();
-        process.exit(command ? 1 : 0);
-}

package/src/cli-qrcode.mjs

@@ -1,5 +0,0 @@
-import qrcodeTerminal from 'qrcode-terminal';
-
-export function printQRCode(url) {
-    qrcodeTerminal.generate(String(url), {small: true}, qrcode => console.log(qrcode));
-}