@tutti-os/nexight-devops 0.6.1 → 0.6.2

package/dist/cli.js

@@ -6,17 +6,6 @@ import { resolve as resolve4 } from "path";
 import { fileURLToPath, pathToFileURL as pathToFileURL2 } from "url";
 import { Command } from "commander";
 
-// src/constants/admin.ts
-var DEFAULT_ADMIN_API_ORIGIN = "https://tutti.sh";
-
-// src/lib/admin-computer.ts
-import { randomUUID } from "crypto";
-import { createWriteStream } from "fs";
-import { link, mkdir, rename, stat, unlink } from "fs/promises";
-import { basename, dirname, join, resolve } from "path";
-import { Readable } from "stream";
-import { pipeline } from "stream/promises";
-
 // src/lib/errors.ts
 var CliError = class extends Error {
   exitCode;
@@ -45,7 +34,36 @@ var toExitCode = (error) => {
   return 1;
 };
 
+// src/lib/ppe-lane.ts
+var PPE_LANE_MAX_LENGTH = 38;
+var PPE_LANE_PATTERN = /^[a-z0-9](?:[-a-z0-9]*[a-z0-9])?$/;
+var validatePpeLaneName = (value) => {
+  const lane = value.trim();
+  if (!lane) {
+    throw new CliError("PPE lane name is required", 1);
+  }
+  if (lane.length > PPE_LANE_MAX_LENGTH) {
+    throw new CliError(`PPE lane name must be ${PPE_LANE_MAX_LENGTH} characters or fewer`, 1);
+  }
+  if (!PPE_LANE_PATTERN.test(lane)) {
+    throw new CliError(
+      "PPE lane name must use lowercase letters, digits, or hyphens, and start and end with a letter or digit",
+      1
+    );
+  }
+  return lane;
+};
+
+// src/constants/admin.ts
+var DEFAULT_ADMIN_API_ORIGIN = "https://tutti.sh";
+
 // src/lib/admin-computer.ts
+import { randomUUID } from "crypto";
+import { createWriteStream } from "fs";
+import { link, mkdir, rename, stat, unlink } from "fs/promises";
+import { basename, dirname, join, resolve } from "path";
+import { Readable } from "stream";
+import { pipeline } from "stream/promises";
 var TUTTI_COMPUTER_API_BASE_PATH = "/api/desktop/v2/admin/tutti-v2/computers";
 var TUTTI_COMPUTER_CONNECTION_WIRE_VALUE = {
   online: 1,
@@ -127,6 +145,12 @@ var parseTuttiComputer = (value) => {
   const owner = objectValue(root.owner);
   return {
     computerId: stringField(root, "computerId", "computer_id"),
+    ...field(root, "canCollect", "can_collect") !== void 0 ? {
+      canCollect: booleanField(root, "canCollect", "can_collect"),
+      collectionBlockedReason: stringField(root, "collectionBlockedReason", "collection_blocked_reason"),
+      computerKind: stringField(root, "computerKind", "computer_kind"),
+      computerVersion: stringField(root, "computerVersion", "computer_version")
+    } : {},
     displayName: stringField(root, "displayName", "display_name"),
     reportedName: stringField(root, "reportedName", "reported_name"),
     owner: {
@@ -356,6 +380,9 @@ var AdminApi = class {
   constructor(runtime, fetchImpl = fetch) {
     this.runtime = runtime;
     this.fetchImpl = fetchImpl;
+    if (runtime.ppeLane !== void 0) {
+      this.runtime = { ...runtime, ppeLane: validatePpeLaneName(runtime.ppeLane) };
+    }
   }
   async request(method, path, body) {
     const headers = {
@@ -364,6 +391,9 @@ var AdminApi = class {
     if (this.runtime.token) {
       headers.authorization = `Bearer ${this.runtime.token}`;
     }
+    if (this.runtime.ppeLane) {
+      headers["x-zk-ppe-lane"] = this.runtime.ppeLane;
+    }
     let payload;
     if (body !== void 0) {
       headers["content-type"] = "application/json";
@@ -372,9 +402,22 @@ var AdminApi = class {
     const response = await this.fetchImpl(`${this.runtime.apiOrigin}${path}`, {
       method,
       headers,
-      body: payload
+      body: payload,
+      ...this.runtime.ppeLane ? { redirect: "error" } : {}
     });
     const parsed = await parseResponseBody(response);
+    if (this.runtime.ppeLane) {
+      const hit = response.headers.get("x-zk-ppe-lane-hit");
+      const fallback = response.headers.get("x-tutti-server-route-fallback");
+      if (hit !== this.runtime.ppeLane || fallback) {
+        const detail = adminApiErrorDetail(parsed);
+        throw new AdminApiError(
+          `PPE \u8DEF\u7531\u4E0D\u5339\u914D: \u8BF7\u6C42 ${this.runtime.ppeLane}\uFF0C\u5B9E\u9645 ${hit || "\u672A\u786E\u8BA4\u6CF3\u9053\uFF08\u6B63\u5F0F\u73AF\u5883\u56DE\u843D\u6216\u7F3A\u5C11\u547D\u4E2D\u54CD\u5E94\u5934\uFF09"}${fallback ? `\uFF0CServer \u56DE\u843D\u539F\u56E0 ${fallback}` : ""}; ${method} ${path}; HTTP ${response.status}${detail ? `: ${detail}` : ""}`,
+          response.status,
+          parsed
+        );
+      }
+    }
     if (!response.ok) {
       const detail = adminApiErrorDetail(parsed);
       throw new AdminApiError(
@@ -658,7 +701,7 @@ var logger = {
 };
 
 // src/commands/admin/shared.ts
-var addAdminConnectionOptions = (command) => command.option("--admin-url <url>", "management API URL or admin.tutti.sh page URL").option("--json", "print the response as JSON without CLI decorations");
+var addAdminConnectionOptions = (command) => command.option("--admin-url <url>", "management API URL or admin.tutti.sh page URL").option("--ppe-lane <lane>", "route every management request to this exact PPE lane").option("--json", "print the response as JSON without CLI decorations");
 var resolveAdminContext = async (options = {}, tokenOverride) => {
   const config = await loadConfig();
   const apiOrigin = normalizeAdminApiOrigin(options.adminUrl ?? config.admin?.apiOrigin);
@@ -667,7 +710,7 @@ var resolveAdminContext = async (options = {}, tokenOverride) => {
     throw new CliError("\u7BA1\u7406\u540E\u53F0 Token \u672A\u914D\u7F6E\uFF0C\u8BF7\u5148\u8FD0\u884C nexight-devops admin auth login", 1);
   }
   return {
-    api: new AdminApi({ apiOrigin, token }),
+    api: new AdminApi({ apiOrigin, token, ppeLane: options.ppeLane }),
     apiOrigin,
     config,
     token
@@ -852,6 +895,14 @@ var resolveRuntimeLogRecallSelection = (input2, now = /* @__PURE__ */ new Date()
 var isUUID = (value) => /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(
   value
 );
+var assertComputerCollectable = (computer) => {
+  if (computer.canCollect === false) {
+    throw new CliError(`Computer ${computer.computerId} \u65E0\u6CD5\u91C7\u96C6\u65E5\u5FD7: ${computer.collectionBlockedReason || "\u670D\u52A1\u7AEF\u672A\u63D0\u4F9B\u963B\u585E\u539F\u56E0"}`, 1);
+  }
+  if (computer.canCollect === void 0 && computer.connectionStatus !== "online") {
+    throw new CliError(`Computer ${computer.computerId} \u5F53\u524D\u4E0D\u5728\u7EBF\uFF0C\u65E0\u6CD5\u53EC\u56DE\u65E5\u5FD7`, 1);
+  }
+};
 var computerNameMatches = (computer, selector) => {
   const expected = selector.trim().toLowerCase();
   return [computer.displayName, computer.reportedName].map((value) => value.trim().toLowerCase()).includes(expected);
@@ -863,9 +914,7 @@ var resolveOnlineTuttiComputer = async (api, selector) => {
   }
   if (isUUID(normalized)) {
     const computer = await api.getTuttiComputer(normalized);
-    if (computer.connectionStatus !== "online") {
-      throw new CliError(`Computer ${normalized} \u5F53\u524D\u4E0D\u5728\u7EBF\uFF0C\u65E0\u6CD5\u53EC\u56DE\u65E5\u5FD7`, 1);
-    }
+    assertComputerCollectable(computer);
     return computer;
   }
   const matches = [];
@@ -977,6 +1026,7 @@ var recallComputerRuntimeLogs = async (input2, dependencies) => {
   const selector = input2.ownerQuery ? `\u7528\u6237\u540D/\u90AE\u7BB1 ${input2.ownerQuery}` : `Computer ${input2.computer}`;
   progress(`\u6B63\u5728\u89E3\u6790\u552F\u4E00\u5728\u7EBF Computer: ${selector}`);
   const computer = await resolveOnlineTuttiComputerForLogs(dependencies.api, input2);
+  assertComputerCollectable(computer);
   progress(
     `\u5DF2\u5339\u914D ${computer.displayName || computer.reportedName} (${computer.computerId})\uFF0Cdesktopd ${computer.desktopdVersion || "\u672A\u77E5"}`
   );
@@ -3283,26 +3333,6 @@ var pollWorkflowRun = async (input2) => {
   throw new CliError(`Timed out waiting for workflow run in ${input2.repoFullName}`, 1);
 };
 
-// src/lib/ppe-lane.ts
-var PPE_LANE_MAX_LENGTH = 38;
-var PPE_LANE_PATTERN = /^[a-z0-9](?:[-a-z0-9]*[a-z0-9])?$/;
-var validatePpeLaneName = (value) => {
-  const lane = value.trim();
-  if (!lane) {
-    throw new CliError("PPE lane name is required", 1);
-  }
-  if (lane.length > PPE_LANE_MAX_LENGTH) {
-    throw new CliError(`PPE lane name must be ${PPE_LANE_MAX_LENGTH} characters or fewer`, 1);
-  }
-  if (!PPE_LANE_PATTERN.test(lane)) {
-    throw new CliError(
-      "PPE lane name must use lowercase letters, digits, or hyphens, and start and end with a letter or digit",
-      1
-    );
-  }
-  return lane;
-};
-
 // src/lib/prerequisites.ts
 var ensureCommandInstalled = async (command, installHint) => {
   const result = await runCommand(command, ["--version"]);