@nasl/cli 0.1.16 → 0.1.17

package/dist/bin/nasl.mjs

@@ -15,7 +15,7 @@ import require$$1$1 from 'tty';
 import require$$3 from 'http';
 import require$$4$1 from 'https';
 import require$$0$6 from 'url';
-import require$$8 from 'crypto';
+import crypto$1 from 'crypto';
 import http2 from 'http2';
 import zlib from 'zlib';
 import * as readline from 'readline';
@@ -6192,10 +6192,10 @@ var libExports = /*@__PURE__*/ requireLib();
  * 默认配置
  */
 const DEFAULT_CONFIG = {
-    serverBaseURL: 'https://nasl.lcap.163yun.com/api/v1/nasl',
+    serverBaseURL: 'https://nasl.lcap.163yun.com',
     representation: 'NaturalTS',
     namespaceResolution: 'filename-as-namespace',
-    ideVersion: '4.3',
+    ideVersion: '4.4',
     srcDir: 'src',
     outDir: 'out',
 };
@@ -22146,7 +22146,7 @@ function requireForm_data () {
 	var parseUrl = require$$0$6.parse;
 	var fs = require$$0$2;
 	var Stream = stream$4.Stream;
-	var crypto = require$$8;
+	var crypto = crypto$1;
 	var mime = requireMimeTypes();
 	var asynckit = requireAsynckit();
 	var setToStringTag = /*@__PURE__*/ requireEsSetTostringtag();
@@ -23055,7 +23055,7 @@ const generateString = (size = 16, alphabet = ALPHABET.ALPHA_DIGIT) => {
   let str = '';
   const {length} = alphabet;
   const randomValues = new Uint32Array(size);
-  require$$8.randomFillSync(randomValues);
+  crypto$1.randomFillSync(randomValues);
   for (let i = 0; i < size; i++) {
     str += alphabet[randomValues[i] % length];
   }
@@ -28840,14 +28840,199 @@ const {
   mergeConfig
 } = axios;
 
-function createAxios(baseURL) {
-    return axios.create({
+// Unique ID creation requires a high quality random # generator. In the browser we therefore
+// require the crypto API and do not support built-in fallback to lower quality random number
+// generators (like Math.random()).
+let getRandomValues;
+const rnds8 = new Uint8Array(16);
+function rng() {
+  // lazy load so that environments that need to polyfill have a chance to do so
+  if (!getRandomValues) {
+    // getRandomValues needs to be invoked in a context where "this" is a Crypto implementation.
+    getRandomValues = typeof crypto !== 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto);
+
+    if (!getRandomValues) {
+      throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
+    }
+  }
+
+  return getRandomValues(rnds8);
+}
+
+/**
+ * Convert array of 16 byte values to UUID string format of the form:
+ * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+ */
+
+const byteToHex = [];
+
+for (let i = 0; i < 256; ++i) {
+  byteToHex.push((i + 0x100).toString(16).slice(1));
+}
+
+function unsafeStringify(arr, offset = 0) {
+  // Note: Be careful editing this code!  It's been tuned for performance
+  // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
+  return byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]];
+}
+
+const randomUUID = typeof crypto !== 'undefined' && crypto.randomUUID && crypto.randomUUID.bind(crypto);
+var native = {
+  randomUUID
+};
+
+function v4(options, buf, offset) {
+  if (native.randomUUID && true && !options) {
+    return native.randomUUID();
+  }
+
+  options = options || {};
+  const rnds = options.random || (options.rng || rng)(); // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+
+  rnds[6] = rnds[6] & 0x0f | 0x40;
+  rnds[8] = rnds[8] & 0x3f | 0x80; // Copy bytes to buffer, if provided
+
+  return unsafeStringify(rnds);
+}
+
+/**
+ * 构建签名字符串
+ */
+function buildStringToSign(appKey, nonce, timestamp, secretKey) {
+    return `${appKey}&${nonce}&${timestamp}&${secretKey}`;
+}
+/**
+ * 生成 MD5 签名
+ */
+function generateSignature(plainText) {
+    return crypto$1.createHash('md5').update(plainText).digest('hex');
+}
+/**
+ * 生成客户端签名信息
+ * @param appKey AppKey
+ * @param secretKey SecretKey
+ * @returns 签名信息
+ */
+function generateClientSignature(appKey, secretKey) {
+    const timestamp = Math.floor(Date.now() / 1000).toString();
+    const nonce = v4();
+    const plainText = buildStringToSign(appKey, nonce, timestamp, secretKey);
+    const signature = generateSignature(plainText);
+    return {
+        appKey,
+        timestamp,
+        nonce,
+        signature,
+    };
+}
+/**
+ * 生成基础认证头
+ * @param ak AppKey
+ * @param sk SecretKey
+ * @returns 基础认证头
+ */
+function generateBaseHeaders(ak, sk) {
+    const { timestamp, signature, nonce } = generateClientSignature(ak, sk);
+    return {
+        'Content-Type': 'application/json',
+        'x-appKey': ak,
+        'x-timestamp': timestamp,
+        'x-nonce': nonce,
+        'x-signature': signature,
+    };
+}
+/**
+ * 获取租户的 signInfo
+ * @param options 服务器选项
+ * @param baseHeaders 基础认证头
+ * @returns x-signInfo 值
+ */
+async function fetchSignInfo(options, baseHeaders) {
+    const tenantName = options.tenantName || 'defaulttenant';
+    const userName = tenantName === 'defaulttenant' ? 'admin' : `${tenantName}-admin`;
+    const data = {
+        tenantName,
+        userName,
+        source: 'Normal',
+    };
+    const url = `${options.serverBaseURL}/openapi/v3/auth/getSignInfo`;
+    try {
+        const tempAxios = axios.create({
+            headers: baseHeaders,
+            timeout: 120000,
+        });
+        const response = await tempAxios.post(url, data);
+        return response?.data?.result || null;
+    }
+    catch (error) {
+        console.error('Error fetching sign info:', error.response?.data);
+        return null;
+    }
+}
+/**
+ * 生成完整的认证头（包含 x-signInfo）
+ * @param options 服务器选项
+ * @returns 完整的认证头
+ */
+async function generateCompleteHeaders(options) {
+    const headers = {
+        'Content-Type': 'application/json',
+    };
+    const OPENAPI_AK = options.OPENAPI_AK || process.env.LCAP_OPENAPI_AK;
+    const OPENAPI_SK = options.OPENAPI_SK || process.env.LCAP_OPENAPI_SK;
+    // 如果没有提供 ak 和 sk，返回基础 headers
+    if (!OPENAPI_AK || !OPENAPI_SK) {
+        throw new Error(`配置了 useOPENAPI，但没有提供 OPENAPI_AK 和 OPENAPI_SK:
+- 可取消配置 useOPENAPI
+- 在 nasl.config.json 中配置 OPENAPI_AK 和 OPENAPI_SK，或者在环境变量中配置 LCAP_OPENAPI_AK 和 LCAP_OPENAPI_SK`);
+    }
+    // 生成基础认证头
+    const baseHeaders = generateBaseHeaders(OPENAPI_AK, OPENAPI_SK);
+    Object.assign(headers, baseHeaders);
+    // 获取 signInfo
+    const signInfo = await fetchSignInfo(options, headers);
+    if (signInfo) {
+        headers['x-signInfo'] = signInfo;
+    }
+    return headers;
+}
+
+/**
+ * 创建 Axios 实例
+ * @param options 服务器选项，包含认证信息
+ * @returns Axios 实例
+ */
+async function createAxios(options) {
+    // 如果需要鉴权，拼接 /openapi/v3/nasl；否则使用原始 URL
+    const serverBaseURL = new URL(options.serverBaseURL).origin;
+    const useOPENAPI = options.useOPENAPI || process.env.USE_LCAP_OPENAPI === 'true';
+    const baseURL = useOPENAPI ? `${serverBaseURL}/openapi/v3/nasl` : `${serverBaseURL}/api/v1/nasl`;
+    // 如果需要鉴权，生成完整的认证头；否则只使用基础 headers
+    const headers = useOPENAPI ? await generateCompleteHeaders(options) : { 'Content-Type': 'application/json' };
+    console.log('本次服务调用方为:', baseURL);
+    const instance = axios.create({
         baseURL,
-        headers: {
-            'Content-Type': 'application/json',
-        },
+        headers,
         timeout: 120000,
     });
+    const oldPost = instance.post;
+    instance.post = async (url, data, config) => {
+        return oldPost(url, data, config).then((res) => {
+            const data = res.data;
+            if (data.code !== 200)
+                throw new Error(JSON.stringify(data));
+            return res;
+        }).catch((err) => {
+            // console.log(err.response ? err.response.data : err);
+            if (err.response) {
+                throw new Error(JSON.stringify(err.response.data));
+            }
+            else {
+                throw err;
+            }
+        });
+    };
+    return instance;
 }
 
 function truncate(str, maxLength) {
@@ -28861,13 +29046,11 @@ function truncate(str, maxLength) {
 async function compileApi(fullNaturalTS, options) {
     // 这里需要调用实际的编译服务接口
     // 示例实现：
-    const axios = createAxios(options.serverBaseURL);
+    const axios = await createAxios(options);
     const res = await axios.post(`/compile/tsx?ideVersion=${options.ideVersion}&needAnnotation=true`, fullNaturalTS, {
         headers: { 'Content-Type': 'text/plain' },
     });
     const data = res.data;
-    if (data.code !== 200)
-        throw new Error(data.message);
     const { bundle } = data.result;
     const fileMap = bundle.frontendBundle.files;
     const files = Object.keys(fileMap).map((key) => {
@@ -28895,7 +29078,7 @@ window.backendApp = app;
  * TODO: 实现具体的 API 调用逻辑
  */
 async function checkApi(fullNaturalTS, options) {
-    const axios = createAxios(options.serverBaseURL);
+    const axios = await createAxios(options);
     const res = await axios.post(`/check/tsx?ideVersion=${options.ideVersion}`, fullNaturalTS, {
         headers: { 'Content-Type': 'text/plain' },
     });
@@ -28913,7 +29096,7 @@ async function checkApi(fullNaturalTS, options) {
 async function createAppSyncApi(fullNaturalTS, options) {
     const url = new URL(options.serverBaseURL);
     const origin = url.origin + '/app-ai-creator';
-    const axios = createAxios(origin);
+    const axios = await createAxios({ serverBaseURL: origin});
     try {
         const res = await axios.post('/api/createAppSync', {
             fullNaturalTS,
@@ -37796,10 +37979,7 @@ async function compile(entry, options) {
     logger.info('正在调用编译服务...');
     try {
         const fullNaturalTS = composeToString(collectedFiles);
-        const outputFiles = await compileApi(fullNaturalTS, {
-            serverBaseURL: config.serverBaseURL,
-            ideVersion: config.ideVersion,
-        });
+        const outputFiles = await compileApi(fullNaturalTS, config);
         logger.success('编译成功！');
         // 写入输出文件
         for (const file of outputFiles) {
@@ -37846,10 +38026,7 @@ async function check(entry, options) {
         result = error.message.trim();
     }
     if (!result && fullNaturalTS) {
-        result = (await checkApi(fullNaturalTS, {
-            serverBaseURL: config.serverBaseURL,
-            ideVersion: config.ideVersion,
-        })).trim();
+        result = (await checkApi(fullNaturalTS, config)).trim();
     }
     const checkResult = {
         success: !result,
@@ -38189,15 +38366,13 @@ async function createAppInIde(entry, options) {
  * 编译 NASL 代码
  * TODO: 实现具体的 API 调用逻辑
  */
-async function transformJson2FilesApi(jsonContent, options) {
+async function transformJson2FilesApi(json, options) {
     // 示例实现：
-    const axios = createAxios(options.serverBaseURL);
-    const res = await axios.post(`/transform/json2files?ideVersion=${options.ideVersion}`, jsonContent, {
-        headers: { 'Content-Type': 'text/plain' },
+    const axios = await createAxios(options);
+    const res = await axios.post(`/transform/json2files?ideVersion=${options.ideVersion}`, json, {
+        headers: { 'Content-Type': 'application/json' },
     });
     const data = res.data;
-    if (data.code !== 200)
-        throw new Error(data.message);
     return data.result;
 }
 
@@ -38237,14 +38412,19 @@ const transformFns = {
         const projectRoot = getProjectRoot();
         logger.info(`项目根目录: ${projectRoot}`);
         logger.info(`源代码目录: ${config.srcDir}`);
+        if (!libExports.existsSync(config.srcDir)) {
+            logger.error(`当前目录下 ${config.srcDir} 目录不存在，请先创建`);
+            logger.exit(1);
+        }
         let jsonContent = '';
         if (!entry) {
             logger.warn('没有指定 JSON 文件路径，按照默认 IDE 版本的基础模板转换');
         }
         else {
             jsonContent = libExports.readFileSync(entry, 'utf-8');
+            logger.info(`读取到 JSON 文件: ${entry}`);
         }
-        const files = await transformJson2FilesApi(jsonContent, {
+        const files = await transformJson2FilesApi(jsonContent ? JSON.parse(jsonContent) : {}, {
             serverBaseURL: config.serverBaseURL,
             ideVersion: config.ideVersion,
         });
@@ -38276,7 +38456,7 @@ async function transform(transformType, entry, options) {
     await transformFn(entry, options);
 }
 
-var version = "0.1.16";
+var version = "0.1.17";
 var pkg = {
 	version: version};
 
@@ -38385,8 +38565,8 @@ program
         // 如果不是 quiet 模式，询问用户确认
         if (!options?.quiet) {
             defaultLogger.newLine();
-            defaultLogger.info('即将在 IDE 中创建应用，此操作将调用远程服务。');
-            const confirmed = await askForConfirmation('是否继续？(y/n): ');
+            defaultLogger.info('即将在 IDE 中创建新的应用，此操作将调用远程接口。');
+            const confirmed = await askForConfirmation('请确认是否继续？(y/N): ');
             if (!confirmed) {
                 defaultLogger.info('已取消操作');
                 process.exit(0);
@@ -38402,7 +38582,7 @@ program
 });
 program
     .command('transform <transformType> [entry]')
-    .description('转换文件格式\n  transformType: files2full (将 src 文件组合成 fullNaturalTS), json2files (将 JSON 转换为文件, 待实现), files2json (将 src 文件转换为 JSON)')
+    .description('转换文件格式\n  transformType: files2full (将 src 文件组合成 fullNaturalTS), json2files (将 JSON 转换为文件), files2json (将 src 文件转换为 JSON)')
     .option('-o, --output <outputPath>', '指定输出路径')
     .option('-v, --verbose', '显示详细信息，如依赖分析树')
     .action(async (transformType, entry, options) => {