@koeroesi86/node-worker-express 20.10.9-16a7d5b → 22.3.12-fd2e588

package/README.md

@@ -1,4 +1,4 @@
-# Node Worker Express [![Build status](https://travis-ci.com/Koeroesi86/node-worker-express.svg?branch=master)](https://travis-ci.org/Koeroesi86/node-worker-express)
+# Node Worker Express [![Build Status](https://app.travis-ci.com/Koeroesi86/node-worker-express.svg?branch=master)](https://app.travis-ci.com/Koeroesi86/node-worker-express)
 
 Express JS library for [@koeroesi86/node-worker](https://www.npmjs.com/package/@koeroesi86/node-worker)
 

package/constants/index.js

@@ -2,6 +2,7 @@ const WORKER_EVENT = {
   REQUEST: 'WORKER_REQUEST',
   REQUEST_ACKNOWLEDGE: 'WORKER_REQUEST_ACK',
   RESPONSE: 'WORKER_RESPONSE',
+  RESPONSE_EMIT: 'WORKER_RESPONSE_EMIT',
   RESPONSE_ACKNOWLEDGE: 'WORKER_RESPONSE_ACK',
   WS_MESSAGE_RECEIVE: 'WS_MESSAGE_RECEIVE',
   WS_MESSAGE_SEND: 'WS_MESSAGE_SEND',

package/examples/staticWorker.js

@@ -2,9 +2,14 @@ const path = require('path');
 const fs = require('fs');
 const crypto = require('crypto');
 const { execSync } = require('child_process');
+const { Writable } = require('stream');
 
 let timer;
 
+const features = {
+  enableEmit: false,
+};
+
 function debounce(fn = () => {}, timeout = 0) {
   if (timer) clearTimeout(timer);
   timer = setTimeout(() => {
@@ -133,8 +138,7 @@ function getCharset(body, fileName) {
     return 'iso-8859-1';
 
   try {
-    const out = execSync(`file -b --mime-encoding ${fileName}`).toString('utf8').trim();
-    return out;
+    return execSync(`file -b --mime-encoding ${fileName}`).toString('utf8').trim();
   } catch (e) {
     //
   }
@@ -169,19 +173,54 @@ const staticWorker = (event, callback = () => {}) => {
         isModified = false;
       }
     }
-
-    callback({
+    const response = {
       statusCode: isModified ? 200 : 304,
       headers: {
         'Content-Type': `${contentType}${charset ? `; charset=${charset}` : ''}`,
         'Cache-Control': 'public, max-age=0',
-        'Content-Length': bodyBuffer.length,
+        'Content-Length': bodyBuffer.byteLength,
         'ETag': currentEtag,
         ...(stats.mtime && { 'Last-Modified': lastModified.toUTCString() }),
       },
-      body: bodyBuffer.toString('base64'),
+      body: isModified ? bodyBuffer.toString('base64') : '',
       isBase64Encoded: true,
-    });
+    };
+
+    if (features.enableEmit && isModified) {
+      const writer = new Writable({
+        /**
+         * @param {Buffer} chunk
+         * @param {string} encoding
+         * @param {Function} next
+         */
+        write(chunk, encoding, next) {
+          response.emit = true;
+          response.isBase64Encoded = true;
+          response.body = chunk.toString('base64');
+          // console.log('sending', chunk.length, 'bytes')
+          callback(response);
+          next();
+        },
+        destroy() {
+          response.isBase64Encoded = false;
+          response.emit = true;
+          response.body = null;
+          callback(response);
+        },
+      });
+
+      fs.createReadStream(fileName, {
+        // encoding: 'binary',
+        // encoding: 'utf-8',
+        emitClose: false,
+        autoClose: false,
+        // highWaterMark: 16,
+        start: 0,
+        end: Infinity,
+      }).pipe(writer);
+    } else {
+      callback(response);
+    }
   } else {
     callback({
       statusCode: 404,

package/index.d.ts

@@ -45,6 +45,7 @@ declare namespace Middleware {
     statusCode: number;
     headers?: { [key: string]: string };
     isBase64Encoded?: boolean;
+    emit?: boolean;
     body?: string;
   }
 

package/middleware/index.js

@@ -215,6 +215,25 @@ const workerMiddleware = (options) => {
             response.end();
           }
 
+          if (responseEvent.type === WORKER_EVENT.RESPONSE_EMIT) {
+            worker.postMessage({
+              type: WORKER_EVENT.RESPONSE_ACKNOWLEDGE,
+              requestId,
+            });
+            /** @type {ResponseEvent|WSFrameEvent} event */
+            const { event } = responseEvent;
+            const bufferEncoding = event.isBase64Encoded ? 'base64' : 'utf8';
+
+            if (!response.headersSent) {
+              response.writeHead(event.statusCode, event.headers);
+            }
+            if (event.body !== null) {
+              response.write(Buffer.from(event.body, bufferEncoding).toString());
+            } else {
+              response.end();
+            }
+          }
+
           if (responseEvent.type === WORKER_EVENT.WS_MESSAGE_SEND) {
             request.socket.write(constructWsMessage(responseEvent.event.frame));
           }

package/middleware/workerInvoke.js

@@ -15,10 +15,12 @@ function messageListener(message) {
     const callback = responseEvent => {
       /** @type {WorkerOutputEvent} e */
       const e = {
-        type: responseEvent.sendWsMessage ? WORKER_EVENT.WS_MESSAGE_SEND : WORKER_EVENT.RESPONSE,
+        type: WORKER_EVENT.RESPONSE,
         requestId: message.requestId,
         event: responseEvent,
-      }
+      };
+      if (responseEvent.sendWsMessage) e.type = WORKER_EVENT.WS_MESSAGE_SEND;
+      if (responseEvent.emit) e.type = WORKER_EVENT.RESPONSE_EMIT;
       process.send(e);
     };
     worker(message.event, callback);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koeroesi86/node-worker-express",
-  "version": "v20.10.9-16a7d5b",
+  "version": "v22.03.12-fd2e588",
   "description": "",
   "main": "index.js",
   "author": {
@@ -19,12 +19,12 @@
   "license": "MIT",
   "dependencies": {
     "@koeroesi86/node-worker": "^1.0.3-6bc3bc7",
-    "uuid": "^7.0.3"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@types/express": "^4.17.6",
-    "@types/node": "^13.11.1",
-    "express": "^4.17.1",
-    "nodemon": "^2.0.3"
+    "@types/express": "^4.17.13",
+    "@types/node": "^17.0.21",
+    "express": "^4.17.3",
+    "nodemon": "^2.0.15"
   }
 }

package/utils/workerPool.js

@@ -14,7 +14,7 @@ const createWorkerCommand = workerPath => {
   switch (ext) {
     case '.js':
     default:
-      return `node ${path.resolve(__dirname, '../middleware/workerInvoke.js')} ${workerPath}`;
+      return `node --expose-gc ${path.resolve(__dirname, '../middleware/workerInvoke.js')} ${workerPath}`;
   }
 };