starred/unifi-voucher-site
1
0
Fork 0
mirror of https://github.com/glenndehaan/unifi-voucher-site.git synced 2026-03-31 06:24:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor fetch.js to utilize global cache

Browse Source
This commit is contained in:
Glenn de Haan
2025-08-26 18:35:20 +02:00
parent 7af385c8fe
commit 19d7e4c0c6
2 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/cache.js
View File

@@ -1,9 +1,12 @@
/**
* Internal application cache
*
* @type {{guests: *[], vouchers: *[], updated: number}}
* @type {{unifi: {siteUUID: null}, vouchers: *[], guests: *[], updated: number}}
*/
module.exports = {
unifi: {
siteUUID: null
},
vouchers: [],
guests: [],
updated: 0

30
utils/fetch.js
View File

@@ -7,22 +7,10 @@ const {Agent} = require('undici');
/**
* Import own modules
*/
const cache = require('../modules/cache');
const variables = require('../modules/variables');
const log = require('../modules/log');
/**
* UniFi Settings
*/
const controller = {
ip: variables.unifiIp,
port: variables.unifiPort,
username: variables.unifiUsername,
password: variables.unifiPassword,
token: variables.unifiToken,
siteID: variables.unifiSiteId,
siteUUID: null
};
/**
* Request a Controller Site UUID
*
@@ -30,11 +18,11 @@ const controller = {
*/
const getSiteUUID = () => {
return new Promise((resolve, reject) => {
fetch(`https://${controller.ip}:${controller.port}/proxy/network/integration/v1/sites?filter=internalReference.eq('${controller.siteID}')`, {
fetch(`https://${variables.unifiIp}:${variables.unifiPort}/proxy/network/integration/v1/sites?filter=internalReference.eq('${variables.unifiSiteId}')`, {
headers: {
'User-Agent': 'unifi-voucher-site',
'Content-Type': 'application/json',
'X-API-KEY': controller.token
'X-API-KEY': variables.unifiToken
},
dispatcher: new Agent({
connect: {
@@ -61,9 +49,9 @@ const getSiteUUID = () => {
}
if(response.data.length < 1) {
log.error(`[UniFi] Unknown site id: ${controller.siteID}.`);
log.error(`[UniFi] Unknown site id: ${variables.unifiSiteId}.`);
log.debug(response);
reject(`Unknown site id: ${controller.siteID}`);
reject(`Unknown site id: ${variables.unifiSiteId}`);
return;
}
@@ -90,7 +78,7 @@ const getSiteUUID = () => {
module.exports = (endpoint, method = 'GET', params = {}, data = null) => {
return new Promise(async (resolve, reject) => {
// Auto-resolve siteUUID if not set
if(controller.siteUUID === null) {
if(cache.unifi.siteUUID === null) {
log.debug('[UniFi] Requesting Site UUID...');
const siteUUID = await getSiteUUID().catch((err) => {
@@ -98,7 +86,7 @@ module.exports = (endpoint, method = 'GET', params = {}, data = null) => {
});
if(siteUUID) {
controller.siteUUID = siteUUID;
cache.unifi.siteUUID = siteUUID;
} else {
return;
}
@@ -110,7 +98,7 @@ module.exports = (endpoint, method = 'GET', params = {}, data = null) => {
headers: {
'User-Agent': 'unifi-voucher-site',
'Content-Type': 'application/json',
'X-API-KEY': controller.token
'X-API-KEY': variables.unifiToken
},
dispatcher: new Agent({
connect: {
@@ -124,7 +112,7 @@ module.exports = (endpoint, method = 'GET', params = {}, data = null) => {
request.body = JSON.stringify(data);
}
fetch(`https://${controller.ip}:${controller.port}/proxy/network/integration/v1/sites/${controller.siteUUID}${endpoint}?${querystring.stringify(params)}`, request)
fetch(`https://${variables.unifiIp}:${variables.unifiPort}/proxy/network/integration/v1/sites/${cache.unifi.siteUUID}${endpoint}?${querystring.stringify(params)}`, request)
.then((response) => {
return response.json();
})