cfpilot 0.12.1 → 0.12.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cli.js CHANGED
@@ -87,7 +87,7 @@ var VERSION, NAME;
87
87
  var init_version = __esm({
88
88
  "src/shared/version.ts"() {
89
89
  "use strict";
90
- VERSION = "0.12.1";
90
+ VERSION = "0.12.4";
91
91
  NAME = "cfpilot";
92
92
  }
93
93
  });
@@ -877,6 +877,31 @@ var init_cf_api = __esm({
877
877
  `/accounts/${encodeURIComponent(accountId)}/workers/domains/${encodeURIComponent(domainId)}`
878
878
  );
879
879
  }
880
+ /**
881
+ * 列出账号下全部 Worker 自定义域名绑定。
882
+ *
883
+ * 换部署形态(Pages ↔ Workers)时靠它找出旧数据面占用的域名,
884
+ * 否则迁移时只能依赖清单里的 `dataCustomDomain`(清单缺失就会漏)。
885
+ */
886
+ async listWorkerDomains(accountId) {
887
+ const result = await this.request(
888
+ "GET",
889
+ `/accounts/${encodeURIComponent(accountId)}/workers/domains`
890
+ );
891
+ return Array.isArray(result) ? result : [];
892
+ }
893
+ /**
894
+ * 删除 Worker 脚本。
895
+ *
896
+ * 换形态到 Pages 之后用它清理旧数据面 —— 只删**自己**创建的那个脚本名,
897
+ * 绝不按前缀批量删。
898
+ */
899
+ async deleteScript(accountId, scriptName) {
900
+ await this.request(
901
+ "DELETE",
902
+ `/accounts/${encodeURIComponent(accountId)}/workers/scripts/${encodeURIComponent(scriptName)}`
903
+ );
904
+ }
880
905
  /** 解除 Worker 自定义域名绑定(降级到 Route + CNAME 前清理用) */
