@jackwener/opencli 1.4.1 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/build-extension.yml +2 -6
- package/.github/workflows/ci.yml +21 -1
- package/README.md +35 -6
- package/README.zh-CN.md +12 -5
- package/SKILL.md +2 -0
- package/dist/browser/cdp.d.ts +2 -1
- package/dist/browser/discover.d.ts +4 -1
- package/dist/browser/discover.js +6 -2
- package/dist/browser/errors.d.ts +2 -2
- package/dist/browser/errors.js +4 -12
- package/dist/browser/mcp.d.ts +2 -1
- package/dist/build-manifest.d.ts +2 -0
- package/dist/build-manifest.js +39 -14
- package/dist/build-manifest.test.js +21 -0
- package/dist/capabilityRouting.d.ts +2 -0
- package/dist/capabilityRouting.js +2 -1
- package/dist/cli-manifest.json +1111 -112
- package/dist/cli.js +34 -3
- package/dist/clis/36kr/article.d.ts +1 -0
- package/dist/clis/36kr/article.js +62 -0
- package/dist/clis/36kr/hot.d.ts +3 -0
- package/dist/clis/36kr/hot.js +80 -0
- package/dist/clis/36kr/hot.test.d.ts +1 -0
- package/dist/clis/36kr/hot.test.js +15 -0
- package/dist/clis/36kr/news.d.ts +1 -0
- package/dist/clis/36kr/news.js +51 -0
- package/dist/clis/36kr/news.test.d.ts +1 -0
- package/dist/clis/36kr/news.test.js +85 -0
- package/dist/clis/36kr/search.d.ts +1 -0
- package/dist/clis/36kr/search.js +72 -0
- package/dist/clis/bilibili/comments.d.ts +5 -0
- package/dist/clis/bilibili/comments.js +40 -0
- package/dist/clis/bilibili/comments.test.d.ts +1 -0
- package/dist/clis/bilibili/comments.test.js +82 -0
- package/dist/clis/chatgpt/ask.js +29 -14
- package/dist/clis/chatgpt/ax.d.ts +6 -0
- package/dist/clis/chatgpt/ax.js +172 -1
- package/dist/clis/chatgpt/model.d.ts +1 -0
- package/dist/clis/chatgpt/model.js +24 -0
- package/dist/clis/chatgpt/send.js +12 -3
- package/dist/clis/douban/download.d.ts +1 -0
- package/dist/clis/douban/download.js +67 -0
- package/dist/clis/douban/download.test.d.ts +1 -0
- package/dist/clis/douban/download.test.js +170 -0
- package/dist/clis/douban/photos.d.ts +1 -0
- package/dist/clis/douban/photos.js +34 -0
- package/dist/clis/douban/utils.d.ts +25 -0
- package/dist/clis/douban/utils.js +190 -1
- package/dist/clis/douban/utils.test.d.ts +1 -0
- package/dist/clis/douban/utils.test.js +64 -0
- package/dist/clis/imdb/person.d.ts +1 -0
- package/dist/clis/imdb/person.js +203 -0
- package/dist/clis/imdb/reviews.d.ts +1 -0
- package/dist/clis/imdb/reviews.js +88 -0
- package/dist/clis/imdb/search.d.ts +1 -0
- package/dist/clis/imdb/search.js +161 -0
- package/dist/clis/imdb/title.d.ts +1 -0
- package/dist/clis/imdb/title.js +93 -0
- package/dist/clis/imdb/top.d.ts +1 -0
- package/dist/clis/imdb/top.js +53 -0
- package/dist/clis/imdb/trending.d.ts +1 -0
- package/dist/clis/imdb/trending.js +52 -0
- package/dist/clis/imdb/utils.d.ts +46 -0
- package/dist/clis/imdb/utils.js +285 -0
- package/dist/clis/imdb/utils.test.d.ts +1 -0
- package/dist/clis/imdb/utils.test.js +88 -0
- package/dist/clis/jd/item.d.ts +4 -0
- package/dist/clis/jd/item.js +16 -15
- package/dist/clis/jd/item.test.js +16 -1
- package/dist/clis/linux-do/categories.yaml +38 -9
- package/dist/clis/linux-do/category.d.ts +1 -0
- package/dist/clis/linux-do/category.js +36 -0
- package/dist/clis/linux-do/feed.d.ts +45 -0
- package/dist/clis/linux-do/feed.js +397 -0
- package/dist/clis/linux-do/feed.test.d.ts +1 -0
- package/dist/clis/linux-do/feed.test.js +118 -0
- package/dist/clis/linux-do/hot.d.ts +1 -0
- package/dist/clis/linux-do/hot.js +25 -0
- package/dist/clis/linux-do/latest.d.ts +1 -0
- package/dist/clis/linux-do/latest.js +18 -0
- package/dist/clis/linux-do/tags.yaml +41 -0
- package/dist/clis/linux-do/topic.yaml +41 -3
- package/dist/clis/linux-do/user-posts.yaml +67 -0
- package/dist/clis/linux-do/user-topics.yaml +54 -0
- package/dist/clis/paperreview/commands.test.d.ts +3 -0
- package/dist/clis/paperreview/commands.test.js +243 -0
- package/dist/clis/paperreview/feedback.d.ts +1 -0
- package/dist/clis/paperreview/feedback.js +52 -0
- package/dist/clis/paperreview/review.d.ts +1 -0
- package/dist/clis/paperreview/review.js +37 -0
- package/dist/clis/paperreview/submit.d.ts +1 -0
- package/dist/clis/paperreview/submit.js +85 -0
- package/dist/clis/paperreview/utils.d.ts +46 -0
- package/dist/clis/paperreview/utils.js +197 -0
- package/dist/clis/paperreview/utils.test.d.ts +1 -0
- package/dist/clis/paperreview/utils.test.js +49 -0
- package/dist/clis/producthunt/browse.d.ts +1 -0
- package/dist/clis/producthunt/browse.js +99 -0
- package/dist/clis/producthunt/hot.d.ts +1 -0
- package/dist/clis/producthunt/hot.js +110 -0
- package/dist/clis/producthunt/posts.d.ts +1 -0
- package/dist/clis/producthunt/posts.js +28 -0
- package/dist/clis/producthunt/today.d.ts +1 -0
- package/dist/clis/producthunt/today.js +35 -0
- package/dist/clis/producthunt/utils.d.ts +29 -0
- package/dist/clis/producthunt/utils.js +99 -0
- package/dist/clis/producthunt/utils.test.d.ts +1 -0
- package/dist/clis/producthunt/utils.test.js +64 -0
- package/dist/clis/twitter/article.js +4 -28
- package/dist/clis/twitter/likes.d.ts +24 -0
- package/dist/clis/twitter/likes.js +217 -0
- package/dist/clis/twitter/likes.test.d.ts +1 -0
- package/dist/clis/twitter/likes.test.js +85 -0
- package/dist/clis/twitter/profile.js +4 -28
- package/dist/clis/twitter/search.js +2 -1
- package/dist/clis/twitter/search.test.js +2 -0
- package/dist/clis/twitter/shared.d.ts +6 -0
- package/dist/clis/twitter/shared.js +35 -0
- package/dist/clis/twitter/timeline.js +2 -13
- package/dist/clis/weixin/download.d.ts +17 -0
- package/dist/clis/weixin/download.js +88 -20
- package/dist/clis/weread/book.js +2 -2
- package/dist/clis/weread/commands.test.d.ts +3 -0
- package/dist/clis/weread/commands.test.js +43 -0
- package/dist/clis/weread/highlights.js +2 -2
- package/dist/clis/weread/notebooks.js +2 -2
- package/dist/clis/weread/notes.js +3 -3
- package/dist/clis/weread/shelf.js +2 -2
- package/dist/clis/weread/utils.d.ts +4 -4
- package/dist/clis/weread/utils.js +32 -14
- package/dist/clis/weread/utils.test.js +1 -28
- package/dist/clis/xiaohongshu/comments.d.ts +5 -0
- package/dist/clis/xiaohongshu/comments.js +74 -0
- package/dist/clis/xiaohongshu/comments.test.d.ts +1 -0
- package/dist/clis/xiaohongshu/comments.test.js +79 -0
- package/dist/clis/xiaohongshu/publish.js +114 -18
- package/dist/clis/xiaohongshu/publish.test.d.ts +1 -0
- package/dist/clis/xiaohongshu/publish.test.js +119 -0
- package/dist/commanderAdapter.d.ts +1 -0
- package/dist/commanderAdapter.js +176 -29
- package/dist/commanderAdapter.test.d.ts +1 -0
- package/dist/commanderAdapter.test.js +62 -0
- package/dist/daemon.js +17 -1
- package/dist/discovery.js +8 -14
- package/dist/doctor.d.ts +1 -0
- package/dist/doctor.js +9 -2
- package/dist/download/index.js +63 -51
- package/dist/download/index.test.js +17 -4
- package/dist/errors.d.ts +3 -1
- package/dist/errors.js +15 -32
- package/dist/execution.d.ts +1 -3
- package/dist/execution.js +21 -1
- package/dist/hooks.js +2 -0
- package/dist/main.js +5 -0
- package/dist/output.js +5 -1
- package/dist/pipeline/executor.js +3 -4
- package/dist/plugin-manifest.d.ts +70 -0
- package/dist/plugin-manifest.js +160 -0
- package/dist/plugin-manifest.test.d.ts +4 -0
- package/dist/plugin-manifest.test.js +179 -0
- package/dist/plugin.d.ts +38 -5
- package/dist/plugin.js +267 -33
- package/dist/plugin.test.js +220 -3
- package/dist/registry.d.ts +4 -0
- package/dist/registry.js +2 -0
- package/dist/runtime-detect.d.ts +21 -0
- package/dist/runtime-detect.js +32 -0
- package/dist/runtime-detect.test.d.ts +1 -0
- package/dist/runtime-detect.test.js +27 -0
- package/dist/runtime.js +1 -1
- package/dist/serialization.d.ts +2 -0
- package/dist/serialization.js +6 -0
- package/dist/types.d.ts +1 -0
- package/dist/update-check.d.ts +22 -0
- package/dist/update-check.js +112 -0
- package/dist/weixin-download.test.d.ts +1 -0
- package/dist/weixin-download.test.js +30 -0
- package/dist/weread-private-api-regression.test.d.ts +1 -0
- package/dist/weread-private-api-regression.test.js +122 -0
- package/dist/yaml-schema.d.ts +3 -0
- package/dist/yaml-schema.js +18 -1
- package/docs/.vitepress/config.mts +4 -0
- package/docs/adapters/browser/36kr.md +47 -0
- package/docs/adapters/browser/douban.md +14 -0
- package/docs/adapters/browser/imdb.md +47 -0
- package/docs/adapters/browser/jd.md +2 -2
- package/docs/adapters/browser/linux-do.md +181 -20
- package/docs/adapters/browser/paperreview.md +43 -0
- package/docs/adapters/browser/producthunt.md +49 -0
- package/docs/adapters/desktop/chatgpt.md +5 -0
- package/docs/adapters/index.md +6 -2
- package/docs/advanced/download.md +4 -0
- package/docs/advanced/rate-limiter-plugin.md +99 -0
- package/docs/guide/electron-app-cli.md +200 -0
- package/docs/guide/getting-started.md +1 -0
- package/docs/guide/plugins.md +87 -0
- package/docs/zh/guide/electron-app-cli.md +188 -0
- package/docs/zh/guide/getting-started.md +1 -0
- package/docs/zh/guide/plugins.md +65 -0
- package/extension/package.json +1 -0
- package/extension/scripts/package-release.mjs +179 -0
- package/extension/src/background.ts +2 -0
- package/package.json +4 -1
- package/scripts/postinstall.js +10 -0
- package/src/browser/cdp.ts +2 -1
- package/src/browser/discover.ts +8 -3
- package/src/browser/errors.ts +13 -14
- package/src/browser/mcp.ts +2 -1
- package/src/build-manifest.test.ts +23 -0
- package/src/build-manifest.ts +40 -15
- package/src/capabilityRouting.ts +2 -1
- package/src/cli.ts +35 -3
- package/src/clis/36kr/article.ts +69 -0
- package/src/clis/36kr/hot.test.ts +19 -0
- package/src/clis/36kr/hot.ts +100 -0
- package/src/clis/36kr/news.test.ts +90 -0
- package/src/clis/36kr/news.ts +54 -0
- package/src/clis/36kr/search.ts +78 -0
- package/src/clis/bilibili/comments.test.ts +102 -0
- package/src/clis/bilibili/comments.ts +44 -0
- package/src/clis/chatgpt/ask.ts +28 -14
- package/src/clis/chatgpt/ax.ts +180 -1
- package/src/clis/chatgpt/model.ts +27 -0
- package/src/clis/chatgpt/send.ts +16 -6
- package/src/clis/douban/download.test.ts +196 -0
- package/src/clis/douban/download.ts +78 -0
- package/src/clis/douban/photos.ts +36 -0
- package/src/clis/douban/utils.test.ts +97 -0
- package/src/clis/douban/utils.ts +232 -1
- package/src/clis/imdb/person.ts +232 -0
- package/src/clis/imdb/reviews.ts +111 -0
- package/src/clis/imdb/search.ts +179 -0
- package/src/clis/imdb/title.ts +121 -0
- package/src/clis/imdb/top.ts +67 -0
- package/src/clis/imdb/trending.ts +66 -0
- package/src/clis/imdb/utils.test.ts +117 -0
- package/src/clis/imdb/utils.ts +305 -0
- package/src/clis/jd/item.test.ts +18 -1
- package/src/clis/jd/item.ts +18 -15
- package/src/clis/linux-do/categories.yaml +38 -9
- package/src/clis/linux-do/category.ts +37 -0
- package/src/clis/linux-do/feed.test.ts +132 -0
- package/src/clis/linux-do/feed.ts +501 -0
- package/src/clis/linux-do/hot.ts +26 -0
- package/src/clis/linux-do/latest.ts +19 -0
- package/src/clis/linux-do/tags.yaml +41 -0
- package/src/clis/linux-do/topic.yaml +41 -3
- package/src/clis/linux-do/user-posts.yaml +67 -0
- package/src/clis/linux-do/user-topics.yaml +54 -0
- package/src/clis/paperreview/commands.test.ts +283 -0
- package/src/clis/paperreview/feedback.ts +64 -0
- package/src/clis/paperreview/review.ts +47 -0
- package/src/clis/paperreview/submit.ts +119 -0
- package/src/clis/paperreview/utils.test.ts +68 -0
- package/src/clis/paperreview/utils.ts +276 -0
- package/src/clis/producthunt/browse.ts +109 -0
- package/src/clis/producthunt/hot.ts +127 -0
- package/src/clis/producthunt/posts.ts +29 -0
- package/src/clis/producthunt/today.ts +37 -0
- package/src/clis/producthunt/utils.test.ts +72 -0
- package/src/clis/producthunt/utils.ts +122 -0
- package/src/clis/twitter/article.ts +5 -28
- package/src/clis/twitter/likes.test.ts +91 -0
- package/src/clis/twitter/likes.ts +256 -0
- package/src/clis/twitter/profile.ts +5 -28
- package/src/clis/twitter/search.test.ts +2 -0
- package/src/clis/twitter/search.ts +3 -1
- package/src/clis/twitter/shared.ts +45 -0
- package/src/clis/twitter/timeline.ts +2 -13
- package/src/clis/weixin/download.ts +114 -20
- package/src/clis/weread/book.ts +2 -2
- package/src/clis/weread/commands.test.ts +57 -0
- package/src/clis/weread/highlights.ts +2 -2
- package/src/clis/weread/notebooks.ts +2 -2
- package/src/clis/weread/notes.ts +3 -3
- package/src/clis/weread/shelf.ts +2 -2
- package/src/clis/weread/utils.test.ts +1 -32
- package/src/clis/weread/utils.ts +41 -16
- package/src/clis/xiaohongshu/comments.test.ts +96 -0
- package/src/clis/xiaohongshu/comments.ts +81 -0
- package/src/clis/xiaohongshu/publish.test.ts +137 -0
- package/src/clis/xiaohongshu/publish.ts +129 -18
- package/src/commanderAdapter.test.ts +78 -0
- package/src/commanderAdapter.ts +188 -24
- package/src/daemon.ts +19 -1
- package/src/discovery.ts +8 -15
- package/src/doctor.ts +13 -2
- package/src/download/index.test.ts +14 -4
- package/src/download/index.ts +67 -55
- package/src/errors.ts +25 -66
- package/src/execution.ts +28 -3
- package/src/hooks.ts +1 -0
- package/src/main.ts +6 -0
- package/src/output.ts +3 -1
- package/src/pipeline/executor.ts +4 -6
- package/src/plugin-manifest.test.ts +223 -0
- package/src/plugin-manifest.ts +206 -0
- package/src/plugin.test.ts +246 -2
- package/src/plugin.ts +338 -36
- package/src/registry.ts +6 -1
- package/src/runtime-detect.test.ts +30 -0
- package/src/runtime-detect.ts +36 -0
- package/src/runtime.ts +1 -1
- package/src/serialization.ts +4 -0
- package/src/types.ts +1 -0
- package/src/update-check.ts +114 -0
- package/src/weixin-download.test.ts +64 -0
- package/src/weread-private-api-regression.test.ts +150 -0
- package/src/yaml-schema.ts +20 -0
- package/tests/e2e/browser-auth.test.ts +13 -9
- package/tests/e2e/browser-public-extended.test.ts +1 -1
- package/tests/e2e/browser-public.test.ts +62 -4
- package/tests/e2e/helpers.ts +2 -1
- package/tests/e2e/public-commands.test.ts +37 -3
- package/tests/smoke/api-health.test.ts +1 -1
- package/vitest.config.ts +10 -0
- package/dist/clis/linux-do/category.yaml +0 -51
- package/dist/clis/linux-do/hot.yaml +0 -50
- package/dist/clis/linux-do/latest.yaml +0 -40
- package/src/clis/linux-do/category.yaml +0 -51
- package/src/clis/linux-do/hot.yaml +0 -50
- package/src/clis/linux-do/latest.yaml +0 -40
|
@@ -57,14 +57,22 @@ async function injectImages(page, images) {
|
|
|
57
57
|
(async () => {
|
|
58
58
|
const images = ${payload};
|
|
59
59
|
|
|
60
|
-
//
|
|
60
|
+
// Only use image-capable file inputs. Do not fall back to a generic uploader,
|
|
61
|
+
// otherwise we can accidentally feed images into the video upload flow.
|
|
61
62
|
const inputs = Array.from(document.querySelectorAll('input[type="file"]'));
|
|
62
63
|
const input = inputs.find(el => {
|
|
63
64
|
const accept = el.getAttribute('accept') || '';
|
|
64
|
-
return
|
|
65
|
-
|
|
65
|
+
return (
|
|
66
|
+
accept.includes('image') ||
|
|
67
|
+
accept.includes('.jpg') ||
|
|
68
|
+
accept.includes('.jpeg') ||
|
|
69
|
+
accept.includes('.png') ||
|
|
70
|
+
accept.includes('.gif') ||
|
|
71
|
+
accept.includes('.webp')
|
|
72
|
+
);
|
|
73
|
+
});
|
|
66
74
|
|
|
67
|
-
if (!input) return { ok: false, count: 0, error: 'No file input found on page' };
|
|
75
|
+
if (!input) return { ok: false, count: 0, error: 'No image file input found on page' };
|
|
68
76
|
|
|
69
77
|
const dt = new DataTransfer();
|
|
70
78
|
for (const img of images) {
|
|
@@ -141,6 +149,99 @@ async function fillField(page, selectors, text, fieldName) {
|
|
|
141
149
|
throw new Error(`Could not find ${fieldName} input. Debug screenshot: /tmp/xhs_publish_${fieldName}_debug.png`);
|
|
142
150
|
}
|
|
143
151
|
}
|
|
152
|
+
async function selectImageTextTab(page) {
|
|
153
|
+
const result = await page.evaluate(`
|
|
154
|
+
() => {
|
|
155
|
+
const isVisible = (el) => {
|
|
156
|
+
if (!el || el.offsetParent === null) return false;
|
|
157
|
+
const rect = el.getBoundingClientRect();
|
|
158
|
+
return rect.width > 0 && rect.height > 0;
|
|
159
|
+
};
|
|
160
|
+
|
|
161
|
+
const normalize = (value) => (value || '').replace(/\\s+/g, ' ').trim();
|
|
162
|
+
const selector = 'button, [role="tab"], [role="button"], a, label, div, span, li';
|
|
163
|
+
const nodes = Array.from(document.querySelectorAll(selector));
|
|
164
|
+
const targets = ['上传图文', '图文', '图片'];
|
|
165
|
+
|
|
166
|
+
for (const target of targets) {
|
|
167
|
+
for (const node of nodes) {
|
|
168
|
+
if (!isVisible(node)) continue;
|
|
169
|
+
const text = normalize(node.innerText || node.textContent || '');
|
|
170
|
+
if (!text || text.includes('视频')) continue;
|
|
171
|
+
if (text === target || text.startsWith(target) || text.includes(target)) {
|
|
172
|
+
const clickable = node.closest('button, [role="tab"], [role="button"], a, label') || node;
|
|
173
|
+
clickable.click();
|
|
174
|
+
return { ok: true, target, text };
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
const visibleTexts = [];
|
|
180
|
+
for (const node of nodes) {
|
|
181
|
+
if (!isVisible(node)) continue;
|
|
182
|
+
const text = normalize(node.innerText || node.textContent || '');
|
|
183
|
+
if (!text || text.length > 20) continue;
|
|
184
|
+
visibleTexts.push(text);
|
|
185
|
+
if (visibleTexts.length >= 20) break;
|
|
186
|
+
}
|
|
187
|
+
return { ok: false, visibleTexts };
|
|
188
|
+
}
|
|
189
|
+
`);
|
|
190
|
+
if (result?.ok) {
|
|
191
|
+
await page.wait({ time: 1 });
|
|
192
|
+
}
|
|
193
|
+
return result;
|
|
194
|
+
}
|
|
195
|
+
async function inspectPublishSurface(page) {
|
|
196
|
+
return page.evaluate(`
|
|
197
|
+
() => {
|
|
198
|
+
const text = (document.body?.innerText || '').replace(/\\s+/g, ' ').trim();
|
|
199
|
+
const hasTitleInput = !!Array.from(document.querySelectorAll('input, textarea')).find((el) => {
|
|
200
|
+
if (!el || el.offsetParent === null) return false;
|
|
201
|
+
const placeholder = (el.getAttribute('placeholder') || '').trim();
|
|
202
|
+
const cls = el.className ? String(el.className) : '';
|
|
203
|
+
const maxLength = Number(el.getAttribute('maxlength') || 0);
|
|
204
|
+
return (
|
|
205
|
+
placeholder.includes('标题') ||
|
|
206
|
+
/title/i.test(placeholder) ||
|
|
207
|
+
/title/i.test(cls) ||
|
|
208
|
+
maxLength === 20
|
|
209
|
+
);
|
|
210
|
+
});
|
|
211
|
+
const hasImageInput = !!Array.from(document.querySelectorAll('input[type="file"]')).find((el) => {
|
|
212
|
+
const accept = el.getAttribute('accept') || '';
|
|
213
|
+
return (
|
|
214
|
+
accept.includes('image') ||
|
|
215
|
+
accept.includes('.jpg') ||
|
|
216
|
+
accept.includes('.jpeg') ||
|
|
217
|
+
accept.includes('.png') ||
|
|
218
|
+
accept.includes('.gif') ||
|
|
219
|
+
accept.includes('.webp')
|
|
220
|
+
);
|
|
221
|
+
});
|
|
222
|
+
return {
|
|
223
|
+
hasTitleInput,
|
|
224
|
+
hasImageInput,
|
|
225
|
+
hasVideoSurface: text.includes('拖拽视频到此处点击上传') || text.includes('上传视频'),
|
|
226
|
+
};
|
|
227
|
+
}
|
|
228
|
+
`);
|
|
229
|
+
}
|
|
230
|
+
async function waitForImageTextSurface(page, maxWaitMs = 5_000) {
|
|
231
|
+
const pollMs = 500;
|
|
232
|
+
const maxAttempts = Math.max(1, Math.ceil(maxWaitMs / pollMs));
|
|
233
|
+
let surface = await inspectPublishSurface(page);
|
|
234
|
+
for (let i = 0; i < maxAttempts; i++) {
|
|
235
|
+
if (surface.hasTitleInput || surface.hasImageInput || !surface.hasVideoSurface) {
|
|
236
|
+
return surface;
|
|
237
|
+
}
|
|
238
|
+
if (i < maxAttempts - 1) {
|
|
239
|
+
await page.wait({ time: pollMs / 1_000 });
|
|
240
|
+
surface = await inspectPublishSurface(page);
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
return surface;
|
|
244
|
+
}
|
|
144
245
|
cli({
|
|
145
246
|
site: 'xiaohongshu',
|
|
146
247
|
name: 'publish',
|
|
@@ -189,21 +290,16 @@ cli({
|
|
|
189
290
|
'Re-capture browser login via: opencli xiaohongshu creator-profile');
|
|
190
291
|
}
|
|
191
292
|
// ── Step 2: Select 图文 (image+text) note type if tabs are present ─────────
|
|
192
|
-
const
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
293
|
+
const tabResult = await selectImageTextTab(page);
|
|
294
|
+
const surface = await waitForImageTextSurface(page, tabResult?.ok ? 5_000 : 2_000);
|
|
295
|
+
if (!surface.hasTitleInput && !surface.hasImageInput && surface.hasVideoSurface) {
|
|
296
|
+
await page.screenshot({ path: '/tmp/xhs_publish_tab_debug.png' });
|
|
297
|
+
const detail = tabResult?.ok
|
|
298
|
+
? `clicked "${tabResult.text}"`
|
|
299
|
+
: `visible candidates: ${(tabResult?.visibleTexts || []).join(' | ') || 'none'}`;
|
|
300
|
+
throw new Error('Still on the video publish page after trying to select 图文. ' +
|
|
301
|
+
`Details: ${detail}. Debug screenshot: /tmp/xhs_publish_tab_debug.png`);
|
|
201
302
|
}
|
|
202
|
-
return false;
|
|
203
|
-
}
|
|
204
|
-
`);
|
|
205
|
-
if (tabClicked)
|
|
206
|
-
await page.wait({ time: 1 });
|
|
207
303
|
// ── Step 3: Upload images ──────────────────────────────────────────────────
|
|
208
304
|
if (imageData.length > 0) {
|
|
209
305
|
const upload = await injectImages(page, imageData);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import './publish.js';
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import * as fs from 'node:fs';
|
|
2
|
+
import * as os from 'node:os';
|
|
3
|
+
import * as path from 'node:path';
|
|
4
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
5
|
+
import { getRegistry } from '../../registry.js';
|
|
6
|
+
import './publish.js';
|
|
7
|
+
function createPageMock(evaluateResults) {
|
|
8
|
+
const evaluate = vi.fn();
|
|
9
|
+
for (const result of evaluateResults) {
|
|
10
|
+
evaluate.mockResolvedValueOnce(result);
|
|
11
|
+
}
|
|
12
|
+
return {
|
|
13
|
+
goto: vi.fn().mockResolvedValue(undefined),
|
|
14
|
+
evaluate,
|
|
15
|
+
snapshot: vi.fn().mockResolvedValue(undefined),
|
|
16
|
+
click: vi.fn().mockResolvedValue(undefined),
|
|
17
|
+
typeText: vi.fn().mockResolvedValue(undefined),
|
|
18
|
+
pressKey: vi.fn().mockResolvedValue(undefined),
|
|
19
|
+
scrollTo: vi.fn().mockResolvedValue(undefined),
|
|
20
|
+
getFormState: vi.fn().mockResolvedValue({ forms: [], orphanFields: [] }),
|
|
21
|
+
wait: vi.fn().mockResolvedValue(undefined),
|
|
22
|
+
tabs: vi.fn().mockResolvedValue([]),
|
|
23
|
+
closeTab: vi.fn().mockResolvedValue(undefined),
|
|
24
|
+
newTab: vi.fn().mockResolvedValue(undefined),
|
|
25
|
+
selectTab: vi.fn().mockResolvedValue(undefined),
|
|
26
|
+
networkRequests: vi.fn().mockResolvedValue([]),
|
|
27
|
+
consoleMessages: vi.fn().mockResolvedValue([]),
|
|
28
|
+
scroll: vi.fn().mockResolvedValue(undefined),
|
|
29
|
+
autoScroll: vi.fn().mockResolvedValue(undefined),
|
|
30
|
+
installInterceptor: vi.fn().mockResolvedValue(undefined),
|
|
31
|
+
getInterceptedRequests: vi.fn().mockResolvedValue([]),
|
|
32
|
+
getCookies: vi.fn().mockResolvedValue([]),
|
|
33
|
+
screenshot: vi.fn().mockResolvedValue(''),
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
describe('xiaohongshu publish', () => {
|
|
37
|
+
it('selects the image-text tab and publishes successfully', async () => {
|
|
38
|
+
const cmd = getRegistry().get('xiaohongshu/publish');
|
|
39
|
+
expect(cmd?.func).toBeTypeOf('function');
|
|
40
|
+
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'opencli-xhs-publish-'));
|
|
41
|
+
const imagePath = path.join(tempDir, 'demo.jpg');
|
|
42
|
+
fs.writeFileSync(imagePath, Buffer.from([0xff, 0xd8, 0xff, 0xd9]));
|
|
43
|
+
const page = createPageMock([
|
|
44
|
+
'https://creator.xiaohongshu.com/publish/publish?from=menu_left',
|
|
45
|
+
{ ok: true, target: '上传图文', text: '上传图文' },
|
|
46
|
+
{ hasTitleInput: true, hasImageInput: true, hasVideoSurface: false },
|
|
47
|
+
{ ok: true, count: 1 },
|
|
48
|
+
false,
|
|
49
|
+
{ ok: true, sel: 'input[maxlength="20"]' },
|
|
50
|
+
{ ok: true, sel: '[contenteditable="true"][class*="content"]' },
|
|
51
|
+
true,
|
|
52
|
+
'https://creator.xiaohongshu.com/publish/success',
|
|
53
|
+
'发布成功',
|
|
54
|
+
]);
|
|
55
|
+
const result = await cmd.func(page, {
|
|
56
|
+
title: 'DeepSeek别乱问',
|
|
57
|
+
content: '一篇真实一点的小红书正文',
|
|
58
|
+
images: imagePath,
|
|
59
|
+
topics: '',
|
|
60
|
+
draft: false,
|
|
61
|
+
});
|
|
62
|
+
const evaluateCalls = page.evaluate.mock.calls.map((args) => String(args[0]));
|
|
63
|
+
expect(evaluateCalls.some((code) => code.includes("const targets = ['上传图文', '图文', '图片']"))).toBe(true);
|
|
64
|
+
expect(evaluateCalls.some((code) => code.includes("No image file input found on page"))).toBe(true);
|
|
65
|
+
expect(result).toEqual([
|
|
66
|
+
{
|
|
67
|
+
status: '✅ 发布成功',
|
|
68
|
+
detail: '"DeepSeek别乱问" · 1张图片 · 发布成功',
|
|
69
|
+
},
|
|
70
|
+
]);
|
|
71
|
+
});
|
|
72
|
+
it('fails early with a clear error when still on the video page', async () => {
|
|
73
|
+
const cmd = getRegistry().get('xiaohongshu/publish');
|
|
74
|
+
expect(cmd?.func).toBeTypeOf('function');
|
|
75
|
+
const page = createPageMock([
|
|
76
|
+
'https://creator.xiaohongshu.com/publish/publish?from=menu_left',
|
|
77
|
+
{ ok: false, visibleTexts: ['上传视频', '上传图文'] },
|
|
78
|
+
{ hasTitleInput: false, hasImageInput: false, hasVideoSurface: true },
|
|
79
|
+
{ hasTitleInput: false, hasImageInput: false, hasVideoSurface: true },
|
|
80
|
+
{ hasTitleInput: false, hasImageInput: false, hasVideoSurface: true },
|
|
81
|
+
{ hasTitleInput: false, hasImageInput: false, hasVideoSurface: true },
|
|
82
|
+
]);
|
|
83
|
+
await expect(cmd.func(page, {
|
|
84
|
+
title: 'DeepSeek别乱问',
|
|
85
|
+
content: '一篇真实一点的小红书正文',
|
|
86
|
+
topics: '',
|
|
87
|
+
draft: false,
|
|
88
|
+
})).rejects.toThrow('Still on the video publish page after trying to select 图文');
|
|
89
|
+
expect(page.screenshot).toHaveBeenCalledWith({ path: '/tmp/xhs_publish_tab_debug.png' });
|
|
90
|
+
});
|
|
91
|
+
it('waits for the image-text surface to appear after clicking the tab', async () => {
|
|
92
|
+
const cmd = getRegistry().get('xiaohongshu/publish');
|
|
93
|
+
expect(cmd?.func).toBeTypeOf('function');
|
|
94
|
+
const page = createPageMock([
|
|
95
|
+
'https://creator.xiaohongshu.com/publish/publish?from=menu_left',
|
|
96
|
+
{ ok: true, target: '上传图文', text: '上传图文' },
|
|
97
|
+
{ hasTitleInput: false, hasImageInput: false, hasVideoSurface: true },
|
|
98
|
+
{ hasTitleInput: true, hasImageInput: true, hasVideoSurface: false },
|
|
99
|
+
{ ok: true, sel: 'input[maxlength="20"]' },
|
|
100
|
+
{ ok: true, sel: '[contenteditable="true"][class*="content"]' },
|
|
101
|
+
true,
|
|
102
|
+
'https://creator.xiaohongshu.com/publish/success',
|
|
103
|
+
'发布成功',
|
|
104
|
+
]);
|
|
105
|
+
const result = await cmd.func(page, {
|
|
106
|
+
title: '延迟切换也能过',
|
|
107
|
+
content: '图文页切换慢一点也继续等',
|
|
108
|
+
topics: '',
|
|
109
|
+
draft: false,
|
|
110
|
+
});
|
|
111
|
+
expect(page.wait.mock.calls).toContainEqual([{ time: 0.5 }]);
|
|
112
|
+
expect(result).toEqual([
|
|
113
|
+
{
|
|
114
|
+
status: '✅ 发布成功',
|
|
115
|
+
detail: '"延迟切换也能过" · 无图 · 发布成功',
|
|
116
|
+
},
|
|
117
|
+
]);
|
|
118
|
+
});
|
|
119
|
+
});
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
*/
|
|
12
12
|
import { Command } from 'commander';
|
|
13
13
|
import { type CliCommand } from './registry.js';
|
|
14
|
+
export declare function normalizeArgValue(argType: string | undefined, value: unknown, name: string): unknown;
|
|
14
15
|
/**
|
|
15
16
|
* Register a single CliCommand as a Commander subcommand.
|
|
16
17
|
*/
|
package/dist/commanderAdapter.js
CHANGED
|
@@ -14,14 +14,30 @@ import { fullName, getRegistry } from './registry.js';
|
|
|
14
14
|
import { formatRegistryHelpText } from './serialization.js';
|
|
15
15
|
import { render as renderOutput } from './output.js';
|
|
16
16
|
import { executeCommand } from './execution.js';
|
|
17
|
-
import { CliError, ERROR_ICONS, getErrorMessage } from './errors.js';
|
|
17
|
+
import { CliError, ERROR_ICONS, getErrorMessage, BrowserConnectError, AuthRequiredError, TimeoutError, SelectorError, EmptyResultError, ArgumentError, AdapterLoadError, CommandExecutionError, } from './errors.js';
|
|
18
|
+
import { checkDaemonStatus } from './browser/discover.js';
|
|
19
|
+
export function normalizeArgValue(argType, value, name) {
|
|
20
|
+
if (argType !== 'bool')
|
|
21
|
+
return value;
|
|
22
|
+
if (typeof value === 'boolean')
|
|
23
|
+
return value;
|
|
24
|
+
if (value == null || value === '')
|
|
25
|
+
return false;
|
|
26
|
+
const normalized = String(value).trim().toLowerCase();
|
|
27
|
+
if (normalized === 'true')
|
|
28
|
+
return true;
|
|
29
|
+
if (normalized === 'false')
|
|
30
|
+
return false;
|
|
31
|
+
throw new CliError('ARGUMENT', `"${name}" must be either "true" or "false".`);
|
|
32
|
+
}
|
|
18
33
|
/**
|
|
19
34
|
* Register a single CliCommand as a Commander subcommand.
|
|
20
35
|
*/
|
|
21
36
|
export function registerCommandToProgram(siteCmd, cmd) {
|
|
22
37
|
if (siteCmd.commands.some((c) => c.name() === cmd.name))
|
|
23
38
|
return;
|
|
24
|
-
const
|
|
39
|
+
const deprecatedSuffix = cmd.deprecated ? ' [deprecated]' : '';
|
|
40
|
+
const subCmd = siteCmd.command(cmd.name).description(`${cmd.description}${deprecatedSuffix}`);
|
|
25
41
|
// Register positional args first, then named options
|
|
26
42
|
const positionalArgs = [];
|
|
27
43
|
for (const arg of cmd.args) {
|
|
@@ -48,27 +64,32 @@ export function registerCommandToProgram(siteCmd, cmd) {
|
|
|
48
64
|
const actionOpts = actionArgs[positionalArgs.length] ?? {};
|
|
49
65
|
const optionsRecord = typeof actionOpts === 'object' && actionOpts !== null ? actionOpts : {};
|
|
50
66
|
const startTime = Date.now();
|
|
51
|
-
// ── Collect kwargs ──────────────────────────────────────────────────
|
|
52
|
-
const kwargs = {};
|
|
53
|
-
for (let i = 0; i < positionalArgs.length; i++) {
|
|
54
|
-
const v = actionArgs[i];
|
|
55
|
-
if (v !== undefined)
|
|
56
|
-
kwargs[positionalArgs[i].name] = v;
|
|
57
|
-
}
|
|
58
|
-
for (const arg of cmd.args) {
|
|
59
|
-
if (arg.positional)
|
|
60
|
-
continue;
|
|
61
|
-
const camelName = arg.name.replace(/-([a-z])/g, (_m, ch) => ch.toUpperCase());
|
|
62
|
-
const v = optionsRecord[arg.name] ?? optionsRecord[camelName];
|
|
63
|
-
if (v !== undefined)
|
|
64
|
-
kwargs[arg.name] = v;
|
|
65
|
-
}
|
|
66
67
|
// ── Execute + render ────────────────────────────────────────────────
|
|
67
68
|
try {
|
|
69
|
+
// ── Collect kwargs ────────────────────────────────────────────────
|
|
70
|
+
const kwargs = {};
|
|
71
|
+
for (let i = 0; i < positionalArgs.length; i++) {
|
|
72
|
+
const v = actionArgs[i];
|
|
73
|
+
if (v !== undefined)
|
|
74
|
+
kwargs[positionalArgs[i].name] = v;
|
|
75
|
+
}
|
|
76
|
+
for (const arg of cmd.args) {
|
|
77
|
+
if (arg.positional)
|
|
78
|
+
continue;
|
|
79
|
+
const camelName = arg.name.replace(/-([a-z])/g, (_m, ch) => ch.toUpperCase());
|
|
80
|
+
const v = optionsRecord[arg.name] ?? optionsRecord[camelName];
|
|
81
|
+
if (v !== undefined)
|
|
82
|
+
kwargs[arg.name] = normalizeArgValue(arg.type, v, arg.name);
|
|
83
|
+
}
|
|
68
84
|
const verbose = optionsRecord.verbose === true;
|
|
69
85
|
const format = typeof optionsRecord.format === 'string' ? optionsRecord.format : 'table';
|
|
70
86
|
if (verbose)
|
|
71
87
|
process.env.OPENCLI_VERBOSE = '1';
|
|
88
|
+
if (cmd.deprecated) {
|
|
89
|
+
const message = typeof cmd.deprecated === 'string' ? cmd.deprecated : `${fullName(cmd)} is deprecated.`;
|
|
90
|
+
const replacement = cmd.replacedBy ? ` Use ${cmd.replacedBy} instead.` : '';
|
|
91
|
+
console.error(chalk.yellow(`Deprecated: ${message}${replacement}`));
|
|
92
|
+
}
|
|
72
93
|
const result = await executeCommand(cmd, kwargs, verbose);
|
|
73
94
|
if (verbose && (!result || (Array.isArray(result) && result.length === 0))) {
|
|
74
95
|
console.error(chalk.yellow('[Verbose] Warning: Command returned an empty result.'));
|
|
@@ -84,22 +105,148 @@ export function registerCommandToProgram(siteCmd, cmd) {
|
|
|
84
105
|
});
|
|
85
106
|
}
|
|
86
107
|
catch (err) {
|
|
87
|
-
|
|
88
|
-
const icon = ERROR_ICONS[err.code] ?? '⚠️';
|
|
89
|
-
console.error(chalk.red(`${icon} ${err.message}`));
|
|
90
|
-
if (err.hint)
|
|
91
|
-
console.error(chalk.yellow(`→ ${err.hint}`));
|
|
92
|
-
}
|
|
93
|
-
else if (optionsRecord.verbose === true && err instanceof Error && err.stack) {
|
|
94
|
-
console.error(chalk.red(err.stack));
|
|
95
|
-
}
|
|
96
|
-
else {
|
|
97
|
-
console.error(chalk.red(`Error: ${getErrorMessage(err)}`));
|
|
98
|
-
}
|
|
108
|
+
await renderError(err, fullName(cmd), optionsRecord.verbose === true);
|
|
99
109
|
process.exitCode = 1;
|
|
100
110
|
}
|
|
101
111
|
});
|
|
102
112
|
}
|
|
113
|
+
// ── Error rendering ──────────────────────────────────────────────────────────
|
|
114
|
+
const ISSUES_URL = 'https://github.com/jackwener/opencli/issues';
|
|
115
|
+
/** Pattern-based classifier for untyped errors thrown by adapters. */
|
|
116
|
+
function classifyGenericError(msg) {
|
|
117
|
+
const m = msg.toLowerCase();
|
|
118
|
+
if (/not logged in|login required|please log in|未登录|请先登录|authentication required|cookie expired/.test(m))
|
|
119
|
+
return 'auth';
|
|
120
|
+
// Match "HTTP 404", "status: 500", "status 403", bare "404 Not Found", etc.
|
|
121
|
+
if (/\b(status[: ]+)?[45]\d{2}\b|http[/ ][45]\d{2}/.test(m))
|
|
122
|
+
return 'http';
|
|
123
|
+
if (/not found|未找到|could not find|no .+ found/.test(m))
|
|
124
|
+
return 'not-found';
|
|
125
|
+
return 'other';
|
|
126
|
+
}
|
|
127
|
+
/** Render a status line for BrowserConnectError based on real-time or kind-derived state. */
|
|
128
|
+
function renderBridgeStatus(running, extensionConnected) {
|
|
129
|
+
const ok = chalk.green('✓');
|
|
130
|
+
const fail = chalk.red('✗');
|
|
131
|
+
console.error(` Daemon ${running ? ok : fail} ${running ? 'running' : 'not running'}`);
|
|
132
|
+
console.error(` Extension ${extensionConnected ? ok : fail} ${extensionConnected ? 'connected' : 'not connected'}`);
|
|
133
|
+
console.error();
|
|
134
|
+
if (!running) {
|
|
135
|
+
console.error(chalk.yellow(' Run the command again — daemon should auto-start.'));
|
|
136
|
+
console.error(chalk.dim(' Still failing? Run: opencli doctor'));
|
|
137
|
+
}
|
|
138
|
+
else if (!extensionConnected) {
|
|
139
|
+
console.error(chalk.yellow(' Install the Browser Bridge extension to continue:'));
|
|
140
|
+
console.error(chalk.dim(' 1. Download from github.com/jackwener/opencli/releases'));
|
|
141
|
+
console.error(chalk.dim(' 2. chrome://extensions → Enable Developer Mode → Load unpacked'));
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
console.error(chalk.yellow(' Connection failed despite extension being active.'));
|
|
145
|
+
console.error(chalk.dim(' Try reloading the extension, or run: opencli doctor'));
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
async function renderError(err, cmdName, verbose) {
|
|
149
|
+
// ── BrowserConnectError: real-time diagnosis, kind as fallback ────────
|
|
150
|
+
if (err instanceof BrowserConnectError) {
|
|
151
|
+
console.error(chalk.red('🔌 Browser Bridge not connected'));
|
|
152
|
+
console.error();
|
|
153
|
+
try {
|
|
154
|
+
// 300ms matches execution.ts — localhost responds in <50ms when running.
|
|
155
|
+
const status = await checkDaemonStatus({ timeout: 300 });
|
|
156
|
+
renderBridgeStatus(status.running, status.extensionConnected);
|
|
157
|
+
}
|
|
158
|
+
catch (_statusErr) {
|
|
159
|
+
// checkDaemonStatus itself failed — derive best-guess state from kind.
|
|
160
|
+
const running = err.kind !== 'daemon-not-running';
|
|
161
|
+
const extensionConnected = err.kind === 'command-failed';
|
|
162
|
+
renderBridgeStatus(running, extensionConnected);
|
|
163
|
+
}
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
// ── AuthRequiredError ─────────────────────────────────────────────────
|
|
167
|
+
if (err instanceof AuthRequiredError) {
|
|
168
|
+
console.error(chalk.red(`🔒 Not logged in to ${err.domain}`));
|
|
169
|
+
// Respect custom hints set by the adapter; fall back to generic guidance.
|
|
170
|
+
console.error(chalk.yellow(`→ ${err.hint ?? `Open Chrome and log in to https://${err.domain}, then retry.`}`));
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
// ── TimeoutError ──────────────────────────────────────────────────────
|
|
174
|
+
if (err instanceof TimeoutError) {
|
|
175
|
+
console.error(chalk.red(`⏱ ${err.message}`));
|
|
176
|
+
console.error(chalk.yellow('→ Try again, or raise the limit:'));
|
|
177
|
+
console.error(chalk.dim(` OPENCLI_BROWSER_COMMAND_TIMEOUT=60 ${cmdName}`));
|
|
178
|
+
return;
|
|
179
|
+
}
|
|
180
|
+
// ── SelectorError / EmptyResultError: likely outdated adapter ─────────
|
|
181
|
+
if (err instanceof SelectorError || err instanceof EmptyResultError) {
|
|
182
|
+
const icon = ERROR_ICONS[err.code] ?? '⚠️';
|
|
183
|
+
console.error(chalk.red(`${icon} ${err.message}`));
|
|
184
|
+
console.error(chalk.yellow('→ The page structure may have changed — this adapter may be outdated.'));
|
|
185
|
+
console.error(chalk.dim(` Debug: ${cmdName} --verbose`));
|
|
186
|
+
console.error(chalk.dim(` Report: ${ISSUES_URL}`));
|
|
187
|
+
return;
|
|
188
|
+
}
|
|
189
|
+
// ── ArgumentError ─────────────────────────────────────────────────────
|
|
190
|
+
if (err instanceof ArgumentError) {
|
|
191
|
+
console.error(chalk.red(`❌ ${err.message}`));
|
|
192
|
+
if (err.hint)
|
|
193
|
+
console.error(chalk.yellow(`→ ${err.hint}`));
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
// ── AdapterLoadError ──────────────────────────────────────────────────
|
|
197
|
+
if (err instanceof AdapterLoadError) {
|
|
198
|
+
console.error(chalk.red(`📦 ${err.message}`));
|
|
199
|
+
if (err.hint)
|
|
200
|
+
console.error(chalk.yellow(`→ ${err.hint}`));
|
|
201
|
+
return;
|
|
202
|
+
}
|
|
203
|
+
// ── CommandExecutionError ─────────────────────────────────────────────
|
|
204
|
+
if (err instanceof CommandExecutionError) {
|
|
205
|
+
console.error(chalk.red(`💥 ${err.message}`));
|
|
206
|
+
if (err.hint) {
|
|
207
|
+
console.error(chalk.yellow(`→ ${err.hint}`));
|
|
208
|
+
}
|
|
209
|
+
else {
|
|
210
|
+
console.error(chalk.dim(` Add --verbose for details, or report: ${ISSUES_URL}`));
|
|
211
|
+
}
|
|
212
|
+
return;
|
|
213
|
+
}
|
|
214
|
+
// ── Other typed CliError (fallback for future codes) ──────────────────
|
|
215
|
+
if (err instanceof CliError) {
|
|
216
|
+
const icon = ERROR_ICONS[err.code] ?? '⚠️';
|
|
217
|
+
console.error(chalk.red(`${icon} ${err.message}`));
|
|
218
|
+
if (err.hint)
|
|
219
|
+
console.error(chalk.yellow(`→ ${err.hint}`));
|
|
220
|
+
return;
|
|
221
|
+
}
|
|
222
|
+
// ── Generic Error from adapters: classify by message pattern ──────────
|
|
223
|
+
const msg = getErrorMessage(err);
|
|
224
|
+
const kind = classifyGenericError(msg);
|
|
225
|
+
if (kind === 'auth') {
|
|
226
|
+
console.error(chalk.red(`🔒 ${msg}`));
|
|
227
|
+
console.error(chalk.yellow('→ Open Chrome, log in to the target site, then retry.'));
|
|
228
|
+
return;
|
|
229
|
+
}
|
|
230
|
+
if (kind === 'http') {
|
|
231
|
+
console.error(chalk.red(`🌐 ${msg}`));
|
|
232
|
+
console.error(chalk.yellow('→ Check your login status, or the site may be temporarily unavailable.'));
|
|
233
|
+
return;
|
|
234
|
+
}
|
|
235
|
+
if (kind === 'not-found') {
|
|
236
|
+
console.error(chalk.red(`📭 ${msg}`));
|
|
237
|
+
console.error(chalk.yellow('→ The resource was not found. The adapter or page structure may have changed.'));
|
|
238
|
+
console.error(chalk.dim(` Report: ${ISSUES_URL}`));
|
|
239
|
+
return;
|
|
240
|
+
}
|
|
241
|
+
// ── Unknown error: show stack in verbose mode ─────────────────────────
|
|
242
|
+
if (verbose && err instanceof Error && err.stack) {
|
|
243
|
+
console.error(chalk.red(err.stack));
|
|
244
|
+
}
|
|
245
|
+
else {
|
|
246
|
+
console.error(chalk.red(`💥 Unexpected error: ${msg}`));
|
|
247
|
+
console.error(chalk.dim(` Run with --verbose for details, or report: ${ISSUES_URL}`));
|
|
248
|
+
}
|
|
249
|
+
}
|
|
103
250
|
/**
|
|
104
251
|
* Register all commands from the registry onto a Commander program.
|
|
105
252
|
*/
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { Command } from 'commander';
|
|
3
|
+
const { mockExecuteCommand, mockRenderOutput } = vi.hoisted(() => ({
|
|
4
|
+
mockExecuteCommand: vi.fn(),
|
|
5
|
+
mockRenderOutput: vi.fn(),
|
|
6
|
+
}));
|
|
7
|
+
vi.mock('./execution.js', () => ({
|
|
8
|
+
executeCommand: mockExecuteCommand,
|
|
9
|
+
}));
|
|
10
|
+
vi.mock('./output.js', () => ({
|
|
11
|
+
render: mockRenderOutput,
|
|
12
|
+
}));
|
|
13
|
+
import { registerCommandToProgram } from './commanderAdapter.js';
|
|
14
|
+
describe('commanderAdapter arg passing', () => {
|
|
15
|
+
const cmd = {
|
|
16
|
+
site: 'paperreview',
|
|
17
|
+
name: 'submit',
|
|
18
|
+
description: 'Submit a PDF',
|
|
19
|
+
browser: false,
|
|
20
|
+
args: [
|
|
21
|
+
{ name: 'pdf', positional: true, required: true, help: 'Path to the paper PDF' },
|
|
22
|
+
{ name: 'dry-run', type: 'bool', default: false, help: 'Validate only' },
|
|
23
|
+
{ name: 'prepare-only', type: 'bool', default: false, help: 'Prepare only' },
|
|
24
|
+
],
|
|
25
|
+
func: vi.fn(),
|
|
26
|
+
};
|
|
27
|
+
beforeEach(() => {
|
|
28
|
+
mockExecuteCommand.mockReset();
|
|
29
|
+
mockExecuteCommand.mockResolvedValue([]);
|
|
30
|
+
mockRenderOutput.mockReset();
|
|
31
|
+
delete process.env.OPENCLI_VERBOSE;
|
|
32
|
+
process.exitCode = undefined;
|
|
33
|
+
});
|
|
34
|
+
it('passes bool flag values through to executeCommand for coercion', async () => {
|
|
35
|
+
const program = new Command();
|
|
36
|
+
const siteCmd = program.command('paperreview');
|
|
37
|
+
registerCommandToProgram(siteCmd, cmd);
|
|
38
|
+
await program.parseAsync(['node', 'opencli', 'paperreview', 'submit', './paper.pdf', '--dry-run', 'false']);
|
|
39
|
+
expect(mockExecuteCommand).toHaveBeenCalled();
|
|
40
|
+
const kwargs = mockExecuteCommand.mock.calls[0][1];
|
|
41
|
+
expect(kwargs.pdf).toBe('./paper.pdf');
|
|
42
|
+
expect(kwargs).toHaveProperty('dry-run');
|
|
43
|
+
});
|
|
44
|
+
it('passes valueless bool flags as true to executeCommand', async () => {
|
|
45
|
+
const program = new Command();
|
|
46
|
+
const siteCmd = program.command('paperreview');
|
|
47
|
+
registerCommandToProgram(siteCmd, cmd);
|
|
48
|
+
await program.parseAsync(['node', 'opencli', 'paperreview', 'submit', './paper.pdf', '--prepare-only']);
|
|
49
|
+
expect(mockExecuteCommand).toHaveBeenCalled();
|
|
50
|
+
const kwargs = mockExecuteCommand.mock.calls[0][1];
|
|
51
|
+
expect(kwargs.pdf).toBe('./paper.pdf');
|
|
52
|
+
expect(kwargs['prepare-only']).toBe(true);
|
|
53
|
+
});
|
|
54
|
+
it('rejects invalid bool values before calling executeCommand', async () => {
|
|
55
|
+
const program = new Command();
|
|
56
|
+
const siteCmd = program.command('paperreview');
|
|
57
|
+
registerCommandToProgram(siteCmd, cmd);
|
|
58
|
+
await program.parseAsync(['node', 'opencli', 'paperreview', 'submit', './paper.pdf', '--dry-run', 'maybe']);
|
|
59
|
+
// normalizeArgValue validates bools eagerly; executeCommand should not be reached
|
|
60
|
+
expect(mockExecuteCommand).not.toHaveBeenCalled();
|
|
61
|
+
});
|
|
62
|
+
});
|
package/dist/daemon.js
CHANGED
|
@@ -25,6 +25,7 @@ const PORT = parseInt(process.env.OPENCLI_DAEMON_PORT ?? String(DEFAULT_DAEMON_P
|
|
|
25
25
|
const IDLE_TIMEOUT = 5 * 60 * 1000; // 5 minutes
|
|
26
26
|
// ─── State ───────────────────────────────────────────────────────────
|
|
27
27
|
let extensionWs = null;
|
|
28
|
+
let extensionVersion = null;
|
|
28
29
|
const pending = new Map();
|
|
29
30
|
let idleTimer = null;
|
|
30
31
|
const LOG_BUFFER_SIZE = 200;
|
|
@@ -103,6 +104,7 @@ async function handleRequest(req, res) {
|
|
|
103
104
|
jsonResponse(res, 200, {
|
|
104
105
|
ok: true,
|
|
105
106
|
extensionConnected: extensionWs?.readyState === WebSocket.OPEN,
|
|
107
|
+
extensionVersion,
|
|
106
108
|
pending: pending.size,
|
|
107
109
|
});
|
|
108
110
|
return;
|
|
@@ -195,6 +197,11 @@ wss.on('connection', (ws) => {
|
|
|
195
197
|
ws.on('message', (data) => {
|
|
196
198
|
try {
|
|
197
199
|
const msg = JSON.parse(data.toString());
|
|
200
|
+
// Handle hello message from extension (version handshake)
|
|
201
|
+
if (msg.type === 'hello') {
|
|
202
|
+
extensionVersion = typeof msg.version === 'string' ? msg.version : null;
|
|
203
|
+
return;
|
|
204
|
+
}
|
|
198
205
|
// Handle log messages from extension
|
|
199
206
|
if (msg.type === 'log') {
|
|
200
207
|
const prefix = msg.level === 'error' ? '❌' : msg.level === 'warn' ? '⚠️' : '📋';
|
|
@@ -219,6 +226,7 @@ wss.on('connection', (ws) => {
|
|
|
219
226
|
clearInterval(heartbeatInterval);
|
|
220
227
|
if (extensionWs === ws) {
|
|
221
228
|
extensionWs = null;
|
|
229
|
+
extensionVersion = null;
|
|
222
230
|
// Reject all pending requests since the extension is gone
|
|
223
231
|
for (const [id, p] of pending) {
|
|
224
232
|
clearTimeout(p.timer);
|
|
@@ -229,8 +237,16 @@ wss.on('connection', (ws) => {
|
|
|
229
237
|
});
|
|
230
238
|
ws.on('error', () => {
|
|
231
239
|
clearInterval(heartbeatInterval);
|
|
232
|
-
if (extensionWs === ws)
|
|
240
|
+
if (extensionWs === ws) {
|
|
233
241
|
extensionWs = null;
|
|
242
|
+
extensionVersion = null;
|
|
243
|
+
// Reject pending requests in case 'close' does not follow this 'error'
|
|
244
|
+
for (const [, p] of pending) {
|
|
245
|
+
clearTimeout(p.timer);
|
|
246
|
+
p.reject(new Error('Extension disconnected'));
|
|
247
|
+
}
|
|
248
|
+
pending.clear();
|
|
249
|
+
}
|
|
234
250
|
});
|
|
235
251
|
});
|
|
236
252
|
// ─── Start ───────────────────────────────────────────────────────────
|