How to deploy with gcloud instead of the graphical GAE Launcher

Author: BruceSherwood

dispatch.yaml

@@ -0,0 +1,3 @@
+dispatch:
+  - url: "glowscript.org/"
+    service: default

docs/GlowScriptDocs/local.html

@@ -51,17 +51,19 @@ <h1 class="Heading-1"> <font color="#0000A0">Running locally</font></h1>
           2) 
 click the Download button for &quot;Install and initialize Google Cloud SDK&quot;.<br>
 3) 
-In a command-line terminal, execute the gcloud statement.<br>
+In a command-line terminal, execute the statement &quot;gcloud init&quot;.<br>
 4) If you intend to use GitHub, click &quot;Download and Install Git&quot;.<br>
 <br>
 If you had already installed the Google Cloud SDK, follow the instructions on the page for updating it.        </p>
         <p class="Normal"><strong>* Using gcloud with Google App Engine</strong><br>
           At 
             <a href="https://cloud.google.com/appengine/docs/python/" target="_blank"><strong>cloud.google.com/appengine/docs/python</strong></a> choose the Standard environment Python 2 Docs. Presumably you have already installed the Cloud SDK; follow the rest of the instructions, except that you need not install Git if you don't intend to use GitHub. You do need to execute &quot;gcloud components install app-engine-python&quot; to add Google App Engine support to the Cloud SDK.<br>
             <br>
-            To run GlowScript, execute dev_appserver.py /..../glowscript/app.yaml, where the location of the GlowScript code is at /..../glowscript (on Windows, use backslashes instead of slashes). This starts up the Google App Engine machinery. Open a browser tab and enter &quot;localhost:8080&quot; to run.</p>
+            To run GlowScript, execute dev_appserver.py /..../glowscript/app.yaml, where the location of the GlowScript code is at /..../glowscript (on Windows, use backslashes instead of slashes). This starts up the Google App Engine machinery. Open a browser tab and enter &quot;localhost:8080&quot; to run.<br>
+            <br>
+          More precisely, 8080 is the default port number. At the start of ide/api.py, if the variable &quot;localport&quot; is XXXX instead of 8080, to start up the application you must execute dev_appserver.py --port=XXXX /..../glowscript/app.yaml and the browser must point to &quot;localhost:XXXX&quot;.</p>
         <p class="Normal"><strong>* Testing your changes</strong><br />
-          Suppose the current version of GlowScript is 2.7. Change the version number in a program to 2.8dev; that is, 0.1 greater than the current 2.7, plus dev. When you run the program, it will use your latest JavaScript changes. If you make further changes to the JavaScript code, just reload the program edit page to get the latest changes. <br />
+          Suppose the current version of GlowScript is 2.7. Change the version number in a program to 2.8dev; that is, 0.1 greater than the current 2.7, plus dev. When you run the program, it will use your latest JavaScript changes. If you make further changes to the JavaScript code, just re-execute a test program to get the latest changes. You don't have to restart the application.<br />
           <br />
           If you want to remake/update the existing version 2.7, or create a new version 2.8, see MakingNewVersion.txt in the docs folder of the GlowScript GitHub repository. Note that use of the build program requires that there be an appropriate version of node in the build-tools folder.<br />
           <br />

docs/GlowScriptOverview.txt

@@ -13,7 +13,8 @@ the application in app.yaml, and at the start of ide/ide.js, ide/api.py, and unt
 COMPILATION
 
 The main compilation program is lib/compiling/GScompiler.js. Additional comments
-on GScompiler.js are included in the file itself.
+on GScompiler.js are included in the file itself. Also, at the start of the file
+are instructions on how to obtain others' libraries, such as RapydScript-NG.
 
 Triggered by a "Run" event in ide/index.html, the sandboxed untrusted/run.js calls
 the appropriate compiler and run-time package corresponding to the version number
@@ -27,6 +28,8 @@ Replace delete with remove, as delete is a JavaScript reserved word.
 Parse import statements, including making list of objects imported.
     Except for vpython, the Python random library is currently the only Python library 
     that can be imported thanks to a JavaScript implementation by RapydScript-NG.
+    The random library is not complete but contains seed_state, get_random_byte, seed,
+    random, randrange, randint, uniform, choice, shuffle, and sample.
 Look for function declarations and function calls that are outside strings.
     If inside a string, change the name to name+'~!#' so that this mention will
     not be found in a later search for "name(".
@@ -43,7 +46,7 @@ Insert preamble to transpiled JavaScript code.
 Insert statements to deal with various kinds of import statements.
 Insert statements such as "box = vp_box" so that box invokes the VPython version of a box.
 Add some Array.prototype functionality to mimic Python lists.
-papercompile(program) calls a library that converts A+B to A['+'](B), which makes possible
+papercompile() calls a library that converts A+B to A['+'](B), which makes possible
     "operator overloading": that is, 2+3 evaluates to 5, but vec(1,2,3)+vec(10,20,30)
     evaluates to vec(11,22,33). In lib/glow/vectors.js is a set of Number and vec
     prototype methods that alter the behavior of the arithmetic operators.
@@ -58,7 +61,7 @@ which includes references to run-time libraries stored at Amazon S3, which is an
 which makes the libraries accessible to https sites containing embedded GlowScript programs.
 (Originally, glowscript.org was an http site, which an https site could not access.)
 Note the sizable amount of code that comes from RapydScript-NG, as well as the preamble
