yaml-admin-api 0.0.9 → 0.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml-admin-api",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "YAML Admin API package",
   "type": "commonjs",
   "main": "src/index.js",

package/src/crud/entity-api-generator.js

@@ -18,6 +18,8 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         access_key_id: yml.upload.s3.access_key_id,
         secret_access_key: yml.upload.s3.secret_access_key,
         bucket: yml.upload.s3.bucket,
+        region: yml.upload.s3.region,
+        prefix: yml.upload.s3.prefix,
         bucket_private: yml.upload.s3.bucket_private,
         base_url: yml.upload.s3.base_url,
     }) : withConfigLocal({
@@ -166,7 +168,7 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
             }
         })
 
-        console.log('f', f, req.query)
+        //console.log('f', f)
 
         var name = req.query.name;
         if (name == null && req.query.q)
@@ -364,7 +366,7 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
             const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'buffer' });
 
             const currentTime = moment().format('YYYYMMDD_HHmmss');
-            const key = `${filename}${currentTime}.xlsx`;
+            const key = `/excel/${filename}${currentTime}.xlsx`;
             await uploader.uploadSecure(key, excelBuffer);
             let url = await uploader.getUrlSecure(key, auth);
             return res.json({ r: true, url });

package/src/upload/localUpload.js

@@ -1,17 +1,6 @@
 const moment = require('moment')
 const fs = require('fs')
 
