Compare commits
No commits in common. "53b592476714c64301125997fe473a2ad9645211" and "00198b819950af10ec967024a069c47aa8d252b6" have entirely different histories.
53b5924767
...
00198b8199
@ -23,7 +23,6 @@ export class SocketManager {
|
||||
// Create Socket.IO server - CORS applies to HTTP long-polling transport
|
||||
const allowedOrigins = config.server.corsOrigins || ['*'];
|
||||
const io = new Server(server, {
|
||||
maxHttpBufferSize: 1e8,
|
||||
cors: {
|
||||
origin: (origin, callback) => {
|
||||
// Allow requests with no origin (e.g. same-origin, Postman, native apps)
|
||||
|
||||
@ -306,41 +306,23 @@ export class SocketUser {
|
||||
}
|
||||
|
||||
async handlePreviewTemplateEvent(data, callback) {
|
||||
try {
|
||||
const result = await this.templateManager.renderTemplate(
|
||||
data._id,
|
||||
data.content,
|
||||
data.testObject,
|
||||
data.scale
|
||||
);
|
||||
if (typeof callback === 'function') {
|
||||
callback(result);
|
||||
}
|
||||
} catch (err) {
|
||||
logger.error('Preview template event error:', err);
|
||||
if (typeof callback === 'function') {
|
||||
callback({ error: err.message });
|
||||
}
|
||||
}
|
||||
const result = await this.templateManager.renderTemplate(
|
||||
data._id,
|
||||
data.content,
|
||||
data.testObject,
|
||||
data.scale
|
||||
);
|
||||
callback(result);
|
||||
}
|
||||
|
||||
async handleRenderTemplatePDFEvent(data, callback) {
|
||||
try {
|
||||
const result = await this.templateManager.renderPDF(
|
||||
data._id,
|
||||
data.content,
|
||||
data.object,
|
||||
1
|
||||
);
|
||||
if (typeof callback === 'function') {
|
||||
callback(result);
|
||||
}
|
||||
} catch (err) {
|
||||
logger.error('Render template PDF event error:', err);
|
||||
if (typeof callback === 'function') {
|
||||
callback({ error: err.message });
|
||||
}
|
||||
}
|
||||
const result = await this.templateManager.renderPDF(
|
||||
data._id,
|
||||
data.content,
|
||||
data.object,
|
||||
1
|
||||
);
|
||||
callback(result);
|
||||
}
|
||||
async handleGenerateHostOtpEvent(data, callback) {
|
||||
const result = await generateHostOTP(data._id);
|
||||
|
||||
@ -407,9 +407,6 @@ export class TemplateManager {
|
||||
} else {
|
||||
const objectType = documentTemplate?.objectType;
|
||||
const model = getModelByName(objectType);
|
||||
if (model == null) {
|
||||
return { error: `Unknown object type: ${objectType}` };
|
||||
}
|
||||
const defaultKeys = Object.keys(model.schema.obj);
|
||||
const defaultValues = {};
|
||||
for (const key of defaultKeys) {
|
||||
@ -427,37 +424,24 @@ export class TemplateManager {
|
||||
|
||||
var templateWithParentContent;
|
||||
|
||||
var parentTemplate = documentTemplate.parent;
|
||||
|
||||
if (documentTemplate.parent != undefined) {
|
||||
if (typeof parentTemplate === 'string') {
|
||||
parentTemplate = await getObject({
|
||||
model: documentTemplateModel,
|
||||
id: parentTemplate,
|
||||
populate: [
|
||||
{ path: 'documentSize' },
|
||||
{ path: 'parent', strictPopulate: false }
|
||||
],
|
||||
cached: true
|
||||
});
|
||||
}
|
||||
// Validate parent content
|
||||
if (
|
||||
parentTemplate.content == null ||
|
||||
typeof parentTemplate.content !== 'string'
|
||||
documentTemplate.parent.content == null ||
|
||||
typeof documentTemplate.parent.content !== 'string'
|
||||
) {
|
||||
logger.error(
|
||||
'Parent template content is required and must be a string.',
|
||||
parentTemplate.content
|
||||
documentTemplate.parent.content
|
||||
);
|
||||
return {
|
||||
error:
|
||||
'Parent template content is required and must be a string.' +
|
||||
parentTemplate.content
|
||||
documentTemplate.parent.content
|
||||
};
|
||||
}
|
||||
templateWithParentContent = await ejs.render(
|
||||
parentTemplate.content,
|
||||
documentTemplate.parent.content,
|
||||
{ content: templateContent, fc: this.fc },
|
||||
defaultOptions
|
||||
);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user