@kumologica/sdk 3.1.0-alpha2 → 3.1.0-beta2

package/cli/utils/download.js

@@ -0,0 +1,119 @@
+// This file is mostly adapted from https://github.com/kevva/download repository
+
+// License of the original module - https://github.com/kevva/download/blob/master/license
+
+// MIT License
+
+// Copyright (c) Kevin Mårtensson <kevinmartensson@gmail.com> (github.com/kevva)
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+'use strict';
+
+const fsp = require('fs').promises;
+const path = require('path');
+const { URL } = require('url');
+const contentDisposition = require('content-disposition');
+const archiveType = require('archive-type');
+const decompress = require('decompress');
+const filenamify = require('filenamify');
+const getStream = require('get-stream');
+const got = require('got');
+const makeDir = require('make-dir');
+const pEvent = require('p-event');
+const FileType = require('file-type');
+const extName = require('ext-name');
+
+const filenameFromPath = (res) => path.basename(new URL(res.requestUrl).pathname);
+
+const getExtFromMime = (res) => {
+  const header = res.headers['content-type'];
+
+  if (!header) {
+    return null;
+  }
+
+  const exts = extName.mime(header);
+
+  if (exts.length !== 1) {
+    return null;
+  }
+
+  return exts[0].ext;
+};
+
+const getFilename = async (res, data) => {
+  const header = res.headers['content-disposition'];
+
+  if (header) {
+    const parsed = contentDisposition.parse(header);
+
+    if (parsed.parameters && parsed.parameters.filename) {
+      return parsed.parameters.filename;
+    }
+  }
+
+  let filename = filenameFromPath(res);
+
+  if (!path.extname(filename)) {
+    const ext = ((await FileType.fromBuffer(data)) || {}).ext || getExtFromMime(res);
+
+    if (ext) {
+      filename = `${filename}.${ext}`;
+    }
+  }
+
+  return filename;
+};
+
+module.exports = (uri, output, opts) => {
+  if (typeof output === 'object') {
+    opts = output;
+    output = null;
+  }
+
+  opts = Object.assign(
+    {
+      https: {
+        rejectUnauthorized: process.env.npm_config_strict_ssl !== 'false',
+      },
+      responseType: 'buffer',
+    },
+    opts
+  );
+
+  const stream = got.stream(uri, opts);
+
+  const promise = pEvent(stream, 'response')
+    .then((res) => {
+      const encoding = opts.responseType === 'buffer' ? 'buffer' : opts.encoding;
+      return Promise.all([getStream(stream, { encoding }), res]);
+    })
+    .then(async (result) => {
+      const [data, res] = result;
+
+      if (!output) {
+        return opts.extract && archiveType(data) ? decompress(data, opts) : data;
+      }
+
+      const filename = opts.filename || filenamify(await getFilename(res, data));
+      const outputFilepath = path.join(output, filename);
+
+      if (opts.extract && archiveType(data)) {
+        return decompress(data, path.dirname(outputFilepath), opts);
+      }
+
+      return makeDir(path.dirname(outputFilepath))
+        .then(() => fsp.writeFile(outputFilepath, data))
+        .then(() => data);
+    });
+
+  stream.then = promise.then.bind(promise);
+  stream.catch = promise.catch.bind(promise);
+
+  return stream;
+};

package/cli/utils/fs/copy-dir-contents-sync.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const fse = require('fs-extra');
+
+const isNotSymbolicLink = (src) => !fse.lstatSync(src).isSymbolicLink();
+
+function copyDirContentsSync(srcDir, destDir, { noLinks = false } = {}) {
+  const copySyncOptions = {
+    dereference: true,
+    filter: noLinks ? isNotSymbolicLink : null,
+  };
+  fse.copySync(srcDir, destDir, copySyncOptions);
+}
+
+module.exports = copyDirContentsSync;

package/cli/utils/fs/create-zip-file.js

@@ -0,0 +1,39 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const archiver = require('archiver');
+const BbPromise = require('bluebird');
+const walkDirSync = require('./walk-dir-sync');
+
+async function createZipFile(srcDirPath, outputFilePath) {
+  const files = walkDirSync(srcDirPath).map((file) => ({
+    input: file,
+    output: file.replace(path.join(srcDirPath, path.sep), ''),
+  }));
+
+  return new BbPromise((resolve, reject) => {
+    const output = fs.createWriteStream(outputFilePath);
+    const archive = archiver('zip', {
+      zlib: { level: 9 },
+    });
+
+    output.on('open', () => {
+      archive.pipe(output);
+
+      files.forEach((file) => {
+        // TODO: update since this is REALLY slow
+        if (fs.lstatSync(file.input).isFile()) {
+          archive.append(fs.createReadStream(file.input), { name: file.output });
+        }
+      });
+
+      archive.finalize();
+    });
+
+    archive.on('error', (err) => reject(err));
+    output.on('close', () => resolve(outputFilePath));
+  });
+}
+
+module.exports = createZipFile;

