Remake corrections to glowcommlab.js

Author: BruceSherwood

labextension/vpython/src/glowcommlab.js

@@ -1,31 +1,57 @@
-//define(["nbextensions/vpython_libraries/plotly.min",
-//        "nbextensions/vpython_libraries/glow.min",
-//        "nbextensions/vpython_libraries/jquery-ui.custom.min"], function(Plotly) {
-
 import 'script-loader!./vpython_libraries/jquery.min.js';
 import 'script-loader!./vpython_libraries/jquery-ui.custom.min.js';
 import 'script-loader!./vpython_libraries/glow.min.js';
 import 'script-loader!./vpython_libraries/plotly.min.js';
 import '../style/jquery-ui.custom.css'
 import '../style/ide.css'
 
+// Ensure downstream JupyterLab webpack places the fonts and images in predictable locations
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/earth_texture.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/favicon.ico'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/flower_texture.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/granite_texture.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/gravel_bumpmap.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/gravel_texture.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/metal_texture.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/NimbusRomNo9L-Med.otf'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/Roboto-Medium.ttf'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/rock_bumpmap.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/rock_texture.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/rough_texture.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/rug_texture.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/stones_bumpmap.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/stones_texture.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/stucco_bumpmap.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/stucco_texture.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/wood_old_bumpmap.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/wood_old_texture.jpg'
+import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/wood_texture.jpg'
+
 export var comm
 var ws = null
 var isopen = false
 
 console.log('START OF GLOWCOMM')
 
-export function createWebsocket(msg) {
+export function createWebsocket(msg, serviceUrl) {
     if (msg.content.data.wsport !== undefined) {
         // create websocket instance
-		var port = msg.content.data.wsport
-		var uri = msg.content.data.wsuri
-        ws = new WebSocket("ws://localhost:" + port + uri);
-	    ws.binaryType = "arraybuffer";
+        var port = msg.content.data.wsport
+        var uri = msg.content.data.wsuri
+        var url;
+    
+        if (document.location.hostname.includes("localhost")){
+           url = "ws://localhost:" + port + uri;
+        }
+        else {
+           url = serviceUrl + port + uri;
+        }
+        ws = new WebSocket(url);
+        ws.binaryType = "arraybuffer";
 
         // Handle incoming websocket message callback
         ws.onmessage = function(evt) {
-            console.log("WebSocket Message Received: " + evt.data)
+		console.log("WebSocket Message Received: " + evt.data)
         };
 
         // Close Websocket callback
@@ -43,25 +69,22 @@ export function createWebsocket(msg) {
     }
 }
 
-var wsmsg
-
-function wscheckfontsloaded() {
+function wscheckfontsloaded(msg,serviceUrl) {
 	"use strict";
 	if (window.__font_sans === undefined || window.__font_serif === undefined) {
-		setTimeout(wscheckfontsloaded,10)
+		setTimeout(wscheckfontsloaded,10,msg,serviceUrl)
 	} else {
-		createWebsocket(wsmsg)
+		createWebsocket(msg,serviceUrl)
 	}
 }
 
-export function setupWebsocket(msg) {
+export function setupWebsocket(msg,serviceUrl) {
 	"use strict";
-	wsmsg = msg
-	wscheckfontsloaded()
+	wscheckfontsloaded(msg,serviceUrl)
 }
 
-var datadir = window.location.href + '/static/vpython_data/'
-window.Jupyter_VPython = "/lab/static/vpython_data/" // prefix used by glow.min.js for textures
+var datadir = './static/lab/vpython_data/'
+window.Jupyter_VPython = "./static/lab/vpython_data/" // prefix used by glow.min.js for textures
 
 function fontloading() {
     "use strict";
@@ -183,7 +206,6 @@ ellipsoid = vp_ellipsoid
 ring = vp_ring
 arrow = vp_arrow
 compound = vp_compound
-
 function msclock() {
     "use strict";
     if (performance.now) return performance.now()