@lark-apaas/fullstack-cli 1.1.40-alpha.1 → 1.1.40-alpha.3

package/dist/index.js

@@ -3107,19 +3107,21 @@ async function run3(options = {}) {
 import { spawnSync as spawnSync3 } from "child_process";
 
 // src/utils/grayscale/config.ts
-function getGrayscaleConfig() {
-  const raw = process.env.GRAYSCALE_CONFIG;
+function getGrayscaleConfig(configJson) {
+  const raw = configJson || process.env.GRAYSCALE_CONFIG;
   if (!raw) {
     return null;
   }
   try {
-    const config = JSON.parse(raw);
+    const parsed = JSON.parse(raw);
+    const config = parsed.config || parsed;
+    const tenantId = parsed.tenant_id != null ? String(parsed.tenant_id) : void 0;
     if (!config.enabled) {
       return null;
     }
-    return config;
+    return { config, tenantId };
   } catch {
-    console.warn("[grayscale] Failed to parse GRAYSCALE_CONFIG env");
+    console.warn("[grayscale] Failed to parse grayscale config");
     return null;
   }
 }
@@ -3224,14 +3226,12 @@ function readProjectIdentity(cwd) {
 }
 
 // src/utils/grayscale/rules.ts
-import { createHash } from "crypto";
-function isInPercentage(key, percentage) {
+function isInPercentage(tenantId, percentage) {
   if (percentage <= 0) return false;
   if (percentage >= 100) return true;
-  const hash = createHash("md5").update(`grayscale:${key}`).digest("hex");
-  const value = parseInt(hash.substring(0, 8), 16) % 1e4;
-  const threshold = Math.floor(percentage * 100);
-  return value < threshold;
+  const id = parseInt(tenantId, 10);
+  if (isNaN(id)) return false;
+  return id % 100 < percentage;
 }
 function matchConditions(rule, identity) {
   const { conditions } = rule;
@@ -3246,9 +3246,8 @@ function matchConditions(rule, identity) {
     }
   }
   if (conditions.percentage != null && conditions.percentage > 0) {
-    const hashKey = conditions.hash_key || "app_id";
-    const hashValue = hashKey === "tenant_id" ? identity.tenantId : identity.appId;
-    if (hashValue && isInPercentage(hashValue, conditions.percentage)) {
+    if (conditions.percentage >= 100) return true;
+    if (identity.tenantId && isInPercentage(identity.tenantId, conditions.percentage)) {
       return true;
     }
   }
@@ -3294,16 +3293,16 @@ function resolveTargetVersions(config, identity) {
 }
 
 // src/utils/grayscale/index.ts
-function resolveGrayscaleVersions(cwd) {
-  const config = getGrayscaleConfig();
-  if (!config) {
+function resolveGrayscaleVersions(cwd, configJson) {
+  const result = getGrayscaleConfig(configJson);
+  if (!result) {
     console.log("[grayscale] Config not available, skipping grayscale");
     return null;
   }
+  const { config, tenantId: payloadTenantId } = result;
   const identity = readProjectIdentity(cwd);
-  if (!identity.appId && !identity.tenantId) {
-    console.log("[grayscale] No app_id or tenant_id found, skipping grayscale");
-    return null;
+  if (payloadTenantId) {
+    identity.tenantId = payloadTenantId;
   }
   console.log(`[grayscale] Project identity: appId=${identity.appId || "N/A"}, tenantId=${identity.tenantId || "N/A"}`);
   const versions = resolveTargetVersions(config, identity);
@@ -3418,7 +3417,7 @@ async function run4(options = {}) {
     if (!options.skipGrayscale && !options.version) {
       console.log("[fullstack-cli] Step 2/3: Checking grayscale config...");
       try {
-        const grayscaleVersions = resolveGrayscaleVersions(cwd);
+        const grayscaleVersions = resolveGrayscaleVersions(cwd, options.grayscaleConfig);
         if (grayscaleVersions) {
           console.log("[fullstack-cli] Step 3/3: Applying grayscale versions...");
           installGrayscaleVersions(packages, grayscaleVersions, cwd, !!options.dryRun);
@@ -3459,7 +3458,7 @@ var depsCommand = {
   name: "deps",
   description: "Upgrade @lark-apaas dependencies",
   register(parentCommand) {
-    parentCommand.command(this.name).description(this.description).option("--version <version>", "Upgrade to specific version").option("--packages <packages>", "Only upgrade specific packages (comma-separated)").option("--skip-grayscale", "Skip grayscale version check").option("--dry-run", "Show upgrade plan without executing").action(async (options) => {
+    parentCommand.command(this.name).description(this.description).option("--version <version>", "Upgrade to specific version").option("--packages <packages>", "Only upgrade specific packages (comma-separated)").option("--skip-grayscale", "Skip grayscale version check").option("--grayscale-config <json>", "Grayscale config JSON (injected by sandbox_console)").option("--dry-run", "Show upgrade plan without executing").action(async (options) => {
       await run4(options);
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.40-alpha.1",
+  "version": "1.1.40-alpha.3",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",