[Meteor 3] Environment Variable Tweaks

.envrc

@@ -0,0 +1,32 @@
+#!/bin/env zsh
+
+#
+# Commands and shortcuts for Meteor core development, you can load these in your terminal by running `source .envrc`.
+# Or by adding `[[ -s .envrc ]] && source .envrc` to your `.zshrc` or `.bashrc`.
+#
+
+export ROOT_DIR=$(git rev-parse --show-toplevel)
+
+function @meteor {
+   "$ROOT_DIR/meteor" "$@"
+}
+
+function @test-package {
+   @meteor test-packages "$@" --exclude-archs=web.browser.legacy,web.cordova
+}
+
+function @test-packages {
+  TINYTEST_FILTER="$1" @meteor test-packages --exclude-archs=web.browser.legacy,web.cordova
+}
+
+function @test-self {
+  @meteor self-test "$@"
+}
+
+function @check-syntax {
+  node "$ROOT_DIR/scripts/admin/check-legacy-syntax/check-syntax.js"
+}
+
+function @generate-dev-bundle {
+  "$ROOT_DIR/scripts/generate-dev-bundle.sh"
+}

packages/accounts-password/password_tests.js

@@ -1213,7 +1213,6 @@ if (Meteor.isServer) (() => {
   // This test properly belongs in accounts-base/accounts_tests.js, but
   // this is where the tests that actually log in are.
   Tinytest.addAsync('accounts - user() out of context', async test => {
-    // basic server context, no method.
     await test.throwsAsync(
       async () =>
         await Meteor.user()

packages/meteor/asl-helpers-client.js

@@ -11,3 +11,7 @@ Meteor.isFibersDisabled = true;
 Meteor._isPromise = function (r) {
   return r && typeof r.then === "function";
 };
+
+Meteor._runFresh = function (fn) {
+  return fn();
+};

packages/meteor/asl-helpers.js

@@ -36,10 +36,16 @@ function updateAslStore(key, value) {
   return getAslStore()[key] = value;
 }
 
+function runFresh(fn) {
+  var asyncLocalStorage = getAsl();
+  return asyncLocalStorage.run({}, fn);
+}
+
 Meteor._getAsl = getAsl;
 Meteor._getAslStore = getAslStore;
 Meteor._getValueFromAslStore = getValueFromAslStore;
 Meteor._updateAslStore = updateAslStore;
+Meteor._runFresh = runFresh;
 
 Meteor._runAsync = function (fn, ctx, store) {
   if (store === undefined) {

packages/meteor/async_helpers.js

@@ -71,7 +71,7 @@ Object.assign(AsynchronousQueue.prototype, {
     const promise = new Promise(r => resolve = r);
     const runImmediateHandle = (fn) => {
       if (Meteor.isServer) {
-        setImmediate(fn);
+        Meteor._runFresh(() => setImmediate(fn))
         return;
       }
       setTimeout(fn, 0);

packages/meteor/dynamics_browser.js

@@ -36,11 +36,26 @@ EVp.getOrNullIfOutsideFiber = function () {
  */
 EVp.withValue = function (value, func) {
   var saved = currentValues[this.slot];
+
   try {
     currentValues[this.slot] = value;
+
     var ret = func();
+    var isPromise = Meteor._isPromise(ret);
+
+    if (isPromise) {
+      var self = this;
+      return ret.then(function (res) {
+        currentValues[self.slot] = saved;
+        return res
+      });
+    }
+  } catch (e) {
+    throw e;
   } finally {
-    currentValues[this.slot] = saved;
+    if (!isPromise) {
+      currentValues[this.slot] = saved;
+    }
   }
 
   return ret;

packages/meteor/dynamics_nodejs.js

@@ -60,20 +60,10 @@ class EnvironmentVariableAsync {
     }
 
     return Meteor._runAsync(
-      async function () {
-        let ret;
-        try {
-          Meteor._updateAslStore(CURRENT_VALUE_KEY_NAME, value);
-          Meteor._updateAslStore(UPPER_CALL_DYNAMICS_KEY_NAME, dynamics);
-          ret = await func();
-        } finally {
-          Meteor._updateAslStore(CURRENT_VALUE_KEY_NAME, undefined);
-          Meteor._updateAslStore(
-            UPPER_CALL_DYNAMICS_KEY_NAME,
-            undefined,
-          );
-        }
-        return ret;
+      function () {
+        Meteor._updateAslStore(CURRENT_VALUE_KEY_NAME, value);
+        Meteor._updateAslStore(UPPER_CALL_DYNAMICS_KEY_NAME, dynamics);
+        return func();
       },
       self,
       Object.assign(
@@ -142,10 +132,10 @@ Meteor.EnvironmentVariable = EnvironmentVariableAsync;
 /**
  * @summary Stores the current Meteor environment variables, and wraps the
  * function to run with the environment variables restored. On the server, the
- * function is wrapped within a fiber.
+ * function is wrapped within Async Local Storage.
  *
  *  This function has two reasons:
- *  1. Return the function to be executed on the MeteorJS context, having it assinged in the async localstorage.
+ *  1. Return the function to be executed on the MeteorJS context, having it assigned in Async Local Storage.
  *  2. Better error handling, the error message will be more clear.
  * @locus Anywhere
  * @memberOf Meteor

packages/meteor/dynamics_test.js

@@ -107,7 +107,7 @@ Tinytest.addAsync("environment - bindEnvironment", async function (test) {
     test.equal(raised_f, null);
 
     test.equal(await f(true), undefined);
-    test.equal(raised_f, "test");
+    test.equal(raised_f, "test", 'raised_f should be "test"');
   };
 
   // At top level
@@ -117,9 +117,9 @@ Tinytest.addAsync("environment - bindEnvironment", async function (test) {
 
   // Inside a withValue
 
-  await CurrentFoo.withValue(22, function () {
+  await CurrentFoo.withValue(22, async function () {
     test.equal(CurrentFoo.get(), 22);
-    test_f();
+    await test_f();
     test.equal(CurrentFoo.get(), 22);
   });
 
@@ -178,3 +178,54 @@ Tinytest.addAsync("environment - bare bindEnvironment",
     setTimeout(f, 0);
   });
 });
+
+/**
+ * This won't work on the client due to the absence of ALS/AH
+ */
+if (Meteor.isServer) {
+  Tinytest.addAsync('environment - preserve ev value async/await', async function (test) {
+    let val1 = null;
+    let val2 = null;
+
+    let ev1 = new Meteor.EnvironmentVariable();
+
+    async function runAsyncFunction() {
+      await test.sleep(10)
+      val2 = ev1.get();
+    }
+
+    ev1.withValue({ name: 'test' }, async () => {
+      runAsyncFunction();
+
+      val1 = ev1.get();
+    });
+
+    await test.sleep(20)
+
+    test.equal(val1, { name: 'test' }, 'val1 should be equal to { name: "test" }');
+    test.equal(val2, { name: 'test' }, 'val2 should be equal to val1');
+  })
+
+  Tinytest.addAsync('environment - should not access ev after it finishes', async function (test) {
+    const context1 = new Meteor.EnvironmentVariable();
+    const context2 = new Meteor.EnvironmentVariable();
+
+    await context1.withValue({ idd: 123 }, async () => {
+      await context2.withValue({ idd: 456 }, async () => {
+        await context2.withValue({ idd: 789 }, async () => {
+          test.equal(context2.get(), { idd: 789 }, 'context2 should be 789');
+        })
+        test.equal(context2.get(), { idd: 456 }, 'context2 should be 456');
+      })
+
+      test.equal(context1.get(), { idd: 123 }, 'context1 should be 123');
+      test.equal(context2.get(), undefined, 'context2 should be undefined');
+    });
+  })
+}
+
+Tinytest.add('environment - consistent ev value', function (test) {
+  let ev1 = new Meteor.EnvironmentVariable();
+  const ret = ev1.withValue(10, () => 5);
+  test.equal(ret, 5);
+})

packages/tinytest/tinytest.js

@@ -16,6 +16,10 @@ export class TestCaseResults {
     this.extraDetails = {};
   }
 
+  sleep(ms = 0) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+
   ok(doc) {
     var ok = {type: "ok"};
     if (doc)