@cloudbase/cli 2.0.3 → 2.0.5

package/runtime/nodejs/runtime.js

@@ -1,183 +1,183 @@
-/* eslint-disable */
-const fs = require('fs')
-const crypto = require('crypto')
-
-var GLOBAL_FUNCTION_HANDLER = process.argv[2] || process.env.SCF_FUNCTION_HANDLER || 'index.main'
-var GLOBAL_FUNCTION_NAME = process.env.SCF_FUNCTION_NAME || 'main'
-var GLOBAL_EVENT_BODY =
-    process.argv[3] ||
-    process.env.SCF_EVENT_BODY ||
-    (process.env.DOCKER_USE_STDIN && fs.readFileSync('/dev/stdin', 'utf8')) ||
-    '{}'
-
-var GLOBAL_USER_FILE_PATH = process.env.GLOBAL_USER_FILE_PATH || ''
-var GLOBAL_VERSION = process.env.SCF_FUNCTION_VERSION || '$LATEST'
-var GLOBAL_MEM_SIZE = process.env.SCF_FUNCTION_MEMORY_SIZE || '256'
-var GLOBAL_TIMEOUT = process.env.SCF_FUNCTION_TIMEOUT || '3'
-var GLOBAL_ENVIRON = process.env.SCF_FUNCTION_ENVIRON || ''
-var GLOBAL_IS_QUIET = process.env.SCF_DISPLAY_IS_QUIET === 'True' || false
-
-var GLOBAL_REQUEST_ID = uuid()
-var GLOBAL_START_TIME = process.hrtime()
-var GLOBAL_SOCK = -1
-var GLOBAL_STAGE = 0
-
-module.exports = {
-    init: function() {
-        if (!GLOBAL_IS_QUIET) {
-            consoleLog('开始本地执行云函数，受环境影响，执行结果可能与云端存在一定差异！')
-            consoleLog('START RequestId: ' + GLOBAL_REQUEST_ID)
-        }
-        return 0
-    },
-    wait_for_invoke: function() {
-        var invokeInfo = []
-
-        GLOBAL_STAGE += 1
-        switch (GLOBAL_STAGE) {
-            case 1:
-                invokeInfo.cmd = 'RELOAD'
-                invokeInfo.context = GLOBAL_USER_FILE_PATH + GLOBAL_FUNCTION_HANDLER
-                invokeInfo.globalHandler = GLOBAL_FUNCTION_HANDLER
-                invokeInfo.filePath = GLOBAL_USER_FILE_PATH
-                break
-            case 2:
-                invokeInfo.cmd = 'EVENT'
-                invokeInfo.sockfd = GLOBAL_SOCK
-                invokeInfo.event = GLOBAL_EVENT_BODY
-                invokeInfo.context = initContext()
-                break
-            default:
-                process.exit()
-        }
-
-        return invokeInfo
-    },
-    log: function(str) {
-        // consoleLog(formatSystem(str))
-    },
-    console_log: function(str, err = false) {
-        if (!GLOBAL_IS_QUIET) {
-            if (err === false) {
-                consoleLog(formatConsole(str))
-            } else {
-                consoleLogErr(formatConsole(str))
-            }
-        }
-    },
-    report_fail: function(stackTrace, errNum, errType = 0) {
-        const result = {}
-
-        result['errorCode'] = 1
-        result['errorMessage'] = 'user code exception caught'
-        if (stackTrace) {
-            result['stackTrace'] = stackTrace
-        }
-
-        reportDone('', (errType = 1))
-        // console.dir(result);
-        consoleLogErr(JSON.stringify(result))
-    },
-    report_running: function() {
-        GLOBAL_START_TIME = process.hrtime()
-    },
-    report_done: function(resultStr, errType = 0) {
-        reportDone(resultStr, errType)
-    }
-}
-
-function initContext() {
-    var context = {}
-    context['function_version'] = GLOBAL_VERSION
-    context['function_name'] = GLOBAL_FUNCTION_NAME
-
-    context['time_limit_in_ms'] = GLOBAL_TIMEOUT
-    context['memory_limit_in_mb'] = GLOBAL_MEM_SIZE
-
-    context['request_id'] = GLOBAL_REQUEST_ID
-    context['environ'] = GLOBAL_ENVIRON
-
-    return JSON.stringify(context)
-}
-
-function reportDone(resultStr, errType = 0) {
-    if (GLOBAL_IS_QUIET) {
-        if (typeof resultStr === 'string') {
-            if (errType === 0) consoleLog(resultStr)
-            else consoleLogErr(resultStr)
-        }
-        return
-    }
-
-    var diffMs = hrTimeMs(process.hrtime(GLOBAL_START_TIME))
-    var billedMs = Math.min(100 * (Math.floor(diffMs / 100) + 1), GLOBAL_TIMEOUT * 1000)
-    if (errType === 0) {
-        consoleLog('END RequestId: ' + GLOBAL_REQUEST_ID)
-        consoleLog(
-            [
-                '运行信息：',
-                'REPORT RequestId: ' + GLOBAL_REQUEST_ID,
-                'Duration: ' + diffMs.toFixed(2) + ' ms',
-                'Billed Duration: ' + billedMs + ' ms',
-                'Memory Size: ' + GLOBAL_MEM_SIZE + ' MB',
-                'Max Memory Used: ' + Math.round(process.memoryUsage().rss / (1024 * 1024)) + ' MB'
-            ].join('\n')
-        )
-    } else {
-        consoleLogErr(
-            [
-                '运行信息：',
-                'REPORT RequestId: ' + GLOBAL_REQUEST_ID,
-                'Duration: ' + diffMs.toFixed(2) + ' ms',
-                'Billed Duration: ' + billedMs + ' ms',
-                'Memory Size: ' + GLOBAL_MEM_SIZE + ' MB',
-                'Max Memory Used: ' + Math.round(process.memoryUsage().rss / (1024 * 1024)) + ' MB'
-            ].join('\n')
-        )
-    }
-
-    if (typeof resultStr === 'string') {
-        if (errType === 0) {
-            consoleLog('返回结果：\n' + resultStr)
-        } else {
-            consoleLogErr('返回结果：\n' + resultStr)
-        }
-    }
-}
-
-function consoleLog(str) {
-    process.stdout.write(str + '\n')
-}
-
-function consoleLogErr(str) {
-    process.stderr.write(str + '\n')
-}
-
-function formatConsole(str) {
-    return str.replace(/^[0-9TZ:.-]+\t[0-9a-f-]+\t/, '\u001b[34m$&\u001b[0m')
-}
-
-function formatSystem(str) {
-    return '\u001b[32m' + str + '\u001b[0m'
-}
-
-function hrTimeMs(hrtime) {
-    return (hrtime[0] * 1e9 + hrtime[1]) / 1e6
-}
-
-function uuid() {
-    return (
-        crypto.randomBytes(4).toString('hex') +
-        '-' +
-        crypto.randomBytes(2).toString('hex') +
-        '-' +
-        crypto
-            .randomBytes(2)
-            .toString('hex')
-            .replace(/^./, '1') +
-        '-' +
-        crypto.randomBytes(2).toString('hex') +
-        '-' +
-        crypto.randomBytes(6).toString('hex')
-    )
-}
+/* eslint-disable */
+const fs = require('fs')
+const crypto = require('crypto')
+
+var GLOBAL_FUNCTION_HANDLER = process.argv[2] || process.env.SCF_FUNCTION_HANDLER || 'index.main'
+var GLOBAL_FUNCTION_NAME = process.env.SCF_FUNCTION_NAME || 'main'
+var GLOBAL_EVENT_BODY =
+    process.argv[3] ||
+    process.env.SCF_EVENT_BODY ||
+    (process.env.DOCKER_USE_STDIN && fs.readFileSync('/dev/stdin', 'utf8')) ||
+    '{}'
+
+var GLOBAL_USER_FILE_PATH = process.env.GLOBAL_USER_FILE_PATH || ''
+var GLOBAL_VERSION = process.env.SCF_FUNCTION_VERSION || '$LATEST'
+var GLOBAL_MEM_SIZE = process.env.SCF_FUNCTION_MEMORY_SIZE || '256'
+var GLOBAL_TIMEOUT = process.env.SCF_FUNCTION_TIMEOUT || '3'
+var GLOBAL_ENVIRON = process.env.SCF_FUNCTION_ENVIRON || ''
+var GLOBAL_IS_QUIET = process.env.SCF_DISPLAY_IS_QUIET === 'True' || false
+
+var GLOBAL_REQUEST_ID = uuid()
+var GLOBAL_START_TIME = process.hrtime()
+var GLOBAL_SOCK = -1
+var GLOBAL_STAGE = 0
+
+module.exports = {
+    init: function() {
+        if (!GLOBAL_IS_QUIET) {
+            consoleLog('开始本地执行云函数，受环境影响，执行结果可能与云端存在一定差异！')
+            consoleLog('START RequestId: ' + GLOBAL_REQUEST_ID)
+        }
+        return 0
+    },
+    wait_for_invoke: function() {
+        var invokeInfo = []
+
+        GLOBAL_STAGE += 1
+        switch (GLOBAL_STAGE) {
+            case 1:
+                invokeInfo.cmd = 'RELOAD'
+                invokeInfo.context = GLOBAL_USER_FILE_PATH + GLOBAL_FUNCTION_HANDLER
+                invokeInfo.globalHandler = GLOBAL_FUNCTION_HANDLER
+                invokeInfo.filePath = GLOBAL_USER_FILE_PATH
+                break
+            case 2:
+                invokeInfo.cmd = 'EVENT'
+                invokeInfo.sockfd = GLOBAL_SOCK
+                invokeInfo.event = GLOBAL_EVENT_BODY
+                invokeInfo.context = initContext()
+                break
+            default:
+                process.exit()
+        }
+
+        return invokeInfo
+    },
+    log: function(str) {
+        // consoleLog(formatSystem(str))
+    },
+    console_log: function(str, err = false) {
+        if (!GLOBAL_IS_QUIET) {
+            if (err === false) {
+                consoleLog(formatConsole(str))
+            } else {
+                consoleLogErr(formatConsole(str))
+            }
+        }
+    },
+    report_fail: function(stackTrace, errNum, errType = 0) {
+        const result = {}
+
+        result['errorCode'] = 1
+        result['errorMessage'] = 'user code exception caught'
+        if (stackTrace) {
+            result['stackTrace'] = stackTrace
+        }
+
+        reportDone('', (errType = 1))
+        // console.dir(result);
+        consoleLogErr(JSON.stringify(result))
+    },
+    report_running: function() {
+        GLOBAL_START_TIME = process.hrtime()
+    },
+    report_done: function(resultStr, errType = 0) {
+        reportDone(resultStr, errType)
+    }
+}
+
+function initContext() {
+    var context = {}
+    context['function_version'] = GLOBAL_VERSION
+    context['function_name'] = GLOBAL_FUNCTION_NAME
+
+    context['time_limit_in_ms'] = GLOBAL_TIMEOUT
+    context['memory_limit_in_mb'] = GLOBAL_MEM_SIZE
+
+    context['request_id'] = GLOBAL_REQUEST_ID
+    context['environ'] = GLOBAL_ENVIRON
+
+    return JSON.stringify(context)
+}
+
+function reportDone(resultStr, errType = 0) {
+    if (GLOBAL_IS_QUIET) {
+        if (typeof resultStr === 'string') {
+            if (errType === 0) consoleLog(resultStr)
+            else consoleLogErr(resultStr)
+        }
+        return
+    }
+
+    var diffMs = hrTimeMs(process.hrtime(GLOBAL_START_TIME))
+    var billedMs = Math.min(100 * (Math.floor(diffMs / 100) + 1), GLOBAL_TIMEOUT * 1000)
+    if (errType === 0) {
+        consoleLog('END RequestId: ' + GLOBAL_REQUEST_ID)
+        consoleLog(
+            [
+                '运行信息：',
+                'REPORT RequestId: ' + GLOBAL_REQUEST_ID,
+                'Duration: ' + diffMs.toFixed(2) + ' ms',
+                'Billed Duration: ' + billedMs + ' ms',
+                'Memory Size: ' + GLOBAL_MEM_SIZE + ' MB',
+                'Max Memory Used: ' + Math.round(process.memoryUsage().rss / (1024 * 1024)) + ' MB'
+            ].join('\n')
+        )
+    } else {
+        consoleLogErr(
+            [
+                '运行信息：',
+                'REPORT RequestId: ' + GLOBAL_REQUEST_ID,
+                'Duration: ' + diffMs.toFixed(2) + ' ms',
+                'Billed Duration: ' + billedMs + ' ms',
+                'Memory Size: ' + GLOBAL_MEM_SIZE + ' MB',
+                'Max Memory Used: ' + Math.round(process.memoryUsage().rss / (1024 * 1024)) + ' MB'
+            ].join('\n')
+        )
+    }
+
+    if (typeof resultStr === 'string') {
+        if (errType === 0) {
+            consoleLog('返回结果：\n' + resultStr)
+        } else {
+            consoleLogErr('返回结果：\n' + resultStr)
+        }
+    }
+}
+
+function consoleLog(str) {
+    process.stdout.write(str + '\n')
+}
+
+function consoleLogErr(str) {
+    process.stderr.write(str + '\n')
+}
+
+function formatConsole(str) {
+    return str.replace(/^[0-9TZ:.-]+\t[0-9a-f-]+\t/, '\u001b[34m$&\u001b[0m')
+}
+
+function formatSystem(str) {
+    return '\u001b[32m' + str + '\u001b[0m'
+}
+
+function hrTimeMs(hrtime) {
+    return (hrtime[0] * 1e9 + hrtime[1]) / 1e6
+}
+
+function uuid() {
+    return (
+        crypto.randomBytes(4).toString('hex') +
+        '-' +
+        crypto.randomBytes(2).toString('hex') +
+        '-' +
+        crypto
+            .randomBytes(2)
+            .toString('hex')
+            .replace(/^./, '1') +
+        '-' +
+        crypto.randomBytes(2).toString('hex') +
+        '-' +
+        crypto.randomBytes(6).toString('hex')
+    )
+}