-const getUrl = async (Key) => {
-    //console.log('getSignedUrl')
-    let r = await s3.getSignedUrl('getObject', {
-        Bucket:aws_bucket_private,
-        Key,
-    })
-
-    //console.log(r)
-    return r
-}
-
 const withConfigLocal = ({path, path_private, base_url, api_host}) => {
 
     const upload = async (key, stream) => {

package/src/upload/s3Upload.js

@@ -2,46 +2,97 @@ const moment = require('moment')
 const { S3Client, PutObjectCommand, GetObjectCommand, DeleteObjectCommand } = require('@aws-sdk/client-s3')
 const { getSignedUrl } = require('@aws-sdk/s3-request-presigner')
 
-
-const upload = async (key, stream) => {
-    if(!key){
-        throw new Error('필수값이 없습니다')
-    }
-    //console.log('uploadExcel')
-    return await s3.upload({
-        Bucket: aws_bucket_private,
-        Key: key,
-        Body: stream,
-        ACL: 'private',
-        Expires: moment().add(10, 'minute').toISOString(),
-        ContentType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-    }).promise()
+const whatIsContentType = (ext) => {
+    let contentType = 'image/jpeg'
+    if(ext == 'mp4') 
+        contentType = 'video/mp4'
+    else if(ext == 'mov')
+        contentType = 'video/quicktime'
+    else if(ext == 'png') 
+        contentType = 'image/png'
+    else if(ext == 'xlsx') 
+        contentType = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+    else if(ext == 'zip') 
+        contentType = 'application/zip'
+    else if(ext == 'pdf') 
+        contentType = 'application/pdf'
+    else if(ext == 'docx') 
+        contentType = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+    else if(ext == 'doc') 
+        contentType = 'application/msword'
+    else if(ext == 'txt') 
+        contentType = 'text/plain'
+    else if(ext == 'csv') 
+        contentType = 'text/csv'
+    else if(ext == 'xls') 
+        contentType = 'application/vnd.ms-excel'
+    else if(ext == 'pptx') 
+        contentType = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
+    else if(ext == 'ppt') 
+        contentType = 'application/vnd.ms-powerpoint'
+    else if(ext == 'mp3') 
+        contentType = 'audio/mpeg'
+    else if(ext == 'mov') 
+        contentType = 'video/quicktime'
+    return contentType
 }
 
-const getUrl = async (Key) => {
-    //console.log('getSignedUrl')
-    let r = await s3.getSignedUrl('getObject', {
-        Bucket:aws_bucket_private,
-        Key,
+
+const withConfigS3 = ({ access_key_id, secret_access_key, region, prefix, bucket, bucket_private, base_url }) => {
+    const s3 = new S3Client({
+        region: region,
+        credentials: {
+            accessKeyId: access_key_id,
+            secretAccessKey: secret_access_key
+        }
     })
 
-    //console.log(r)
-    return r
-}
+    const upload = async (key, stream) => {
+        return await s3.send(new PutObjectCommand({
+            Bucket: bucket,
+            Key: key,
+            Body: stream,
+            ACL: 'public-read',
+            ContentType: whatIsContentType(key.split('.').pop()),
+        }))
+    }
 
-const getSecureUrl = async (Key) => {
-    //console.log('getSignedUrl')
-    let r = await s3.getSignedUrl('getObject', {
-        Bucket:aws_bucket_private,
-        Key,
-    })
+    const uploadSecure = async (Key, stream) => {
+        console.log('uploadSecure', prefix, Key)
+        return await s3.send(new PutObjectCommand({
+            Bucket: bucket_private,
+            Key: `${prefix}/${Key}`,
+            Body: stream,
+            ACL: 'private',
+            Expires: moment().add(10, 'minute').toDate(),
+            ContentType: whatIsContentType(Key.split('.').pop()),
+        }))
+    }
+    
+    const getUrl = async (Key) => {
+        return `${base_url}/${prefix}/${Key}`
+    }
+    
+    const getUrlSecure = async (Key) => {
+        const command = new GetObjectCommand({
+            Bucket: bucket_private,
+            Key: `${prefix}/${Key}`,
+        })
+        const r = await getSignedUrl(s3, command, { expiresIn: 600 })
+        return r
+    }
 
-    //console.log(r)
-    return r
+    return {
+        upload,
+        uploadSecure,
+        getUrl,
+        getUrlSecure,
+    }
 }
 
+
+
 module.exports = {
-    upload,
-    getUrl,
-    getSecureUrl,
+    withConfigS3,
+    whatIsContentType,
 };

package/src/upload/upload-api-generator.js

@@ -4,22 +4,11 @@ const { getSignedUrl } = require('@aws-sdk/s3-request-presigner')
 const { genEntityIdWithKey } = require('../common/util.js');
 const { S3Client } = require('@aws-sdk/client-s3')
 const fs = require('fs')
-
-const getContentType = (ext) => {
-    let contentType = 'image/jpeg'
-    if(ext == 'mp4') 
-        contentType = 'video/mp4'
-    else if(ext == 'mov')
-        contentType = 'video/quicktime'
-    else if(ext == 'png') 
-        contentType = 'image/png'
-    return contentType
-}
-
+const { whatIsContentType } = require('./s3Upload.js');
 
 const generateS3UploadApi = async ({ app, db, yml, options }) => {
     const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"] });
-    const { region, access_key_id, secret_access_key, bucket, bucket_private } = yml.upload.s3;
+    const { region, access_key_id, secret_access_key, prefix, bucket, bucket_private } = yml.upload.s3;
     const getS3 = () => {
         let s3 = new S3Client({
             region: region,
@@ -33,15 +22,15 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
     
     app.get('/api/media/url/put/:ext', auth.isAuthenticated, async function(req, res){
         let s3 = getS3()
-        let {member_no} = req.user;
+        let member_no = req.user.member_no || req.user.id;;
         let fileName = await genEntityIdWithKey(db, 'file');
         let ext = req.params.ext;
 
-        let contentType = getContentType(ext)
-        let key = `media/${member_no}/${fileName}.${ext}`
-        const uploadUrl = await getSignedUrl(s3, new PutObjectCommand({Bucket: aws_bucket_image,
+        let contentType = whatIsContentType(ext)
+        let key = `${member_no}/${fileName}.${ext}`
+        const uploadUrl = await getSignedUrl(s3, new PutObjectCommand({Bucket: bucket,
             ContentType: contentType,
-            Key: key}), { expiresIn: 300 }); 
+            Key: `${prefix}/${key}`}), { expiresIn: 300 }); 
 
         let r = {upload_url:uploadUrl, key, fileName:`${fileName}.${ext}`, member_no, contentType}
         console.log(r)
@@ -50,15 +39,15 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
 
     app.get('/api/media/url/secure/put/:ext', auth.isAuthenticated, async function(req, res){
         let s3 = getS3()
-        let {member_no} = req.user;
+        let member_no = req.user.member_no || req.user.id;;
         let fileName = await genEntityIdWithKey(db, 'file');
         let ext = req.params.ext;
 
-        let contentType = getContentType(ext)
-        let key = `media/${member_no}/${fileName}.${ext}`
-        const uploadUrl = await getSignedUrl(s3, new PutObjectCommand({Bucket: aws_bucket_private,
+        let contentType = whatIsContentType(ext)
+        let key = `${member_no}/${fileName}.${ext}`
+        const uploadUrl = await getSignedUrl(s3, new PutObjectCommand({Bucket: bucket_private,
             ContentType: contentType,   
-            Key: key}), { expiresIn: 300 }); 
+            Key: `${prefix}/${key}`}), { expiresIn: 300 }); 
 
         let r = {upload_url:uploadUrl, key, fileName:`${fileName}.${ext}`, member_no, contentType}
         
@@ -72,12 +61,12 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
         let fileName = await genEntityIdWithKey(db, 'file');
         let ext = req.params.ext;
         
-        let key = `media/${member_no}/${fileName}.${ext}`;
-        let contentType = getContentType(ext);
+        let key = `/${member_no}/${fileName}.${ext}`;
+        let contentType = whatIsContentType(ext);
 
         const createMultipartUpload = await s3.send(new CreateMultipartUploadCommand({
-            Bucket: aws_bucket_private,
-            Key: key,
+            Bucket: bucket_private,
+            Key: `${prefix}/${key}`,
             ContentType: contentType
         }));
 
@@ -90,8 +79,8 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
         let { key, uploadId, partNumber } = req.body;
 
         const command = new UploadPartCommand({
-            Bucket: aws_bucket_private,
-            Key: key,
+            Bucket: bucket_private,
+            Key: `${prefix}/${key}`,
             UploadId: uploadId,
             PartNumber: partNumber
         });
@@ -109,8 +98,8 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
         parts.sort((a, b) => a.PartNumber - b.PartNumber);
 
         await s3.send(new CompleteMultipartUploadCommand({
-            Bucket: aws_bucket_private,
-            Key: key,
+            Bucket: bucket_private,
+            Key: `${prefix}/${key}`,
             UploadId: uploadId,
             MultipartUpload: { Parts: parts }
         }));
@@ -125,8 +114,8 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
             const s3 = getS3();
 
             await s3.send(new AbortMultipartUploadCommand({
-                Bucket: aws_bucket_private,
-                Key: key,
+                Bucket: bucket_private,
+                Key: `${prefix}/${key}`,
                 UploadId: uploadId
             }));
 
@@ -139,17 +128,17 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
 
     app.post('/api/media/url/put', auth.isAuthenticated, async function(req, res) {
         let s3 = getS3()
-        let {member_no} = req.user
+        let member_no = req.user.member_no || req.user.id;
         const {ext_list} = req.body
         
         let r = {list:[], r:true}
         for(let ext of ext_list) {
             let fileName = await genEntityIdWithKey(db, 'file')
-            let key = `media/${member_no}/${fileName}.${ext}`
-            let contentType = getContentType(ext)
-            const upload_url = await getSignedUrl(s3, new PutObjectCommand({Bucket: aws_bucket_image,
+            let key = `/${member_no}/${fileName}.${ext}`
+            let contentType = whatIsContentType(ext)
+            const upload_url = await getSignedUrl(s3, new PutObjectCommand({Bucket: bucket,
                 ContentType: contentType,
-                Key: key}), { expiresIn: 300 }); 
+                Key: `${prefix}/${key}`}), { expiresIn: 300 }); 
             
             r.list.push({upload_url, key, fileName:`${fileName}.${ext}`, member_no, contentType})
         }
@@ -159,17 +148,17 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
 
     app.post('/api/media/url/secure/put', auth.isAuthenticated, async function(req, res) {
         let s3 = getS3()
-        let {member_no} = req.user
+        let member_no = req.user.member_no || req.user.id;
         const {ext_list} = req.body
 
         let r = {list:[], r:true}
         for(let ext of ext_list) {
             let fileName = await genEntityIdWithKey(db, 'file')
-            let key = `media/${member_no}/${fileName}.${ext}`
-            let contentType = getContentType(ext)
-            const upload_url = await getSignedUrl(s3, new PutObjectCommand({Bucket: aws_bucket_private,
+            let key = `${member_no}/${fileName}.${ext}`
+            let contentType = whatIsContentType(ext)
+            const upload_url = await getSignedUrl(s3, new PutObjectCommand({Bucket: bucket_private,
                 ContentType: contentType,
-                Key: key}), { expiresIn: 300 }); 
+                Key: `${prefix}/${key}`}), { expiresIn: 300 }); 
 
             r.list.push({upload_url, key, fileName:`${fileName}.${ext}`, member_no, contentType})
         }
@@ -187,7 +176,7 @@ const generateLocalUploadApi = async ({ app, db, yml, options }) => {
         let member_no = req.user.member_no || req.user.id;
         let {ext, name} = req.query
         let fileName = await genEntityIdWithKey(db, 'file')
-        let key = `media/${member_no}/${fileName}.${ext}`
+        let key = `${member_no}/${fileName}.${ext}`
 
         // Ensure directory exists
         const fullPath = `${path}/${key}`;
@@ -209,7 +198,7 @@ const generateLocalUploadApi = async ({ app, db, yml, options }) => {
         let {ext, name} = req.query
 
         let fileName = await genEntityIdWithKey(db, 'file')
-        let key = `media/${member_no}/${fileName}.${ext}`
+        let key = `${member_no}/${fileName}.${ext}`
 
         try {
             // Ensure directory exists