Merge pull request #60 from abap34/dev

レスポンス改善のために Pyodide の読み込みが不要な時スキップされるように

src/ast.hpp

@@ -14,6 +14,11 @@ namespace almo {
  // - syntax_theme: Highlight.jsのテーマ
  std::map<std::string, std::string> meta_data;
 
+ // レスポンス時間短縮のため、pyodideが不要なら読み込みをスキップするためのフラグ.
+ bool loaded_pyodide = false;
+
+ std::string pyodide_loader = "<script src=\"https://cdn.jsdelivr.net/pyodide/v0.24.0/full/pyodide.js\"></script>";
+
  // 各ノードに対して一意なIDを生成する用の関数オブジェクト. 呼ぶと前に呼ばれた時の値 + 1 が返る.
  struct UUID_gen {
  std::string operator()() {
@@ -552,6 +557,8 @@ namespace almo {
 
  std::string output = title_h3 + editor_div + ace_editor + sample_in_area + sample_out_area + expect_out_area + define_data + test_run_button + submit_button + judge_code;
 
+ loaded_pyodide = true;
+
  return output;
  }
 
@@ -613,6 +620,8 @@ namespace almo {
 
  std::string output = editor_div + ace_editor + out_area + plot_area + run_button;
 
+ loaded_pyodide = true;
+
  return output;
  }
 

src/render.hpp

@@ -60,6 +60,14 @@ namespace almo {
  }
 
  std::string runner = "<script>" + RUNNER + "</script>";
+
+ if (loaded_pyodide) {
+ // runnner の先頭に　　pyodide を挿入
+ runner = pyodide_loader + runner;
+ } else {
+ runner = "<!-- Runner is not required. Skip this. -->";
+ }
+
  std::string sidebar_builder = "<script>" + SIDEBAR_BULDER + "</script>";
 
  // runner を挿入
@@ -88,11 +96,10 @@ namespace almo {
  }
 
  std::string render(Block ast, std::map<std::string, std::string> meta_data) {
-
- std::string html_template = load_html_template(meta_data["template_file"], meta_data["css_setting"]);
-
  std::string content = ast.render();
-
+
+ std::string html_template = load_html_template(meta_data["template_file"], meta_data["css_setting"]);
+
  std::string output_html = replace_template(html_template, meta_data, content);
 
  return output_html;

src/runner.js

@@ -1,5 +1,4 @@
-
-
+
 
 all_sample_input = {}
 all_sample_output = {}
@@ -11,7 +10,6 @@ use_libs = []
 
 judge_types = {}
 problem_status = {}
-page_contents = []
 
 const pyodidePromise = loadPyodide({
  stdin: stdin_func,

src/template.html

@@ -30,8 +30,6 @@
 
  <script>hljs.highlightAll();</script>
 
- <script src="https://cdn.jsdelivr.net/pyodide/v0.24.0/full/pyodide.js"></script>
-
  <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/confetti.browser.min.js"></script>
 
  <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
@@ -40,11 +38,14 @@
  <script type="text/javascript" id="MathJax-script" async
  src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js"></script>
 
- <script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/3.11.0/gsap.min.js"></script>
 
  {{style}}
 
 
+ <script>
+ page_contents = []
+ </script>
+
  {{runner}}