Skip to content

Commit cc0e356

Browse files
committed
Feat: 复现了zcode的单一用户标识UUID生成
复现了zcode的单一用户uuid标识,首次运行会自动生成并且储存在config.yaml内
1 parent 3fb4f95 commit cc0e356

13 files changed

Lines changed: 336 additions & 7 deletions

File tree

‎Android-APP/app/src/main/assets/server_bundle/config.example.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ identity:
6464
sourceTitle: "cli"
6565
# HTTP-Referer URL. Default "https://zcode.z.ai".
6666
refererOrigin: "https://zcode.z.ai"
67+
# Device identity (X-Device-Mid) — random UUIDv4, generated ONCE and reused
68+
# forever (mirrors ZCode's telemetry deviceMid; no hardware values involved).
69+
# Auto-generated into this file at first `auth login` or config creation.
70+
# Leave empty on Android — the app injects ZCODE_IDENTITY_DEVICE_MID instead.
71+
deviceMid: ""
6772

6873
# Local client-session inference for cache-affinity experiments.
6974
# "observe" (default) logs inferred sessions in debug mode but does not change

‎Android-APP/app/src/main/assets/server_bundle/server.cjs‎

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34616,6 +34616,7 @@ ${captureLines}` : capture.stack;
3461634616
var index_exports = {};
3461734617
__export(index_exports, {
3461834618
applyAndroidIdentityDefaults: () => applyAndroidIdentityDefaults,
34619+
ensureDeviceMidInConfig: () => ensureDeviceMidInConfig,
3461934620
main: () => main,
3462034621
parseServeArgs: () => parseServeArgs
3462134622
});
@@ -34705,7 +34706,8 @@ function loadConfig(path) {
3470534706
sourceTitleEnv: process.env[ENV.SOURCE_TITLE],
3470634707
sourceTitleYaml: parsed?.identity?.sourceTitle,
3470734708
refererEnv: process.env[ENV.REFERER_ORIGIN],
34708-
refererYaml: parsed?.identity?.refererOrigin
34709+
refererYaml: parsed?.identity?.refererOrigin,
34710+
deviceMidYaml: parsed?.identity?.deviceMid
3470934711
});
3471034712
const clientIdentity = resolveClientIdentity(parsed?.clientIdentity);
3471134713
const responses = resolveResponsesConfig(parsed?.responses);
@@ -34859,7 +34861,8 @@ function resolveIdentity(inp) {
3485934861
const appVersion = ASCII_PRINTABLE.test(rawVersion) ? rawVersion : DEFAULTS.APP_VERSION;
3486034862
const sourceTitle = (inp.sourceTitleEnv ?? inp.sourceTitleYaml ?? DEFAULTS.SOURCE_TITLE).trim() || DEFAULTS.SOURCE_TITLE;
3486134863
const refererOrigin = (inp.refererEnv ?? inp.refererYaml ?? DEFAULTS.REFERER_ORIGIN).trim() || DEFAULTS.REFERER_ORIGIN;
34862-
return { appVersion, sourceTitle, refererOrigin };
34864+
const deviceMid = typeof inp.deviceMidYaml === "string" ? inp.deviceMidYaml.trim() : "";
34865+
return { appVersion, sourceTitle, refererOrigin, ...deviceMid ? { deviceMid } : {} };
3486334866
}
3486434867
function validate(config) {
3486534868
if (config.server.port < 1 || config.server.port > 65535) {
@@ -34946,6 +34949,11 @@ identity:
3494634949
sourceTitle: "cli"
3494734950
# HTTP-Referer URL. Default "https://zcode.z.ai".
3494834951
refererOrigin: "https://zcode.z.ai"
34952+
# Device identity (X-Device-Mid) \u2014 random UUIDv4, generated ONCE and reused
34953+
# forever (mirrors ZCode's telemetry deviceMid; no hardware values involved).
34954+
# Auto-generated into this file at first \`auth login\` or config creation.
34955+
# Leave empty on Android \u2014 the app injects ZCODE_IDENTITY_DEVICE_MID instead.
34956+
deviceMid: ""
3494934957

3495034958
# Local client-session inference for cache-affinity experiments.
3495134959
# "observe" (default) logs inferred sessions in debug mode but does not change
@@ -36525,7 +36533,7 @@ function buildIdentityHeaders(id) {
3652536533
const releaseChannel = normalizePrintableHeaderValue(process.env.ZCODE_IDENTITY_RELEASE_CHANNEL);
3652636534
const clientLanguage = resolveClientLanguage();
3652736535
const clientTimezone = resolveClientTimezone();
36528-
const deviceMid = normalizePrintableHeaderValue(process.env.ZCODE_IDENTITY_DEVICE_MID);
36536+
const deviceMid = normalizePrintableHeaderValue(process.env.ZCODE_IDENTITY_DEVICE_MID) ?? normalizePrintableHeaderValue(id.deviceMid);
3652936537
const headers = {
3653036538
"HTTP-Referer": id.refererOrigin,
3653136539
"User-Agent": `ZCode/${n ?? "unknown"}`,
@@ -41992,6 +42000,7 @@ var import_node_child_process = require("node:child_process");
4199242000
var import_node_fs4 = require("node:fs");
4199342001
var import_node_path2 = require("node:path");
4199442002
var import_node_os3 = require("node:os");
42003+
var import_node_crypto3 = require("node:crypto");
4199542004

4199642005
// src/runtime/node-fetch-compat.ts
4199742006
var applied = false;
@@ -42075,6 +42084,7 @@ async function serve(configPath, debug) {
4207542084
const path = configPath ?? process.env.ZCODE_PROXY_CONFIG ?? "config.yaml";
4207642085
if (!(0, import_node_fs4.existsSync)(path)) {
4207742086
(0, import_node_fs4.writeFileSync)(path, EXAMPLE_CONFIG_YAML, "utf-8");
42087+
ensureDeviceMidInConfig(path);
4207842088
console.log(`Created ${path} from bundled template.`);
4207942089
console.log(`Edit auth.apiKey, or run: zcode-proxy auth login <zai|bigmodel>
4208042090
`);
@@ -42267,6 +42277,7 @@ async function authLogin(args) {
4226742277
console.error("Usage: zcode-proxy auth login <zai|bigmodel> [--import]");
4226842278
process.exit(1);
4226942279
}
42280+
ensureConfigWithDeviceMid();
4227042281
console.log(`Logging in: ${provider}${importMode ? " (import)" : " (OAuth)"}
4227142282
`);
4227242283
let cred;
@@ -42286,6 +42297,40 @@ Logged in as ${provider}.`);
4228642297
if (cred.userId) console.log(` User ID: ${cred.userId}`);
4228742298
console.log(` Stored: ${getStorePath()}`);
4228842299
}
42300+
function ensureConfigWithDeviceMid() {
42301+
const path = process.env.ZCODE_PROXY_CONFIG ?? "config.yaml";
42302+
if (!(0, import_node_fs4.existsSync)(path)) {
42303+
(0, import_node_fs4.writeFileSync)(path, EXAMPLE_CONFIG_YAML, "utf-8");
42304+
console.log(`Created ${path} from bundled template.`);
42305+
}
42306+
return ensureDeviceMidInConfig(path);
42307+
}
42308+
function ensureDeviceMidInConfig(path) {
42309+
const deviceMidLine = /^(\s*)deviceMid:\s*(.*)$/m;
42310+
const identityBlockLine = /^identity:\s*$/m;
42311+
const raw = (0, import_node_fs4.readFileSync)(path, "utf-8");
42312+
const existing = deviceMidLine.exec(raw);
42313+
if (existing) {
42314+
const value = existing[2].trim().replace(/^"|"$/g, "");
42315+
if (value.length > 0) return value;
42316+
}
42317+
const mid = (0, import_node_crypto3.randomUUID)();
42318+
let updated;
42319+
if (existing) {
42320+
updated = raw.replace(deviceMidLine, `${existing[1]}deviceMid: "${mid}"`);
42321+
} else if (identityBlockLine.test(raw)) {
42322+
updated = raw.replace(identityBlockLine, `identity:
42323+
deviceMid: "${mid}"`);
42324+
} else {
42325+
const block = `identity:
42326+
deviceMid: "${mid}"
42327+
`;
42328+
updated = raw.endsWith("\n") || raw.length === 0 ? raw + block : raw + "\n" + block;
42329+
}
42330+
(0, import_node_fs4.writeFileSync)(path, updated, "utf-8");
42331+
console.log(`Device identity generated: ${mid.slice(0, 8)}\u2026 (stored in ${path})`);
42332+
return mid;
42333+
}
4228942334
function authLogout() {
4229042335
if (!(0, import_node_fs4.existsSync)(getStorePath())) {
4229142336
console.log("Not logged in.");
@@ -42371,6 +42416,7 @@ function openBrowser(url) {
4237142416
// Annotate the CommonJS export names for ESM import in node:
4237242417
0 && (module.exports = {
4237342418
applyAndroidIdentityDefaults,
42419+
ensureDeviceMidInConfig,
4237442420
main,
4237542421
parseServeArgs
4237642422
});

‎Android-APP/app/src/main/java/com/zcode/proxy/NodeRunner.kt‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ class NodeRunner(private val context: Context) {
5959
}
6060

6161
val credentialSeed = CredentialStore.getOrCreateSeed(context)
62+
val deviceMid = ensureDeviceMid()
6263

6364
val pb = ProcessBuilder(
6465
libnode.absolutePath,
@@ -76,7 +77,8 @@ class NodeRunner(private val context: Context) {
7677
environment()["ZCODE_PROXY_CREDENTIAL_SECRET"] = credentialSeed
7778
environment()["ZCODE_IDENTITY_PLATFORM"] = "linux"
7879
environment()["ZCODE_IDENTITY_ARCH"] = "x64"
79-
environment()["ZCODE_IDENTITY_RELEASE"] = "6.8.0"
80+
environment()["ZCODE_IDENTITY_RELEASE"] = "6.8.0-49-generic"
81+
environment()["ZCODE_IDENTITY_DEVICE_MID"] = deviceMid
8082
environment()["ZCODE_PROXY_CONFIG"] = config.absolutePath
8183
environment()["ZCODE_LOG_FORMAT"] = "compact"
8284
}
@@ -132,6 +134,23 @@ class NodeRunner(private val context: Context) {
132134
false
133135
}
134136

137+
/**
138+
* Stable per-install device identity (X-Device-Mid): random UUIDv4 created
139+
* once in the app-private dir and reused forever — mirrors ZCode's
140+
* telemetry deviceMid. Never regenerated while the file exists (fingerprint
141+
* stability is required by upstream risk engines).
142+
*/
143+
private fun ensureDeviceMid(): String {
144+
val f = File(context.filesDir, "device_mid.txt")
145+
if (f.exists()) {
146+
val cached = f.readText().trim()
147+
if (cached.isNotEmpty()) return cached
148+
}
149+
val mid = java.util.UUID.randomUUID().toString()
150+
f.writeText(mid)
151+
return mid
152+
}
153+
135154
companion object {
136155
private const val TAG = "NodeRunner"
137156
private const val LOG_CAPACITY = 500

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ multi-session autosave (localStorage). Open Settings (⚙) to configure.
192192
| `plan` | — | `coding-plan` | Plan tier: `coding-plan` (direct upstream) or `start-plan` (zcode.z.ai gateway + JWT + captcha) |
193193
| `providers.<p>.credential` | — | — | Per-provider credential override (else uses `auth.apiKey`) |
194194
| `identity.appVersion` | `ZCODE_APP_VERSION` | `3.7.7` | `User-Agent: ZCode/{version}` |
195+
| `identity.deviceMid` | `ZCODE_IDENTITY_DEVICE_MID` | auto-generated | Device identity (`X-Device-Mid`); UUIDv4 generated once at first `auth login` / config creation and reused forever |
195196
| `identity.sourceTitle` | `ZCODE_SOURCE_TITLE` | `cli` | `X-Title: Z Code@{title}` |
196197
| `identity.refererOrigin` | `ZCODE_REFERER_ORIGIN` | `https://zcode.z.ai` | `HTTP-Referer` URL |
197198
| config file path | `ZCODE_PROXY_CONFIG` | `config.yaml` | Config file to load on `serve` |

‎config.example.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ identity:
6464
sourceTitle: "cli"
6565
# HTTP-Referer URL. Default "https://zcode.z.ai".
6666
refererOrigin: "https://zcode.z.ai"
67+
# Device identity (X-Device-Mid) — random UUIDv4, generated ONCE and reused
68+
# forever (mirrors ZCode's telemetry deviceMid; no hardware values involved).
69+
# Auto-generated into this file at first `auth login` or config creation.
70+
# Leave empty on Android — the app injects ZCODE_IDENTITY_DEVICE_MID instead.
71+
deviceMid: ""
6772

6873
# Local client-session inference for cache-affinity experiments.
6974
# "observe" (default) logs inferred sessions in debug mode but does not change

‎src/config/loader.test.ts‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,67 @@ afterEach(() => {
3434
rmSync(TMP, { recursive: true, force: true });
3535
});
3636

37+
describe("identity.deviceMid", () => {
38+
it("loads identity.deviceMid from YAML", () => {
39+
const path = writeYaml(`
40+
server:
41+
port: 9090
42+
host: "127.0.0.1"
43+
auth:
44+
mode: apikey
45+
apiKey: "testkey.testsecret"
46+
provider: zai
47+
identity:
48+
appVersion: "3.7.7"
49+
deviceMid: "0f1e2d3c-4b5a-4978-8796-a5b4c3d2e1f0"
50+
`);
51+
const cfg = loadConfig(path);
52+
expect(cfg.identity.deviceMid).toBe("0f1e2d3c-4b5a-4978-8796-a5b4c3d2e1f0");
53+
});
54+
55+
it("leaves identity.deviceMid undefined when the key is absent or empty", () => {
56+
const path = writeYaml(`
57+
server:
58+
port: 9090
59+
host: "127.0.0.1"
60+
auth:
61+
mode: apikey
62+
apiKey: "testkey.testsecret"
63+
provider: zai
64+
identity:
65+
appVersion: "3.7.7"
66+
deviceMid: ""
67+
`);
68+
expect(loadConfig(path).identity.deviceMid).toBeUndefined();
69+
70+
const path2 = writeYaml(`
71+
server:
72+
port: 9090
73+
auth:
74+
mode: apikey
75+
apiKey: "k"
76+
provider: zai
77+
identity:
78+
appVersion: "3.7.7"
79+
`);
80+
expect(loadConfig(path2).identity.deviceMid).toBeUndefined();
81+
});
82+
83+
it("trims whitespace around identity.deviceMid", () => {
84+
const path = writeYaml(`
85+
server:
86+
port: 9090
87+
auth:
88+
mode: apikey
89+
apiKey: "testkey.testsecret"
90+
provider: zai
91+
identity:
92+
deviceMid: " 0f1e2d3c-4b5a-4978-8796-a5b4c3d2e1f0 "
93+
`);
94+
expect(loadConfig(path).identity.deviceMid).toBe("0f1e2d3c-4b5a-4978-8796-a5b4c3d2e1f0");
95+
});
96+
});
97+
3798
describe("loadConfig", () => {
3899
it("loads a valid YAML config with all fields", () => {
39100
const path = writeYaml(`

‎src/config/loader.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ export function loadConfig(path: string): ProxyConfig {
112112
sourceTitleYaml: parsed?.identity?.sourceTitle,
113113
refererEnv: process.env[ENV.REFERER_ORIGIN],
114114
refererYaml: parsed?.identity?.refererOrigin,
115+
deviceMidYaml: parsed?.identity?.deviceMid,
115116
});
116117

117118
const clientIdentity = resolveClientIdentity(parsed?.clientIdentity);
@@ -292,6 +293,7 @@ interface IdentityInputs {
292293
sourceTitleYaml?: string;
293294
refererEnv?: string;
294295
refererYaml?: string;
296+
deviceMidYaml?: string;
295297
}
296298

297299
/** Resolve identity fields (env > YAML > default). Non-ASCII `appVersion` silently falls back to the default. */
@@ -305,7 +307,8 @@ function resolveIdentity(inp: IdentityInputs): ProxyIdentity {
305307
const refererOrigin = (inp.refererEnv ?? inp.refererYaml ?? DEFAULTS.REFERER_ORIGIN).trim()
306308
|| DEFAULTS.REFERER_ORIGIN;
307309

308-
return { appVersion, sourceTitle, refererOrigin };
310+
const deviceMid = typeof inp.deviceMidYaml === "string" ? inp.deviceMidYaml.trim() : "";
311+
return { appVersion, sourceTitle, refererOrigin, ...(deviceMid ? { deviceMid } : {}) };
309312
}
310313

311314
/** Cross-field validation after all fields are resolved. */

‎src/config/template.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ identity:
7373
sourceTitle: "cli"
7474
# HTTP-Referer URL. Default "https://zcode.z.ai".
7575
refererOrigin: "https://zcode.z.ai"
76+
# Device identity (X-Device-Mid) — random UUIDv4, generated ONCE and reused
77+
# forever (mirrors ZCode's telemetry deviceMid; no hardware values involved).
78+
# Auto-generated into this file at first \`auth login\` or config creation.
79+
# Leave empty on Android — the app injects ZCODE_IDENTITY_DEVICE_MID instead.
80+
deviceMid: ""
7681
7782
# Local client-session inference for cache-affinity experiments.
7883
# "observe" (default) logs inferred sessions in debug mode but does not change

‎src/config/types.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ export interface ProxyIdentity {
4242
appVersion: string;
4343
sourceTitle: string;
4444
refererOrigin: string;
45+
/**
46+
* Device identity for `X-Device-Mid` (mirrors ZCode's telemetry deviceMid:
47+
* a random UUIDv4 generated ONCE and reused forever — no hardware values).
48+
* Empty/undefined omits the header. Desktop: persisted in config.yaml
49+
* (`ensureDeviceMidInConfig`). Android: injected via the
50+
* `ZCODE_IDENTITY_DEVICE_MID` env var (NodeRunner, app-private file) — env
51+
* wins over YAML. Must stay stable per anti-pattern #13; never randomize
52+
* per-request.
53+
*/
54+
deviceMid?: string;
4555
}
4656

4757
/** Local client-session inference mode for upstream session affinity. */

0 commit comments

Comments
 (0)