881
906
  async deleteWorkerDomain(accountId, domainId) {
882
907
  await this.request(
@@ -1316,6 +1341,7 @@ async function checkTokenPermissions(options) {
1316
1341
  kvProbe
1317
1342
  )
1318
1343
  );
1344
+ const expectWorkers = options.expectWorkers ?? false;
1319
1345
  const scriptsProbe = await probePermission(async () => {
1320
1346
  const scripts = await client.listScripts(account.id);
1321
1347
  return `\u5171 ${scripts.length} \u4E2A\u811A\u672C`;
@@ -1323,12 +1349,25 @@ async function checkTokenPermissions(options) {
1323
1349
  rows.push(
1324
1350
  makeRow(
1325
1351
  "Workers \u811A\u672C",
1326
- false,
1327
- "\u4E0D\u5F71\u54CD Pages \u90E8\u7F72\uFF08\u5185\u6838\u8D70 Pages \u90E8\u7F72\u63A5\u53E3\u4E0A\u4F20\uFF0C\u4E0D\u7ECF\u8FC7 Workers \u811A\u672C API\uFF09",
1328
- "\u4EC5\u5F53\u4F60\u8981\u7528\u5F52\u6863\u7684\u5355\u9879\u76EE Workers \u5F62\u6001\u65F6\u624D\u9700\u8981",
1352
+ expectWorkers,
1353
+ expectWorkers ? "Workers \u6570\u636E\u9762\u65E0\u6CD5\u4E0A\u4F20\u811A\u672C\uFF0C\u90E8\u7F72\u4F1A\u5728\u7B2C\u4E00\u6B65\u4E2D\u65AD" : "\u4E0D\u5F71\u54CD Pages \u90E8\u7F72\uFF08\u5185\u6838\u8D70 Pages \u90E8\u7F72\u63A5\u53E3\u4E0A\u4F20\uFF0C\u4E0D\u7ECF\u8FC7 Workers \u811A\u672C API\uFF09",
1354
+ "Token \u4E2D\u6DFB\u52A0 Account / Workers Scripts / Edit\uFF08\u4EC5 Workers \u6570\u636E\u9762\u9700\u8981\uFF09",
1329
1355
  scriptsProbe
1330
1356
  )
1331
1357
  );
1358
+ const workerDomainsProbe = await probePermission(async () => {
1359
+ const domains = await client.listWorkerDomains(account.id);
1360
+ return `\u5171 ${domains.length} \u4E2A\u81EA\u5B9A\u4E49\u57DF\u540D\u7ED1\u5B9A`;
1361
+ });
1362
+ rows.push(
1363
+ makeRow(
1364
+ "Workers \u81EA\u5B9A\u4E49\u57DF\u540D",
1365
+ expectWorkers && expectCustomDomain,
1366
+ expectWorkers && expectCustomDomain ? "Workers \u6570\u636E\u9762\u7ED1\u4E0D\u4E0A\u57DF\u540D \u2192 \u53EA\u80FD\u9000\u5230 *.workers.dev\uFF08\u76F4\u8FDE\u4E0D\u53EF\u8BBF\u95EE\uFF0C\u8282\u70B9\u5168\u90E8\u8FDE\u4E0D\u4E0A\uFF09" : "\u4E0D\u5F71\u54CD Pages \u90E8\u7F72\uFF08Pages \u7528 Pages \u81EA\u5DF1\u7684\u57DF\u540D\u7ED1\u5B9A\u63A5\u53E3\uFF09",
1367
+ "Token \u4E2D\u6DFB\u52A0 Account / Workers Routes / Edit\uFF08\u4EC5 Workers \u6570\u636E\u9762 + \u81EA\u5B9A\u4E49\u57DF\u540D\u9700\u8981\uFF09",
1368
+ workerDomainsProbe
1369
+ )
1370
+ );
1332
1371
  const subdomainProbe = await probePermission(async () => {
1333
1372
  const subdomain = await client.getWorkersSubdomain(account.id);
1334
1373
  return subdomain ? `\u5B50\u57DF\uFF1A${subdomain}` : "\u8D26\u53F7\u5C1A\u672A\u6CE8\u518C workers.dev \u5B50\u57DF";
@@ -1338,7 +1377,7 @@ async function checkTokenPermissions(options) {
1338
1377
  "workers.dev \u5B50\u57DF\u8BFB\u53D6",
1339
1378
  false,
1340
1379
  "\u4E0D\u5F71\u54CD Pages \u90E8\u7F72\uFF08Pages \u9879\u76EE\u7528\u81EA\u5DF1\u7684 *.pages.dev \u57DF\u540D\uFF09",
1341
- "\u4EC5\u5F53\u4F60\u8981\u7528\u5F52\u6863\u7684\u5355\u9879\u76EE Workers \u5F62\u6001\u65F6\u624D\u9700\u8981",
1380
+ "Workers \u6A21\u5F0F\u6CA1\u914D\u81EA\u5B9A\u4E49\u57DF\u540D\uFF08\u56DE\u843D\u5230 *.workers.dev\uFF09\u65F6\u624D\u9700\u8981",
1342
1381
  subdomainProbe
1343
1382
  )
1344
1383
  );
@@ -1365,7 +1404,7 @@ async function checkTokenPermissions(options) {
1365
1404
  "workers.dev \u8DEF\u7531\u5F00\u5173",
1366
1405
  false,
1367
1406
  "\u4E0D\u5F71\u54CD Pages \u90E8\u7F72\uFF08Pages \u9879\u76EE\u7528\u81EA\u5DF1\u7684 *.pages.dev \u57DF\u540D\uFF09",
1368
- "\u4EC5\u5F53\u4F60\u8981\u7528\u5F52\u6863\u7684\u5355\u9879\u76EE Workers \u5F62\u6001\u65F6\u624D\u9700\u8981",
1407
+ "Workers \u6A21\u5F0F\u6CA1\u914D\u81EA\u5B9A\u4E49\u57DF\u540D\uFF08\u56DE\u843D\u5230 *.workers.dev\uFF09\u65F6\u624D\u9700\u8981",
1369
1408
  subdomainRouteProbe
1370
1409
  )
1371
1410
  );
@@ -1461,6 +1500,199 @@ var init_token_check = __esm({
1461
1500
  }
1462
1501
  });
1463
1502
 
1503
+ // src/deploy/workers-deploy.ts
1504
+ function isPermissionError(err) {
1505
+ return err instanceof CloudflareError && (err.status === 401 || err.status === 403);
1506
+ }
1507
+ function describeWorkersPermissionError(err, which) {
1508
+ if (!isPermissionError(err)) return null;
1509
+ const perm = WORKERS_PERMISSIONS[which];
1510
+ const detail = err instanceof Error ? err.message : String(err);
1511
+ return `Token \u7F3A\u5C11\u300C${perm.label}\u300D\u6743\u9650\uFF08${detail}\uFF09\u3002
1512
+ \u2192 ${perm.hint}
1513
+ \u2192 Workers \u6A21\u5F0F\u6BD4 Pages \u6A21\u5F0F\u591A\u9700\u8981\u8FD9\u51E0\u9879\u6743\u9650\uFF1B\u4E0D\u60F3\u52A0\u6743\u9650\u5C31\u628A\u6570\u636E\u9762\u90E8\u7F72\u6A21\u5F0F\u6539\u56DE Pages\u3002`;
1514
+ }
1515
+ async function preflightWorkersDataPlane(client, accountId, hostname, log, warnings) {
1516
+ log("\xB7 \u9884\u68C0 Workers \u6570\u636E\u9762\u6240\u9700\u6743\u9650\u2026");
1517
+ try {
1518
+ const scripts = await client.listScripts(accountId);
1519
+ log(` \xB7 Workers \u811A\u672C\u6743\u9650\u6B63\u5E38\uFF08\u8D26\u53F7\u4E0B ${Array.isArray(scripts) ? scripts.length : 0} \u4E2A\u811A\u672C\uFF09`);
1520
+ } catch (err) {
1521
+ const message = describeWorkersPermissionError(err, "scripts");
1522
+ if (message) throw new Error(message);
1523
+ warnings.push(`\u65E0\u6CD5\u8BFB\u53D6 Workers \u811A\u672C\u5217\u8868\uFF1A${err instanceof Error ? err.message : String(err)}`);
1524
+ }
1525
+ try {
1526
+ await client.listWorkerDomains(accountId);
1527
+ log(" \xB7 Workers \u81EA\u5B9A\u4E49\u57DF\u540D\u6743\u9650\u6B63\u5E38");
1528
+ } catch (err) {
1529
+ const message = describeWorkersPermissionError(err, "domains");
1530
+ if (message) throw new Error(message);
1531
+ warnings.push(
1532
+ `\u65E0\u6CD5\u8BFB\u53D6 Workers \u81EA\u5B9A\u4E49\u57DF\u540D\u5217\u8868\uFF1A${err instanceof Error ? err.message : String(err)}`
1533
+ );
1534
+ }
1535
+ if (!hostname) {
1536
+ return { zone: null };
1537
+ }
1538
+ const zone = await resolveZoneForHost(client, hostname);
1539
+ if (!zone) {
1540
+ throw new Error(
1541
+ `\u57DF\u540D ${hostname} \u4E0D\u5728\u672C\u8D26\u53F7\u7684\u4EFB\u4F55 zone \u4E0B\uFF0C\u65E0\u6CD5\u7ED1\u5B9A\u4E3A Worker \u81EA\u5B9A\u4E49\u57DF\u540D\u3002
1542
+ \u2192 Workers \u81EA\u5B9A\u4E49\u57DF\u540D\u4E0D\u652F\u6301\u5916\u90E8 CNAME\uFF0C\u57DF\u540D\u7684 DNS \u5FC5\u987B\u6258\u7BA1\u5728\u8FD9\u4E2A Cloudflare \u8D26\u53F7\u91CC\u3002
1543
+ \u2192 \u6362\u4E00\u4E2A\u672C\u8D26\u53F7\u4E0B\u7684\u57DF\u540D\uFF0C\u6216\u628A\u6570\u636E\u9762\u90E8\u7F72\u6A21\u5F0F\u6539\u56DE Pages\uFF08*.pages.dev \u4E0D\u9700\u8981\u81EA\u6709\u57DF\u540D\uFF09\u3002`
1544
+ );
1545
+ }
1546
+ log(` \xB7 \u57DF\u540D ${hostname} \u5F52\u5C5E zone ${zone.name}`);
1547
+ try {
1548
+ await client.getDnsRecords(zone.id, hostname);
1549
+ log(" \xB7 Zone DNS \u6743\u9650\u6B63\u5E38");
1550
+ } catch (err) {
1551
+ const message = describeWorkersPermissionError(err, "dns");
1552
+ warnings.push(
1553
+ message ?? `\u65E0\u6CD5\u8BFB\u53D6 DNS \u8BB0\u5F55\uFF1A${err instanceof Error ? err.message : String(err)}
1554
+ \u2192 \u82E5\u7ED1\u5B9A\u57DF\u540D\u65F6\u62A5\u6743\u9650\u9519\u8BEF\uFF0C\u8BF7\u8865 Zone / DNS / Edit\u3002`
1555
+ );
1556
+ }
1557
+ return { zone };
1558
+ }
1559
+ async function resolveZoneForHost(client, hostname) {
1560
+ const zones = await client.listZones();
1561
+ const host = hostname.trim().toLowerCase();
1562
+ if (!host) return null;
1563
+ const matches = zones.filter((zone2) => host === zone2.name || host.endsWith(`.${zone2.name}`)).sort((a, b) => b.name.length - a.name.length);
1564
+ const zone = matches[0];
1565
+ return zone ? { id: zone.id, name: zone.name } : null;
1566
+ }
1567
+ async function findWorkerDomain(client, accountId, scriptName) {
1568
+ const domains = await client.listWorkerDomains(accountId);
1569
+ return domains.find((d) => d.service === scriptName) ?? null;
1570
+ }
1571
+ async function uploadWorkerScript(options) {
1572
+ await options.client.uploadScript(options.accountId, options.name, {
1573
+ mainModule: "worker.js",
1574
+ code: options.code,
1575
+ compatibilityDate: WORKERS_COMPAT_DATE,
1576
+ bindings: options.bindings
1577
+ });
1578
+ }
1579
+ async function attachWorkerHostname(client, accountId, hostname, scriptName, zone) {
1580
+ const targetZone = zone ?? await resolveZoneForHost(client, hostname);
1581
+ if (!targetZone) {
1582
+ throw new Error(
1583
+ `\u57DF\u540D ${hostname} \u4E0D\u5728\u672C\u8D26\u53F7\u7684\u4EFB\u4F55 zone \u4E0B\uFF0C\u65E0\u6CD5\u7ED1\u5B9A\u4E3A Worker \u81EA\u5B9A\u4E49\u57DF\u540D\u3002
1584
+ \u2192 \u8BF7\u786E\u8BA4\u8BE5\u57DF\u540D\u7684 DNS \u6258\u7BA1\u5728\u8FD9\u4E2A Cloudflare \u8D26\u53F7\u91CC\uFF08Workers \u81EA\u5B9A\u4E49\u57DF\u540D\u4E0D\u652F\u6301\u5916\u90E8 CNAME\uFF09\u3002`
1585
+ );
1586
+ }
1587
+ try {
1588
+ return await client.attachCustomDomain(accountId, {
1589
+ hostname,
1590
+ service: scriptName,
1591
+ zoneId: targetZone.id
1592
+ });
1593
+ } catch (err) {
1594
+ if (isPermissionError(err)) {
1595
+ throw new Error(
1596
+ `\u7ED1\u5B9A\u81EA\u5B9A\u4E49\u57DF\u540D ${hostname} \u88AB\u62D2\u7EDD\uFF08\u6743\u9650\u4E0D\u8DB3\uFF09\u3002
1597
+ \u2192 ${WORKERS_PERMISSIONS.domains.hint}
1598
+ \u2192 ${WORKERS_PERMISSIONS.dns.hint}
1599
+ \u2192 \u4E5F\u53EF\u4EE5\u5148\u4E0D\u7ED1\u57DF\u540D\uFF1A\u628A\u300C\u81EA\u5B9A\u4E49\u57DF\u540D\u300D\u7559\u7A7A\uFF0C\u90E8\u7F72\u5230 *.workers.dev\uFF08\u591A\u6570\u7F51\u7EDC\u4E0B\u76F4\u8FDE\u4E0D\u53EF\u8BBF\u95EE\uFF09\u3002`
1600
+ );
1601
+ }
1602
+ throw err;
1603
+ }
1604
+ }
1605
+ async function detachWorkerHostname(client, accountId, scriptName) {
1606
+ const domain = await findWorkerDomain(client, accountId, scriptName);
1607
+ if (!domain) return "";
1608
+ try {
1609
+ await client.deleteWorkerDomain(accountId, domain.id);
1610
+ return domain.hostname;
1611
+ } catch {
1612
+ return "";
1613
+ }
1614
+ }
1615
+ async function probeHost(host, options = {}) {
1616
+ const deadline = Date.now() + (options.timeoutMs ?? 9e4);
1617
+ const interval = options.intervalMs ?? 5e3;
1618
+ for (; ; ) {
1619
+ try {
1620
+ await fetch(`https://${host}/`, {
1621
+ method: "GET",
1622
+ redirect: "manual",
1623
+ signal: AbortSignal.timeout(1e4)
1624
+ });
1625
+ return true;
1626
+ } catch {
1627
+ }
1628
+ if (Date.now() > deadline) return false;
1629
+ await new Promise((r) => setTimeout(r, interval));
1630
+ }
1631
+ }
1632
+ async function deployWorkersDataPlane(options) {
1633
+ const { client, accountId, name, hostname, log, warnings } = options;
1634
+ log(`\xB7 \u4E0A\u4F20 Workers \u6570\u636E\u9762\u811A\u672C ${name}`);
1635
+ await uploadWorkerScript(options);
1636
+ let host = "";
1637
+ let customDomain = "";
1638
+ if (hostname) {
1639
+ const domain = await attachWorkerHostname(client, accountId, hostname, name, options.zone);
1640
+ customDomain = domain.hostname;
1641
+ host = domain.hostname;
1642
+ log(`\u2705 \u5DF2\u7ED1\u5B9A\u81EA\u5B9A\u4E49\u57DF\u540D ${host}`);
1643
+ const reachable = await probeHost(host);
1644
+ if (!reachable) {
1645
+ warnings.push(
1646
+ `\u81EA\u5B9A\u4E49\u57DF\u540D ${host} \u5728 90 \u79D2\u5185\u4ECD\u672A\u8FD4\u56DE\u54CD\u5E94\uFF08\u8BC1\u4E66\u7B7E\u53D1\u901A\u5E38\u9700\u8981 1~3 \u5206\u949F\uFF09\u3002
1647
+ \u2192 \u7A0D\u7B49\u7247\u523B\u7528\u6D4F\u89C8\u5668\u6253\u5F00\u8BE5\u57DF\u540D\u786E\u8BA4\uFF1B\u82E5\u957F\u65F6\u95F4\u4E0D\u53EF\u7528\uFF0C\u8BF7\u5230 Cloudflare \u63A7\u5236\u53F0\u68C0\u67E5
1648
+ Workers \u2192 \u4F60\u7684\u811A\u672C \u2192 \u8BBE\u7F6E \u2192 \u57DF\u548C\u8DEF\u7531 \u91CC\u7684\u81EA\u5B9A\u4E49\u57DF\u540D\u72B6\u6001\u3002`
1649
+ );
1650
+ }
1651
+ } else {
1652
+ await client.putScriptSubdomain(accountId, name, true);
1653
+ const subdomain = await client.getWorkersSubdomain(accountId);
1654
+ host = subdomain ? `${name}.${subdomain}.workers.dev` : `${name}.workers.dev`;
1655
+ warnings.push(
1656
+ `\u672A\u914D\u7F6E\u81EA\u5B9A\u4E49\u57DF\u540D\uFF0C\u6570\u636E\u9762\u4F7F\u7528 ${host}\u3002
1657
+ \u2192 *.workers.dev \u57DF\u540D\u76F4\u8FDE\u65E0\u6CD5\u8BBF\u95EE\uFF0C\u8BF7\u767B\u5F55 cloudflare \u63A7\u5236\u53F0\u914D\u7F6E\u81EA\u5B9A\u4E49\u57DF\u540D\uFF0C
1658
+ \u5426\u5219\u5BA2\u6237\u7AEF\u8282\u70B9\u4F1A\u5168\u90E8\u8FDE\u4E0D\u4E0A\u3002`
1659
+ );
1660
+ }
1661
+ return { name, host, customDomain };
1662
+ }
1663
+ async function deleteWorkersDataPlane(client, accountId, name, log) {
1664
+ const host = await detachWorkerHostname(client, accountId, name);
1665
+ if (host) log(`\xB7 \u5DF2\u89E3\u7ED1\u65E7\u6570\u636E\u9762\u57DF\u540D ${host}`);
1666
+ await client.deleteScript(accountId, name);
1667
+ log(`\u2705 \u5DF2\u5220\u9664\u65E7 Workers \u6570\u636E\u9762\uFF1A${name}`);
1668
+ }
1669
+ var WORKERS_COMPAT_DATE, WORKERS_PERMISSIONS;
1670
+ var init_workers_deploy = __esm({
1671
+ "src/deploy/workers-deploy.ts"() {
1672
+ "use strict";
1673
+ init_cf_api();
1674
+ WORKERS_COMPAT_DATE = "2026-10-01";
1675
+ WORKERS_PERMISSIONS = {
1676
+ scripts: {
1677
+ label: "Workers \u811A\u672C",
1678
+ hint: "Token \u4E2D\u6DFB\u52A0 Account / Workers Scripts / Edit"
1679
+ },
1680
+ domains: {
1681
+ label: "Workers \u81EA\u5B9A\u4E49\u57DF\u540D",
1682
+ hint: "Token \u4E2D\u6DFB\u52A0 Account / Workers Routes / Edit\uFF08\u8D26\u53F7\u7EA7\uFF09"
1683
+ },
1684
+ zoneRoutes: {
1685
+ label: "Zone \u7EA7 Worker \u8DEF\u7531",
1686
+ hint: "Token \u4E2D\u6DFB\u52A0 Zone / Workers Routes / Edit\uFF08\u57DF\u7EA7\uFF09"
1687
+ },
1688
+ dns: {
1689
+ label: "Zone DNS \u8BB0\u5F55",
1690
+ hint: "Token \u4E2D\u6DFB\u52A0 Zone / DNS / Edit\uFF08\u81EA\u5B9A\u4E49\u57DF\u540D\u8981\u81EA\u52A8\u5EFA DNS \u8BB0\u5F55\uFF09"
1691
+ }
1692
+ };
1693
+ }
1694
+ });
1695
+
1464
1696
  // src/shared/version-util.ts
1465
1697
  function parseVersion(input) {
1466
1698
  const text = input.trim();
@@ -2337,10 +2569,29 @@ async function deployPagesSplit(options) {
2337
2569
  result.uuid = effective.uuid;
2338
2570
  result.wsPath = effective.wsPath;
2339
2571
  result.panelPassword = effective.panelPassword;
2340
- for (const [label, name] of [
2341
- ["\u63A7\u5236\u9762", controlName],
2342
- ["\u6570\u636E\u9762", dataName]
2343
- ]) {
2572
+ const prevDataMode = manifest?.dataPlaneMode === "workers" ? "workers" : "pages";
2573
+ const dataMode = options.dataPlaneMode ?? prevDataMode;
2574
+ const modeSwitched = !!manifest && dataMode !== prevDataMode;
2575
+ const oldDataName = manifest?.dataProject ?? "";
2576
+ const targetHost = (options.dataHost ?? "").trim() || (manifest?.dataCustomDomain ?? "").trim();
2577
+ if (modeSwitched) {
2578
+ log(
2579
+ `\u26A0 \u6570\u636E\u9762\u90E8\u7F72\u5F62\u6001\u53D8\u66F4\uFF1A${prevDataMode === "pages" ? "Pages" : "Workers"} \u2192 ${dataMode === "pages" ? "Pages" : "Workers"}`
2580
+ );
2581
+ log(" \u2192 \u65B0\u6570\u636E\u9762\u90E8\u7F72\u6210\u529F\u540E\uFF0C\u4F1A\u81EA\u52A8\u5220\u9664\u65E7\u7684\u6570\u636E\u9762\u5E76\u8FC1\u79FB\u57DF\u540D");
2582
+ }
2583
+ let workersZone = null;
2584
+ if (dataMode === "workers") {
2585
+ const preflight = await preflightWorkersDataPlane(
2586
+ client,
2587
+ options.accountId,
2588
+ targetHost || void 0,
2589
+ log,
2590
+ warnings
2591
+ );
2592
+ workersZone = preflight.zone;
2593
+ }
2594
+ const ensurePagesProject = async (label, name) => {
2344
2595
  try {
2345
2596
  const project = await client.createPagesProject(options.accountId, {
2346
2597
  name,
@@ -2367,11 +2618,17 @@ async function deployPagesSplit(options) {
2367
2618
  );
2368
2619
  }
2369
2620
  }
2621
+ };
2622
+ await ensurePagesProject("\u63A7\u5236\u9762", controlName);
2623
+ if (dataMode === "pages") {
2624
+ await ensurePagesProject("\u6570\u636E\u9762", dataName);
2625
+ } else {
2626
+ log("\xB7 \u6570\u636E\u9762\u90E8\u7F72\u5F62\u6001\uFF1AWorkers\uFF08\u4E0D\u521B\u5EFA Pages \u6570\u636E\u9762\u9879\u76EE\uFF09");
2370
2627
  }
2371
2628
  if (result.control.subdomain) {
2372
2629
  await configureProject(client, options.accountId, controlName, "\u63A7\u5236\u9762", result, options, log, warnings, effective);
2373
2630
  }
2374
- if (result.data.subdomain) {
2631
+ if (dataMode === "pages" && result.data.subdomain) {
2375
2632
  await configureProject(client, options.accountId, dataName, "\u6570\u636E\u9762", result, options, log, warnings, effective);
2376
2633
  }
2377
2634
  await writeEffectiveConfig(
@@ -2386,7 +2643,7 @@ async function deployPagesSplit(options) {
2386
2643
  const dataCode = kernel.data;
2387
2644
  const controlCode = kernel.control;
2388
2645
  let dataCustomDomain = "";
2389
- if (previousDataProject) {
2646
+ if (dataMode === "pages" && previousDataProject) {
2390
2647
  const isCustom = (d) => typeof d === "string" && !d.endsWith(".pages.dev");
2391
2648
  try {
2392
2649
  const all = await client.listPagesDomains(options.accountId, previousDataProject);
@@ -2400,31 +2657,154 @@ async function deployPagesSplit(options) {
2400
2657
  } catch {
2401
2658
  }
2402
2659
  }
2403
- const dataAttempt = await deployWithBlockRetry({
2404
- client,
2405
- accountId: options.accountId,
2406
- preferredName: dataName,
2407
- code: dataCode,
2408
- label: "\u6570\u636E\u9762",
2409
- result,
2410
- options,
2411
- effective,
2412
- wait,
2413
- log,
2414
- warnings,
2415
- oldProject: previousDataProject,
2416
- customDomain: dataCustomDomain
2417
- });
2418
- if (dataAttempt) {
2419
- result.data.name = dataAttempt.project ?? options.dataProject;
2420
- result.data.subdomain = dataAttempt.subdomain;
2660
+ if (dataMode === "pages" && prevDataMode === "workers" && !dataCustomDomain) {
2661
+ dataCustomDomain = targetHost;
2662
+ }
2663
+ if (dataMode === "workers") {
2664
+ const workersBindings = [
2665
+ { type: "kv_namespace", name: "KV", namespace_id: options.kvNamespaceId },
2666
+ { type: "plain_text", name: "UUID", text: effective.uuid },
2667
+ { type: "plain_text", name: "TROJAN_PASSWORD", text: effective.trojanPassword },
2668
+ { type: "plain_text", name: "WS_PATH", text: effective.wsPath },
2669
+ { type: "plain_text", name: "PATH", text: effective.wsPath },
2670
+ { type: "plain_text", name: "ENABLE_TROJAN", text: options.enableTrojan ? "true" : "false" },
2671
+ { type: "plain_text", name: "ENABLE_XHTTP", text: options.enableXhttp ? "true" : "false" },
2672
+ ...options.resolvePreferred === void 0 ? [] : [
2673
+ {
2674
+ type: "plain_text",
2675
+ name: "RESOLVE_PREFERRED",
2676
+ text: options.resolvePreferred ? "true" : "false"
2677
+ }
2678
+ ]
2679
+ ];
2680
+ const switchingFromPages = modeSwitched && prevDataMode === "pages";
2681
+ if (switchingFromPages && targetHost && oldDataName) {
2682
+ try {
2683
+ await client.removePagesDomain(options.accountId, oldDataName, targetHost);
2684
+ log(`\xB7 \u5DF2\u4ECE\u65E7 Pages \u6570\u636E\u9762 ${oldDataName} \u89E3\u7ED1\u57DF\u540D ${targetHost}\uFF08\u51C6\u5907\u8FC1\u5230 Workers\uFF09`);
2685
+ } catch {
2686
+ }
2687
+ }
2688
+ try {
2689
+ const deployed = await deployWorkersDataPlane({
2690
+ client,
2691
+ accountId: options.accountId,
2692
+ name: dataName,
2693
+ code: dataCode,
2694
+ hostname: targetHost || void 0,
2695
+ zone: workersZone,
2696
+ bindings: workersBindings,
2697
+ log,
2698
+ warnings
2699
+ });
2700
+ result.data.name = deployed.name;
2701
+ result.data.subdomain = deployed.host;
2702
+ dataCustomDomain = deployed.customDomain;
2703
+ } catch (err) {
2704
+ if (switchingFromPages && targetHost && oldDataName) {
2705
+ try {
2706
+ await client.addPagesDomain(options.accountId, oldDataName, targetHost);
2707
+ log("\xB7 \u5DF2\u628A\u57DF\u540D\u56DE\u6EDA\u5230\u65E7 Pages \u6570\u636E\u9762");
2708
+ } catch {
2709
+ warnings.push(
2710
+ `\u57DF\u540D ${targetHost} \u56DE\u6EDA\u5931\u8D25\uFF0C\u8BF7\u624B\u52A8\u5230 Cloudflare \u63A7\u5236\u53F0\u628A\u5B83\u7ED1\u56DE ${oldDataName}\u3002`
2711
+ );
2712
+ }
2713
+ }
2714
+ warnings.push(
2715
+ `Workers \u811A\u672C ${dataName} \u53EF\u80FD\u5DF2\u4E0A\u4F20\u4F46\u672A\u751F\u6548\uFF08\u672A\u7ED1\u5230\u53EF\u7528\u57DF\u540D\uFF09\u3002
2716
+ \u2192 \u8865\u5B8C\u6743\u9650\u540E\u91CD\u8DD1\u540C\u4E00\u6761\u547D\u4EE4\u5373\u53EF\uFF1A\u811A\u672C\u540D\u4E0D\u53D8\uFF0C\u4F1A\u539F\u5730\u66F4\u65B0\uFF0C\u4E0D\u4F1A\u91CD\u590D\u521B\u5EFA\u3002`
2717
+ );
2718
+ throw new Error(
2719
+ `Workers \u6570\u636E\u9762\u90E8\u7F72\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}`
2720
+ );
2721
+ }
2722
+ if (switchingFromPages && oldDataName) {
2723
+ try {
2724
+ await client.deletePagesProject(options.accountId, oldDataName);
2725
+ log(`\u2705 \u5DF2\u5220\u9664\u88AB\u66FF\u6362\u7684\u65E7 Pages \u6570\u636E\u9762\u9879\u76EE\uFF1A${oldDataName}`);
2726
+ } catch (err) {
2727
+ warnings.push(
2728
+ `\u5220\u9664\u65E7 Pages \u6570\u636E\u9762\u5931\u8D25\uFF08${oldDataName}\uFF09\uFF1A${err instanceof Error ? err.message : String(err)}
2729
+ \u2192 \u5B83\u5DF2\u7ECF\u4E0D\u518D\u63A5\u6536\u6D41\u91CF\uFF0C\u53EF\u5230\u63A7\u5236\u53F0\u624B\u52A8\u5220\u9664\u3002`
2730
+ );
2731
+ }
2732
+ }
2733
+ } else {
2734
+ if (modeSwitched && prevDataMode === "workers") {
2735
+ await ensurePagesProject("\u6570\u636E\u9762", dataName);
2736
+ if (result.data.subdomain) {
2737
+ await configureProject(client, options.accountId, dataName, "\u6570\u636E\u9762", result, options, log, warnings, effective);
2738
+ }
2739
+ }
2740
+ const dataAttempt = await deployWithBlockRetry({
2741
+ client,
2742
+ accountId: options.accountId,
2743
+ preferredName: dataName,
2744
+ code: dataCode,
2745
+ label: "\u6570\u636E\u9762",
2746
+ result,
2747
+ options,
2748
+ effective,
2749
+ wait,
2750
+ log,
2751
+ warnings,
2752
+ oldProject: previousDataProject,
2753
+ customDomain: dataCustomDomain
2754
+ });
2755
+ if (dataAttempt) {
2756
+ result.data.name = dataAttempt.project ?? options.dataProject;
2757
+ result.data.subdomain = dataAttempt.subdomain;
2758
+ if (modeSwitched && prevDataMode === "workers" && oldDataName) {
2759
+ let detachedHost = "";
2760
+ try {
2761
+ detachedHost = await detachWorkerHostname(client, options.accountId, oldDataName);
2762
+ if (detachedHost) log(`\xB7 \u5DF2\u4ECE\u65E7 Workers \u6570\u636E\u9762\u89E3\u7ED1\u57DF\u540D ${detachedHost}`);
2763
+ } catch {
2764
+ }
2765
+ const host = dataCustomDomain || detachedHost;
2766
+ let moved = true;
2767
+ if (host) {
2768
+ try {
2769
+ await client.addPagesDomain(options.accountId, result.data.name, host);
2770
+ log(`\u2705 \u81EA\u5B9A\u4E49\u57DF\u540D\u5DF2\u8FC1\u79FB\u5230 Pages \u6570\u636E\u9762\uFF1A${host}`);
2771
+ dataCustomDomain = host;
2772
+ } catch (err) {
2773
+ moved = false;
2774
+ warnings.push(
2775
+ `\u81EA\u5B9A\u4E49\u57DF\u540D\u8FC1\u79FB\u5931\u8D25\uFF08${host} \u2192 ${result.data.name}\uFF09\uFF1A${err instanceof Error ? err.message : String(err)}
2776
+ \u2192 \u8BF7\u624B\u52A8\u5230 Cloudflare \u63A7\u5236\u53F0\u628A\u8BE5\u57DF\u540D\u7ED1\u5230 ${result.data.name}\uFF0C\u5426\u5219\u8BA2\u9605\u5730\u5740\u4F1A\u5931\u6548\u3002`
2777
+ );
2778
+ try {
2779
+ await client.attachCustomDomain(options.accountId, {
2780
+ hostname: host,
2781
+ service: oldDataName,
2782
+ zoneId: (await client.listWorkerDomains(options.accountId)).find((d) => d.hostname === host)?.zone_id ?? ""
2783
+ });
2784
+ log("\xB7 \u5DF2\u628A\u57DF\u540D\u56DE\u6EDA\u5230\u65E7 Workers \u6570\u636E\u9762");
2785
+ } catch {
2786
+ }
2787
+ }
2788
+ }
2789
+ if (moved) {
2790
+ try {
2791
+ await deleteWorkersDataPlane(client, options.accountId, oldDataName, log);
2792
+ } catch (err) {
2793
+ warnings.push(
2794
+ `\u5220\u9664\u65E7 Workers \u6570\u636E\u9762\u5931\u8D25\uFF08${oldDataName}\uFF09\uFF1A${err instanceof Error ? err.message : String(err)}
2795
+ \u2192 \u5B83\u5DF2\u7ECF\u4E0D\u518D\u63A5\u6536\u6D41\u91CF\uFF0C\u53EF\u5230\u63A7\u5236\u53F0\u624B\u52A8\u5220\u9664\u3002`
2796
+ );
2797
+ }
2798
+ }
2799
+ }
2800
+ }
2421
2801
  }
2422
2802
  if (result.data.subdomain && result.control.name) {
2423
2803
  const expected = result.data.subdomain;
2424
2804
  try {
2425
2805
  const controlProject = await client.getPagesProject(options.accountId, result.control.name);
2426
2806
  const currentHost = controlProject.deployment_configs?.production?.env_vars?.DATA_HOST?.value ?? "";
2427
- if (currentHost && currentHost !== expected) {
2807
+ if (currentHost !== expected) {
2428
2808
  log(`\u26A0 \u63A7\u5236\u9762 DATA_HOST \u4ECD\u6307\u5411\u65E7\u57DF\u540D ${currentHost}\uFF0C\u6B63\u5728\u540C\u6B65\u4E3A ${expected}`);
2429
2809
  await configureProject(
2430
2810
  client,
@@ -2472,6 +2852,8 @@ async function deployPagesSplit(options) {
2472
2852
  dataSubdomain: result.data.subdomain,
2473
2853
  // 自定义域名:本次迁过来的,或旧项目上原有的(下次更新还要靠它迁移)
2474
2854
  dataCustomDomain: dataCustomDomain || manifest?.dataCustomDomain || "",
2855
+ // 部署形态:更新时靠它识别「用户是否改过数据面形态」
2856
+ dataPlaneMode: dataMode,
2475
2857
  build,
2476
2858
  kernelVersion,
2477
2859
  at: (/* @__PURE__ */ new Date()).toISOString(),
@@ -2622,6 +3004,7 @@ var init_pages_deploy = __esm({
2622
3004
  "src/deploy/pages-deploy.ts"() {
2623
3005
  "use strict";
2624
3006
  init_cf_api();
3007
+ init_workers_deploy();
2625
3008
  init_utils();
2626
3009
  init_kernel_remote();
2627
3010
  init_version_util();
@@ -2637,9 +3020,10 @@ var init_help = __esm({
2637
3020
  "use strict";
2638
3021
  init_version();
2639
3022
  DEPLOY_HELP = `
2640
- ${NAME} deploy \u2014\u2014 Pages \u53CC\u9879\u76EE\u90E8\u7F72\uFF08\u63A7\u5236\u9762 + \u6570\u636E\u9762\uFF09
3023
+ ${NAME} deploy \u2014\u2014 \u53CC\u9762\u90E8\u7F72\uFF08\u63A7\u5236\u9762 Pages + \u6570\u636E\u9762 Pages/Workers\uFF09
2641
3024
 
2642
- \u26A0\uFE0F \u8FD9\u662F\u552F\u4E00\u53D7\u652F\u6301\u7684\u90E8\u7F72\u5F62\u6001\u3002\u5408\u5E76\u6210\u5355\u9879\u76EE\u4F1A\u89E6\u53D1 8000119 \u98CE\u63A7\u3002
3025
+ \u26A0\uFE0F \u63A7\u5236\u9762\u5FC5\u987B\u7559\u5728 Pages\uFF1B\u6570\u636E\u9762\u53EF\u9009 Pages \u6216 Workers\u3002
3026
+ \u5408\u5E76\u6210\u5355\u9879\u76EE\u4F1A\u89E6\u53D1 8000119 \u98CE\u63A7\u3002
2643
3027
 
2644
3028
  \u7528\u6CD5:
2645
3029
  ${NAME} deploy [\u9009\u9879]
@@ -2647,12 +3031,17 @@ ${NAME} deploy \u2014\u2014 Pages \u53CC\u9879\u76EE\u90E8\u7F72\uFF08\u63A7\u52
2647
3031
  \u9009\u9879:
2648
3032
  --token <token> Cloudflare API Token\uFF08\u4E5F\u53EF\u7528\u73AF\u5883\u53D8\u91CF CLOUDFLARE_API_TOKEN\uFF09
2649
3033
  --account <id> \u76EE\u6807\u8D26\u53F7 ID
2650
- --kv <id> KV \u547D\u540D\u7A7A\u95F4 ID\uFF08\u4E24\u4E2A\u9879\u76EE\u5171\u7528\uFF09
3034
+ --kv <id> KV \u547D\u540D\u7A7A\u95F4 ID\uFF08\u4E24\u4E2A\u9762\u5171\u7528\uFF09
2651
3035
  --kv-title <title> \u65B0\u5EFA KV \u65F6\u4F7F\u7528\u7684\u6807\u9898
2652
3036
  --new-kv \u5F3A\u5236\u65B0\u5EFA\u4E00\u4E2A KV \u547D\u540D\u7A7A\u95F4\uFF08\u7528\u4E8E\u90E8\u7F72\u7B2C 2\u30013\u2026 \u4E2A\u5B9E\u4F8B\uFF09
2653
3037
  --list-kv \u5217\u51FA\u8BE5\u8D26\u53F7\u4E0B\u7684 KV \u4E0E\u5176\u4E2D\u7684 CFPilot \u5B9E\u4F8B\uFF0C\u4E0D\u6267\u884C\u90E8\u7F72
2654
3038
  --control <name> \u63A7\u5236\u9762 Pages \u9879\u76EE\u540D\uFF08\u9ED8\u8BA4\u968F\u673A\uFF09
2655
- --data <name> \u6570\u636E\u9762 Pages \u9879\u76EE\u540D\uFF08\u9ED8\u8BA4\u968F\u673A\uFF09
3039
+ --data <name> \u6570\u636E\u9762\u540D\u79F0\uFF08Pages \u9879\u76EE\u540D / Worker \u811A\u672C\u540D\uFF0C\u9ED8\u8BA4\u968F\u673A\uFF09
3040
+ --data-plane <mode> \u6570\u636E\u9762\u90E8\u7F72\u5F62\u6001\uFF1Apages\uFF08\u9ED8\u8BA4\uFF09/ workers
3041
+ \u4E0D\u4F20 = \u6CBF\u7528\u90E8\u7F72\u6E05\u5355\u91CC\u8BB0\u5F55\u7684\u5F62\u6001\uFF1B
3042
+ \u663E\u5F0F\u4F20\u4E14\u4E0E\u6E05\u5355\u4E0D\u540C = \u5207\u6362\u5F62\u6001\uFF08\u65B0\u6570\u636E\u9762\u4E0A\u7EBF\u540E\u81EA\u52A8\u5220\u9664\u65E7\u7684\u5E76\u8FC1\u79FB\u57DF\u540D\uFF09
3043
+ --data-host <host> Workers \u6570\u636E\u9762\u7684\u81EA\u5B9A\u4E49\u57DF\u540D\uFF08\u5982 w1a2b3c4.example.com\uFF09
3044
+ \u26A0\uFE0F *.workers.dev \u76F4\u8FDE\u4E0D\u53EF\u8BBF\u95EE\uFF0C\u4E0D\u7ED9\u57DF\u540D\u4F1A\u544A\u8B66
2656
3045
  --panel-path <path> \u9762\u677F\u8BBF\u95EE\u8DEF\u5F84\uFF08\u9ED8\u8BA4\u968F\u673A\uFF09
2657
3046
  --mode <mode> \u90E8\u7F72\u6A21\u5F0F\uFF1Aauto\uFF08\u9ED8\u8BA4\uFF0C\u81EA\u52A8\u5224\u65AD\uFF09/ fresh\uFF08\u5F3A\u5236\u9996\u6B21\uFF09/ update\uFF08\u5F3A\u5236\u66F4\u65B0\uFF09
2658
3047
  --force \u5FFD\u7565\u7248\u672C\u68C0\u67E5\uFF0C\u5F3A\u5236\u91CD\u65B0\u90E8\u7F72
@@ -2692,13 +3081,16 @@ ${NAME} deploy \u2014\u2014 Pages \u53CC\u9879\u76EE\u90E8\u7F72\uFF08\u63A7\u52
2692
3081
  packages/worker-core/dist/dataplane.js \u6570\u636E\u9762\uFF08VLESS/Trojan-WS/XHTTP\uFF0C\u81EA\u7814\u5B9E\u73B0\uFF09
2693
3082
 
2694
3083
  \u90E8\u7F72\u987A\u5E8F\uFF08\u4E0D\u53EF\u8C03\u6362\uFF09:
2695
- 1. \u521B\u5EFA\u4E24\u4E2A Pages \u9879\u76EE
3084
+ 1. \u521B\u5EFA\u63A7\u5236\u9762 Pages \u9879\u76EE\uFF08\u6570\u636E\u9762\u6309\u5F62\u6001\u521B\u5EFA Pages \u9879\u76EE\u6216 Worker\uFF09
2696
3085
  2. \u914D\u7F6E KV \u7ED1\u5B9A\u4E0E\u73AF\u5883\u53D8\u91CF\uFF08Pages \u7684\u7ED1\u5B9A\u53EA\u5BF9\u4E4B\u540E\u7684\u90E8\u7F72\u751F\u6548\uFF09
2697
3086
  3. \u5148\u90E8\u7F72\u6570\u636E\u9762\uFF0C\u518D\u90E8\u7F72\u63A7\u5236\u9762\uFF08\u63A7\u5236\u9762\u9700\u8981\u6570\u636E\u9762\u57DF\u540D\u751F\u6210\u8BA2\u9605\uFF09
2698
3087
 
2699
3088
  Token \u6240\u9700\u6743\u9650:
2700
3089
  Account / Pages / Edit \u521B\u5EFA\u9879\u76EE\u3001\u914D\u7F6E\u53D8\u91CF\u3001\u89E6\u53D1\u90E8\u7F72
3090
+ Account / Workers Scripts / Edit \u90E8\u7F72 Workers \u6570\u636E\u9762\uFF08--data-plane workers\uFF09
2701
3091
  Account / Workers KV Storage / Edit \u521B\u5EFA KV\uFF08\u82E5\u672A\u63D0\u4F9B --kv\uFF09
3092
+ Zone / Workers Routes / Edit \u7ED1\u5B9A Workers \u81EA\u5B9A\u4E49\u57DF\u540D\uFF08--data-host\uFF09
3093
+ Zone / DNS / Edit \u81EA\u5B9A\u4E49\u57DF\u540D\u9700\u8981\u81EA\u52A8\u5EFA DNS \u8BB0\u5F55
2702
3094
  `;
2703
3095
  }
2704
3096
  });
@@ -2910,6 +3302,18 @@ async function runDeployCommand(args) {
2910
3302
  process.exitCode = 1;
2911
3303
  return;
2912
3304
  }
3305
+ const dataPlaneRaw = (flagString(args, "data-plane") || "").toLowerCase();
3306
+ if (dataPlaneRaw && dataPlaneRaw !== "pages" && dataPlaneRaw !== "workers") {
3307
+ process.stderr.write(`\u2717 --data-plane \u53EA\u63A5\u53D7 pages / workers\uFF0C\u6536\u5230\uFF1A${dataPlaneRaw}
3308
+ `);
3309
+ process.exitCode = 1;
3310
+ return;
3311
+ }
3312
+ const dataPlaneMode = dataPlaneRaw ? dataPlaneRaw : void 0;
3313
+ const dataHost = flagString(args, "data-host") || "";
3314
+ if (dataHost && dataPlaneMode !== "workers") {
3315
+ process.stderr.write("\xB7 --data-host \u53EA\u5BF9 --data-plane workers \u751F\u6548\uFF0C\u5DF2\u5FFD\u7565\n");
3316
+ }
2913
3317
  const keepCredentials = !flagBool(args, "new-credentials");
2914
3318
  const skipSameVersion = !flagBool(args, "force");
2915
3319
  const panelPath = flagString(args, "panel-path") || "";
@@ -2937,6 +3341,9 @@ async function runDeployCommand(args) {
2937
3341
  // 想关在面板「入站配置 → 启用服务端 XHTTP 入站监听」关即可
2938
3342
  //(KV 配置优先级高于环境变量,面板开关会覆盖这里的默认值)。
2939
3343
  enableXhttp: true,
3344
+ // 数据面形态:不传 = 沿用清单;显式传且与清单不一致 = 切换形态
3345
+ dataPlaneMode,
3346
+ dataHost: dataPlaneMode === "workers" ? dataHost : void 0,
2940
3347
  mode,
2941
3348
  keepCredentials,
2942
3349
  skipSameVersion,
@@ -4686,8 +5093,14 @@ async function runScan(options) {
4686
5093
  function formatHost(ip) {
4687
5094
  return ip.includes(":") ? `[${ip}]` : ip;
4688
5095
  }
5096
+ function copyTag(colo) {
5097
+ const code = (colo || "").toUpperCase().trim();
5098
+ if (!code) return "CF";
5099
+ const city = coloCity(code);
5100
+ return city ? code + city : code;
5101
+ }
4689
5102
  function formatCopyable(entries) {
4690
- return entries.map((e) => `${formatHost(e.ip)}:${e.port}#${e.colo}`).join("\n");
5103
+ return entries.map((e) => `${formatHost(e.ip)}:${e.port}#${copyTag(e.colo)}`).join("\n");
4691
5104
  }
4692
5105
  function formatEntries(entries) {
4693
5106
  return entries.map(
@@ -5288,14 +5701,14 @@ async function detectProxyInterference(host) {
5288
5701
  advice: "\u5728\u300C\u8BBE\u7F6E \u2192 \u7F51\u7EDC\u548C Internet \u2192 \u4EE3\u7406\u300D\u4E2D\u5173\u95ED\u7CFB\u7EDF\u4EE3\u7406"
5289
5702
  });
5290
5703
  }
5291
- const probeHost = host?.trim() || "www.cloudflare.com";
5704
+ const probeHost2 = host?.trim() || "www.cloudflare.com";
5292
5705
  try {
5293
5706
  const { resolve4 } = await import("node:dns/promises");
5294
- const ips = await resolve4(probeHost).catch(() => []);
5707
+ const ips = await resolve4(probeHost2).catch(() => []);
5295
5708
  const fake = ips.find((ip) => isFakeIp(ip));
5296
5709
  if (fake) {
5297
5710
  findings.push({
5298
- message: `DNS \u628A ${probeHost} \u89E3\u6790\u5230 ${fake}\uFF08198.18/15 \u4FDD\u7559\u6BB5\uFF09\uFF0CTUN / fake-ip \u6B63\u5728\u751F\u6548`,
5711
+ message: `DNS \u628A ${probeHost2} \u89E3\u6790\u5230 ${fake}\uFF08198.18/15 \u4FDD\u7559\u6BB5\uFF09\uFF0CTUN / fake-ip \u6B63\u5728\u751F\u6548`,
5299
5712
  advice: "\u5173\u95ED\u4EE3\u7406\u5DE5\u5177\u7684 TUN \u6A21\u5F0F\u4E0E fake-ip DNS"
5300
5713
  });
5301
5714
  }
@@ -7215,11 +7628,13 @@ async function runTokenCheck(args) {
7215
7628
  if (flagBool(args, "check")) {
7216
7629
  const zoneName = flagString(args, "zone") || void 0;
7217
7630
  const domain = flagString(args, "domain") || void 0;
7631
+ const plane = (flagString(args, "data-plane") || "").toLowerCase();
7218
7632
  const result = await checkTokenPermissions({
7219
7633
  token,
7220
7634
  accountId: flagString(args, "account") || void 0,
7221
7635
  zoneName,
7222
- expectCustomDomain: Boolean(zoneName || domain)
7636
+ expectCustomDomain: Boolean(zoneName || domain),
7637
+ expectWorkers: plane === "workers"
7223
7638
  });
7224
7639
  process.stdout.write(renderTokenCheck(result));
7225
7640
  if (!result.ok) process.exitCode = 1;