esa-cli 0.0.2-beta.10 → 0.0.2-beta.13

package/dist/utils/checkAssetsExist.js

@@ -0,0 +1,80 @@
+import fs from 'fs';
+import path from 'path';
+import { getProjectConfig } from './fileUtils/index.js';
+/**
+ * Check if the assets directory exists in the project config
+ * @returns {boolean} true if the assets directory exists, false otherwise
+ */
+const checkConfigAssetsExist = () => {
+    var _a;
+    const projectConfig = getProjectConfig();
+    if (!projectConfig) {
+        return false;
+    }
+    const directory = (_a = projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory;
+    if (!directory) {
+        return false;
+    }
+    return true;
+};
+export var EDGE_ROUTINE_TYPE;
+(function (EDGE_ROUTINE_TYPE) {
+    EDGE_ROUTINE_TYPE["ASSETS_ONLY"] = "assets_only";
+    EDGE_ROUTINE_TYPE["JS_ONLY"] = "js_only";
+    EDGE_ROUTINE_TYPE["JS_AND_ASSETS"] = "js_and_assets";
+    EDGE_ROUTINE_TYPE["NOT_EXIST"] = "not_exist";
+})(EDGE_ROUTINE_TYPE || (EDGE_ROUTINE_TYPE = {}));
+/**
+ * Check if a path exists and is valid
+ * @param filePath - The path to check
+ * @param isDirectory - Whether the path should be a directory
+ * @returns boolean
+ */
+const isValidPath = (filePath, isDirectory = false) => {
+    if (!filePath || typeof filePath !== 'string' || filePath.trim() === '') {
+        return false;
+    }
+    try {
+        const resolvedPath = path.isAbsolute(filePath)
+            ? filePath
+            : path.resolve(filePath);
+        const exists = fs.existsSync(resolvedPath);
+        if (!exists) {
+            return false;
+        }
+        if (isDirectory) {
+            return fs.statSync(resolvedPath).isDirectory();
+        }
+        else {
+            return fs.statSync(resolvedPath).isFile();
+        }
+    }
+    catch (error) {
+        return false;
+    }
+};
+export const checkEdgeRoutineType = (scriptEntry, assetsDirectory, projectPath) => {
+    var _a;
+    const projectConfig = getProjectConfig(projectPath);
+    const entry = scriptEntry || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry);
+    const assets = assetsDirectory || ((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory);
+    const entryPath = path.resolve(projectPath !== null && projectPath !== void 0 ? projectPath : '', entry !== null && entry !== void 0 ? entry : '');
+    const assetsPath = path.resolve(projectPath !== null && projectPath !== void 0 ? projectPath : '', assets !== null && assets !== void 0 ? assets : '');
+    const hasAssets = isValidPath(assetsPath, true) && assets;
+    const hasEntry = isValidPath(entryPath, false) && entry;
+    // Both assets and entry exist
+    if (hasAssets && hasEntry) {
+        return EDGE_ROUTINE_TYPE.JS_AND_ASSETS;
+    }
+    // Only assets exist
+    if (hasAssets && !hasEntry) {
+        return EDGE_ROUTINE_TYPE.ASSETS_ONLY;
+    }
+    // Only entry exists
+    if (!hasAssets && hasEntry) {
+        return EDGE_ROUTINE_TYPE.JS_ONLY;
+    }
+    // Neither exists
+    return EDGE_ROUTINE_TYPE.NOT_EXIST;
+};
+export default checkConfigAssetsExist;

package/dist/utils/checkDevPort.js

@@ -7,12 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import portscanner from 'portscanner';
-import SelectItems from '../components/selectInput.js';
+import chalk from 'chalk';
 import inquirer from 'inquirer';
-import logger from '../libs/logger.js';
+import portscanner from 'portscanner';
 import t from '../i18n/index.js';
-import chalk from 'chalk';
+import logger from '../libs/logger.js';
 export const checkPort = (port) => {
     return new Promise((resolve) => {
         portscanner.checkPortStatus(port, '127.0.0.1', (error, status) => {
@@ -28,19 +27,6 @@ export const checkPort = (port) => {
         });
     });
 };
-const ask = () => {
-    return new Promise((resolve) => {
-        SelectItems({
-            items: [
-                { label: 'Yes', value: 'yes' },
-                { label: 'No', value: 'no' }
-            ],
-            handleSelect: (item) => __awaiter(void 0, void 0, void 0, function* () {
-                resolve(item.value === 'yes');
-            })
-        });
-    });
-};
 const findAvailablePort = (startPort) => __awaiter(void 0, void 0, void 0, function* () {
     return yield portscanner.findAPortNotInUse(startPort, 65535);
 });

package/dist/utils/checkEntryFileExist.js

@@ -0,0 +1,10 @@
+import fs from 'fs';
+import { getProjectConfig } from './fileUtils/index.js';
+export const checkEntryFileExist = () => {
+    const projectConfig = getProjectConfig();
+    const entry = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry;
+    if (!entry) {
+        return true;
+    }
+    return fs.existsSync(entry);
+};

package/dist/utils/checkIsRoutineCreated.js

@@ -7,16 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import path from 'path';
-import { createEdgeRoutine } from '../commands/commit/index.js';
-import { displaySelectSpec } from '../commands/deploy/index.js';
-import { ApiService } from '../libs/apiService.js';
-import { readEdgeRoutineFile } from './fileUtils/index.js';
-import logger from '../libs/logger.js';
-import t from '../i18n/index.js';
-import prodBuild from '../commands/commit/prodBuild.js';
 import { exit } from 'process';
 import chalk from 'chalk';
+import t from '../i18n/index.js';
+import { ApiService } from '../libs/apiService.js';
+import logger from '../libs/logger.js';
 export function isRoutineExist(name) {
     return __awaiter(this, void 0, void 0, function* () {
         const server = yield ApiService.getInstance();
@@ -34,38 +29,28 @@ export function validRoutine(name) {
         }
     });
 }
-export function checkRoutineExist(name, entry) {
+/**
+ * Ensure routine exists, if not, create a new routine
+ * @param name - Routine name
+ */
+export function ensureRoutineExists(name) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const isCreatedRoutine = yield isRoutineExist(name);
-        if (!isCreatedRoutine) {
+        const isExist = yield isRoutineExist(name);
+        // If routine does not exist, create a new routine
+        if (!isExist) {
             logger.log(t('first_deploy').d('This is the first time to deploy, we will create a new routine for you.'));
-            const entryFile = path.resolve(entry !== null && entry !== void 0 ? entry : '', 'src/index.js');
-            yield prodBuild(false, entryFile, entry);
-            const code = readEdgeRoutineFile(entry) || '';
             const server = yield ApiService.getInstance();
-            const specList = ((_b = (_a = (yield server.ListRoutineOptionalSpecs())) === null || _a === void 0 ? void 0 : _a.data.Specs) !== null && _b !== void 0 ? _b : []).reduce((acc, item) => {
-                if (item.IsAvailable) {
-                    acc.push(item.SpecName);
-                }
-                return acc;
-            }, []);
-            const spec = yield displaySelectSpec(specList);
-            console.log({
-                name: name,
-                specName: spec,
-                code: code
-            });
-            const res = yield createEdgeRoutine({
+            const createRes = yield server.createRoutine({
                 name: name,
-                specName: spec,
-                code: code
+                description: ''
             });
-            if (res) {
+            const isSuccess = (createRes === null || createRes === void 0 ? void 0 : createRes.data.Status) === 'OK';
+            if (isSuccess) {
                 logger.success(t('routine_create_success').d('Routine created successfully.'));
             }
             else {
                 logger.error(t('routine_create_fail').d('Routine created failed.'));
+                exit();
             }
         }
     });

package/dist/utils/checkVersion.js

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { promises as fs } from 'fs';
-import { getDirName } from '../utils/fileUtils/base.js';
 import path from 'path';
+import { getDirName } from '../utils/fileUtils/base.js';
 export function handleCheckVersion() {
     return __awaiter(this, void 0, void 0, function* () {
         const __dirname = getDirName(import.meta.url);

package/dist/utils/compress.js

@@ -0,0 +1,80 @@
+/*
+ Toml Example:
+name = "DeepSeek model invocation"
+description = 'How to invoke DeepSeek series models through API calls on the BaiLian platform.'
+entry = "src/index.js"
+assets = ["src/assets"]
+codeVersions = [ ]
+
+[assets]
+directory = './assets/'
+
+[dev]
+port = 18080
+localUpstream = ''
+*/
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import fs from 'fs';
+import path from 'path';
+import AdmZip from 'adm-zip';
+import prodBuild from '../commands/commit/prodBuild.js';
+import { checkEdgeRoutineType, EDGE_ROUTINE_TYPE } from './checkAssetsExist.js';
+import { getProjectConfig, readEdgeRoutineFile } from './fileUtils/index.js';
+const compress = (scriptEntry_1, assetsDir_1, ...args_1) => __awaiter(void 0, [scriptEntry_1, assetsDir_1, ...args_1], void 0, function* (scriptEntry, assetsDir, minify = false, projectPath) {
+    var _a;
+    let code;
+    const zip = new AdmZip();
+    const projectConfig = getProjectConfig(projectPath);
+    const routineType = checkEdgeRoutineType(scriptEntry, assetsDir, projectPath);
+    if (!projectConfig) {
+        throw new Error('Project config not found');
+    }
+    // 参数优先：如果有参数则使用参数，否则使用配置文件中的值
+    const entry = scriptEntry || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry);
+    let assetsDirectory = assetsDir || ((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory);
+    if (routineType === EDGE_ROUTINE_TYPE.NOT_EXIST) {
+        throw new Error('Entry file not found in project config');
+    }
+    if (routineType === EDGE_ROUTINE_TYPE.JS_ONLY ||
+        routineType === EDGE_ROUTINE_TYPE.JS_AND_ASSETS) {
+        const buildEntry = path.resolve(projectPath !== null && projectPath !== void 0 ? projectPath : '', entry !== null && entry !== void 0 ? entry : '');
+        yield prodBuild(minify, buildEntry, projectPath);
+        code = readEdgeRoutineFile(projectPath);
+        zip.addFile(`routine/index.js`, Buffer.from(code || ''));
+    }
+    assetsDirectory = path.resolve(projectPath !== null && projectPath !== void 0 ? projectPath : '', assetsDirectory !== null && assetsDirectory !== void 0 ? assetsDirectory : '');
+    // Add all files in the assets directory to the /assets directory
+    if ((routineType === EDGE_ROUTINE_TYPE.JS_AND_ASSETS ||
+        routineType === EDGE_ROUTINE_TYPE.ASSETS_ONLY) &&
+        assetsDirectory &&
+        fs.existsSync(assetsDirectory)) {
+        const addDirectoryToZip = (dirPath, zipPath) => {
+            const files = fs.readdirSync(dirPath);
+            for (const file of files) {
+                const fullPath = path.join(dirPath, file);
+                const stat = fs.statSync(fullPath);
+                if (stat.isDirectory()) {
+                    addDirectoryToZip(fullPath, path.join(zipPath, file));
+                }
+                else {
+                    const fileContent = fs.readFileSync(fullPath);
+                    const relativePath = path.relative(assetsDirectory, fullPath);
+                    zip.addFile(`assets/${relativePath}`, fileContent);
+                }
+            }
+        };
+        addDirectoryToZip(assetsDirectory, 'assets');
+    }
+    //输出zip
+    zip.writeZip('testassets.zip');
+    return zip;
+});
+export default compress;

package/dist/utils/download.js

@@ -7,16 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import fetch from 'node-fetch';
+import { exec } from 'child_process';
 import * as fs from 'fs/promises';
-import * as path from 'path';
 import os from 'os';
-import AdmZip from 'adm-zip';
-import { exec } from 'child_process';
+import * as path from 'path';
 import { promisify } from 'util';
+import AdmZip from 'adm-zip';
+import chalk from 'chalk';
+import fetch from 'node-fetch';
 import t from '../i18n/index.js';
 import logger from '../libs/logger.js';
-import chalk from 'chalk';
 const execAsync = promisify(exec);
 function getBinDir() {
     const home = os.homedir();

package/dist/utils/fileMd5.js

@@ -1,5 +1,5 @@
-import fs from 'fs-extra';
 import crypto from 'crypto';
+import fs from 'fs-extra';
 export function calculateFileMD5(filePath) {
     return new Promise((resolve, reject) => {
         const hash = crypto.createHash('md5');

package/dist/utils/fileUtils/index.js

@@ -7,14 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import fs from 'fs';
+import fs, { promises as fsPromises } from 'fs';
 import os from 'os';
 import path from 'path';
 import toml from '@iarna/toml';
-import { promises as fsPromises } from 'fs';
-import { getDirName, getRoot } from './base.js';
-import logger from '../../libs/logger.js';
 import t from '../../i18n/index.js';
+import logger from '../../libs/logger.js';
+import { getDirName, getRoot } from './base.js';
 const projectConfigFile = 'esa.toml';
 const __dirname = getDirName(import.meta.url);
 const root = getRoot();
@@ -76,11 +75,20 @@ export function readConfigFile(configPath) {
     if (fs.existsSync(configPath)) {
         const configFileContent = fs.readFileSync(configPath, 'utf-8');
         try {
-            const config = toml.parse(configFileContent);
-            return config;
+            if (configPath.endsWith('.jsonc') || configPath.endsWith('.json')) {
+                // Remove comments for JSON parsing
+                const jsonContent = configFileContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*$/gm, '');
+                const config = JSON.parse(jsonContent);
+                return config;
+            }
+            else {
+                // TOML format
+                const config = toml.parse(configFileContent);
+                return config;
+            }
         }
         catch (error) {
-            logger.error(`Error parsing TOML file: ${error}`);
+            logger.error(`Error parsing config file: ${error}`);
             return null;
         }
     }
@@ -94,11 +102,16 @@ export function getCliConfig() {
     return res;
 }
 export function getProjectConfig(filePath = root) {
-    const res = readConfigFile(path.join(filePath, projectConfigFile));
-    if (!res) {
-        return null;
+    // Try to find config file in order of preference: .jsonc, .toml
+    const configFormats = ['esa.jsonc', 'esa.toml'];
+    for (const format of configFormats) {
+        const configPath = path.join(filePath, format);
+        const config = readConfigFile(configPath);
+        if (config) {
+            return config;
+        }
     }
-    return res;
+    return null;
 }
 export function readEdgeRoutineFile(projectPath = root) {
     const projectConfig = getProjectConfig(projectPath);
@@ -122,26 +135,62 @@ export function getConfigurations() {
         return [null, null];
     }
 }
-export function generateConfigFile(projectName, initConfigs) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const newFilePath = path.join(process.cwd(), 'esa.toml');
-        const currentDirName = path.basename(process.cwd());
-        const entry = ((_a = initConfigs === null || initConfigs === void 0 ? void 0 : initConfigs.dev) === null || _a === void 0 ? void 0 : _a.entry) || 'src/index.js';
+export function generateConfigFile(projectName_1, initConfigs_1, targetDir_1) {
+    return __awaiter(this, arguments, void 0, function* (projectName, initConfigs, targetDir, configFormat = 'toml', isSinglePageApplication = false) {
+        var _a, _b;
+        const outputDir = targetDir !== null && targetDir !== void 0 ? targetDir : process.cwd();
+        const currentDirName = path.basename(outputDir);
+        const entry = (_a = initConfigs === null || initConfigs === void 0 ? void 0 : initConfigs.dev) === null || _a === void 0 ? void 0 : _a.entry;
         const port = (initConfigs === null || initConfigs === void 0 ? void 0 : initConfigs.port) || 18080;
         const name = projectName || currentDirName;
-        if (fs.existsSync(newFilePath)) {
-            logger.error(t('generate_config_error').d('esa.toml already exists'));
-            return;
+        const assetsDirectory = (_b = initConfigs === null || initConfigs === void 0 ? void 0 : initConfigs.assets) === null || _b === void 0 ? void 0 : _b.directory;
+        let newFilePath;
+        let genConfig;
+        if (configFormat === 'jsonc') {
+            newFilePath = path.join(outputDir, 'esa.jsonc');
+            const assetsBlock = assetsDirectory
+                ? `,
+  "assets": {
+    "directory": "${assetsDirectory}"
+    ${isSinglePageApplication
+                    ? `,
+  "notFoundStrategy": "singlePageApplication"`
+                    : ''}
+  }`
+                : '';
+            const entryBlock = entry
+                ? `,
+  "entry": "${entry}"`
+                : '';
+            genConfig = `{
+  "name": "${name}"${entryBlock}${assetsBlock},
+  "dev": {
+    "port": ${port}
+  }
+}`;
         }
         else {
-            const genConfig = `name = "${name}"
+            // Default to TOML format
+            newFilePath = path.join(outputDir, 'esa.toml');
+            const assetsBlock = assetsDirectory
+                ? `
+[assets]
+directory = "${assetsDirectory}"
+`
+                : '';
+            genConfig = `name = "${name}"
 entry = "${entry}"
+${assetsBlock}${isSinglePageApplication ? 'notFoundStrategy = "singlePageApplication"' : ''}
 [dev]
 port = ${port}
   `;
+        }
+        if (fs.existsSync(newFilePath)) {
+            logger.error(t('generate_config_error').d(`${path.basename(newFilePath)} already exists`));
+            return;
+        }
+        else {
             yield fsPromises.writeFile(newFilePath, genConfig, 'utf-8');
-            logger.success(t('generate_config_success').d('Generated esa.toml'));
         }
     });
 }

package/dist/utils/installDeno.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { exec, execSync } from 'child_process';
 import os from 'os';
 import path from 'path';
+import t from '../i18n/index.js';
 import logger from '../libs/logger.js';
-import { getDirName } from './fileUtils/base.js';
 import { downloadRuntimeAndUnzipForWindows } from './download.js';
-import t from '../i18n/index.js';
+import { getDirName } from './fileUtils/base.js';
 export function preCheckDeno() {
     return __awaiter(this, void 0, void 0, function* () {
         const command = yield checkDenoInstalled();
@@ -45,7 +45,7 @@ export function checkDenoInstalled() {
             .then((res) => {
             resolve(res);
         })
-            .catch((err) => {
+            .catch(() => {
             resolve(false);
         });
     });

package/dist/utils/installEw2.js

@@ -7,17 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { execSync } from 'child_process';
+import https from 'https';
 import os from 'os';
-import fs from 'fs-extra';
 import path from 'path';
 import util from 'util';
-import https from 'https';
-import { execSync } from 'child_process';
-import logger from '../libs/logger.js';
-import { getDirName } from './fileUtils/base.js';
+import fs from 'fs-extra';
 import t from '../i18n/index.js';
-import { calculateFileMD5 } from './fileMd5.js';
+import logger from '../libs/logger.js';
 import { checkOS } from './checkOS.js';
+import { calculateFileMD5 } from './fileMd5.js';
+import { getDirName } from './fileUtils/base.js';
 export const EW2DirName = '.ew2';
 export const EW2BinName = 'edgeworker2';
 export const EW2Path = path.join(os.homedir(), EW2DirName);
@@ -79,7 +79,7 @@ export function fetchRemoteManifest() {
                 }
             });
         })
-            .on('error', (err) => reject);
+            .on('error', () => reject);
     });
 }
 export function checkManifest() {

package/dist/utils/openInBrowser.js

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import open from 'open';
-import logger from '../libs/logger.js';
 import t from '../i18n/index.js';
+import logger from '../libs/logger.js';
 /**
  * Open url in browser
  * @param {string} url

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.2-beta.10",
+  "version": "0.0.2-beta.13",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -18,9 +18,10 @@
     "watch": "tsc --watch",
     "eslint": "eslint src/ --ext .js,.jsx,.ts,.tsx",
     "lint-staged": "lint-staged",
-    "prepare": "npm run build",
-    "test": "FORCE_COLOR=0 npx vitest ",
-    "coverage": "vitest --coverage"
+    "test": "vitest --coverage",
+    "coverage": "vitest --coverage",
+    "lint": "eslint src/",
+    "lint:fix": "eslint src/ --fix"
   },
   "keywords": [
     "cli",
@@ -50,9 +51,13 @@
     "@types/portscanner": "^2.1.4",
     "@types/react": "^18.2.47",
     "@types/yargs": "^17.0.32",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.9.1",
     "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",
+    "eslint-import-resolver-alias": "^1.1.2",
+    "eslint-import-resolver-typescript": "^4.4.4",
+    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.3",
@@ -67,7 +72,7 @@
     "vitest": "^2.0.4"
   },
   "dependencies": {
-    "@alicloud/esa20240910": "2.8.1",
+    "@alicloud/esa20240910": "2.25.0",
     "@alicloud/openapi-client": "^0.4.7",
     "@babel/generator": "^7.26.3",
     "@babel/parser": "^7.24.4",
@@ -80,7 +85,7 @@
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.5",
     "cross-spawn": "^7.0.3",
-    "esa-template": "^0.0.3",
+    "esa-template": "^0.0.7",
     "esbuild": "^0.21.1",
     "esbuild-plugin-less": "^1.3.8",
     "form-data": "^4.0.0",