-geneated by GScompiler.js. It is interesting to see the changes that result in this case:
+generated by GScompiler.js. It is interesting to see the changes that result in this case:
     GlowScript X.Y VPython
     from vpython import box
     box()
@@ -67,6 +70,11 @@ Also observe what is generated in these cases:
     import vpython  # or import vpython as vp
     vpython.box()   # or vp.box()
 
+If using (say) version 2.7, you can see the generated JavaScript program by choosing
+"Share or export this program" from the edit page. However, if using an experimental
+version such as 2.8dev, to see the code you need to uncomment console.log(program)
+at the end of GScompiler.js, and when running use shift-ctrl-j to see console output.
+
 ---------------------------------------------
 EXECUTION
 
@@ -172,7 +180,7 @@ an attribute vector is changed, the parent object is marked as changed, which wi
 trigger at render time calling the object's __update() function. Axis, size, and up
 attribute vectors deal with connections among these attributes, due to the VPython
 definition that axis and size affect each other, and under rotation axis and up
-must be force always to be perpendicular to each other. There is also special
+must be forced always to be perpendicular to each other. There is also special
 treatment of individual vector components, to make sure that changing only one
 component of a vector is noticed as a change.
 
@@ -189,9 +197,9 @@ situations. They are of two kinds. The "vertex" shaders have the task of mapping
 in 3D to a point projected onto the 2D screen. A hidden component of the GPU, the "rasterizer",
 determines the location of all pixels that are inside a triangle defined by three vertex
 locations projected onto the 2D screen. The "fragment" shaders set the color of each pixel, based
-on the color of the object and the locations and colors of lights. The key to GPU rendering speed is
-that the a large number of vertex shaders can work in parallel, and a large number of
-fragment shaders can work in parallel. Also, the non-display of hidden objects is possible
+on the color of the object and the locations and colors of lights. The key to GPU rendering speed
+is that the a large number of vertex shaders can work in parallel, and a large number of
+fragment shaders can work in parallel. Also, the non-display of hidden objects is assured
 because when the fragment shader stores a color into a pixel location, the "z-depth" of the
 pixel is also stored in the memory. When another fragment shader attempts to store a
 color into that same pixel location, the hardware ignores the attempt if the associated
@@ -238,12 +246,12 @@ existing user data.
 ---------------------------------------------
 TESTING CHANGES
 
-Currently (August 2019), it is possible to run a test program locally by starting up the
-Google App Engine launcher, and here are the details:
-    https://www.glowscript.org/docs/GlowScriptDocs/local.html
+Until July 30, 2020, it is possible to run a test program locally by using the
+graphical-interface Google App Engine launcher, but after that date it will be
+necessary to launch from a terminal (command-line interface or "CLI"). The
+following link describes both schemes:
 
-However, this launcher is being phased out, and in the future it will be necessary to
-launch from a terminal (command prompt).
+    https://www.glowscript.org/docs/GlowScriptDocs/local.html
 
 To test a new version of GlowScript, change a program header from X.Y to X.Ydev and
 run the program, which will use the latest, modified code. Make another change in the code
@@ -303,7 +311,7 @@ of glowscript.org.
 There is one more web entity. In Amazon S3 is a glowscript bucket that contains
 the libraries, fonts, and textures used by exported GlowScript programs. They are
 stored there in part because it wasn't clear how to deal with CORS-enabling these
-files within the http://glowscript.org web site, whereas at Amazon S3 it's a
+files within the original http://glowscript.org web site, whereas at Amazon S3 it's a
 one-click action (click a file listing in glowscript/package, then click "Make Public").
 Also, https://s3.amazonaws.com/glowscript is an https site, whereas glowscript.org
 was until Feb. 2019 an http site, so references to S3 from a program exported to an

docs/MakingNewVersion.txt

@@ -87,7 +87,15 @@ This has not actually been done so far.
     (This includes vectors_no_overload.js instead of vectors.js.)
 *********************************************************************************************
 
-Deploy in GAE launcher; note that at this point property.js should have version 0.5dev.
+Note that at this point property.js should have version 0.5dev.
+
+If using the graphical Google App Engine launcher, click "Deploy" to upload the new version.
+
+After July 30, 2020, the graphical Google App Engine launcher will not work, and one must
+use the gcloud machinery in a terminal. See www.glowscript.org/docs/GlowScriptDocs/local.html
+for instructions on installing gcloud. To deploy the new version, in a terminal cd to the
+glowscript project and execute "gcloud app deploy". (If this is the first time that you are
+deploying to a test site, execute "gcloud app deploy app.yaml dispatch.yaml".)
 
 Test that version 0.3 programs still work, that version 0.4 programs work, 
 that 0.4dev programs give an error, that 0.4 is the default version for a new program, 

lib/glow/canvas.js

@@ -313,7 +313,7 @@
 
         capture: async function(filename) { // send image of canvas to Download directory
         	if (filename.constructor !== String) throw new Error('A capture file name must be a string.')
-        	if (filename.indexOf('.png') < 0) filename += '.png'
+        	if (filename.slice(-4) != '.png') filename += '.png'
             var img = await this.__renderer.screenshot()
             var a = document.createElement("a")
             a.href = img.src