bfg-common 1.3.227 → 1.3.229

package/lib/utils/sendTask.ts

@@ -1,72 +1,72 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  API_UI_I_Error,
-  UI_I_RequestBody,
-} from '~/lib/models/store/interfaces'
-import type {
-  UI_I_NotifyBodyMessage,
-  UI_I_SendTaskParams,
-} from '~/lib/models/interfaces'
-import { base64 } from './base64'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const showNotification = (message: UI_I_NotifyBodyMessage): void => {
-  const { title, desc, status } = message
-  const { $store } = useNuxtApp()
-
-  // @ts-ignore
-  $store.dispatch('main/A_SHOW_NOTIFICATION', {
-    status,
-    messages: [
-      {
-        title,
-        descriptions: [desc],
-      },
-    ],
-    headline: '',
-    timeout: status === 'success' ? 3000 : '',
-  })
-}
-const msgError: UI_I_NotifyBodyMessage = {
-  status: 'error',
-  title: localization.value.error,
-  desc: '',
-}
-const handleErrors = (error: Ref<API_UI_I_Error>): void => {
-  if (error.value.data?.error_message) {
-    msgError.desc = error.value.data?.error_message
-    showNotification(msgError)
-  }
-}
-
-export const handleRequest = async (
-  url: string,
-  body: UI_I_RequestBody
-): Promise<void> => {
-  // @ts-ignore
-  const { error } = await useMyFetch<never, API_UI_I_Error>(url, {
-    body,
-    method: 'POST',
-    key: Date.now().toString(),
-  })
-
-  if (error.value && error.value.data.error_code !== 0) {
-    handleErrors(error)
-  }
-}
-
-export async function sendTask({
-  method,
-  target,
-  args,
-}: UI_I_SendTaskParams): Promise<void> {
-  const argsToBase64 = args ? base64.encode(args) : ''
-  await handleRequest('/ui/tasks', {
-    method,
-    params: {
-      target,
-      args: argsToBase64,
-    },
-  })
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  API_UI_I_Error,
+  UI_I_RequestBody,
+} from '~/lib/models/store/interfaces'
+import type {
+  UI_I_NotifyBodyMessage,
+  UI_I_SendTaskParams,
+} from '~/lib/models/interfaces'
+import { base64 } from './base64'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const showNotification = (message: UI_I_NotifyBodyMessage): void => {
+  const { title, desc, status } = message
+  const { $store } = useNuxtApp()
+
+  // @ts-ignore
+  $store.dispatch('main/A_SHOW_NOTIFICATION', {
+    status,
+    messages: [
+      {
+        title,
+        descriptions: [desc],
+      },
+    ],
+    headline: '',
+    timeout: status === 'success' ? 3000 : '',
+  })
+}
+const msgError: UI_I_NotifyBodyMessage = {
+  status: 'error',
+  title: localization.value.error,
+  desc: '',
+}
+const handleErrors = (error: Ref<API_UI_I_Error>): void => {
+  if (error.value.data?.error_message) {
+    msgError.desc = error.value.data?.error_message
+    showNotification(msgError)
+  }
+}
+
+export const handleRequest = async (
+  url: string,
+  body: UI_I_RequestBody
+): Promise<void> => {
+  // @ts-ignore
+  const { error } = await useMyFetch<never, API_UI_I_Error>(url, {
+    body,
+    method: 'POST',
+    key: Date.now().toString(),
+  })
+
+  if (error.value && error.value.data.error_code !== 0) {
+    handleErrors(error)
+  }
+}
+
+export async function sendTask({
+  method,
+  target,
+  args,
+}: UI_I_SendTaskParams): Promise<void> {
+  const argsToBase64 = args ? base64.encode(args) : ''
+  await handleRequest('/ui/tasks', {
+    method,
+    params: {
+      target,
+      args: argsToBase64,
+    },
+  })
+}

package/minify.js

