From 89a0473f4168dfff1f0b6cf527a58c146844eb52 Mon Sep 17 00:00:00 2001 From: Percs <83934299+Percslol@users.noreply.github.com> Date: Thu, 26 Dec 2024 02:30:36 -0600 Subject: [PATCH] feat: switch to wisp-js for dev server and update libcurl transport --- package.json | 16 +-- pnpm-lock.yaml | 305 +++++++++++++++++++++++++------------------------ server.js | 2 +- 3 files changed, 164 insertions(+), 159 deletions(-) diff --git a/package.json b/package.json index 766a4c3..8f2c3e0 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,8 @@ "@fastify/static": "^8.0.3", "@mercuryworkshop/bare-as-module3": "^2.2.5", "@mercuryworkshop/epoxy-transport": "^2.1.27", - "@mercuryworkshop/libcurl-transport": "^1.3.14", + "@mercuryworkshop/libcurl-transport": "^1.3.15", + "@mercuryworkshop/wisp-js": "^0.3.3", "@nebula-services/bare-server-node": "^2.0.4", "@playwright/test": "^1.49.1", "@rsdoctor/rspack-plugin": "^0.4.12", @@ -44,24 +45,23 @@ "@types/eslint": "^9.6.1", "@types/estree": "^1.0.6", "@types/node": "^22.10.2", - "@types/serviceworker": "^0.0.107", - "@typescript-eslint/eslint-plugin": "^8.18.1", - "@typescript-eslint/parser": "^8.18.1", + "@types/serviceworker": "^0.0.108", + "@typescript-eslint/eslint-plugin": "^8.18.2", + "@typescript-eslint/parser": "^8.18.2", "dotenv": "^16.4.7", "eslint": "^9.17.0", "fastify": "^5.2.0", "playwright": "^1.49.1", "prettier": "^3.4.2", "tslib": "^2.8.1", - "typescript": "^5.7.2", - "wisp-server-node": "^1.1.7" + "typescript": "^5.7.2" }, "dependencies": { "@mercuryworkshop/bare-mux": "^2.1.7", "dom-serializer": "^2.0.0", "domhandler": "^5.0.3", - "domutils": "^3.1.0", - "htmlparser2": "^9.1.0", + "domutils": "^3.2.1", + "htmlparser2": "10.0.0", "parse-domain": "^8.2.2", "set-cookie-parser": "^2.7.1" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1aa7a21..2673e99 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,11 +18,11 @@ importers: specifier: ^5.0.3 version: 5.0.3 domutils: - specifier: ^3.1.0 - version: 3.1.0 + specifier: ^3.2.1 + version: 3.2.1 htmlparser2: - specifier: ^9.1.0 - version: 9.1.0 + specifier: 10.0.0 + version: 10.0.0 parse-domain: specifier: ^8.2.2 version: 8.2.2 @@ -49,20 +49,23 @@ importers: specifier: ^2.1.27 version: 2.1.27 '@mercuryworkshop/libcurl-transport': - specifier: ^1.3.14 - version: 1.3.14 + specifier: ^1.3.15 + version: 1.3.15 + '@mercuryworkshop/wisp-js': + specifier: ^0.3.3 + version: 0.3.3 '@nebula-services/bare-server-node': specifier: ^2.0.4 - version: 2.0.4(bufferutil@4.0.8)(utf-8-validate@6.0.5) + version: 2.0.4(bufferutil@4.0.8) '@playwright/test': specifier: ^1.49.1 version: 1.49.1 '@rsdoctor/rspack-plugin': specifier: ^0.4.12 - version: 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1) + version: 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(webpack@5.97.1) '@rspack/cli': specifier: ^1.1.8 - version: 1.1.8(@rspack/core@1.1.8)(@types/express@4.17.21)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1) + version: 1.1.8(@rspack/core@1.1.8)(@types/express@4.17.21)(bufferutil@4.0.8)(webpack@5.97.1) '@rspack/core': specifier: ^1.1.8 version: 1.1.8 @@ -76,14 +79,14 @@ importers: specifier: ^22.10.2 version: 22.10.2 '@types/serviceworker': - specifier: ^0.0.107 - version: 0.0.107 + specifier: ^0.0.108 + version: 0.0.108 '@typescript-eslint/eslint-plugin': - specifier: ^8.18.1 - version: 8.18.1(@typescript-eslint/parser@8.18.1(eslint@9.17.0)(typescript@5.7.2))(eslint@9.17.0)(typescript@5.7.2) + specifier: ^8.18.2 + version: 8.18.2(@typescript-eslint/parser@8.18.2(eslint@9.17.0)(typescript@5.7.2))(eslint@9.17.0)(typescript@5.7.2) '@typescript-eslint/parser': - specifier: ^8.18.1 - version: 8.18.1(eslint@9.17.0)(typescript@5.7.2) + specifier: ^8.18.2 + version: 8.18.2(eslint@9.17.0)(typescript@5.7.2) dotenv: specifier: ^16.4.7 version: 16.4.7 @@ -105,9 +108,6 @@ importers: typescript: specifier: ^5.7.2 version: 5.7.2 - wisp-server-node: - specifier: ^1.1.7 - version: 1.1.7 packages: @@ -285,8 +285,12 @@ packages: '@mercuryworkshop/epoxy-transport@2.1.27': resolution: {integrity: sha512-jvlJbNbqokU2YRfNYUCqSX+m4/T5Jx659Zn0/AgV2ZfB0S67FK7z9ZMstuxrZHog2AmBdOFaYUjLnI6cAboiaw==} - '@mercuryworkshop/libcurl-transport@1.3.14': - resolution: {integrity: sha512-H2tDNmS3jZBzHpX6kVzmrdIc+0tif721eVCkEnSxoXXuz6g4GkfNFL2b7llRSZcxV+p/V/kGbSFvdDo/yCxUIw==} + '@mercuryworkshop/libcurl-transport@1.3.15': + resolution: {integrity: sha512-lmFoTovP2L519S+KjAfvUy8QQa4mM+/HCcO+wx0jsd43xOrFxwYIvRLKAEJgW9Wk1MBy2FNwYsarv/teUlc3VA==} + + '@mercuryworkshop/wisp-js@0.3.3': + resolution: {integrity: sha512-egc9jbBmNqPXGOkvOOG142SLaBL3jBkz0IGnhYYWOnmg5FeC6KfGSRU5xlk+dKYecE3tuH03bFNi3/vBAOoJKA==} + hasBin: true '@module-federation/runtime-tools@0.5.1': resolution: {integrity: sha512-nfBedkoZ3/SWyO0hnmaxuz0R0iGPSikHZOAZ0N/dVSQaIzlffUo35B5nlC2wgWIc0JdMZfkwkjZRrnuuDIJbzg==} @@ -517,8 +521,8 @@ packages: '@types/serve-static@1.15.7': resolution: {integrity: sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==} - '@types/serviceworker@0.0.107': - resolution: {integrity: sha512-FfMNCrVjiz9w6RZKIfbfXZ6Vuyba4SZFf/cTyjs4ppl8DcFL9wBGm1SC/n6bilUJylKbbNcfTodjyf0hrvaQJg==} + '@types/serviceworker@0.0.108': + resolution: {integrity: sha512-jicpN0A3+X1HUlVhtykUmqOnnfAzAD+IV2FOOzJ9EvN/FItR9igOWUey+ZyP/kRQr8uAN1HMVBBaYniVCniGAA==} '@types/sockjs@0.3.36': resolution: {integrity: sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==} @@ -529,51 +533,51 @@ packages: '@types/ws@8.5.13': resolution: {integrity: sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==} - '@typescript-eslint/eslint-plugin@8.18.1': - resolution: {integrity: sha512-Ncvsq5CT3Gvh+uJG0Lwlho6suwDfUXH0HztslDf5I+F2wAFAZMRwYLEorumpKLzmO2suAXZ/td1tBg4NZIi9CQ==} + '@typescript-eslint/eslint-plugin@8.18.2': + resolution: {integrity: sha512-adig4SzPLjeQ0Tm+jvsozSGiCliI2ajeURDGHjZ2llnA+A67HihCQ+a3amtPhUakd1GlwHxSRvzOZktbEvhPPg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <5.8.0' - '@typescript-eslint/parser@8.18.1': - resolution: {integrity: sha512-rBnTWHCdbYM2lh7hjyXqxk70wvon3p2FyaniZuey5TrcGBpfhVp0OxOa6gxr9Q9YhZFKyfbEnxc24ZnVbbUkCA==} + '@typescript-eslint/parser@8.18.2': + resolution: {integrity: sha512-y7tcq4StgxQD4mDr9+Jb26dZ+HTZ/SkfqpXSiqeUXZHxOUyjWDKsmwKhJ0/tApR08DgOhrFAoAhyB80/p3ViuA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <5.8.0' - '@typescript-eslint/scope-manager@8.18.1': - resolution: {integrity: sha512-HxfHo2b090M5s2+/9Z3gkBhI6xBH8OJCFjH9MhQ+nnoZqxU3wNxkLT+VWXWSFWc3UF3Z+CfPAyqdCTdoXtDPCQ==} + '@typescript-eslint/scope-manager@8.18.2': + resolution: {integrity: sha512-YJFSfbd0CJjy14r/EvWapYgV4R5CHzptssoag2M7y3Ra7XNta6GPAJPPP5KGB9j14viYXyrzRO5GkX7CRfo8/g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@8.18.1': - resolution: {integrity: sha512-jAhTdK/Qx2NJPNOTxXpMwlOiSymtR2j283TtPqXkKBdH8OAMmhiUfP0kJjc/qSE51Xrq02Gj9NY7MwK+UxVwHQ==} + '@typescript-eslint/type-utils@8.18.2': + resolution: {integrity: sha512-AB/Wr1Lz31bzHfGm/jgbFR0VB0SML/hd2P1yxzKDM48YmP7vbyJNHRExUE/wZsQj2wUCvbWH8poNHFuxLqCTnA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <5.8.0' - '@typescript-eslint/types@8.18.1': - resolution: {integrity: sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==} + '@typescript-eslint/types@8.18.2': + resolution: {integrity: sha512-Z/zblEPp8cIvmEn6+tPDIHUbRu/0z5lqZ+NvolL5SvXWT5rQy7+Nch83M0++XzO0XrWRFWECgOAyE8bsJTl1GQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.18.1': - resolution: {integrity: sha512-z8U21WI5txzl2XYOW7i9hJhxoKKNG1kcU4RzyNvKrdZDmbjkmLBo8bgeiOJmA06kizLI76/CCBAAGlTlEeUfyg==} + '@typescript-eslint/typescript-estree@8.18.2': + resolution: {integrity: sha512-WXAVt595HjpmlfH4crSdM/1bcsqh+1weFRWIa9XMTx/XHZ9TCKMcr725tLYqWOgzKdeDrqVHxFotrvWcEsk2Tg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <5.8.0' - '@typescript-eslint/utils@8.18.1': - resolution: {integrity: sha512-8vikiIj2ebrC4WRdcAdDcmnu9Q/MXXwg+STf40BVfT8exDqBCUPdypvzcUPxEqRGKg9ALagZ0UWcYCtn+4W2iQ==} + '@typescript-eslint/utils@8.18.2': + resolution: {integrity: sha512-Cr4A0H7DtVIPkauj4sTSXVl+VBWewE9/o40KcF3TV9aqDEOWoXF3/+oRXNby3DYzZeCATvbdksYsGZzplwnK/Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <5.8.0' - '@typescript-eslint/visitor-keys@8.18.1': - resolution: {integrity: sha512-Vj0WLm5/ZsD013YeUKn+K0y8p1M0jPpxOkKdbD1wB0ns53a5piVY02zjf072TblEweAbcYiFiPoSMF3kp+VhhQ==} + '@typescript-eslint/visitor-keys@8.18.2': + resolution: {integrity: sha512-zORcwn4C3trOWiCqFQP1x6G3xTRyZ1LYydnj51cRnJ6hxBlr/cKPckk+PKPUw/fXmvfKTcw7bwY3w9izgx5jZw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@webassemblyjs/ast@1.14.1': @@ -857,6 +861,10 @@ packages: resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==} engines: {node: '>=14'} + commander@12.1.0: + resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==} + engines: {node: '>=18'} + commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} @@ -1013,8 +1021,8 @@ packages: resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==} engines: {node: '>= 4'} - domutils@3.1.0: - resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==} + domutils@3.2.1: + resolution: {integrity: sha512-xWXmuRnN9OMP6ptPd2+H0cCbcYBULa5YDTbMm/2lvkWvNA3O4wcW+GvzooqBuNM8yy6pl3VIAeJTUUWUbfI5Fw==} dotenv@16.4.7: resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==} @@ -1033,8 +1041,8 @@ packages: ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - electron-to-chromium@1.5.75: - resolution: {integrity: sha512-Lf3++DumRE/QmweGjU+ZcKqQ+3bKkU/qjaKYhIJKEOhgIO9Xs6IiAQFkfFoj+RhgDk4LUeNsLo6plExHqSyu6Q==} + electron-to-chromium@1.5.76: + resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==} emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -1073,6 +1081,10 @@ packages: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} + entities@6.0.0: + resolution: {integrity: sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==} + engines: {node: '>=0.12'} + envinfo@7.14.0: resolution: {integrity: sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==} engines: {node: '>=4'} @@ -1219,8 +1231,8 @@ packages: fastify@5.2.0: resolution: {integrity: sha512-3s+Qt5S14Eq5dCpnE0FxTp3z4xKChI83ZnMv+k0FwX+VUoZrgCFoLAxpfdi/vT4y6Mk+g7aAMt9pgXDoZmkefQ==} - fastq@1.17.1: - resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} + fastq@1.18.0: + resolution: {integrity: sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==} faye-websocket@0.11.4: resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==} @@ -1389,8 +1401,8 @@ packages: html-escaper@2.0.2: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} - htmlparser2@9.1.0: - resolution: {integrity: sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==} + htmlparser2@10.0.0: + resolution: {integrity: sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==} http-deceiver@1.2.7: resolution: {integrity: sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==} @@ -1594,8 +1606,8 @@ packages: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} - libcurl.js@0.6.20: - resolution: {integrity: sha512-tBXjza50/OJWnG9dYthlwBSY/OezR5r6R+lyG0kQzmIUhUxHvNXnngWUAJqzQjDZ+xhx17XVZz9b294FNCoJQg==} + libcurl.js@0.6.21: + resolution: {integrity: sha512-Y+r0y2gky5CrgambbtVEBHmHUsDYAP1dsOdgy8+NVDl8syDDOfy/LpmGQB2epWUbtfRP1s+ULA4q/or/FkQLNg==} light-my-request@6.4.0: resolution: {integrity: sha512-U0UONITz4GVQodMPoygnqJan2RYfhyLsCzFBakJHWNfiQKyHzvp38YOxxLGs8lIDPwR6ngd4gmuZJQQJtRBu/A==} @@ -1871,8 +1883,8 @@ packages: pino-std-serializers@7.0.0: resolution: {integrity: sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==} - pino@9.5.0: - resolution: {integrity: sha512-xSEmD4pLnV54t0NOUN16yCl7RIB1c5UUOse5HSyEXtBp+FgFQyPeDutc+Q2ZO7/22vImV7VfEjH/1zV2QuqvYw==} + pino@9.6.0: + resolution: {integrity: sha512-i85pKRCt4qMjZ1+L7sy2Ag4t1atFcdbEt76+7iRJn1g2BvsnRMGu9p8pivl9fs63M2kF/A0OacFZhTub+m/qMg==} hasBin: true playwright-core@1.49.1: @@ -2325,10 +2337,6 @@ packages: uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} - utf-8-validate@6.0.5: - resolution: {integrity: sha512-EYZR+OpIXp9Y1eG1iueg8KRsY8TuT8VNgnanZ0uA3STqhHQTLwbl+WX76/9X5OY12yQubymBpaBSmMPkSTQcKA==} - engines: {node: '>=6.14.2'} - util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -2410,9 +2418,6 @@ packages: engines: {node: '>= 8'} hasBin: true - wisp-server-node@1.1.7: - resolution: {integrity: sha512-1kL4dbGAZLHks3qYQDOzhxFKvmKwPwfMFTskvsdOc2YA6TmUKZvq5TNPkGs9JJXPnWiOtqMzAVQVC/FwixxXvQ==} - word-wrap@1.2.5: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} engines: {node: '>=0.10.0'} @@ -2593,7 +2598,7 @@ snapshots: '@fastify/send': 3.3.0 content-disposition: 0.5.4 fastify-plugin: 5.0.1 - fastq: 1.17.1 + fastq: 1.18.0 glob: 11.0.0 '@humanfs/core@0.19.1': {} @@ -2672,9 +2677,18 @@ snapshots: dependencies: '@mercuryworkshop/epoxy-tls': 2.1.16-1 - '@mercuryworkshop/libcurl-transport@1.3.14': + '@mercuryworkshop/libcurl-transport@1.3.15': dependencies: - libcurl.js: 0.6.20 + libcurl.js: 0.6.21 + + '@mercuryworkshop/wisp-js@0.3.3': + dependencies: + bufferutil: 4.0.8 + commander: 12.1.0 + ipaddr.js: 2.2.0 + ws: 8.18.0(bufferutil@4.0.8) + transitivePeerDependencies: + - utf-8-validate '@module-federation/runtime-tools@0.5.1': dependencies: @@ -2692,7 +2706,7 @@ snapshots: '@module-federation/runtime': 0.5.1 '@module-federation/sdk': 0.5.1 - '@nebula-services/bare-server-node@2.0.4(bufferutil@4.0.8)(utf-8-validate@6.0.5)': + '@nebula-services/bare-server-node@2.0.4(bufferutil@4.0.8)': dependencies: async-exit-hook: 2.0.1 commander: 10.0.1 @@ -2700,7 +2714,7 @@ snapshots: http-errors: 2.0.0 ipaddr.js: 2.2.0 source-map-support: 0.5.21 - ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.5) + ws: 8.18.0(bufferutil@4.0.8) transitivePeerDependencies: - bufferutil - utf-8-validate @@ -2715,7 +2729,7 @@ snapshots: '@nodelib/fs.walk@1.2.8': dependencies: '@nodelib/fs.scandir': 2.1.5 - fastq: 1.17.1 + fastq: 1.18.0 '@pkgjs/parseargs@0.11.0': optional: true @@ -2728,10 +2742,10 @@ snapshots: '@rsdoctor/client@0.4.12': {} - '@rsdoctor/core@0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1)': + '@rsdoctor/core@0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(webpack@5.97.1)': dependencies: - '@rsdoctor/graph': 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1) - '@rsdoctor/sdk': 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1) + '@rsdoctor/graph': 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(webpack@5.97.1) + '@rsdoctor/sdk': 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(webpack@5.97.1) '@rsdoctor/types': 0.4.12(@rspack/core@1.1.8)(webpack@5.97.1) '@rsdoctor/utils': 0.4.12(@rspack/core@1.1.8)(webpack@5.97.1) axios: 1.7.9 @@ -2742,7 +2756,7 @@ snapshots: path-browserify: 1.0.1 semver: 7.6.3 source-map: 0.7.4 - webpack-bundle-analyzer: 4.10.2(bufferutil@4.0.8)(utf-8-validate@6.0.5) + webpack-bundle-analyzer: 4.10.2(bufferutil@4.0.8) transitivePeerDependencies: - '@rspack/core' - bufferutil @@ -2751,12 +2765,12 @@ snapshots: - utf-8-validate - webpack - '@rsdoctor/graph@0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1)': + '@rsdoctor/graph@0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(webpack@5.97.1)': dependencies: '@rsdoctor/types': 0.4.12(@rspack/core@1.1.8)(webpack@5.97.1) '@rsdoctor/utils': 0.4.12(@rspack/core@1.1.8)(webpack@5.97.1) lodash: 4.17.21 - socket.io: 4.8.1(bufferutil@4.0.8)(utf-8-validate@6.0.5) + socket.io: 4.8.1(bufferutil@4.0.8) source-map: 0.7.4 transitivePeerDependencies: - '@rspack/core' @@ -2765,11 +2779,11 @@ snapshots: - utf-8-validate - webpack - '@rsdoctor/rspack-plugin@0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1)': + '@rsdoctor/rspack-plugin@0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(webpack@5.97.1)': dependencies: - '@rsdoctor/core': 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1) - '@rsdoctor/graph': 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1) - '@rsdoctor/sdk': 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1) + '@rsdoctor/core': 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(webpack@5.97.1) + '@rsdoctor/graph': 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(webpack@5.97.1) + '@rsdoctor/sdk': 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(webpack@5.97.1) '@rsdoctor/types': 0.4.12(@rspack/core@1.1.8)(webpack@5.97.1) '@rsdoctor/utils': 0.4.12(@rspack/core@1.1.8)(webpack@5.97.1) '@rspack/core': 1.1.8 @@ -2781,10 +2795,10 @@ snapshots: - utf-8-validate - webpack - '@rsdoctor/sdk@0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1)': + '@rsdoctor/sdk@0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(webpack@5.97.1)': dependencies: '@rsdoctor/client': 0.4.12 - '@rsdoctor/graph': 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1) + '@rsdoctor/graph': 0.4.12(@rspack/core@1.1.8)(bufferutil@4.0.8)(webpack@5.97.1) '@rsdoctor/types': 0.4.12(@rspack/core@1.1.8)(webpack@5.97.1) '@rsdoctor/utils': 0.4.12(@rspack/core@1.1.8)(webpack@5.97.1) '@types/fs-extra': 11.0.4 @@ -2796,7 +2810,7 @@ snapshots: lodash: 4.17.21 open: 8.4.2 serve-static: 1.16.2 - socket.io: 4.8.1(bufferutil@4.0.8)(utf-8-validate@6.0.5) + socket.io: 4.8.1(bufferutil@4.0.8) source-map: 0.7.4 tapable: 2.2.1 transitivePeerDependencies: @@ -2880,17 +2894,17 @@ snapshots: '@rspack/binding-win32-ia32-msvc': 1.1.8 '@rspack/binding-win32-x64-msvc': 1.1.8 - '@rspack/cli@1.1.8(@rspack/core@1.1.8)(@types/express@4.17.21)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1)': + '@rspack/cli@1.1.8(@rspack/core@1.1.8)(@types/express@4.17.21)(bufferutil@4.0.8)(webpack@5.97.1)': dependencies: '@discoveryjs/json-ext': 0.5.7 '@rspack/core': 1.1.8 - '@rspack/dev-server': 1.0.9(@rspack/core@1.1.8)(@types/express@4.17.21)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1) + '@rspack/dev-server': 1.0.9(@rspack/core@1.1.8)(@types/express@4.17.21)(bufferutil@4.0.8)(webpack@5.97.1) colorette: 2.0.19 exit-hook: 4.0.0 interpret: 3.1.1 rechoir: 0.8.0 semver: 7.6.3 - webpack-bundle-analyzer: 4.6.1(bufferutil@4.0.8)(utf-8-validate@6.0.5) + webpack-bundle-analyzer: 4.6.1(bufferutil@4.0.8) yargs: 17.6.2 transitivePeerDependencies: - '@types/express' @@ -2908,7 +2922,7 @@ snapshots: '@rspack/lite-tapable': 1.0.1 caniuse-lite: 1.0.30001690 - '@rspack/dev-server@1.0.9(@rspack/core@1.1.8)(@types/express@4.17.21)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1)': + '@rspack/dev-server@1.0.9(@rspack/core@1.1.8)(@types/express@4.17.21)(bufferutil@4.0.8)(webpack@5.97.1)': dependencies: '@rspack/core': 1.1.8 chokidar: 3.6.0 @@ -2918,8 +2932,8 @@ snapshots: mime-types: 2.1.35 p-retry: 4.6.2 webpack-dev-middleware: 7.4.2(webpack@5.97.1) - webpack-dev-server: 5.0.4(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1) - ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.5) + webpack-dev-server: 5.0.4(bufferutil@4.0.8)(webpack@5.97.1) + ws: 8.18.0(bufferutil@4.0.8) transitivePeerDependencies: - '@types/express' - bufferutil @@ -3042,7 +3056,7 @@ snapshots: '@types/node': 22.10.2 '@types/send': 0.17.4 - '@types/serviceworker@0.0.107': {} + '@types/serviceworker@0.0.108': {} '@types/sockjs@0.3.36': dependencies: @@ -3056,14 +3070,14 @@ snapshots: dependencies: '@types/node': 22.10.2 - '@typescript-eslint/eslint-plugin@8.18.1(@typescript-eslint/parser@8.18.1(eslint@9.17.0)(typescript@5.7.2))(eslint@9.17.0)(typescript@5.7.2)': + '@typescript-eslint/eslint-plugin@8.18.2(@typescript-eslint/parser@8.18.2(eslint@9.17.0)(typescript@5.7.2))(eslint@9.17.0)(typescript@5.7.2)': dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.18.1(eslint@9.17.0)(typescript@5.7.2) - '@typescript-eslint/scope-manager': 8.18.1 - '@typescript-eslint/type-utils': 8.18.1(eslint@9.17.0)(typescript@5.7.2) - '@typescript-eslint/utils': 8.18.1(eslint@9.17.0)(typescript@5.7.2) - '@typescript-eslint/visitor-keys': 8.18.1 + '@typescript-eslint/parser': 8.18.2(eslint@9.17.0)(typescript@5.7.2) + '@typescript-eslint/scope-manager': 8.18.2 + '@typescript-eslint/type-utils': 8.18.2(eslint@9.17.0)(typescript@5.7.2) + '@typescript-eslint/utils': 8.18.2(eslint@9.17.0)(typescript@5.7.2) + '@typescript-eslint/visitor-keys': 8.18.2 eslint: 9.17.0 graphemer: 1.4.0 ignore: 5.3.2 @@ -3073,27 +3087,27 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.18.1(eslint@9.17.0)(typescript@5.7.2)': + '@typescript-eslint/parser@8.18.2(eslint@9.17.0)(typescript@5.7.2)': dependencies: - '@typescript-eslint/scope-manager': 8.18.1 - '@typescript-eslint/types': 8.18.1 - '@typescript-eslint/typescript-estree': 8.18.1(typescript@5.7.2) - '@typescript-eslint/visitor-keys': 8.18.1 + '@typescript-eslint/scope-manager': 8.18.2 + '@typescript-eslint/types': 8.18.2 + '@typescript-eslint/typescript-estree': 8.18.2(typescript@5.7.2) + '@typescript-eslint/visitor-keys': 8.18.2 debug: 4.4.0 eslint: 9.17.0 typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.18.1': + '@typescript-eslint/scope-manager@8.18.2': dependencies: - '@typescript-eslint/types': 8.18.1 - '@typescript-eslint/visitor-keys': 8.18.1 + '@typescript-eslint/types': 8.18.2 + '@typescript-eslint/visitor-keys': 8.18.2 - '@typescript-eslint/type-utils@8.18.1(eslint@9.17.0)(typescript@5.7.2)': + '@typescript-eslint/type-utils@8.18.2(eslint@9.17.0)(typescript@5.7.2)': dependencies: - '@typescript-eslint/typescript-estree': 8.18.1(typescript@5.7.2) - '@typescript-eslint/utils': 8.18.1(eslint@9.17.0)(typescript@5.7.2) + '@typescript-eslint/typescript-estree': 8.18.2(typescript@5.7.2) + '@typescript-eslint/utils': 8.18.2(eslint@9.17.0)(typescript@5.7.2) debug: 4.4.0 eslint: 9.17.0 ts-api-utils: 1.4.3(typescript@5.7.2) @@ -3101,12 +3115,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.18.1': {} + '@typescript-eslint/types@8.18.2': {} - '@typescript-eslint/typescript-estree@8.18.1(typescript@5.7.2)': + '@typescript-eslint/typescript-estree@8.18.2(typescript@5.7.2)': dependencies: - '@typescript-eslint/types': 8.18.1 - '@typescript-eslint/visitor-keys': 8.18.1 + '@typescript-eslint/types': 8.18.2 + '@typescript-eslint/visitor-keys': 8.18.2 debug: 4.4.0 fast-glob: 3.3.2 is-glob: 4.0.3 @@ -3117,20 +3131,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.18.1(eslint@9.17.0)(typescript@5.7.2)': + '@typescript-eslint/utils@8.18.2(eslint@9.17.0)(typescript@5.7.2)': dependencies: '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0) - '@typescript-eslint/scope-manager': 8.18.1 - '@typescript-eslint/types': 8.18.1 - '@typescript-eslint/typescript-estree': 8.18.1(typescript@5.7.2) + '@typescript-eslint/scope-manager': 8.18.2 + '@typescript-eslint/types': 8.18.2 + '@typescript-eslint/typescript-estree': 8.18.2(typescript@5.7.2) eslint: 9.17.0 typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.18.1': + '@typescript-eslint/visitor-keys@8.18.2': dependencies: - '@typescript-eslint/types': 8.18.1 + '@typescript-eslint/types': 8.18.2 eslint-visitor-keys: 4.2.0 '@webassemblyjs/ast@1.14.1': @@ -3303,7 +3317,7 @@ snapshots: avvio@9.1.0: dependencies: '@fastify/error': 4.0.0 - fastq: 1.17.1 + fastq: 1.18.0 axios@1.7.9: dependencies: @@ -3359,7 +3373,7 @@ snapshots: browserslist@4.24.3: dependencies: caniuse-lite: 1.0.30001690 - electron-to-chromium: 1.5.75 + electron-to-chromium: 1.5.76 node-releases: 2.0.19 update-browserslist-db: 1.1.1(browserslist@4.24.3) @@ -3444,6 +3458,8 @@ snapshots: commander@10.0.1: {} + commander@12.1.0: {} + commander@2.20.3: {} commander@7.2.0: {} @@ -3569,7 +3585,7 @@ snapshots: dependencies: domelementtype: 2.3.0 - domutils@3.1.0: + domutils@3.2.1: dependencies: dom-serializer: 2.0.0 domelementtype: 2.3.0 @@ -3589,7 +3605,7 @@ snapshots: ee-first@1.1.1: {} - electron-to-chromium@1.5.75: {} + electron-to-chromium@1.5.76: {} emoji-regex@8.0.0: {} @@ -3601,7 +3617,7 @@ snapshots: engine.io-parser@5.2.3: {} - engine.io@6.6.2(bufferutil@4.0.8)(utf-8-validate@6.0.5): + engine.io@6.6.2(bufferutil@4.0.8): dependencies: '@types/cookie': 0.4.1 '@types/cors': 2.8.17 @@ -3612,7 +3628,7 @@ snapshots: cors: 2.8.5 debug: 4.3.7 engine.io-parser: 5.2.3 - ws: 8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.5) + ws: 8.17.1(bufferutil@4.0.8) transitivePeerDependencies: - bufferutil - supports-color @@ -3632,6 +3648,8 @@ snapshots: entities@4.5.0: {} + entities@6.0.0: {} + envinfo@7.14.0: {} es-define-property@1.0.1: {} @@ -3829,7 +3847,7 @@ snapshots: fast-json-stringify: 6.0.0 find-my-way: 9.1.0 light-my-request: 6.4.0 - pino: 9.5.0 + pino: 9.6.0 process-warning: 4.0.0 proxy-addr: 2.0.7 rfdc: 1.4.1 @@ -3837,7 +3855,7 @@ snapshots: semver: 7.6.3 toad-cache: 3.7.0 - fastq@1.17.1: + fastq@1.18.0: dependencies: reusify: 1.0.4 @@ -4012,12 +4030,12 @@ snapshots: html-escaper@2.0.2: {} - htmlparser2@9.1.0: + htmlparser2@10.0.0: dependencies: domelementtype: 2.3.0 domhandler: 5.0.3 - domutils: 3.1.0 - entities: 4.5.0 + domutils: 3.2.1 + entities: 6.0.0 http-deceiver@1.2.7: {} @@ -4198,7 +4216,7 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 - libcurl.js@0.6.20: {} + libcurl.js@0.6.21: {} light-my-request@6.4.0: dependencies: @@ -4418,7 +4436,7 @@ snapshots: pino-std-serializers@7.0.0: {} - pino@9.5.0: + pino@9.6.0: dependencies: atomic-sleep: 1.0.0 fast-redact: 3.5.0 @@ -4675,10 +4693,10 @@ snapshots: mrmime: 2.0.0 totalist: 3.0.1 - socket.io-adapter@2.5.5(bufferutil@4.0.8)(utf-8-validate@6.0.5): + socket.io-adapter@2.5.5(bufferutil@4.0.8): dependencies: debug: 4.3.7 - ws: 8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.5) + ws: 8.17.1(bufferutil@4.0.8) transitivePeerDependencies: - bufferutil - supports-color @@ -4691,14 +4709,14 @@ snapshots: transitivePeerDependencies: - supports-color - socket.io@4.8.1(bufferutil@4.0.8)(utf-8-validate@6.0.5): + socket.io@4.8.1(bufferutil@4.0.8): dependencies: accepts: 1.3.8 base64id: 2.0.0 cors: 2.8.5 debug: 4.3.7 - engine.io: 6.6.2(bufferutil@4.0.8)(utf-8-validate@6.0.5) - socket.io-adapter: 2.5.5(bufferutil@4.0.8)(utf-8-validate@6.0.5) + engine.io: 6.6.2(bufferutil@4.0.8) + socket.io-adapter: 2.5.5(bufferutil@4.0.8) socket.io-parser: 4.2.4 transitivePeerDependencies: - bufferutil @@ -4892,10 +4910,6 @@ snapshots: dependencies: punycode: 2.3.1 - utf-8-validate@6.0.5: - dependencies: - node-gyp-build: 4.8.4 - util-deprecate@1.0.2: {} utils-merge@1.0.1: {} @@ -4913,7 +4927,7 @@ snapshots: dependencies: minimalistic-assert: 1.0.1 - webpack-bundle-analyzer@4.10.2(bufferutil@4.0.8)(utf-8-validate@6.0.5): + webpack-bundle-analyzer@4.10.2(bufferutil@4.0.8): dependencies: '@discoveryjs/json-ext': 0.5.7 acorn: 8.14.0 @@ -4926,12 +4940,12 @@ snapshots: opener: 1.5.2 picocolors: 1.1.1 sirv: 2.0.4 - ws: 7.5.10(bufferutil@4.0.8)(utf-8-validate@6.0.5) + ws: 7.5.10(bufferutil@4.0.8) transitivePeerDependencies: - bufferutil - utf-8-validate - webpack-bundle-analyzer@4.6.1(bufferutil@4.0.8)(utf-8-validate@6.0.5): + webpack-bundle-analyzer@4.6.1(bufferutil@4.0.8): dependencies: acorn: 8.14.0 acorn-walk: 8.3.4 @@ -4941,7 +4955,7 @@ snapshots: lodash: 4.17.21 opener: 1.5.2 sirv: 1.0.19 - ws: 7.5.10(bufferutil@4.0.8)(utf-8-validate@6.0.5) + ws: 7.5.10(bufferutil@4.0.8) transitivePeerDependencies: - bufferutil - utf-8-validate @@ -4957,7 +4971,7 @@ snapshots: optionalDependencies: webpack: 5.97.1 - webpack-dev-server@5.0.4(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.97.1): + webpack-dev-server@5.0.4(bufferutil@4.0.8)(webpack@5.97.1): dependencies: '@types/bonjour': 3.5.13 '@types/connect-history-api-fallback': 1.5.4 @@ -4988,7 +5002,7 @@ snapshots: sockjs: 0.3.24 spdy: 4.0.2 webpack-dev-middleware: 7.4.2(webpack@5.97.1) - ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.5) + ws: 8.18.0(bufferutil@4.0.8) optionalDependencies: webpack: 5.97.1 transitivePeerDependencies: @@ -5041,12 +5055,6 @@ snapshots: dependencies: isexe: 2.0.0 - wisp-server-node@1.1.7: - dependencies: - bufferutil: 4.0.8 - utf-8-validate: 6.0.5 - ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.5) - word-wrap@1.2.5: {} wrap-ansi@7.0.0: @@ -5061,20 +5069,17 @@ snapshots: string-width: 5.1.2 strip-ansi: 7.1.0 - ws@7.5.10(bufferutil@4.0.8)(utf-8-validate@6.0.5): + ws@7.5.10(bufferutil@4.0.8): optionalDependencies: bufferutil: 4.0.8 - utf-8-validate: 6.0.5 - ws@8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.5): + ws@8.17.1(bufferutil@4.0.8): optionalDependencies: bufferutil: 4.0.8 - utf-8-validate: 6.0.5 - ws@8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.5): + ws@8.18.0(bufferutil@4.0.8): optionalDependencies: bufferutil: 4.0.8 - utf-8-validate: 6.0.5 y18n@5.0.8: {} diff --git a/server.js b/server.js index b040922..cc39f7c 100644 --- a/server.js +++ b/server.js @@ -6,7 +6,7 @@ import fastifyStatic from "@fastify/static"; import { join } from "node:path"; import { spawn } from "node:child_process"; import { fileURLToPath } from "node:url"; -import wisp from "wisp-server-node"; +import { server as wisp } from "@mercuryworkshop/wisp-js/server"; //transports import { baremuxPath } from "@mercuryworkshop/bare-mux/node";