updates

Author: devsnek

index.html

@@ -55,14 +55,14 @@ <h2>Output:</h2>
           state.set('gist', parameters.get('gist'));
         } else {
           state.set('code', LZString.compressToBase64(editor.getValue()));
+          state.set('mode', mode.value);
+          state.set('features', [...features].join(','));
         }
-        state.set('features', [...features].join(','));
-        state.set('mode', mode.value);
         document.location.hash = state.toString();
       }
 
       let featuresPopulated = false;
-      const features = new Set(parameters.has('features') ? parameters.get('features').split(',') : []);
+      let features = new Set(parameters.has('features') ? parameters.get('features').split(',') : []);
       let worker;
 
       if (parameters.has('mode')) {
@@ -158,16 +158,12 @@ <h2>Output:</h2>
         fetch(`https://api.github.com/gists/${parameters.get('gist')}`)
           .then((r) => r.json())
           .then((data) => {
-            const fileName = Object.keys(data.files)[0];
-            const file = data.files[fileName];
-            editor.setValue(file.content);
-            if (fileName.endsWith('.js')) {
-              mode.value = 'script';
-            } else if (fileName.endsWith('.mjs')) {
-              mode.value = 'module';
-            }
-            saveState();
+            const state = JSON.parse(data.files['state.json'].content);
+            mode.value = state.mode;
+            features = new Set(state.features);
+            const file = data.files[`code.${state.mode === 'script' ? 'js' : 'mjs'}`];
             respawn();
+            editor.setValue(file.content);
           });
       } else {
         editor.setValue('print(\'Hello, World!\');');

server/index.js

@@ -11,16 +11,19 @@ const EXTENSIONS = {
   __proto__: null,
 };
 
-function createGist(content, mode) {
-  const name = `code.${EXTENSIONS[mode]}`;
+function createGist(content, state) {
+  const name = `code.${EXTENSIONS[state.mode]}`;
   return fetch('https://api.github.com/gists', {
     method: 'POST',
     headers: {
       'Authorization': AUTH,
       'Content-Type': 'application/json',
     },
     body: JSON.stringify({
-      files: { [name]: { content } },
+      files: {
+        [name]: { content },
+        'state.json': { content: JSON.stringify(state) },
+      },
       description: 'Code shared from https://engine262.js.org',
       public: false,
     }),
@@ -49,12 +52,14 @@ const server = http.createServer((req, res) => {
     body += chunk;
   });
   req.on('end', () => {
-    const { content, mode } = JSON.parse(body);
-    createGist(content, mode)
+    Promise.resolve()
+      .then(() => JSON.parse(body))
+      .then(({ content, state }) => createGist(content, state))
       .then((data) => {
         res.writeHead(200, { 'Content-Type': 'application/json' });
         res.end(JSON.stringify(data));
-      }, (e) => {
+      })
+      .catch((e) => {
         console.error(e); // eslint-disable-line no-console
         res.writeHead(500);
         res.end('500');