Tests: added tests for NJS loadable modules.

test/conftest.py

@@ -523,26 +523,31 @@ def _clear_conf(sock, *, log=None):
 
     assert 'success' in resp, 'clear conf'
 
-    if 'openssl' not in option.available['modules']:
+    def get(url):
-        return
+        return http.get(url=url, sock_type='unix', addr=sock)['body']
 
-    try:
+    def delete(url):
-        certs = json.loads(
+        return http.delete(url=url, sock_type='unix', addr=sock)['body']
-            http.get(url='/certificates', sock_type='unix', addr=sock)['body']
-        ).keys()
 
-    except json.JSONDecodeError:
+    if 'openssl' in option.available['modules']:
-        pytest.fail("Can't parse certificates list.")
+        try:
+            certs = json.loads(get('/certificates')).keys()
 
-    for cert in certs:
+        except json.JSONDecodeError:
-        resp = http.delete(
+            pytest.fail("Can't parse certificates list.")
-            url=f'/certificates/{cert}',
-            sock_type='unix',
-            addr=sock,
-        )['body']
 
-        assert 'success' in resp, 'remove certificate'
+        for cert in certs:
+            assert 'success' in delete(f'/certificates/{cert}'), 'delete cert'
 
+    if 'njs' in option.available['modules']:
+        try:
+            scripts = json.loads(get('/js_modules')).keys()
+
+        except json.JSONDecodeError:
+            pytest.fail("Can't parse njs modules list.")
+
+        for script in scripts:
+            assert 'success' in delete(f'/js_modules/{script}'), 'delete script'
 
 def _clear_temp_dir():
     temp_dir = unit_instance['temp_dir']

test/njs/global_this/script.js

@@ -0,0 +1,3 @@
+export default {
+    "str" : function () {return typeof globalThis.njs.version}
+}

test/njs/import_from/script.js

@@ -0,0 +1,5 @@
+import cr from 'crypto';
+
+export default {
+    "num" : function () {return typeof cr.createHash('md5').digest().length}
+}

test/njs/invalid/script.js

@@ -0,0 +1,3 @@
+export default {
+    "route": function() {blah 'next'}
+}

test/njs/next/script.js

@@ -0,0 +1,3 @@
+export default {
+    "route": function() {return 'next'}
+}

test/test_njs_modules.py

@@ -0,0 +1,99 @@
+from unit.applications.proto import TestApplicationProto
+from unit.option import option
+
+
+class TestNJSModules(TestApplicationProto):
+    prerequisites = {'modules': {'njs': 'any'}}
+
+    def njs_script_load(self, module, name=None, expect='success'):
+        if name is None:
+            name = module
+
+        with open(f'{option.test_dir}/njs/{module}/script.js', 'rb') as s:
+            assert expect in self.conf(s.read(), f'/js_modules/{name}')
+
+    def test_njs_modules(self):
+        self.njs_script_load('next')
+
+        assert 'export' in self.conf_get('/js_modules/next')
+        assert 'error' in self.conf_post('"blah"', '/js_modules/next')
+
+        assert 'success' in self.conf(
+            {
+                "settings": {"js_module": "next"},
+                "listeners": {"*:7080": {"pass": "routes/first"}},
+                "routes": {
+                    "first": [{"action": {"pass": "`routes/${next.route()}`"}}],
+                    "next": [{"action": {"return": 200}}],
+                },
+            }
+        )
+        assert self.get()['status'] == 200, 'string'
+
+        assert 'success' in self.conf({"js_module": ["next"]}, 'settings')
+        assert self.get()['status'] == 200, 'array'
+
+        # add one more value to array
+
+        assert len(self.conf_get('/js_modules').keys()) == 1
+
+        self.njs_script_load('next', 'next_2')
+
+        assert len(self.conf_get('/js_modules').keys()) == 2
+
+        assert 'success' in self.conf_post('"next_2"', 'settings/js_module')
+        assert self.get()['status'] == 200, 'array len 2'
+
+        assert 'success' in self.conf(
+            '"`routes/${next_2.route()}`"', 'routes/first/0/action/pass'
+        )
+        assert self.get()['status'] == 200, 'array new'
+
+        # can't update exsisting script
+
+        self.njs_script_load('global_this', 'next', expect='error')
+
+        # delete modules
+
+        assert 'error' in self.conf_delete('/js_modules/next_2')
+        assert 'success' in self.conf_delete('settings/js_module')
+        assert 'success' in self.conf_delete('/js_modules/next_2')
+
+    def test_njs_modules_import(self):
+        self.njs_script_load('import_from')
+
+        assert 'success' in self.conf(
+            {
+                "settings": {"js_module": "import_from"},
+                "listeners": {"*:7080": {"pass": "routes/first"}},
+                "routes": {
+                    "first": [
+                        {"action": {"pass": "`routes/${import_from.num()}`"}}
+                    ],
+                    "number": [{"action": {"return": 200}}],
+                },
+            }
+        )
+        assert self.get()['status'] == 200
+
+    def test_njs_modules_this(self):
+        self.njs_script_load('global_this')
+
+        assert 'success' in self.conf(
+            {
+                "settings": {"js_module": "global_this"},
+                "listeners": {"*:7080": {"pass": "routes/first"}},
+                "routes": {
+                    "first": [
+                        {"action": {"pass": "`routes/${global_this.str()}`"}}
+                    ],
+                    "string": [{"action": {"return": 200}}],
+                },
+            }
+        )
+        assert self.get()['status'] == 200
+
+    def test_njs_modules_invalid(self, skip_alert):
+        skip_alert(r'.*JS compile module.*failed.*')
+
+        self.njs_script_load('invalid', expect='error')