package/cli/utils/fs/dir-exists-sync.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const fse = require('fs-extra');
+
+function dirExistsSync(dirPath) {
+  try {
+    const stats = fse.statSync(dirPath);
+    return stats.isDirectory();
+  } catch (e) {
+    return false;
+  }
+}
+
+module.exports = dirExistsSync;

package/cli/utils/fs/dir-exists.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const fsp = require('fs').promises;
+
+async function dirExists(path) {
+  return fsp.lstat(path).then(
+    (stats) => stats.isDirectory(),
+    (error) => {
+      if (error.code === 'ENOENT') {
+        return false;
+      }
+      throw error;
+    }
+  );
+}
+
+module.exports = dirExists;

package/cli/utils/fs/file-exists-sync.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const fse = require('fs-extra');
+
+function fileExistsSync(filePath) {
+  try {
+    const stats = fse.statSync(filePath);
+    return stats.isFile();
+  } catch (e) {
+    return false;
+  }
+}
+
+module.exports = fileExistsSync;

package/cli/utils/fs/file-exists.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const fsp = require('fs').promises;
+
+async function fileExists(filePath) {
+  return fsp
+    .lstat(filePath)
+    .then((stats) => stats.isFile())
+    .catch(() => false);
+}
+
+module.exports = fileExists;

package/cli/utils/fs/get-tmp-dir-path.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const os = require('os');
+const path = require('path');
+const crypto = require('crypto');
+
+
+function getBaseTmpDirPath() {
+  return path.join(os.tmpdir(), 'tmp-templates-kumologica');
+}
+
+function getTmpDirPath() {
+  return path.join(
+    getBaseTmpDirPath(),
+    crypto.randomBytes(8).toString('hex')
+  );
+}
+
+module.exports = {
+  getBaseTmpDirPath,
+  getTmpDirPath
+}

package/cli/utils/fs/parse.js

@@ -0,0 +1,40 @@
+'use strict';
+
+const jc = require('json-cycle');
+const yaml = require('js-yaml');
+const _ = require('lodash');
+// const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
+
+const loadYaml = (contents, options) => {
+  let data;
+  let error;
+  try {
+    data = yaml.load(contents.toString(), options || {});
+  } catch (exception) {
+    error = exception;
+  }
+  return { data, error };
+};
+
+function parse(filePath, contents) {
+  // Auto-parse JSON
+  if (filePath.endsWith('.json') || filePath.endsWith('.tfstate')) {
+    return jc.parse(contents);
+  } else if (filePath.endsWith('.yml') || filePath.endsWith('.yaml')) {
+    const options = {
+      filename: filePath,
+    };
+    let result = loadYaml(contents.toString(), options);
+    // if (result.error && result.error.name === 'YAMLException') {
+    //   _.merge(options, { schema: cloudformationSchema });
+    //   result = loadYaml(contents.toString(), options);
+    // }
+    if (result.error) {
+      throw result.error;
+    }
+    return result.data;
+  }
+  return contents.toString().trim();
+}
+
+module.exports = parse;

package/cli/utils/fs/read-file-sync.js

@@ -0,0 +1,11 @@
+'use strict';
+
+const fse = require('fs-extra');
+const parse = require('./parse');
+
+function readFileSync(filePath) {
+  const contents = fse.readFileSync(filePath);
+  return parse(filePath, contents);
+}
+
+module.exports = readFileSync;

package/cli/utils/fs/read-file.js

@@ -0,0 +1,10 @@
+'use strict';
+
+const fsp = require('fs').promises;
+const parse = require('./parse');
+
+async function readFile(filePath) {
+  return fsp.readFile(filePath, 'utf8').then((contents) => parse(filePath, contents));
+}
+
+module.exports = readFile;

package/cli/utils/fs/safe-move-file.js

