make sure there is consistent ev value across client/server

.envrc

@@ -12,5 +12,5 @@ function @meteor {
 }
 
 function @test-package {
-   @meteor test-packages "$@"
+   @meteor test-packages "$@" --exclude-archs=web.browser.legacy,web.cordova
 }

packages/meteor/dynamics_browser.js

@@ -35,12 +35,26 @@ EVp.getOrNullIfOutsideFiber = function () {
  * @returns {any} The return value of the function
  */
 EVp.withValue = function (value, func) {
-  var saved = currentValues[this.slot];
+  let ret
+  let isPromise
+  const saved = currentValues[this.slot];
+
   try {
     currentValues[this.slot] = value;
-    var ret = func();
+
+    ret = func();
+
+    isPromise = Meteor._isPromise(ret);
+
+    if (isPromise) {
+      return ret.finally(() => {
+        currentValues[this.slot] = saved;
+      });
+    }
   } finally {
-    currentValues[this.slot] = saved;
+    if (!isPromise) {
+      currentValues[this.slot] = saved;
+    }
   }
 
   return ret;

packages/meteor/dynamics_nodejs.js

@@ -60,12 +60,10 @@ class EnvironmentVariableAsync {
     }
 
     return Meteor._runAsync(
-      async function () {
-        let ret;
+      function () {
         Meteor._updateAslStore(CURRENT_VALUE_KEY_NAME, value);
         Meteor._updateAslStore(UPPER_CALL_DYNAMICS_KEY_NAME, dynamics);
-        ret = await func();
-        return ret;
+        return func();
       },
       self,
       Object.assign(
@@ -134,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);
   });
 
@@ -223,4 +223,10 @@ if (Meteor.isServer) {
     test.equal(val1, { name: 'test' });
     test.equal(val2, { name: 'test' });
   })
-}
+}
+
+Tinytest.add('environment - consistent ev value', function (test) {
+  let ev1 = new Meteor.EnvironmentVariable();
+  const ret = ev1.withValue(10, () => 5);
+  test.equal(ret, 5);
+})