fix: await repl and console message missing

Author: surunzi

src/domains/Runtime.ts

@@ -10,8 +10,9 @@ import stackTrace from 'licia/stackTrace'
 import trim from 'licia/trim'
 import types from 'licia/types'
 import * as objManager from '../lib/objManager'
-import evaluateJs, { setGlobal } from '../lib/evaluate'
+import { evalJs, evalJsAsync, setGlobal } from '../lib/evaluate'
 import Protocol from 'devtools-protocol'
+import { getTimestamp } from '../lib/util'
 import Runtime = Protocol.Runtime
 
 const executionContext = {
@@ -64,17 +65,30 @@ export function getProperties(
   return objManager.getProperties(params)
 }
 
-export function evaluate(
+let isAsyncSupported = true
+
+try {
+  eval('async () => {}')
+} catch (e) {
+  isAsyncSupported = false
+}
+
+export async function evaluate(
   params: Runtime.EvaluateRequest
-): Runtime.EvaluateResponse {
+): Promise<Runtime.EvaluateResponse> {
   const ret: any = {}
 
   let result: any
   try {
     if (params.throwOnSideEffect && hasSideEffect(params.expression)) {
       throw EvalError('Possible side-effect in debug-evaluate')
     }
-    result = evaluateJs(params.expression)
+
+    if (isAsyncSupported && (params.replMode || params.awaitPromise)) {
+      result = await evalJsAsync(params.expression)
+    } else {
+      result = evalJs(params.expression)
+    }
     setGlobal('$_', result)
     ret.result = objManager.wrap(result, {
       generatePreview: true,
@@ -123,6 +137,7 @@ function monitorConsole() {
     if (!console[name]) {
       return
     }
+    let lastTimestamp = 0
     const origin = console[name].bind(console)
     console[name] = (...args: any[]) => {
       origin(...args)
@@ -133,6 +148,12 @@ function monitorConsole() {
         })
       )
 
+      let timestamp = getTimestamp()
+      if (timestamp <= lastTimestamp) {
+        timestamp = lastTimestamp + 0.001
+      }
+      lastTimestamp = timestamp
+
       trigger('Runtime.consoleAPICalled', {
         type,
         args,
@@ -141,7 +162,7 @@ function monitorConsole() {
             type === 'error' || type === 'warning' ? getCallFrames() : [],
         },
         executionContextId: executionContext.id,
-        timestamp: now(),
+        timestamp,
       })
     }
   })

src/lib/evaluate.ts

@@ -44,7 +44,7 @@ export function setGlobal(name: string, val: any) {
   global[name] = val
 }
 
-export default function evaluate(expression: string) {
+export function evalJs(expression: string) {
   let ret
 
   injectGlobal()
@@ -57,3 +57,17 @@ export default function evaluate(expression: string) {
 
   return ret
 }
+
+export function evalJsAsync(expression: string) {
+  let ret
+
+  injectGlobal()
+  try {
+    ret = eval.call(window, `(async () => (${expression}))()`)
+  } catch (e) {
+    ret = eval.call(window, `(async () => {${expression}})()`)
+  }
+  clearGlobal()
+
+  return ret
+}

src/lib/util.ts

@@ -6,6 +6,8 @@ import convertBin from 'licia/convertBin'
 import axios from 'axios'
 import _type from 'licia/type'
 import _has from 'licia/has'
+import perfNow from 'licia/perfNow'
+import now from 'licia/now'
 
 const prefix = random(1000, 9999) + '.'
 
@@ -73,6 +75,14 @@ export function has(obj: any, key: string) {
   }
 }
 
+export function getTimestamp() {
+  if (window.performance && performance.timeOrigin) {
+    return performance.timeOrigin + perfNow()
+  }
+
+  return now()
+}
+
 async function getContent(url: string, responseType: any, proxy = '') {
   try {
     const urlObj = new Url(url)