Merge branch 'master' into bemasc-integration

Author: bemasc

Gruntfile.coffee

@@ -62,13 +62,17 @@ config =
     ###
     # Samples.
     ###
-    libsForProvisionChromeApp:
+    libsForDeployerChromeApp:
       Rule.copyLibs
         npmLibNames: ['freedom-for-chrome', 'forge-min']
-        pathsFromDevBuild: ['loggingprovider', 'cloud/provision']
-        pathsFromThirdPartyBuild: [
-        ]
-        localDestPath: 'samples/provision-chromeapp/'
+        pathsFromDevBuild: ['loggingprovider', 'cloud/deployer', 'cloud/digitalocean']
+        localDestPath: 'samples/deployer-chromeapp/'
+    libsForDeployerFirefoxApp:
+      Rule.copyLibs
+        npmLibNames: ['freedom-for-firefox', 'forge-min']
+        pathsFromDevBuild: ['loggingprovider', 'cloud/deployer', 'cloud/digitalocean']
+        localDestPath: 'samples/deployer-firefoxapp/data'
+
     libsForZorkChromeApp:
       Rule.copyLibs
         npmLibNames: ['freedom-for-chrome']
@@ -295,6 +299,7 @@ config =
           ignore: ['ws', 'path']
           browserifyOptions: { standalone: 'browserified_exports' }
         })
+    digitalOceanFreedomModule: Rule.browserify 'cloud/digitalocean/freedom-module'
     # Sample app freedom modules.
     copypasteChatFreedomModule: Rule.browserify 'copypaste-chat/freedom-module'
     copypasteSocksFreedomModule: Rule.browserify 'copypaste-socks/freedom-module'
@@ -312,12 +317,12 @@ config =
         './src/cloud/social/alias/randombytes.js:randombytes'
       ]
     })
+    deployerFreedomModule: Rule.browserify 'cloud/deployer/freedom-module'
     simpleChatFreedomModule: Rule.browserify 'simple-chat/freedom-module'
     simpleSocksFreedomModule: Rule.browserify 'simple-socks/freedom-module'
     simpleTurnFreedomModule: Rule.browserify 'simple-turn/freedom-module'
     uprobeFreedomModule: Rule.browserify 'uprobe/freedom-module'
     zorkFreedomModule: Rule.browserify 'zork/freedom-module'
-    provisionFreedomModule: Rule.browserify 'cloud/provision/freedom-module'
     # Sample app main environments (samples with UI).
     copypasteChatMain: Rule.browserify 'copypaste-chat/main.core-env'
     copypasteSocksMain: Rule.browserify 'copypaste-socks/main.core-env'
@@ -428,18 +433,19 @@ taskManager.add 'base', [
   'browserify:loggingProvider'
   'browserify:churnPipeFreedomModule'
   'browserify:cloudSocialProviderFreedomModule'
+  'browserify:digitalOceanFreedomModule'
 ]
 
 taskManager.add 'samples', [
   'echoServer'
   'copypasteChat'
   'copypasteSocks'
+  'deployer'
   'simpleChat'
   'simpleSocks'
   'simpleTurn'
   'uprobe'
   'zork'
-  'provision'
 ]
 
 # Makes the distribution build.
@@ -479,6 +485,13 @@ taskManager.add 'copypasteSocks', [
   'copy:libsForCopyPasteSocksFirefoxApp'
 ]
 
