@cloudbase/cli 2.3.0 → 2.3.1

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/templates/html/loginFail.html

@@ -1,90 +1,90 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <title>CloudBase CLI</title>
-
-        <style media="screen">
-            body {
-                background: #eceff1;
-                color: rgba(0, 0, 0, 0.87);
-                font-family: Roboto, Helvetica, Arial, sans-serif;
-                margin: 0;
-                padding: 0;
-            }
-            #message {
-                background: white;
-                max-width: 360px;
-                margin: 100px auto 16px;
-                padding: 32px 24px 8px;
-                border-radius: 3px;
-            }
-            #message h2 {
-                color: #f44336;
-                font-weight: bold;
-                font-size: 16px;
-                margin: 0 0 8px;
-            }
-            #message h1 {
-                font-size: 22px;
-                font-weight: 300;
-                color: rgba(0, 0, 0, 0.6);
-                margin: 0 0 16px;
-            }
-            #message p {
-                line-height: 140%;
-                margin: 16px 0 24px;
-                font-size: 14px;
-            }
-            #message a {
-                display: block;
-                text-align: center;
-                background: #039be5;
-                text-transform: uppercase;
-                text-decoration: none;
-                color: white;
-                padding: 16px;
-                border-radius: 4px;
-            }
-            #message,
-            #message a {
-                box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
-            }
-            #load {
-                color: rgba(0, 0, 0, 0.4);
-                text-align: center;
-                font-size: 13px;
-            }
-            @media (max-width: 600px) {
-                body,
-                #message {
-                    margin-top: 0;
-                    background: white;
-                    box-shadow: none;
-                }
-                body {
-                    border-top: 16px solid #f44336;
-                }
-            }
-            code {
-                background: #37474f;
-                color: white;
-                border-radius: 2px;
-                padding: 2px 4px;
-                font-size: 12px;
-                margin: 0 4px;
-            }
-        </style>
-    </head>
-    <body>
-        <div id="message">
-            <h2>失败！</h2>
-            <h1>CloudBase CLI 登录失败</h1>
-            <p>
-                CloudBase CLI 登录失败，请检验终端网络是否联通，然后使用
-                <code>cloudbase login</code> 再次登录 。
-            </p>
-        </div>
-    </body>
-</html>
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <title>CloudBase CLI</title>
+
+        <style media="screen">
+            body {
+                background: #eceff1;
+                color: rgba(0, 0, 0, 0.87);
+                font-family: Roboto, Helvetica, Arial, sans-serif;
+                margin: 0;
+                padding: 0;
+            }
+            #message {
+                background: white;
+                max-width: 360px;
+                margin: 100px auto 16px;
+                padding: 32px 24px 8px;
+                border-radius: 3px;
+            }
+            #message h2 {
+                color: #f44336;
+                font-weight: bold;
+                font-size: 16px;
+                margin: 0 0 8px;
+            }
+            #message h1 {
+                font-size: 22px;
+                font-weight: 300;
+                color: rgba(0, 0, 0, 0.6);
+                margin: 0 0 16px;
+            }
+            #message p {
+                line-height: 140%;
+                margin: 16px 0 24px;
+                font-size: 14px;
+            }
+            #message a {
+                display: block;
+                text-align: center;
+                background: #039be5;
+                text-transform: uppercase;
+                text-decoration: none;
+                color: white;
+                padding: 16px;
+                border-radius: 4px;
+            }
+            #message,
+            #message a {
+                box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+            }
+            #load {
+                color: rgba(0, 0, 0, 0.4);
+                text-align: center;
+                font-size: 13px;
+            }
+            @media (max-width: 600px) {
+                body,
+                #message {
+                    margin-top: 0;
+                    background: white;
+                    box-shadow: none;
+                }
+                body {
+                    border-top: 16px solid #f44336;
+                }
+            }
+            code {
+                background: #37474f;
+                color: white;
+                border-radius: 2px;
+                padding: 2px 4px;
+                font-size: 12px;
+                margin: 0 4px;
+            }
+        </style>
+    </head>
+    <body>
+        <div id="message">
+            <h2>失败！</h2>
+            <h1>CloudBase CLI 登录失败</h1>
+            <p>
+                CloudBase CLI 登录失败，请检验终端网络是否联通，然后使用
+                <code>cloudbase login</code> 再次登录 。
+            </p>
+        </div>
+    </body>
+</html>