@agung_dhewe/webapps 1.1.2 → 1.2.4

package/src/sequencerdoc.js

@@ -17,7 +17,6 @@ class Sequencer {
 	#defaultOptions = {
 		COMPANY_CODE: '00',
 		blockLength: 3,
-		clusterLength: 2,
 		numberLength: 6
 	}
 
@@ -44,24 +43,24 @@ class Sequencer {
 	}
 
 
-	async yearly(doc_id, block=0, cluster=0) {
+	async yearly(doc_id, block=0) {
 		const self = this
 		const db = self.db
 		try {
 			const { year } = await getDbCurrentDate(db)
 			const month = 0
-			return await generateId(self, year, month, doc_id, block, cluster)
+			return await generateId(self, year, month, doc_id, block)
 		} catch (err) {
 			throw err
 		}		
 	}
 
-	async monthly(doc_id, block=0, cluster=0) {
+	async monthly(doc_id, block=0) {
 		const self = this
 		const db = self.db
 		try {
 			const { year, month } = await getDbCurrentDate(db)
-			return await generateId(self, year, month, doc_id, block, cluster)
+			return await generateId(self, year, month, doc_id, block)
 		} catch (err) {
 			throw err
 		}
@@ -78,13 +77,13 @@ function isValidDigitMax(n, length) {
 }
  
 
-async function generateId(self, year, month, doc_id, block, cluster) {
+async function generateId(self, year, month, doc_id, block) {
 	const options = self.options
 	const db = self.db
 	const searchMap = {
 		seqnum: `sequencer_seqnum=\${seqnum}`,
 		block: `sequencer_block=\${block}`,
-		cluster: 'sequencer_cluster=\${cluster}',
+		seqclust: 'sequencer_cluster=\${seqclust}',
 		year: `sequencer_year=\${year}`,
 		month: `sequencer_month=\${month}`
 	};
@@ -96,30 +95,26 @@ async function generateId(self, year, month, doc_id, block, cluster) {
 			throw new Error(`block value: '${block}' is not integer`)
 		}
 
-		if (!Number.isInteger(cluster)) {
-			throw new Error(`cluster value: '${cluster}' is not integer`)
-		}
-
 		if (block<0 || !isValidDigitMax(block, options.blockLength)) {
 			throw new Error(`block value: '${block}' is invalid. max length: ${options.blockLength} `)
 		}
 
-		if (cluster<0 || !isValidDigitMax(cluster, options.clusterLength)) {
-			throw new Error(`cluster value: '${cluster}' is invalid. max length: ${options.clusterLength} `)
-		}
-
-
-
 
 		// ambil code doc
 		const docparam = { doc_id }
-		const sqldoc = `select doc_seqnum from core.doc where doc_id=\${doc_id}`
+		const sqldoc = `select doc_prefix, doc_seqclust, doc_seqnum from core.doc where doc_id=\${doc_id}`
 		const row = await db.oneOrNone(sqldoc, docparam)
+		const prefix = row!=null ? row.doc_prefix : null
+		const seqclust = row!=null ? row.doc_seqclust : 0
 		const seqnum = row!=null ? row.doc_seqnum : 0
 
 
+		if (seqclust<0 || seqclust>999) {
+			throw new Error(`doc_id: '${doc_id}' has doc seqclust '${seqclust}' that is invalid. doc seqnum have to in range 0-999 `)
+		}
+
 		if (seqnum<0 || seqnum>99) {
-			throw new Error(`doc_id: '${doc_id}' has doc seqnum '${seqnum}' that is invalid. doc seqnum have to in range 1-99 `)
+			throw new Error(`doc_id: '${doc_id}' has doc seqnum '${seqnum}' that is invalid. doc seqnum have to in range 0-99 `)
 		}
 
 
@@ -141,10 +136,6 @@ async function generateId(self, year, month, doc_id, block, cluster) {
 			nlength += self.options.blockLength
 		}
 
-		if (cluster>0) {
-			nlength += self.options.clusterLength
-		}
-
 
 		// 250901000402 0000009
 
@@ -159,15 +150,11 @@ async function generateId(self, year, month, doc_id, block, cluster) {
 
 		// ambil data sequencer
 		{
-			const criteria = { year, month, seqnum, block, cluster }
+			const criteria = { year, month, seqnum, block, seqclust }
 			if (block==null) {  
 				criteria.block = 0 
 			}
 
-			if (cluster==null) {
-				criteria.cluster = 0
-			}
-
 
 			const {whereClause, queryParams} = sqlUtil.createWhereClause(criteria, searchMap) 
 			// console.log(year, month, whereClause, queryParams)
@@ -204,7 +191,7 @@ async function generateId(self, year, month, doc_id, block, cluster) {
 				obj.sequencer_month = month
 				obj.sequencer_seqnum = seqnum
 				obj.sequencer_block = block
-				obj.sequencer_cluster = cluster
+				obj.sequencer_cluster = seqclust
 				obj.sequencer_number = 1
 				obj.sequencer_lastdate = (new Date()).toISOString()
 				obj.sequencer_remark = doc_id
@@ -221,15 +208,12 @@ async function generateId(self, year, month, doc_id, block, cluster) {
 			const tokennum = []
 			
 
-			if (options.COMPANY_CODE!='00') {
-				if (seqnum>0) {
-					tokendoc.push(doc_id)
-					tokendoc.push(options.COMPANY_CODE)
-				}
-			} else {
-				if (seqnum>0) {
-					tokendoc.push(doc_id)
-				}
+			if (prefix!=null) {
+				tokendoc.push(prefix)
+			}
+
+			if (options.COMPANY_CODE!='00' && options.COMPANY_CODE!=null) {
+				tokendoc.push(options.COMPANY_CODE)
 			}
 
 
@@ -263,14 +247,6 @@ async function generateId(self, year, month, doc_id, block, cluster) {
 				tokennum.push(codeBlock)
 			}
 
-			if (cluster>0) {
-				const codeCluster = String(cluster).padStart(self.options.clusterLength, '0')
-				tokendoc.push('.')
-				tokendoc.push(codeCluster)
-
-				tokennum.push(codeCluster)
-			}
-
 			
 			tokendoc.push('.')
 			tokendoc.push(String(obj.sequencer_number).padStart(self.options.numberLength, '0'))

package/src/sequencerline.js

@@ -63,6 +63,7 @@ async function generateId(self, year, month, doc_id, short=false) {
 	const options = self.options
 	const db = self.db
 	const searchMap = {
+		seqclust: 'sequencer_cluster=\${seqclust}',
 		seqnum: `sequencer_seqnum=\${seqnum}`,
 		year: `sequencer_year=\${year}`,
 		month: `sequencer_month=\${month}`
@@ -74,10 +75,15 @@ async function generateId(self, year, month, doc_id, short=false) {
 
 		// ambil code doc
 		const docparam = { doc_id }
-		const sqldoc = `select doc_seqnum from core.doc where doc_id=\${doc_id}`
+		const sqldoc = `select doc_prefix, doc_seqclust, doc_seqnum from core.doc where doc_id=\${doc_id}`
 		const row = await db.oneOrNone(sqldoc, docparam)
+		const prefix = row!=null ? row.doc_prefix : ''
+		const seqclust = row!=null ? row.doc_seqclust : 0
 		const seqnum = row!=null ? row.doc_seqnum : 0
 
+		if (seqclust<0 || seqclust>999) {
+			throw new Error(`doc_id: '${doc_id}' has doc seqclust '${seqclust}' that is invalid. doc seqnum have to in range 0-999 `)
+		}
 
 		if (seqnum<0 || seqnum>99) {
 			throw new Error(`doc_id: '${doc_id}' has doc seqnum '${seqnum}' that is invalid. doc seqnum have to in range 1-99 `)
@@ -110,6 +116,7 @@ async function generateId(self, year, month, doc_id, short=false) {
 				throw new Error(`Total length of sequencer (${ln}) is mre than max length allowed(9)`)
 			}
 		} else {
+
 			if (ln > MAX_LENGTH) {
 				throw new Error(`Total length of sequencer (${ln}) is mre than max length allowed(${MAX_LENGTH})`)
 			}
@@ -118,13 +125,14 @@ async function generateId(self, year, month, doc_id, short=false) {
 
 		// ambil data sequencer
 		{
-			const criteria = { year, month, seqnum }
+			const criteria = { year, month, seqnum, seqclust }
 			const {whereClause, queryParams} = sqlUtil.createWhereClause(criteria, searchMap) 
 	
 			const columns = [
 				'sequencer_id',
 				'sequencer_year',
 				'sequencer_month',
+				'sequencer_cluster',
 				'sequencer_seqnum',
 				'sequencer_number',
 				'EXTRACT(YEAR FROM sequencer_lastdate) AS lastyear',
@@ -150,6 +158,7 @@ async function generateId(self, year, month, doc_id, short=false) {
 				obj.sequencer_year = year,
 				obj.sequencer_month = month
 				obj.sequencer_seqnum = seqnum
+				obj.sequencer_cluster = seqclust
 				obj.sequencer_number = 1
 				obj.sequencer_lastdate = (new Date()).toISOString()
 				obj.sequencer_remark = doc_id
@@ -186,8 +195,11 @@ async function generateId(self, year, month, doc_id, short=false) {
 			const numlen = maxlen - idpref.length
 			tokennum.push(String(obj.sequencer_number).padStart(numlen, '0'))
 
-			const s =  tokennum.join('')
-			return s
+			const ret = {
+				id: tokennum.join(''),
+				doc: `${prefix}${tokennum.join('')}`
+			}
+			return ret
 		}
 	} catch (err) {
 		throw err

package/src/session.js

@@ -1,11 +1,13 @@
 import session from 'express-session'; // session
 import { createClient } from 'redis'; // session
 import * as connectRedis from 'connect-redis';  // session
-
+import createFileStore from 'session-file-store'
+import context from './context.js'
+import * as path from 'node:path';
 
 export async function createSession(options) {
 
-	const redisUrl = options.redisUrl || 'redis://localhost:6379'
+	const redisUrl = options.redisUrl //|| 'redis://localhost:6379'
 	const sessionName =  options.sessionName || 'sid'
 	const sessionSecret = options.sessionSecret || 'rahasia'
 	const sessionMaxAge = options.sessionMaxAge || 15 * 50 * 1000 // default 15 menit
@@ -13,35 +15,72 @@ export async function createSession(options) {
 	const sessionSecure = options.sessionSecure ?? false
 	const sessionHttpOnly = options.sessionHttpOnly ?? true
 
-	const RedisStore = connectRedis.RedisStore;
-
-
-	console.log(`connecting to redis ${redisUrl}`)
-	const redisClient = createClient({
-		url: redisUrl
-	});
-	await redisClient.connect(); 
-	console.log('connected to redis server.')
-
-	const redisStore = new RedisStore({
-		client: redisClient,
-		prefix: 'sess:',
-	});
-
-
-	const sessionConfig = {
-		name: sessionName,
-		store: redisStore,
-		secret: sessionSecret,
-		resave: false,
-		saveUninitialized: false,
-		rolling: true,
-		cookie: {
-			secure: sessionSecure,
-			httpOnly: sessionHttpOnly,
-			maxAge: sessionMaxAge,
-			domain: sessionDomain
+
+	if (redisUrl!==undefined) {
+		const RedisStore = connectRedis.RedisStore;
+
+		console.log(`connecting to redis ${redisUrl}`)
+		const redisClient = createClient({
+			url: redisUrl
+		});
+		await redisClient.connect(); 
+		console.log('connected to redis server.')
+
+		const redisStore = new RedisStore({
+			client: redisClient,
+			prefix: 'sess:',
+		});
+
+
+		const sessionConfig = {
+			name: sessionName,
+			store: redisStore,
+			secret: sessionSecret,
+			resave: false,
+			saveUninitialized: false,
+			rolling: true,
+			cookie: {
+				secure: sessionSecure,
+				httpOnly: sessionHttpOnly,
+				maxAge: sessionMaxAge,
+				domain: sessionDomain
+			}
 		}
+
+
+		console.log('starting redis session manager.')
+		return session(sessionConfig)
+
+	} else {
+
+		const __rootDirectory = context.getRootDirectory()
+		const SessionFileStore = createFileStore(session)
+
+		const fileStoreOptions = {
+			path: path.join(__rootDirectory, 'sessions'),
+			reapInterval: 3600, // dalam detik, bersihkan setiap 1 jam
+			logFn: () => {} // Bungkam semua log internal
+		}
+
+		const fileStore = new SessionFileStore(fileStoreOptions)
+
+		const sessionConfig = {
+			name: sessionName,
+			store: fileStore,
+			secret: sessionSecret,
+			resave: false,
+			saveUninitialized: false,
+			rolling: true,
+			cookie: {
+				secure: sessionSecure,
+				httpOnly: sessionHttpOnly,
+				maxAge: sessionMaxAge,
+				domain: sessionDomain
+			}
+		}
+
+		console.log('starting filebased session manager.')
+		return session(sessionConfig)
 	}
 
 	// TODO: tambahkan untuk keperluan ini
@@ -51,7 +90,4 @@ export async function createSession(options) {
 	// httpOnly: true,              // ✅ Tidak bisa diakses dari JavaScript
 	// sameSite: 'none',            // ✅ Bisa lintas domain (harus paired dengan secure)
 	// maxAge: 15 * MINUTE,	
-
-	console.log('starting session manager.')
-	return session(sessionConfig)
 }

package/src/startup.js

@@ -1,13 +1,14 @@
 
 export async function authorizeRequest(db, req) {
 	const moduleName = req.params.modulename;
-	const program_id = req.query.prog; 
+	const program_id = req.query.prog;
 
 	try {
 
 		// jika belum login
-		if (req.session.user==null) {
-			const err = new Error(`Belum login. Anda harus <a href="login">login</a> dulu untuk mengakses resource ini`)
+		if (req.session.user == null) {
+			const nextUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`;
+			const err = new Error(`Belum login. Anda harus <a href="login?nexturl=${nextUrl}">login</a> dulu untuk mengakses resource ini`)
 			err.status = 401
 			err.code = 401
 			throw err
@@ -20,15 +21,15 @@ export async function authorizeRequest(db, req) {
 
 		// jika punya akses developer boleh buka semuanya
 		const sqlUser = 'select * from core.user where user_id=${user_id} and user_isdev=true'
-		const rowUser = await db.oneOrNone(sqlUser, {user_id})
-		if (rowUser!=null) {
+		const rowUser = await db.oneOrNone(sqlUser, { user_id })
+		if (rowUser != null) {
 			return true  // user adalah developer
 		}
 
 		// jika tidak punya akses developer, cek apakah boleh buka program 
 		const sql = 'select * from core.get_user_programs(${user_id}) where id=${program_id}'
-		const row = await db.oneOrNone(sql, {user_id, program_id});
-		if (row!=null) {
+		const row = await db.oneOrNone(sql, { user_id, program_id });
+		if (row != null) {
 			return true  // user punya akses program
 		}
 
@@ -37,23 +38,59 @@ export async function authorizeRequest(db, req) {
 		err.code = 401
 		throw err
 
-	} catch(err) {
+	} catch (err) {
 		throw err
 	}
 }
 
-export async function getApplicationSetting(db) {
+export async function getApplicationSetting(db, tablename = 'core.setting') {
 	const setting = {}
 	try {
-		const sql = 'select setting_id, setting_value from core.setting'
+		const sql = `select setting_id, setting_value from ${tablename}`
 		const rows = await db.any(sql);
 		for (var row of rows) {
 			const setting_id = row.setting_id
 			const setting_value = row.setting_value
 			setting[setting_id] = setting_value
 		}
+
+		setting.SETTING_TABLE_NAME = tablename
 		return setting
 	} catch (err) {
 		throw err
 	}
 }
+
+
+export async function requireSetting(db, setting, setting_id, descr) {
+	if (setting[setting_id] !== undefined) {
+		// setting sudah ada
+		return true
+	} else {
+		const tablename = setting.SETTING_TABLE_NAME
+		const unset = '*** unset ***'
+
+		// cek di database
+		const sqlCek = `select setting_value from ${tablename} where setting_id=\${setting_id}`
+		const rowCek = await db.oneOrNone(sqlCek, { setting_id })
+		if (rowCek == null) {
+			throw new Error(`setting '${setting_id}' tidak ditemukan di data setting ${tablename}`)
+		}
+
+		const value = rowCek.setting_value
+		if (value == unset) {
+			throw new Error(`setting '${setting_id}' belum di set`)
+		}
+
+		// buat dulu di database
+		const sql = `
+			insert into ${tablename}
+			(setting_id, setting_value, setting_descr, _createby)
+			values
+			(\${setting_id}, \${defaultValue}, \${descr}, '240100000')`
+		await db.none(sql, { setting_id, defaultValue: unset, descr })
+
+		throw new Error(`setting ${setting_id} belum diisi di ${tablename}\n`)
+	}
+
+}

package/src/webapps.js

@@ -8,6 +8,10 @@ import cors from 'cors';
 import favicon from 'serve-favicon';
 import * as path from 'node:path';
 import * as helper from './helper.js'
+import http from 'http'
+import https from 'https'
+import fs from 'fs'
+import { execSync } from 'node:child_process';
 
 
 const __filename = fileURLToPath(import.meta.url);
@@ -51,11 +55,11 @@ export default class WebApplication {
 	get defaultSessionSecure() { return defaultSessionSecure }
 	get defaultSessionHttpOnly() { return defaultSessionHttpOnly }
 
-	get express() { return this.#express}
+	get express() { return this.#express }
 
 	#__rootDirectory
 	get __rootDirectory() { return this.#__rootDirectory }
-	setRootDirectory(v) { 
+	setRootDirectory(v) {
 		this.#__rootDirectory = v
 	}
 
@@ -69,8 +73,9 @@ export default class WebApplication {
 			throw new Error('__rootDirectory belum didefinisikan')
 		}
 
-		context.setRootDirectory(this.__rootDirectory)	
+		context.setRootDirectory(this.__rootDirectory)
 		context.setFnParseModuleRequest(options.fnParseModuleRequest)
+		context.alwaysLoadApi(!options.disableApiCache)
 
 		if (this.#startedOnce) {
 			throw new Error('start already called!')
@@ -81,7 +86,7 @@ export default class WebApplication {
 		main(this, options)
 	}
 
-	
+
 }
 
 
@@ -120,7 +125,7 @@ async function main(self, options) {
 	const port = options.port ?? self.defaultPort
 	const startingMessage = options.startingMessage ?? `Starting webserver on port \x1b[1;33m${port}\x1b[0m`
 	const appConfig = options.appConfig || createDefaultAppConfig()
-	
+
 	const basicRouter = createBasicRouter()
 	const extendedRouter = options.router || ExpressServer.Router({ mergeParams: true });
 	const router = ExpressServer.Router({ mergeParams: true });
@@ -160,9 +165,10 @@ async function main(self, options) {
 	]);
 
 	// setup cors
-	if (options.allowedOrigins!=null) {
+	if (options.allowedOrigins != null) {
 		const allowedOrigins = options.allowedOrigins
 		app.use(cors({
+			credentials: true,
 			origin: function (origin, callback) {
 				if (!origin) return callback(null, true); // untuk server-side atau curl
 				const isAllowed = allowedOrigins.some(o => {
@@ -196,28 +202,33 @@ async function main(self, options) {
 
 	// framework ini menggunakan library fgta5 untuk ui di client
 	if (appConfig.fgta5jsDebugMode) {
-		app.use('/public/libs/fgta5js', ExpressServer.static(path.join(__dirname, '..', 'libs', 'fgta5js')));
+		app.use('/public/lib/fgta5js', ExpressServer.static(path.join(__dirname, '..', 'lib', 'fgta5js')));
 	} else {
-		app.use('/public/libs/fgta5js', ExpressServer.static(path.join(__dirname, '..', 'libs', 'fgta5js-dist')));
+		app.use('/public/lib/fgta5js', ExpressServer.static(path.join(__dirname, '..', 'lib', 'fgta5js-dist')));
 	}
-	
-	app.use('/public/libs/webmodule', ExpressServer.static(path.join(__dirname, '..', 'libs', 'webmodule')));
-	
+
+	app.use('/public/lib/webmodule', ExpressServer.static(path.join(__dirname, '..', 'lib', 'webmodule')));
+
 	// Routing /public  untuk serve halaman-halaman static
 	app.use('/public', rejectEjsFiles);
 	app.use('/public', ExpressServer.static(path.join(__rootDirectory, 'public')));
 	app.use('/', router)
 	app.use(handleModuleNotfound)
-	
 
-	const server = app.listen(port, ()=>{
-		console.log('\n\n' + startingMessage);
-	});
+
+	// const server = app.listen(port, ()=>{
+	// 	console.log('\n\n' + startingMessage);
+	// });
+
+	// Buat server
+	const server = createApplicationServer(app, port, startingMessage, appConfig)
+
 
 	// Tangani event 'error' pada objek server
 	server.on('error', (err) => {
 		if (err.code === 'EADDRINUSE') {
-			console.error(`\n\x1b[31mError!\x1b[0m\nPort ${port} sudah digunakan. Silakan coba port lain.\n`);
+			const pid = getPidByPort(port)
+			console.error(`\n\x1b[31mError!\x1b[0m\nPort ${port} sudah digunakan pid ${pid}. Silakan coba port lain.\nCurrent pid: ${process.pid}\n`);
 		} else {
 			console.error('\n\x1b[31mError!\x1b[0m\nTerjadi kesalahan saat memulai server:', err, "\n");
 		}
@@ -227,8 +238,29 @@ async function main(self, options) {
 }
 
 
+function createApplicationServer(app, port, startingMessage, appConfig) {
+	const useSSL = appConfig.useSSL
+	const sslKey = appConfig.sslKey
+	const sslCertificate = appConfig.sslCertificate
+
+	if (useSSL) {
+		const sslOptions = {
+			key: fs.readFileSync(sslKey), // path ke private key
+			cert: fs.readFileSync(sslCertificate)     // path ke sertifikat
+		};
+
+		return https.createServer(sslOptions, app).listen(port, () => {
+			console.log('\n\n' + startingMessage + ' (https)');
+		});
+	} else {
+		return http.createServer({}, app).listen(port, () => {
+			console.log('\n\n' + startingMessage);
+		});
+	}
+}
+
 function rejectEjsFiles(req, res, next) {
-	const excludedExtensions = ['.ejs']; 
+	const excludedExtensions = ['.ejs'];
 	const ext = path.extname(req.url);
 
 	if (excludedExtensions.includes(ext)) {
@@ -236,4 +268,16 @@ function rejectEjsFiles(req, res, next) {
 	}
 
 	next();
-}
+}
+
+
+function getPidByPort(port) {
+	try {
+		// Menggunakan lsof untuk mendapatkan PID saja (-t)
+		const pid = execSync(`lsof -t -i:${port}`).toString().trim();
+		return pid ? parseInt(pid) : null;
+	} catch (error) {
+		// Jika tidak ada proses di port tersebut, lsof mengembalikan error code non-zero
+		return null;
+	}
+};

package/templates/_lib_debug.ejs

@@ -1,11 +1,11 @@
 
 			<!-- Component -->
-			<script type="module" src="public/libs/fgta5js/src/main.mjs"></script>
-			<link rel="stylesheet" href="public/libs/fgta5js/styles/fgta5js-root.css" />
-			<link rel="stylesheet" href="public/libs/fgta5js/styles/fgta5js-messagebox.css" />
-			<link rel="stylesheet" href="public/libs/fgta5js/styles/fgta5js-modal.css" />
-			<link rel="stylesheet" href="public/libs/fgta5js/styles/fgta5js-entry.css" />
-			<link rel="stylesheet" href="public/libs/fgta5js/styles/fgta5js-checkbox.css" />
-			<link rel="stylesheet" href="public/libs/fgta5js/styles/fgta5js-gridview.css" />
-			<link rel="stylesheet" href="public/libs/fgta5js/styles/fgta5js-appmanager.css" />
+			<script type="module" src="public/lib/fgta5js/src/main.mjs"></script>
+			<link rel="stylesheet" href="public/lib/fgta5js/styles/fgta5js-root.css" />
+			<link rel="stylesheet" href="public/lib/fgta5js/styles/fgta5js-messagebox.css" />
+			<link rel="stylesheet" href="public/lib/fgta5js/styles/fgta5js-modal.css" />
+			<link rel="stylesheet" href="public/lib/fgta5js/styles/fgta5js-entry.css" />
+			<link rel="stylesheet" href="public/lib/fgta5js/styles/fgta5js-checkbox.css" />
+			<link rel="stylesheet" href="public/lib/fgta5js/styles/fgta5js-gridview.css" />
+			<link rel="stylesheet" href="public/lib/fgta5js/styles/fgta5js-appmanager.css" />
 

package/templates/_lib_production.ejs

@@ -1,5 +1,5 @@
 
 			<!-- Component -->
-			<script src="public/libs/fgta5js/fgta5js-<%=fgta5jsVersion%>.min.js"></script>
-			<link rel="stylesheet" href="public/libs/fgta5js/fgta5js-<%=fgta5jsVersion%>.min.css" /> 
+			<script src="public/lib/fgta5js/fgta5js-<%=fgta5jsVersion%>.min.js"></script>
+			<link rel="stylesheet" href="public/lib/fgta5js/fgta5js-<%=fgta5jsVersion%>.min.css" />