dsh-qoder-connect 0.1.2 → 0.1.5

package/lib/{variants-C0iZD8AD.js → variants-BEiQve5M.js}

@@ -876,6 +876,14 @@ function getQoderUserStatusUrl(region = "global") {
 	const { openApiUrl } = resolveQoderEndpoints(region);
 	return `${openApiUrl}/api/v3/user/status`;
 }
+function getQoderCampaignsUrl(region = "global") {
+	const { openApiUrl } = resolveQoderEndpoints(region);
+	return `${openApiUrl}/sash/api/v1/me/campaigns`;
+}
+function getQoderClaimCampaignUrl(region = "global", campaignId) {
+	const { openApiUrl } = resolveQoderEndpoints(region);
+	return `${openApiUrl}/sash/api/v1/me/campaigns/${encodeURIComponent(campaignId)}/claim`;
+}
 //#endregion
 //#region src/qoder/errors.ts
 /**
@@ -2408,6 +2416,131 @@ var QoderUsageReader = class {
 	}
 };
 //#endregion
+//#region src/qoder/transport/checkin.ts
+const defaultCheckInTimeoutMs = 15e3;
+var QoderCheckInService = class {
+	authService;
+	fetchImpl;
+	region;
+	variantId;
+	logger;
+	timeoutMs;
+	constructor(options) {
+		this.authService = options.authService;
+		this.fetchImpl = options.fetch ?? globalThis.fetch;
+		this.region = options.region ?? "china";
+		this.variantId = options.variantId ?? "qoder";
+		this.logger = options.logger;
+		this.timeoutMs = options.timeoutMs ?? defaultCheckInTimeoutMs;
+	}
+	async fetchCampaigns(token, signal) {
+		const url = getQoderCampaignsUrl(this.region);
+		const data = await openApiJsonRequest(this.fetchImpl, {
+			url,
+			token,
+			signal,
+			timeoutMs: this.timeoutMs,
+			logger: this.logger,
+			operation: "Campaigns",
+			logCategory: "campaigns.list"
+		});
+		return Array.isArray(data?.campaigns) ? data.campaigns : [];
+	}
+	async claimCampaign(token, campaignId, signal) {
+		const url = getQoderClaimCampaignUrl(this.region, campaignId);
+		const { openApiUrl } = resolveQoderEndpoints(this.region);
+		return openApiJsonRequest(this.fetchImpl, {
+			url,
+			method: "POST",
+			token,
+			headers: { origin: openApiUrl },
+			signal,
+			timeoutMs: this.timeoutMs,
+			logger: this.logger,
+			operation: "ClaimCampaign",
+			logCategory: "campaigns.claim"
+		});
+	}
+	getTodayDateString() {
+		const now = /* @__PURE__ */ new Date();
+		const utc8Time = new Date(now.getTime() + (now.getTimezoneOffset() + 480) * 6e4);
+		return `${utc8Time.getFullYear()}-${String(utc8Time.getMonth() + 1).padStart(2, "0")}-${String(utc8Time.getDate()).padStart(2, "0")}`;
+	}
+	async checkIn(pat, signal) {
+		const today = this.getTodayDateString();
+		const nowMs = Date.now();
+		if (!pat || typeof pat !== "string" || pat.trim() === "") return {
+			variantId: this.variantId,
+			date: today,
+			timestamp: nowMs,
+			status: "error",
+			message: "No PAT available"
+		};
+		const executeWithToken = async (authToken) => {
+			const benefitCampaign = (await this.fetchCampaigns(authToken, signal)).find((c) => c.actionType === "CLAIM_BENEFIT");
+			if (!benefitCampaign) return {
+				variantId: this.variantId,
+				date: today,
+				timestamp: nowMs,
+				status: "no-campaign",
+				message: "No claimable benefit campaign found for this region"
+			};
+			if (benefitCampaign.claimStatus === "CLAIMED") return {
+				variantId: this.variantId,
+				date: today,
+				timestamp: nowMs,
+				status: "already-claimed",
+				campaignKey: benefitCampaign.campaignKey,
+				amount: benefitCampaign.benefit?.amount ?? 100,
+				message: "Already claimed today"
+			};
+			const claimResult = await this.claimCampaign(authToken, benefitCampaign.campaignId, signal);
+			const isClaimed = claimResult.status === "CLAIMED";
+			const replayed = Boolean(claimResult.replayed);
+			const amount = claimResult.benefit?.amount ?? benefitCampaign.benefit?.amount ?? 100;
+			if (isClaimed) return {
+				variantId: this.variantId,
+				date: today,
+				timestamp: nowMs,
+				status: replayed ? "already-claimed" : "claimed",
+				amount,
+				campaignKey: benefitCampaign.campaignKey,
+				message: replayed ? "Already claimed today" : `Successfully claimed ${amount} credits`
+			};
+			return {
+				variantId: this.variantId,
+				date: today,
+				timestamp: nowMs,
+				status: "error",
+				campaignKey: benefitCampaign.campaignKey,
+				message: `Claim returned status ${claimResult.status ?? "unknown"}`
+			};
+		};
+		try {
+			const creds = await this.authService.getCredentials(pat, signal);
+			try {
+				return await executeWithToken(creds.authToken);
+			} catch (innerError) {
+				if (isQoderAuthRejection(innerError)) {
+					this.logger?.warn?.(`[Qoder CheckIn] Auth token rejected, retrying with fresh exchange`);
+					return await executeWithToken((await this.authService.exchangeFresh(pat, signal)).authToken);
+				}
+				throw innerError;
+			}
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			this.logger?.error?.(`[Qoder CheckIn] Check-in failed: ${message}`);
+			return {
+				variantId: this.variantId,
+				date: today,
+				timestamp: nowMs,
+				status: "error",
+				message
+			};
+		}
+	}
+};
+//#endregion
 //#region src/qoder/transport/wire/encoding.ts
 /**
 * Qoder WAF Body encoding algorithm.
@@ -2623,7 +2756,10 @@ function parseEnvelope(rawData) {
 	const envelope = value;
 	if (envelope.statusCodeValue !== void 0 && typeof envelope.statusCodeValue !== "number") throw malformed("Qoder SSE envelope has an invalid status code.");
 	if (envelope.statusCodeValue !== void 0 && (!Number.isInteger(envelope.statusCodeValue) || envelope.statusCodeValue < 100 || envelope.statusCodeValue > 599)) throw malformed("Qoder SSE envelope has an invalid status code.");
-	if (envelope.statusCodeValue !== void 0 && envelope.statusCodeValue !== 200) throw qoderHttpError(`Qoder service returned upstream error status ${envelope.statusCodeValue}.`, { status: envelope.statusCodeValue });
+	if (envelope.statusCodeValue !== void 0 && envelope.statusCodeValue !== 200) {
+		const status = envelope.statusCodeValue;
+		throw qoderHttpError(envelope.body ? `Qoder service returned upstream error status ${status}: ${envelope.body}` : `Qoder service returned upstream error status ${status}.`, { status });
+	}
 	if (envelope.body !== void 0 && typeof envelope.body !== "string") throw malformed("Qoder SSE envelope has an invalid model body.");
 	return envelope;
 }
@@ -3030,6 +3166,18 @@ async function* streamQoderChat(options, model, credentials, messages, dependenc
 		requestController.abort("request complete");
 	}
 }
+/**
+* How long a rotated-token notice may wait for an accepting chat.
+*
+* The heal's own retry can lose a race with a transient fault and be rescued
+* by a later attempt, so the notice is deferred until some chat is accepted.
+* That deferral has to be bounded: an unbounded one let a rotation from
+* minutes earlier surface as a fresh-looking row whose timestamp named a
+* moment the user could not connect to the row appearing now. Five minutes
+* comfortably covers the host's own retry cycle (its backoff caps at 10s)
+* while keeping the row adjacent to the event it describes.
+*/
+const jobTokenNoticeMaxAgeMs = 3e5;
 function aborted(message) {
 	return new QoderLlmError(message, "ABORTED");
 }
