*Fix Module.js paths

*Throw ScriptingException on js exception
eclipse · Sep 21, 2021 · 4011d62 · 4011d62
1 parent 2988c00
commit 4011d62
Show file tree

Hide file tree

Showing 5 changed files with 260 additions and 261 deletions.
diff --git a/...acade/api-tests/src/main/java/org/eclipse/dirigible/api/v3/test/AbstractApiSuiteTest.java b/...acade/api-tests/src/main/java/org/eclipse/dirigible/api/v3/test/AbstractApiSuiteTest.java
@@ -424,7 +424,10 @@ protected void runTest(IJavascriptEngineExecutor executor, IRepository repositor
         }
         Object result = null;
         long start = System.currentTimeMillis();
-        executor.executeServiceModule(testModule, null);
+        Object error = executor.executeServiceModule(testModule, null);
+        if (error != null && error.toString() != null) {
+            throw new ScriptingException(error.toString());
+        }
         long time = System.currentTimeMillis() - start;
         System.out.println(String.format("API test [%s] on engine [%s] passed for: %d ms", testModule,
                 executor.getType(), time));

diff --git a/api/api-facade/api-tests/src/main/resources/META-INF/dirigible/ext/cassandra/client.js b/api/api-facade/api-tests/src/main/resources/META-INF/dirigible/ext/cassandra/client.js
@@ -27,8 +27,6 @@ java.lang.Thread.sleep(500);
 var resultSet = cassandraSession.getDBResults(cassandraSession,"test", "select*from test_table");
 var stringResult = resultSet.getRowAsString();
 
-console.log("EXECUTING ASSERT")
-assertTrue(false);
 assertTrue(stringResult !== null && stringResult !== undefined && stringResult === "[Row[1, test_user, 18]]");
 
 
diff --git a/...va/org/eclipse/dirigible/engine/js/graalvm/processor/GraalVMJavascriptEngineExecutor.java b/...va/org/eclipse/dirigible/engine/js/graalvm/processor/GraalVMJavascriptEngineExecutor.java
@@ -187,7 +187,7 @@ public Object executeService(String moduleOrCode, Map<Object, Object> executionC
 
 				if (isModule) {
 					bindings.putMember("MODULE_FILENAME", moduleOrCode);
-					result = context.eval(ENGINE_JAVA_SCRIPT, Require.MODULE_LOAD_CODE).as(Object.class);
+					context.eval(ENGINE_JAVA_SCRIPT, Require.MODULE_LOAD_CODE);
 				} else {
 					bindings.putMember("SCRIPT_STRING", moduleOrCode);
 					context.eval(ENGINE_JAVA_SCRIPT, Require.LOAD_STRING_CODE).as(Object.class);
@@ -211,6 +211,8 @@ public Object executeService(String moduleOrCode, Map<Object, Object> executionC
 			e.printStackTrace();
 		} catch (PolyglotException e) {
 			e.printStackTrace();
+			logger.trace("exiting: executeServiceModule() with js exception");
+			return e.getMessage(); // TODO: Create JSExecutionResult class and return it instead of Object instance
 		} catch (URISyntaxException e) {
 			e.printStackTrace();
 		}

diff --git a/modules/engines/engine-javascript-graalvm/src/main/resources/Module.debug.js b/modules/engines/engine-javascript-graalvm/src/main/resources/Module.debug.js
@@ -140,7 +140,7 @@ function findModulePath (id, dirs) {
           return findModulePath(id, rest);
       }
 
-      var resource = org.eclipse.dirigible.api.v3.platform.RepositoryFacade.getResource("/registry/public/" + location)
+      var resource = org.eclipse.dirigible.api.v3.platform.RepositoryFacade.getResource("/registry/public" + location)
       if (resource.exists()) {
           return location;
       }  else {