bfg-common 1.4.306 → 1.4.308

package/components/common/pages/scheduledTasks/modals/common/newTaskForm/NewTaskForm.vue

@@ -101,6 +101,7 @@ import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import type { UI_I_InitialValidationFields } from '~/components/common/pages/scheduledTasks/modals/common/newTaskForm/lib/models/interfaces'
 import type { UI_T_FrequencyType } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/models/types'
+import * as cron from '~/components/common/pages/scheduledTasks/modals/common/newTaskForm/lib/utils'
 import { frequencyMethodFunc } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/config/frequencyOptions'
 
 const props = defineProps<{
@@ -134,72 +135,6 @@ watch(
   { deep: true }
 )
 
-/* TODO рефакторинг все методы надо рефакторить */
-const generateHourlyCronExpression = (
-  data: UI_I_ScheduleNewTasksForm
-): string => {
-  const startTimestamp = Math.floor(
-    new Date(data.frg_start_on_time).getTime() / 1000
-  )
-  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
-
-  // Генерируем cron-выражение
-  return endTimestamp
-    ? `* * * * * ${startTimestamp}-${endTimestamp}:${data.frg_interval}-0-0-0`
-    : `* * * * * ${startTimestamp}:${data.frg_interval}-0-0-0`
-}
-const generateDailyCronExpression = (
-  data: UI_I_ScheduleNewTasksForm
-): string => {
-  const startTimestamp = Math.floor(
-    new Date(data.frg_start_on_time).getTime() / 1000
-  )
-  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
-
-  // Генерируем cron-выражение
-  return endTimestamp
-    ? `* * * * * ${startTimestamp}-${endTimestamp}:0-${data.frg_interval}-0-0`
-    : `* * * * * ${startTimestamp}:0-${data.frg_interval}-0-0`
-}
-const generateWeeklyCronExpression = (
-  data: UI_I_ScheduleNewTasksForm
-): string => {
-  const { frg_on_week_days } = data
-
-  const startTimestamp = Math.floor(
-    new Date(data.frg_start_on_time).getTime() / 1000
-  )
-  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
-  const daysOfWeek = frg_on_week_days.join(',')
-
-  return endTimestamp
-    ? `* * * * ${daysOfWeek} ${startTimestamp}-${endTimestamp}:0-0-0-${data.frg_interval}`
-    : `* * * * ${daysOfWeek} ${startTimestamp}:0-0-0-${data.frg_interval}`
-}
-
-const generateMonthlyCronExpression = (
-  data: UI_I_ScheduleNewTasksForm
-): string => {
-  const { frg_interval, frg_monthly_day, frq_week_day, frq_ordinal_number } =
-    data
-
-  const startTimestamp = Math.floor(
-    new Date(data.frg_start_on_time).getTime() / 1000
-  )
-  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
-
-  const daysOfWeek = `${frq_week_day}#${frq_ordinal_number}`
-
-  const timestamp = endTimestamp
-    ? `${startTimestamp}-${endTimestamp}`
-    : startTimestamp
-
-  // Генерируем cron-выражение
-  return data.frg_monthly_mode === 'week'
-    ? `* * * * * ${timestamp}:0-0-${frg_interval}-${daysOfWeek}`
-    : `* * ${frg_monthly_day} */${frg_interval} * ${timestamp}:0-0-0-0`
-}
-
 const generateCronExpression = (
   runType: UI_T_FrequencyType,
   interval: UI_I_ScheduleNewTasksForm
@@ -220,16 +155,16 @@ const generateCronExpression = (
       cronExpression = `* * * * * after_procurator_startup${suffixDelay}` // Выполняется после запуска procurator_startup с задержой N минут
       break
     case 'hour':
-      cronExpression = generateHourlyCronExpression(interval)
+      cronExpression = cron.generateHourlyCronExpression(interval)
       break
     case 'day':
-      cronExpression = generateDailyCronExpression(interval)
+      cronExpression = cron.generateDailyCronExpression(interval)
       break
     case 'week':
-      cronExpression = generateWeeklyCronExpression(interval)
+      cronExpression = cron.generateWeeklyCronExpression(interval)
       break
     case 'month':
-      cronExpression = generateMonthlyCronExpression(interval)
+      cronExpression = cron.generateMonthlyCronExpression(interval)
       break
     default:
       cronExpression = '* * * * *'

package/components/common/pages/scheduledTasks/modals/common/newTaskForm/lib/utils.ts

@@ -0,0 +1,67 @@
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+
+export const generateHourlyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
+  const startTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
+
+  // Генерируем cron-выражение
+  return endTimestamp
+    ? `* * * * * ${startTimestamp}-${endTimestamp}:${data.frg_interval}-0-0-0`
+    : `* * * * * ${startTimestamp}:${data.frg_interval}-0-0-0`
+}
+export const generateWeeklyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
+  const { frg_on_week_days } = data
+
+  const startTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
+  const daysOfWeek = frg_on_week_days.join(',')
+
+  return endTimestamp
+    ? `* * * * ${daysOfWeek} ${startTimestamp}-${endTimestamp}:0-0-0-${data.frg_interval}`
+    : `* * * * ${daysOfWeek} ${startTimestamp}:0-0-0-${data.frg_interval}`
+}
+
+export const generateDailyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
+  const startTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
+
+  // Генерируем cron-выражение
+  return endTimestamp
+    ? `* * * * * ${startTimestamp}-${endTimestamp}:0-${data.frg_interval}-0-0`
+    : `* * * * * ${startTimestamp}:0-${data.frg_interval}-0-0`
+}
+
+export const generateMonthlyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
+  const { frg_interval, frg_monthly_day, frq_week_day, frq_ordinal_number } =
+    data
+
+  const startTimestamp = Math.floor(
+    new Date(data.frg_start_on_time).getTime() / 1000
+  )
+  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
+
+  const daysOfWeek = `${frq_week_day}#${frq_ordinal_number}`
+
+  const timestamp = endTimestamp
+    ? `${startTimestamp}-${endTimestamp}`
+    : startTimestamp
+
+  // Генерируем cron-выражение
+  return data.frg_monthly_mode === 'week'
+    ? `* * * * * ${timestamp}:0-0-${frg_interval}-${daysOfWeek}`
+    : `* * ${frg_monthly_day} */${frg_interval} * ${timestamp}:0-0-0-0`
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.306",
+  "version": "1.4.308",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",