@@ -3043,11 +3191,13 @@ var DefaultQoderTransport = class {
 	metadataTimeoutMs;
 	auth;
 	usage;
+	checkInService;
 	modelFlights = new SingleFlight();
 	attachments;
 	imageUploader;
 	preserveThinking;
 	onJobTokenRefreshed;
+	onJobTokenRefreshFailed;
 	/**
 	* Set when the self-heal exchanged a fresh job token, cleared when a chat
 	* afterwards succeeds. The notice reports "the token was rotated because the
@@ -3056,6 +3206,16 @@ var DefaultQoderTransport = class {
 	* transient upstream timeout and be rescued by a later attempt.
 	*/
 	pendingRefreshAt;
+	/**
+	* Whether the current unresolved heal failure has already been reported.
+	*
+	* One upstream rejection can outlive many host-level retries (an observed
+	* storm ran 59 of them across 75 steps), and the transport re-heals inside
+	* every one of them. Without this latch the failure notice would print once
+	* per retry; with it, the user is told once per outage. Cleared as soon as
+	* any chat is accepted, so the next outage announces itself again.
+	*/
+	refreshFailureAnnounced = false;
 	constructor(options) {
 		this.region = options.region;
 		this.resolvePat = options.resolvePat;
@@ -3067,6 +3227,7 @@ var DefaultQoderTransport = class {
 		this.attachments = options.attachments;
 		this.preserveThinking = options.preserveThinking;
 		this.onJobTokenRefreshed = options.onJobTokenRefreshed;
+		this.onJobTokenRefreshFailed = options.onJobTokenRefreshFailed;
 		this.auth = new QoderAuthService({
 			fetch: this.fetchImpl,
 			logger: this.logger,
@@ -3092,6 +3253,13 @@ var DefaultQoderTransport = class {
 			region: this.region,
 			timeoutMs: this.metadataTimeoutMs
 		});
+		this.checkInService = new QoderCheckInService({
+			authService: this.auth,
+			fetch: this.fetchImpl,
+			logger: this.logger,
+			region: this.region,
+			timeoutMs: this.metadataTimeoutMs
+		});
 	}
 	stream(options, model) {
 		return this.generate(options, model);
@@ -3107,12 +3275,35 @@ var DefaultQoderTransport = class {
 		if (this.pendingRefreshAt === void 0) return;
 		const at = this.pendingRefreshAt;
 		this.pendingRefreshAt = void 0;
+		if (Date.now() - at > jobTokenNoticeMaxAgeMs) return;
 		this.logger?.warn?.("[Qoder Stream] Job token was auto-refreshed after an upstream rejection; the chat has recovered");
 		this.onJobTokenRefreshed?.({
 			region: this.region,
 			at
 		});
 	}
+	/**
+	* Drop a pending rotation notice whose heal did not rescue anything.
+	*
+	* The heal's own retry was rejected too, so "the rotation fixed it" is not
+	* what happened. Leaving the notice pending made a LATER, unrelated chat
+	* acceptance flush it — printing a success row that contradicts the failure
+	* row already shown, stamped with the old rotation time.
+	*/
+	discardPendingRefreshNotice() {
+		this.pendingRefreshAt = void 0;
+	}
+	/**
+	* Note that the upstream accepted a chat, ending any unresolved heal failure.
+	*
+	* `streamChat` calls this the moment its first chunk arrives — the only point
+	* at which "the credential was accepted" is actually known. A rejected chat
+	* throws before that, so this never fires on a failing attempt.
+	*/
+	onChatAccepted() {
+		this.refreshFailureAnnounced = false;
+		this.flushPendingRefreshNotice();
+	}
 	async discoverModels(signal) {
 		const pat = await this.requirePat(signal);
 		const key = opaqueCredentialKey(pat);
@@ -3134,6 +3325,10 @@ var DefaultQoderTransport = class {
 			signal: options?.signal
 		});
 	}
+	async checkIn(signal) {
+		const pat = await this.requirePat(signal);
+		return this.checkInService.checkIn(pat, signal);
+	}
 	async requirePat(signal) {
 		if (signal?.aborted) throw aborted("Qoder request was aborted.");
 		const pat = (await this.resolvePat()).trim();
@@ -3178,7 +3373,7 @@ var DefaultQoderTransport = class {
 		const chatCredentials = await this.auth.getCredentials(pat, options.signal);
 		try {
 			yield* this.streamChat(options, model, chatCredentials, messages, () => {
-				this.flushPendingRefreshNotice();
+				this.onChatAccepted();
 			});
 			return;
 		} catch (error) {
@@ -3191,7 +3386,7 @@ var DefaultQoderTransport = class {
 			this.pendingRefreshAt = Date.now();
 			try {
 				yield* this.streamChat(options, model, refreshed, messages, () => {
-					this.flushPendingRefreshNotice();
+					this.onChatAccepted();
 				});
 				return;
 			} catch (error) {
@@ -3212,6 +3407,16 @@ var DefaultQoderTransport = class {
 				}
 			}
 		}
+		this.discardPendingRefreshNotice();
+		if (!this.refreshFailureAnnounced) {
+			this.refreshFailureAnnounced = true;
+			this.logger?.warn?.("[Qoder Stream] Job token refresh did not recover the chat; the upstream still rejects it", { status: lastRejection instanceof LlmError ? lastRejection.failure.status : void 0 });
+			this.onJobTokenRefreshFailed?.({
+				region: this.region,
+				at: Date.now(),
+				...lastRejection instanceof LlmError && lastRejection.failure.status !== void 0 ? { status: lastRejection.failure.status } : {}
+			});
+		}
 		throw lastRejection;
 	}
 };
@@ -3618,14 +3823,23 @@ var ChunkEncoder = class {
 				}] })];
 			}
 			case "usage": {
-				const prompt = chunk.usage.inputTokens + (chunk.usage.cacheReadTokens ?? 0) + (chunk.usage.cacheWriteTokens ?? 0);
+				const cacheRead = chunk.usage.cacheReadTokens;
+				const cacheWrite = chunk.usage.cacheWriteTokens;
+				const prompt = chunk.usage.inputTokens + (cacheRead ?? 0) + (cacheWrite ?? 0);
 				const completion = chunk.usage.outputTokens;
+				const reasoning = chunk.usage.reasoningTokens;
+				const details = cacheRead === void 0 && cacheWrite === void 0 ? void 0 : {
+					...cacheRead === void 0 ? {} : { cached_tokens: cacheRead },
+					...cacheWrite === void 0 ? {} : { cache_write_tokens: cacheWrite }
+				};
 				return [this.frame({
 					choices: [],
 					usage: {
 						prompt_tokens: prompt,
 						completion_tokens: completion,
-						total_tokens: chunk.usage.totalTokens ?? prompt + completion
+						total_tokens: chunk.usage.totalTokens ?? prompt + completion,
+						...details === void 0 ? {} : { prompt_tokens_details: details },
+						...reasoning === void 0 ? {} : { completion_tokens_details: { reasoning_tokens: reasoning } }
 					}
 				})];
 			}