package/src/auth/index.ts

@@ -1,2 +1,2 @@
-export * from './login'
+export * from './login'
 export * from './logout'

package/src/auth/login.ts

@@ -1,91 +1,91 @@
-import _ from 'lodash'
-import { Credential } from '@cloudbase/toolbox'
-import { authSupevisor, checkAndGetCredential, execWithLoading, checkEnvAvaliable } from '../utils'
-import { ILoginOptions } from '../types'
-import { ENV_STATUS } from '../constant'
-import { Logger } from '../decorators'
-import { getEnvInfo } from '../env'
-
-const log = new Logger()
-
-// 登录返回 code 与信息
-const LoginRes = {
-    SUCCESS: {
-        code: 'SUCCESS',
-        msg: '登录成功！'
-    },
-    INVALID_TOKEN: {
-        code: 'INVALID_TOKEN',
-        msg: '无效的身份信息！'
-    },
-    CHECK_LOGIN_FAILED: {
-        code: 'CHECK_LOGIN_FAILED',
-        msg: '检查登录态失败'
-    },
-    INVALID_PARAM(msg) {
-        return {
-            code: 'INVALID_PARAM',
-            msg: `参数无效：${msg}`
-        }
-    }
-}
-
-// 打开腾讯云-云开发控制台，通过获取临时密钥登录，临时密钥可续期，最长时间为 1 个月
-export async function loginByWebAuth() {
-    const credential = await authSupevisor.loginByWebAuth()
-
-    if (_.isEmpty(credential)) {
-        return LoginRes.INVALID_TOKEN
-    }
-
-    return {
-        credential,
-        ...LoginRes.SUCCESS
-    }
-}
-
-// 使用密钥登录
-export async function loginWithKey(secretId?: string, secretKey?: string, token?: string) {
-    if (!secretId || !secretKey) {
-        return LoginRes.INVALID_PARAM('SecretID 或 SecretKey 不能为空')
-    }
-
-    const credential = await authSupevisor.loginByApiSecret(secretId, secretKey, token)
-
-    if (_.isEmpty(credential)) {
-        return LoginRes.INVALID_TOKEN
-    }
-
-    return LoginRes.SUCCESS
-}
-
-export async function login(
-    options: ILoginOptions = {}
-): Promise<{ code: string; msg: string; credential?: Credential }> {
-    const { secretId, secretKey, key, token } = options
-    return key ? loginWithKey(secretId, secretKey, token) : loginByWebAuth()
-}
-
-// 检查是否登录，没有登录时，自动拉起浏览器授权
-export async function checkLogin() {
-    const credential = await checkAndGetCredential()
-    // 没有登录，拉起 Web 登录
-    if (_.isEmpty(credential)) {
-        log.info('你还没有登录，请在控制台中授权登录')
-
-        const res = await execWithLoading(() => login(), {
-            startTip: '获取授权中...',
-            successTip: '授权登录成功！'
-        })
-
-        const envId = res?.credential?.envId
-
-        // 登录返回 envId，检查环境初始化
-        if (envId) {
-            const env = await getEnvInfo(envId)
-            if (env.Status === ENV_STATUS.UNAVAILABLE) {
-                await checkEnvAvaliable(envId)
-            }
-        }
-    }
-}
+import _ from 'lodash'
+import { Credential } from '@cloudbase/toolbox'
+import { authSupevisor, checkAndGetCredential, execWithLoading, checkEnvAvaliable } from '../utils'
+import { ILoginOptions } from '../types'
+import { ENV_STATUS } from '../constant'
+import { Logger } from '../decorators'
+import { getEnvInfo } from '../env'
+
+const log = new Logger()
+
+// 登录返回 code 与信息
+const LoginRes = {
+    SUCCESS: {
+        code: 'SUCCESS',
+        msg: '登录成功！'
+    },
+    INVALID_TOKEN: {
+        code: 'INVALID_TOKEN',
+        msg: '无效的身份信息！'
+    },
+    CHECK_LOGIN_FAILED: {
+        code: 'CHECK_LOGIN_FAILED',
+        msg: '检查登录态失败'
+    },
+    INVALID_PARAM(msg) {
+        return {
+            code: 'INVALID_PARAM',
+            msg: `参数无效：${msg}`
+        }
+    }
+}
+
+// 打开腾讯云-云开发控制台，通过获取临时密钥登录，临时密钥可续期，最长时间为 1 个月
+export async function loginByWebAuth() {
+    const credential = await authSupevisor.loginByWebAuth()
+
+    if (_.isEmpty(credential)) {
+        return LoginRes.INVALID_TOKEN
+    }
+
+    return {
+        credential,
+        ...LoginRes.SUCCESS
+    }
+}
+
+// 使用密钥登录
+export async function loginWithKey(secretId?: string, secretKey?: string, token?: string) {
+    if (!secretId || !secretKey) {
+        return LoginRes.INVALID_PARAM('SecretID 或 SecretKey 不能为空')
+    }
+
+    const credential = await authSupevisor.loginByApiSecret(secretId, secretKey, token)
+
+    if (_.isEmpty(credential)) {
+        return LoginRes.INVALID_TOKEN
+    }
+
+    return LoginRes.SUCCESS
+}
+
+export async function login(
+    options: ILoginOptions = {}
+): Promise<{ code: string; msg: string; credential?: Credential }> {
+    const { secretId, secretKey, key, token } = options
+    return key ? loginWithKey(secretId, secretKey, token) : loginByWebAuth()
+}
+
+// 检查是否登录，没有登录时，自动拉起浏览器授权
+export async function checkLogin() {
+    const credential = await checkAndGetCredential()
+    // 没有登录，拉起 Web 登录
+    if (_.isEmpty(credential)) {
+        log.info('你还没有登录，请在控制台中授权登录')
+
+        const res = await execWithLoading(() => login(), {
+            startTip: '获取授权中...',
+            successTip: '授权登录成功！'
+        })
+
+        const envId = res?.credential?.envId
+
+        // 登录返回 envId，检查环境初始化
+        if (envId) {
+            const env = await getEnvInfo(envId)
+            if (env.Status === ENV_STATUS.UNAVAILABLE) {
+                await checkEnvAvaliable(envId)
+            }
+        }
+    }
+}

package/src/auth/logout.ts

@@ -1,7 +1,7 @@
-import { authSupevisor } from '../utils'
-
-// 注销登录信息
-export async function logout() {
-    process.emit('logout')
-    await authSupevisor.logout()
-}
+import { authSupevisor } from '../utils'
+
+// 注销登录信息
+export async function logout() {
+    process.emit('logout')
+    await authSupevisor.logout()
+}

package/src/commands/account/index.ts

@@ -1,2 +1,2 @@
-export * from './login'
-export * from './logout'
+export * from './login'
+export * from './logout'