@@ -1,146 +1,146 @@
-const fs = require('fs')
-const terser = require('terser')
-
-// Файлы которые нужно минимизировать
-const filesByOrder = [
-  'public/spice-console/lib/decoder/jmuxer.js',
-  'public/spice-console/lib/decoder/dixie.js',
-  'public/spice-console/lib/jquery-2.0.3.js',
-  'public/spice-console/lib/utils.js',
-  'public/spice-console/lib/modernizr.js',
-  'public/spice-console/lib/jquery-mousewheel.js',
-  'public/spice-console/lib/jquery-visibility.min.js',
-  'public/spice-console/lib/lodash.4.0.0.min.js',
-  'public/spice-console/lib/jgestures.min.js',
-  'public/spice-console/lib/pixastic.js',
-  'public/spice-console/lib/base64.js',
-  'public/spice-console/lib/biginteger.js',
-  'public/spice-console/lib/virtualjoystick.js',
-  'public/spice-console/lib/prettyprint.js',
-  'public/spice-console/lib/jsbn.js',
-  'public/spice-console/lib/jsbn2.js',
-  'public/spice-console/lib/prng4.js',
-  'public/spice-console/lib/rng.js',
-  'public/spice-console/lib/sha1.js',
-  'public/spice-console/lib/encrypt.js',
-  'public/spice-console/swcanvas/swcanvas.js',
-  'public/spice-console/lib/bowser.js',
-  'public/spice-console/lib/flipper.js',
-  'public/spice-console/lib/CollisionDetector.js',
-  'public/spice-console/lib/GlobalPool.js',
-  'public/spice-console/lib/GenericObjectPool.js',
-  'public/spice-console/lib/AsyncConsumer.js',
-  'public/spice-console/lib/AsyncWorker.js',
-  'public/spice-console/lib/PacketWorkerIdentifier.js',
-  'public/spice-console/spiceobjects/spiceobjects.js',
-  'public/spice-console/spiceobjects/generated/protocol.js',
-  'public/spice-console/lib/graphicdebug.js',
-  'public/spice-console/lib/images/lz.js',
-  'public/spice-console/lib/images/bitmap.js',
-  'public/spice-console/lib/images/png.js',
-  'public/spice-console/lib/runqueue.js',
-  'public/spice-console/lib/graphic.js',
-  'public/spice-console/lib/queue.js',
-  'public/spice-console/lib/ImageUncompressor.js',
-  'public/spice-console/lib/SyncAsyncHandler.js',
-  'public/spice-console/lib/IntegrationBenchmark.js',
-  'public/spice-console/lib/stuckkeyshandler.js',
-  'public/spice-console/lib/timelapsedetector.js',
-  'public/spice-console/lib/displayRouter.js',
-  'public/spice-console/lib/rasterEngine.js',
-  'public/spice-console/lib/DataLogger.js',
-  'public/spice-console/network/socket.js',
-  'public/spice-console/network/clusternodechooser.js',
-  'public/spice-console/network/socketqueue.js',
-  'public/spice-console/network/packetcontroller.js',
-  'public/spice-console/network/packetextractor.js',
-  'public/spice-console/network/packetreassembler.js',
-  'public/spice-console/network/reassemblerfactory.js',
-  'public/spice-console/network/sizedefiner.js',
-  'public/spice-console/network/packetlinkfactory.js',
-  'public/spice-console/network/spicechannel.js',
-  'public/spice-console/network/busconnection.js',
-  'public/spice-console/network/websocketwrapper.js',
-  'public/spice-console/network/connectioncontrol.js',
-  'public/spice-console/application/checkActivity.js',
-  'public/spice-console/application/agent.js',
-  'public/spice-console/application/codec.js',
-  'public/spice-console/application/clipboard.js',
-  'public/spice-console/application/clipboard/clipboarddataparser.js',
-  'public/spice-console/application/clipboard/local/localClipboard.js',
-  'public/spice-console/application/spiceconnection.js',
-  'public/spice-console/application/clientgui.js',
-  'public/spice-console/application/packetprocess.js',
-  'public/spice-console/application/packetfilter.js',
-  'public/spice-console/application/packetfactory.js',
-  'public/spice-console/application/application.js',
-  'public/spice-console/application/virtualmouse.js',
-  'public/spice-console/application/imagecache.js',
-  'public/spice-console/application/rasteroperation.js',
-  'public/spice-console/application/stream.js',
-  'public/spice-console/application/inputmanager.js',
-  'public/spice-console/process/busprocess.js',
-  'public/spice-console/process/displayprocess.js',
-  'public/spice-console/process/displaypreprocess.js',
-  'public/spice-console/process/inputprocess.js',
-  'public/spice-console/process/cursorprocess.js',
-  'public/spice-console/process/playbackprocess.js',
-  'public/spice-console/process/mainprocess.js',
-  'public/spice-console/keymaps/keyevent.js',
-  'public/spice-console/keymaps/keymapes.js',
-  'public/spice-console/keymaps/scanCodeObjProvider.js',
-  'public/spice-console/keymaps/scanCodeObjModifier.js',
-  'public/spice-console/keymaps/keymapesObj.js',
-  'public/spice-console/keymaps/keymapus.js',
-  'public/spice-console/keymaps/keymap.js',
-  'public/spice-console/run.js',
-]
-
-// Папка и файл в которую вы хотите сохранить минифицированные файлы
-const outputFolder = 'public/spice-console-minify'
-const outputFile = `${outputFolder}/run.min.js`
-
-// Создайте папку назначения, если она не существует
-if (!fs.existsSync(outputFolder)) {
-  fs.mkdirSync(outputFolder, { recursive: true })
-}
-
-let index = 0
-let runMinJsContent = ''
-filesByOrder.forEach((filePath) => {
-  // Минифицируем
-  const fileContent = fs.readFileSync(filePath, 'utf8')
-  terser.minify(fileContent).then((minified) => {
-    if (minified.error) {
-      console.error(
-        `Ошибка при минификации файла ${filePath}: ${minified.error.message}`
-      )
-    } else {
-      runMinJsContent += minified.code.replaceAll(
-        'spice-console/application/WorkerProcess.js',
-        'spice-console-minify/WorkerProcess.min.js'
-      )
-      index++
-
-      // Если последний файл то все помещаем в run.min.js
-      if (filesByOrder.length === index)
-        fs.writeFileSync(outputFile, runMinJsContent)
-    }
-  })
-})
-
-// Обрабатываем Worker
-const workerJs = 'public/spice-console/application/WorkerProcess.js'
-const outputWorkerFile = `${outputFolder}/WorkerProcess.min.js`
-
-// Минифицируем
-const fileContent = fs.readFileSync(workerJs, 'utf8')
-terser.minify(fileContent).then((minified) => {
-  if (minified.error) {
-    console.error(
-      `Ошибка при минификации файла ${workerJs}: ${minified.error.message}`
-    )
-  } else {
-    fs.writeFileSync(outputWorkerFile, minified.code)
-  }
-})
+const fs = require('fs')
+const terser = require('terser')
+
+// Файлы которые нужно минимизировать
+const filesByOrder = [
+  'public/spice-console/lib/decoder/jmuxer.js',
+  'public/spice-console/lib/decoder/dixie.js',
+  'public/spice-console/lib/jquery-2.0.3.js',
+  'public/spice-console/lib/utils.js',
+  'public/spice-console/lib/modernizr.js',
+  'public/spice-console/lib/jquery-mousewheel.js',
+  'public/spice-console/lib/jquery-visibility.min.js',
+  'public/spice-console/lib/lodash.4.0.0.min.js',
+  'public/spice-console/lib/jgestures.min.js',
+  'public/spice-console/lib/pixastic.js',
+  'public/spice-console/lib/base64.js',
+  'public/spice-console/lib/biginteger.js',
+  'public/spice-console/lib/virtualjoystick.js',
+  'public/spice-console/lib/prettyprint.js',
+  'public/spice-console/lib/jsbn.js',
+  'public/spice-console/lib/jsbn2.js',
+  'public/spice-console/lib/prng4.js',
+  'public/spice-console/lib/rng.js',
+  'public/spice-console/lib/sha1.js',
+  'public/spice-console/lib/encrypt.js',
+  'public/spice-console/swcanvas/swcanvas.js',
+  'public/spice-console/lib/bowser.js',
+  'public/spice-console/lib/flipper.js',
+  'public/spice-console/lib/CollisionDetector.js',
+  'public/spice-console/lib/GlobalPool.js',
+  'public/spice-console/lib/GenericObjectPool.js',
+  'public/spice-console/lib/AsyncConsumer.js',
+  'public/spice-console/lib/AsyncWorker.js',
+  'public/spice-console/lib/PacketWorkerIdentifier.js',
+  'public/spice-console/spiceobjects/spiceobjects.js',
+  'public/spice-console/spiceobjects/generated/protocol.js',
+  'public/spice-console/lib/graphicdebug.js',
+  'public/spice-console/lib/images/lz.js',
+  'public/spice-console/lib/images/bitmap.js',
+  'public/spice-console/lib/images/png.js',
+  'public/spice-console/lib/runqueue.js',
+  'public/spice-console/lib/graphic.js',
+  'public/spice-console/lib/queue.js',
+  'public/spice-console/lib/ImageUncompressor.js',
+  'public/spice-console/lib/SyncAsyncHandler.js',
+  'public/spice-console/lib/IntegrationBenchmark.js',
+  'public/spice-console/lib/stuckkeyshandler.js',
+  'public/spice-console/lib/timelapsedetector.js',
+  'public/spice-console/lib/displayRouter.js',
+  'public/spice-console/lib/rasterEngine.js',
+  'public/spice-console/lib/DataLogger.js',
+  'public/spice-console/network/socket.js',
+  'public/spice-console/network/clusternodechooser.js',
+  'public/spice-console/network/socketqueue.js',
+  'public/spice-console/network/packetcontroller.js',
+  'public/spice-console/network/packetextractor.js',
+  'public/spice-console/network/packetreassembler.js',
+  'public/spice-console/network/reassemblerfactory.js',
+  'public/spice-console/network/sizedefiner.js',
+  'public/spice-console/network/packetlinkfactory.js',
+  'public/spice-console/network/spicechannel.js',
+  'public/spice-console/network/busconnection.js',
+  'public/spice-console/network/websocketwrapper.js',
+  'public/spice-console/network/connectioncontrol.js',
+  'public/spice-console/application/checkActivity.js',
+  'public/spice-console/application/agent.js',
+  'public/spice-console/application/codec.js',
+  'public/spice-console/application/clipboard.js',
+  'public/spice-console/application/clipboard/clipboarddataparser.js',
+  'public/spice-console/application/clipboard/local/localClipboard.js',
+  'public/spice-console/application/spiceconnection.js',
+  'public/spice-console/application/clientgui.js',
+  'public/spice-console/application/packetprocess.js',
+  'public/spice-console/application/packetfilter.js',
+  'public/spice-console/application/packetfactory.js',
+  'public/spice-console/application/application.js',
+  'public/spice-console/application/virtualmouse.js',
+  'public/spice-console/application/imagecache.js',
+  'public/spice-console/application/rasteroperation.js',
+  'public/spice-console/application/stream.js',
+  'public/spice-console/application/inputmanager.js',
+  'public/spice-console/process/busprocess.js',
+  'public/spice-console/process/displayprocess.js',
+  'public/spice-console/process/displaypreprocess.js',
+  'public/spice-console/process/inputprocess.js',
+  'public/spice-console/process/cursorprocess.js',
+  'public/spice-console/process/playbackprocess.js',
+  'public/spice-console/process/mainprocess.js',
+  'public/spice-console/keymaps/keyevent.js',
+  'public/spice-console/keymaps/keymapes.js',
+  'public/spice-console/keymaps/scanCodeObjProvider.js',
+  'public/spice-console/keymaps/scanCodeObjModifier.js',
+  'public/spice-console/keymaps/keymapesObj.js',
+  'public/spice-console/keymaps/keymapus.js',
+  'public/spice-console/keymaps/keymap.js',
+  'public/spice-console/run.js',
+]
+
+// Папка и файл в которую вы хотите сохранить минифицированные файлы
+const outputFolder = 'public/spice-console-minify'
+const outputFile = `${outputFolder}/run.min.js`
+
+// Создайте папку назначения, если она не существует
+if (!fs.existsSync(outputFolder)) {
+  fs.mkdirSync(outputFolder, { recursive: true })
+}
+
+let index = 0
+let runMinJsContent = ''
+filesByOrder.forEach((filePath) => {
+  // Минифицируем
+  const fileContent = fs.readFileSync(filePath, 'utf8')
+  terser.minify(fileContent).then((minified) => {
+    if (minified.error) {
+      console.error(
+        `Ошибка при минификации файла ${filePath}: ${minified.error.message}`
+      )
+    } else {
+      runMinJsContent += minified.code.replaceAll(
+        'spice-console/application/WorkerProcess.js',
+        'spice-console-minify/WorkerProcess.min.js'
+      )
+      index++
+
+      // Если последний файл то все помещаем в run.min.js
+      if (filesByOrder.length === index)
+        fs.writeFileSync(outputFile, runMinJsContent)
+    }
+  })
+})
+
+// Обрабатываем Worker
+const workerJs = 'public/spice-console/application/WorkerProcess.js'
+const outputWorkerFile = `${outputFolder}/WorkerProcess.min.js`
+
+// Минифицируем
+const fileContent = fs.readFileSync(workerJs, 'utf8')
+terser.minify(fileContent).then((minified) => {
+  if (minified.error) {
+    console.error(
+      `Ошибка при минификации файла ${workerJs}: ${minified.error.message}`
+    )
+  } else {
+    fs.writeFileSync(outputWorkerFile, minified.code)
+  }
+})

