dsh-xdpool 2.5.0 → 2.5.1

package/lib/bin.js

@@ -993,7 +993,8 @@ function parseTask(value) {
 		status: typeof raw["status"] === "string" ? raw["status"] : "",
 		claimable: !claimed && target > 0 && current >= target,
 		claimed,
-		locked: raw["locked"] === true
+		locked: raw["locked"] === true,
+		jumpUrl: typeof raw["jump_url"] === "string" ? raw["jump_url"] : ""
 	};
 }
 var WorkBuddyUpstreamClient = class {
@@ -1354,17 +1355,14 @@ var WorkBuddyUpstreamClient = class {
 			if (typeof raw !== "object" || raw === null) continue;
 			const account = raw;
 			const num = (key) => typeof account[key] === "number" ? account[key] : 0;
-			const capacityType = num("CapacityType");
-			const monthly = capacityType === 4;
-			const periodic = monthly || capacityType === 2;
-			const size = periodic ? num("CycleCapacitySize") : num("CapacitySize");
-			const remain = periodic ? num("CycleCapacityRemain") : num("CapacityRemain");
+			const monthly = num("CapacityType") === 4;
+			const size = monthly ? num("CycleCapacitySize") : num("CapacitySize");
+			const remain = monthly ? num("CycleCapacityRemain") : num("CapacityRemain");
 			const capped = remain < 0 ? 0 : remain;
 			const cycleEndMs = parseDate(account["CycleEndTime"]);
-			const expiresAtMs = monthly ? void 0 : capacityType === 2 ? parseDate(account["DeductionEndTime"]) : parseDate(account["ExpiredTime"]) ?? cycleEndMs;
+			const expiresAtMs = monthly ? void 0 : parseDate(account["ExpiredTime"]) ?? cycleEndMs;
 			const refreshAtMs = monthly ? cycleEndMs === void 0 ? void 0 : cycleEndMs + 1e3 : void 0;
-			if (expiresAtMs !== void 0 && expiresAtMs <= Date.now()) continue;
-			if (!periodic && capped <= 0) continue;
+			if (!monthly && (capped <= 0 || expiresAtMs !== void 0 && expiresAtMs <= Date.now())) continue;
 			total += capped;
 			if (expiresAtMs !== void 0) {
 				if (nearestExpiryMs === void 0 || expiresAtMs < nearestExpiryMs) nearestExpiryMs = expiresAtMs;
@@ -3696,11 +3694,11 @@ var WorkBuddyAccountPool = class {
 	* model id the legacy account-wide check applies (callers that cannot name a
 	* model, e.g. CLI diagnostics).
 	*/
-	available(now, modelId, region) {
+	available(now, modelId, region, reserveExempt) {
 		return this.accounts.filter((account) => {
 			if (this.disabledIds.has(account.id)) return false;
 			const reserve = this.creditReserves.get(account.id);
-			if (reserve !== void 0 && reserve > 0) {
+			if (!reserveExempt?.has(account.id) && reserve !== void 0 && reserve > 0) {
 				const balance = this.creditBalances.get(account.id);
 				if (balance !== void 0 && balance <= reserve) return false;
 			}
@@ -3724,7 +3722,7 @@ var WorkBuddyAccountPool = class {
 	* Counts are over the region's accounts, since a provider only ever sees its
 	* own gateway.
 	*/
-	unavailableReason(modelId, region) {
+	unavailableReason(modelId, region, reserveExempt) {
 		const now = Date.now();
 		const inRegion = this.accounts.filter((account) => region === void 0 || regionOf(account.credential.domain) === region);
 		if (inRegion.length === 0) return {
@@ -3737,6 +3735,29 @@ var WorkBuddyAccountPool = class {
 		let cooling = 0;
 		let disabled = 0;
 		let dead = 0;
+		/**
+		* Accounts that survived every OTHER filter and are held back only by their
+		* credit floor.
+		*
+		* Counted rather than returned on the first hit. The old `return` fired the
+		* moment it met one reserved account, so a single account parked under its
+		* floor reported `reserve` for the whole gateway — even while four other
+		* accounts were healthy and had just been tried. The caller turns
+		* `reason === 'reserve'` into a 402 telling the user to lower the reserve,
+		* which pointed at a setting that was not the problem (#98: a five-account
+		* pool reported `reserve_floor` because of one account that had sat below
+		* its floor for weeks, while the actual state was "the rest are cooling").
+		*/
+		let reserved = 0;
+		/**
+		* Accounts that reached the end of the walk unblocked.
+		*
+		* Non-zero means the pool still has somewhere to send a request, so a
+		* reserve is NOT what this answer is about: editing a number cannot fix a
+		* request that some other account is already able to serve, and saying
+		* otherwise sends the reader to the wrong setting.
+		*/
+		let usable = 0;
 		for (const account of inRegion) {
 			if (this.disabledIds.has(account.id)) {
 				disabled += 1;
@@ -3752,16 +3773,14 @@ var WorkBuddyAccountPool = class {
 				continue;
 			}
 			const reserve = this.creditReserves.get(account.id);
-			if (reserve !== void 0 && reserve > 0) {
+			if (!reserveExempt?.has(account.id) && reserve !== void 0 && reserve > 0) {
 				const balance = this.creditBalances.get(account.id);
-				if (balance !== void 0 && balance <= reserve) return {
-					total: inRegion.length,
-					cooling,
-					disabled,
-					dead,
-					reason: "reserve"
-				};
+				if (balance !== void 0 && balance <= reserve) {
+					reserved += 1;
+					continue;
+				}
 			}
+			usable += 1;
 		}
 		if (dead > 0) return {
 			total: inRegion.length,
@@ -3784,6 +3803,13 @@ var WorkBuddyAccountPool = class {
 			dead,
 			reason: "disabled"
 		};
+		if (usable === 0 && reserved > 0) return {
+			total: inRegion.length,
+			cooling,
+			disabled,
+			dead,
+			reason: "reserve"
+		};
 		return {
 			total: inRegion.length,
 			cooling,
@@ -3960,16 +3986,18 @@ var WorkBuddyAccountPool = class {
 	* Scans on first use, and rescans when every known account is cooling down: a
 	* fresh desktop login is the usual way out of an exhausted pool.
 	*
+	* `reserveExempt` is host-only: account ids whose own credentials freshly
+	* confirmed a zero-credit model. It never bypasses disabled, dead credentials, cooldowns or region.
 	* `conversationKey` is only consulted under `sticky`; other modes ignore it.
 	*/
-	async acquire(modelId, region, conversationKey) {
+	async acquire(modelId, region, conversationKey, reserveExempt) {
 		if (this.accounts.length === 0) await this.scan();
 		const maxTries = this.accounts.length + 1;
 		for (let attempt = 0; attempt < maxTries; attempt += 1) {
-			let pool = this.available(Date.now(), modelId, region);
+			let pool = this.available(Date.now(), modelId, region, reserveExempt);
 			if (pool.length === 0 && attempt === 0) {
 				await this.scan();
-				pool = this.available(Date.now(), modelId, region);
+				pool = this.available(Date.now(), modelId, region, reserveExempt);
 			}
 			if (pool.length === 0) return void 0;
 			if (this.preferredAccountId !== void 0) {
@@ -9967,6 +9995,71 @@ function appearanceChain(themeKey = APPEARANCE_THEME_KEY) {
 	};
 }
 /**
+* Pull the `expertId` out of a task's `jump_url`.
+*
+* The "体验XX专家" tasks (#98) name an expert that is NOT in the marketplace
+* listing — the reporter翻遍了 marketExpertList in both `agent` and `team`
+* types and got zero hits — so the only place the id appears is the deeplink
+* embedded in the task itself:
+*
+*   https://www.workbuddy.cn/work/launch/?deeplink=workbuddy%3A%2F%2Fexperts%3FexpertId%3Dex_GDl31WahyIH0&buddy_type=workbuddy
+*
+* The deeplink is percent-encoded, and it has to be: the `?` and `&` inside it
+* would otherwise end the outer query. So the parse is two steps — decode the
+* `deeplink` parameter, then read `expertId` off the scheme it decodes to — and
+* NOT a regex over the whole URL, which would also match the outer `expertId`
+* spelling in a future URL shape and silently pick the wrong one.
+*
+* Returns undefined for the tasks whose deeplink carries no id at all
+* (`WorkBuddy_Valorant` points at `workbuddy://expert` with no query), which is
+* the honest answer: those need a different source and are not guessed here.
+*/
+function expertIdFromJumpUrl(jumpUrl) {
+	if (jumpUrl === "") return void 0;
+	/** Read `expertId` off any URL-ish string, decoded or not. */
+	const readId = (value) => {
+		let query = value;
+		try {
+			const parsed = new URL(value);
+			query = parsed.search === "" ? value : parsed.search;
+		} catch {
+			query = value;
+		}
+		const marker = query.indexOf("expertId=");
+		if (marker === -1) return void 0;
+		const rest = query.slice(marker + 9);
+		const end = rest.search(/[&#]/u);
+		const id = (end === -1 ? rest : rest.slice(0, end)).trim();
+		return id === "" ? void 0 : id;
+	};
+	let source = jumpUrl;
+	try {
+		const raw = new URL(jumpUrl).searchParams.get("deeplink");
+		if (raw !== null && raw !== "") source = raw;
+	} catch {
+		source = jumpUrl;
+	}
+	return readId(source);
+}
+/**
+* Build a summon record for an expert the marketplace does not list.
+*
+* Everything the chains need beyond the id is cosmetic — the scorer keys on
+* `expertId` — so the title from the task is reused as the display name rather
+* than inventing one. `version` is left empty, which every consumer already
+* defaults to `1.0.0`.
+*/
+function expertFromTask(expertId, title) {
+	return {
+		expertId,
+		expertType: "agent",
+		displayName: title,
+		profession: title,
+		version: "",
+		categories: []
+	};
+}
+/**
 * The three "summon an expert" events (`expert_summon_click` and friends).
 *
 * Paid before the conversation, in the order the app emits them.
@@ -10080,7 +10173,12 @@ const EVENT_CHAIN_BUILDERS = {
 	skill_1: true,
 	expert_5: true,
 	Expert_team_use_3: true,
-	Expert_lighthouse: true
+	Expert_lighthouse: true,
+	expert_use_maidehao: true,
+	expert_use_douyinyin: true,
+	expert_use_shangjia_xuanchuan: true,
+	expert_use_bowangwang: true,
+	WorkBuddy_Valorant: true
 };
 const AUTOMATION_TICK_MS = 6e4;
 const JOB_KINDS = [
@@ -10269,6 +10367,16 @@ var WorkBuddyScheduler = class {
 	/** Host hooks that persist the ledger across restarts. */
 	loadEarnings;
 	saveEarningsFn;
+	/**
+	* The most recent ledger write that may still be in flight.
+	*
+	* `persistEarnings` is synchronous from its callers' point of view, but the
+	* host's settings write is not: it is an async document update. Keeping the
+	* promise here is what lets {@link flushEarnings} wait for the write that
+	* matters — the last one before a restart — without making every counter
+	* update await disk.
+	*/
+	pendingEarningsWrite = Promise.resolve();
 	constructor(pool, client, options = {}) {
 		this.pool = pool;
 		this.client = client;
@@ -10305,6 +10413,18 @@ var WorkBuddyScheduler = class {
 		this.saveEarningsFn = save;
 	}
 	/**
+	* Wait for the ledger write that is (or was last) in flight.
+	*
+	* Called at the END of a task pass, right after the last claim, so the rewards
+	* that were just collected are on disk before a restart can lose them. It is
+	* deliberately NOT awaited on every counter bump: the settings document write
+	* is the slow part, and paying it per account would slow the pass for no
+	* benefit while the process is still alive.
+	*/
+	async flushEarnings() {
+		await this.pendingEarningsWrite;
+	}
+	/**
 	* Fold a previously persisted ledger back in, when it belongs to today.
 	*
 	* Used after the settings document becomes readable, which happens after
@@ -10574,7 +10694,7 @@ var WorkBuddyScheduler = class {
 			compensationCredit: (existing?.compensationCredit ?? 0) + compensationCredit,
 			date: today
 		});
-		this.persistEarnings();
+		this.pendingEarningsWrite = this.persistEarnings();
 	}
 	/** Clear the per-account counters when the local day changes. */
 	rollEarnings(today) {
@@ -10590,9 +10710,18 @@ var WorkBuddyScheduler = class {
 	* Best effort on purpose: a failed save must never abort a run that has
 	* already collected rewards, and the in-memory ledger keeps serving the card
 	* for the rest of the session either way.
+	*
+	* The returned promise settles when the write has landed (or failed). Callers
+	* that are about to END a run await it: reported in #98, a task pass that
+	* claimed 21 tasks had its process restarted before the volatile settings
+	* write reached disk, so `automationEarnings` still read `credit: 0` while
+	* the upstream had really paid out. Fire-and-forget is fine for a counter the
+	* card will re-read in this process; it is not fine for the last write before
+	* exit.
 	*/
 	persistEarnings() {
-		if (this.saveEarningsFn === void 0) return;
+		const save = this.saveEarningsFn;
+		if (save === void 0) return Promise.resolve();
 		const accounts = {};
 		for (const [id, entry] of this.earnings) accounts[id] = entry;
 		const ledger = {
@@ -10600,12 +10729,14 @@ var WorkBuddyScheduler = class {
 			accounts
 		};
 		try {
-			const saved = this.saveEarningsFn(ledger);
-			if (saved !== void 0 && typeof saved.then === "function") saved.then(void 0, (error) => {
+			const saved = save(ledger);
+			if (saved !== void 0 && typeof saved.then === "function") return Promise.resolve(saved).then(void 0, (error) => {
 				this.logger.warn?.("dsh-xdpool: could not persist automation earnings:", error);
 			});
+			return Promise.resolve();
 		} catch (error) {
 			this.logger.warn?.("dsh-xdpool: could not persist automation earnings:", error);
+			return Promise.resolve();
 		}
 	}
 	/**
@@ -10714,6 +10845,7 @@ var WorkBuddyScheduler = class {
 		state.detail = detail;
 		state.progress = progressNote;
 		this.logger.info?.(`automation ${accountWord}: ${state.message}`);
+		if (kind === "tasks" || kind === "checkin" || kind === "streak" || kind === "travel" || kind === "compensation") await this.flushEarnings();
 	}
 	/** Compose the one-line summary shown on the card. */
 	summarise(kind, ok, failed, claimed, credit, energy) {
@@ -10836,10 +10968,43 @@ var WorkBuddyScheduler = class {
 			case "expert_5": return this.expertChains(credential, "agent", task);
 			case "Expert_team_use_3": return this.expertChains(credential, "team", task);
 			case "Expert_lighthouse": return this.lighthouseChains(credential);
+			case "expert_use_maidehao":
+			case "expert_use_douyinyin":
+			case "expert_use_shangjia_xuanchuan":
+			case "expert_use_bowangwang":
+			case "WorkBuddy_Valorant": return this.taskExpertChains(credential, task);
 			default: return [];
 		}
 	}
 	/**
+	* Summon-and-use one expert NAMED BY THE TASK.
+	*
+	* Structurally `expertChains` minus the marketplace: the expert id is read
+	* from the task's deeplink instead of by browsing `marketExpertList`, because
+	* this family's experts are not listed there at all (#98 measured 500 entries
+	* across both `agent` and `team`, zero hits).
+	*
+	* Returns `[]` — not a throw — when the task carries no usable id: the caller
+	* logs "could not be built" only for exceptions, and a task shape this code
+	* does not understand is information, not a fault.
+	*/
+	async taskExpertChains(credential, task) {
+		const expertId = expertIdFromJumpUrl(task.jumpUrl);
+		if (expertId === void 0) {
+			this.logger.warn?.(`automation events ${task.taskCode}: no expertId in jump_url, skipping`);
+			return [];
+		}
+		const expert = expertFromTask(expertId, task.title);
+		await this.client.reportDesktopEvents(credential, expertSummonEvents(expert));
+		if (this.delayMs > 0 && !this.stopped) await sleep(this.delayMs);
+		const chat = await this.client.openConversation(credential, expert.expertId);
+		if (chat === void 0) throw new Error(`${task.taskCode}: no server conversation`);
+		return [{
+			transport: "desktop",
+			events: [...expertChatEvents(expert, chat.conversationId, chat.requestId), expertActualUseEvent(expert, chat.conversationId, chat.requestId)]
+		}];
+	}
+	/**
 	* The summon-and-use chains for the expert tasks.
 	*
 	* Two steps per expert, and both are load-bearing: the summon events alone are
@@ -11306,8 +11471,7 @@ z.object({
 	modelSelectionCn: asVolatile(modelSelectionSchema.description("Model selection for the domestic gateway")),
 	modelSelectionGlobal: asVolatile(modelSelectionSchema.description("Model selection for the international gateway")),
 	automation: asVolatile(automationSchema.description("Daily points automation (activity report, task claiming, check-in)")),
-	automationEarnings: asVolatile(z.any().description("Automation earnings ledger (written by the scheduler)")),
-	sidebarRow: asVolatile(z.boolean().default(true).description("Show the XD Pool entry in the left sidebar (the Settings page keeps working either way)"))
+	automationEarnings: asVolatile(z.any().description("Automation earnings ledger (written by the scheduler)"))
 });
 /** Assemble the runtime objects without registering anything. */
 /**