@@ -0,0 +1,58 @@
+'use strict';
+
+const fsp = require('fs').promises;
+const fse = require('fs-extra');
+const crypto = require('crypto');
+const path = require('path');
+
+/**
+ * Given a path that designates a location of a file on another device,
+ * will return a path to file in the same folder, but with a unique name
+ * to avoid collisions.
+ *
+ * @param {*} destPath the path to the final location of the file being moved
+ * @returns a unique path to a file on the same device as the file being moved
+ */
+const generateTemporaryPathOnDestinationDevice = (destPath) => {
+  const dirName = path.dirname(destPath);
+  // Generate a unique destination file name to get the file onto the destination filesystem
+  const tempName = path.basename(destPath) + crypto.randomBytes(8).toString('hex');
+  return path.join(dirName, tempName);
+};
+
+/**
+ * Allows a file to be moved (renamed) even across filesystem boundaries.
+ *
+ * If the rename fails because the file is getting renamed across file system boundaries,
+ * the file is first copied to the destination file system under a temporary name,
+ * and then renamed from there.
+ *
+ * This is done because rename is atomic but copy is not, and can leave partially copied files.
+ *
+ * @param {*} oldPath the original file that should be moved
+ * @param {*} newPath the path to move the file to
+ */
+async function safeMoveFile(oldPath, newPath) {
+  try {
+    // Golden path, we simply rename the file in an atomic operation
+    await fsp.rename(oldPath, newPath);
+  } catch (err) {
+    // The EXDEV error indicates that the rename failed because the rename was across filesystem boundaries
+    // This might occur if a distro uses tmpfs for temporary directories
+    if (err.code === 'EXDEV') {
+      // Generate a unique destination file name to get the file onto the destination filesystem
+      const tempPath = generateTemporaryPathOnDestinationDevice(newPath);
+
+      // Copy onto the destination filesystem (not guaranteed to be atomic)
+      await fse.copy(oldPath, tempPath);
+      // Atomically move the file onto the destination path, overwriting it
+      await fsp.rename(tempPath, newPath);
+      // Delete the old file once both the above operations succeed
+      await fse.remove(oldPath);
+    } else {
+      throw err;
+    }
+  }
+}
+
+module.exports = safeMoveFile;

package/cli/utils/fs/walk-dir-sync.js

@@ -0,0 +1,34 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+
+function walkDirSync(dirPath, opts) {
+  const options = Object.assign(
+    {
+      noLinks: false,
+      gitIgnore: true,
+      recursive: false
+    },
+    opts
+  );
+  let filePaths = [];
+  const list = fs.readdirSync(dirPath);
+  list.forEach((filePathParam) => {
+    let filePath = filePathParam;
+    filePath = path.join(dirPath, filePath);
+    const stat = options.noLinks ? fs.lstatSync(filePath) : fs.statSync(filePath);
+    // skipping symbolic links when noLinks option
+    if ((options.noLinks && stat && stat.isSymbolicLink()) || (options.gitIgnore && filePathParam === '.git')){
+      return;
+    } else if (stat && stat.isDirectory() && options.recursive) {
+      filePaths = filePaths.concat(walkDirSync(filePath, opts));
+    } else {
+      filePaths.push(filePathParam);
+    }
+  });
+
+  return filePaths;
+}
+
+module.exports = walkDirSync;

package/cli/utils/fs/write-file-sync.js

@@ -0,0 +1,31 @@
+'use strict';
+
+const fse = require('fs-extra');
+const path = require('path');
+const jc = require('json-cycle');
+const yaml = require('js-yaml');
+
+function writeFileSync(filePath, conts, cycles) {
+  let contents = conts || '';
+
+  fse.mkdirsSync(path.dirname(filePath));
+
+  if (filePath.indexOf('.json') !== -1 && typeof contents !== 'string') {
+    if (cycles) {
+      contents = jc.stringify(contents, null, 2);
+    } else {
+      contents = JSON.stringify(contents, null, 2);
+    }
+  }
+
+  const yamlFileExists = filePath.indexOf('.yaml') !== -1;
+  const ymlFileExists = filePath.indexOf('.yml') !== -1;
+
+  if ((yamlFileExists || ymlFileExists) && typeof contents !== 'string') {
+    contents = yaml.dump(contents);
+  }
+
+  return fse.writeFileSync(filePath, contents);
+}
+
+module.exports = writeFileSync;

package/cli/utils/fs/write-file.js

