fix(ses): WIP

Co-Authored-By: Saleh Abdel Motaal <dev@smotaal.io>
endojs · Jun 28, 2024 · cb86680 · cb86680
1 parent 8fa174e
commit cb86680
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 174 deletions.
diff --git a/packages/ses/scripts/bundle.js b/packages/ses/scripts/bundle.js
@@ -1,6 +1,5 @@
 /* global process */
 import '../index.js';
-// lockdown();
 import fs from 'fs';
 import { makeBundle } from '@endo/compartment-mapper/bundle.js';
 import { minify } from 'terser';
@@ -63,7 +62,6 @@ const writeBundle = async ({ buildType } = {}) => {
     `dist/lockdown${buildType ? `-${buildType}` : ''}.umd.min.js`,
   ];
 
-
   await Promise.all([
     ...bundleFilePaths.map(dest => write(dest, versionedBundle)),
     ...terseFilePaths.map(dest => write(dest, terse)),

diff --git a/packages/ses/src/get-anonymous-intrinsics-hermes.js b/packages/ses/src/get-anonymous-intrinsics-hermes.js
diff --git a/packages/ses/src/get-anonymous-intrinsics.js b/packages/ses/src/get-anonymous-intrinsics.js
@@ -14,6 +14,7 @@ import {
   matchAllSymbol,
   regexpPrototype,
   globalThis,
+  assign,
 } from './commons.js';
 import { InertCompartment } from './compartment.js';
 
@@ -95,20 +96,6 @@ export const getAnonymousIntrinsics = () => {
 
   const Generator = GeneratorFunction.prototype;
 
-  // 25.3.1 The AsyncGeneratorFunction Constructor
-
-  // eslint-disable-next-line no-empty-function
-  async function* AsyncGeneratorFunctionInstance() {}
-  const AsyncGeneratorFunction = getConstructorOf(
-    AsyncGeneratorFunctionInstance,
-  );
-
-  // 25.3.2.2 AsyncGeneratorFunction.prototype
-  const AsyncGenerator = AsyncGeneratorFunction.prototype;
-  // 25.5.1 Properties of the AsyncGenerator Prototype Object
-  const AsyncGeneratorPrototype = AsyncGenerator.prototype;
-  const AsyncIteratorPrototype = getPrototypeOf(AsyncGeneratorPrototype);
-
   // 25.7.1 The AsyncFunction Constructor
 
   // eslint-disable-next-line no-empty-function
@@ -119,10 +106,6 @@ export const getAnonymousIntrinsics = () => {
     '%InertFunction%': InertFunction,
     '%ArrayIteratorPrototype%': ArrayIteratorPrototype,
     '%InertAsyncFunction%': AsyncFunction,
-    '%AsyncGenerator%': AsyncGenerator,
-    '%InertAsyncGeneratorFunction%': AsyncGeneratorFunction,
-    '%AsyncGeneratorPrototype%': AsyncGeneratorPrototype,
-    '%AsyncIteratorPrototype%': AsyncIteratorPrototype,
     '%Generator%': Generator,
     '%InertGeneratorFunction%': GeneratorFunction,
     '%IteratorPrototype%': IteratorPrototype,
@@ -135,6 +118,33 @@ export const getAnonymousIntrinsics = () => {
     '%InertCompartment%': InertCompartment,
   };
 
+  try {
+    // 25.3.1 The AsyncGeneratorFunction Constructor
+
+    // eslint-disable-next-line no-empty-function
+    const AsyncGeneratorFunctionInstance = new FERAL_FUNCTION(
+      'return (async function* AsyncGeneratorFunctionInstance() {})',
+    )();
+    const AsyncGeneratorFunction = getConstructorOf(
+      AsyncGeneratorFunctionInstance,
+    );
+
+    // 25.3.2.2 AsyncGeneratorFunction.prototype
+    const AsyncGenerator = AsyncGeneratorFunction.prototype;
+    // 25.5.1 Properties of the AsyncGenerator Prototype Object
+    const AsyncGeneratorPrototype = AsyncGenerator.prototype;
+    const AsyncIteratorPrototype = getPrototypeOf(AsyncGeneratorPrototype);
+
+    assign(intrinsics, {
+      '%AsyncGenerator%': AsyncGenerator,
+      '%InertAsyncGeneratorFunction%': AsyncGeneratorFunction,
+      '%AsyncGeneratorPrototype%': AsyncGeneratorPrototype,
+      '%AsyncIteratorPrototype%': AsyncIteratorPrototype,
+    });
+  } catch {
+    //
+  }
+
   if (globalThis.Iterator) {
     intrinsics['%IteratorHelperPrototype%'] = getPrototypeOf(
       // eslint-disable-next-line @endo/no-polymorphic-call

diff --git a/packages/ses/src/lockdown-hermes.js b/packages/ses/src/lockdown-hermes.js
@@ -50,7 +50,7 @@ import { tameDomains } from './tame-domains.js';
 import { tameConsole } from './error/tame-console.js';
 import tameErrorConstructor from './error/tame-error-constructor.js';
 import { assert, makeAssert } from './error/assert.js';
-import { getAnonymousIntrinsicsHermes } from './get-anonymous-intrinsics-hermes.js';
+import { getAnonymousIntrinsics } from './get-anonymous-intrinsics.js';
 import { makeCompartmentConstructor } from './compartment.js';
 import { tameHarden } from './tame-harden.js';
 import { tameSymbolConstructor } from './tame-symbol-constructor.js';
@@ -130,7 +130,6 @@ const assertDirectEvalAvailable = () => {
 
 /**
  * @param {LockdownOptions} [options]
- * @param {boolean} hermes
  */
 export const repairIntrinsics = (options = {}) => {
   // First time, absent options default to 'safe'.
@@ -276,7 +275,7 @@ export const repairIntrinsics = (options = {}) => {
   addIntrinsics(tameRegExpConstructor(regExpTaming));
   addIntrinsics(tameSymbolConstructor());
 
-  addIntrinsics(getAnonymousIntrinsicsHermes());
+  addIntrinsics(getAnonymousIntrinsics());
 
   completePrototypes();
 

diff --git a/packages/ses/src/permits.js b/packages/ses/src/permits.js
@@ -1574,8 +1574,9 @@ export const permitted = {
 };
 
 try {
-  // eslint-disable-next-line
-  new FERAL_FUNCTION('async function* (){}') // A string, so Metro doesn't throw creating release bundle
+  new FERAL_FUNCTION(
+    'return (async function* AsyncGeneratorFunctionInstance() {})',
+  )();
   assign(permitted, {
     '%InertAsyncGeneratorFunction%': {
       // Properties of the AsyncGeneratorFunction Constructor
@@ -1604,7 +1605,41 @@ try {
       throw: fn,
       '@@toStringTag': 'string',
     },
-  })
+
+    // https://github.com/tc39/proposal-async-iterator-helpers
+    AsyncIterator: {
+      // Properties of the Iterator Constructor
+      '[[Proto]]': '%FunctionPrototype%',
+      prototype: '%AsyncIteratorPrototype%',
+      from: fn,
+    },
+
+    '%AsyncIteratorPrototype%': {
+      // The %AsyncIteratorPrototype% Object
+      '@@asyncIterator': fn,
+      // https://github.com/tc39/proposal-async-iterator-helpers
+      constructor: 'AsyncIterator',
+      map: fn,
+      filter: fn,
+      take: fn,
+      drop: fn,
+      flatMap: fn,
+      reduce: fn,
+      toArray: fn,
+      forEach: fn,
+      some: fn,
+      every: fn,
+      find: fn,
+      '@@toStringTag': 'string',
+      // See https://github.com/Moddable-OpenSource/moddable/issues/523#issuecomment-1942904505
+      '@@asyncDispose': false,
+    },
+  });
+
+  // assign(uniqueGlobalPropertyNames, {
+  //   // https://github.com/tc39/proposal-async-iterator-helpers
+  //   AsyncIterator: 'AsyncIterator',
+  // });
 } catch {
-  // 
+  //
 }
diff --git a/packages/ses/src/tame-function-constructors.js b/packages/ses/src/tame-function-constructors.js
@@ -128,15 +128,16 @@ export default function tameFunctionConstructors() {
   );
 
   try {
-    // eslint-disable-next-line
-    new FERAL_FUNCTION('async function* (){}');
+    new FERAL_FUNCTION(
+      'return (async function* AsyncGeneratorFunctionInstance() {})',
+    )();
     repairFunction(
       'AsyncGeneratorFunction',
       '%InertAsyncGeneratorFunction%',
       '(async function*(){})',
     );
   } catch {
-    // 
+    //
   }
 
   return newIntrinsics;