clawmoney 0.17.44 → 0.17.46

package/dist/task/daemon.js

@@ -23,6 +23,8 @@
 import { readFileSync, writeFileSync, unlinkSync, existsSync, appendFileSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
+import { fileURLToPath } from "node:url";
+import { execFileSync } from "node:child_process";
 import YAML from "yaml";
 const TASK_LOG_FILE = join(homedir(), ".clawmoney", "task.log");
 function tsLine(level, msg) {
@@ -40,11 +42,11 @@ function logToFile(level, ...args) {
         /* best effort */
     }
 }
-// Redirect console.* to the file so daemon log lines persist even when
-// the daemon is spawned with stdio:"ignore" by `clawmoney task start`.
-console.log = (...args) => logToFile("INFO", ...args);
-console.warn = (...args) => logToFile("WARN", ...args);
-console.error = (...args) => logToFile("ERROR", ...args);
+function installFileLogger() {
+    console.log = (...args) => logToFile("INFO", ...args);
+    console.warn = (...args) => logToFile("WARN", ...args);
+    console.error = (...args) => logToFile("ERROR", ...args);
+}
 import { TaskWsClient } from "./ws-client.js";
 import { getSkill, listSkills } from "./skills/index.js";
 const CONFIG_DIR = join(homedir(), ".clawmoney");
@@ -185,7 +187,47 @@ async function handleTaskRequest(ws, req) {
             clearTimeout(timer);
     }
 }