package/public/spice-console/lib/rasterEngine.js

@@ -16,8 +16,14 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
+const _SOI = new Uint8Array([0xff, 0xd8]);
+const _EOI = new Uint8Array([0xff, 0xd9]);
 
 wdi.RasterEngine = $.spcExtend(wdi.EventObject.prototype, {
+  chunks: [],
+  size: 0,
+  jpegInst: null,
+
   init: function (c) {
     this.time = Date.now()
     this.clientGui = c.clientGui
@@ -101,6 +107,9 @@ wdi.RasterEngine = $.spcExtend(wdi.EventObject.prototype, {
   handleStreamData: function (spiceMessage) {
     var stream = wdi.Stream.getStream(spiceMessage.args.id)
     switch (stream.codec) {
+      case wdi.SpiceVideoCodecType.SPICE_VIDEO_CODEC_TYPE_MJPEG:
+        this.handleMjpegStream(spiceMessage)
+        break
       case wdi.SpiceVideoCodecType.SPICE_VIDEO_CODEC_TYPE_H264:
         this.handleH264Stream(spiceMessage)
         break
@@ -151,6 +160,76 @@ wdi.RasterEngine = $.spcExtend(wdi.EventObject.prototype, {
     console.log('%chandleStreamDestroy', 'color:rgb(255,100,100)')
   },
 
+  indexOfBytes: function(haystack, needle, start = 0) {
+    for (let i = start; i <= haystack.length - needle.length; i++) {
+      let found = true;
+      for (let j = 0; j < needle.length; j++) {
+        if (haystack[i + j] !== needle[j]) {
+          found = false;
+          break;
+        }
+      }
+      if (found) return i;
+    }
+    return -1;
+  },
+
+  concatenateChunks: function(chunks, totalLength) {
+    const result = new Uint8Array(totalLength);
+    let offset = 0;
+    for (const chunk of chunks) {
+      result.set(chunk, offset);
+      offset += chunk.length;
+    }
+    return result;
+  },
+
+  pushWholeMjpegFrame: function(chunk) {
+    const chunkLength = chunk.length;
+    let pos = 0;
+    while (true) {
+      if (this.size) {
+        const eoi = this.indexOfBytes(chunk, _EOI);
+        if (eoi === -1) {
+          this.chunks.push(chunk);
+          size += chunkLength;
+          break;
+        } else {
+          pos = eoi + _EOI.length;
+          const sliced = chunk.slice(0, pos);
+          this.chunks.push(sliced);
+          this.size += sliced.length;
+          this.jpegInst = this.concatenateChunks(chunks, size);
+          this.chunks = [];
+          size = 0;
+          if (pos === chunkLength) {
+            break;
+          }
+        }
+      } else {
+        const soi = this.indexOfBytes(chunk, _SOI, pos);
+        if (soi === -1) {
+          break;
+        } else {
+          pos = soi + 500; // можно уменьшить значение для улучшения производительности
+        }
+        const eoi = this.indexOfBytes(chunk, _EOI, pos);
+        if (eoi === -1) {
+          const sliced = chunk.slice(soi);
+          this.chunks = [sliced];
+          this.size = sliced.length;
+          break;
+        } else {
+          pos = eoi + _EOI.length;
+          this.jpegInst = chunk.slice(soi, pos);
+          if (pos === chunkLength) {
+            break;
+          }
+        }
+      }
+    }
+  },
+
   handleMjpegStream: function (spiceMessage) {
     var imageData = spiceMessage.args.data //jpeg string encoded
     var stream = wdi.Stream.getStream(spiceMessage.args.id) //recover the stream
@@ -186,8 +265,17 @@ wdi.RasterEngine = $.spcExtend(wdi.EventObject.prototype, {
       URL.revokeObjectURL(url)
     }
 
-    url = wdi.SpiceObject.bytesToURI(imageData)
-    img.src = url
+
+    // Здесь предполагается, что imageData – это двоичные данные в виде Uint8Array
+    const byteData = new Uint8Array(imageData); // Преобразование в Uint8Array
+    this.pushWholeMjpegFrame(byteData);
+
+    // Проверяем, был ли сформирован полный JPEG-кадр
+    if (this.jpegInst) {
+      url = wdi.SpiceObject.bytesToURI(this.jpegInst);
+      img.src = url;
+    }
+
   },
 
   handleH264Stream: function (spiceMessage) {