Merge pull request Automattic#15094 from IchirokuXVI/fix-aggregate-cursor-als

Fix aggregate cursor als

Author: vkarpov15

lib/aggregate.js

@@ -87,6 +87,24 @@ function Aggregate(pipeline, model) {
 
 Aggregate.prototype.options;
 
+/**
+ * Returns default options for this aggregate.
+ *
+ * @param {Model} model
+ * @api private
+ */
+
+Aggregate.prototype._optionsForExec = function() {
+  const options = this.options || {};
+
+  const asyncLocalStorage = this.model()?.db?.base.transactionAsyncLocalStorage?.getStore();
+  if (!options.hasOwnProperty('session') && asyncLocalStorage?.session != null) {
+    options.session = asyncLocalStorage.session;
+  }
+
+  return options;
+};
+
 /**
  * Get/set the model that this aggregation will execute on.
  *
@@ -914,6 +932,7 @@ Aggregate.prototype.option = function(value) {
  */
 
 Aggregate.prototype.cursor = function(options) {
+  this._optionsForExec();
   this.options.cursor = options || {};
   return new AggregationCursor(this); // return this;
 };
@@ -1022,10 +1041,7 @@ Aggregate.prototype.exec = async function exec() {
   applyGlobalMaxTimeMS(this.options, model.db.options, model.base.options);
   applyGlobalDiskUse(this.options, model.db.options, model.base.options);
 
-  const asyncLocalStorage = this.model()?.db?.base.transactionAsyncLocalStorage?.getStore();
-  if (!this.options.hasOwnProperty('session') && asyncLocalStorage?.session != null) {
-    this.options.session = asyncLocalStorage.session;
-  }
+  this._optionsForExec();
 
   if (this.options && this.options.cursor) {
     return new AggregationCursor(this);
@@ -1052,6 +1068,7 @@ Aggregate.prototype.exec = async function exec() {
   }
 
   const options = clone(this.options || {});
+
   let result;
   try {
     const cursor = await collection.aggregate(this._pipeline, options);