@jsreport/jsreport-core 3.0.1 → 3.1.2-test.2

package/lib/main/migration/xlsxTemplatesToAssets.js

@@ -1,118 +1,128 @@
-const Request = require('../../shared/request')
-
-module.exports = async (reporter) => {
-  if (
-    reporter.options.migrateXlsxTemplatesToAssets === false ||
-    reporter.documentStore.collection('xlsxTemplates') == null ||
-    reporter.documentStore.collection('assets') == null
-  ) {
-    return
-  }
-
-  const migrated = await reporter.settings.findValue('core-migrated-xlsxTemplates')
-
-  if (migrated) {
-    return
-  }
-
-  const req = Request({})
-  await reporter.documentStore.beginTransaction(req)
-
-  try {
-    const xlsxTemplateIds = await reporter.documentStore.collection('xlsxTemplates').find({}, { _id: 1 }, req)
-
-    if (xlsxTemplateIds.length !== 0) {
-      reporter.logger.debug('Running migration "xlsxTemplatesToAssets"')
-    }
-
-    const xlsxTemplateToAssetMap = new Map()
-
-    for (const xlsxTemplateId of xlsxTemplateIds) {
-      const xlsxTemplate = await reporter.documentStore.collection('xlsxTemplates').findOne({ _id: xlsxTemplateId._id }, req)
-
-      if (!xlsxTemplateToAssetMap.has(xlsxTemplate.shortid)) {
-        let newAsset
-        let tryCount = 0
-
-        while (newAsset == null) {
-          try {
-            const assetName = `${'_'.repeat(tryCount) + xlsxTemplate.name}.xlsx`
-
-            newAsset = await reporter.documentStore.collection('assets').insert({
-              name: assetName,
-              content: xlsxTemplate.contentRaw,
-              folder: xlsxTemplate.folder || null
-            }, req)
-          } catch (insertError) {
-            tryCount++
-
-            if (insertError.code === 'DUPLICATED_ENTITY') {
-              continue
-            } else {
-              throw insertError
-            }
-          }
-        }
-
-        xlsxTemplateToAssetMap.set(xlsxTemplate.shortid, newAsset)
-      }
-    }
-
-    const templateIds = await reporter.documentStore.collection('templates').find({}, { _id: 1 }, req)
-
-    for (const templateId of templateIds) {
-      const template = await reporter.documentStore.collection('templates').findOne({ _id: templateId._id }, req)
-      let continueUpdate = false
-
-      // handle jsreport-xlsx migration
-      if (template.xlsxTemplate != null) {
-        continueUpdate = true
-
-        const xlsxTemplateRef = template.xlsxTemplate
-
-        template.xlsxTemplate = null
-
-        if (xlsxTemplateRef.shortid != null && xlsxTemplateToAssetMap.has(xlsxTemplateRef.shortid)) {
-          template.xlsx = template.xlsx || {}
-          template.xlsx.templateAssetShortid = xlsxTemplateToAssetMap.get(xlsxTemplateRef.shortid).shortid
-        }
-      }
-
-      // handle jsreport-html-to-xlsx migration
-      if (template.baseXlsxTemplate != null) {
-        continueUpdate = true
-
-        const baseXlsxTemplateRef = template.baseXlsxTemplate
-
-        template.baseXlsxTemplate = null
-
-        if (baseXlsxTemplateRef.shortid != null && xlsxTemplateToAssetMap.has(baseXlsxTemplateRef.shortid)) {
-          template.htmlToXlsx = template.htmlToXlsx || {}
-          template.htmlToXlsx.templateAssetShortid = xlsxTemplateToAssetMap.get(baseXlsxTemplateRef.shortid).shortid
-        }
-      }
-
-      if (continueUpdate) {
-        await reporter.documentStore.collection('templates').update({ _id: template._id }, { $set: template }, req)
-      }
-    }
-
-    for (const xlsxTemplateId of xlsxTemplateIds) {
-      await reporter.documentStore.collection('xlsxTemplates').remove({ _id: xlsxTemplateId._id }, req)
-    }
-
-    if (xlsxTemplateIds.length !== 0) {
-      reporter.logger.debug('Migration "xlsxTemplatesToAssets" finished')
-    }
-
-    await reporter.documentStore.commitTransaction(req)
-
-    await reporter.settings.addOrSet('core-migrated-xlsxTemplates', true)
-  } catch (migrationErr) {
-    await reporter.documentStore.rollbackTransaction(req)
-
-    migrationErr.message = `Migration "xlsxTemplatesToAssets" failed: ${migrationErr.message}`
-
-    throw migrationErr
-  }
-}
+const Request = require('../../shared/request')
+
+module.exports = async (reporter) => {
+  if (
+    reporter.options.migrateXlsxTemplatesToAssets === false ||
+    reporter.documentStore.collection('xlsxTemplates') == null ||
+    reporter.documentStore.collection('assets') == null
+  ) {
+    return
+  }
+
+  const migrated = await reporter.settings.findValue('core-migrated-xlsxTemplates')
+
+  if (migrated) {
+    return
+  }
+
+  const req = Request({})
+  await reporter.documentStore.beginTransaction(req)
+
+  try {
+    const xlsxTemplateIds = await reporter.documentStore.collection('xlsxTemplates').find({}, { _id: 1 }, req)
+
+    if (xlsxTemplateIds.length !== 0) {
+      reporter.logger.debug('Running migration "xlsxTemplatesToAssets"')
+    }
+
+    const xlsxTemplateToAssetMap = new Map()
+
+    for (const xlsxTemplateId of xlsxTemplateIds) {
+      const xlsxTemplate = await reporter.documentStore.collection('xlsxTemplates').findOne({ _id: xlsxTemplateId._id }, req)
+
+      if (!xlsxTemplateToAssetMap.has(xlsxTemplate.shortid)) {
+        let newAsset
+        let tryCount = 0
+
+        while (newAsset == null) {
+          try {
+            const assetName = `${'_'.repeat(tryCount) + xlsxTemplate.name}.xlsx`
+
+            const assetProps = {
+              name: assetName,
+              content: xlsxTemplate.contentRaw,
+              folder: xlsxTemplate.folder || null
+            }
+
+            if (xlsxTemplate.readPermissions != null) {
+              assetProps.readPermissions = xlsxTemplate.readPermissions
+            }
+
+            if (xlsxTemplate.editPermissions != null) {
+              assetProps.editPermissions = xlsxTemplate.editPermissions
+            }
+
+            newAsset = await reporter.documentStore.collection('assets').insert(assetProps, req)
+          } catch (insertError) {
+            tryCount++
+
+            if (insertError.code === 'DUPLICATED_ENTITY') {
+              continue
+            } else {
+              throw insertError
+            }
+          }
+        }
+
+        xlsxTemplateToAssetMap.set(xlsxTemplate.shortid, newAsset)
+      }
+    }
+
+    const templateIds = await reporter.documentStore.collection('templates').find({}, { _id: 1 }, req)
+
+    for (const templateId of templateIds) {
+      const template = await reporter.documentStore.collection('templates').findOne({ _id: templateId._id }, req)
+      let continueUpdate = false
+
+      // handle jsreport-xlsx migration
+      if (template.xlsxTemplate != null) {
+        continueUpdate = true
+
+        const xlsxTemplateRef = template.xlsxTemplate
+
+        template.xlsxTemplate = null
+
+        if (xlsxTemplateRef.shortid != null && xlsxTemplateToAssetMap.has(xlsxTemplateRef.shortid)) {
+          template.xlsx = template.xlsx || {}
+          template.xlsx.templateAssetShortid = xlsxTemplateToAssetMap.get(xlsxTemplateRef.shortid).shortid
+        }
+      }
+
+      // handle jsreport-html-to-xlsx migration
+      if (template.baseXlsxTemplate != null) {
+        continueUpdate = true
+
+        const baseXlsxTemplateRef = template.baseXlsxTemplate
+
+        template.baseXlsxTemplate = null
+
+        if (baseXlsxTemplateRef.shortid != null && xlsxTemplateToAssetMap.has(baseXlsxTemplateRef.shortid)) {
+          template.htmlToXlsx = template.htmlToXlsx || {}
+          template.htmlToXlsx.templateAssetShortid = xlsxTemplateToAssetMap.get(baseXlsxTemplateRef.shortid).shortid
+        }
+      }
+
+      if (continueUpdate) {
+        await reporter.documentStore.collection('templates').update({ _id: template._id }, { $set: template }, req)
+      }
+    }
+
+    for (const xlsxTemplateId of xlsxTemplateIds) {
+      await reporter.documentStore.collection('xlsxTemplates').remove({ _id: xlsxTemplateId._id }, req)
+    }
+
+    if (xlsxTemplateIds.length !== 0) {
+      reporter.logger.debug('Migration "xlsxTemplatesToAssets" finished')
+    }
+
+    await reporter.documentStore.commitTransaction(req)
+
+    await reporter.settings.addOrSet('core-migrated-xlsxTemplates', true)
+  } catch (migrationErr) {
+    await reporter.documentStore.rollbackTransaction(req)
+
+    migrationErr.message = `Migration "xlsxTemplatesToAssets" failed: ${migrationErr.message}`
+
+    throw migrationErr
+  }
+}

