@jwn-js/common 2.0.36 → 2.0.39

package/index.js

@@ -1169,16 +1169,15 @@ class Web {
       if (["get", "head"].includes(this.contextWeb.method) && this.contextWeb?.stack?.memcached instanceof Memcached) {
         const memcached = this.contextWeb.stack.memcached;
         if (memcached.isConnectedServers()) {
-          memcached.getPage(this.memcachedKey).then((cache) => {
-            if (cache) {
-              const { data, headers } = cache;
-              this.success({
-                body: data.toString(),
-                headers,
-                statusCode: 200
-              });
-            }
-          });
+          const cache = await memcached.getPage(this.memcachedKey);
+          if (cache) {
+            const { data, headers } = cache;
+            this.success({
+              body: data.toString(),
+              headers,
+              statusCode: 200
+            });
+          }
         }
       }
       request.controller = request.controller || this.defaultControllerSubaction.controller;
@@ -1201,6 +1200,13 @@ class Web {
           const records = xmljs__default["default"].xml2js(raw, { compact: true, cdataKey: "_value", textKey: "_value" });
           Object.assign(request, records || {});
         } else if (type.indexOf("stream") !== -1) {
+          Object.defineProperty(this.contextWeb, "$stream", {
+            enumerable: false,
+            configurable: false,
+            writable: false,
+            value: streamBody(this.res, this.req, false)
+          });
+        } else if (type.indexOf("binary") !== -1) {
           await new Promise((resolve) => {
             const stream = streamBody(this.res, this.req);
             const temp = os__namespace.tmpdir();
@@ -1216,13 +1222,6 @@ class Web {
             });
             stream.on("end", () => resolve(true));
           });
-        } else if (type.indexOf("binary") !== -1) {
-          Object.defineProperty(this.contextWeb, "$stream", {
-            enumerable: false,
-            configurable: false,
-            writable: false,
-            value: streamBody(this.res, this.req, false)
-          });
         } else {
           Object.defineProperty(this.contextWeb, "$body", {
             enumerable: false,
@@ -1316,28 +1315,62 @@ class Web {
     }
   }
   success(response) {
+    const isStream = response.body instanceof stream$1.Stream;
     const code = response.statusCode || 200;
     const status = codeToStatus(code);
-    const body = easyAsh.isObject(response.body) ? JSON.stringify(response.body) : response.body;
-    if (["get", "head"].includes(this.contextWeb.method) && code === 200 && response.memcache && this.contextWeb?.stack?.memcached instanceof Memcached) {
+    const body = !isStream && easyAsh.isObject(response.body) ? JSON.stringify(response.body) : response.body;
+    if (!isStream && ["get", "head"].includes(this.contextWeb.method) && code === 200 && response.memcache && this.contextWeb?.stack?.memcached instanceof Memcached) {
       const memcached = this.contextWeb.stack.memcached;
       memcached.setPage(this.memcachedKey, response.headers, body, response.memcache).then();
     }
-    this.res.writeStatus(status);
-    Object.entries(response.headers).map(([key, value]) => this.res.writeHeader(key, value));
-    this.res.end(body);
+    if (!isStream) {
+      this.res.cork(() => {
+        this.res.writeStatus(status);
+        Object.entries(response.headers).map(([key, value]) => this.res.writeHeader(key, value));
+        this.res.end(body);
+      });
+    } else {
+      this.res.cork(() => {
+        this.res.writeStatus(status);
+        Object.entries(response.headers).map(([key, value]) => this.res.writeHeader(key, value));
+        body.on("data", (chunk) => {
+          this.res.write(chunk);
+        }).on("end", () => {
+          this.res.end();
+        });
+      });
+    }
   }
   error(e) {
+    const isStream = e instanceof ApiError.ApiError && e.getData() instanceof stream$1.Stream;
     let status = codeToStatus(404), headers = this.defaultResponse.headers, body = e.message;
     if (e instanceof ApiError.ApiError) {
       const data = { isError: true, code: e.getCode(), error: e.getMessage() };
       status = codeToStatus(e.getStatusCode());
       headers = e.getHeaders() || this.defaultResponse.headers;
-      body = easyAsh.isObject(e.getData()) && Object.keys(e.getData()).length > 0 ? JSON.stringify(e.getData()) : JSON.stringify(data);
+      if (isStream) {
+        body = e.getData();
+      } else {
+        body = easyAsh.isObject(e.getData()) && Object.keys(e.getData()).length > 0 ? JSON.stringify(e.getData()) : JSON.stringify(data);
+      }
+    }
+    if (!isStream) {
+      this.res.cork(() => {
+        this.res.writeStatus(status);
+        Object.entries(headers).map(([key, value]) => this.res.writeHeader(key, value));
+        this.res.end(body);
+      });
+    } else {
+      this.res.cork(() => {
+        this.res.writeStatus(status);
+        Object.entries(headers).map(([key, value]) => this.res.writeHeader(key, value));
+        body.on("data", (chunk) => {
+          this.res.write(chunk);
+        }).on("end", () => {
+          this.res.end();
+        });
+      });
     }
-    this.res.writeStatus(status);
-    Object.entries(headers).map(([key, value]) => this.res.writeHeader(key, value));
-    this.res.end(body);
   }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jwn-js/common",
   "private": false,
-  "version": "2.0.36",
+  "version": "2.0.39",
   "description": "@jwn-js/common package",
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "buildmsql": "^1.3.17",
-    "easy-ash": "^1.1.7",
+    "easy-ash": "^1.1.8",
     "formidable": "2",
     "memjs": "^1.3.0",
     "reflect-metadata": "^0.1.13",