@@ -3779,6 +3993,12 @@ var QoderUpstreamClient = class {
 		};
 	}
 	/**
+	* Run daily benefit check-in for this client's variant.
+	*/
+	async checkIn(signal) {
+		return this.transport.checkIn(signal);
+	}
+	/**
 	* Stream one translated chat-completions request.
 	*
 	* The first transport chunk is pulled before the response is constructed:
@@ -4013,7 +4233,7 @@ const DEFAULT_MAX_TOKENS = 32768;
 const DEFAULT_CONTEXT_WINDOW = 18e4;
 //#endregion
 //#region src/version.ts
-const QODER_CONNECT_VERSION = "0.1.2";
+const QODER_CONNECT_VERSION = "0.1.5";
 //#endregion
 //#region src/host-heartbeat.ts
 /**

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-qoder-connect",
   "displayName": "DSH Qoder Connect",
   "description": "将 Qoder（国内版 / 国际版）的模型接入 DeepSeek Harness — bring Qoder (CN & international) models into DeepSeek Harness.",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "author": "corrinehu",
   "keywords": [
     "dsh-plugin",
@@ -23,7 +23,7 @@
   "scripts": {
     "prepack": "npm run build",
     "build": "tsdown",
-    "test": "vitest run",
+    "test": "node -r ./tests/sandbox-shim.cjs ./node_modules/vitest/vitest.mjs run",
     "test:qoder": "node --test --test-isolation=none --experimental-strip-types tests/qoder/*.test.ts",
     "typecheck": "tsc -p tsconfig.json && tsc -p tsconfig.client.json",
     "check": "pnpm run typecheck && pnpm run test && pnpm run test:qoder && pnpm run build"