Split Client into Client and ModuleClient (#5)

Author: LazarusX

app/index.js

@@ -1,54 +1,54 @@
-"use strict";
+'use strict';
 
-var Generator = require("yeoman-generator");
-var path = require("path");
-var yosay = require("yosay");
+var Generator = require('yeoman-generator');
+var path = require('path');
+var yosay = require('yosay');
 
 module.exports = class extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
-    this.option("name", {
-      desc: "Module name",
-      alias: "n",
+    this.option('name', {
+      desc: 'Module name',
+      alias: 'n',
       type: String
     });
-    this.option("repository", {
-      desc: "Docker image repository for your module",
-      alias: "r",
+    this.option('repository', {
+      desc: 'Docker image repository for your module',
+      alias: 'r',
       type: String
     });
   }
 
   prompting() {
-    this.log(yosay("Hey You\r\nWelcome to Azure IoT Edge module generator"));
+    this.log(yosay('Hey You\r\nWelcome to Azure IoT Edge module generator'));
 
     return this.prompt([
       {
-        type: "input",
-        name: "name",
-        message: "What's the name of your module?",
-        default: "SampleModule",
+        type: 'input',
+        name: 'name',
+        message: 'What\'s the name of your module?',
+        default: 'SampleModule',
         when: () => {
           return !this.options.name; // skip the prompt when the value is already passed as a command option
         },
         validate: (name) => {
           if (!name) {
-            return "Module name could not be empty";
+            return 'Module name could not be empty';
           }
-          if (name.startsWith("_") || name.endsWith("_")) {
-            return "Module name must not start or end with the symbol _";
+          if (name.startsWith('_') || name.endsWith('_')) {
+            return 'Module name must not start or end with the symbol _';
           }
           if (name.match(/[^a-zA-Z0-9\_]/)) {
-            return "Module name must contain only alphanumeric characters or the symbol _";
+            return 'Module name must contain only alphanumeric characters or the symbol _';
           }
           return true;
         }
       },
       {
-        type: "input",
-        name: "repository",
-        "message": "What's the Docker image repository for your module?",
+        type: 'input',
+        name: 'repository',
+        message: 'What\'s the Docker image repository for your module?',
         when: () => {
           return !this.options.repository; // skip the prompt when the value is already passed as a command option
         },
@@ -66,13 +66,13 @@ module.exports = class extends Generator {
   writing() {
     this.log(`Creating ${this.name} module at ${this.repository} ...`);
 
-    this._copyStatic("gitignore", ".gitignore");
-    this._copyStatic("app.js");
-    this._copyStatic("Dockerfile");
-    this._copyStatic("Dockerfile.windows-amd64");
+    this._copyStatic('gitignore', '.gitignore');
+    this._copyStatic('app.js');
+    this._copyStatic('Dockerfile');
+    this._copyStatic('Dockerfile.windows-amd64');
 
-    this._copyTemplate("module.json", { repository: this.repository });
-    this._copyTemplate("package.json", { name: this.name })
+    this._copyTemplate('module.json', { repository: this.repository });
+    this._copyTemplate('package.json', { name: this.name })
   }
 
   _copyStatic(from, to = undefined) {

app/templates/app.js

@@ -1,27 +1,18 @@
 'use strict';
 
 var Transport = require('azure-iot-device-mqtt').Mqtt;
-var Client = require('azure-iot-device').Client;
+var Client = require('azure-iot-device').ModuleClient;
 var Message = require('azure-iot-device').Message;
-var fs = require('fs');
 
-var connectionString = process.env.EdgeHubConnectionString;
-var caCertFile = process.env.EdgeModuleCACertificateFile;
-
-var client = Client.fromConnectionString(connectionString, Transport);
-console.log('Connection String: ' + connectionString);
-
-client.on('error', function (err) {
-  console.error(err.message);
-});
-
-client.setOptions({
-  ca: fs.readFileSync(caCertFile).toString('ascii')
-}, function (err) {
+Client.fromEnvironment(Transport, function (err, client) {
   if (err) {
     console.log('error:' + err);
   } else {
-    // connect to the edge instance
+    client.on('error', function (err) {
+      console.error(err.message);
+    });
+
+    // connect to the Edge instance
     client.open(function (err) {
       if (err) {
         console.error('Could not connect: ' + err.message);
@@ -30,15 +21,15 @@ client.setOptions({
 
         // Act on input messages to the module.
         client.on('inputMessage', function (inputName, msg) {
-          pipeMessage(inputName, msg);
+          pipeMessage(client, inputName, msg);
         });
       }
     });
   }
 });
 
 // This function just pipes the messages without any change.
-function pipeMessage(inputName, msg) {
+function pipeMessage(client, inputName, msg) {
   client.complete(msg, printResultFor('Receiving message'));
 
   if (inputName === 'input1') {

app/templates/package.json

@@ -2,7 +2,7 @@
     "name": "<%= name %>",
     "version": "0.0.1",
     "dependencies": {
-        "azure-iot-device": "1.4.0-modules-preview",
-        "azure-iot-device-mqtt": "1.4.0-modules-preview"
+        "azure-iot-device": "1.7.0-modules-preview.2",
+        "azure-iot-device-mqtt": "1.7.0-modules-preview.2"
     }
 }