[fix] fix hosting and storage path error on windows

Author: chhpt

lib/auth/logout.js

@@ -11,8 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const constant_1 = require("../constant");
-const logger_1 = require("../logger");
-const error_1 = require("../error");
 function logout() {
     return __awaiter(this, void 0, void 0, function* () {
         const credentail = utils_1.getCredentialData();
@@ -22,12 +20,10 @@ function logout() {
             }
             utils_1.authStore.delete(constant_1.ConfigItems.credentail);
             utils_1.authStore.delete(constant_1.ConfigItems.ssh);
-            logger_1.successLog('注销登录成功！');
         }
         catch (e) {
             utils_1.authStore.delete(constant_1.ConfigItems.credentail);
             utils_1.authStore.delete(constant_1.ConfigItems.ssh);
-            throw new error_1.CloudBaseError('云端设备登录记录删除失败，请手动删除！');
         }
     });
 }

lib/commands/logout.js

@@ -1,11 +1,24 @@
 "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 });
 const commander_1 = __importDefault(require("commander"));
 const auth_1 = require("../auth");
+const logger_1 = require("../logger");
 commander_1.default
     .command('logout')
     .description('登出腾讯云账号')
-    .action(auth_1.logout);
+    .action(() => __awaiter(void 0, void 0, void 0, function* () {
+    yield auth_1.logout();
+    logger_1.successLog('注销登录成功！');
+}));

lib/commands/storage.js

@@ -59,12 +59,18 @@ commander_1.default
             logger_1.successLog(`上传${fileText}成功！`);
         });
         if (isDir) {
-            yield storageService.uploadDirectory(resolveLocalPath, cloudPath, {
+            yield storageService.uploadDirectory({
+                localPath: resolveLocalPath,
+                cloudPath,
                 onProgress
             });
         }
         else {
-            yield storageService.uploadFile(resolveLocalPath, cloudPath, onProgress);
+            yield storageService.uploadFile({
+                localPath: resolveLocalPath,
+                cloudPath,
+                onProgress
+            });
         }
     });
 });
@@ -87,10 +93,16 @@ commander_1.default
         const loading = utils_1.loadingFactory();
         loading.start(`下载${fileText}中`);
         if (dir) {
-            yield storageService.downloadDirectory(cloudPath, resolveLocalPath);
+            yield storageService.downloadDirectory({
+                localPath: resolveLocalPath,
+                cloudPath
+            });
         }
         else {
-            yield storageService.downloadFile(cloudPath, resolveLocalPath);
+            yield storageService.downloadFile({
+                cloudPath,
+                localPath: resolveLocalPath
+            });
         }
         loading.succeed(`下载${fileText}成功！`);
     });

lib/hosting.js

@@ -94,7 +94,11 @@ function hostingList(options) {
         const hosting = yield checkHostingStatus(envId);
         const { bucket, regoin } = hosting;
         const storageService = yield getStorageService(envId);
-        const list = yield storageService.walkCloudDirCustom('', bucket, regoin);
+        const list = yield storageService.walkCloudDirCustom({
+            prefix: '',
+            bucket,
+            region: regoin
+        });
         return list;
     });
 }
@@ -141,12 +145,20 @@ function hostingDeploy(options) {
         const { bucket, regoin } = hosting;
         const storageService = yield getStorageService(envId);
         if (utils_1.isDirectory(resolvePath)) {
-            yield storageService.uploadDirectoryCustom(resolvePath, cloudPath, bucket, regoin, {
+            yield storageService.uploadDirectoryCustom({
+                localPath: resolvePath,
+                cloudPath,
+                bucket,
+                region: regoin,
                 onProgress
             });
         }
         else {
-            yield storageService.uploadFileCustom(resolvePath, cloudPath, bucket, regoin, {
+            yield storageService.uploadFileCustom({
+                localPath: resolvePath,
+                cloudPath,
+                bucket,
+                region: regoin,
                 onProgress
             });
         }
@@ -160,7 +172,11 @@ function hostingDelete(options) {
         const { bucket, regoin } = hosting;
         const storageService = yield getStorageService(envId);
         if (isDir) {
-            yield storageService.deleteDirectoryCustom(cloudPath, bucket, regoin);
+            yield storageService.deleteDirectoryCustom({
+                cloudPath,
+                bucket,
+                region: regoin
+            });
         }
         else {
             yield storageService.deleteFileCustom([cloudPath], bucket, regoin);

lib/index.js

@@ -15,6 +15,7 @@ const utils_1 = require("./utils");
 module.exports = class CloudBase {
     constructor(secretId, secretKey) {
         this.login = auth_1.login;
+        this.logout = auth_1.logout;
         this.env = {
             list: env_1.listEnvs,
             create: env_1.createEnv,

lib/storage.js

@@ -32,31 +32,43 @@ function uploadFile(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const { envId, localPath, cloudPath } = options;
         const storageService = yield getStorageService(envId);
-        return storageService.uploadFile(localPath, cloudPath);
+        return storageService.uploadFile({
+            localPath,
+            cloudPath
+        });
     });
 }
 exports.uploadFile = uploadFile;
 function uploadDirectory(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const { envId, localPath, cloudPath } = options;
         const storageService = yield getStorageService(envId);
-        return storageService.uploadDirectory(localPath, cloudPath);
+        return storageService.uploadDirectory({
+            localPath,
+            cloudPath
+        });
     });
 }
 exports.uploadDirectory = uploadDirectory;
 function downloadFile(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const { envId, localPath, cloudPath } = options;
         const storageService = yield getStorageService(envId);
-        return storageService.downloadFile(cloudPath, localPath);
+        return storageService.downloadFile({
+            cloudPath,
+            localPath
+        });
     });
 }
 exports.downloadFile = downloadFile;
 function downloadDirectory(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const { envId, localPath, cloudPath } = options;
         const storageService = yield getStorageService(envId);
-        return storageService.downloadDirectory(cloudPath, localPath);
+        return storageService.downloadDirectory({
+            cloudPath,
+            localPath
+        });
     });
 }
 exports.downloadDirectory = downloadDirectory;

package-lock.json

@@ -7,7 +7,8 @@
         "build": "rimraf lib types && tsc",
         "eslint": "eslint \"./**/*.ts\"",
         "test": "jest --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000",
-        "publish": "node scripts/publish.js"
+        "publish": "node scripts/publish.js",
+        "pkg": "pkg ./bin/cloudbase.js --out-path ./pkg"
     },
     "repository": {
         "type": "git",
@@ -25,7 +26,7 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@cloudbase/manager-node": "^1.3.0",
+        "@cloudbase/manager-node": "^2.0.0",
         "@sentry/node": "^5.10.2",
         "address": "^1.1.2",
         "archiver": "^3.1.1",

package.json

@@ -1,7 +1,5 @@
 import { getCredentialData, authStore, refreshTmpToken } from '../utils'
 import { ConfigItems } from '../constant'
-import { successLog } from '../logger'
-import { CloudBaseError } from '../error'
 
 // 注销登录信息
 export async function logout() {
@@ -17,10 +15,8 @@ export async function logout() {
         }
         authStore.delete(ConfigItems.credentail)
         authStore.delete(ConfigItems.ssh)
-        successLog('注销登录成功！')
     } catch (e) {
         authStore.delete(ConfigItems.credentail)
         authStore.delete(ConfigItems.ssh)
-        throw new CloudBaseError('云端设备登录记录删除失败，请手动删除！')
     }
 }