use new agent api

Author: devsnek

src/worker.js

@@ -8,7 +8,7 @@ importScripts('https://unpkg.com/[email protected]/lib/nearley.js');
 importScripts('/engine262/engine262.js');
 
 const {
-  initializeAgent,
+  Agent,
   Realm,
   Abstract,
   AbruptCompletion,
@@ -27,112 +27,110 @@ addEventListener('message', ({ data }) => {
   if (data.type === 'evaluate') {
     const { state, code } = data.value;
 
-    try {
-      initializeAgent({
-        features: [...state.get('features')],
-      });
-    } catch (e) {
-      // o.o
-    }
-
-    const promises = new Set();
-    const realm = new Realm({
-      promiseRejectionTracker(promise, operation) {
-        switch (operation) {
-          case 'reject':
-            promises.add(promise);
-            break;
-          case 'handle':
-            promises.delete(promise);
-            break;
-          default:
-            break;
-        }
-      },
+    const agent = new Agent({
+      features: [...state.get('features')],
     });
-    const print = new Value(realm, (args) => {
-      postMessage({
-        type: 'console',
-        value: {
-          method: 'log',
-          values: args.map((a) => inspect(a)),
+
+    agent.scope(() => {
+      const promises = new Set();
+      const realm = new Realm({
+        promiseRejectionTracker(promise, operation) {
+          switch (operation) {
+            case 'reject':
+              promises.add(promise);
+              break;
+            case 'handle':
+              promises.delete(promise);
+              break;
+            default:
+              break;
+          }
         },
       });
-      return Value.undefined;
-    }, [], realm);
-    Abstract.CreateDataProperty(realm.global, new Value(realm, 'print'), print);
+      const print = new Value(realm, (args) => {
+        postMessage({
+          type: 'console',
+          value: {
+            method: 'log',
+            values: args.map((a) => inspect(a)),
+          },
+        });
+        return Value.undefined;
+      }, [], realm);
+      Abstract.CreateDataProperty(realm.global, new Value(realm, 'print'), print);
 
-    {
-      const console = new APIObject(realm);
-      Abstract.CreateDataProperty(realm.global, new Value(realm, 'console'), console);
+      {
+        const console = new APIObject(realm);
+        Abstract.CreateDataProperty(realm.global, new Value(realm, 'console'), console);
 
-      [
-        'log',
-        'warn',
-        'debug',
-        'error',
-        'clear',
-      ].forEach((method) => {
-        const fn = new Value(realm, (args) => {
-          postMessage({
-            type: 'console',
-            value: {
-              method,
-              values: args.map((a, i) => {
-                if (i === 0 && Abstract.Type(a) === 'String') {
-                  return a.stringValue();
-                }
-                return inspect(a);
-              }),
-            },
+        [
+          'log',
+          'warn',
+          'debug',
+          'error',
+          'clear',
+        ].forEach((method) => {
+          const fn = new Value(realm, (args) => {
+            postMessage({
+              type: 'console',
+              value: {
+                method,
+                values: args.map((a, i) => {
+                  if (i === 0 && Abstract.Type(a) === 'String') {
+                    return a.stringValue();
+                  }
+                  return inspect(a);
+                }),
+              },
+            });
+            return Value.undefined;
           });
-          return Value.undefined;
+          Abstract.CreateDataProperty(console, new Value(realm, method), fn);
         });
-        Abstract.CreateDataProperty(console, new Value(realm, method), fn);
-      });
-    }
-
-    postMessage({
-      type: 'console',
-      value: {
-        method: 'clear',
-        values: [],
-      },
-    });
-
-    let result;
-    if (state.get('mode') === 'script') {
-      result = realm.evaluateScript(code, { specifier: 'code.js' });
-    } else {
-      result = realm.createSourceTextModule('code.mjs', code);
-      if (!(result instanceof AbruptCompletion)) {
-        const module = result;
-        realm.moduleEntry = module;
-        result = module.Link();
-        if (!(result instanceof AbruptCompletion)) {
-          result = module.Evaluate();
-          if (result.PromiseState === 'rejected') {
-            result = Throw(realm, result.PromiseResult);
-          }
-        }
       }
-    }
-    if (result instanceof AbruptCompletion) {
+
       postMessage({
         type: 'console',
         value: {
-          method: 'error',
-          values: [inspect(result, realm)],
+          method: 'clear',
+          values: [],
         },
       });
-    }
 
-    for (const promise of promises) {
-      postMessage({
-        type: 'unhandledRejection',
-        // eslint-disable-next-line no-use-before-define
-        value: inspect(promise.PromiseResult, realm),
-      });
-    }
+      let result;
+      if (state.get('mode') === 'script') {
+        result = realm.evaluateScript(code, { specifier: 'code.js' });
+      } else {
+        result = realm.createSourceTextModule('code.mjs', code);
+        if (!(result instanceof AbruptCompletion)) {
+          const module = result;
+          realm.moduleEntry = module;
+          result = module.Link();
+          if (!(result instanceof AbruptCompletion)) {
+            result = module.Evaluate();
+            if (result.PromiseState === 'rejected') {
+              result = Throw(realm, result.PromiseResult);
+            }
+          }
+        }
+      }
+      if (result instanceof AbruptCompletion) {
+        postMessage({
+          type: 'console',
+          value: {
+            method: 'error',
+            values: [inspect(result, realm)],
+          },
+        });
+      }
+
+      for (const promise of promises) {
+        postMessage({
+          type: 'unhandledRejection',
+          // eslint-disable-next-line no-use-before-define
+          value: inspect(promise.PromiseResult, realm),
+        });
+      }
+    });
   }
 });