package/lib/main/monitoring.js

@@ -1,91 +1,91 @@
-const os = require('os')
-
-function cpu () {
-  // Create function to get CPU information
-  function cpuAverage () {
-  // Initialise sum of idle and time of cores and fetch CPU info
-    let totalIdle = 0; let totalTick = 0
-    const cpus = os.cpus()
-
-    // Loop through CPU cores
-    for (let i = 0, len = cpus.length; i < len; i++) {
-    // Select CPU core
-      const cpu = cpus[i]
-
-      // Total up the time in the cores tick
-      for (const type in cpu.times) {
-        totalTick += cpu.times[type]
-      }
-
-      // Total up the idle time of the core
-      totalIdle += cpu.times.idle
-    }
-
-    // Return the average Idle and Tick times
-    return { idle: totalIdle / cpus.length, total: totalTick / cpus.length }
-  }
-
-  // Grab first CPU Measure
-  const startMeasure = cpuAverage()
-
-  return new Promise((resolve) => {
-    // Set delay for second Measure
-    setTimeout(function () {
-    // Grab second Measure
-      const endMeasure = cpuAverage()
-
-      // Calculate the difference in idle and total time between the measures
-      const idleDifference = endMeasure.idle - startMeasure.idle
-      const totalDifference = endMeasure.total - startMeasure.total
-
-      // Calculate the average percentage CPU usage
-      const percentageCPU = 100 - ~~(100 * idleDifference / totalDifference)
-
-      // Output result to console
-      resolve(percentageCPU)
-    }, 1000)
-  })
-}
-
-class Monitoring {
-  constructor (reporter) {
-    this.reporter = reporter
-  }
-
-  async execute () {
-    const monitoring = {
-      cpu: await cpu(),
-      freemem: Math.round(os.freemem() / 1024 / 1024),
-      timestamp: new Date(),
-      hostname: os.hostname()
-    }
-    return this.reporter.documentStore.collection('monitoring').insert(monitoring)
-  }
-
-  init () {
-    this._interval = setInterval(() => {
-      this.execute()
-    }, 60000)
-    this._interval.unref()
-  }
-
-  close () {
-    clearInterval(this._interval)
-  }
-}
-
-module.exports = (reporter) => {
-  reporter.documentStore.registerEntityType('MonitoringType', {
-    cpu: { type: 'Edm.Int32' },
-    freemem: { type: 'Edm.Int32' },
-    timestamp: { type: 'Edm.DateTimeOffset', schema: { type: 'null' } },
-    hostname: { type: 'Edm.String' }
-  })
-
-  reporter.documentStore.registerEntitySet('monitoring', {
-    entityType: 'jsreport.MonitoringType',
-    exportable: false
-  })
-
-  reporter.monitoring = new Monitoring(reporter)
-}
+const os = require('os')
+
+function cpu () {
+  // Create function to get CPU information
+  function cpuAverage () {
+  // Initialise sum of idle and time of cores and fetch CPU info
+    let totalIdle = 0; let totalTick = 0
+    const cpus = os.cpus()
+
+    // Loop through CPU cores
+    for (let i = 0, len = cpus.length; i < len; i++) {
+    // Select CPU core
+      const cpu = cpus[i]
+
+      // Total up the time in the cores tick
+      for (const type in cpu.times) {
+        totalTick += cpu.times[type]
+      }
+
+      // Total up the idle time of the core
+      totalIdle += cpu.times.idle
+    }
+
+    // Return the average Idle and Tick times
+    return { idle: totalIdle / cpus.length, total: totalTick / cpus.length }
+  }
+
+  // Grab first CPU Measure
+  const startMeasure = cpuAverage()
+
+  return new Promise((resolve) => {
+    // Set delay for second Measure
+    setTimeout(function () {
+    // Grab second Measure
+      const endMeasure = cpuAverage()
+
+      // Calculate the difference in idle and total time between the measures
+      const idleDifference = endMeasure.idle - startMeasure.idle
+      const totalDifference = endMeasure.total - startMeasure.total
+
+      // Calculate the average percentage CPU usage
+      const percentageCPU = 100 - ~~(100 * idleDifference / totalDifference)
+
+      // Output result to console
+      resolve(percentageCPU)
+    }, 1000)
+  })
+}
+
+class Monitoring {
+  constructor (reporter) {
+    this.reporter = reporter
+  }
+
+  async execute () {
+    const monitoring = {
+      cpu: await cpu(),
+      freemem: Math.round(os.freemem() / 1024 / 1024),
+      timestamp: new Date(),
+      hostname: os.hostname()
+    }
+    return this.reporter.documentStore.collection('monitoring').insert(monitoring)
+  }
+
+  init () {
+    this._interval = setInterval(() => {
+      this.execute().catch((e) => this.reporter.logger.warn('unable to persist monitoring info, but no need to worry, we will retry, details:' + e.stack))
+    }, 60000)
+    this._interval.unref()
+  }
+
+  close () {
+    clearInterval(this._interval)
+  }
+}
+
+module.exports = (reporter) => {
+  reporter.documentStore.registerEntityType('MonitoringType', {
+    cpu: { type: 'Edm.Int32' },
+    freemem: { type: 'Edm.Int32' },
+    timestamp: { type: 'Edm.DateTimeOffset', schema: { type: 'null' } },
+    hostname: { type: 'Edm.String' }
+  })
+
+  reporter.documentStore.registerEntitySet('monitoring', {
+    entityType: 'jsreport.MonitoringType',
+    exportable: false
+  })
+
+  reporter.monitoring = new Monitoring(reporter)
+}