@@ -0,0 +1,32 @@
+'use strict';
+
+const fsp = require('fs').promises;
+const fse = require('fs-extra');
+const path = require('path');
+const jc = require('json-cycle');
+const yaml = require('js-yaml');
+
+async function writeFile(filePath, conts, cycles) {
+  let contents = conts || '';
+
+  return fse.mkdirs(path.dirname(filePath)).then(() => {
+    if (filePath.indexOf('.json') !== -1 && typeof contents !== 'string') {
+      if (cycles) {
+        contents = jc.stringify(contents, null, 2);
+      } else {
+        contents = JSON.stringify(contents, null, 2);
+      }
+    }
+
+    const yamlFileExists = filePath.indexOf('.yaml') !== -1;
+    const ymlFileExists = filePath.indexOf('.yml') !== -1;
+
+    if ((yamlFileExists || ymlFileExists) && typeof contents !== 'string') {
+      contents = yaml.dump(contents);
+    }
+
+    return fsp.writeFile(filePath, contents);
+  });
+}
+
+module.exports = writeFile;

package/cli/{commands/utils.js → utils/logger.js}

@@ -1,5 +1,6 @@
 const chalk = require('chalk');
 
+/* Loggers */
 function logError(message) {
     console.log(chalk.red(message));
 }
@@ -8,7 +9,12 @@ function logNotice(message) {
     console.log(chalk.yellow(message));
 }
 
+function logInfo(message) {
+    console.log(message);
+}
+
 module.exports = {
     logError,
-    logNotice
+    logNotice,
+    logInfo
 }

package/cli/utils/rename-service.js

