bfg-common 1.5.471 → 1.5.473

package/lib/utils/utils.ts

@@ -1,60 +1,60 @@
-import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
-export const enumKeyFromValue = (
-  enumObj: UI_I_ArbitraryObject<string | number>,
-  value: string
-): string | undefined => {
-  // Преобразуем enum в массив пар [ключ, значение] и находим нужную пару
-  const dataFromEnum = Object.entries(enumObj).find(([_, val]) => val === value)
-
-  // Возвращаем ключ, если найдена пара, иначе undefined
-  return dataFromEnum ? dataFromEnum[0] : undefined
-}
-
-export const extractContentInBrackets = (inputString: string): string => {
-  const regex = /\[([^\]]+)\]/
-  const match = inputString.match(regex)
-
-  return match ? match[1] : ''
-}
-export const extractContentLastSlash = (
-    inputString: string,
-    after = false
-): string => {
-  const regex = after ? /\/([^/]+)\/?$/ : /(.*)\//
-
-  const match = inputString.match(regex)
-
-  return match ? match[1] : ''
-}
-
-export const removeLastSlash = (
-    inputString: string
-): string => {
-  return inputString.endsWith('/') ? inputString.slice(0, -1) : inputString
-}
-
-export const intToIp = (value: number): string => {
-  return [
-    (value >> 24) & 0xff,
-    (value >> 16) & 0xff,
-    (value >> 8) & 0xff,
-    value & 0xff,
-  ].join('.')
-}
-
-export const ipToUint32 = (ip: string): number => {
-  const octets = ip.split('.').map(Number)
-  if (
-    octets.length !== 4 ||
-    octets.some((octet) => isNaN(octet) || octet < 0 || octet > 255)
-  ) {
-    return 0
-  }
-  return (
-    (((octets[0] << 24) >>> 0) |
-      (octets[1] << 16) |
-      (octets[2] << 8) |
-      octets[3]) >>>
-    0
-  )
-}
+import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
+export const enumKeyFromValue = (
+  enumObj: UI_I_ArbitraryObject<string | number>,
+  value: string
+): string | undefined => {
+  // Преобразуем enum в массив пар [ключ, значение] и находим нужную пару
+  const dataFromEnum = Object.entries(enumObj).find(([_, val]) => val === value)
+
+  // Возвращаем ключ, если найдена пара, иначе undefined
+  return dataFromEnum ? dataFromEnum[0] : undefined
+}
+
+export const extractContentInBrackets = (inputString: string): string => {
+  const regex = /\[([^\]]+)\]/
+  const match = inputString.match(regex)
+
+  return match ? match[1] : ''
+}
+export const extractContentLastSlash = (
+    inputString: string,
+    after = false
+): string => {
+  const regex = after ? /\/([^/]+)\/?$/ : /(.*)\//
+
+  const match = inputString.match(regex)
+
+  return match ? match[1] : ''
+}
+
+export const removeLastSlash = (
+    inputString: string
+): string => {
+  return inputString.endsWith('/') ? inputString.slice(0, -1) : inputString
+}
+
+export const intToIp = (value: number): string => {
+  return [
+    (value >> 24) & 0xff,
+    (value >> 16) & 0xff,
+    (value >> 8) & 0xff,
+    value & 0xff,
+  ].join('.')
+}
+
+export const ipToUint32 = (ip: string): number => {
+  const octets = ip.split('.').map(Number)
+  if (
+    octets.length !== 4 ||
+    octets.some((octet) => isNaN(octet) || octet < 0 || octet > 255)
+  ) {
+    return 0
+  }
+  return (
+    (((octets[0] << 24) >>> 0) |
+      (octets[1] << 16) |
+      (octets[2] << 8) |
+      octets[3]) >>>
+    0
+  )
+}

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/modules/fixContentBuild/index.ts

