esa-cli 1.0.3-beta.3 → 1.0.3

package/dist/commands/dev/ew2/devEntry.js

@@ -1,10 +1,8 @@
-import worker from '$userPath';
 import Cache from './mock/cache.js';
 import mockKV from './mock/kv.js';
+import worker from '$userPath';
 
-var mock_cache = new Cache($userPort);
-globalThis.mockCache = mock_cache;
+Cache.port = $userPort;
 mockKV.port = $userPort;
-globalThis.mockKV = mockKV;
 
 export default worker;

package/dist/commands/dev/ew2/mock/cache.js

@@ -1,7 +1,7 @@
 class MockCache {
-  constructor(port) {
-    this.port = port;
-  }
+  static port = 0;
+
+  constructor() {}
 
   async put(reqOrUrl, response) {
     if (arguments.length < 2) {
@@ -30,7 +30,7 @@ class MockCache {
 
       const key = this.normalizeKey(reqOrUrl);
       const fetchRes = await fetch(
-        `http://localhost:${this.port}/mock_cache/put`,
+        `http://localhost:${MockCache.port}/mock_cache/put`,
         {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
@@ -58,7 +58,7 @@ class MockCache {
   async get(reqOrUrl) {
     const key = this.normalizeKey(reqOrUrl);
     const fetchRes = await fetch(
-      `http://localhost:${this.port}/mock_cache/get`,
+      `http://localhost:${MockCache.port}/mock_cache/get`,
       {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -85,7 +85,7 @@ class MockCache {
   async delete(reqOrUrl) {
     const key = this.normalizeKey(reqOrUrl);
     const fetchRes = await fetch(
-      `http://localhost:${this.port}/mock_cache/delete`,
+      `http://localhost:${MockCache.port}/mock_cache/delete`,
       {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -113,4 +113,7 @@ class MockCache {
   }
 }
 
+var mock_cache = new MockCache();
+globalThis.mockCache = mock_cache;
+
 export default MockCache;

package/dist/commands/dev/ew2/mock/kv.js

@@ -163,4 +163,6 @@ class EdgeKV {
   }
 }
 
+globalThis.mockKV = EdgeKV;
+
 export default EdgeKV;

package/dist/commands/init/helper.js

@@ -17,7 +17,7 @@ import Haikunator from 'haikunator';
 import t from '../../i18n/index.js';
 import logger from '../../libs/logger.js';
 import Template from '../../libs/templates/index.js';
-import { execCommand } from '../../utils/command.js';
+import { execCommand, execWithLoginShell } from '../../utils/command.js';
 import { getDirName } from '../../utils/fileUtils/base.js';
 import { generateConfigFile, getCliConfig, getProjectConfig, getTemplatesConfig, templateHubPath, updateProjectConfigFile } from '../../utils/fileUtils/index.js';
 import promptParameter from '../../utils/prompt.js';
@@ -382,7 +382,7 @@ export const createProject = (initParams) => __awaiter(void 0, void 0, void 0, f
         const templateFlag = ((_a = frameworkConfig.language) === null || _a === void 0 ? void 0 : _a[initParams.language || 'typescript']) || '';
         const extraParams = frameworkConfig.params || '';
         const full = `${command} ${initParams.name} ${templateFlag} ${extraParams}`.trim();
-        const res = yield execCommand(['sh', '-lc', full], {
+        const res = yield execWithLoginShell(full, {
             interactive: true,
             startText: `Starting to execute framework command ${chalk.gray(full)}`,
             doneText: `Framework command executed  ${chalk.gray(full)}`

package/dist/index.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import chalk from 'chalk';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import logger from './libs/logger.js';
 import commit from './commands/commit/index.js';
 import config from './commands/config.js';
 import deploy from './commands/deploy/index.js';
@@ -25,6 +24,7 @@ import routeCommand from './commands/route/index.js';
 import routine from './commands/routine/index.js';
 import site from './commands/site/index.js';
 import t from './i18n/index.js';
+import logger from './libs/logger.js';
 import { handleCheckVersion, checkCLIVersion } from './utils/checkVersion.js';
 import { getCliConfig } from './utils/fileUtils/index.js';
 const main = () => __awaiter(void 0, void 0, void 0, function* () {

package/dist/libs/api.js

@@ -12,6 +12,7 @@ import * as $OpenApi from '@alicloud/openapi-client';
 import * as $Util from '@alicloud/tea-util';
 import { getApiConfig } from '../utils/fileUtils/index.js';
 import logger from './logger.js';
+import { CLI_USER_AGENT } from './constants.js';
 class Client {
     constructor() {
         this.callApi = (action, request) => __awaiter(this, void 0, void 0, function* () {
@@ -77,7 +78,8 @@ class Client {
         const apiConfig = new $OpenApi.Config({
             accessKeyId: (_a = config.auth) === null || _a === void 0 ? void 0 : _a.accessKeyId,
             accessKeySecret: (_b = config.auth) === null || _b === void 0 ? void 0 : _b.accessKeySecret,
-            endpoint: config.endpoint
+            endpoint: config.endpoint,
+            userAgent: CLI_USER_AGENT
         });
         return new ESA.default(apiConfig);
     }

package/dist/libs/apiService.js

@@ -13,13 +13,15 @@ import fetch from 'node-fetch';
 import t from '../i18n/index.js';
 import { getApiConfig } from '../utils/fileUtils/index.js';
 import { Environment } from './interface.js';
+import { CLI_USER_AGENT } from './constants.js';
 export class ApiService {
     constructor(cliConfig) {
         var _a, _b;
         let apiConfig = new $OpenApi.Config({
             accessKeyId: (_a = cliConfig.auth) === null || _a === void 0 ? void 0 : _a.accessKeyId,
             accessKeySecret: (_b = cliConfig.auth) === null || _b === void 0 ? void 0 : _b.accessKeySecret,
-            endpoint: cliConfig.endpoint
+            endpoint: cliConfig.endpoint,
+            userAgent: CLI_USER_AGENT
         });
         this.client = new $OpenApi.default.default(apiConfig);
     }
@@ -37,7 +39,8 @@ export class ApiService {
         let apiConfig = new $OpenApi.Config({
             accessKeyId: (_a = newConfig.auth) === null || _a === void 0 ? void 0 : _a.accessKeyId,
             accessKeySecret: (_b = newConfig.auth) === null || _b === void 0 ? void 0 : _b.accessKeySecret,
-            endpoint: newConfig.endpoint
+            endpoint: newConfig.endpoint,
+            userAgent: CLI_USER_AGENT
         });
         this.client = new $OpenApi.default.default(apiConfig);
     }

package/dist/libs/constants.js

@@ -0,0 +1,13 @@
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+const packageJson = require('../../package.json');
+/**
+ * CLI User-Agent string for API requests
+ * Format: esa-cli/{version}
+ * This helps identify requests originating from the CLI
+ */
+export const CLI_USER_AGENT = `esa-cli/${packageJson.version}`;
+/**
+ * CLI version from package.json
+ */
+export const CLI_VERSION = packageJson.version;

package/dist/libs/logger.js

@@ -63,9 +63,6 @@ class Logger {
     get ora() {
         return this.spinner;
     }
-    get isDebug() {
-        return this.logger.level === 'debug';
-    }
     setLogLevel(level) {
         this.logger.level = level;
     }

package/dist/utils/command.js

@@ -8,14 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { spawn } from 'child_process';
+import { platform } from 'os';
 import { cancel, spinner } from '@clack/prompts';
 import chalk from 'chalk';
-import logger from '../libs/logger.js';
+export const isWindows = platform() === 'win32';
 /**
  * Execute a shell command with rich options (spinner, capture, env, cwd).
  */
 export const execCommand = (command_1, ...args_1) => __awaiter(void 0, [command_1, ...args_1], void 0, function* (command, options = {}) {
-    const { startText, doneText, silent = false, captureOutput = false, useSpinner = true, realtimeOutput = false, interactive = false, env, cwd, transformOutput, fallbackOutput, errorMessage, debug = logger.isDebug } = options;
+    const { startText, doneText, silent = false, captureOutput = false, useSpinner = true, realtimeOutput = false, interactive = false, env, cwd, transformOutput, fallbackOutput, errorMessage, shell = false } = options;
     // Determine stdio mode based on options
     // If realtimeOutput is true, we need to pipe to capture and display output in real-time
     // If spinner is used without realtimeOutput, pipe to avoid TTY contention
@@ -56,7 +57,7 @@ export const execCommand = (command_1, ...args_1) => __awaiter(void 0, [command_
                 stdio,
                 cwd,
                 env: Object.assign(Object.assign({}, process.env), env),
-                shell: false
+                shell
             });
             if (stdio === 'pipe') {
                 (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (chunk) => {
@@ -141,27 +142,27 @@ export const execCommand = (command_1, ...args_1) => __awaiter(void 0, [command_
             if (stderr)
                 process.stderr.write(stderr);
         }
-        if (debug) {
-            console.error(chalk.red('\n--- DEBUG INFO ---'));
-            console.error(chalk.red(`Command: ${command.join(' ')}`));
-            if (cwd)
-                console.error(chalk.red(`CWD: ${cwd}`));
-            if (stdout)
-                console.error(chalk.red(`Stdout:\n${stdout}`));
-            if (stderr)
-                console.error(chalk.red(`Stderr:\n${stderr}`));
-            if (e instanceof Error && e.stack) {
-                console.error(chalk.red(`Stack:\n${e.stack}`));
-            }
-            else if (e && typeof e === 'object') {
-                console.error(chalk.red(`Error Object:\n${JSON.stringify(e, null, 2)}`));
-            }
-            console.error(chalk.red('------------------\n'));
-        }
         if (errorMessage) {
             cancel(errorMessage);
         }
         return { success: false, stdout, stderr };
     }
 });
+/**
+ * Execute a command with login shell on Unix (to load ~/.profile, ~/.zshrc etc.)
+ * On Windows, directly execute the command since login shell is not typically needed.
+ *
+ * @param commandStr - The full command string to execute
+ * @param options - ExecCommandOptions
+ */
+export const execWithLoginShell = (commandStr_1, ...args_1) => __awaiter(void 0, [commandStr_1, ...args_1], void 0, function* (commandStr, options = {}) {
+    if (isWindows) {
+        // Windows: use cmd /c to execute the command
+        return execCommand(['cmd', '/c', commandStr], options);
+    }
+    else {
+        // Unix: use login shell to ensure PATH is properly set (nvm, fnm, etc.)
+        return execCommand(['sh', '-lc', commandStr], options);
+    }
+});
 export default execCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "1.0.3-beta.3",
+  "version": "1.0.3",
   "description": "A CLI for operating Alibaba Cloud ESA Functions and Pages.",
   "main": "bin/enter.cjs",
   "type": "module",