Merge pull request #569 from brownplt/vmt-initialState

VMT/embedding API

Author: jpolitz

.env.example

@@ -13,4 +13,4 @@ PYRET="http://localhost:4999/js/cpo-main.jarr"
 PORT=4999
 NODE_ENV=development
 POSTMESSAGE_ORIGIN="http://localhost:3000"
-
+SHARED_FETCH_SERVER="https://code.pyret.org"

.travis.yml

@@ -16,6 +16,7 @@ env:
   - PORT=5000
   - SAUCE_TEST_TARGET="http://localhost:5000"
   - SAUCE_USERNAME="pyret-lang"
+  - POSTMESSAGE_ORIGIN="*"
   - secure: e0vpQGmW0d69Ql72Mw6gsGsMxAKgt61ZNqsfQEtNlAGtx7CbTKe3xg8kF1ygwFVEB7GDmTaojTcSGbRwqqZ5GAa8dsTAkefhOtfCDV5KUjvXXbpo9J/8YLiZiIy7ksHyh1yhByvvWmZZpjmdxWwcH8gUqtpae3bGtz7rQX3jLf2v3OR5uVFt8vKRMSR9imCWmq6tpnu+GVoaCFOHjq3U7LS1h78R2LJz+MnTuCbDtYFlxp/sAyS7vSXssFScl6wqOsgH5PHlj+kaHhFWLhzsAzG1RoHftqqIeinXzDcYo8EC/c6O3hMf2KtHm/Hsh1dPR8GnE6WClxPw0xNbh10jVf7b1CXuzKGF8a1JlmtsVztiujsMswZGGLpTkqBvBAiuDsMOwKFNk7UrR5FA/0bVMMsluKxW/0UBzVPN9QyMKAs19ca1t/qT3abxYFyvXrDibKMLuS1uCCsZbwTkjkPwfWBzin8ohK2gLi+y24eQFSd27XWcmk+fJHfgJ458OgvczubK0CsyPAaJtCvRBYKvLQaEtkc4RkoM0yx6NhYYLCZqH1DRneam40rVSrVO41yT/PUnA5U64q16ptbn90Vgw/yKlp9OLtWKheBDTinwbst1kegbCSj4qZtORFLIQIUsZQN6SUm9tCACqFosDpRXAzURc2IOdsSUmtJEqvkijsc=
   - secure: "E19TyEFE1iQSRrZI4w6ahWgFGEFZBiUgxn/Pqq5sQwHlMNpai+bVydDRVlcQ0NsrdPmyXY/4+29wMjsAHbSaiBuqgG5PbtpChJK7a+8583G6CrbkWdZgwkMDpqPQ2IBEWVYeybvl36wuXJ4HNCqImPODWvX1Wxzk5RCK/gM4PNu3OdmQm3+6O8y1N6r0Y/lnqeAxhaZ5wv01/6EE3I3rAbnFxnu0wIJ7AfNV64VRk+tqwYuM5fLXrl6yhelSwp9q5CLEwvvYknBkklHAXbvxc2qo8XfZb6Zb701NyGvFW86Acgo1dytqV+BNmxNj4FfnXj+rxi/SDpiKEifzj5UYLIAgAx/qbxWSHD8SHiOL1WMa7N3vN2Dh+O+9vCLDwtpzbC0kJqxVMei8buAR4pLReZO0OsmHGXDPApoqOdxvQ0Z2VtEWojIWaJSIl0gTaWKAPAE6GMT0zRQcmm6GPXmLpWGc/9MZKJ5lTXQloucRaStRhPYV4x2HNF4vVZmJ0RWQexAX4qsUiaVFs0jdnJTDvgyPWj+f7qJaaqNFfXz9TyP2N8LSjPdGBYfkWIbkv8dXjJCufXX29BbOD5Yq1NcRQxgTnQO1cvXs1/MJOrK8tCAQ/rZUqQakBMg71fhznOm2lejiiingfnq846C1v27KxZzFLnGIOfDUbMAgS1sbGUU="
   - secure: "W74n+StLe0w+Lm6KNQN3lLzj4BFCy7vVSRCOQ3t5e3uSXDyLubqgRTXTXPoeypzcztbnMsd8Y57FyjJEaUydb2LPATEoJ9VbBy0ohXV/c3bucJSa4ZJxvb/8L62cepsZkRmoMl1HpW2kLWle50UdCLRqE0aGNHwM9FXfBAd279vmjmvPhFtGEiKkDek/ckroebG0n0xAox56ZmnuJM4boG3o0oUNjSE4U4W/RKMoApLJlUcEcdmWzJvOILeNvydFrHzQcSeHx6uH5LJg/N6RCHb++MI+BiUrAeGa0jm0YXFH0mdDmjCACAcRUzlyAGuadb2dAPcgKPV7xGyDJIn6+OD9dhwEGTGzyKr622fUcCa5+t4PERBFq7nYj7BU1CoqWUsYN6jArkH0ye7lA9usNZsHNXoykZkhpJYEoygYQg6mGnO0v0sRiUbv0BFQ4tN+l/ejvLfCiczjhuBgHlm7m0TUsH94dzeHFqGPlNGy75Rq9PM+0kxvN/TLY3udymKzpTJlbcaDvwQ37unBU2h7DpAYzscxyMcPbHo/F2lnmK/vlpSAsSjkdnpVp4Av+urn8G2eVJw+XnLWCQb4GIRsFzLfXOAPdhcQIZHfhiQTUXgFl+ahC2hEdC1sjho0yWWOHIhRoQ/5sLenB4hFTozxhbIKZTlyWI7FwuPnpWnhvAY="

