@jayfong/x-server 2.78.2 → 2.79.0

package/lib/_cjs/cli/env_util.js

@@ -10,7 +10,7 @@ var _inquirer = _interopRequireDefault(require("inquirer"));
 var _vtils = require("vtils");
 var _yaml = require("yaml");
 class EnvUtil {
-  static async getAllChannel(cwd) {
+  static async getAllChannel(cwd, excludeChannels) {
     const channelFiles = await (0, _globby.default)(['.env@*'], {
       cwd: cwd,
       onlyFiles: true,
@@ -19,11 +19,14 @@ class EnvUtil {
     if (channelFiles.length === 0) {
       return [];
     }
-    const channels = (0, _vtils.uniq)(channelFiles.map(channel => channel.split('@').pop().split('.')[0]));
+    let channels = (0, _vtils.uniq)(channelFiles.map(channel => channel.split('@').pop().split('.')[0]));
+    if (excludeChannels?.length) {
+      channels = (0, _vtils.difference)(channels, excludeChannels);
+    }
     return channels;
   }
-  static async chooseChannel(cwd) {
-    const channels = await EnvUtil.getAllChannel(cwd);
+  static async chooseChannel(cwd, excludeChannels) {
+    const channels = await EnvUtil.getAllChannel(cwd, excludeChannels);
     if (channels.length === 0) return undefined;
     if (channels.length === 1) return channels[0];
     const res = await _inquirer.default.prompt([{
@@ -35,12 +38,14 @@ class EnvUtil {
     return res.channel || undefined;
   }
   static async withChannel(options) {
-    if (options.channel === '_') {
-      const channel = await EnvUtil.chooseChannel(options.cwd);
+    if (options.channel?.startsWith('_')) {
+      const excludeChannels = options.channel.split('!')[1]?.split(',').filter(Boolean);
+      const channel = await EnvUtil.chooseChannel(options.cwd, excludeChannels);
       console.log(`========= ${channel} =========`);
       await options.cb(channel);
-    } else if (options.channel === '@') {
-      const channels = await EnvUtil.getAllChannel(options.cwd);
+    } else if (options.channel?.startsWith('@')) {
+      const excludeChannels = options.channel.split('!')[1]?.split(',').filter(Boolean);
+      const channels = await EnvUtil.getAllChannel(options.cwd, excludeChannels);
       for (const channel of channels) {
         console.log(`========= ${channel} =========`);
         await options.cb(channel);

package/lib/_cjs/services/crypto.js

@@ -120,7 +120,7 @@ class CryptoService {
    * @param key - 用于加密的密钥（仅支持16字节的密钥）。
    */
   aesEncrypt(text, key) {
-    const cipher = _nodeCrypto.default.createCipheriv('aes-128-ecb', key, null);
+    const cipher = _nodeCrypto.default.createCipheriv('aes-128-ecb', key.substring(0, 16), null);
     let encrypted = cipher.update(text, 'utf8', 'base64');
     encrypted += cipher.final('base64');
     return encrypted;
@@ -133,7 +133,7 @@ class CryptoService {
    * @param key - 用于解密的密钥（仅支持16字节的密钥）。
    */
   aesDecrypt(text, key) {
-    const decipher = _nodeCrypto.default.createDecipheriv('aes-128-ecb', key, null);
+    const decipher = _nodeCrypto.default.createDecipheriv('aes-128-ecb', key.substring(0, 16), null);
     let decrypted = decipher.update(text, 'base64', 'utf8');
     decrypted += decipher.final('utf8');
     return decrypted;

package/lib/cli/env_util.d.ts

@@ -9,8 +9,8 @@ export declare class EnvUtil {
     static RE_NEWLINES: RegExp;
     static NEWLINES_MATCH: RegExp;
     static COMMENT_MATCH: RegExp;
-    static getAllChannel(cwd: string): Promise<string[]>;
-    static chooseChannel(cwd: string): Promise<string | undefined>;
+    static getAllChannel(cwd: string, excludeChannels?: string[]): Promise<string[]>;
+    static chooseChannel(cwd: string, excludeChannels?: string[]): Promise<string | undefined>;
     static withChannel(options: {
         cwd: string;
         channel?: string;

package/lib/cli/env_util.js

@@ -2,10 +2,10 @@ import path from 'node:path';
 import fs from 'fs-extra';
 import globby from 'globby';
 import inquirer from 'inquirer';
-import { dedent, escapeRegExp, isPlainObject, uniq } from 'vtils';
+import { dedent, difference, escapeRegExp, isPlainObject, uniq } from 'vtils';
 import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
-  static async getAllChannel(cwd) {
+  static async getAllChannel(cwd, excludeChannels) {
     const channelFiles = await globby(['.env@*'], {
       cwd: cwd,
       onlyFiles: true,
@@ -14,11 +14,14 @@ export class EnvUtil {
     if (channelFiles.length === 0) {
       return [];
     }
-    const channels = uniq(channelFiles.map(channel => channel.split('@').pop().split('.')[0]));
+    let channels = uniq(channelFiles.map(channel => channel.split('@').pop().split('.')[0]));
+    if (excludeChannels?.length) {
+      channels = difference(channels, excludeChannels);
+    }
     return channels;
   }
-  static async chooseChannel(cwd) {
-    const channels = await EnvUtil.getAllChannel(cwd);
+  static async chooseChannel(cwd, excludeChannels) {
+    const channels = await EnvUtil.getAllChannel(cwd, excludeChannels);
     if (channels.length === 0) return undefined;
     if (channels.length === 1) return channels[0];
     const res = await inquirer.prompt([{
@@ -30,12 +33,14 @@ export class EnvUtil {
     return res.channel || undefined;
   }
   static async withChannel(options) {
-    if (options.channel === '_') {
-      const channel = await EnvUtil.chooseChannel(options.cwd);
+    if (options.channel?.startsWith('_')) {
+      const excludeChannels = options.channel.split('!')[1]?.split(',').filter(Boolean);
+      const channel = await EnvUtil.chooseChannel(options.cwd, excludeChannels);
       console.log(`========= ${channel} =========`);
       await options.cb(channel);
-    } else if (options.channel === '@') {
-      const channels = await EnvUtil.getAllChannel(options.cwd);
+    } else if (options.channel?.startsWith('@')) {
+      const excludeChannels = options.channel.split('!')[1]?.split(',').filter(Boolean);
+      const channels = await EnvUtil.getAllChannel(options.cwd, excludeChannels);
       for (const channel of channels) {
         console.log(`========= ${channel} =========`);
         await options.cb(channel);

package/lib/services/crypto.js

@@ -115,7 +115,7 @@ export class CryptoService {
    * @param key - 用于加密的密钥（仅支持16字节的密钥）。
    */
   aesEncrypt(text, key) {
-    const cipher = crypto.createCipheriv('aes-128-ecb', key, null);
+    const cipher = crypto.createCipheriv('aes-128-ecb', key.substring(0, 16), null);
     let encrypted = cipher.update(text, 'utf8', 'base64');
     encrypted += cipher.final('base64');
     return encrypted;
@@ -128,7 +128,7 @@ export class CryptoService {
    * @param key - 用于解密的密钥（仅支持16字节的密钥）。
    */
   aesDecrypt(text, key) {
-    const decipher = crypto.createDecipheriv('aes-128-ecb', key, null);
+    const decipher = crypto.createDecipheriv('aes-128-ecb', key.substring(0, 16), null);
     let decrypted = decipher.update(text, 'base64', 'utf8');
     decrypted += decipher.final('utf8');
     return decrypted;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.78.2",
+  "version": "2.79.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",