@agung_dhewe/webapps 1.1.2 → 1.2.4

package/src/generator/worker.js

@@ -29,19 +29,22 @@ import { createInfoLogs } from './createInfoLogs.js';
 import { createInfoRecordExtender } from './createInfoRecordExtender.js';
 import { createIcon } from './createIcon.js'
 import { createProgramData } from './createProgramData.js'
+import { createLayoutCss } from './createLayoutCss.js';
 
 
 
-const { generator_id, user_id, user_name, ipaddress, jeda } = workerData;
+const { generator_id, user_id, user_name, ipaddress, ModuleDbContract, jeda } = workerData;
 
 
 main(generator_id)
 
 
 async function main(id) {
+	const tablename = ModuleDbContract.generator.table
+
 	try {
-		const queryParams = {generator_id: id}
-		const sql = 'select generator_data from core."generator" where generator_id = \${generator_id}'
+		const queryParams = { generator_id: id }
+		const sql = `select generator_data from ${tablename} where generator_id = \${generator_id}`
 		const data = await db.one(sql, queryParams);
 
 
@@ -50,8 +53,8 @@ async function main(id) {
 
 
 		await generate(id, data.generator_data)
-		
-		
+
+
 	} catch (err) {
 		err.message = `Generator Worker: ${err.message}`
 		throw err
@@ -59,14 +62,14 @@ async function main(id) {
 }
 
 async function sleep(s) {
-	if (s==0) {
+	if (s == 0) {
 		return
 	}
 
-	return new Promise(lanjut=>{
-		setTimeout(()=>{
+	return new Promise(lanjut => {
+		setTimeout(() => {
 			lanjut()
-		}, s*1000)	
+		}, s * 1000)
 	})
 }
 
@@ -87,9 +90,9 @@ async function generate(id, data) {
 
 
 	const context = {
-		id:id,
+		id: id,
 		user_id: user_id,
-		user_name: user_name, 
+		user_name: user_name,
 		ipaddress: ipaddress,
 		title: data.title,
 		descr: data.description,
@@ -97,6 +100,7 @@ async function generate(id, data) {
 		appname: data.appname,
 		moduleName: data.name,
 		entities: data.entities,
+		actions: data.actions,
 		icon: data.icon,
 		timeGenerated: formattedTime,
 		postMessage: (info) => {
@@ -115,7 +119,7 @@ async function generate(id, data) {
 	const headerItems = entityHeader.Items
 	for (var entityName in context.entities) {
 		// tambahkan jika bukan header
-		if (entityName!='header') {
+		if (entityName != 'header') {
 			const headerPK = structuredClone(headerItems[headerPkFieldName])
 			headerPK.Reference.pk = entityHeader.pk
 			headerPK.Reference.table = entityHeader.table
@@ -132,98 +136,103 @@ async function generate(id, data) {
 		// process.exit(0)
 
 
-		await prepareDirectory(context, {overwrite:true})
+		await prepareDirectory(context, { overwrite: true })
 		await sleep(jedaWaktu)
 
 
-		
-		const iconFileName = await createIcon(context, {overwrite:true})
 
-		await createProgramData(context, {iconFileName})
-	
-		await createTable(context, {overwrite:true})
-		await sleep(jedaWaktu)
-		
-		await createApiModule(context, {overwrite:true})
+		const iconFileName = await createIcon(context, { overwrite: true })
+
+		await createProgramData(context, { iconFileName })
+
+		await createTable(context, { overwrite: true })
 		await sleep(jedaWaktu)
 
 
-		
-		await createModuleRollup(context, {overwrite:true})
+
+		await createModuleRollup(context, { overwrite: true })
 		await sleep(jedaWaktu)
 
-		await createModuleContext(context, {overwrite:true})
+		await createModuleContext(context, { overwrite: true })
 		await sleep(jedaWaktu)
 
-		
 
-		await createModuleEjs(context, {overwrite:true})
+
+		await createModuleEjs(context, { overwrite: true })
 		await sleep(jedaWaktu)
 
-		
-		await createModuleMjs(context, {overwrite:true, iconFileName})
+
+		await createModuleMjs(context, { overwrite: true, iconFileName })
 		await sleep(jedaWaktu)
 
 
 
 		// Header
-		await createModuleHeaderListHtml(context, {overwrite:true})
+		await createModuleHeaderListHtml(context, { overwrite: true })
 		await sleep(jedaWaktu)
-		
 
-		await createModuleHeaderListMjs(context, {overwrite:true})
+
+		await createModuleHeaderListMjs(context, { overwrite: true })
 		await sleep(jedaWaktu)
 
-		
-		await createModuleHeaderEditHtml(context,  {overwrite:true})
+
+		await createModuleHeaderEditHtml(context, { overwrite: true })
 		await sleep(jedaWaktu)
 
-		
-		await createModuleHeaderEditMjs(context, {overwrite:true})
+
+		await createModuleHeaderEditMjs(context, { overwrite: true })
 		await sleep(jedaWaktu)
-	
 
-		
+
+
 		// Detils
-		await createModuleDetilListHtml(context, {overwrite:true})
+		await createModuleDetilListHtml(context, { overwrite: true })
 		await sleep(jedaWaktu)
 
-		await createModuleDetilListMjs(context, {overwrite:true})
+		await createModuleDetilListMjs(context, { overwrite: true })
 		await sleep(jedaWaktu)
 
 
-		await createModuleDetilEditHtml(context, {overwrite:true})
+		await createModuleDetilEditHtml(context, { overwrite: true })
 		await sleep(jedaWaktu)
-		
-		await createModuleDetilEditMjs(context, {overwrite:true})
+
+		await createModuleDetilEditMjs(context, { overwrite: true })
 		await sleep(jedaWaktu)
-		
 
-		await createInfoLogs(context, {overwrite:true})
+
+		await createInfoLogs(context, { overwrite: true })
 		await sleep(jedaWaktu)
 
 
 		// Extender
-		await createApiExtenderModule(context, {overwrite:false})
+		await createModuleExtenderHtml(context, { overwrite: false })
 		await sleep(jedaWaktu)
 
-		await createModuleExtenderHtml(context, {overwrite:false})
+		await createModuleExtenderMjs(context, { overwrite: false })
 		await sleep(jedaWaktu)
 
-		await createModuleExtenderMjs(context, {overwrite:false})
+		await createInfoAboutExtender(context, { overwrite: false })
 		await sleep(jedaWaktu)
 
-		await createInfoAboutExtender(context, {overwrite:false})
+		await createInfoRecordExtender(context, { overwrite: false })
 		await sleep(jedaWaktu)
 
-		await createInfoRecordExtender(context, {overwrite:false})
+
+		// Layout CSS
+		await createLayoutCss(context, { overwrite: true })
 		await sleep(jedaWaktu)
-		
-	
 
 
+		// Api
+
+		await createApiExtenderModule(context, { overwrite: false })
+		await createApiModule(context, { overwrite: true })
+
+		context.postMessage({ message: `restarting service` })
+		await sleep(1)
+
 		// Selesai
-		context.postMessage({message: `finish`, done:true})
+		context.postMessage({ message: `finish`, done: true })
 	} catch (err) {
 		throw err
 	}
@@ -237,7 +246,7 @@ async function prepareDirectory(context) {
 
 	try {
 
-		context.postMessage({message: `preparing directory`})
+		context.postMessage({ message: `preparing directory` })
 		// await sleep(1)
 
 		// cek jika directory project exists
@@ -250,20 +259,20 @@ async function prepareDirectory(context) {
 		const apiDir = path.join(directory, 'src', 'apis')
 		const apiExtenderDir = path.join(apiDir, 'extenders')
 
-		const moduleDirExists =  await directoryExists(moduleDir)
+		const moduleDirExists = await directoryExists(moduleDir)
 		if (!moduleDirExists) {
 			// direktori modul tidak ditemukan, buat dulu
-			context.postMessage({message: `creating new directory: '${moduleDir}`})
+			context.postMessage({ message: `creating new directory: '${moduleDir}` })
 			await mkdir(moduleDir, {});
 			// await sleep(1)
 		}
 
-		const apiDirExists =  await directoryExists(apiDir)
+		const apiDirExists = await directoryExists(apiDir)
 		if (!apiDirExists) {
 			throw new Error(`directory tujuan '${apiDir}' tidak ditemukan`)
 		}
 
-		const apiExtenderDirExists =  await directoryExists(apiExtenderDir)
+		const apiExtenderDirExists = await directoryExists(apiExtenderDir)
 		if (!apiExtenderDirExists) {
 			throw new Error(`directory tujuan '${apiExtenderDir}' tidak ditemukan`)
 		}
@@ -276,7 +285,7 @@ async function prepareDirectory(context) {
 			console.log("\n\n\x1b[1m\x1b[31mERROR\x1b[0m")
 			console.log('Module sudah di lock, tidak bisa digenerate ulang')
 			process.exit(1)
-		}  
+		}
 
 
 		context.moduleDir = moduleDir
@@ -312,7 +321,7 @@ async function checkEntitiy(context) {
 
 
 	// cek appname
-	if (apps[context.appname]==null) {
+	if (apps[context.appname] == null) {
 		throw new Error(`App Name: '${context.appname}' tidak valid. Cek di data apps`)
 	}
 
@@ -324,15 +333,15 @@ async function checkEntitiy(context) {
 		const entity_table = entity.table
 		const entity_pk = entity.pk
 		const Items = entity.Items
-		
-		let pkExists = false	
+
+		let pkExists = false
 
 		for (let fieldName in Items) {
 			const item = Items[fieldName]
 			const component = item.component
 
 			// Cek Primary Key
-			if (fieldName==entity_pk) {
+			if (fieldName == entity_pk) {
 				pkExists = true
 				if (!item.showInForm) {
 					throw new Error(`Primary key '${fieldName}' pada entity '${entityName}' harus di embed di form. Apabila ingin menyembunyakannya, gunakan 'hidden' di Container CSS `)
@@ -340,7 +349,7 @@ async function checkEntitiy(context) {
 			}
 
 			// Cek combobox
-			if (component=='Combobox') {
+			if (component == 'Combobox') {
 				// cek apakah konfig udah bener
 				const reference = item.Reference
 				const table = reference.table.trim()
@@ -350,31 +359,33 @@ async function checkEntitiy(context) {
 				const loaderApiModule = reference.loaderApiModule.trim()
 				const loaderApiPath = reference.loaderApiPath.trim()
 
-				if(table=='') {
+				if (table == '') {
 					throw new Error(`table reference Combobox '${fieldName}' di entity '${entityName}' tidak boleh kosong`)
 				}
 
-				if(pk=='') {
+				if (pk == '') {
 					throw new Error(`PK untuk table reference Combobox '${fieldName}' di entity '${entityName}' tidak boleh kosong`)
 				}
-				
-				if(bindingValue=='') {
+
+				if (bindingValue == '') {
 					throw new Error(`binding value untuk table reference Combobox '${fieldName}' di entity '${entityName}' tidak boleh kosong`)
 				}
 
-				if(bindingText=='') {
+				if (bindingText == '') {
 					throw new Error(`binding value untuk table reference Combobox '${fieldName}' di entity '${entityName}' tidak boleh kosong`)
 				}
 
-				if(loaderApiModule=='') {
+				if (loaderApiModule == '') {
 					throw new Error(`loader API Name untuk table reference Combobox '${fieldName}' di entity '${entityName}' tidak boleh kosong`)
 				}
 
-				if (apps[loaderApiModule]==null) {
-					throw new Error(`loader API Name: '${loaderApiModule}' untuk table reference Combobox '${fieldName}' di entity '${entityName}' tidak valid. Cek di data apps`)
+				if (apps[loaderApiModule] == null) {
+					if (loaderApiModule != '/') {
+						throw new Error(`loader API Name: '${loaderApiModule}' untuk table reference Combobox '${fieldName}' di entity '${entityName}' tidak valid. Cek di data apps`)
+					}
 				}
 
-				if(loaderApiPath=='') {
+				if (loaderApiPath == '') {
 					throw new Error(`loader API path untuk table reference Combobox '${fieldName}' di entity '${entityName}' tidak boleh kosong`)
 				}
 			}

package/src/helper.js

@@ -6,21 +6,20 @@ import context from './context.js'
 
 
 export function kebabToCamel(str) {
-  return str
-    .split('-')
-    .map((part, index) =>
-      index === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)
-    )
-    .join('');
+	return str
+		.split('-')
+		.map((part, index) =>
+			index === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)
+		)
+		.join('');
 }
 
 
-export async function importApiModule(modulename, options={}) {
+export async function importApiModule(modulename, options = {}) {
 	// jika mode debug, 
 	// load api akan selalu dilakukan saat request (tanpa caching)
 
-
-	const cached = options.cached===true ? true : false
+	const cached = context.isApiCached()
 	const apiDir = options.apiDir || path.join('.', 'apis')
 	const apiPath = path.join(apiDir, `${modulename}.api.js`)
 
@@ -32,11 +31,11 @@ export async function importApiModule(modulename, options={}) {
 		const freshUrl = `${fullPath}?v=${mtime}`;
 		const module = await import(freshUrl);
 
-		if (module.default===undefined) {
+		if (module.default === undefined) {
 			throw new Error(`modul api '${modulename}' tidak mempunyai default class untuk import`)
 		}
 
-		return module.default;	
+		return module.default;
 	}
 }
 
@@ -52,8 +51,8 @@ export async function isFileExists(filepath) {
 	}
 }
 
-export async function parseTemplate(tplFilePath, variables={}) {
-	const template =  await fs.readFile(tplFilePath, 'utf-8');
+export async function parseTemplate(tplFilePath, variables = {}) {
+	const template = await fs.readFile(tplFilePath, 'utf-8');
 	const content = ejs.render(template, variables)
 	return content
 }

package/src/logger.js

@@ -6,25 +6,25 @@ export default new (class {
 		console.log('logger access', modulename, url, errormessage)
 	}
 
-	
+
 	async log(logdata) {
-		const { id, user_id, user_name, moduleName, action, tablename, executionTimeMs, remark, metadata, ipaddress=''} = logdata
-		const sql = `insert into datalog 
+		const { id, user_id, user_name, moduleName, action, tablename, executionTimeMs, remark, metadata, ipaddress = '' } = logdata
+		const sql = `insert into log."datalog" 
 			(log_time, log_user_id, log_user_name, log_action, log_ipaddress, log_module, log_table, log_doc_id, log_remark, log_executiontime, log_metadata)
 			values
 			(now(), \${log_user_id}, \${log_user_name}, \${log_action}, \${log_ipaddress}, \${log_module}, \${log_table}, \${log_doc_id}, \${log_remark}, \${log_executiontime}, \${log_metadata})
 			RETURNING log_time
 			`
 		const variable = {
-			log_user_id: user_id, 
-			log_user_name: user_name, 
-			log_action: action,  
-			log_ipaddress: ipaddress, 
-			log_module: moduleName, 
-			log_table: tablename, 
-			log_doc_id: id, 
-			log_remark: remark, 
-			log_executiontime: executionTimeMs, 
+			log_user_id: user_id,
+			log_user_name: user_name,
+			log_action: action,
+			log_ipaddress: ipaddress,
+			log_module: moduleName,
+			log_table: tablename,
+			log_doc_id: id,
+			log_remark: remark,
+			log_executiontime: executionTimeMs,
 			log_metadata: metadata
 		}
 

package/src/notifier.js

@@ -0,0 +1,29 @@
+
+
+export default async function notifyClient(notifierServer, clientId, status, info) {
+	try {
+
+		const method = 'POST'
+		const data = { clientId, status, info }
+		const url = `${notifierServer}/notify`
+		const response = await fetch(url, {
+			method: method,
+			headers: {
+				'Content-Type': 'application/json',
+			},
+			body: JSON.stringify(data)
+		});
+
+		if (!response.ok) {
+			const httpErrorStatus = response.status
+			const httpErrorStatustext = response.statusText
+			const err = new Error(`${httpErrorStatus} ${httpErrorStatustext}: ${method} ${url}`)
+			err.code = httpErrorStatus
+			throw err
+		}
+
+		return response
+	} catch (err) {
+		throw err
+	}
+}

package/src/routers/generatorApi.js

@@ -1,16 +1,22 @@
+import context from './../context.js'
 import * as helper from './../helper.js'
 import { handleError } from './handleError.js'
+import * as path from 'path'
+
 
 export async function generatorApi(req, res, next) {
 	// res.status(200).send(`{"code":"1", "message":"api not implemented"}`)
 	const moduleName = 'generator'
 	const methodName = req.params.method
-	
+	const options = {
+		apiDir: path.join(context.getWebappsDirectory(), 'src', 'apis')
+	}
+
 	try {
 
-		const ModuleClass = await helper.importApiModule(moduleName)
+		const ModuleClass = await helper.importApiModule(moduleName, options)
 		const method = helper.kebabToCamel(methodName);
-		if (ModuleClass===undefined) {
+		if (ModuleClass === undefined) {
 			throw new Error(`invalid module: '${moduleName}'`)
 		}
 

package/src/routers/generatorPage.js

@@ -13,6 +13,7 @@ export async function generatorPage(req, res, next) {
 		const generatorListPath = path.join(__dirname, 'modules', 'generator', 'generatorList.html')
 		const generatorEditPath = path.join(__dirname, 'modules', 'generator', 'generatorEdit.html')
 		const generatorDesignPath = path.join(__dirname, 'modules', 'generator', 'generator-designtemplate.html')
+		const generatorModulePath = path.join(__dirname, 'modules', 'generator')
 
 		// load halaman html-nya
 		const variables	= {
@@ -20,7 +21,8 @@ export async function generatorPage(req, res, next) {
 			...{
 				generatorListPath,
 				generatorEditPath,
-				generatorDesignPath
+				generatorDesignPath,
+				generatorModulePath
 			}
 		}
 

package/src/routers/moduleApi.js

@@ -15,7 +15,7 @@ export async function moduleApi(req, res, next) {
 
 		const ModuleClass = await helper.importApiModule(moduleName, options)
 		const method = helper.kebabToCamel(methodName);
-		if (ModuleClass===undefined) {
+		if (ModuleClass === undefined) {
 			throw new Error(`invalid module: '${moduleName}'`)
 		}
 

package/src/routers/modulePage.js

@@ -24,25 +24,39 @@ export async function modulePage(req, res) {
 	const moduleDir = path.join(__rootDir, 'public', 'modules', moduleName)
 	const ejsPath = path.join(__rootDir, 'public', 'modules', moduleName, `${moduleName}.ejs`)
 	const cssPath = path.join(__rootDir, 'public', 'modules', moduleName, `${moduleName}.css`);
+	const cssLayoutPath = path.join(__rootDir, 'public', 'modules', moduleName, `${moduleName}.layout.css`);
+	const cssApplicationPath = path.join(__rootDir, 'public', 'local', 'application.css');
+
+
+	const variance = req.query.variance;
+	const id = req.query.id;
 
 
 	// const mjsFileName = appDebugMode ? `${moduleName}.mjs` : `${moduleName}.min.mjs`
+	let useCssBundle
+	let cssBundleFileName
 	let mjsFileName
 	if (appDebugMode) {
 		// Default Debug
-		if (req.query.mode=='release') {
+		if (req.query.mode == 'release') {
 			const version = await getCurrentVersion(path.join(__rootDir, 'public', 'modules', moduleName, 'version.txt'))
 			mjsFileName = `${moduleName}-${version}.min.mjs`
+			cssBundleFileName = `${moduleName}-${version}.min.css`
+			useCssBundle = true
 		} else {
 			mjsFileName = `${moduleName}.mjs`
+			useCssBundle = false
 		}
 	} else {
 		// Default Production
-		if (req.query.mode=='debug') {
+		if (req.query.mode == 'debug') {
 			mjsFileName = `${moduleName}.mjs`
+			useCssBundle = false
 		} else {
 			const version = await getCurrentVersion(path.join(__rootDir, 'public', 'modules', moduleName, 'version.txt'))
 			mjsFileName = `${moduleName}-${version}.min.mjs`
+			cssBundleFileName = `${moduleName}-${version}.min.css`
+			useCssBundle = true
 		}
 	}
 	const mjsPath = path.join(__rootDir, 'public', 'modules', moduleName, mjsFileName);
@@ -51,24 +65,33 @@ export async function modulePage(req, res) {
 	const htmlExtenderFile = `${moduleName}-ext.html`
 	const htmlExtenderPath = path.join(__rootDir, 'public', 'modules', moduleName, htmlExtenderFile)
 
+	const iconFileName = `${moduleName}.svg`
+	const iconFilePath = path.join(__rootDir, 'public', 'modules', moduleName, iconFileName)
 
+	const cssLayoutExists = await helper.isFileExists(cssLayoutPath)
 	const cssExists = await helper.isFileExists(cssPath)
 	const mjsExists = await helper.isFileExists(mjsPath);
 	const htmlExtenderExists = await helper.isFileExists(htmlExtenderPath);
+	const iconFileExists = await helper.isFileExists(iconFilePath);
+
+	const cssApplicationExists = await helper.isFileExists(cssApplicationPath);
 
 	const mjsPrerenderPath = path.join(__rootDir, 'public', 'modules', moduleName, `${moduleName}-prerender.mjs`);
 	const mjsPrerenderExists = await helper.isFileExists(mjsPrerenderPath)
 
 
-	const ejsModuleExist = await helper.isFileExists(ejsPath) 
+	const ejsModuleExist = await helper.isFileExists(ejsPath)
+
+	const additionalHeaderPath = path.join(__rootDir, 'public', 'modules', moduleName, `_htmlheader.ejs`);
+	const additionalHeaderExists = await helper.isFileExists(additionalHeaderPath)
 
 	try {
 
 		// coba cek request halaman
 		const fnParseModuleRequest = context.getFnParseModuleRequest()
-		if (typeof fnParseModuleRequest==='function') {
+		if (typeof fnParseModuleRequest === 'function') {
 			await fnParseModuleRequest(req, res)
-		}		
+		}
 
 
 		// load halaman html-nya
@@ -77,18 +100,30 @@ export async function modulePage(req, res) {
 			err.status = 404
 			throw err
 		}
-		
-		const variables	= {
+
+		const variables = {
 			...helper.createDefaultEjsVariable(req),
 			...{
+				id,
+				variance,
 				moduleDir,
 				ejsPath,
 				mjsPrerenderExists,
+				cssLayoutExists,
 				cssExists,
 				mjsExists,
 				mjsFileName,
 				htmlExtenderExists,
 				htmlExtenderPath,
+				iconFileName,
+				iconFileExists,
+				additionalHeaderPath,
+				additionalHeaderExists,
+				cssApplicationPath,
+				cssApplicationExists,
+				setting: req.app.locals.appConfig,
+				useCssBundle,
+				cssBundleFileName,
 			}
 		}