public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[jsscripting] Support non unix file paths (#11805)

Browse Source 
Lets try this again, Fixes #11801

Signed-off-by: Dan Cunningham <dan@digitaldan.com>
This commit is contained in:
Dan Cunningham 2021-12-17 11:34:25 -08:00 committed by GitHub
parent 4eea4ac4f4
commit 0fddb6151c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/OpenhabGraalJSScriptEngine.java
View File

@ -14,7 +14,6 @@ package org.openhab.automation.jsscripting.internal;
import static org.openhab.core.automation.module.script.ScriptEngineFactory.*; import static org.openhab.core.automation.module.script.ScriptEngineFactory.*;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.channels.SeekableByteChannel; import java.nio.channels.SeekableByteChannel;
@ -66,7 +65,7 @@ public class OpenhabGraalJSScriptEngine extends InvocationInterceptingScriptEngi
private static final String GLOBAL_REQUIRE = "require(\"@jsscripting-globals\");"; private static final String GLOBAL_REQUIRE = "require(\"@jsscripting-globals\");";
private static final String REQUIRE_WRAPPER_NAME = "__wraprequire__"; private static final String REQUIRE_WRAPPER_NAME = "__wraprequire__";
// final CommonJS search path for our library // final CommonJS search path for our library
private static final Path LOCAL_NODE_PATH = Paths.get(File.separator + "node_modules"); private static final Path NODE_DIR = Paths.get("node_modules");
// these fields start as null because they are populated on first use // these fields start as null because they are populated on first use
private @NonNullByDefault({}) String engineIdentifier; private @NonNullByDefault({}) String engineIdentifier;
@ -116,10 +115,11 @@ public class OpenhabGraalJSScriptEngine extends InvocationInterceptingScriptEngi
if (scriptDependencyListener != null) { if (scriptDependencyListener != null) {
scriptDependencyListener.accept(path.toString()); scriptDependencyListener.accept(path.toString());
} }
if (path.toString().endsWith(".js")) { if (path.toString().endsWith(".js")) {
SeekableByteChannel sbc = null; SeekableByteChannel sbc = null;
if (path.startsWith(LOCAL_NODE_PATH)) { if (isRootNodePath(path)) {
InputStream is = getClass().getResourceAsStream(path.toString()); InputStream is = getClass().getResourceAsStream(nodeFileToResource(path));
if (is == null) { if (is == null) {
throw new IOException("Could not read " + path.toString()); throw new IOException("Could not read " + path.toString());
} }
@ -137,8 +137,8 @@ public class OpenhabGraalJSScriptEngine extends InvocationInterceptingScriptEngi
@Override @Override
public void checkAccess(Path path, Set<? extends AccessMode> modes, public void checkAccess(Path path, Set<? extends AccessMode> modes,
LinkOption... linkOptions) throws IOException { LinkOption... linkOptions) throws IOException {
if (path.startsWith(LOCAL_NODE_PATH)) { if (isRootNodePath(path)) {
if (getClass().getResource(path.toString()) == null) { if (getClass().getResource(nodeFileToResource(path)) == null) {
throw new NoSuchFileException(path.toString()); throw new NoSuchFileException(path.toString());
} }
} else { } else {
@ -149,7 +149,7 @@ public class OpenhabGraalJSScriptEngine extends InvocationInterceptingScriptEngi
@Override @Override
public Map<String, Object> readAttributes(Path path, String attributes, public Map<String, Object> readAttributes(Path path, String attributes,
LinkOption... options) throws IOException { LinkOption... options) throws IOException {
if (path.startsWith(LOCAL_NODE_PATH)) { if (isRootNodePath(path)) {
return Collections.singletonMap("isRegularFile", true); return Collections.singletonMap("isRegularFile", true);
} }
return super.readAttributes(path, attributes, options); return super.readAttributes(path, attributes, options);
@ -157,7 +157,7 @@ public class OpenhabGraalJSScriptEngine extends InvocationInterceptingScriptEngi
@Override @Override
public Path toRealPath(Path path, LinkOption... linkOptions) throws IOException { public Path toRealPath(Path path, LinkOption... linkOptions) throws IOException {
if (path.startsWith(LOCAL_NODE_PATH)) { if (isRootNodePath(path)) {
return path; return path;
} }
return super.toRealPath(path, linkOptions); return super.toRealPath(path, linkOptions);
@ -210,4 +210,24 @@ public class OpenhabGraalJSScriptEngine extends InvocationInterceptingScriptEngi
LOGGER.error("Could not inject global script", e); LOGGER.error("Could not inject global script", e);
} }
} }
/**
* Tests if this is a root node directory, `/node_modules`, `C:\node_modules`, etc...
*
* @param path
* @return
*/
private boolean isRootNodePath(Path path) {
return path.startsWith(path.getRoot().resolve(NODE_DIR));
}
/**
* Converts a root node path to a class resource path for loading local modules
*
* @param path
* @return
*/
private String nodeFileToResource(Path path) {
return "/" + NODE_DIR + "/" + path.getFileName();
}
} }