build/web/js/cpo-main.jarr.gz.js

@@ -21,6 +21,7 @@
     "pyret-base/js/post-load-hooks": "pyret/build/phaseA/js/post-load-hooks.js",
 
     "cpo/gdrive-locators": "src/web/js/gdrive-locators.js",
+    "cpo/file-locator": "src/web/js/file-locator.js",
     "cpo/http-imports": "src/web/js/http-imports.js",
     "cpo/guess-gas": "src/web/js/guess-gas.js",
     "cpo/cpo-builtin-modules": "src/web/js/cpo-builtin-modules.js",

cpo-config.json

@@ -157,7 +157,9 @@ requirejs(["pyret-base/js/runtime", "pyret-base/js/post-load-hooks", "pyret-base
         $("#runDropdown").attr("disabled", false);
         clearInterval($("#loader").data("intervalID"));
         $("#loader").hide();
+        CPO.events.triggerOnLoad();
         CPO.say('Pyret loaded and ready.');
+        
         console.log("REPL ready.");
       });
     }

cpo-standalone.js

@@ -14,6 +14,7 @@
     "body-parser": "^1.20.2",
     "bootstrap": "^4.6.2",
     "browserify": "^14.5.0",
+    "chromedriver": "^131.0.5",
     "codemirror": "~5.58.2",
     "colorspaces": "0.1.4",
     "cookie-parser": "^1.4.6",

package-lock.json

@@ -37,7 +37,8 @@ var res = Q.fcall(function(db) {
       redirect: "/oauth2callback"
     },
     version: process.env["CURRENT_PYRET_RELEASE"],
-    pyret: process.env["PYRET"]
+    pyret: process.env["PYRET"],
+    sharedFetchServer: process.env["SHARED_FETCH_SERVER"]
   }, function(app) {
     console.log("Server ready.");
   });

package.json