+taskManager.add 'deployer', [
+  'base'
+  'browserify:deployerFreedomModule'
+  'copy:libsForDeployerChromeApp'
+  'copy:libsForDeployerFirefoxApp'
+]
+
 taskManager.add 'simpleChat', [
   'base'
   'browserify:simpleChatFreedomModule'
@@ -517,12 +530,6 @@ taskManager.add 'zork', [
   'copy:libsForZorkNode'
 ]
 
-taskManager.add 'provision', [
-  'base'
-  'browserify:provisionFreedomModule'
-  'copy:libsForProvisionChromeApp'
-]
-
 specList = Rule.getTests('src', undefined, ['integration-tests'])
 
 # Run unit tests

src/cloud/deployer/freedom-module.json

@@ -0,0 +1,23 @@
+{
+  "name": "deployer",
+  "description": "Deploy a uProxy cloud instance.",
+  "app": {
+    "script": [
+      "freedom-module.static.js"
+    ]
+  },
+  "dependencies": {
+    "loggingcontroller": {
+      "url": "../../loggingprovider/freedom-module.json",
+      "api": "loggingcontroller"
+    },
+    "logginglistener": {
+      "url": "../../loggingprovider/freedom-module.json",
+      "api": "logginglistener"
+    },
+    "digitalocean": {
+      "url": "../digitalocean/freedom-module.json",
+      "api": "digitalocean"
+    }
+  }
+}

src/cloud/deployer/freedom-module.ts

@@ -0,0 +1,25 @@
+/// <reference path='../../../../third_party/typings/es6-promise/es6-promise.d.ts' />
+/// <reference path='../../../../third_party/typings/freedom/freedom-module-env.d.ts' />
+
+import logging = require('../../logging/logging');
+import loggingTypes = require('../../loggingprovider/loggingprovider.types');
+
+const loggingController = freedom['loggingcontroller']();
+loggingController.setDefaultFilter(loggingTypes.Destination.console,
+                                   loggingTypes.Level.debug);
+
+const log :logging.Log = new logging.Log('deployer');
+
+const digitalOcean = freedom['digitalocean']();
+
+digitalOcean.on('status', (msg:any) => {
+  log.info('status: %1', msg.message);
+});
+
+log.info('deploying...');
+
+digitalOcean.start('test').then((ret: any) => {
+  log.info('final result: %1', ret);
+}, (e:Error) => {
+  log.error('failed to deploy: %1', e);
+});

src/cloud/provision/freedom-module.json …c/cloud/digitalocean/freedom-module.jsonsrc/cloud/provision/freedom-module.json renamed to src/cloud/digitalocean/freedom-module.json src/cloud/provision/freedom-module.json renamed to src/cloud/digitalocean/freedom-module.json

@@ -1,16 +1,16 @@
 {
-  "name": "provision",
+  "name": "digitalocean",
   "description": "Provisions VMs on Digital Ocean",
   "app": {
     "script": [
       "../../../forge-min/forge.min.js",
       "freedom-module.static.js"
     ]
   },
-  "provides": [ "provision" ],
-  "default": "provision",
+  "provides": [ "digitalocean" ],
+  "default": "digitalocean",
   "api": {
-    "provision": {
+    "digitalocean": {
       "constructor": { "value": [ ] },
       "start": {
         "type": "method",

src/cloud/digitalocean/freedom-module.ts

@@ -0,0 +1,7 @@
+/// <reference path='../../../../third_party/typings/freedom/freedom-module-env.d.ts' />
+
+import Provisioner = require('./provisioner');
+
+freedom().providePromises(Provisioner);
+
+export = Provisioner

src/cloud/provision/freedom-module.ts src/cloud/digitalocean/provisioner.tssrc/cloud/provision/freedom-module.ts renamed to src/cloud/digitalocean/provisioner.ts

@@ -2,7 +2,8 @@
 /// <reference path='../../../../third_party/typings/es6-promise/es6-promise.d.ts' />
 /// <reference path='../../../../third_party/typings/freedom/freedom-module-env.d.ts' />
 
-const forge = require("forge-min");
+// TODO: https://github.com/uProxy/uproxy/issues/2051
+declare var forge: any;
 
 const POLL_TIMEOUT: number = 5000; //milliseconds
 
@@ -38,7 +39,7 @@ interface KeyPair {
 
 class Provisioner {
 
-  constructor(private dispatch_: Function, private state_: any) {}
+  constructor(private dispatch_: Function, private state_: any = {}) {}
 
   /**
    * One-click setup of a VM
@@ -57,14 +58,15 @@ class Provisioner {
       this.state_.ssh = keys;
       return this.setupDigitalOcean_(name);
     // Setup Digital Ocean (SSH key + droplet)
-    }).then((actions: any) => {
-      //console.log(actions);
+    }).then(() => {
       return this.doRequest_("GET", "droplets/" + this.state_.cloud.vm.id);
     // Get the droplet's configuration
     }).then((resp: any) => {
       this.sendStatus_("CLOUD_DONE_VM");
       this.state_.cloud.vm = resp.droplet;
-      this.state_.network.ssh_port = 22;
+      this.state_.network = {
+        "ssh_port": 22
+      };
       // Retrieve public IPv4 address
       for (var i = 0; i < resp.droplet.networks.v4.length; i++) {
         if (resp.droplet.networks.v4[i].type === "public") {
@@ -156,7 +158,7 @@ class Provisioner {
       }).then((responseUrl: string) => {
         var query = responseUrl.substr(responseUrl.indexOf('#') + 1),
             param: string,
-            params: { [k: string]: string },
+            params: { [k: string]: string } = {},
             keys = query.split('&'),
             i = 0;
         for (i = 0; i < keys.length; i++) {
@@ -186,7 +188,7 @@ class Provisioner {
   private getSshKey_ = (name: string) : Promise<KeyPair> => {
     var storage = freedom["core.storage"]();
     return new Promise((F, R) => {
-      var result : KeyPair;
+      var result: KeyPair = <KeyPair>{};
       Promise.all([
         storage.get("DigitalOcean-" + name + "-PublicKey"),
         storage.get("DigitalOcean-" + name + "-PrivateKey")
@@ -222,12 +224,12 @@ class Provisioner {
     return new Promise((F, R) => {
       var url = 'https://api.digitalocean.com/v2/' + actionPath;
       var xhr = freedom["core.xhr"]();
-      xhr.on("onload", (resolve: Function, reject: Function, xhr: any, e: Error) => {
-        xhr.getResponseText().then((resolve: Function, reject: Function, resp: string) => {
+      xhr.on("onload", (loadInfo: any) => {
+        xhr.getResponseText().then((response: string) => {
           try {
-            resolve(JSON.parse(resp));
+            F(JSON.parse(response));
           } catch(e) {
-            reject(e);
+            R(e);
           }
         });
       });
@@ -247,22 +249,22 @@ class Provisioner {
   /** 
    * Waits for all in-progress Digital Ocean actions to complete
    * e.g. after powering on a machine, or creating a VM
-   * @param {Function} resolve - call when done
-   * @param {Function} reject - call on failure
    */
-  private waitDigitalOceanActions_ = (resolve: Function, reject: Function) : void => {
+  private waitDigitalOceanActions_ = () : Promise<void> => {
     console.log("Polling for Digital Ocean in-progress actions");
-    this.doRequest_("GET", "droplets/" + this.state_.cloud.vm.id + "/actions").then((resp: any) => {
+    return this.doRequest_("GET", "droplets/" + this.state_.cloud.vm.id + "/actions").then((resp: any) => {
       for (var i = 0; i < resp.actions.length; i++) {
         if (resp.actions[i].status === "in-progress") {
-          setTimeout(this.waitDigitalOceanActions_, POLL_TIMEOUT);
-          return;
+          return new Promise<void>((F, R) => {
+            setTimeout(() => {
+              this.waitDigitalOceanActions_().then(F, R);
+            }, POLL_TIMEOUT);
+          });
         }
       }
-      resolve(resp);
     }).catch((e: Error) => {
       console.error("Error waiting for digital ocean actions:" + JSON.stringify(e));
-      reject(e);
+      throw e;
     });
   }
 
@@ -280,7 +282,6 @@ class Provisioner {
       this.sendStatus_("CLOUD_INIT_ADDKEY");
       // Get SSH keys in account
       this.doRequest_("GET", "account/keys").then((resp: any) => {
-        //console.log(resp);
         for (var i = 0; i < resp.ssh_keys.length; i++) {
           if (resp.ssh_keys[i].public_key === this.state_.ssh.public) {
             return Promise.resolve({
@@ -295,14 +296,12 @@ class Provisioner {
         }));
       // If missing, put SSH key into account
       }).then((resp: any) => {
-        //console.log(resp);
         this.state_.cloud.ssh = resp.ssh_key;
         this.sendStatus_("CLOUD_DONE_ADDKEY");
         this.sendStatus_("CLOUD_INIT_VM");
         return this.doRequest_("GET", "droplets");
       // Get list of droplets
       }).then((resp: any) => {
-        //console.log(resp);
         for (var i = 0; i < resp.droplets.length; i++) {
           if (resp.droplets[i].name === name) {
             return Promise.resolve({
@@ -320,7 +319,6 @@ class Provisioner {
         }));
       // If missing, create the droplet
       }).then((resp: any) => {
-        //console.log(resp);
         this.state_.cloud.vm = resp.droplet;
         if (resp.droplet.status == "off") {
           // Need to power on VM
@@ -334,9 +332,8 @@ class Provisioner {
         }
       // If the machine exists, but powered off, turn it on
       }).then((resp: any) => {
-        //console.log(resp);
         this.sendStatus_("CLOUD_WAITING_VM");
-        this.waitDigitalOceanActions_(F, R);
+        this.waitDigitalOceanActions_().then(F, R);
       // Wait for all in-progress actions to complete
       }).catch((err: Error) => {
         console.error("Error w/DigitalOcean: " + err);
@@ -350,8 +347,4 @@ class Provisioner {
   }
 }
 
-if (typeof freedom !== 'undefined') {
-  freedom['provisioner']().providePromises(Provisioner);
-}
-
 export = Provisioner;

src/cloud/social/freedom-module.json

@@ -59,7 +59,7 @@
       "inviteUser": {
         "type": "method",
         "value": ["string"],
-        "ret": "Object"
+        "ret": "object"
       },
 
       "acceptUserInvitation": {