Env.util, etcd fixes

client/imports/ui/pages/lab/labview.ts

@@ -68,6 +68,7 @@ export default class LabView extends MeteorComponent {
     var slf = this;
     Meteor.call('prepareLab',"1", function(err,res){
       console.log('here');
+      console.log("fired",err,res);
       //slf.labMarkdown = "# Sander \n ## are you sure this will work?";
       slf.tasks = res.taskList;
       slf.toTask(slf.tasks[0]);

collections/courses.ts

@@ -75,6 +75,10 @@ courses.allow({
         }
       });
       var courseSchema = new SimpleSchema({
+        _id: {
+           type: String,
+
+        },
         course_name: {
           type: String
         },

server/imports/api/env.util.js

@@ -0,0 +1,5 @@
+var util = function(){}
+
+util.prototype.parent = null;
+util.prototype.gitDiff = function(){}
+module.exports = util;

server/imports/api/lab.env.js

@@ -1,10 +1,12 @@
 // Import other libraries
 var nconf = require('nconf');
-
+var util = require('./env.util.js');
 /* constructor
  * intializes docker, etcd connection
  */
 var env = function(){
+  this.util = new util();
+  this.util.parent = this;
   this.docker = docker;
   this.root_dom = nconf.get('domain_root');
 }
@@ -68,7 +70,7 @@ env.deleteRecords = function(user,callback){
 			{dockerodeStartOptions: {--your options here--}}
  */
 env.prototype.init = function(opts){
-
+  TuxLog.log("warn","env.init");
   /* create unique labVm name to avoid collisions
    * for usr: cemersoz, at time 1467752963922
    * labvm = "labVm_cemersoz_1467752963922"
@@ -165,21 +167,20 @@ env.prototype.init = function(opts){
 
                 //create etcd directory for helix record
                 var dir = slf.root_dom.split('.');
-                dir.reverse().push(slf.usr,'A');
+                dir.reverse().push(slf.usr);
                 slf.dnsKey = dir.join('/');
                 slf.dnsKey = "/skydns/"+slf.dnsKey;
-
+                console.log(slf.dnsKey);
                 slf.redRouterKey = '/redrouter/SSH::'+slf.usr;
 
                 //set etcd record for redrouter
                 etcd.set(slf.redRouterKey,JSON.stringify(etcd_redrouter),function(err,res){
 
                   if(err){
-                    TuxLog.log('debug',err);
+                    TuxLog.log('warn',err);
                     reject(err);
                   }
                   else{
-
                     //set etcd record for helixdns
                     slf.docker.getContainer(containerId).inspect(function(err,container){
                       if(err){
@@ -189,12 +190,14 @@ env.prototype.init = function(opts){
                       else{
                         var dnsIP = container.Node.IP;
 			//set etcd record for helix
-            	        etcd.set(slf.helixKey,{host: dnsIP},function(err,res){
+            	        etcd.set(slf.dnsKey,JSON.stringify({host: dnsIP}),function(err,res){
+
             	          if(err){
             	            TuxLog.log('warn',err);
             	            reject(err);
             	          }
             	          else{
+                            TuxLog.log("warn","go ME!");
             	            slf.vmList.labVm = slf.labVm;
             	            resolve();
                           }
@@ -426,6 +429,7 @@ env.prototype.shell = function(vmName,command,opts) {
 	          }
 	        });//TODO: split stdout and stderr
 	        stream.on('end',function(){
+                  console.log(dat);
                   resolve(dat,stdErr);
 	        });
 	     }
@@ -440,6 +444,7 @@ env.prototype.shell = function(vmName,command,opts) {
  * calls callback(password)
  */
 env.prototype.getPass = function(callback){
+  TuxLog.log("warn","getPass");
   this.shell("labVm", "cat /pass")()
     .then(function(sOut,sErr){ callback(null,sOut); }, function(err){ callback(err,null)});
 }
@@ -452,4 +457,4 @@ env.prototype.listVolumes = function() {}	//Don't know what this does
 env.prototype.createNetwork = function() {}	//Don't know what this does
 env.prototype.listNetworks = function() {}	//Don't know what this does
 env.prototype.run = function() {}			//Runs Docker commands
-module.exports = new env();
+module.exports = env;

server/imports/api/lab.session.js

@@ -1,24 +1,110 @@
 /// <reference path="./lab.exec.d.ts" />
+//require session submodules
 var lab = require('./lab.js');
 var student = require('./lab.student.js');
-var session = function(){};
+var env = require('./lab.env.js');
 
+
+
+//labCache.get wrapper
+
+function getLab(id, callback){
+  var lab_data = Collections.labs.findOne({_id: id});
+
+  if(!lab_data || lab_data.length < 0){
+    TuxLog.log("warn",new Error("Lab not found"));
+    callback(new Error("Lab Not Found."), null);
+  }
+
+  var labcache_id = id + "#" + lab_data.updated;
+  LabCache.get(labcache_id,function(err,value){
+    if(err){
+      TuxLog.log("warn",err);
+      callback(err,null);
+    }
+    else if(!value){
+      TuxLog.log("warn","didn't get from labcache");
+      var file = lab_data.file;
+
+      var Lab = eval(file);
+      LabCache.set(labcache_id,Lab,function(err,res){
+        TuxLog.log("warn","oooh no");
+        if(err){
+	  TuxLog.log("warn",err);
+	}
+      });
+      callback(null,Lab);
+    }
+    else{
+      TuxLog.log("warn","got from cache");
+      callback(null,value);
+    }
+  });
+}
+
+//constructor
+var session = function(){
+};
+
+//define session fields
 session.prototype.env = null;
 session.prototype.lab = null;
 session.prototype.student = null;
+session.prototype.pass = null;
+session.prototype.started = false;
+session.prototype.courseId = null;
+session.prototype.user = null;
+session.prototype.userId = null;
+
 session.prototype.taskUpdates = [];
 
+
+session.prototype.fromJson = function(data, callback){
+  //set session fields
+  this.user = data.user;
+  this.courseId = data.courseId;
+  this.pass = data.pass;
+  this.userId = data.userId;
+
+  this.env = new env();
+  this.env.setUser(data.user);
+  this.taskUpdates = data.taskUpdates;
+
+  this.student = new student(this,data.userId,data.labId,data.courseId);
+
+  getLab(data.labId,function(err,lab){
+    if(err){
+      callback(err,null);
+    }
+    else{
+      this.lab = lab;
+      callback(null,null);
+    }
+  });
+
+}
+session.prototype.changeStarted = function(){
+  this.started = true;
+  console.log(this.started);
+}
 /* init: pulls labFile and initializes session object from it
  */
 session.prototype.init = function(user,userId,labId,callback){
   var slf = this;
-  this.env = require('./lab.env.js');
-  this.env.setUser(user);
+
+  //set session fields;
+  this.user = user;
+  this.userId = userId;
 
+  this.env = new env();
+  this.env.setUser(user);
   // Get Metadata from Database
   var lab_data = Collections.labs.findOne({_id: labId}, {fields: {'labfile' : 0}});
+
   var courseId = lab_data.course_id;
 
+  this.courseId = courseId;
+
   //initialize student object
   this.student = new student(this, userId,labId,courseId);
 
@@ -31,74 +117,47 @@ session.prototype.init = function(user,userId,labId,callback){
     // Get Course Metadata
     var course = Collections.courses.findOne({_id: lab_data.course_id}, {fields: {'labs' : 1 }});
 
-    // Format LabFile Cache URL
-    var labfile_id = labId + "#" + lab_data.updated;
-
-    // Check Cache for LabFile Object
-    LabCache.get(labfile_id, function(err, value){
+    getLab(labId,function(err,lab){
       if(err){
-	TuxLog.log("warn",err);
-        callback(err, null);
+        callback(err,null);
       }
-      else if(typeof value === "undefined"){
-        // Get LabFile from Database
-        var labfile_data = Collections.labs.findOne({_id: labId}, {fields : {'field' : 0}});
-        var Lab = eval(labfile_data.labfile);
-        Lab.taskNo = 0;
-        slf.lab = Lab;
-
-        // Cache LabFile -runs sync, not central to anything
-        LabCache.set(labfile_id, slf.lab, function(err, success){
-          if(err || !success){
-            TuxLog.log("warn", err);
-          }
-        });
-
+      else if(!slf.started){
+        slf.lab = lab;
 	slf.start(function(err){
 	  if(err){
             //err logged in slf.start
 	    callback(err,null);
 	  }
 	  else{
 	    slf.env.getPass(function(err,res){
-              if(err){
-		//TODO: separate streams in env.js
-                callback(err,null);
-              }
-              else{
-                slf.lab.pass = res;
-                callback(null,{taskNo: slf.lab.taskNo,sshPass: res});
-              }
-            });
+	      //TODO: separate streams in env.js
+	      if(err){
+	        callback(err,null);
+	      }
+	      else{
+                console.log("calling back");
+		callback(null,{taskNo: slf.lab.taskNo,sshPass: res});
+	      }
+	    });
 	  }
 	});
-      }     
+      }
       else{
-        // Get LabFile from Cache
-        var Lab = value;
-        Lab.taskNo = 0;
-        slf.lab = Lab;
-        slf.start(function(err){
+        slf.env.getPass(function(err,res){
+          console.log("already started");
           if(err){
             callback(err,null);
           }
           else{
-	    slf.env.getPass(function(err,res){
-              if(err){
-                //TODO : same as above
-                callback(err,null);
-              }
-              else{
-                //slf.lab.pass = res;
-                callback(null,{taskNo: slf.lab.taskNo,sshPass: res});
-              }
-            });
+            slf.pass = res;
+            callback(null,{taskNo: slf.lab.taskNo,sshPass: res});
           }
-	});
+       });
       }
-    });
+    })
   }
 }
+
 /* start: runs setup and moves task header to first task
  * runs callback(err) on err if there is an error,
  * (null) no error

server/imports/lab/cache.js

@@ -1,9 +1,10 @@
 /*
   Creates Session and Lab Caches
 */
-var async = require('async');
 var NodeCache = require('node-cache');
 
+var session = require('../api/lab.session.js');
+
 // Lab Cache
   LabCache = new NodeCache({
     stdTTL: nconf.get('labvm_idle_timeout'),
@@ -46,6 +47,7 @@ var NodeCache = require('node-cache');
     Gets a session from the local memory cache or ETCD
   */
   SessionCache.get = function(userid, labid, callback){
+    var slf = this;
     SessionCache._NodeCache.get(userid+'#'+labid, function(err, value){
       if(err){
         TuxLog.log('warn', "SessionCache NodeCache Error.");
@@ -56,8 +58,18 @@ var NodeCache = require('node-cache');
       }
       else{
         var data = etcd.get('/tuxlab/sessions/'+userid+'/'+labid, function(err, value){
-          //TODO @cemersoz from_data method
-        });
+
+	  var session = new session();
+	  session.fillJson(data,function(err,res){
+	    if(err){
+	      callback(err,null);
+	    }
+	    else{
+              slf.add(session);
+	      callback(null,session);
+	    }
+	  });
+	});
       }
     });
   }
@@ -87,10 +99,19 @@ var NodeCache = require('node-cache');
         });
       },
       function(cb){
-        //TODO @cemersoz to_data method
+
+        //convert session object to JSON for etcd
+        var json = {
+	  taskNo: session.lab.taskNo,
+	  taskUpdates: session.taskUpdates,
+	  pass: session.pass,
+	  user: session.user,
+	  userId: userid,
+	  labId: labid,
+          courseId: session.courseId	
+	};
 
-        var json = null;
-        etcd.set('tuxlab/sessions/'+userid+'/'+labid, json, function(err){
+        etcd.set('tuxlab/sessions/'+userid+'/'+labid, Json.stringify(json), function(err){
           cb(err);
         });
       }