@@ -0,0 +1,49 @@
+'use strict';
+
+const path = require('path');
+const fse = require('fs-extra');
+
+const fileExistsSync = require('./fs/file-exists-sync');
+const readFileSync = require('./fs/read-file-sync');
+const writeFileSync = require('./fs/write-file-sync');
+const KumologicaError = require('../KumologicaError');
+
+function renameYmlService(name, ymlServiceFile) {
+  const serverlessYml = fse
+    .readFileSync(ymlServiceFile, 'utf-8')
+    .replace(/(^|\s|#)service\s*:.+/, (ignore, prefix) => `${prefix}service: ${name}`)
+    .replace(
+      /(^|\s|#)service\s*:\s*\n(\s+)name:.+/,
+      (match, prefix, indent) => `${prefix}service:\n${indent}name: ${name}`
+    );
+
+  fse.writeFileSync(ymlServiceFile, serverlessYml);
+}
+
+function renameTsService(name, tsServicefile) {
+  const serverlessTs = fse
+    .readFileSync(tsServicefile, 'utf-8')
+    .replace(/(^|\s)service\s*:\s*('|").+('|")/, (ignore, prefix) => `${prefix}service: '${name}'`)
+    .replace(
+      /(^|\s)service\s*:\s*{\s*\n(\s+)name:\s*('|").+('|")/,
+      (match, prefix, indent) => `${prefix}service: {\n${indent}name: '${name}'`
+    );
+
+  fse.writeFileSync(tsServicefile, serverlessTs);
+}
+
+function renameService(targetProjectDir, projectName) {
+  const name = projectName;
+  const packageFile = path.join(targetProjectDir, 'package.json');
+  if (fileExistsSync(packageFile)) {
+    const json = readFileSync(packageFile);
+    writeFileSync(packageFile, Object.assign(json, { name }));
+  }
+  const packageLockFile = path.join(targetProjectDir, 'package-lock.json');
+  if (fileExistsSync(packageLockFile)) {
+    const json = readFileSync(packageLockFile);
+    writeFileSync(packageLockFile, Object.assign(json, { name }));
+  }
+}
+
+module.exports.renameService = renameService;

package/package.json

@@ -3,7 +3,7 @@
   "productName": "Kumologica Designer",
   "copyright": "Copyright 2020 Kumologica Pty Ltd, All Rights Reserved.",
   "author": "Kumologica Pty Ltd <contact@kumologica.com>",
-  "version": "3.1.0-alpha2",
+  "version": "3.1.0-beta2",
   "description": "Kumologica Designer, harnessing Serverless for your cloud integration needs",
   "main": "src/app/main.js",
   "files": [
@@ -65,62 +65,52 @@
   "license": "Proprietary",
   "dependencies": {
     "@electron/remote": "^2.0.8",
-    "@kumologica/builder": "3.1.0-alpha2",
-    "@kumologica/devkit": "3.1.0-alpha2",
-    "@kumologica/runtime": "3.1.0-alpha2",
+    "@kumologica/builder": "3.1.0-beta2",
+    "@kumologica/devkit": "3.1.0-beta2",
+    "@kumologica/runtime": "3.1.0-beta2",
     "adm-zip": "0.4.13",
     "ajv": "8.10.0",
-    "aws-sdk": "2.513.0",
+    "aws-sdk": "2.814.0",
     "basic-auth": "2.0.1",
     "bcryptjs": "2.4.3",
-    "body-parser": "1.19.0",
+    "body-parser": "1.20.1",
     "chalk": "2.4.2",
-    "child_process": "1.0.2",
+    "child-process-ext": "^2.1.1",
     "clone": "2.1.2",
     "cookie-parser": "1.4.4",
     "cors": "^2.8.5",
     "dagre": "^0.8.5",
     "debounce": "^1.2.0",
-    "electron": "19.0.0",
-    "electron-tabs": "^1.0.1",
+    "electron": "19.1.9",
     "electron-updater": "4.3.9",
     "enquirer": "^2.3.1",
     "express": "4.17.3",
     "express-session": "1.16.2",
-    "extract-json-from-string": "1.0.1",
     "fs-extra": "10.1.0",
     "glob": "7.1.6",
-    "got": "11.8.2",
+    "got": "11.8.5",
     "hash-sum": "2.0.0",
-    "http-shutdown": "1.2.1",
     "iconv-lite": "0.5.0",
     "ini": "^2.0.0",
-    "js-yaml": "3.13.1",
-    "jsonata": "1.7.0",
-    "jsonpath": "1.0.2",
+    "js-yaml": "^3.13.1",
+    "json-cycle": "^1.3.0",
+    "jsonpath": "1.1.1",
     "memorystore": "1.6.1",
     "mime": "2.4.4",
-    "minimist": "^1.2.3",
-    "multer": "1.4.1",
     "mustache": "3.0.1",
-    "oauth2orize": "1.11.0",
     "os": "0.1.1",
-    "passport": "0.4.0",
-    "passport-http-bearer": "1.0.1",
-    "passport-oauth2-client-password": "0.1.2",
     "request": "2.88.0",
     "rimraf": "3.0.0",
     "shell-path": "2.1.0",
     "simple-git": "^3.14.1",
     "simplemde": "1.11.2",
     "smoketail": "0.2.2",
-    "socket.io": "2.3.0",
     "tcp-port-used": "1.0.2",
     "util": "0.12.1",
     "when": "3.7.8",
     "wide-align": "^1.1.5",
     "wildcard-match": "^5.1.2",
-    "ws": "7.1.1",
+    "ws": "7.5.9",
     "xterm": "4.1.0",
     "xterm-addon-fit": "0.2.1",
     "yargs": "17.3.1"
@@ -129,32 +119,27 @@
     "@types/node": "^12.6.8",
     "chai": "^4.2.0",
     "grunt": "^1.0.4",
-    "grunt-chmod": "~1.1.1",
     "grunt-cli": "~1.3.2",
-    "grunt-concurrent": "~2.3.1",
+    "grunt-concurrent": "3.0.0",
     "grunt-contrib-clean": "~1.1.0",
     "grunt-contrib-compress": "~1.4.0",
     "grunt-contrib-concat": "~1.0.1",
     "grunt-contrib-copy": "~1.0.0",
-    "grunt-contrib-jshint": "~1.1.0",
-    "grunt-contrib-uglify-es": "github:gruntjs/grunt-contrib-uglify#harmony",
     "grunt-contrib-watch": "~1.1.0",
     "grunt-jsdoc": "^2.2.1",
-    "grunt-jsdoc-to-markdown": "^4.0.0",
-    "grunt-jsonlint": "~1.1.0",
+    "grunt-jsdoc-to-markdown": "6.0.0",
     "grunt-mkdir": "~1.0.0",
     "grunt-mocha-istanbul": "5.0.2",
-    "grunt-nodemon": "~0.4.2",
     "grunt-npm-command": "~0.1.2",
     "grunt-sass": "3.1.0",
     "grunt-simple-mocha": "~0.4.1",
-    "grunt-webdriver": "^2.0.3",
+    "grunt-terser": "2.0.0",
     "istanbul": "^0.4.5",
     "license-checker": "^25.0.1",
     "license-compatibility-checker": "^0.3.4",
     "license-report": "^3.0.0",
-    "mocha": "^6.2.0",
-    "node-sass": "^6.0.0",
+    "mocha": "10.2.0",
+    "node-sass": "8.0.0",
     "tslint": "^5.18.0",
     "typescript": "^3.5.3"
   },