yaml-admin-api 0.0.110 → 0.0.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml-admin-api",
-  "version": "0.0.110",
+  "version": "0.0.112",
   "license": "MIT",
   "description": "YAML Admin API package",
   "type": "commonjs",

package/src/common/Uploader.js

@@ -0,0 +1,56 @@
+const { withConfigLocal } = require('../upload/localUpload.js');
+const { withConfigS3 } = require('../upload/s3Upload.js');
+
+class Uploader {
+    constructor(uploader) {
+        this._uploader = uploader;
+    }
+
+    async getSecureUrl(key) {
+        return await this._uploader.getUrlSecure(key);
+    }
+
+    async upload(key, stream) {
+        return await this._uploader.upload(key, stream);
+    }
+
+    async uploadSecure(key, stream) {
+        return await this._uploader.uploadSecure(key, stream);
+    }
+
+    async getUrl(key) {
+        return await this._uploader.getUrl(key);
+    }
+
+    static init(yml, auth) {
+        const api_host = yml['api-host']?.uri;
+        const raw = yml.upload.s3
+            ? withConfigS3({
+                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({
+                path: yml.upload.local.path,
+                path_private: yml.upload.local.path_private,
+                base_url: yml.upload.local.base_url,
+                api_host,
+                auth,
+            });
+        Uploader._instance = new Uploader(raw);
+        return Uploader._instance;
+    }
+
+    static getInstance() {
+        if (!Uploader._instance) throw new Error('Uploader is not initialized. Call Uploader.init(yml) first.');
+        return Uploader._instance;
+    }
+}
+
+Uploader._instance = null;
+
+module.exports = { Uploader };

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

@@ -6,8 +6,7 @@ const crypto = require('crypto');
 const bcrypt = require('bcryptjs');
 const XLSX = require('xlsx');
 const moment = require('moment');
-const { withConfigLocal } = require('../upload/localUpload.js');
-const { withConfigS3 } = require('../upload/s3Upload.js');
+const { Uploader } = require('../common/Uploader.js');
 const { makeMongoSortFromYml } = require('./crud-common.js');
 
 const asyncErrorHandler = (fn) => (req, res, next) => {
@@ -34,25 +33,12 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
 
     const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"] });
     const passwordEncoding = yml.login['password-encoding']
-    const api_host = yml["api-host"].uri;
+    
     let isS3 = yml.upload.s3
     let host_image = isS3 ? yml.upload.s3.base_url : yml.upload.local.base_url
     let api_prefix = options?.api_prefix || ''
 
-    const uploader = yml.upload.s3 ? withConfigS3({
-        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({
-        path: yml.upload.local.path,
-        path_private: yml.upload.local.path_private,
-        base_url: yml.upload.local.base_url,
-        api_host,
-    })
+    const uploader = Uploader.getInstance()
 
     let key_field = yml_entity.fields?.find(field => field.key)
     if (!key_field) {
@@ -207,7 +193,7 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
             url= host_image + '/' + url
 
         if(private) {
-            url = await uploader.getUrlSecure(key, auth);
+            url = await uploader.getSecureUrl(key);
         }
 
         return url
@@ -594,7 +580,7 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
             const currentTime = moment().format('YYYYMMDD_HHmmss');
             const key = `excel/${filename}${currentTime}.xlsx`;
             await uploader.uploadSecure(key, excelBuffer);
-            let url = await uploader.getUrlSecure(key, auth);
+            let url = await uploader.getSecureUrl(key);
             return res.json({ r: true, url });
         }))
     }
@@ -869,8 +855,8 @@ const makeApiGenerateAggregate = async (apiGenerate) => {
     return aggregate
 }
 
-const generateEntityApi = async ({ app, db, entity_name, entity, yml, options }) => {
-    await generateCrud({ app, db, entity_name, yml_entity: entity, yml, options })
+const generateEntityApi = async ({ app, db, entity_name, entity, yml, options, uploader }) => {
+    await generateCrud({ app, db, entity_name, yml_entity: entity, yml, options, uploader })
 }
 
 module.exports = {

package/src/index.js

@@ -1,6 +1,4 @@
 const registerRoutes = require('./yml-admin-api.js');
 const { genEntityIdWithKey } = require('./common/util.js');
-const { withConfig } = require('./login/auth.js');
-const { withConfigLocal } = require('./upload/localUpload.js');
-const { withConfigS3 } = require('./upload/s3Upload.js');
-module.exports = { registerRoutes, genEntityIdWithKey, withConfigLocal, withConfigS3, withConfig };
+const { Uploader } = require('./common/Uploader.js');
+module.exports = { registerRoutes, genEntityIdWithKey, Uploader };

package/src/upload/localUpload.js

@@ -1,7 +1,7 @@
 const moment = require('moment')
 const fs = require('fs')
 
-const withConfigLocal = ({path, path_private, base_url, api_host}) => {
+const withConfigLocal = ({path, path_private, base_url, api_host, auth}) => {
 
     const upload = async (key, stream) => {
         return await fs.writeFileSync(path + '/' + key, stream)
@@ -11,7 +11,7 @@ const withConfigLocal = ({path, path_private, base_url, api_host}) => {
         return await fs.writeFileSync(path_private + '/' + key, stream)
     }
 
-    const getUrlSecure = async (Key, auth) => { 
+    const getUrlSecure = async (Key) => {
         let r = `${api_host}/local-secure-download?key=${Key}`
         let shortToken = await auth.genenrateShortToken()
         r += `&token=${shortToken}`

package/src/yml-admin-api.js

@@ -6,6 +6,7 @@ const { generateLoginApi } = require('./crud/login-api-generator');
 const { generateChartApi } = require('./crud/chart-api-generator');
 const { withConfig } = require('./login/auth.js');
 const { generateUploadApi } = require('./upload/upload-api-generator');
+const { Uploader } = require('./common/Uploader.js');
 
 const changeEnv = (yamlString, env = {}) => {
   if (!yamlString) return yamlString;
@@ -41,6 +42,8 @@ async function registerRoutes(app, options = {}) {
     yml = yaml.parse(yamlString);
   }
 
+  
+
   const {database, entity} = yml;
   let db = null;
   if(database) {
@@ -52,14 +55,19 @@ async function registerRoutes(app, options = {}) {
     }
   }
 
+  //local secure download api
+  const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"] });
+
+  const uploader = Uploader.init(yml, auth);
+
   await generateLoginApi(app, db, yml, api_prefix)
   await generateChartApi(app, db, yml, api_prefix)
-  
+
   entity && Object.keys(entity).forEach(async (entity_name) => {
     await generateEntityApi({
-      app, db, 
-      entity_name, 
-      entity:entity[entity_name], 
+      app, db,
+      entity_name,
+      entity:entity[entity_name],
       yml,
       options,
     })
@@ -70,9 +78,6 @@ async function registerRoutes(app, options = {}) {
     yml,
     options,
   })
-  
-  //local secure download api
-  const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"] });
   app.get(api_prefix + '/local-secure-download', auth.isAuthenticated, async (req, res) => {
     const {key} = req.query;
     const a = `${yml.upload.local.path_private}/${key}`