From fb15c01cc2258a1c4858a6ce6039f109cdc7eacd Mon Sep 17 00:00:00 2001
From: vinay <vinaymaheshwari35@gmail.com>
Date: Tue, 16 May 2023 19:18:01 +0530
Subject: [PATCH] ADD : Broken X-Form Serving Api
---
packages/form-manager/package.json | 5 +-
packages/form-manager/src/app.controller.ts | 22 ++-
packages/form-manager/src/app.service.ts | 23 ++-
packages/form-manager/src/xform.ts | 167 ++++++++++++++++++++
4 files changed, 210 insertions(+), 7 deletions(-)
create mode 100644 packages/form-manager/src/xform.ts
diff --git a/packages/form-manager/package.json b/packages/form-manager/package.json
index 14e714e..5faecff 100644
--- a/packages/form-manager/package.json
+++ b/packages/form-manager/package.json
@@ -29,6 +29,8 @@
"cache-manager": "^4.1.0",
"cache-manager-redis-store": "^3.0.1",
"ioredis": "^5.3.1",
+ "libxmljs": "^1.0.9",
+ "localforage": "^1.10.0",
"minio": "^7.0.32",
"reflect-metadata": "^0.1.13",
"request": "^2.88.2",
@@ -38,8 +40,7 @@
"webpack": "^5.74.0",
"xml2js": "^0.4.23",
"xml2json": "^0.12.0",
- "xmldom": "^0.6.0",
- "localforage": "^1.10.0"
+ "xmldom": "^0.6.0"
},
"devDependencies": {
"@nestjs/cli": "^8.0.0",
diff --git a/packages/form-manager/src/app.controller.ts b/packages/form-manager/src/app.controller.ts
index c8d914c..861355c 100644
--- a/packages/form-manager/src/app.controller.ts
+++ b/packages/form-manager/src/app.controller.ts
@@ -41,11 +41,14 @@ type PrefillDto = {
@Controller()
export class AppController {
+ getHello(): any {
+ throw new Error('Method not implemented.');
+ }
constructor(
@Inject(CACHE_MANAGER) private cacheManager: Cache,
private readonly appService: AppService,
private configService: ConfigService,
- ) { }
+ ) {}
MINIO_ENDPOINT = this.configService.get('MINIO_ENDPOINT');
MINIO_URL = this.configService.get('MINIO_URL');
@@ -241,6 +244,15 @@ export class AppController {
return parser.toJson(xml.xml);
}
+ // form list vinay start
+
+ @Get('formlist')
+ async formList(@Query('form-id') formId: string) {
+ return await this.appService.getFormList(formId);
+ }
+
+ // form list vinay end
+
@Get('osceForm/:type/:year/:speciality?')
getOsceForm(
@Param('type') type,
@@ -275,7 +287,7 @@ export class AppController {
port: parseInt(this.configService.get('MINIO_PORT')),
useSSL: this.configService.get('MINIO_USE_SSL') === true,
accessKey: this.configService.get('MINIO_USERNAME'),
- secretKey: this.configService.get('MINIO_PASSWORD')
+ secretKey: this.configService.get('MINIO_PASSWORD'),
});
const metaData: ItemBucketMetadata = {
@@ -290,7 +302,7 @@ export class AppController {
metaData,
function (err, res) {
if (err) {
- console.log(err)
+ console.log(err);
throw new HttpException(
'Error uploading file',
HttpStatus.BAD_REQUEST,
@@ -299,7 +311,9 @@ export class AppController {
},
);
- const fileURL = `${this.MINIO_URL}/${this.configService.get('MINIO_BUCKETNAME')}/${fileName}`;
+ const fileURL = `${this.MINIO_URL}/${this.configService.get(
+ 'MINIO_BUCKETNAME',
+ )}/${fileName}`;
console.log('Uploaded File:', fileURL);
diff --git a/packages/form-manager/src/app.service.ts b/packages/form-manager/src/app.service.ts
index fa41f96..c1a120b 100644
--- a/packages/form-manager/src/app.service.ts
+++ b/packages/form-manager/src/app.service.ts
@@ -1,7 +1,9 @@
-import { ConsoleLogger, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
import { DOMParser } from 'xmldom';
import * as fs from 'fs';
import { join } from 'path';
+import Xform from './xform';
+import libxmljs from 'libxmljs';
@Injectable()
export class AppService {
@@ -308,4 +310,23 @@ export class AppService {
console.log('Update Done');
}
}
+
+ async getFormList(formId: string) {
+ const form = libxmljs.Document();
+ const formFilePath = join(__dirname, `forms/${formId}.xml`);
+ const xform = form.node('xforms');
+ xform.namespace('http://openrosa.org/xforms/xformsList');
+ let file = fs.readFileSync(formFilePath);
+ const id = formFilePath.substring(0, file.length - 4);
+ const formObject = await new Xform(id, formFilePath).getProperties(
+ formFilePath,
+ );
+ if (formObject) {
+ for (const property in formObject) {
+ xform.node(property, formObject[property]);
+ }
+ }
+
+ return [xform].toString();
+ }
}
diff --git a/packages/form-manager/src/xform.ts b/packages/form-manager/src/xform.ts
new file mode 100644
index 0000000..0bd9ba4
--- /dev/null
+++ b/packages/form-manager/src/xform.ts
@@ -0,0 +1,167 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const url = require('url');
+// const utils = require('../lib/utils');
+const libxmljs = require('libxmljs');
+// const debug = require( 'debug' )( 'Xform model' );
+
+// TODO move
+const FORMSTORAGEPATH = path.resolve(__dirname, '../../storage/forms');
+
+class Xform {
+ static node(arg0: string) {
+ throw new Error('Method not implemented.');
+ }
+ data: any;
+ doc: any;
+ namespaces: {
+ xmlns: string;
+ h: string;
+ jr: string;
+ orx: string;
+ xsd: string;
+ ev: string;
+ };
+ constructor(private readonly id: string, private readonly path: string) {}
+
+ initialize() {
+ const xform = this;
+ return new Promise(function (resolve, reject) {
+ // mimicking future async db query
+ fs.readFile(xform.path, 'utf-8', (error: any, data: any) => {
+ if (error) {
+ reject(error);
+ } else {
+ xform.data = data;
+ //that.data = '<data>dfdsa';
+ try {
+ xform.doc = libxmljs.parseXml(xform.data);
+ xform.namespaces = xform._getNamespaces();
+ //debug( 'defaultNamespace', JSON.stringify( that.defaultNamespace[ 0 ] ) );
+ resolve(true);
+ } catch (e) {
+ const err = new Error(
+ 'XML Error in form "' + xform.id + '": ' + JSON.stringify(e),
+ );
+ reject(err);
+ }
+ }
+ });
+ });
+ }
+
+ getProperties(baseUrl: any) {
+ const xform = this;
+
+ return this.initialize().then(() => {
+ const props = {
+ formID: xform._getFormId(),
+ name: xform._getName(),
+ majorMinorVersion: xform._getMajorMinorVersion(),
+ version: xform._getVersion(),
+ // hash: xform._getHash(),
+ downloadUrl: xform._getDownloadUrl(baseUrl),
+ };
+
+ return xform._getManifestUrl(baseUrl).then(function (manifestUrl: any) {
+ if (manifestUrl) {
+ props['manifestUrl'] = manifestUrl;
+ }
+ return props;
+ });
+ });
+ }
+
+ _getNamespaces() {
+ // TODO: extract these from this.doc instead
+ return {
+ xmlns: 'http://www.w3.org/2002/xforms',
+ h: 'http://www.w3.org/1999/xhtml',
+ jr: 'http://openrosa.org/javarosa',
+ orx: 'http://openrosa.org/xforms',
+ xsd: 'http://www.w3.org/2001/XMLSchema',
+ ev: 'http://www.w3.org/2001/xml-events',
+ };
+ }
+
+ _getFormId() {
+ let id = this.doc.get(
+ '//xmlns:model/xmlns:instance/node()[@id]',
+ this.namespaces,
+ );
+ if (!id) {
+ throw new Error('id attribute not found for form "' + this.id + '"');
+ }
+ // there has to be a better way to get this id and version...
+ id = id.attr('id').toString();
+ return id.substring(5, id.length - 1);
+ }
+
+ _getName() {
+ const title = this.doc.get('//h:head/h:title', this.namespaces);
+
+ if (!title) {
+ throw new Error('title element not found for form "' + this.id + '"');
+ }
+ return title.text();
+ }
+
+ _getMajorMinorVersion() {
+ return '';
+ }
+
+ _getVersion() {
+ let version = this.doc.get(
+ '//xmlns:model/xmlns:instance/node()[@version]',
+ this.namespaces,
+ );
+ if (!version) {
+ return '';
+ }
+ // there has to be a better way to get this version...
+ version = version.attr('version').toString();
+ return version.substring(10, version.length - 1);
+ }
+
+ // _getHash() {
+ // return 'md5:' + utils.md5(this.data);
+ // }
+
+ _getDescriptionText() {
+ return this._getName();
+ }
+
+ _getDescriptionUrl() {
+ return '';
+ }
+
+ _getDownloadUrl(baseUrl: any) {
+ return url.resolve(baseUrl, path.join('form', this.id, 'form.xml'));
+ }
+
+ _getManifestUrl(baseUrl: any) {
+ const xform = this;
+
+ return new Promise((resolve, reject) => {
+ fs.readdir(
+ path.join(FORMSTORAGEPATH, xform.id + '-media'),
+ (error: any, files: string | any[]) => {
+ if (error || files.length === 0) {
+ resolve(null);
+ } else {
+ resolve(
+ url.resolve(
+ baseUrl,
+ path.join('/form/', xform.id, '/manifest.xml'),
+ ),
+ );
+ }
+ },
+ );
+ });
+ }
+}
+
+export default Xform;
--
GitLab