From a0c083af208cd9f676bb56762b4e27a3174a773d Mon Sep 17 00:00:00 2001
From: Oisin Canty <o.canty@f5.com>
Date: Wed, 12 May 2021 09:26:55 +0000
Subject: Node.js: a shim for overriding "http" and "websocket" modules.

Also added stubs for Server.address()
This was done to prevent crashes in some popular frameworks like express

Supports both CommonJS and the new ES Modules system syntax e.g:

app.js:
const http = require('http')

app.mjs:
import http from "http"

Usage on Node 14.16.x and higher:
{
    "type": "external",
    "processes": {"spare": 0},
    "working_directory": '/project',
    "executable": "/usr/bin/env",
    "arguments": [
        "node",
        "--loader",
        "unit-http/require_shim.mjs"
        "--require",
        "unit-http/require_shim",
        "app.js"
    ]
}

Usage on Node 14.15.x and lower:
{
    "type": "external",
    "processes": {"spare": 0},
    "working_directory": '/project',
    "executable": "/usr/bin/env",
    "arguments": [
        "node",
        "--require",
        "unit-http/require_shim",
        "app.js"
    ]
}
---
 test/test_node_es_modules.py | 50 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 test/test_node_es_modules.py

(limited to 'test/test_node_es_modules.py')

diff --git a/test/test_node_es_modules.py b/test/test_node_es_modules.py
new file mode 100644
index 00000000..ce27e474
--- /dev/null
+++ b/test/test_node_es_modules.py
@@ -0,0 +1,50 @@
+import pytest
+
+from distutils.version import LooseVersion
+from unit.applications.lang.node import TestApplicationNode
+from unit.applications.websockets import TestApplicationWebsocket
+
+
+class TestNodeESModules(TestApplicationNode):
+    prerequisites = {
+        'modules': {
+            'node': lambda v:  LooseVersion(v) >= LooseVersion("14.16.0")
+        }
+    }
+
+    es_modules = True
+    ws = TestApplicationWebsocket()
+
+    def assert_basic_application(self):
+        resp = self.get()
+        assert resp['headers']['Content-Type'] == 'text/plain', 'basic header'
+        assert resp['body'] == 'Hello World\n', 'basic body'
+
+    def test_node_es_modules_require_shim_http(self):
+        self.load('require_shim/es_modules_http', name="app.mjs")
+
+        self.assert_basic_application()
+
+    def test_node_es_modules_require_shim_http_indirect(self):
+        self.load('require_shim/es_modules_http_indirect', name="app.js")
+
+        self.assert_basic_application()
+
+    def test_node_es_modules_require_shim_websockets(self):
+        self.load('require_shim/es_modules_websocket', name="app.mjs")
+
+        message = 'blah'
+
+        _, sock, _ = self.ws.upgrade()
+
+        self.ws.frame_write(sock, self.ws.OP_TEXT, message)
+        frame = self.ws.frame_read(sock)
+
+        assert message == frame['data'].decode('utf-8'), 'mirror'
+
+        self.ws.frame_write(sock, self.ws.OP_TEXT, message)
+        frame = self.ws.frame_read(sock)
+
+        assert message == frame['data'].decode('utf-8'), 'mirror 2'
+
+        sock.close()
-- 
cgit 


From c160ea11e4ece4db52731ac8b83dd09ca2d1ef11 Mon Sep 17 00:00:00 2001
From: Oisin Canty <o.canty@f5.com>
Date: Mon, 24 May 2021 09:01:42 +0000
Subject: Node.js: renamed "require_shim" to "loader".

---
 test/test_node_es_modules.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'test/test_node_es_modules.py')

diff --git a/test/test_node_es_modules.py b/test/test_node_es_modules.py
index ce27e474..0945a967 100644
--- a/test/test_node_es_modules.py
+++ b/test/test_node_es_modules.py
@@ -20,18 +20,18 @@ class TestNodeESModules(TestApplicationNode):
         assert resp['headers']['Content-Type'] == 'text/plain', 'basic header'
         assert resp['body'] == 'Hello World\n', 'basic body'
 
-    def test_node_es_modules_require_shim_http(self):
-        self.load('require_shim/es_modules_http', name="app.mjs")
+    def test_node_es_modules_loader_http(self):
+        self.load('loader/es_modules_http', name="app.mjs")
 
         self.assert_basic_application()
 
-    def test_node_es_modules_require_shim_http_indirect(self):
-        self.load('require_shim/es_modules_http_indirect', name="app.js")
+    def test_node_es_modules_loader_http_indirect(self):
+        self.load('loader/es_modules_http_indirect', name="app.js")
 
         self.assert_basic_application()
 
-    def test_node_es_modules_require_shim_websockets(self):
-        self.load('require_shim/es_modules_websocket', name="app.mjs")
+    def test_node_es_modules_loader_websockets(self):
+        self.load('loader/es_modules_websocket', name="app.mjs")
 
         message = 'blah'
 
-- 
cgit