bfg-common 1.1.106 → 1.2.0

package/minify.js

@@ -1,51 +1,126 @@
-const fs = require('fs');
-const terser = require('terser');
-const path = require('path');
-
-// Папка, в которой находятся ваши исходные файлы
-const sourceFolder = 'public/spice-console';
-
-// Папка, в которую вы хотите сохранить минифицированные файлы
-const outputFolder = 'public/spice-console-minify';
-
-// Создайте папку назначения, если она не существует
-if (!fs.existsSync(outputFolder)) {
-    fs.mkdirSync(outputFolder, { recursive: true });
-}
-
-// Функция для рекурсивной обработки файлов и папок
-function processFilesInFolder(folderPath) {
-    fs.readdirSync(folderPath).forEach((file) => {
-        const filePath = path.join(folderPath, file);
-        if (fs.statSync(filePath).isDirectory()) {
-            // Если это папка, вызываем функцию рекурсивно
-            processFilesInFolder(filePath);
-        } else if (path.extname(file) === '.js') {
-            // Если это файл с расширением .js, минифицируем его
-            const fileContent = fs.readFileSync(filePath, 'utf8');
-            terser.minify(fileContent).then((minified) => {
-                if (minified.error) {
-                    console.error(`Ошибка при минификации файла ${file}: ${minified.error.message}`);
-                } else {
-                    const outputPath = path.join(
-                        outputFolder,
-                        filePath.substring(sourceFolder.length + 1)
-                            .replace('.min.js', '.js') // Если файл уже минифиц., то нужно изменить на .js, чтобы не было дублей .min.min.js
-                            .replace('.js', '.min.js')
-                    );
-
-                    // Создайте папку для выходного файла, если она не существует
-                    const outputDir = path.dirname(outputPath);
-                    if (!fs.existsSync(outputDir)) {
-                        fs.mkdirSync(outputDir, { recursive: true });
-                    }
-
-                    fs.writeFileSync(outputPath, minified.code);
-                }
-            })
-        }
-    });
-}
-
-// Запускаем обработку файлов в sourceFolder
-processFilesInFolder(sourceFolder);
+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',
+]
+
+// Папка и файл в которую вы хотите сохранить минифицированные файлы
+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
+      index++
+
+      // Если последний файл то все помещаем в run.min.js
+      if (filesByOrder.length - 1 === index)
+        fs.writeFileSync(outputFile, runMinJsContent)
+    }
+  })
+})

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.1.106",
+  "version": "1.2.0",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
-    "postinstall": "nuxt prepare"
+    "postinstall": "nuxt prepare",
+    "minify": "node minify.js",
+    "prepublishOnly": "npm run minify"
   },
   "devDependencies": {
     "@novnc/novnc": "^1.4.0",

package/plugins/spice-console/spice.console.ts

@@ -1,127 +1,17 @@
-const loadSpiceScripts = (src: string, callback: () => void) => {
+const loadSpiceScripts = (src: string) => {
   const script = document.createElement('script')
   script.src = src
-  script.onload = callback
 
   document.head.appendChild(script)
 }
 // @ts-ignore
 window.config = useRuntimeConfig()
 
-
-const isMinify = true
-const rootFolderName = isMinify ? 'spice-console-minify' : 'spice-console'
-const fileType = isMinify ? '.min.js' : '.js'
-const libsSrc: string[] = [
-  // `/${rootFolderName}/lib/decoder/jmuxer${fileType}`,
-  // `/${rootFolderName}/lib/decoder/dixie${fileType}`,
-  // `/${rootFolderName}/lib/jquery-2.0.3${fileType}`,
-  // `/${rootFolderName}/lib/utils${fileType}`,
-  // `/${rootFolderName}/lib/modernizr${fileType}`,
-  // `/${rootFolderName}/lib/jquery-mousewheel${fileType}`,
-  // `/${rootFolderName}/lib/jquery-visibility.min.js`,
-  // `/${rootFolderName}/lib/lodash.4.0.0.min.js`,
-  // `/${rootFolderName}/lib/jgestures.min.js`,
-  // `/${rootFolderName}/lib/pixastic${fileType}`,
-  // `/${rootFolderName}/lib/base64${fileType}`,
-  // `/${rootFolderName}/lib/biginteger${fileType}`,
-  // `/${rootFolderName}/lib/virtualjoystick${fileType}`,
-  // `/${rootFolderName}/lib/prettyprint${fileType}`,
-  // `/${rootFolderName}/lib/jsbn${fileType}`,
-  // `/${rootFolderName}/lib/jsbn2${fileType}`,
-  // `/${rootFolderName}/lib/prng4${fileType}`,
-  // `/${rootFolderName}/lib/rng${fileType}`,
-  // `/${rootFolderName}/lib/sha1${fileType}`,
-  // `/${rootFolderName}/lib/encrypt${fileType}`,
-  // `/${rootFolderName}/swcanvas/swcanvas${fileType}`,
-  // `/${rootFolderName}/lib/bowser${fileType}`,
-  // `/${rootFolderName}/lib/flipper${fileType}`,
-  // `/${rootFolderName}/lib/CollisionDetector${fileType}`,
-  // `/${rootFolderName}/lib/GlobalPool${fileType}`,
-  // `/${rootFolderName}/lib/GenericObjectPool${fileType}`,
-  // `/${rootFolderName}/lib/AsyncConsumer${fileType}`,
-  // `/${rootFolderName}/lib/AsyncWorker${fileType}`,
-  // `/${rootFolderName}/lib/PacketWorkerIdentifier${fileType}`,
-  // `/${rootFolderName}/spiceobjects/spiceobjects${fileType}`,
-  // `/${rootFolderName}/spiceobjects/generated/protocol${fileType}`,
-  // `/${rootFolderName}/lib/graphicdebug${fileType}`,
-  // `/${rootFolderName}/lib/images/lz${fileType}`,
-  // `/${rootFolderName}/lib/images/bitmap${fileType}`,
-  // `/${rootFolderName}/lib/images/png${fileType}`,
-  // `/${rootFolderName}/lib/runqueue${fileType}`,
-  // `/${rootFolderName}/lib/graphic${fileType}`,
-  // `/${rootFolderName}/lib/queue${fileType}`,
-  // `/${rootFolderName}/lib/ImageUncompressor${fileType}`,
-  // `/${rootFolderName}/lib/SyncAsyncHandler${fileType}`,
-  // `/${rootFolderName}/lib/IntegrationBenchmark${fileType}`,
-  // `/${rootFolderName}/lib/stuckkeyshandler${fileType}`,
-  // `/${rootFolderName}/lib/timelapsedetector${fileType}`,
-  // `/${rootFolderName}/lib/displayRouter${fileType}`,
-  // `/${rootFolderName}/lib/rasterEngine${fileType}`,
-  // `/${rootFolderName}/lib/DataLogger${fileType}`,
-  // `/${rootFolderName}/network/socket${fileType}`,
-  // `/${rootFolderName}/network/clusternodechooser${fileType}`,
-  // `/${rootFolderName}/network/socketqueue${fileType}`,
-  // `/${rootFolderName}/network/packetcontroller${fileType}`,
-  // `/${rootFolderName}/network/packetextractor${fileType}`,
-  // `/${rootFolderName}/network/packetreassembler${fileType}`,
-  // `/${rootFolderName}/network/reassemblerfactory${fileType}`,
-  // `/${rootFolderName}/network/sizedefiner${fileType}`,
-  // `/${rootFolderName}/network/packetlinkfactory${fileType}`,
-  // `/${rootFolderName}/network/spicechannel${fileType}`,
-  // `/${rootFolderName}/network/busconnection${fileType}`,
-  // `/${rootFolderName}/network/websocketwrapper${fileType}`,
-  // `/${rootFolderName}/network/connectioncontrol${fileType}`,
-  // `/${rootFolderName}/application/checkActivity${fileType}`,
-  // `/${rootFolderName}/application/agent${fileType}`,
-  // `/${rootFolderName}/application/codec${fileType}`,
-  // `/${rootFolderName}/application/clipboard${fileType}`,
-  // `/${rootFolderName}/application/clipboard/clipboarddataparser${fileType}`,
-  // `/${rootFolderName}/application/clipboard/local/localClipboard${fileType}`,
-  // `/${rootFolderName}/application/spiceconnection${fileType}`,
-  // `/${rootFolderName}/application/clientgui${fileType}`,
-  // `/${rootFolderName}/application/packetprocess${fileType}`,
-  // `/${rootFolderName}/application/packetfilter${fileType}`,
-  // `/${rootFolderName}/application/packetfactory${fileType}`,
-  // `/${rootFolderName}/application/application${fileType}`,
-  // `/${rootFolderName}/application/virtualmouse${fileType}`,
-  // `/${rootFolderName}/application/imagecache${fileType}`,
-  // `/${rootFolderName}/application/rasteroperation${fileType}`,
-  // `/${rootFolderName}/application/stream${fileType}`,
-  // `/${rootFolderName}/application/inputmanager${fileType}`,
-  // `/${rootFolderName}/process/busprocess${fileType}`,
-  // `/${rootFolderName}/process/displayprocess${fileType}`,
-  // `/${rootFolderName}/process/displaypreprocess${fileType}`,
-  // `/${rootFolderName}/process/inputprocess${fileType}`,
-  // `/${rootFolderName}/process/cursorprocess${fileType}`,
-  // `/${rootFolderName}/process/playbackprocess${fileType}`,
-  // `/${rootFolderName}/process/mainprocess${fileType}`,
-  // `/${rootFolderName}/keymaps/keyevent${fileType}`,
-  // `/${rootFolderName}/keymaps/keymapes${fileType}`,
-  // `/${rootFolderName}/keymaps/scanCodeObjProvider${fileType}`,
-  // `/${rootFolderName}/keymaps/scanCodeObjModifier${fileType}`,
-  // `/${rootFolderName}/keymaps/keymapesObj${fileType}`,
-  // `/${rootFolderName}/keymaps/keymapus${fileType}`,
-  // `/${rootFolderName}/keymaps/keymap${fileType}`,
-  `/${rootFolderName}/run${fileType}`,
-]
-const isJqueryLoaded = ref<boolean>(false)
-
-const loadSpiceScriptsRecursion = (index: number) => {
-  const src = libsSrc[index]
-  if (!src) return
-
-  loadSpiceScripts(src, () => {
-    isJqueryLoaded.value = true
-    loadSpiceScriptsRecursion(index + 1)
-  })
-}
-
-const init = (wsUrl) => {
+const init = (wsUrl: string) => {
   window.CONSOLE = {
     wsUrl
   }
-  loadSpiceScriptsRecursion(0)
+  loadSpiceScripts('/spice-console-minify/run.min.js')
 }
 export default {
   init