add zip function

Author: gotoweb

index.js

@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./lib/mocha');
+module.exports = require('./lib/');

lib/index.js

@@ -2,8 +2,9 @@ const { exec } = require("child_process");
 const { post } = require("axios")
 const { readFileSync } = require("fs");
 const path = require('path')
-const prompt = require('prompt')
-const endpoint = 'https://nhfz4ymqhc.execute-api.ap-northeast-2.amazonaws.com/dev/auth'
+const prompt = require('prompt');
+const zip = require('./zip')
+const endpoint = 'https://2j12cf7y29.execute-api.ap-northeast-2.amazonaws.com/dev/'
 const payload = {
   "name": path.basename(process.cwd()),
   "assessments": [{
@@ -38,11 +39,11 @@ const getEmail = () => {
 }
 
 const getEndpoint = (email) => {
-  post(endpoint, {
+  post(endpoint + 'auth', {
     email
   })
   .then(res => {
-    runReport(result => submit(result, res.data))
+    runReport(async result => await submit(result, res.data))
   })
   .catch(err => {
     if (err.response.status === 404) {
@@ -64,17 +65,36 @@ const runReport = (callback) => {
   })
 }
 
-const submit = (result, auth) => {
+const submit = async (result, auth) => {
   payload.user = auth.users[0]
   payload.assessments[0].result = result
+  const filename = `${payload.user.email}--${new Date().toISOString().replace(/\:/g, '-')}.zip`
 
-  post(auth.endpoint_submit, payload)
+  // console.log(payload)
+  const config = {
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  }
+
+  post(auth.endpoint_submit, payload, config)
   .then(resp => {
     console.log('제출에 성공하였습니다.')
   })
   .catch(err => {
+    console.log(err)
     throw new Error('제출에 실패하였습니다.')
   })
+
+  const base64 = await zip(filename)
+  post(auth.endpoint_upload, { contents: base64, filename }, config)
+  .then(resp => {
+    console.log('과제 업로드에 성공하였습니다.')
+  })
+  .catch(err => {
+    console.log(err)
+    throw new Error('과제 업로드에 실패하였습니다.')
+  })
 }
 
 module.exports = getEmail;

lib/zip.js

@@ -0,0 +1,33 @@
+const { createWriteStream } = require("fs")
+const archiver = require("archiver")
+const { Base64Encode } = require('base64-stream')
+const getStream = require('get-stream')
+
+const zip = (filename) => {
+  const out = createWriteStream(filename)
+  const archive = archiver('zip', { zlib: { level: 9 }})
+  const encoder = new Base64Encode()
+
+  return new Promise((resolve, reject) => {
+    archive
+    .glob('**', {
+      ignore: ['node_modules/**', filename]
+    })
+    .on('error', err => reject(err))
+    .pipe(out)
+
+    let base64str;
+    getStream(archive.pipe(encoder)).then(str => {
+      base64str = str
+    })
+
+    out.on('close', async () => {
+      // console.log(base64str)
+      resolve(base64str)
+    })
+
+    archive.finalize()
+  })
+}
+
+module.exports = zip;

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@codestates/submission-npm",
-  "version": "1.0.5",
+  "name": "@codestates-cc/submission-npm",
+  "version": "1.0.7",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -14,13 +14,16 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/codestates/codestates-submission-npm.git"
+    "url": "git://github.com/codestates-cc/submission-npm.git"
   },
   "keywords": [],
   "author": "Hoyong Lee",
   "license": "ISC",
   "dependencies": {
+    "archiver": "^5.1.0",
     "axios": "^0.21.0",
+    "base64-stream": "^1.0.0",
+    "get-stream": "^6.0.0",
     "prompt": "^1.0.0"
   }
 }