@cloudbase/cli 2.7.2 → 2.7.3

package/lib/commands/functions/code-download.js

@@ -102,8 +102,7 @@ let CodeDownload = class CodeDownload extends common_1.Command {
                 envId,
                 functionName: name,
                 destPath: destPath,
-                codeSecret: codeSecret,
-                unzip: true
+                codeSecret: codeSecret
             });
             loading.succeed(`[${name}] 云函数代码下载成功！`);
         });

package/lib/commands/functions/layer/download.js

@@ -86,8 +86,7 @@ let DownloadFileLayer = class DownloadFileLayer extends common_1.Command {
             yield (0, function_1.downloadLayer)({
                 destPath,
                 version: Number(version),
-                name: layer,
-                unzip: true
+                name: layer
             });
             loading.succeed('文件下载成功！');
         });

package/lib/function/code.js

@@ -8,45 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadFunctionCode = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const unzipper_1 = __importDefault(require("unzipper"));
 const utils_1 = require("../utils");
+const common_1 = require("../utils/tools/common");
 const scfService = utils_1.CloudApiService.getInstance('scf');
 function downloadFunctionCode(options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { destPath, envId, functionName, codeSecret, unzip = false } = options;
+        const { destPath, envId, functionName, codeSecret } = options;
         (0, utils_1.checkFullAccess)(destPath, true);
         const { Url } = yield scfService.request('GetFunctionAddress', {
             FunctionName: functionName,
             Namespace: envId,
             CodeSecret: codeSecret
         });
-        const res = yield (0, utils_1.fetchStream)(Url);
-        const zipPath = path_1.default.join(destPath, `${functionName}.zip`);
-        const dest = fs_1.default.createWriteStream(zipPath);
-        res.body.pipe(dest);
-        return new Promise(resolve => {
-            dest.on('close', () => {
-                if (!unzip) {
-                    resolve();
-                    return;
-                }
-                const unzipStream = unzipper_1.default.Extract({
-                    path: destPath
-                });
-                fs_1.default.createReadStream(zipPath).pipe(unzipStream);
-                unzipStream.on('close', () => {
-                    (0, utils_1.delSync)([zipPath]);
-                    resolve();
-                });
-            });
-        });
+        return (0, common_1.downloadAndExtractRemoteZip)(Url, destPath);
     });
 }
 exports.downloadFunctionCode = downloadFunctionCode;

package/lib/function/layer/download.js

@@ -13,15 +13,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadLayer = void 0;
-const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const unzipper_1 = __importDefault(require("unzipper"));
 const utils_1 = require("../../utils");
 const error_1 = require("../../error");
+const common_1 = require("../../utils/tools/common");
 const scfService = new utils_1.CloudApiService('scf');
 function downloadLayer(options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { name, version, destPath, unzip = false } = options;
+        const { name, version, destPath } = options;
         const res = yield scfService.request('GetLayerVersion', {
             LayerName: name,
             LayerVersion: version
@@ -31,25 +30,7 @@ function downloadLayer(options) {
         if ((0, utils_1.checkFullAccess)(zipPath)) {
             throw new error_1.CloudBaseError(`文件已存在：${zipPath}`);
         }
-        const streamRes = yield (0, utils_1.fetchStream)(url);
-        const dest = fs_1.default.createWriteStream(zipPath);
-        streamRes.body.pipe(dest);
-        return new Promise(resolve => {
-            dest.on('close', () => {
-                if (!unzip) {
-                    resolve();
-                    return;
-                }
-                const unzipStream = unzipper_1.default.Extract({
-                    path: destPath
-                });
-                fs_1.default.createReadStream(zipPath).pipe(unzipStream);
-                unzipStream.on('close', () => {
-                    (0, utils_1.delSync)([zipPath]);
-                    resolve();
-                });
-            });
-        });
+        return (0, common_1.downloadAndExtractRemoteZip)(url, destPath);
     });
 }
 exports.downloadLayer = downloadLayer;

package/lib/utils/tools/common.js

@@ -0,0 +1,69 @@
+"use strict";
+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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.downloadAndExtractRemoteZip = void 0;
+const toolbox_1 = require("@cloudbase/toolbox");
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const unzipper_1 = __importDefault(require("unzipper"));
+function downloadAndExtractRemoteZip(downloadUrl, targetPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const downloadResponse = yield (0, toolbox_1.fetchStream)(downloadUrl);
+        if (!downloadResponse.ok) {
+            throw new Error(`下载失败，状态码: ${downloadResponse.status}`);
+        }
+        if (!downloadResponse.body) {
+            throw new Error('下载响应中没有数据流');
+        }
+        const dirPath = path_1.default.resolve(targetPath);
+        yield fs_extra_1.default.ensureDir(dirPath);
+        yield new Promise((resolve, reject) => {
+            let fileCount = 0;
+            let extractedCount = 0;
+            downloadResponse
+                .body.pipe(unzipper_1.default.Parse())
+                .on('error', reject)
+                .on('entry', (entry) => __awaiter(this, void 0, void 0, function* () {
+                const filePath = path_1.default.join(dirPath, entry.path);
+                try {
+                    yield fs_extra_1.default.ensureDir(path_1.default.dirname(filePath));
+                    if (entry.type === 'Directory') {
+                        yield fs_extra_1.default.ensureDir(filePath);
+                        extractedCount++;
+                    }
+                    else {
+                        fileCount++;
+                        entry
+                            .pipe(fs_extra_1.default.createWriteStream(filePath))
+                            .on('error', reject)
+                            .on('finish', () => {
+                            extractedCount++;
+                            checkCompletion();
+                        });
+                    }
+                }
+                catch (err) {
+                    reject(err);
+                }
+            }))
+                .on('close', checkCompletion);
+            function checkCompletion() {
+                if (fileCount > 0 && fileCount === extractedCount) {
+                    resolve('');
+                }
+            }
+        });
+    });
+}
+exports.downloadAndExtractRemoteZip = downloadAndExtractRemoteZip;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.7.2",
+    "version": "2.7.3",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {

package/types/function/code.d.ts

@@ -3,7 +3,6 @@ interface IFunctionCodeOptions {
     destPath: string;
     functionName: string;
     codeSecret?: string;
-    unzip?: boolean;
 }
 export declare function downloadFunctionCode(options: IFunctionCodeOptions): Promise<void>;
 export {};

package/types/function/layer/download.d.ts

@@ -3,6 +3,5 @@ export interface ILayerDownloadOptions {
     version: number;
     destPath: string;
     force?: boolean;
-    unzip?: boolean;
 }
 export declare function downloadLayer(options: ILayerDownloadOptions): Promise<void>;

package/types/utils/tools/common.d.ts

@@ -0,0 +1 @@
+export declare function downloadAndExtractRemoteZip(downloadUrl: string, targetPath: string): Promise<void>;