package/package.json

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

package/plugins/binary.ts

@@ -36,60 +36,58 @@ export default defineNuxtPlugin(() => {
       return +(tb * 1_024).toFixed(fix)
     }
 
-    const sizeLabels:Record<string, { fromBytes: string[]; sizes: string[] }> = {
-      en: {
-        fromBytes: ['Bytes', 'KB'],
-        sizes: ['MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
-      },
-      ru: {
-        fromBytes: ['Байт', 'КБ'],
-        sizes: ['МБ', 'ГБ', 'ТБ', 'ПБ', 'ЭБ', 'ЗБ', 'ИБ'],
-      },
-    }
+    const sizeLabels: Record<string, { fromBytes: string[]; sizes: string[] }> =
+      {
+        en: {
+          fromBytes: ['Bytes', 'KB'],
+          sizes: ['MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
+        },
+        ru: {
+          fromBytes: ['Байт', 'КБ'],
+          sizes: ['МБ', 'ГБ', 'ТБ', 'ПБ', 'ЭБ', 'ЗБ', 'ИБ'],
+        },
+      }
 
     self.round = function (mb: number, byte = false, language = 'en'): string {
       switch (language) {
         case 'ru':
-          if (mb <= 0) return '0 Б';
-          if (mb < 1) return `${mb} МБ`;
-          break;
+          if (mb <= 0) return '0 Б'
+          if (mb < 1) return `${mb} МБ`
+          break
         default:
-          if (mb <= 0) return '0 B';
-          if (mb < 1) return `${mb} MB`;
-          break;
+          if (mb <= 0) return '0 B'
+          if (mb < 1) return `${mb} MB`
+          break
       }
 
-      const k = 1_024;
-      let { fromBytes, sizes } = sizeLabels[language] || sizeLabels.en;
+      const k = 1_024
+      let { fromBytes, sizes } = sizeLabels[language] || sizeLabels.en
 
       if (byte) sizes = [...fromBytes, ...sizes]
 
-      const i = Math.floor(Math.log(mb) / Math.log(k));
+      const i = Math.floor(Math.log(mb) / Math.log(k))
       const value =
-        (mb / Math.pow(k, i))
-          .toString()
-          .match(/^-?\d+(?:\.\d{0,2})?/)?.[0] || '0';
-
-      const sizeLabel = sizes[i];
-      return parseFloat(value) + ' ' + sizeLabel;
-    };
+        (mb / Math.pow(k, i)).toString().match(/^-?\d+(?:\.\d{0,2})?/)?.[0] ||
+        '0'
 
+      const sizeLabel = sizes[i]
+      return parseFloat(value) + ' ' + sizeLabel
+    }
 
-    const hzLabels: {en: string[], ru: string[]} = {
+    const hzLabels: { en: string[]; ru: string[] } = {
       en: ['MHz', 'GHz', 'THz', 'PHz', 'EHz'],
       ru: ['МГц', 'ГГц', 'ТГц', 'ПГц', 'ИГц'],
-    };
+    }
 
     self.roundHz = function (hz: number, lang = 'en') {
-      if (hz <= 0) return `0 ${lang === 'en' ? 'Hz' : 'Гц'}`;
-      const k = 1_000;
-      const dm = 2;
-      const size = lang === 'en' ? hzLabels.en : hzLabels.ru;
-      const i = Math.floor(Math.log(hz) / Math.log(k));
-      return parseFloat((hz / Math.pow(k, i)).toFixed(dm)) + ' ' + size[i];
+      if (hz <= 0) return `0 ${lang === 'en' ? 'Hz' : 'Гц'}`
+      const k = 1_000
+      const dm = 2
+      const size = lang === 'en' ? hzLabels.en : hzLabels.ru
+      const i = Math.floor(Math.log(hz) / Math.log(k))
+      return parseFloat((hz / Math.pow(k, i)).toFixed(dm)) + ' ' + size[i]
     }
 
-
     self.mhzToGhz = function (mhz: number, fix = 2): number {
       return +(mhz / 1_000).toFixed(fix)
     }
@@ -97,6 +95,19 @@ export default defineNuxtPlugin(() => {
       return +(mhz * 1_000).toFixed(fix)
     }
 
+    self.byteToStringIP = function (ip: number): string {
+      let d: number | string = ip % 256
+      for (let i: number = 3; i > 0; i--) {
+        ip = Math.floor(ip / 256)
+        d = (ip % 256) + '.' + d
+      }
+      return d as string
+    }
+    self.stringToByteIP = function (ip: string): number {
+      let d: string[] = ip.split('.')
+      return ((+d[0] * 256 + +d[1]) * 256 + +d[2]) * 256 + +d[3]
+    }
+
     self.universalFromTo = function (
       val: number,
       typeFrom: string,