@cloudbase/cli 2.10.0-beta.0 → 2.11.0-beta.0

package/lib/utils/notice.js

@@ -1,37 +1,26 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNotification = void 0;
 const net_1 = require("./net");
 const store_1 = require("./store");
 const url = 'https://tcli.service.tcloudbase.com/notify';
 const ONE_DAY = 86400000;
-function getNotification() {
-    return __awaiter(this, void 0, void 0, function* () {
+async function getNotification() {
+    return null;
+    const now = Date.now();
+    const lastTime = await store_1.commonStore.get('lastNotifyTime');
+    const diff = now - Number(lastTime);
+    const day = new Date(lastTime).getDay();
+    const today = new Date().getDay();
+    if (day === today && diff < ONE_DAY)
         return null;
-        const now = Date.now();
-        const lastTime = yield store_1.commonStore.get('lastNotifyTime');
-        const diff = now - Number(lastTime);
-        const day = new Date(lastTime).getDay();
-        const today = new Date().getDay();
-        if (day === today && diff < ONE_DAY)
-            return null;
-        const lastUid = yield store_1.commonStore.get('lastNotificationUid');
-        const data = yield (0, net_1.postFetch)(url);
-        const uid = (data === null || data === void 0 ? void 0 : data.uid) || 0;
-        if (Number(lastUid) >= Number(uid))
-            return;
-        yield store_1.commonStore.set('readNotificationUid', data.uid);
-        yield store_1.commonStore.set('lastNotifyTime', Date.now());
-        return data;
-    });
+    const lastUid = await store_1.commonStore.get('lastNotificationUid');
+    const data = await (0, net_1.postFetch)(url);
+    const uid = (data === null || data === void 0 ? void 0 : data.uid) || 0;
+    if (Number(lastUid) >= Number(uid))
+        return;
+    await store_1.commonStore.set('readNotificationUid', data.uid);
+    await store_1.commonStore.set('lastNotifyTime', Date.now());
+    return data;
 }
 exports.getNotification = getNotification;

package/lib/utils/output/loading.js

@@ -1,13 +1,4 @@
 "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 };
 };
@@ -48,7 +39,7 @@ const loadingFactory = () => {
     return new Loading();
 };
 exports.loadingFactory = loadingFactory;
-const execWithLoading = (task, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const execWithLoading = async (task, options = {}) => {
     const { startTip, successTip, failTip } = options;
     const loading = (0, exports.loadingFactory)();
     const flush = (text) => {
@@ -56,7 +47,7 @@ const execWithLoading = (task, options = {}) => __awaiter(void 0, void 0, void 0
     };
     try {
         loading.start(startTip);
-        const res = yield task(flush);
+        const res = await task(flush);
         successTip ? loading.succeed(successTip) : loading.stop();
         return res;
     }
@@ -64,5 +55,5 @@ const execWithLoading = (task, options = {}) => __awaiter(void 0, void 0, void 0
         failTip ? loading.fail(failTip) : loading.stop();
         throw e;
     }
-});
+};
 exports.execWithLoading = execWithLoading;

package/lib/utils/parallel.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AsyncTaskParallelController = void 0;
 class AsyncTaskParallelController {
@@ -24,41 +15,39 @@ class AsyncTaskParallelController {
         this.tasks.push(task);
         this.totalTasks = this.tasks.length;
     }
-    run() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const results = [];
-            const taskHasRun = [];
-            const taskDone = [];
-            let runningTask = 0;
-            return new Promise((resolve) => {
-                const timer = setInterval(() => {
-                    const taskDoneLength = taskDone.filter((item) => item).length;
-                    if (runningTask === 0 && taskDoneLength === this.totalTasks) {
-                        clearInterval(timer);
-                        resolve(results);
+    async run() {
+        const results = [];
+        const taskHasRun = [];
+        const taskDone = [];
+        let runningTask = 0;
+        return new Promise((resolve) => {
+            const timer = setInterval(() => {
+                const taskDoneLength = taskDone.filter((item) => item).length;
+                if (runningTask === 0 && taskDoneLength === this.totalTasks) {
+                    clearInterval(timer);
+                    resolve(results);
+                }
+                if (runningTask >= this.maxParallel) {
+                    return;
+                }
+                this.tasks.forEach((task, index) => {
+                    if (!taskHasRun[index] && runningTask < this.maxParallel) {
+                        runningTask++;
+                        taskHasRun[index] = 1;
+                        task()
+                            .then((res) => {
+                            results[index] = res;
+                        })
+                            .catch((err) => {
+                            results[index] = err;
+                        })
+                            .then(() => {
+                            runningTask--;
+                            taskDone[index] = 1;
+                        });
                     }
-                    if (runningTask >= this.maxParallel) {
-                        return;
-                    }
-                    this.tasks.forEach((task, index) => {
-                        if (!taskHasRun[index] && runningTask < this.maxParallel) {
-                            runningTask++;
-                            taskHasRun[index] = 1;
-                            task()
-                                .then((res) => {
-                                results[index] = res;
-                            })
-                                .catch((err) => {
-                                results[index] = err;
-                            })
-                                .then(() => {
-                                runningTask--;
-                                taskDone[index] = 1;
-                            });
-                        }
-                    });
-                }, this.checkInterval);
-            });
+                });
+            }, this.checkInterval);
         });
     }
 }

package/lib/utils/platform/mac.js

@@ -1,13 +1,4 @@
 "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 };
 };
