add create

Author: willin

.eslintrc.yml

@@ -1,2 +1,4 @@
 root: true
 extends: dwing
+rules:
+  no-bitwise: 0

.npmignore

@@ -1,6 +1,5 @@
 node_modules/
 demo/
-temp/
 .nyc_output/
 
 .DS_Store

bin/scf.js

@@ -3,6 +3,6 @@ const list = require('cli-list');
 const minimist = require('minimist');
 const endpoint = require('../src');
 
-const [{ _: cmd = [], ...args }] = list(process.argv.slice(2)).map(item => minimist(item));
+const [{ _: cmd = [] }] = list(process.argv.slice(2)).map(item => minimist(item));
 
-endpoint(cmd, args);
+endpoint(cmd);

src/create.js

@@ -0,0 +1,54 @@
+const inquirer = require('inquirer');
+const chalk = require('chalk');
+const fse = require('fs-extra');
+const path = require('path');
+const SDK = require('./lib/sdk');
+const pack = require('./lib/pack');
+const { input, envEditor } = require('./lib/prompt');
+
+module.exports = async (fn = '') => {
+  const FunctionName = fn || await input();
+  const prompts = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'MemorySize',
+      message: '函数运行时内存大小, 以 128MB 为阶梯',
+      default: 128,
+      validate: v => ((~~v >= 128 && ~~v <= 1536 && ~~v % 128 === 0) ? true : '可选范围 128MB-1536MB，并且以 128MB 为阶梯')
+    },
+    {
+      type: 'input',
+      name: 'Timeout',
+      message: '函数最长执行时间, 单位为秒',
+      default: 3,
+      validate: v => ((~~v >= 1 && ~~v <= 300) ? true : '可选值范围 1-300 秒')
+    }
+  ]);
+  const env = await envEditor();
+
+  const zip = await pack();
+
+  const sdk = SDK();
+  const {
+    Response: {
+      Error: {
+        Message = ''
+      } = {}
+    }
+  } = await sdk.CreateFunction({
+    FunctionName,
+    'Code.ZipFile': zip,
+    Handler: 'index.main_handler',
+    ...prompts,
+    ...env,
+    Runtime: 'Nodejs8.9'
+  });
+  if (Message === '') {
+    // eslint-disable-next-line no-console
+    console.log(chalk`{green.bold 创建成功!}`);
+    fse.copySync(path.join(__dirname, '../template'), `./${FunctionName}`);
+  } else {
+    // eslint-disable-next-line no-console
+    console.log(chalk`{red.bold 创建失败:} ${Message}`);
+  }
+};

src/delete.js

@@ -1,20 +1,26 @@
 const fs = require('fs-extra');
 const chalk = require('chalk');
-const select = require('./lib/select');
+const { select } = require('./lib/prompt');
 const SDK = require('./lib/sdk');
 
