Merge pull request #43 from martin-krcmar/issue-250/custom-component-…

…install

Stream lib

appmixer-lib.js

@@ -10,13 +10,14 @@ module.exports = {
     },
     util: {
         array: require('./util/array'),
-        singletons: require('./util/singletons'),
-        HttpError: require('./util/http-error'),
-        object: require('./util/object'),
+        commons: require('./util/commons'),
         component: require('./util/component'),
         flow: require('./util/flow'),
+        HttpError: require('./util/http-error'),
+        object: require('./util/object'),
         PagingAggregator: require('./util/paging-aggregator'),
         promise: require('./util/promise'),
-        commons: require('./util/commons')
+        singletons: require('./util/singletons'),
+        Stream: require('./util/Stream')
     }
 };

lock/method.js

@@ -36,6 +36,7 @@ class Method {
             while (this.callbacks.length > 0) {
                 this.callbacks.pop().resolve(result);
             }
+            return result;
         } catch (err) {
             this.inProgress = false;
             while (this.callbacks.length > 0) {

util/Stream.js

@@ -0,0 +1,72 @@
+'use strict';
+const check = require('check-types');
+const Readable = require('stream').Readable;
+const Promise = require('bluebird');
+
+/**
+ * Simple wrapper around node streams.
+ */
+class Stream {
+
+    /**
+     * @param {string} string
+     * @return {Stream}
+     * @throws Error
+     */
+    static createReadStreamFromString(string) {
+
+        check.assert.string(string, 'Missing input string.');
+        let s = new Readable();
+        s.push(string);
+        s.push(null);
+        return s;
+    }
+
+    /**
+     * @param buffer
+     * @return {Stream}
+     */
+    static createReadStreamFromBuffer(buffer) {
+
+        let s = new Readable();
+        s.push(buffer);
+        s.push(null);
+        return s;
+    }
+
+    /**
+     * @param {*} what
+     * @return {boolean}
+     */
+    static isStream(what) {
+
+        return what instanceof Readable;
+    }
+
+    /**
+     * This method reads stream into string, this method affects stream param - once read
+     * it won't return anything when trying to read again.
+     * @param {Stream} stream
+     * @return {Promise<string>}
+     * @throws Error
+     */
+    static async readStreamToString(stream) {
+
+        check.assert.instance(stream, Readable, 'Invalid file stream.');
+
+        let fileContent = '';
+        return new Promise((resolve, reject) => {
+            stream.on('data', data => {
+                fileContent += data.toString();
+            });
+            stream.on('end', () => {
+                resolve(fileContent);
+            });
+            stream.on('error', err => {
+                reject(err);
+            });
+        });
+    }
+}
+
+module.exports = Stream;

util/promise.js

@@ -56,7 +56,7 @@ module.exports.mapKeys = async (object, callback) => {
     check.assert.function(callback, 'Invalid callback function');
 
     let results = [];
-    return Promise.map(Object.keys(object), async key => {
+    return Promise.map(Object.keys(object), key => {
         return Promise.resolve(callback(key)).reflect();
     }).each(inspection => {
         if (!inspection.isFulfilled()) {
@@ -82,7 +82,7 @@ module.exports.mapProperties = async (object, callback) => {
     check.assert.function(callback, 'Invalid callback function');
 
     let results = [];
-    return Promise.map(Object.keys(object), async key => {
+    return Promise.map(Object.keys(object), key => {
         return Promise.resolve(callback(object[key], key)).reflect();
     }).each(inspection => {
         if (!inspection.isFulfilled()) {