+function applySystemProxy() {
+    // bnbot's publicScrapers honor https_proxy/http_proxy/all_proxy to reach
+    // censored public APIs (wiki/google/...). The daemon's own WS uses the
+    // `ws` lib which ignores these env vars, so this only routes child bnbot
+    // fetches through the proxy. Auto-detect the macOS system proxy when the
+    // operator hasn't set one explicitly.
+    if (process.env.https_proxy || process.env.HTTPS_PROXY ||
+        process.env.all_proxy || process.env.ALL_PROXY) {
+        return;
+    }
+    if (process.platform !== "darwin")
+        return;
+    try {
+        const out = execFileSync("scutil", ["--proxy"], { encoding: "utf8", timeout: 3000 });
+        const get = (key) => out.match(new RegExp(`\\b${key}\\s*:\\s*(\\S+)`))?.[1];
+        let url;
+        if (get("HTTPSEnable") === "1" && get("HTTPSProxy")) {
+            url = `http://${get("HTTPSProxy")}:${get("HTTPSPort") ?? "0"}`;
+        }
+        else if (get("HTTPEnable") === "1" && get("HTTPProxy")) {
+            url = `http://${get("HTTPProxy")}:${get("HTTPPort") ?? "0"}`;
+        }
+        else if (get("SOCKSEnable") === "1" && get("SOCKSProxy")) {
+            url = `socks5://${get("SOCKSProxy")}:${get("SOCKSPort") ?? "0"}`;
+        }
+        if (url) {
+            process.env.https_proxy = url;
+            process.env.http_proxy = url;
+            process.env.all_proxy = url;
+            console.log(`[task] auto-detected system proxy ${url} (routing skill fetches through it)`);
+        }
+    }
+    catch (err) {
+        console.error(`[task] system proxy detection skipped: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
 function main() {
+    // Daemon was started as a script (stdio:"ignore"); from here on, all
+    // log lines should land in ~/.clawmoney/task.log.
+    installFileLogger();
+    applySystemProxy();
     const existing = readTaskPid();
     if (existing !== null && isPidAlive(existing)) {
         console.error(`[task] already running (PID ${existing})`);
@@ -243,4 +285,9 @@ function main() {
     process.on("SIGTERM", () => shutdown("SIGTERM"));
     ws.start();
 }
-main();
+// Only run main() when invoked as a script (`node daemon.js`), not when
+// the module is imported (e.g. by src/commands/task.ts which only wants
+// to use readTaskPid / isPidAlive helpers).
+if (process.argv[1] === fileURLToPath(import.meta.url)) {
+    main();
+}

package/dist/task/skills/opencli/platforms.js

@@ -7,6 +7,13 @@ const symbol = (i) => reqStr(i, ["symbol", "ticker"], "symbol");
 function openSkill(label, base, positional = () => [], flags = () => ({})) {
     return makeOpenCliSkill(label, (i) => opencliCommand(base, positional(i), flags(i)));
 }
+/** Same shape as openSkill but routes to the bnbot CLI instead of opencli.
+ *  Use for any site whose scraper is implemented natively in bnbot (zero
+ *  opencli dependency) — e.g. douban, whose opencli path wedges on anti-bot
+ *  pages while `bnbot douban …` works against the logged-in browser. */
+function bnbotSkill(label, base, positional = () => [], flags = () => ({})) {
+    return makeOpenCliSkill(label, (i) => bnbotCommand(base, positional(i), flags(i)));
+}
 export const ggSearchSkill = makeOpenCliSkill("google search", (i) => bnbotCommand(["google", "search"], [query(i)], { limit: limit(i), lang: str(i, ["lang", "language"]) }));
 export const ggSuggestSkill = makeOpenCliSkill("google suggest", (i) => bnbotCommand(["google", "suggest"], [query(i)], { limit: limit(i), lang: str(i, ["lang", "language"]) }));
 export const ggNewsSkill = makeOpenCliSkill("google news", (i) => bnbotCommand(["google", "news"], str(i, ["query", "keyword", "q"]) ? [str(i, ["query", "keyword", "q"])] : [], {
@@ -113,22 +120,24 @@ export const kr36SearchSkill = openSkill("36kr search", ["36kr", "search"], (i)
 export const kr36ArticleSkill = openSkill("36kr article", ["36kr", "article"], (i) => [
     reqStr(i, ["id", "url"], "id"),
 ]);
-export const dbSearchSkill = openSkill("douban search", ["douban", "search"], (i) => [query(i)], (i) => ({
+export const dbSearchSkill = bnbotSkill("douban search", ["douban", "search"], (i) => [query(i)], (i) => ({
     limit: limit(i),
     type: str(i, ["type"]),
 }));
-export const dbMovieHotSkill = openSkill("douban movie hot", ["douban", "movie-hot"], () => [], (i) => ({
+export const dbMovieHotSkill = bnbotSkill("douban movie hot", ["douban", "movie-hot"], () => [], (i) => ({
+    limit: limit(i),
+}));
+export const dbBookHotSkill = bnbotSkill("douban book hot", ["douban", "book-hot"], () => [], (i) => ({
     limit: limit(i),
 }));
-export const dbBookHotSkill = openSkill("douban book hot", ["douban", "book-hot"], () => [], (i) => ({
+export const dbTop250Skill = bnbotSkill("douban top250", ["douban", "top250"], () => [], (i) => ({
     limit: limit(i),
 }));
-export const dbTop250Skill = makeOpenCliSkill("douban top250", (i) => bnbotCommand(["douban", "top250"], [], { limit: limit(i) }));
-export const dbPhotosSkill = openSkill("douban photos", ["douban", "photos"], (i) => [id(i)], (i) => ({
+export const dbPhotosSkill = bnbotSkill("douban photos", ["douban", "photos"], (i) => [id(i)], (i) => ({
     limit: limit(i),
     type: str(i, ["type"]),
 }));
-export const sfNewsSkill = openSkill("sinafinance news", ["sinafinance", "news"], () => [], (i) => ({
+export const sfNewsSkill = bnbotSkill("sinafinance news", ["sinafinance", "news"], () => [], (i) => ({
     limit: limit(i),
     type: str(i, ["type"]),
 }));
@@ -137,13 +146,13 @@ export const sfStockSkill = openSkill("sinafinance stock", ["sinafinance", "stoc
     reqStr(i, ["key", "query", "symbol", "ticker"], "key"),
 ], (i) => ({ market: str(i, ["market"]) }));
 export const jkFeedSkill = openSkill("jike feed", ["jike", "feed"], () => [], (i) => ({ limit: limit(i) }));
-export const jkSearchSkill = openSkill("jike search", ["jike", "search"], (i) => [query(i)], (i) => ({
+export const jkSearchSkill = bnbotSkill("jike search", ["jike", "search"], (i) => [query(i)], (i) => ({
     limit: limit(i),
 }));
-export const xqSearchSkill = openSkill("xueqiu search", ["xueqiu", "search"], (i) => [query(i)], (i) => ({
+export const xqSearchSkill = bnbotSkill("xueqiu search", ["xueqiu", "search"], (i) => [query(i)], (i) => ({
     limit: limit(i),
 }));
-export const xqHotSkill = openSkill("xueqiu hot", ["xueqiu", "hot"], () => [], (i) => ({ limit: limit(i) }));
+export const xqHotSkill = bnbotSkill("xueqiu hot", ["xueqiu", "hot"], () => [], (i) => ({ limit: limit(i) }));
 export const xqHotStockSkill = openSkill("xueqiu hot stock", ["xueqiu", "hot-stock"], () => [], (i) => ({
     limit: limit(i),
     type: str(i, ["type"]),
@@ -183,23 +192,17 @@ export const wrRankingSkill = openSkill("weread ranking", ["weread", "ranking"],
 export const wrBookSkill = openSkill("weread book", ["weread", "book"], (i) => [
     reqStr(i, ["book_id", "bookId", "id"], "book_id"),
 ]);
-export const ctSearchSkill = openSkill("ctrip search", ["ctrip", "search"], (i) => [query(i)], (i) => ({
-    limit: limit(i),
-}));
-export const ctHotelSuggestSkill = openSkill("ctrip hotel suggest", ["ctrip", "hotel-suggest"], (i) => [query(i)], (i) => ({
-    limit: limit(i),
-}));
-export const ctHotelSearchSkill = openSkill("ctrip hotel search", ["ctrip", "hotel-search"], (i) => [
-    reqStr(i, ["city", "city_id", "cityId"], "city"),
-], (i) => ({
+export const ctSearchSkill = makeOpenCliSkill("ctrip search", (i) => bnbotCommand(["ctrip", "search"], [query(i)], { limit: limit(i) }));
+export const ctHotelSuggestSkill = makeOpenCliSkill("ctrip hotel suggest", (i) => bnbotCommand(["ctrip", "hotel-suggest"], [query(i)], { limit: limit(i) }));
+export const ctHotelSearchSkill = makeOpenCliSkill("ctrip hotel search", (i) => bnbotCommand(["ctrip", "hotel-search"], [reqStr(i, ["city", "city_id", "cityId"], "city")], {
     checkin: reqStr(i, ["checkin", "check_in", "checkIn"], "checkin"),
     checkout: reqStr(i, ["checkout", "check_out", "checkOut"], "checkout"),
     limit: limit(i),
 }));
-export const ctFlightSkill = openSkill("ctrip flight", ["ctrip", "flight"], (i) => [
+export const ctFlightSkill = makeOpenCliSkill("ctrip flight", (i) => bnbotCommand(["ctrip", "flight"], [
     reqStr(i, ["from", "from_iata", "fromIata"], "from"),
     reqStr(i, ["to", "to_iata", "toIata"], "to"),
-], (i) => ({
+], {
     date: reqStr(i, ["date", "departure_date", "departureDate"], "date"),
     limit: limit(i),
 }));

package/dist/task/skills/x/_mapper.d.ts

@@ -67,6 +67,8 @@ export declare function userTweetsToTwitter283(tweets: BnbotTweet[], cursor?: {
 export declare function tweetConversationToTwitter283(head: BnbotTweet, replies?: BnbotTweet[]): unknown;
 export interface BnbotTrend {
     name?: string;
+    topic?: string;
+    tweets?: string | number;
     tweet_volume?: number | null;
     url?: string;
     category?: string;

package/dist/task/skills/x/_mapper.js

@@ -136,8 +136,12 @@ export function trendsToTwitter283(trends) {
     return {
         data: {
             trends: trends.map((t) => ({
-                name: t.name ?? "",
-                tweet_volume: typeof t.tweet_volume === "number" ? t.tweet_volume : null,
+                name: t.name ?? t.topic ?? "",
+                tweet_volume: typeof t.tweet_volume === "number"
+                    ? t.tweet_volume
+                    : typeof t.tweets === "number"
+                        ? t.tweets
+                        : null,
                 url: t.url ?? "",
                 ...(t.category ? { category: t.category } : {}),
             })),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawmoney",
-  "version": "0.17.44",
+  "version": "0.17.46",
   "description": "ClawMoney CLI -- Earn rewards with your AI agent",
   "type": "module",
   "bin": {