From ec4c3fd98e8fab5bce44cab31930f985665a0c84 Mon Sep 17 00:00:00 2001 From: Rune Harlyk Date: Thu, 10 Jul 2025 18:46:14 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9E=96=20Changes=20mgspack=20dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/package.json | 4 +-- app/pnpm-lock.yaml | 66 +++++++----------------------------- app/src/lib/stores/socket.ts | 6 ++-- 3 files changed, 16 insertions(+), 60 deletions(-) diff --git a/app/package.json b/app/package.json index 70ff8b4..5ae481a 100644 --- a/app/package.json +++ b/app/package.json @@ -45,16 +45,14 @@ }, "type": "module", "dependencies": { + "@msgpack/msgpack": "^3.1.2", "@niku/vite-env-caster": "^1.0.2", "@sveltejs/adapter-auto": "^4.0.0", "@tailwindcss/vite": "^4.0.12", - "@types/msgpack-lite": "^0.1.11", "chart.js": "^4.4.2", "compare-versions": "^6.1.0", "cross-env": "^7.0.3", "daisyui": "^5.0.0", - "jwt-decode": "^4.0.0", - "msgpack-lite": "^0.1.26", "nipplejs": "^0.10.1", "svelte-dnd-list": "^0.1.8", "svelte-modals": "^2.0.0", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 5576d58..78d5862 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -8,6 +8,9 @@ importers: .: dependencies: + '@msgpack/msgpack': + specifier: ^3.1.2 + version: 3.1.2 '@niku/vite-env-caster': specifier: ^1.0.2 version: 1.1.2 @@ -17,9 +20,6 @@ importers: '@tailwindcss/vite': specifier: ^4.0.12 version: 4.0.12(vite@6.2.1(@types/node@24.0.12)(jiti@2.4.2)(lightningcss@1.29.2)(yaml@2.4.2)) - '@types/msgpack-lite': - specifier: ^0.1.11 - version: 0.1.11 chart.js: specifier: ^4.4.2 version: 4.4.2 @@ -32,12 +32,6 @@ importers: daisyui: specifier: ^5.0.0 version: 5.0.0 - jwt-decode: - specifier: ^4.0.0 - version: 4.0.0 - msgpack-lite: - specifier: ^0.1.26 - version: 0.1.26 nipplejs: specifier: ^0.10.1 version: 0.10.1 @@ -515,6 +509,10 @@ packages: '@kurkle/color@0.3.2': resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==} + '@msgpack/msgpack@3.1.2': + resolution: {integrity: sha512-JEW4DEtBzfe8HvUYecLU9e6+XJnKDlUAIve8FvPzF3Kzs6Xo/KuZkZJsDH0wJXl/qEZbeeE7edxDNY3kMs39hQ==} + engines: {node: '>= 18'} + '@niku/vite-env-caster@1.1.2': resolution: {integrity: sha512-6I/8REFdmfeGnK92H3nYHGc6lExwjm72jLxAsDPlfji97Eej4rOMl6WuYGLgsQI0pl5RrMRMveeRdijdL6hW+Q==} @@ -766,9 +764,6 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/msgpack-lite@0.1.11': - resolution: {integrity: sha512-cdCZS/gw+jIN22I4SUZUFf1ZZfVv5JM1//Br/MuZcI373sxiy3eSSoiyLu0oz+BPatTbGGGBO5jrcvd0siCdTQ==} - '@types/node@24.0.12': resolution: {integrity: sha512-LtOrbvDf5ndC9Xi+4QZjVL0woFymF/xSTKZKPgrrl7H7XoeDvnD+E2IclKVDyaK9UM756W/3BXqSU+JEHopA9g==} @@ -1202,9 +1197,6 @@ packages: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} - event-lite@0.1.3: - resolution: {integrity: sha512-8qz9nOz5VeD2z96elrEKD2U433+L3DWdUdDkOINLGOJvx1GsMBbMn0aCeu28y8/e85A6mCigBiFlYMnTBEGlSw==} - execa@5.1.1: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} engines: {node: '>=10'} @@ -1350,9 +1342,6 @@ packages: resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} engines: {node: '>=0.10.0'} - ieee754@1.2.1: - resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} - ignore@5.3.1: resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==} engines: {node: '>= 4'} @@ -1374,9 +1363,6 @@ packages: inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - int64-buffer@0.1.10: - resolution: {integrity: sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA==} - is-binary-path@2.1.0: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} @@ -1415,9 +1401,6 @@ packages: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - isarray@1.0.0: - resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} - isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} @@ -1447,10 +1430,6 @@ packages: json-stable-stringify-without-jsonify@1.0.1: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} - jwt-decode@4.0.0: - resolution: {integrity: sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==} - engines: {node: '>=18'} - keyv@4.5.4: resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} @@ -1616,10 +1595,6 @@ packages: ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - msgpack-lite@0.1.26: - resolution: {integrity: sha512-SZ2IxeqZ1oRFGo0xFGbvBJWMp3yLIY9rlIJyxy8CGrwZn1f0ZK4r6jV/AM1r0FZMDUkWkglOk/eeKIL9g77Nxw==} - hasBin: true - nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -2563,6 +2538,8 @@ snapshots: '@kurkle/color@0.3.2': {} + '@msgpack/msgpack@3.1.2': {} + '@niku/vite-env-caster@1.1.2': dependencies: chalk: 4.1.2 @@ -2768,13 +2745,10 @@ snapshots: '@types/json-schema@7.0.15': {} - '@types/msgpack-lite@0.1.11': - dependencies: - '@types/node': 24.0.12 - '@types/node@24.0.12': dependencies: undici-types: 7.8.0 + optional: true '@types/semver@7.5.8': {} @@ -3298,8 +3272,6 @@ snapshots: esutils@2.0.3: {} - event-lite@0.1.3: {} - execa@5.1.1: dependencies: cross-spawn: 7.0.3 @@ -3455,8 +3427,6 @@ snapshots: dependencies: safer-buffer: 2.1.2 - ieee754@1.2.1: {} - ignore@5.3.1: {} import-fresh@3.3.0: @@ -3475,8 +3445,6 @@ snapshots: inherits@2.0.4: {} - int64-buffer@0.1.10: {} - is-binary-path@2.1.0: dependencies: binary-extensions: 2.3.0 @@ -3503,8 +3471,6 @@ snapshots: is-stream@3.0.0: {} - isarray@1.0.0: {} - isexe@2.0.0: {} jiti@2.4.2: {} @@ -3547,8 +3513,6 @@ snapshots: json-stable-stringify-without-jsonify@1.0.1: {} - jwt-decode@4.0.0: {} - keyv@4.5.4: dependencies: json-buffer: 3.0.1 @@ -3682,13 +3646,6 @@ snapshots: ms@2.1.3: {} - msgpack-lite@0.1.26: - dependencies: - event-lite: 0.1.3 - ieee754: 1.2.1 - int64-buffer: 0.1.10 - isarray: 1.0.0 - nanoid@3.3.7: {} nanoid@3.3.8: {} @@ -4064,7 +4021,8 @@ snapshots: ufo@1.5.3: {} - undici-types@7.8.0: {} + undici-types@7.8.0: + optional: true universalify@0.2.0: {} diff --git a/app/src/lib/stores/socket.ts b/app/src/lib/stores/socket.ts index 6c5004e..951938e 100644 --- a/app/src/lib/stores/socket.ts +++ b/app/src/lib/stores/socket.ts @@ -1,5 +1,5 @@ import { writable } from 'svelte/store'; -import msgpack from 'msgpack-lite'; +import { encode, decode } from '@msgpack/msgpack'; const socketEvents = ['open', 'close', 'error', 'message', 'unresponsive'] as const; type SocketEvent = (typeof socketEvents)[number]; @@ -13,7 +13,7 @@ const decodeMessage = (data: string | ArrayBuffer): SocketMessage | null => { try { if (useBinary) { - return msgpack.decode(new Uint8Array(data as ArrayBuffer)); + return decode(new Uint8Array(data as ArrayBuffer)) as SocketMessage; } return JSON.parse(data as string); } catch (error) { @@ -24,7 +24,7 @@ const decodeMessage = (data: string | ArrayBuffer): SocketMessage | null => { const encodeMessage = (data: unknown) => { try { - return useBinary ? msgpack.encode(data) : JSON.stringify(data); + return useBinary ? encode(data) : JSON.stringify(data); } catch (error) { console.error(`Could not encode data: ${data} - ${error}`); }