From 3384e47e202ffd7edd72ff9aa18b3549f5533cb0 Mon Sep 17 00:00:00 2001 From: Elijah R Date: Tue, 25 Jun 2024 20:09:34 -0400 Subject: [PATCH] use msgpackr instead of @ygoe/msgpack --- cvmts/package.json | 2 +- cvmts/src/CollabVMServer.ts | 2 +- yarn.lock | 21 +++++++++++++-------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/cvmts/package.json b/cvmts/package.json index 81246fe..3602618 100644 --- a/cvmts/package.json +++ b/cvmts/package.json @@ -14,9 +14,9 @@ "@cvmts/cvm-rs": "*", "@cvmts/qemu": "*", "@maxmind/geoip2-node": "^5.0.0", - "@ygoe/msgpack": "^1.0.3", "execa": "^8.0.1", "mnemonist": "^0.39.5", + "msgpackr": "^1.10.2", "sharp": "^0.33.3", "toml": "^3.0.0", "ws": "^8.14.1" diff --git a/cvmts/src/CollabVMServer.ts b/cvmts/src/CollabVMServer.ts index fa1ece8..b9f832e 100644 --- a/cvmts/src/CollabVMServer.ts +++ b/cvmts/src/CollabVMServer.ts @@ -15,7 +15,7 @@ import { Size, Rect, Logger } from '@cvmts/shared'; import { JPEGEncoder } from './JPEGEncoder.js'; import VM from './VM.js'; import { ReaderModel } from '@maxmind/geoip2-node'; -import msgpack from "@ygoe/msgpack"; +import * as msgpack from 'msgpackr'; import { CollabVMProtocolMessage, CollabVMProtocolMessageType } from './protocol/CollabVMProtocolMessage.js'; // Instead of strange hacks we can just use nodejs provided diff --git a/yarn.lock b/yarn.lock index 81a1c39..6df216a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -64,9 +64,9 @@ __metadata: "@maxmind/geoip2-node": "npm:^5.0.0" "@types/node": "npm:^20.12.5" "@types/ws": "npm:^8.5.5" - "@ygoe/msgpack": "npm:^1.0.3" execa: "npm:^8.0.1" mnemonist: "npm:^0.39.5" + msgpackr: "npm:^1.10.2" prettier: "npm:^3.2.5" sharp: "npm:^0.33.3" toml: "npm:^3.0.0" @@ -1571,13 +1571,6 @@ __metadata: languageName: node linkType: hard -"@ygoe/msgpack@npm:^1.0.3": - version: 1.0.3 - resolution: "@ygoe/msgpack@npm:1.0.3" - checksum: 10c0/f4a9adc86f41b6ccc07fd7756adac28b71a38e6fb741ff4943b338f3bb6283154ae9ebf0614fa40e78cd3c09bbd79f4c5e60e136a8136a99a2b8385ba4710ed7 - languageName: node - linkType: hard - "abbrev@npm:^2.0.0": version: 2.0.0 resolution: "abbrev@npm:2.0.0" @@ -3105,6 +3098,18 @@ __metadata: languageName: node linkType: hard +"msgpackr@npm:^1.10.2": + version: 1.10.2 + resolution: "msgpackr@npm:1.10.2" + dependencies: + msgpackr-extract: "npm:^3.0.2" + dependenciesMeta: + msgpackr-extract: + optional: true + checksum: 10c0/eb0a47b3d32a3be92f7a5b1182a67e5d9bfd5668d1aed63d3df03480a06798311eea339319b442ffafe83de19d9f3c9c6ac4d9081af0c9f896599d766a53db20 + languageName: node + linkType: hard + "msgpackr@npm:^1.9.5, msgpackr@npm:^1.9.9": version: 1.10.1 resolution: "msgpackr@npm:1.10.1"