@@ -73,7 +73,9 @@ function start(config, onServerReady) {
 
   app.use(cookieSession({
     secret: config.sessionSecret,
-    key: "code.pyret.org"
+    key: "code.pyret.org",
+
+    sameSite: 'lax'
   }));
   app.use(cookieParser());
 
@@ -380,7 +382,6 @@ function start(config, onServerReady) {
         var folderId = decodeURIComponent(parsed.query["folderId"]);
 
         lookForProjectOrCopyStructure(serverClient, drive, folderId).then(target => {
-          console.log("target: ", target);
           res.redirect(`/parley?folder=${target.projectDir.id}`);
         }).catch((err) => {
           console.error(err);
@@ -432,13 +433,11 @@ function start(config, onServerReady) {
           }
         })
         .then(copyResult => {
-          console.log("New directory: ", copyResult);
           serverDrive.files.list({
             key: config.google.serverApiKey,
             q: `"${fileInfo.id}" in parents and not trashed`,
             fields: 'files(id, name, mimeType, modifiedTime, modifiedByMeTime, webContentLink, iconLink, thumbnailLink)',
           }).then(files => {
-            console.log("Directory contents: ", files);
             // NOTE(joe): deliberately parallel
             Promise.all(files.data.files.map(f => copyFileOrDir(serverDrive, clientDrive, copyResult.data.id, f, serverEmailAddress)))
             .then(copiedFiles => {
@@ -471,7 +470,6 @@ function start(config, onServerReady) {
             }
           })
           .then(copiedFile => {
-            console.log("File copied: ", copiedFile);
             resolve(copiedFile.data);
           })
         })
@@ -497,11 +495,9 @@ function start(config, onServerReady) {
       clientDrive.files.list({
         q: `properties has {key='${PROJECT_BACKREF}' and value='${fileId}'} and trashed=false`
       }).then(files => {
-        console.log("Files with key result: ", files);
         if(files.data.files.length === 0) {
           return serverDrive.files.get({ fileId, key: config.google.serverApiKey }).then((dirInfo) => {
             return copyFileOrDir(serverDrive, clientDrive, false, dirInfo.data).then(copied => {
-              console.log("made a full copy of the directory");
               resolve({
                 copied: true,
                 projectDir: copied
@@ -510,7 +506,6 @@ function start(config, onServerReady) {
           });
         }
         else {
-          console.log("Directory existed, so not copying");
           resolve({
             copied: false,
             projectDir: files.data.files[0]
@@ -773,70 +768,111 @@ function start(config, onServerReady) {
     return ret.promise;
   }
 
+    // NOTE(joe): this is a hack for making share URLs work on another server.
+    // The config variable here shouldn't be set to the same URL as the deployment
+    // URL (since this will just make self request). But since Google credentials
+    // lock in files to a particular server, and we want share links from CPO
+    // to work on our testing or other deployments, we need this.
+    // If set, we first try to fetch from the indicated shared server (usually
+    // this will be code.pyret.org).
+    // This in fact doesn't matter *that* much for embedding clients that embed
+    // code.pyret.org directly. However, for *other* deployments, or test
+    // deployments, or development copies, it saves a ton of headaches.
+  function sharedPrefetch(url) {
+    var ret = Q.defer();
+    if(config.sharedFetchServer) {
+      let response = request({url: url});
+      response.on("error", (error) => { ret.reject(error); });
+      response.on("response", (resp) => ret.resolve(response));
+    }
+    else  {
+      ret.reject("No fallback server configured");
+    }
+
+    return ret.promise;
+  }
+
   app.get("/shared-program-contents", function(req, res) {
-    var contents = getSharedContents(req.query.sharedProgramId);
-    contents.fail(function(err) {
-      res.status(400);
-      res.send("Unable to fetch shared file");
-      res.end();
-    });
-    contents.then(function(response) {
-      if(!response.headers['content-type'] === "text/plain") {
+    const requestURL = `${config.sharedFetchServer}/shared-program-contents?sharedProgramId=${req.query.sharedProgramId}`;
+    const shared = sharedPrefetch(requestURL);
+    shared.then((resp) => resp.pipe(res));
+    shared.fail(() => {
+      var contents = getSharedContents(req.query.sharedProgramId);
+      contents.fail(function(err) {
         res.status(400);
-        res.send("Expected a text file, but got: " + response.headers["content-type"]);
+        res.send("Unable to fetch shared file");
         res.end();
-      }
-      else {
-        response
-          .on("response", (r) => r.headers["content-disposition"] = `inline; filename="${req.query.sharedProgramId}"`)
-          .pipe(res);
-      }
+      });
+      contents.then(function(response) {
+        if(!response.headers['content-type'] === "text/plain") {
+          res.status(400);
+          res.send("Expected a text file, but got: " + response.headers["content-type"]);
+          res.end();
+        }
+        else {
+          response
+            .on("response", (r) => r.headers["content-disposition"] = `inline; filename="${req.query.sharedProgramId}"`)
+            .pipe(res);
+        }
+      });  
     });
+
   });
 
   app.get("/shared-image-contents", function(req, res) {
-    var contents = getSharedContents(req.query.sharedImageId);
-    contents.then(function(response) {
-      response
-        .on("response", (r) => r.headers["content-disposition"] = `inline; filename="${req.query.sharedImageId}"`)
-        .pipe(res);
-    })
-    .fail(function(err) {
-      res.status(400);
-      res.send("Could not access shared file, or shared file was not an image.");
-      res.end();
+    const requestURL = `${config.sharedFetchServer}/shared-image-contents?sharedImageId=${req.query.sharedImageId}`;
+    const shared = sharedPrefetch(requestURL);
+    shared.then((resp) => resp.pipe(res));
+    shared.fail(() => {
+      var contents = getSharedContents(req.query.sharedImageId);
+      contents.then(function(response) {
+        response
+          .on("response", (r) => r.headers["content-disposition"] = `inline; filename="${req.query.sharedImageId}"`)
+          .pipe(res);
+      })
+      .fail(function(err) {
+        res.status(400);
+        res.send("Could not access shared file, or shared file was not an image.");
+        res.end();
+      });
     });
   });
 
   app.get("/shared-file", function(req, res) {
-    var sharedProgramId = req.query.sharedProgramId;
-    var both = fileAndToken(sharedProgramId);
-    both.fail(function(err) {
-      console.error(err);
-      res.status(404).send("No share information found for " + sharedProgramId);
-      res.end();
-    });
-    both.then(function(both) {
-      var prog = both[0];
-      var refreshToken = both[1];
-      auth.refreshAccess(refreshToken, function(err, newToken) {
-        if(err) { res.status(403).send("Couldn't access shared file " + sharedProgramId); res.end(); return; }
-        else {
-          var drive = getDriveClient(newToken, 'v2');
-          drive.files.get({fileId: sharedProgramId}, function(err, response) {
-            if(err) { res.status(400).send("Couldn't access shared file " + sharedProgramId); }
-            else {
-              res.send({
-                id: response.data.id,
-                modifiedDate: response.data.modifiedDate,
-                title: response.data.title,
-                selfLink: response.data.selfLink
-              });
-              res.status(200);
-              res.end();
-            }
-          });
-        }
+    const requestURL = `${config.sharedFetchServer}/shared-file?sharedProgramId=${req.query.sharedProgramId}`;
+    const shared = sharedPrefetch(requestURL);
+    shared.then((resp) => resp.pipe(res));
+    shared.fail((e) => {
+      console.error("Fallback failed: ", e);
+      var sharedProgramId = req.query.sharedProgramId;
+      var both = fileAndToken(sharedProgramId);
+      both.fail(function(err) {
+        console.error(err);
+        res.status(404).send("No share information found for " + sharedProgramId);
+        res.end();
+      });
+      both.then(function(both) {
+        var prog = both[0];
+        var refreshToken = both[1];
+        auth.refreshAccess(refreshToken, function(err, newToken) {
+          if(err) { res.status(403).send("Couldn't access shared file " + sharedProgramId); res.end(); return; }
+          else {
+            var drive = getDriveClient(newToken, 'v2');
+            drive.files.get({fileId: sharedProgramId}, function(err, response) {
+              if(err) { res.status(400).send("Couldn't access shared file " + sharedProgramId); }
+              else {
+                res.send({
+                  id: response.data.id,
+                  modifiedDate: response.data.modifiedDate,
+                  title: response.data.title,
+                  selfLink: response.data.selfLink
+                });
+                res.status(200);
+                res.end();
+              }
+            });
+          }
+        });
       });
     });
   });

src/run.js

@@ -4,6 +4,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   <title>code.pyret.org</title>
   <link rel="preload" href="{{&PYRET}}" as="script">
+  <script>window.PYRET = "{{&PYRET}}";</script>
   <link rel="stylesheet" href="/css/reset.css" />
   <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/themes/smoothness/jquery-ui.css" />
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Fira+Mono:400,700" />
@@ -458,7 +459,6 @@ <h2>Announcements</h2>
 var POSTMESSAGE_ORIGIN = "{{{ POSTMESSAGE_ORIGIN }}}";
 console.log(window.performance.now());
 </script>
-<script src="js/events.js"></script>
 <script src="js/beforePyret.js"></script>
 <script>
 var APP_BASE_URL = "{{{ BASE_URL }}}";
@@ -471,6 +471,7 @@ <h2>Announcements</h2>
   }
 });
 </script>
+<script src="js/events.js"></script>
 
   </main>
 </body>

src/server.js

@@ -5,6 +5,12 @@ window.storageAPI = storageAPIDeferred.promise;
 window.sheetsAPI = sheetsAPIDeferred.promise;
 
 window.handleClientLoad = function handleClientLoad(apiKey) {
+  if(!gapi || !gapi.client) {
+    storageAPIDeferred.reject("no gapi.client");
+    sheetsAPIDeferred.reject("no gapi.client");
+    console.log("Not logged in; proceeding without login info");
+    return;
+  }
   gapi.client.setApiKey(apiKey);
   var api = createProgramCollectionAPI("code.pyret.org", true);