t880216t-server 1.5.20 → 1.5.21

package/lib/plugins/whistle.nohost/lib/accountMgr.js

@@ -5,10 +5,6 @@ const util = require('./util');
 const { getServerIp } = require('../../../util/address');
 const parseDomain = require('../../../util/parseDomain');
 
-const generateShortId = () => {
-  return Date.now().toString(36) + Math.random().toString(36).substring(2, 8);
-};
-
 const { parseJSON, shasum } = util;
 const MAX_ACCOUNT_COUNT = 120;
 const MAX_PASSWORD_LENGTH = 24;
@@ -482,18 +478,10 @@ class AccountMgr {
       return false;
     }
     const list = [];
-    const existingEnvMap = {};
-    (account.envList || []).forEach((env) => {
-      existingEnvMap[env.name] = env;
-    });
-    envList.forEach(({ name, id, data }) => {
+    envList.forEach(({ name, data }) => {
       if (name) {
-        const existingEnv = existingEnvMap[name];
-        // 优先级：传入的id > 已存在的id > 自动生成
-        const envId = id || (existingEnv && existingEnv.id) || generateShortId();
         list.push({
           name,
-          id: envId,
           rules: data,
         });
       }
@@ -504,21 +492,6 @@ class AccountMgr {
     return true;
   }
 
-  renameEnv(accountName, oldName, newName) {
-    const account = this.getAccount(accountName);
-    if (!account || !account.envList) {
-      return false;
-    }
-    const env = account.envList.find((e) => e.name === oldName);
-    if (!env) {
-      return false;
-    }
-    env.name = newName;
-    this.saveAccount(account);
-    this.parseRules();
-    return true;
-  }
-
   checkName(name) {
     return typeof name === 'string' && NAME_RE.test(name);
   }
@@ -615,29 +588,8 @@ class AccountMgr {
     return this.checkName(name) ? accountMap[name] : null;
   }
 
-  getRulesByEnvId(accountName, envId) {
-    const account = this.getAccount(accountName);
-    if (!account || !account.envList) {
-      return { rules: '', headers: undefined };
-    }
-    const env = account.envList.find((e) => e.id === envId);
-    if (!env) {
-      return { rules: '', headers: undefined };
-    }
-    return this.parsedMap[`${accountName}/${env.name}`] || { rules: '', headers: undefined };
-  }
-
-  getEnvNameById(accountName, envId) {
-    const account = this.getAccount(accountName);
-    if (!account || !account.envList) {
-      return '';
-    }
-    const env = account.envList.find((e) => e.id === envId);
-    return env ? env.name : '';
-  }
-
   getRules(name, envName) {
-    return this.parsedMap[`${name}/${envName}`] || { rules: '', headers: undefined };
+    return this.parsedMap[`${name}/${envName}`] || '';
   }
 
   getAllAccounts() {
@@ -665,7 +617,7 @@ class AccountMgr {
         return;
       }
       const envList = [];
-      account.envList.forEach(({ name, id, rules }) => {
+      account.envList.forEach(({ name, rules }) => {
         if (!name || name[0] === '\r') {
           return;
         }
@@ -676,8 +628,7 @@ class AccountMgr {
         }
         envList.push({
           name,
-          id: id || encodeURIComponent(name),
-          envId: id || encodeURIComponent(name),
+          id: encodeURIComponent(name),
           rules,
         });
       });

package/lib/plugins/whistle.nohost/lib/uiServer/cgi/selectEnv.js

@@ -2,17 +2,7 @@ const { COOKIE_NAME, ENV_MAX_AGE, decodeURIComponentSafe, getClientId } = requir
 
 module.exports = (ctx) => {
   const { name, envId, redirect } = ctx.request.query;
-  let envName;
-  // 如果 envId 看起来像短ID（不包含编码的环境名特征），则通过 envId 查找 envName
-  if (envId && !envId.includes('%')) {
-    envName = ctx.accountMgr.getEnvNameById(name, envId);
-    // 如果没找到，回退到直接解码（兼容旧逻辑）
-    if (!envName) {
-      envName = decodeURIComponentSafe(envId);
-    }
-  } else {
-    envName = decodeURIComponentSafe(envId);
-  }
+  const envName = decodeURIComponentSafe(envId);
   const env = ctx.envMgr.setEnv(getClientId(ctx), name, envName);
   let value = '';
   if (env) {

package/lib/plugins/whistle.nohost/lib/uiServer/openAPI.js

@@ -17,19 +17,8 @@ const CGI_MAP = {
 };
 
 const getRules = (options) => {
-  const { account, name, env, envName, envId } = options;
-  let rules = '';
-  let headers;
-  // 如果传入了 envId，优先使用 envId 查询
-  if (envId && (account || name)) {
-    const result = accountMgr.getRulesByEnvId(account || name, envId);
-    rules = result.rules || '';
-    headers = result.headers;
-  } else {
-    const result = accountMgr.getRules(account || name, env || envName);
-    rules = result.rules || '';
-    headers = result.headers;
-  }
+  const { account, name, env, envName } = options;
+  let { rules = '', headers } = accountMgr.getRules(account || name, env || envName);
   if (headers) {
     headers = JSON.stringify(headers);
     if (headers.length > 2) {
@@ -51,27 +40,6 @@ module.exports = async (ctx, next) => {
     ctx.body = getRules(query);
     return;
   }
-
-  // Handle rename-env specially to preserve env id
-  if (cgiName === 'rename-env') {
-    const name = ctx.get('x-nohost-account-name');
-    const account = ctx.accountMgr.getAccount(name);
-    if (!account) {
-      return;
-    }
-    const curAuthKey = authKey && ctx.get('x-nohost-auth-key');
-    if (!curAuthKey || (authKey !== curAuthKey && curAuthKey !== ctx.accountMgr.defaultAuthKey)) {
-      ctx.status = 403;
-      return;
-    }
-    const { query } = ctx.request;
-    const oldName = query.name;
-    const newName = query.newValue || query.newName;
-    if (oldName && newName) {
-      ctx.accountMgr.renameEnv(name, oldName, newName);
-    }
-  }
-
   cgiName = CGI_MAP[cgiName];
   const name = ctx.get('x-nohost-account-name');
   const account = cgiName && ctx.accountMgr.getAccount(name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t880216t-server",
-  "version": "1.5.20",
+  "version": "1.5.21",
   "description": "Multi-user & multi-env web debugging proxy based on whistle",
   "main": "index.js",
   "bin": {