-
Notifications
You must be signed in to change notification settings - Fork 0
Resolve JS module on first use if empty #148
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,11 @@ | ||
| package com.indexdata.reservoir.module.impl; | ||
|
|
||
| import com.indexdata.reservoir.module.Module; | ||
| import com.indexdata.reservoir.server.Storage; | ||
| import com.indexdata.reservoir.server.entity.CodeModuleEntity; | ||
| import io.vertx.core.Future; | ||
| import io.vertx.core.Vertx; | ||
| import io.vertx.core.http.HttpMethod; | ||
| import io.vertx.core.json.JsonObject; | ||
| import java.util.Collection; | ||
| import java.util.HashSet; | ||
|
|
@@ -22,7 +24,7 @@ public class ModuleJavaScript implements Module { | |
| private Vertx vertx; | ||
|
|
||
| @Override | ||
| public Future<Void> initialize(Vertx vertx, CodeModuleEntity entity) { | ||
| public Future<CodeModuleEntity> initialize(Vertx vertx, CodeModuleEntity entity) { | ||
| id = entity.getId(); | ||
| if (id == null || id.isEmpty()) { | ||
| return Future.failedFuture( | ||
|
|
@@ -31,29 +33,41 @@ public Future<Void> initialize(Vertx vertx, CodeModuleEntity entity) { | |
| this.vertx = vertx; | ||
| String url = entity.getUrl(); | ||
| String script = entity.getScript(); | ||
| if (script == null || script.isEmpty()) { | ||
| var hasUrl = url != null && !url.isEmpty(); | ||
| var hasScript = script != null && !script.isEmpty(); | ||
| if (!hasUrl && !hasScript) { | ||
| return Future.failedFuture( | ||
| new IllegalArgumentException("Module config must include 'url' or 'script'")); | ||
| } | ||
| if (url != null && !url.isEmpty()) { | ||
| // url always points to an ES module | ||
| defaultFunctionName = entity.getFunction(); | ||
| final boolean isModule = url.endsWith("mjs"); | ||
| if (!isModule) { | ||
| return Future.failedFuture(new IllegalArgumentException( | ||
| "url must end with .mjs to designate ES module")); | ||
| if (hasUrl) { | ||
| //module was never resolved (migration) | ||
| if (!hasScript) { | ||
| return new CodeModuleEntity.CodeModuleBuilder(entity.asJson()) | ||
| .resolve(vertx) | ||
| .compose(this::initAsEsModule); | ||
| } | ||
| Context.Builder cb = Context.newBuilder("js") | ||
| .allowExperimentalOptions(true) | ||
| .option("js.esm-eval-returns-exports", "true"); | ||
| context = cb.build(); | ||
| String moduleName = url.substring(url.lastIndexOf("/") + 1); | ||
| module = context.eval(Source.newBuilder("js", script, moduleName).buildLiteral()); | ||
| return this.initAsEsModule(entity); | ||
| } else { | ||
| context = Context.create("js"); | ||
| function = context.eval("js", script); | ||
| return Future.succeededFuture(entity); | ||
| } | ||
| return Future.succeededFuture(); | ||
| } | ||
|
|
||
| private Future<CodeModuleEntity> initAsEsModule(CodeModuleEntity entity) { | ||
| defaultFunctionName = entity.getFunction(); | ||
| final boolean isModule = entity.getUrl().endsWith("mjs"); | ||
| if (!isModule) { | ||
| return Future.failedFuture(new IllegalArgumentException( | ||
| "url must end with .mjs to designate ES module")); | ||
| } | ||
| Context.Builder cb = Context.newBuilder("js") | ||
| .allowExperimentalOptions(true) | ||
| .option("js.esm-eval-returns-exports", "true"); | ||
| context = cb.build(); | ||
| String moduleName = entity.getUrl().substring(entity.getUrl().lastIndexOf("/") + 1); | ||
| module = context.eval(Source.newBuilder("js", entity.getScript(), moduleName).buildLiteral()); | ||
|
Comment on lines
+57
to
+69
|
||
| return Future.succeededFuture(entity); | ||
| } | ||
|
|
||
| private Value getFunction(String functionName) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The inline comment "module was never resolved (migration)" explains the purpose but lacks detail about when this scenario occurs and what the expected behavior is. Consider expanding this comment to explain that this handles legacy modules that were stored with only URLs before automatic resolution was implemented, and that the code will fetch the script and persist it to the database for future use.