@opengis/pay 1.3.0 → 1.3.2

package/config.js

@@ -1,7 +1,74 @@
-import { existsSync, readFileSync } from 'fs';
+/* eslint-disable no-console */
+import dotenv from 'dotenv';
 
-const config = existsSync('config.json') ? JSON.parse(readFileSync('config.json')) : {};
-// console.log(config);
-config.storageList = {};
+dotenv.config(); // load .env for node, not required for bun
+
+import { existsSync, readFileSync } from 'node:fs';
+
+function unflattenObject(flatObj) {
+    const res = Object.keys(flatObj || {}).reduce((acc, key) => {
+        const keys = key.split('.');
+        keys.reduce((nestedObj, part, index) => {
+            if (index === keys.length - 1) {
+                // json array
+                if (typeof flatObj[key] === 'string' && flatObj[key].startsWith('[') && flatObj[key] !== ('[object Object]')) {
+                    try {
+                        nestedObj[part] = JSON.parse(flatObj[key] || '{}');
+                    }
+                    catch (err) {
+                        console.warn(`Error parsing JSON for key ${key}:`, err.toString());
+                        nestedObj[part] = flatObj[key]; // fallback to original value if parsing fails
+                    }
+                }
+                else if (['true', 'false'].includes(flatObj[key]) || (!isNaN(flatObj[key]) && key !== 'auth.uid')) {
+                    try {
+                        nestedObj[part] = JSON.parse(flatObj[key] || '{}');
+                    }
+                    catch (err) {
+                        console.warn(`Error parsing JSON for key ${key}:`, err.toString());
+                        nestedObj[part] = flatObj[key]; // fallback to original value if parsing fails
+                    }
+                }
+                else {
+                    nestedObj[part] = flatObj[key];
+                }
+            }
+            else {
+                nestedObj[part] = nestedObj[part] || {};
+            }
+            return nestedObj[part];
+        }, acc);
+        return acc;
+    }, {});
+    console.log('unflattened');
+    return res;
+}
+
+const fileName = ['config.json', '/data/local/config.json'].find(el => (existsSync(el) ? el : null));
+const config = fileName ? JSON.parse(readFileSync(fileName)) : {};
+
+const { skipKeys = ['windir'] } = config;
+
+// npm run dev === cross-env NODE_ENV=development
+// alt: node --env=development
+Object.assign(config, {
+    storageList: {},
+    allTemplates: config?.allTemplates || {},
+    skipCheckPolicyRoutes: [],
+    env: process.env?.NODE_ENV,
+});
+
+if (process.env?.NODE_ENV && existsSync(`.env.${process.env.NODE_ENV}`)) {
+    dotenv.config({ path: `.env.${process.env.NODE_ENV}` }); // load .env.{{production}} etc. for node, not required for bun
+}
+
+function loadEnvConfig() {
+    // node --env-file-if-exists=.env.dev --env-file-if-exists=.env server
+    if (config.trace) { console.log(Object.keys(process.env)); }
+    const configKeys = Object.keys(process.env).filter(key => !key.startsWith('npm_') && !skipKeys.includes(key) && (key.charAt(0) === key.charAt(0)?.toLowerCase?.() || key.includes('.'))).reduce((acc, curr) => ({ ...acc, [curr]: process.env[curr] }), {});
+    Object.assign(config, unflattenObject(configKeys));
+}
+
+loadEnvConfig();
 
 export default config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/pay",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "type": "module",
   "description": "pay plugins for billing",
   "main": "plugin.js",
@@ -13,14 +13,13 @@
     "utils.js"
   ],
   "scripts": {
+    "patch": "npm version patch && git push && npm publish",
     "test": "node --test",
     "start": "node --watch-path=server server",
     "admin": "set NODE_ENV=admin&& npm run start",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
   },
   "dependencies": {
-    "fastify": "5.3.3",
-    "fastify-plugin": "5.0.1",
     "ioredis": "5.3.2",
     "liqpayjs-sdk": "3.3.1",
     "nodemailer": "6.5.0",
@@ -28,9 +27,11 @@
     "request-promise": "4.2.6"
   },
   "devDependencies": {
+    "fastify": "5.3.3",
+    "fastify-plugin": "5.0.1",
     "eslint": "8.49.0",
     "eslint-config-airbnb": "19.0.4"
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

package/plugin.js

@@ -16,7 +16,7 @@ const dirname = path.dirname(fileURLToPath(import.meta.url));
 async function plugin(app, config = {}) {
   config.prefix = config.prefix || '/api';
 
-  const pg = await getPGAsync(config.pg || {});
+  const pg = await getPGAsync(config.pg ? { ...config.pg, name: 'client' } : {});
 
   app.register(import('./server/plugins/hook.js'), config);
   app.register(import('./server/routes/portmone/index.mjs'), config);

package/server/plugins/pg/funcs/getPG.js

@@ -10,7 +10,7 @@ import init from './init.js';
 import getDBParams from './getDBParams.js';
 
 function getPG(param) {
-  if (!config.pg) return null;
+  if (!config.pg && !param?.database && !pgClients[param.name || 'client']) return null; // env support?
   const {
     user, password, host, port, db, database, name: origin,
   } = (typeof param === 'string' ? getDBParams(param) : param || {});

package/server/plugins/pg/funcs/getPGAsync.js

@@ -10,7 +10,7 @@ import init from './init.js';
 import getDBParams from './getDBParams.js';
 
 async function getPGAsync(param) {
-  if (!config.pg) return null;
+  if (!config.pg && !param?.database && !pgClients[param.name || 'client']) return null;
 
   const {
     user, password, host, port, db, database, name: origin,

package/server/routes/liqpay/controllers/liqpay.status.js

@@ -12,7 +12,7 @@ import sendNotification from '../../../utils/sendNotification.js';
 import checkStatus from '../utils/check.status.js';
 
 const dirname = path.dirname(fileURLToPath(import.meta.url));
-const ptBody = readFileSync(path.join(dirname, '../../../../module/pay/pt/marketplace-service-payment-client-template.html'));
+const ptBody = readFileSync(path.join(dirname, '../../../../module/pay/pt/marketplace-service-payment-client-template.html'), { encoding: 'utf8' });
 
 const newDate = () => {
     const date = new Date();
@@ -176,7 +176,7 @@ export default async function liqpayStatus(req, reply) {
     });
 
     if (to) {
-        const pt = ptBody
+        const pt = (ptBody || 'empty template')
             .replace(/{{domain}}/g, req.hostname)
             .replace(/{{total_balance}}/g, +(refillSum || 0) + (+totalBalance || 0))
             .replace(/{{username}}/g, to)

package/server/routes/portmone/controllers/portmone.status.js

@@ -10,7 +10,7 @@ import dataUpdate from '../../../plugins/crud/dataUpdate.js';
 
 import sendNotification from '../../../utils/sendNotification.js';
 
-const ptBody = readFileSync(path.join(dirname, '../../../../module/pay/pt/marketplace-service-payment-client-template.html'));
+const ptBody = readFileSync(path.join(dirname, '../../../../module/pay/pt/marketplace-service-payment-client-template.html'), { encoding: 'utf8' });
 
 const newDate = () => {
   const date = new Date();
@@ -146,7 +146,7 @@ export default async function portmoneStatus(req, reply) {
     );
 
     if (to) {
-      const pt = ptBody
+      const pt = (ptBody || 'empty template')
         .replace(/{{domain}}/g, req.hostname)
         .replace(/{{total_balance}}/g, +(refillSum || 0) + (+totalBalance || 0))
         .replace(/{{username}}/g, to)