bfg-common 1.3.138 → 1.3.140

package/components/common/wizards/network/add/steps/SelectedTargetDevice.vue

@@ -364,26 +364,23 @@ const onShowModal = (value: string): void => {
 }
 
 // Switches selection functionality
-const onSelectSwitch = (selectedSwitchId: string): void => {
+const onSelectSwitch = (_selectedSwitchId: string): void => {
   fields.value.switch = ''
 }
 const onSelectStandardSwitch = (selectedSwitchId: string): void => {
-  const selectedSwitch = props.standardSwitchesInitial.find(
-    (switchData: UI_I_Switch) => switchData.id === selectedSwitchId
-  )
-  fields.value.standardSwitch = selectedSwitch?.name
+  fields.value.standardSwitch = selectedSwitchId
 }
-const onSelectNetwork = (selectedNetworkId: string): void => {
+const onSelectNetwork = (_selectedNetworkId: string): void => {
   fields.value.network = ''
 }
 
 watch(
   () => props.standardSwitchesInitial,
-  (newStandardSwitchesInitial) => {
+  (newStandardSwitchesInitial: UI_I_Switch[]) => {
     !fields.value.standardSwitch &&
       (fields.value.standardSwitch =
         newStandardSwitchesInitial?.sort((prev, next) =>
-          prev.name.localeCompare(next.name)
+          prev.name.localeCompare(next.name || '')
         )[0]?.name || '')
   },
   { deep: true, immediate: true }

package/composables/useAppVersion.ts

@@ -1,21 +1,21 @@
-import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
-
-export function useAppVersion(): UI_I_UseAppVersionReturnType {
-  const config = useRuntimeConfig()
-  const version = config.public.APP_VERSION
-
-  const regexHasDot = /\./
-  const regexHasDotAndB = /\..*b/
-  const regexHasDotAndD = /\..*d/
-
-  const isBeta = regexHasDotAndB.test(version)
-  const isDev =
-    regexHasDotAndD.test(version) ||
-    (!regexHasDot.test(version) && version.length < 8)
-
-  return {
-    version,
-    isBeta,
-    isDev,
-  }
-}
+import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
+
+export function useAppVersion(): UI_I_UseAppVersionReturnType {
+  const config = useRuntimeConfig()
+  const version = config.public.APP_VERSION
+
+  const regexHasDot = /\./
+  const regexHasDotAndB = /\..*b/
+  const regexHasDotAndD = /\..*d/
+
+  const isBeta = regexHasDotAndB.test(version)
+  const isDev =
+    regexHasDotAndD.test(version) ||
+    (!regexHasDot.test(version) && version.length < 8)
+
+  return {
+    version,
+    isBeta,
+    isDev,
+  }
+}

package/composables/useEnvLanguage.ts

@@ -1,20 +1,20 @@
-export function useEnvLanguage(): string {
-  const { $store }: any = useNuxtApp()
-
-  let localizationCode = 'en_US'
-  const langFromLocalStorage =
-    useLocalStorage('lang') || $store.getters['main/getInterfaceLang'] // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
-  if (langFromLocalStorage) {
-    if (
-      langFromLocalStorage === 'en_US' ||
-      langFromLocalStorage === 'ru_RU' ||
-      langFromLocalStorage === 'hy_AM'
-    ) {
-      localizationCode = langFromLocalStorage
-    }
-  }
-
-  localizationCode = localizationCode.slice(0, 2).toUpperCase()
-
-  return localizationCode
-}
+export function useEnvLanguage(): string {
+  const { $store }: any = useNuxtApp()
+
+  let localizationCode = 'en_US'
+  const langFromLocalStorage =
+    useLocalStorage('lang') || $store.getters['main/getInterfaceLang'] // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
+  if (langFromLocalStorage) {
+    if (
+      langFromLocalStorage === 'en_US' ||
+      langFromLocalStorage === 'ru_RU' ||
+      langFromLocalStorage === 'hy_AM'
+    ) {
+      localizationCode = langFromLocalStorage
+    }
+  }
+
+  localizationCode = localizationCode.slice(0, 2).toUpperCase()
+
+  return localizationCode
+}

package/composables/useLocal.ts

@@ -1,38 +1,38 @@
-import localRu from '~/assets/localization/local_ru.json'
-import localEn from '~/assets/localization/local_en.json'
-import localHy from '~/assets/localization/local_hy.json'
-import localZh from '~/assets/localization/local_zh.json'
-import localKk from '~/assets/localization/local_kk.json'
-import localBe from '~/assets/localization/local_be.json'
-const locals = {
-  localRu,
-  localEn,
-  localHy,
-  localZh,
-  localKk,
-  localBe,
-}
-export const useLocal = () => {
-  const config = useRuntimeConfig()
-
-  const code: string = config?.public?.LOCALIZATION_CODE?.toLowerCase() || 'ru'
-
-  document.getElementsByTagName('html')[0].setAttribute('lang', code)
-
-  switch (code) {
-    case 'ru':
-      return locals.localRu
-    case 'en':
-      return locals.localEn
-    case 'hy':
-      return locals.localHy
-    case 'zh':
-      return locals.localZh
-    case 'kk':
-      return locals.localKk
-    case 'be':
-      return locals.localBe
-    default:
-      return locals.localRu
-  }
-}
+import localRu from '~/assets/localization/local_ru.json'
+import localEn from '~/assets/localization/local_en.json'
+import localHy from '~/assets/localization/local_hy.json'
+import localZh from '~/assets/localization/local_zh.json'
+import localKk from '~/assets/localization/local_kk.json'
+import localBe from '~/assets/localization/local_be.json'
+const locals = {
+  localRu,
+  localEn,
+  localHy,
+  localZh,
+  localKk,
+  localBe,
+}
+export const useLocal = () => {
+  const config = useRuntimeConfig()
+
+  const code: string = config?.public?.LOCALIZATION_CODE?.toLowerCase() || 'ru'
+
+  document.getElementsByTagName('html')[0].setAttribute('lang', code)
+
+  switch (code) {
+    case 'ru':
+      return locals.localRu
+    case 'en':
+      return locals.localEn
+    case 'hy':
+      return locals.localHy
+    case 'zh':
+      return locals.localZh
+    case 'kk':
+      return locals.localKk
+    case 'be':
+      return locals.localBe
+    default:
+      return locals.localRu
+  }
+}

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.138",
+  "version": "1.3.140",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",