ccjk 12.0.6 → 12.0.7

package/dist/shared/{ccjk.BDKUdmLk.mjs → ccjk.c-ETfBZ_.mjs}

@@ -3,6 +3,7 @@ import os__default, { homedir } from 'node:os';
 import { writeFileAtomic } from '../chunks/fs-operations.mjs';
 import { Buffer } from 'node:buffer';
 import crypto from 'node:crypto';
+import { c as createDefaultGateway } from './ccjk.BtB1e5jm.mjs';
 import { j as join } from './ccjk.bQ7Dh1g4.mjs';
 
 const TOKEN_PREFIX = "ccjk_";
@@ -100,14 +101,150 @@ function maskToken(token) {
   return `${prefix}***...***${suffix}`;
 }
 
+function validateBindRequest(request) {
+  const errors = [];
+  if (!request.code || typeof request.code !== "string") {
+    errors.push("code is required and must be a string");
+  } else if (request.code.length < 4) {
+    errors.push("code must be at least 4 characters");
+  }
+  if (!request.deviceInfo || typeof request.deviceInfo !== "object") {
+    errors.push("deviceInfo is required and must be an object");
+  } else {
+    if (!request.deviceInfo.name || typeof request.deviceInfo.name !== "string") {
+      errors.push("deviceInfo.name is required and must be a string");
+    }
+    if (!request.deviceInfo.platform || typeof request.deviceInfo.platform !== "string") {
+      errors.push("deviceInfo.platform is required and must be a string");
+    }
+  }
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+function validateNotifyRequest(request) {
+  const errors = [];
+  if (!request.title || typeof request.title !== "string") {
+    errors.push("title is required and must be a string");
+  } else if (request.title.length > 200) {
+    errors.push("title must be 200 characters or less");
+  }
+  if (!request.body || typeof request.body !== "string") {
+    errors.push("body is required and must be a string");
+  } else if (request.body.length > 4e3) {
+    errors.push("body must be 4000 characters or less");
+  }
+  if (request.type && !["info", "success", "warning", "error"].includes(request.type)) {
+    errors.push("type must be one of: info, success, warning, error");
+  }
+  if (request.actions) {
+    if (!Array.isArray(request.actions)) {
+      errors.push("actions must be an array");
+    } else {
+      request.actions.forEach((action, index) => {
+        if (!action.id || typeof action.id !== "string") {
+          errors.push(`actions[${index}].id is required and must be a string`);
+        }
+        if (!action.label || typeof action.label !== "string") {
+          errors.push(`actions[${index}].label is required and must be a string`);
+        }
+        if (!action.value || typeof action.value !== "string") {
+          errors.push(`actions[${index}].value is required and must be a string`);
+        }
+      });
+    }
+  }
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+function validateBindResponse(response) {
+  const errors = [];
+  if (typeof response.success !== "boolean") {
+    errors.push("success is required and must be a boolean");
+  }
+  if (response.success) {
+    if (!response.data) {
+      errors.push("data is required when success is true");
+    } else {
+      if (!response.data.deviceToken || typeof response.data.deviceToken !== "string") {
+        errors.push("data.deviceToken is required and must be a string");
+      }
+      if (!response.data.deviceId || typeof response.data.deviceId !== "string") {
+        errors.push("data.deviceId is required and must be a string");
+      }
+    }
+  } else {
+    if (!response.error || typeof response.error !== "string") {
+      errors.push("error is required when success is false");
+    }
+  }
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+function validateNotifyResponse(response) {
+  const errors = [];
+  if (typeof response.success !== "boolean") {
+    errors.push("success is required and must be a boolean");
+  }
+  if (response.success) {
+    if (!response.data) {
+      errors.push("data is required when success is true");
+    } else {
+      if (!response.data.notificationId || typeof response.data.notificationId !== "string") {
+        errors.push("data.notificationId is required and must be a string");
+      }
+    }
+  } else {
+    if (!response.error || typeof response.error !== "string") {
+      errors.push("error is required when success is false");
+    }
+  }
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+function validatePollResponse(response) {
+  const errors = [];
+  if (typeof response.success !== "boolean") {
+    errors.push("success is required and must be a boolean");
+  }
+  if (response.success) {
+    if (!response.data) {
+      errors.push("data is required when success is true");
+    } else if (response.data.reply !== null) {
+      const reply = response.data.reply;
+      if (!reply.content || typeof reply.content !== "string") {
+        errors.push("data.reply.content is required and must be a string");
+      }
+      if (!reply.timestamp || typeof reply.timestamp !== "string") {
+        errors.push("data.reply.timestamp is required and must be a string");
+      }
+    }
+  } else {
+    if (!response.error || typeof response.error !== "string") {
+      errors.push("error is required when success is false");
+    }
+  }
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+
 const CLOUD_API_BASE_URL = "https://api.claudehome.cn";
-const DEFAULT_TIMEOUT = 3e4;
 const POLL_TIMEOUT = 6e4;
 const TOKEN_FILE_PATH = join(homedir(), ".ccjk", "cloud-token.json");
 class CCJKCloudClient {
   baseUrl;
   deviceToken = null;
   deviceId = null;
+  gateway = createDefaultGateway();
   /**
    * Create a new CCJKCloudClient instance
    *
@@ -205,16 +342,35 @@ class CCJKCloudClient {
    */
   async bind(code, deviceInfo) {
     const info = deviceInfo ? { ...getDeviceInfo(), ...deviceInfo } : getDeviceInfo();
-    const response = await this.request("/bind/use", {
+    const requestPayload = {
+      code,
+      deviceInfo: info
+    };
+    const requestValidation = validateBindRequest(requestPayload);
+    if (!requestValidation.valid) {
+      return {
+        success: false,
+        error: `Invalid bind request: ${requestValidation.errors.join(", ")}`,
+        code: "VALIDATION_ERROR"
+      };
+    }
+    const response = await this.gateway.request("notifications.bind", {
       method: "POST",
-      body: JSON.stringify({
-        code,
-        deviceInfo: info
-      })
+      body: requestPayload,
+      authToken: this.deviceToken || void 0
     });
+    const responseValidation = validateBindResponse(response);
+    if (!responseValidation.valid) {
+      return {
+        success: false,
+        error: `Invalid bind response: ${responseValidation.errors.join(", ")}`,
+        code: "RESPONSE_VALIDATION_ERROR"
+      };
+    }
     if (response.success && response.data) {
       this.deviceToken = response.data.deviceToken;
       this.deviceId = response.data.deviceId;
+      this.gateway.setAuthToken(response.data.deviceToken);
       this.saveToken({
         deviceToken: response.data.deviceToken,
         deviceId: response.data.deviceId,
@@ -224,8 +380,10 @@ class CCJKCloudClient {
       });
       return {
         success: true,
-        deviceToken: response.data.deviceToken,
-        deviceId: response.data.deviceId
+        data: {
+          deviceToken: response.data.deviceToken,
+          deviceId: response.data.deviceId
+        }
       };
     }
     return {
@@ -261,21 +419,41 @@ class CCJKCloudClient {
         code: "NOT_BOUND"
       };
     }
-    const response = await this.request("/notify", {
+    const requestPayload = {
+      title: options.title,
+      body: options.body,
+      type: options.type || "info",
+      taskId: options.taskId,
+      metadata: options.metadata,
+      actions: options.actions
+    };
+    const requestValidation = validateNotifyRequest(requestPayload);
+    if (!requestValidation.valid) {
+      return {
+        success: false,
+        error: `Invalid notify request: ${requestValidation.errors.join(", ")}`,
+        code: "VALIDATION_ERROR"
+      };
+    }
+    const response = await this.gateway.request("notifications.send", {
       method: "POST",
-      body: JSON.stringify({
-        title: options.title,
-        body: options.body,
-        type: options.type || "info",
-        taskId: options.taskId,
-        metadata: options.metadata,
-        actions: options.actions
-      })
+      body: requestPayload,
+      authToken: this.deviceToken
     });
+    const responseValidation = validateNotifyResponse(response);
+    if (!responseValidation.valid) {
+      return {
+        success: false,
+        error: `Invalid notify response: ${responseValidation.errors.join(", ")}`,
+        code: "RESPONSE_VALIDATION_ERROR"
+      };
+    }
     if (response.success && response.data) {
       return {
         success: true,
-        notificationId: response.data.notificationId
+        data: {
+          notificationId: response.data.notificationId
+        }
       };
     }
     return {
@@ -309,11 +487,20 @@ class CCJKCloudClient {
     if (!this.deviceToken) {
       throw new Error('Device not bound. Please run "ccjk notification bind <code>" first.');
     }
-    const response = await this.request(`/reply/poll?timeout=${timeout}`, {
+    const response = await this.gateway.request("notifications.poll", {
       method: "GET",
+      query: { timeout },
+      authToken: this.deviceToken,
       timeout
     });
-    if (response.success && response.data?.reply) {
+    const responseValidation = validatePollResponse(response);
+    if (!responseValidation.valid) {
+      throw new Error(`Invalid poll response: ${responseValidation.errors.join(", ")}`);
+    }
+    if (!response.success) {
+      throw new Error(response.error || "Failed to poll for reply");
+    }
+    if (response.data?.reply) {
       return {
         content: response.data.reply.content,
         timestamp: new Date(response.data.reply.timestamp),
@@ -397,72 +584,7 @@ class CCJKCloudClient {
       deviceId: this.deviceId || void 0
     };
   }
-  // ==========================================================================
-  // HTTP Request Helper
-  // ==========================================================================
-  /**
-   * Make an HTTP request to the cloud service
-   */
-  async request(path, options) {
-    const url = `${this.baseUrl}${path}`;
-    const timeout = options.timeout || DEFAULT_TIMEOUT;
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), timeout);
-    try {
-      const headers = {
-        "Content-Type": "application/json"
-      };
-      if (this.deviceToken) {
-        headers["X-Device-Token"] = this.deviceToken;
-      }
-      const response = await fetch(url, {
-        method: options.method,
-        headers,
-        body: options.body,
-        signal: controller.signal
-      });
-      clearTimeout(timeoutId);
-      const data = await response.json();
-      if (!response.ok) {
-        return {
-          success: false,
-          error: data.error || `HTTP ${response.status}: ${response.statusText}`,
-          code: data.code || `HTTP_${response.status}`
-        };
-      }
-      if (this.deviceToken && existsSync(TOKEN_FILE_PATH)) {
-        try {
-          const storageData = readFileSync(TOKEN_FILE_PATH, "utf-8");
-          const storage = JSON.parse(storageData);
-          storage.lastUsedAt = (/* @__PURE__ */ new Date()).toISOString();
-          writeFileAtomic(TOKEN_FILE_PATH, JSON.stringify(storage, null, 2));
-        } catch {
-        }
-      }
-      return data;
-    } catch (error) {
-      clearTimeout(timeoutId);
-      if (error instanceof Error) {
-        if (error.name === "AbortError") {
-          return {
-            success: false,
-            error: "Request timeout",
-            code: "TIMEOUT"
-          };
-        }
-        return {
-          success: false,
-          error: error.message,
-          code: "NETWORK_ERROR"
-        };
-      }
-      return {
-        success: false,
-        error: String(error),
-        code: "UNKNOWN_ERROR"
-      };
-    }
-  }
+  // Note: HTTP requests now handled by CloudApiGateway
 }
 let cloudClientInstance = null;
 function getCloudNotificationClient() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ccjk",
   "type": "module",
-  "version": "12.0.6",
+  "version": "12.0.7",
   "packageManager": "pnpm@10.17.1",
   "description": "CLI toolkit for Claude Code and Codex setup. Simplifies MCP service installation, API configuration, workflow management, and multi-provider support with guided interactive setup.",
   "author": {
@@ -106,6 +106,10 @@
     "test:v2:coverage": "vitest run --config vitest.config.v2.ts --coverage",
     "test:v2:run": "vitest run --config vitest.config.v2.ts",
     "test:v2:watch": "vitest watch --config vitest.config.v2.ts",
+    "test:integration": "NODE_ENV=test vitest --config vitest.integration.config.ts",
+    "test:integration:run": "NODE_ENV=test vitest run --config vitest.integration.config.ts",
+    "test:integration:ui": "NODE_ENV=test vitest --config vitest.integration.config.ts --ui",
+    "test:integration:coverage": "NODE_ENV=test vitest run --config vitest.integration.config.ts --coverage",
     "prepare": "husky",
     "format": "prettier --write src/**/*.ts",
     "prepublish:fix": "node scripts/fix-package-catalog.mjs",

package/templates/claude-code/common/settings.json

@@ -41,6 +41,8 @@
   },
   "permissions": {
     "allow": [
+      "Bash(*)",
+      "Bash(sips *)",
       "Bash(pnpm *)",
       "Bash(npm *)",
       "Bash(npx *)",
@@ -102,4 +104,4 @@
     "alwaysApprove": []
   },
   "experimental": {}
-}
+}