fix windows login error & add deploy default config

Author: chhpt

bin/cloudbase.js

@@ -5,6 +5,7 @@ const Sentry = require('@sentry/node')
 const program = require('commander')
 const logSymbols = require('log-symbols')
 const updateNotifier = require('update-notifier')
+const address = require('address')
 const pkg = require('../package.json')
 
 const isBeta = pkg.version.indexOf('-') > -1
@@ -45,7 +46,8 @@ Sentry.configureScope(scope => {
     try {
         const credential = store.authStore.get('credential') || {}
         scope.setUser({
-            uin: credential.uin || ''
+            uin: credential.uin || '',
+            ip: address.ip() || ''
         })
     } catch (e) {
         Sentry.captureException(e)

lib/commands/functions/deploy.js

@@ -66,7 +66,8 @@ function deploy(ctx, commandOptions) {
                         runtime: 'Nodejs8.9',
                         installDependency: true
                     },
-                    handler: 'index.main'
+                    handler: 'index.main',
+                    ignore: ['node_modules', 'node_modules/**/*']
                 };
             }
             else {

lib/utils/auth.js

@@ -17,6 +17,7 @@ const crypto_1 = __importDefault(require("crypto"));
 const portfinder_1 = __importDefault(require("portfinder"));
 const query_string_1 = __importDefault(require("query-string"));
 const open_1 = __importDefault(require("open"));
+const address_1 = __importDefault(require("address"));
 var cli_table_1 = require("./cli-table");
 exports.printCliTable = cli_table_1.printCliTable;
 const store_1 = require("./store");
@@ -37,17 +38,15 @@ function getPort() {
     });
 }
 function getMacAddress() {
-    const networkInterfaces = os_1.default.networkInterfaces();
-    const options = ['eth0', 'eth1', 'en0', 'en1'];
-    let netInterface = [];
-    options.some(key => {
-        if (networkInterfaces[key]) {
-            netInterface = networkInterfaces[key];
-            return true;
-        }
+    return new Promise(resolve => {
+        address_1.default.mac((err, mac) => {
+            if (err) {
+                resolve('');
+                return;
+            }
+            resolve(mac);
+        });
     });
-    const mac = (netInterface.length && netInterface[0].mac) || '';
-    return mac;
 }
 function getOSInfo() {
     const hostname = os_1.default.hostname();
@@ -63,7 +62,7 @@ function md5(str) {
 }
 function refreshTmpToken(metaData) {
     return __awaiter(this, void 0, void 0, function* () {
-        const mac = getMacAddress();
+        const mac = yield getMacAddress();
         const hash = md5(mac);
         metaData.hash = hash;
         const res = yield utils_1.fetch(refreshTokenUrl, {
@@ -148,9 +147,12 @@ function getAuthTokenFromWeb() {
             loading.start('正在打开腾讯云获取授权');
             try {
                 const { server, port } = yield createLocalServer();
-                const mac = getMacAddress();
+                const mac = yield getMacAddress();
                 const os = getOSInfo();
                 const hash = md5(mac);
+                if (!mac) {
+                    throw new error_1.CloudBaseError('获取 Mac 地址失败，无法登录！');
+                }
                 const CliAuthUrl = `${CliAuthBaseUrl}?port=${port}&hash=${hash}&mac=${mac}&os=${os}`;
                 yield open_1.default(CliAuthUrl);
                 loading.succeed('已打开云开发 CLI 授权页面，请在云开发 CLI 授权页面同意授权！');

lib/utils/function-packer.js

@@ -82,7 +82,8 @@ class FunctionPacker {
         });
     }
     clean() {
-        del_1.default.sync([this.funcDistPath, this.tmpPath]);
+        this.funcDistPath && del_1.default.sync([this.funcDistPath]);
+        this.tmpPath && del_1.default.sync([this.tmpPath]);
     }
 }
 exports.FunctionPacker = FunctionPacker;

package-lock.json

@@ -21,6 +21,7 @@
   "license": "ISC",
   "dependencies": {
     "@sentry/node": "^5.7.1",
+    "address": "^1.1.2",
     "archiver": "^3.1.1",
     "arg": "^4.1.1",
     "chalk": "^2.4.2",

package.json

@@ -63,7 +63,8 @@ export async function deploy(ctx: FunctionContext, commandOptions) {
                     runtime: 'Nodejs8.9',
                     installDependency: true
                 },
-                handler: 'index.main'
+                handler: 'index.main',
+                ignore: ['node_modules', 'node_modules/**/*']
             }
         } else {
             throw new CloudBaseError(`函数 ${name} 配置不存在`)

src/commands/functions/deploy.ts

@@ -1,4 +1,9 @@
-import { CloudService, FunctionPacker, CodeType, loadingFactory } from '../utils'
+import {
+    CloudService,
+    FunctionPacker,
+    CodeType,
+    loadingFactory
+} from '../utils'
 import { CloudBaseError } from '../error'
 import { ICreateFunctionOptions } from '../types'
 import { createFunctionTriggers } from './trigger'

src/function/create.ts

@@ -4,6 +4,7 @@ import crypto from 'crypto'
 import portfinder from 'portfinder'
 import queryString from 'query-string'
 import open from 'open'
+import address from 'address'
 
 import { Credential, AuthSecret } from '../types'
 export { printCliTable } from './cli-table'
@@ -33,18 +34,16 @@ async function getPort(): Promise<number> {
 }
 
 // 获取本机 Mac 地址
-function getMacAddress(): string {
-    const networkInterfaces = os.networkInterfaces()
-    const options = ['eth0', 'eth1', 'en0', 'en1']
-    let netInterface: os.NetworkInterfaceInfo[] = []
-    options.some(key => {
-        if (networkInterfaces[key]) {
-            netInterface = networkInterfaces[key]
-            return true
-        }
+function getMacAddress(): Promise<string> {
+    return new Promise(resolve => {
+        address.mac((err, mac) => {
+            if (err) {
+                resolve('')
+                return
+            }
+            resolve(mac)
+        })
     })
-    const mac: string = (netInterface.length && netInterface[0].mac) || ''
-    return mac
 }
 
 // 获取 hostname 和平台信息
@@ -69,7 +68,7 @@ function md5(str: string): string {
 export async function refreshTmpToken(
     metaData: Credential & { isLogout?: boolean }
 ): Promise<Credential> {
-    const mac = getMacAddress()
+    const mac = await getMacAddress()
     const hash = md5(mac)
     metaData.hash = hash
 
@@ -164,10 +163,14 @@ export async function getAuthTokenFromWeb(): Promise<Credential> {
 
         try {
             const { server, port } = await createLocalServer()
-            const mac = getMacAddress()
+            const mac = await getMacAddress()
             const os = getOSInfo()
             const hash = md5(mac)
 
+            if (!mac) {
+                throw new CloudBaseError('获取 Mac 地址失败，无法登录！')
+            }
+
             const CliAuthUrl = `${CliAuthBaseUrl}?port=${port}&hash=${hash}&mac=${mac}&os=${os}`
             await open(CliAuthUrl)
 

src/utils/auth.ts

@@ -80,7 +80,9 @@ export class FunctionPacker {
                 return code
             } catch (error) {
                 this.clean()
-                throw new CloudBaseError(`函数代码打包失败：\n ${error.message}`)
+                throw new CloudBaseError(
+                    `函数代码打包失败：\n ${error.message}`
+                )
             }
         }
 
@@ -90,12 +92,15 @@ export class FunctionPacker {
                 return code
             } catch (error) {
                 this.clean()
-                throw new CloudBaseError(`函数代码打包失败：\n ${error.message}`)
+                throw new CloudBaseError(
+                    `函数代码打包失败：\n ${error.message}`
+                )
             }
         }
     }
 
     clean() {
-        del.sync([this.funcDistPath, this.tmpPath])
+        this.funcDistPath && del.sync([this.funcDistPath])
+        this.tmpPath && del.sync([this.tmpPath])
     }
 }