@@ -1,91 +1,91 @@
-import { defineNuxtModule } from '@nuxt/kit'
-const fs = require('fs')
-const path = require('path')
-import {
-  replaceFileContent,
-  removeNonImageFiles,
-  removeImagesFromContent,
-  updateImagesPathAndCustomComponents,
-} from './lib/utils/methods'
-
-// const npmDev = (): void => {
-//   const contentPath = path.join(
-//     __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
-//     'content',
-//     'help'
-//   )
-//   // Заменяем кастомные тэги
-//   updateCustomComponents(contentPath)
-// }
-
-const npmGenerate = (): void => {
-  // Правим путь к файлу
-  const filePath = path.join(
-    __dirname.replace('/bfg-common/modules/fixContentBuild', ''),
-    '@nuxt',
-    'content',
-    'dist',
-    'runtime',
-    'legacy',
-    'composables',
-    'query.js'
-  )
-  const searchString = '/query/${hash(params)}'
-  const replacementString = 'cache'
-  replaceFileContent(filePath, searchString, replacementString)
-  // End block
-
-  // Переносим весь контент и удаляем все файлы кроме картинок
-  const contentPath = path.join(
-    __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
-    'content',
-    'help'
-  )
-  if (!fs.existsSync(contentPath)) return
-
-  const publicPath = path.join(
-    __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
-    'public',
-    'images'
-  )
-  fs.cp(contentPath, publicPath, { recursive: true }, () => {
-    // Удаляем все файлы кроме картинок
-    removeNonImageFiles(publicPath)
-
-    // Удаляем картинки из папки content
-    removeImagesFromContent(contentPath)
-
-    // Правим путь к картинкам и заменяем кастомные тэги
-    updateImagesPathAndCustomComponents(contentPath)
-  })
-  // End block
-}
-
-// @ts-ignore
-export default defineNuxtModule(() => {
-  switch (process.env.npm_command) {
-    case 'run-script':
-      // npmDev()
-      break
-    case 'exec':
-      npmGenerate()
-      break
-  }
-})
-
-// export default defineNuxtModule({
-//   meta: {
-//     name: 'fix-content-build',
-//     configKey: 'fixContentBuild',
-//   },
-//   setup() {
-//     switch (process.env.npm_command) {
-//       case 'run-script':
-//         // npmDev()
-//         break
-//       case 'exec':
-//         npmGenerate()
-//         break
-//     }
-//   },
-// })
+import { defineNuxtModule } from '@nuxt/kit'
+const fs = require('fs')
+const path = require('path')
+import {
+  replaceFileContent,
+  removeNonImageFiles,
+  removeImagesFromContent,
+  updateImagesPathAndCustomComponents,
+} from './lib/utils/methods'
+
+// const npmDev = (): void => {
+//   const contentPath = path.join(
+//     __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
+//     'content',
+//     'help'
+//   )
+//   // Заменяем кастомные тэги
+//   updateCustomComponents(contentPath)
+// }
+
+const npmGenerate = (): void => {
+  // Правим путь к файлу
+  const filePath = path.join(
+    __dirname.replace('/bfg-common/modules/fixContentBuild', ''),
+    '@nuxt',
+    'content',
+    'dist',
+    'runtime',
+    'legacy',
+    'composables',
+    'query.js'
+  )
+  const searchString = '/query/${hash(params)}'
+  const replacementString = 'cache'
+  replaceFileContent(filePath, searchString, replacementString)
+  // End block
+
+  // Переносим весь контент и удаляем все файлы кроме картинок
+  const contentPath = path.join(
+    __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
+    'content',
+    'help'
+  )
+  if (!fs.existsSync(contentPath)) return
+
+  const publicPath = path.join(
+    __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
+    'public',
+    'images'
+  )
+  fs.cp(contentPath, publicPath, { recursive: true }, () => {
+    // Удаляем все файлы кроме картинок
+    removeNonImageFiles(publicPath)
+
+    // Удаляем картинки из папки content
+    removeImagesFromContent(contentPath)
+
+    // Правим путь к картинкам и заменяем кастомные тэги
+    updateImagesPathAndCustomComponents(contentPath)
+  })
+  // End block
+}
+
+// @ts-ignore
+export default defineNuxtModule(() => {
+  switch (process.env.npm_command) {
+    case 'run-script':
+      // npmDev()
+      break
+    case 'exec':
+      npmGenerate()
+      break
+  }
+})
+
+// export default defineNuxtModule({
+//   meta: {
+//     name: 'fix-content-build',
+//     configKey: 'fixContentBuild',
+//   },
+//   setup() {
+//     switch (process.env.npm_command) {
+//       case 'run-script':
+//         // npmDev()
+//         break
+//       case 'exec':
+//         npmGenerate()
+//         break
+//     }
+//   },
+// })