-module.exports = async (functionName = '') => {
-  const fn = functionName || await select();
+module.exports = async (fn = '') => {
+  const FunctionName = fn || await select();
   const sdk = SDK();
-  const { codeDesc = '', message = '' } = await sdk.DeleteFunction({
-    functionName: fn
+  const {
+    Response: {
+      Error: {
+        Message = ''
+      } = {}
+    }
+  } = await sdk.DeleteFunction({
+    FunctionName
   });
-  if (codeDesc === 'Success') {
+  if (Message === '') {
     // eslint-disable-next-line no-console
     console.log(chalk`{green.bold 删除成功!}`);
   } else {
     // eslint-disable-next-line no-console
-    console.log(chalk`{red.bold 删除失败:} ${message}`);
+    console.log(chalk`{red.bold 删除失败:} ${Message}`);
   }
   fs.removeSync(fn);
 };

src/index.js

@@ -1,11 +1,13 @@
 const main = require('./main');
 const login = require('./login');
+const create = require('./create');
 const deleter = require('./delete');
 const list = require('./list');
 const help = require('./help');
 
 const cmds = {
   main,
+  create,
   delete: deleter,
   list,
   help,
@@ -22,4 +24,4 @@ const call = new Proxy({}, {
   }
 });
 
-module.exports = ([cmd = 'main', functionName = ''] = [], args = {}) => call[cmd](functionName, args);
+module.exports = ([cmd = 'main', functionName = ''] = []) => call[cmd](functionName);

src/lib/common.js

@@ -0,0 +1,40 @@
+const fs = require('fs');
+const path = require('path');
+const archiver = require('archiver');
+
+const getDefer = () => {
+  const deferred = {};
+  deferred.promise = new Promise((resolve, reject) => {
+    deferred.resolve = resolve;
+    deferred.reject = reject;
+  });
+  return deferred;
+};
+
+module.exports = (fn = 'template') => {
+  const deferred = getDefer();
+  const filepath = path.join(__dirname, `../../temp/${fn}.zip`);
+  const output = fs.createWriteStream(filepath);
+  const archive = archiver('zip', {
+    zlib: { level: 9 }
+  });
+  archive.on('warning', (err) => {
+    if (err.code === 'ENOENT') {
+      // log warning
+    } else {
+      deferred.reject(err);
+    }
+  });
+  archive.on('error', (err) => {
+    deferred.reject(err);
+  });
+  archive.pipe(output);
+  archive.directory(fn === 'templage' ? path.join(__dirname, '../template/') : `./${fn}`, false);
+  archive.finalize();
+  output.on('close', () => {
+    deferred.resolve(
+      fs.readFileSync(filepath, 'base64')
+    );
+  });
+  return deferred.promise;
+};

src/lib/pack.js

@@ -0,0 +1,52 @@
+const inquirer = require('inquirer');
+const fs = require('fs');
+
+exports.select = () => {
+  const files = fs.readdirSync('.', { withFileTypes: true });
+  const dirs = files.filter(x => x.isDirectory() && !x.name.startsWith('.') && x.name !== 'node_modules').map(x => x.name);
+  return inquirer.prompt([{
+    type: 'list',
+    name: 'result',
+    message: '选择本地云函数',
+    choices: dirs
+  }]).then(({ result }) => result);
+};
+
+exports.input = () => inquirer.prompt([{
+  type: 'input',
+  name: 'result',
+  message: '输入云函数名称',
+  validate: v => (/^[a-zA-Z][\w-]{0,58}[a-zA-Z0-9]$/.test(v) ? true : '函数名称支持26个英文字母大小写、数字、连接符和下划线，第一个字符只能以字母开头，最后一个字符不能为连接符或者下划线，名称长度2-60')
+}]).then(({ result }) => result);
+
+exports.envEditor = () => inquirer.prompt([
+  {
+    type: 'confirm',
+    name: 'confirm',
+    message: '是否要设置环境变量？',
+    default: false
+  },
+  {
+    type: 'editor',
+    name: 'env',
+    message: '环境变量，请每行输入一个，参考格式`NODE_ENV=produection`',
+    defaut: '',
+    when: answers => answers.confirm
+  }
+]).then(({ env = '' }) => {
+  const envArr = env.split(/\s*\n\s*/).reduce((r, i) => {
+    const [, key = '', val = ''] = i.match(/(\w+)\s*=\s*(\S+)/) || [];
+    if (key !== '') {
+      r.push([key, val]);
+    }
+    return r;
+  }, []);
+  const obj = {};
+  envArr.forEach(([key, val], i) => {
+    obj[`Environment.Variables.${i}.Key`] = key;
+    if (val !== '') {
+      obj[`Environment.Variables.${i}.Value`] = val;
+    }
+  });
+  return obj;
+});

src/lib/prompt.js

@@ -1,4 +1,5 @@
 const fs = require('fs');
+const fse = require('fs-extra');
 const chalk = require('chalk');
 const { SCF } = require('wqcloud');
 const { globalPath, localPath } = require('../config');
@@ -9,6 +10,9 @@ module.exports = () => {
     console.log(chalk`请先执行 {red.bold csf loign} 进行登录`);
     process.exit(0);
   }
-  const config = fs.readFileSync(fs.existsSync(localPath) ? localPath : globalPath, 'utf8');
-  return SCF(JSON.parse(config));
+  const config = fse.readJSONSync(fs.existsSync(localPath) ? localPath : globalPath);
+  return SCF({
+    ...config,
+    Version: '2018-04-16'
+  });
 };

src/lib/sdk.js

@@ -7,18 +7,18 @@ module.exports = async () => {
   const getted = [];
   while (getted.length < allTotal) {
     const {
-      data: {
-        functions,
-        total = 0
+      Response: {
+        Functions = [],
+        TotalCount = 0
       }
       // eslint-disable-next-line no-await-in-loop
     } = await sdk.ListFunctions({
       Limit: 100,
       Offset: getted.length
     });
-    allTotal = total;
-    getted.push(...functions);
+    allTotal = TotalCount;
+    getted.push(...Functions);
   }
   // eslint-disable-next-line no-console
-  getted.forEach(({ functionName, addTime, modTime }) => console.log(chalk`{magenta.bold ${functionName}} (修改时间: ${modTime} | 添加时间：${addTime})`));
+  getted.forEach(({ FunctionName, AddTime, ModTime }) => console.log(chalk`{magenta.bold ${FunctionName}} (修改时间: ${ModTime} | 添加时间：${AddTime})`));
 };

src/lib/select.js

@@ -1,5 +1,6 @@
 const inquirer = require('inquirer');
 const login = require('./login');
+const create = require('./create');
 const deleter = require('./delete');
 const list = require('./list');
 const help = require('./help');
@@ -20,7 +21,7 @@ const choices = [
   new inquirer.Separator()
 ];
 
-module.exports = async (_, args) => {
+module.exports = async () => {
   const { cmd = 'help' } = await inquirer.prompt([
     {
       type: 'list',
@@ -31,15 +32,19 @@ module.exports = async (_, args) => {
   ]);
   switch (choices.findIndex(x => x === cmd)) {
     case 0: {
-      login('', args);
+      login();
+      break;
+    }
+    case 2: {
+      create();
       break;
     }
     case 3: {
-      deleter('', args);
+      deleter('');
       break;
     }
     case 5: {
-      list('', args);
+      list();
       break;
     }
     default: {

src/list.js

@@ -3,5 +3,6 @@
   "version": "1.0.0",
   "description": "腾讯云无服务器函数SCF命令行辅助工具",
   "dependencies": {
+    "wqcloud": "latest"
   }
 }