@@ -27,11 +18,9 @@ function getMacAddress() {
     });
 }
 exports.getMacAddress = getMacAddress;
-function getMacAddressMd5() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const mac = yield getMacAddress();
-        const macMD5 = (0, tools_1.md5)(mac);
-        return macMD5;
-    });
+async function getMacAddressMd5() {
+    const mac = await getMacAddress();
+    const macMD5 = (0, tools_1.md5)(mac);
+    return macMD5;
 }
 exports.getMacAddressMd5 = getMacAddressMd5;

package/lib/utils/platform/port.js

@@ -1,13 +1,4 @@
 "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 };
 };
@@ -15,12 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPort = void 0;
 const portfinder_1 = __importDefault(require("portfinder"));
 const PORT = 9012;
-function getPort() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const port = yield portfinder_1.default.getPortPromise({
-            port: PORT
-        });
-        return port;
+async function getPort() {
+    const port = await portfinder_1.default.getPortPromise({
+        port: PORT
     });
+    return port;
 }
 exports.getPort = getPort;

package/lib/utils/prompt/select.js

@@ -1,31 +1,22 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pagingSelectPromp = void 0;
 const enquirer_1 = require("enquirer");
 const error_1 = require("../../error");
 const i18n_1 = require("../../i18n");
-const pagingSelectPromp = (type, listFetcher, options, message, filter = _ => true, mapper = item => item) => __awaiter(void 0, void 0, void 0, function* () {
+const pagingSelectPromp = async (type, listFetcher, options, message, filter = _ => true, mapper = item => item) => {
     let res = [];
     let offset = 0;
     let nextRoundList;
     const nextPageText = (0, i18n_1.t)('下一页');
     while (true) {
-        const thisRoundList = nextRoundList || (yield listFetcher(Object.assign(Object.assign({}, options), { limit: 10, offset: offset }))).filter(filter).map(mapper);
+        const thisRoundList = nextRoundList || (await listFetcher({ ...options, limit: 10, offset: offset })).filter(filter).map(mapper);
         offset += 10;
-        nextRoundList = (yield listFetcher(Object.assign(Object.assign({}, options), { limit: 10, offset: offset }))).filter(filter).map(mapper);
+        nextRoundList = (await listFetcher({ ...options, limit: 10, offset: offset })).filter(filter).map(mapper);
         if (!thisRoundList || !thisRoundList.length)
             throw new error_1.CloudBaseError((0, i18n_1.t)('列表没有数据'));
         if (type === 'select') {
-            let receiver = (yield (0, enquirer_1.prompt)({
+            let receiver = (await (0, enquirer_1.prompt)({
                 type: type,
                 name: 'receiver',
                 message: message,
@@ -36,7 +27,7 @@ const pagingSelectPromp = (type, listFetcher, options, message, filter = _ => tr
                 break;
         }
         else {
-            let { receiver } = yield (0, enquirer_1.prompt)({
+            let { receiver } = await (0, enquirer_1.prompt)({
                 type: type,
                 name: 'receiver',
                 message: message,
@@ -50,5 +41,5 @@ const pagingSelectPromp = (type, listFetcher, options, message, filter = _ => tr
         }
     }
     return res;
-});
+};
 exports.pagingSelectPromp = pagingSelectPromp;

package/lib/utils/report.js

@@ -1,13 +1,4 @@
 "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 };
 };
@@ -45,34 +36,38 @@ class BeaconAction {
         ].join('|');
         return crypto_1.default.createHash('sha256').update(deviceInfo).digest('hex').substring(0, 32);
     }
-    report(eventCode, eventData = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const now = Date.now();
-            return (0, net_1.postFetch)('https://otheve.beacon.qq.com/analytics/v2_upload', {
-                appVersion: '',
-                sdkId: 'js',
-                sdkVersion: '4.5.14-web',
-                mainAppKey: '0WEB0AD0GM4PUUU1',
-                platformId: 3,
-                common: {
-                    A2: this.deviceId,
-                    A101: this.userAgent,
-                    from: 'tcb-cli',
-                    xDeployEnv: process.env.NODE_ENV
-                },
-                events: [
-                    {
-                        eventCode,
-                        eventTime: String(now),
-                        mapValue: Object.assign(Object.assign({}, eventData), this.additionalParams)
+    async report(eventCode, eventData = {}) {
+        const now = Date.now();
+        return (0, net_1.postFetch)('https://otheve.beacon.qq.com/analytics/v2_upload', {
+            appVersion: '',
+            sdkId: 'js',
+            sdkVersion: '4.5.14-web',
+            mainAppKey: '0WEB0AD0GM4PUUU1',
+            platformId: 3,
+            common: {
+                A2: this.deviceId,
+                A101: this.userAgent,
+                from: 'tcb-cli',
+                xDeployEnv: process.env.NODE_ENV
+            },
+            events: [
+                {
+                    eventCode,
+                    eventTime: String(now),
+                    mapValue: {
+                        ...eventData,
+                        ...this.additionalParams
                     }
-                ]
-            }).catch((e) => {
-            });
+                }
+            ]
+        }).catch((e) => {
         });
     }
     addAdditionalParams(params) {
-        this.additionalParams = Object.assign(Object.assign({}, this.additionalParams), params);
+        this.additionalParams = {
+            ...this.additionalParams,
+            ...params
+        };
     }
 }
 exports.beaconAction = new BeaconAction();

package/lib/utils/reporter/agree.js

@@ -1,31 +1,20 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectAgree = void 0;
 const net_1 = require("../net");
 const platform_1 = require("../platform");
 const store_1 = require("../store");
 const url = 'https://tcli.service.tcloudbase.com/agree-collect';
-function collectAgree(agree) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const uin = yield (0, store_1.getUin)();
-        const macMd5 = yield (0, platform_1.getMacAddressMd5)();
-        const os = yield (0, platform_1.getOSInfo)();
-        const data = {
-            macMd5,
-            agree,
-            uin,
-            os
-        };
-        return (0, net_1.postFetch)(url, data);
-    });
+async function collectAgree(agree) {
+    const uin = await (0, store_1.getUin)();
+    const macMd5 = await (0, platform_1.getMacAddressMd5)();
+    const os = await (0, platform_1.getOSInfo)();
+    const data = {
+        macMd5,
+        agree,
+        uin,
+        os
+    };
+    return (0, net_1.postFetch)(url, data);
 }
 exports.collectAgree = collectAgree;

package/lib/utils/reporter/download.js

@@ -1,37 +1,26 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.templateDownloadReport = void 0;
 const net_1 = require("../net");
 const platform_1 = require("../platform");
 const store_1 = require("../store");
 const url = 'https://tcli.service.tcloudbase.com/download';
-function templateDownloadReport(templateId, templateName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const uin = yield (0, store_1.getUin)();
-        const os = yield (0, platform_1.getOSInfo)();
-        const macMd5 = yield (0, platform_1.getMacAddressMd5)();
-        const data = {
-            os,
-            uin,
-            macMd5,
-            templateId,
-            templateName,
-            version: process.CLI_VERSION
-        };
-        try {
-            yield (0, net_1.postFetch)(url, data);
-        }
-        catch (e) {
-        }
-    });
+async function templateDownloadReport(templateId, templateName) {
+    const uin = await (0, store_1.getUin)();
+    const os = await (0, platform_1.getOSInfo)();
+    const macMd5 = await (0, platform_1.getMacAddressMd5)();
+    const data = {
+        os,
+        uin,
+        macMd5,
+        templateId,
+        templateName,
+        version: process.CLI_VERSION
+    };
+    try {
+        await (0, net_1.postFetch)(url, data);
+    }
+    catch (e) {
+    }
 }
 exports.templateDownloadReport = templateDownloadReport;

package/lib/utils/reporter/usage.js

@@ -1,32 +1,21 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectUsage = void 0;
 const net_1 = require("../net");
 const platform_1 = require("../platform");
 const store_1 = require("../store");
 const url = 'https://tcli.service.tcloudbase.com/usage';
-function collectUsage(command) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const uin = yield (0, store_1.getUin)();
-        const macMd5 = yield (0, platform_1.getMacAddressMd5)();
-        const os = yield (0, platform_1.getOSInfo)();
-        const data = {
-            os,
-            uin,
-            macMd5,
-            command,
-            version: process.CLI_VERSION
-        };
-        return (0, net_1.postFetch)(url, data);
-    });
+async function collectUsage(command) {
+    const uin = await (0, store_1.getUin)();
+    const macMd5 = await (0, platform_1.getMacAddressMd5)();
+    const os = await (0, platform_1.getOSInfo)();
+    const data = {
+        os,
+        uin,
+        macMd5,
+        command,
+        version: process.CLI_VERSION
+    };
+    return (0, net_1.postFetch)(url, data);
 }
 exports.collectUsage = collectUsage;

package/lib/utils/store/auth.js

@@ -1,13 +1,4 @@
 "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 };
 };
@@ -26,23 +17,21 @@ class AuthStore extends db_1.LocalStore {
         this.defaults = defaults;
         this.moveOldConfig();
     }
-    moveOldConfig() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const db = yield this.getDB();
-            const oldConfigPath = path_1.default.resolve(os_1.default.homedir(), '.config', 'configstore', '@cloudbase', 'cli.json');
-            if ((0, fs_2.checkFullAccess)(oldConfigPath)) {
-                try {
-                    const content = JSON.parse(fs_1.default.readFileSync(oldConfigPath, 'utf8'));
-                    const { credential, ssh } = content;
-                    yield db.set(constant_1.ConfigItems.credential, credential).write();
-                    yield db.set(constant_1.ConfigItems.ssh, ssh).write();
-                    fs_1.default.unlinkSync(oldConfigPath);
-                }
-                catch (e) {
-                    fs_1.default.unlinkSync(oldConfigPath);
-                }
+    async moveOldConfig() {
+        const db = await this.getDB();
+        const oldConfigPath = path_1.default.resolve(os_1.default.homedir(), '.config', 'configstore', '@cloudbase', 'cli.json');
+        if ((0, fs_2.checkFullAccess)(oldConfigPath)) {
+            try {
+                const content = JSON.parse(fs_1.default.readFileSync(oldConfigPath, 'utf8'));
+                const { credential, ssh } = content;
+                await db.set(constant_1.ConfigItems.credential, credential).write();
+                await db.set(constant_1.ConfigItems.ssh, ssh).write();
+                fs_1.default.unlinkSync(oldConfigPath);
+            }
+            catch (e) {
+                fs_1.default.unlinkSync(oldConfigPath);
             }
-        });
+        }
     }
 }
 exports.authStore = new AuthStore({
@@ -50,10 +39,8 @@ exports.authStore = new AuthStore({
     [constant_1.ConfigItems.credential]: {},
     [constant_1.ConfigItems.ssh]: {}
 });
-function getUin() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const credential = yield exports.authStore.get(constant_1.ConfigItems.credential);
-        return (credential === null || credential === void 0 ? void 0 : credential.uin) || (0, i18n_1.t)('无');
-    });
+async function getUin() {
+    const credential = await exports.authStore.get(constant_1.ConfigItems.credential);
+    return (credential === null || credential === void 0 ? void 0 : credential.uin) || (0, i18n_1.t)('无');
 }
 exports.getUin = getUin;

package/lib/utils/store/config.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configStore = void 0;
 const commands_1 = require("../../commands");
@@ -16,22 +7,17 @@ class ConfigStore extends db_1.LocalStore {
     constructor() {
         super({}, 'config');
     }
-    get(key) {
-        const _super = Object.create(null, {
-            get: { get: () => super.get }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const value = yield _super.get.call(this, key);
-            if (value !== undefined)
-                return value;
-            const envKey = commands_1.CONFIGS[key].envKey;
-            if (envKey) {
-                const envValue = process.env[envKey];
-                if (envValue !== undefined)
-                    return envValue;
-            }
-            return commands_1.DEFAULT_CONFIGS[key];
-        });
+    async get(key) {
+        const value = await super.get(key);
+        if (value !== undefined)
+            return value;
+        const envKey = commands_1.CONFIGS[key].envKey;
+        if (envKey) {
+            const envValue = process.env[envKey];
+            if (envValue !== undefined)
+                return envValue;
+        }
+        return commands_1.DEFAULT_CONFIGS[key];
     }
     getSync(key) {
         const value = super.getSyncDB().get(key).value();