🐛 Read state from meta at SSG & workers

GuiDevloper · GuiDevloper · commit eb151ccdb1aa · 2022-04-19T05:13:11.000-03:00
diff --git a/builders/ssg.js b/builders/ssg.js
@@ -32,16 +32,15 @@ module.exports = async function ssg({ output, cache }) {
       writeFileSync(`${target}.html`, content)
     }
 
-    const instancesLookup = 'window.instances = ';
-    const instances = content.split("\n").find((line) => line.indexOf(instancesLookup) > -1).split(instancesLookup)[1].slice(0, -1);
+    const stateLookup = '<meta name="nullstack" content="';
+    const state = content.split("\n").find((line) => line.indexOf(stateLookup) > -1).split(stateLookup)[1].slice(0, -2);
+    const { instances, page } = JSON.parse(decodeURI(state));
 
-    const pageLookup = 'window.page = ';
-    const page = content.split("\n").find((line) => line.indexOf(pageLookup) > -1).split(pageLookup)[1].slice(0, -1);
     if (url !== `/nullstack/${application.environment.key}/offline` && url !== '/404') {
-      pages[url] = JSON.parse(page);
+      pages[url] = page;
     }
 
-    const json = `{"instances": ${instances}, "page": ${page}}`;
+    const json = JSON.stringify({ instances, page });
     writeFileSync(`${target}/index.json`, json);
 
     const pattern = /href="(.*?)"/g;
diff --git a/workers/staticHelpers.js b/workers/staticHelpers.js
@@ -7,11 +7,10 @@ function withAPI(url) {
 
 async function extractData(response) {
   const html = await response.clone().text();
-  const instancesLookup = 'window.instances = ';
-  const instances = html.split("\n").find((line) => line.indexOf(instancesLookup) > -1).split(instancesLookup)[1].slice(0, -1);
-  const pageLookup = 'window.page = ';
-  const page = html.split("\n").find((line) => line.indexOf(pageLookup) > -1).split(pageLookup)[1].slice(0, -1);
-  const json = `{"instances": ${instances}, "page": ${page}}`;
+  const stateLookup = '<meta name="nullstack" content="';
+  const state = html.split("\n").find((line) => line.indexOf(stateLookup) > -1).split(stateLookup)[1].slice(0, -2);
+  const { instances, page } = JSON.parse(decodeURI(state));
+  const json = JSON.stringify({ instances, page });
   return new Response(json, {
     headers: { 'Content-Type': 'application/json' }
   });
