dsh-qoder-connect 0.1.4 → 0.1.8

package/lib/{variants-CSeJqJpR.js → variants-DE76gF0Y.js}

@@ -502,11 +502,18 @@ var QoderCatalog = class {
 	useMaximumContextWindow = false;
 	/** Per-model window overrides (model id → tokens); an override wins over the preference. */
 	modelContextWindows = {};
+	/** Disabled model IDs (blacklist); disabled models are filtered out from current(). */
+	disabledModels = /* @__PURE__ */ new Set();
 	constructor(initial = FALLBACK_QODER_MODELS) {
 		this.models = initial;
 	}
-	/** Current entries; empty while the variant has no usable credential. */
+	/** Current entries; empty while the variant has no usable credential, excluding disabled models. */
 	current() {
+		if (!this.visible) return [];
+		return this.all().filter((model) => !this.disabledModels.has(model.id));
+	}
+	/** All configured entries including disabled ones; empty while the variant has no usable credential. */
+	all() {
 		if (!this.visible) return [];
 		return this.models.map((model) => {
 			const override = this.modelContextWindows[model.id];
@@ -557,6 +564,20 @@ var QoderCatalog = class {
 		return true;
 	}
 	/**
+	* Replace the disabled model IDs wholesale. Returns whether the set
+	* changed, so the caller can skip an invalidation over an identical write.
+	*/
+	setDisabledModels(disabledModels) {
+		const next = new Set(disabledModels);
+		if (next.size === this.disabledModels.size && [...next].every((id) => this.disabledModels.has(id))) return false;
+		this.disabledModels = next;
+		return true;
+	}
+	/** Current disabled model IDs. */
+	getDisabledModels() {
+		return Array.from(this.disabledModels);
+	}
+	/**
 	* Models to fall back to when the upstream fetch fails; ignores
 	* visibility, because the caller asking for the fallback already knows the
 	* credential state.
@@ -876,6 +897,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
 /**
@@ -2359,6 +2388,7 @@ var QoderUsageReader = class {
 		return {
 			userQuota: normalizeQuota(data.userQuota),
 			orgResourcePackage: normalizeQuota(data.orgResourcePackage),
+			addOnQuota: normalizeQuota(data.addOnQuota),
 			totalUsagePercentage: typeof data.totalUsagePercentage === "number" ? data.totalUsagePercentage : void 0,
 			isQuotaExceeded: typeof data.isQuotaExceeded === "boolean" ? data.isQuotaExceeded : false,
 			expiresAt: normalizeExpiresAt(data.expiresAt),
@@ -2408,6 +2438,135 @@ 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,
+			headers: { "cosy-clienttype": "10" },
+			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,
+				"cosy-clienttype": "10"
+			},
+			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.
@@ -3058,6 +3217,7 @@ var DefaultQoderTransport = class {
 	metadataTimeoutMs;
 	auth;
 	usage;
+	checkInService;
 	modelFlights = new SingleFlight();
 	attachments;
 	imageUploader;
@@ -3119,6 +3279,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);
@@ -3184,6 +3351,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();
@@ -3838,6 +4009,13 @@ var QoderUpstreamClient = class {
 			size: org.total,
 			...usage.expiresAt === void 0 ? {} : { packageEndTime: usage.expiresAt }
 		});
+		const addOn = usage.addOnQuota;
+		if (addOn !== void 0) accounts.push({
+			packageName: "赠送额度",
+			remain: addOn.remaining,
+			size: addOn.total,
+			...usage.expiresAt === void 0 ? {} : { packageEndTime: usage.expiresAt }
+		});
 		const unlimited = usage.isQuotaExceeded === false && personal !== void 0 && personal.total === 0;
 		return {
 			total: usage.totalUsagePercentage ?? personal?.percentage ?? 0,
@@ -3848,6 +4026,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:
@@ -4082,7 +4266,7 @@ const DEFAULT_MAX_TOKENS = 32768;
 const DEFAULT_CONTEXT_WINDOW = 18e4;
 //#endregion
 //#region src/version.ts
-const QODER_CONNECT_VERSION = "0.1.4";
+const QODER_CONNECT_VERSION = "0.1.8";
 //#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.4",
+  "version": "0.1.8",
   "author": "corrinehu",
   "keywords": [
     "dsh-plugin",