From 484b6fe2faeec93912e1fc57b54784428cbd15d3 Mon Sep 17 00:00:00 2001
From: Leo Kettmeir <crowlkats@toaxl.com>
Date: Fri, 24 Feb 2023 23:36:07 +0100
Subject: refactor(flash): move remoteAddr to options bag (#17913)

Applies suggestion from #17912
---
 ext/flash/01_http.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'ext/flash')

diff --git a/ext/flash/01_http.js b/ext/flash/01_http.js
index 79a4963a5..267a3551c 100644
--- a/ext/flash/01_http.js
+++ b/ext/flash/01_http.js
@@ -579,16 +579,19 @@ function createServe(opFn) {
             );
 
             let resp;
+            let remoteAddr;
             try {
-              resp = handler(req, () => {
-                const { 0: hostname, 1: port } = core.ops.op_flash_addr(
-                  serverId,
-                  i,
-                );
-                return {
-                  hostname,
-                  port,
-                };
+              resp = handler(req, {
+                get remoteAddr() {
+                  if (!remoteAddr) {
+                    const { 0: hostname, 1: port } = core.ops.op_flash_addr(
+                      serverId,
+                      i,
+                    );
+                    remoteAddr = { hostname, port };
+                  }
+                  return remoteAddr;
+                },
               });
               if (ObjectPrototypeIsPrototypeOf(PromisePrototype, resp)) {
                 PromisePrototypeCatch(
-- 
cgit v1.2.3