dsh-codearts 1.1.1 → 1.1.4

package/lib/rolldown-runtime-B4iAMlE-.mjs

@@ -0,0 +1,35 @@
+import { createRequire } from "node:module";
+//#region \0rolldown/runtime.js
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
+var __exportAll = (all, no_symbols) => {
+	let target = {};
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
+	return target;
+};
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
+//#endregion
+export { __toESM as i, __exportAll as n, __require as r, __commonJSMin as t };

package/lib/{usage-zgF0QuQ4.mjs → usage-B0NfG8vZ.mjs}

@@ -1,21 +1,10 @@
+import { n as __exportAll } from "./rolldown-runtime-B4iAMlE-.mjs";
 import { createHash, createHmac, createPrivateKey, createSign, generateKeyPairSync, randomBytes } from "node:crypto";
 import { chmod, mkdir, readFile, rename, unlink, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import http from "node:http";
 import { existsSync } from "node:fs";
-//#region \0rolldown/runtime.js
-var __defProp = Object.defineProperty;
-var __exportAll = (all, no_symbols) => {
-	let target = {};
-	for (var name in all) __defProp(target, name, {
-		get: all[name],
-		enumerable: true
-	});
-	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
-	return target;
-};
-//#endregion
 //#region src/dpop.ts
 /**
 * DPoP（RFC 9449）证明 JWT：ES256 + P-256，供 oauth2/tokens 请求头使用。
@@ -1246,6 +1235,7 @@ var upstream_exports = /* @__PURE__ */ __exportAll({
 	isConcurrencyCap: () => isConcurrencyCap,
 	isParamInvalidFrame: () => isParamInvalidFrame,
 	isQueueableRate: () => isQueueableRate,
+	isResignRefusal: () => isResignRefusal,
 	isTpmLimit: () => isTpmLimit,
 	isWelfareClaimedStatus: () => isWelfareClaimedStatus,
 	maxTokensCeilingFor: () => maxTokensCeilingFor,
@@ -1596,6 +1586,7 @@ function rateLimitFrame(text) {
 * 让人以为是自己配错了。默认分支仍保留原始信息，便于排查。
 */
 function upstreamErrorMessage(message, status = 0) {
+	if (isResignRefusal(message)) return "本地代理 billion-context 拦下了这条签名请求（它拿不到 CodeArts 凭据做重签，在本地直接拒了），不是你的账号问题：请在 ~/.config/billion-context/billion-context.json 加上 \"resign\": { \"sdk-hmac-sha256\": { \"passthrough\": true } } 后重启 DSH，或为它配置重签凭据。";
 	if (MODEL_RATE_CODE.test(message) || MODEL_RATE_TEXT.test(message)) return "华为侧该模型当前请求过多（共享 TPM 超限），不是你的账号或插件问题。稍后重试，或临时改用 GLM-5.2 / GLM-5.3。";
 	if (message.includes("TM.00001041")) return "CodeArts 免费档同时只允许 3 个会话，当前槽位一直占满（被打断的会话约 1 分钟才释放）。请稍后重试。";
 	if (isBenefitMissing("", message)) return "这个模型属于限时福利，当前福利通道不可用（不是账号问题）。可以刷新模型列表，改用非福利模型。";
@@ -1614,8 +1605,18 @@ const BENEFIT_MISSING_CODE = "InferHub.4004.200";
 function isBenefitMissing(code, message) {
 	return code === "InferHub.4004.200" || message.toLowerCase().includes("benefit not found");
 }
+/**
+* 本地代理「拒签」标记：billion-context 这类宿主层代理拦截出站请求做上下文压缩，
+* 碰到 SDK-HMAC-SHA256 签名请求要用 CodeArts 凭据重签；找不到凭据时在**本地**回
+* 403（根本没出网），body 里带这两个标记。这不是凭据失效 —— 归 session_dead 会把
+* 账号永久禁用（见 issue #1）。
+*/
+function isResignRefusal(message) {
+	return message.includes("signed_request_requires_resign") || message.includes("bili_resign_unavailable");
+}
 function classify(status, message) {
 	const m = message.toLowerCase();
+	if (isResignRefusal(message)) return "client";
 	if (status === 401 || status === 403) return "session_dead";
 	if (status === 402) return "hard_credit";
 	if (status === 429) return "soft_rate";
@@ -1625,6 +1626,34 @@ function classify(status, message) {
 	if (m.includes("tpm") || m.includes("并发")) return "soft_rate";
 	return "client";
 }
+/**
+* 出网唯一入口：**只把 URL 字符串和普通 init 交给 fetch，绝不把 Request 对象交出去**。
+*
+* 邻居插件会换掉 `globalThis.fetch`（例如 IP 池出口路由直接把 undici 模块自带的
+* fetch 装成全局）。这时 `globalThis.Request` 还是另一份实例，而 undici 的 fetch
+* 用 `instanceof` 认自己的 Request：不是自己那份就当 URL 字符串处理，报
+* `Failed to parse URL from [object Request]`，而且是 HTTP 0（根本没出网）。
+* 所以 Request 只当签名的载体（signer 要读写它的头部），发出去时拆回纯数据。
+*
+* 头部按 forEach 展开会全部变成小写名 —— 签名侧本来也按小写规范化，HTTP 头大小写
+* 不敏感，上游不受影响。
+*
+* @param req 已签好名的请求
+* @param body 原始请求体；GET/DELETE 传 undefined（带空 body 的 GET 会被 fetch 直接拒）
+* @param signal 中止信号
+*/
+async function dispatch(req, body, signal) {
+	const headers = {};
+	req.headers.forEach((value, key) => {
+		headers[key] = value;
+	});
+	return fetch(req.url, {
+		method: req.method,
+		headers,
+		...body === void 0 ? {} : { body },
+		...signal === void 0 ? {} : { signal }
+	});
+}
 const enc = new TextEncoder();
 function openAIData(obj) {
 	return enc.encode(`data: ${JSON.stringify(obj)}\n\n`);
@@ -1672,7 +1701,7 @@ async function chatStream(credential, prepared, signal) {
 	}
 	let resp;
 	try {
-		resp = await fetch(req, { signal });
+		resp = await dispatch(req, bodyBuf, signal);
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		if (signal?.aborted === true) return {
@@ -1855,7 +1884,7 @@ async function signedGet(url, credential, agentType, signal) {
 	});
 	let resp;
 	try {
-		resp = await fetch(req, { signal });
+		resp = await dispatch(req, void 0, signal);
 	} catch (error) {
 		return {
 			ok: false,
@@ -2044,7 +2073,7 @@ async function fetchThinkingVariants(credential, modelIds, signal) {
 		secretAccessKey: credential.secretAccessKey,
 		securityToken: credential.securityToken
 	});
-	const resp = await fetch(req, { signal });
+	const resp = await dispatch(req, bodyBuf, signal);
 	if (!resp.ok) {
 		const text = await resp.text().catch(() => "");
 		throw new Error(`thinking-variants HTTP ${resp.status} ${text.slice(0, 200)}`);
@@ -2090,7 +2119,7 @@ async function fetchQueueStatus(credential, chatId, model, signal) {
 		secretAccessKey: credential.secretAccessKey,
 		securityToken: credential.securityToken
 	});
-	const resp = await fetch(req, { signal });
+	const resp = await dispatch(req, void 0, signal);
 	if (!resp.ok) {
 		const text = await resp.text().catch(() => "");
 		throw new Error(`queue status HTTP ${resp.status} ${text.slice(0, 200)}`);
@@ -2128,7 +2157,7 @@ async function clearQueueStatus(credential, chatId, model, signal) {
 		secretAccessKey: credential.secretAccessKey,
 		securityToken: credential.securityToken
 	});
-	const resp = await fetch(req, { signal });
+	const resp = await dispatch(req, void 0, signal);
 	if (!resp.ok) {
 		const text = await resp.text().catch(() => "");
 		throw new Error(`queue clear HTTP ${resp.status} ${text.slice(0, 200)}`);
@@ -2238,7 +2267,7 @@ async function claimBenefit(credential, abort) {
 		secretAccessKey: credential.secretAccessKey,
 		securityToken: credential.securityToken
 	});
-	const resp = await fetch(req, { signal: abort });
+	const resp = await dispatch(req, bodyBuf, abort);
 	const raw = await resp.text().catch(() => "");
 	if (!resp.ok) throw new Error(`claim benefit failed: ${resp.status} ${raw.slice(0, 200)}`);
 	let json;
@@ -2310,7 +2339,7 @@ async function welfareRequest(url, method, credential, body, signal) {
 	});
 	let resp;
 	try {
-		resp = await fetch(req, { signal });
+		resp = await dispatch(req, body === void 0 ? void 0 : bodyBuf, signal);
 	} catch (error) {
 		return {
 			ok: false,
@@ -2740,4 +2769,4 @@ function sumOf(store) {
 	return out;
 }
 //#endregion
-export { filterEnabledModels as A, rateLimitFrame as C, FALLBACK_CODEARTS_MODELS as D, CodeArtsCatalog as E, codeartsAccountsPath as F, codeartsAuthPath as I, startLogin as L, isBenefitModel as M, CodeArtsAccountStore as N, clearBenefitBlocked as O, CodeArtsCredentialStore as P, prepareChatBody as S, upstreamErrorMessage as T, isQueueableRate as _, SNAP_HOST as a, maxTokensCeilingFor as b, claimDailyWelfare as c, fetchCallerIdentity as d, fetchModels as f, isParamInvalidFrame as g, isConcurrencyCap as h, refreshCatalog as i, isBenefitBlocked as j, creditRatioLabel as k, clearQueueStatus as l, fetchWelfareCampaigns as m, codeartsUsagePath as n, canonicalModel as o, fetchQueueStatus as p, discoverModels as r, chatStream as s, CodeArtsUsageTracker as t, degradeTokenCeiling as u, isTpmLimit as v, signedGet as w, pickDailyWelfareCampaign as x, isWelfareClaimedStatus as y };
+export { filterEnabledModels as A, rateLimitFrame as C, FALLBACK_CODEARTS_MODELS as D, CodeArtsCatalog as E, MANUAL_ACCOUNT_ID as F, codeartsAccountsPath as I, codeartsAuthPath as L, isBenefitModel as M, CodeArtsAccountStore as N, clearBenefitBlocked as O, CodeArtsCredentialStore as P, startLogin as R, prepareChatBody as S, upstreamErrorMessage as T, isQueueableRate as _, SNAP_HOST as a, maxTokensCeilingFor as b, claimDailyWelfare as c, fetchCallerIdentity as d, fetchModels as f, isParamInvalidFrame as g, isConcurrencyCap as h, refreshCatalog as i, isBenefitBlocked as j, creditRatioLabel as k, clearQueueStatus as l, fetchWelfareCampaigns as m, codeartsUsagePath as n, canonicalModel as o, fetchQueueStatus as p, discoverModels as r, chatStream as s, CodeArtsUsageTracker as t, degradeTokenCeiling as u, isTpmLimit as v, signedGet as w, pickDailyWelfareCampaign as x, isWelfareClaimedStatus as y };

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-codearts",
   "displayName": "DSH CodeArts Connect",
   "description": "把华为云 CodeArts 接入 DeepSeek Harness —— 内置 OAuth2 登录（PKCE + DPoP），登录后即可在 DSH 对话窗口使用 CodeArts 的模型。",
-  "version": "1.1.1",
+  "version": "1.1.4",
   "packageManager": "pnpm@11.24.0",
   "author": "elegant01",
   "keywords": [
@@ -92,7 +92,6 @@
     "@deepseek-ai/dsh-llm-pi-ai": ">=0.1.2-rc.1 <0.3.0-0",
     "@deepseek-ai/dsh-settings": ">=0.1.2-rc.1 <0.3.0-0",
     "@deepseek-ai/schemastery": "^3.18.2",
-    "@earendil-works/pi-ai": ">=0.84.2 <2.0.0",
     "react": "^18.2.0"
   },
   "devDependencies": {