From 6d42d135c85f05739d4cf79a8e4ba9bffae26f24 Mon Sep 17 00:00:00 2001 From: niqzart Date: Sat, 13 Sep 2025 16:01:10 +0300 Subject: [PATCH] Revert "feat: upgrade to hocuspocus 3.2.0" This reverts commit e3ec521e629aa74ea255f5d1d8e5741e45a208cc. --- package-lock.json | 86 ++++++++++++++++++++++----------------------- package.json | 6 ++-- src/hooks/access.ts | 4 +-- src/index.ts | 2 +- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index e3f0ee5..26cf791 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,9 +8,9 @@ "name": "xi.hocus", "version": "0.1.0", "dependencies": { - "@hocuspocus/extension-database": "^3.2.0", - "@hocuspocus/extension-logger": "^3.2.0", - "@hocuspocus/server": "^3.2.0" + "@hocuspocus/extension-database": "^2.13.5", + "@hocuspocus/extension-logger": "^2.13.6", + "@hocuspocus/server": "^2.13.5" }, "devDependencies": { "@types/node": "^22.5.5", @@ -18,46 +18,46 @@ } }, "node_modules/@hocuspocus/common": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@hocuspocus/common/-/common-3.2.0.tgz", - "integrity": "sha512-nh3dB2KwBQZuGOJnub3Y8wH7rLEBgpWkwFtDG+nOK2aM2BSWkBmMEiuNytzCkOh1LFVEcZ+o5S1FDAp6A4nRbA==", + "version": "2.13.6", + "resolved": "https://registry.npmjs.org/@hocuspocus/common/-/common-2.13.6.tgz", + "integrity": "sha512-jeEawHoaBckfbjMRPqjANjtQkeHgCBsk3XN7CEs/1jvUm60d86FT4y5fp3MWTEE18qkZacbZldn32za+72RBdg==", "license": "MIT", "dependencies": { "lib0": "^0.2.87" } }, "node_modules/@hocuspocus/extension-database": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@hocuspocus/extension-database/-/extension-database-3.2.0.tgz", - "integrity": "sha512-4ZjAWK8XnuFr4WQ8bSLseKiYQGMIFVmlY+gIL9D68YatQzfHD0OsHv31NVOJSuWu+SsQcqOt21xW57bfxsEumw==", + "version": "2.13.5", + "resolved": "https://registry.npmjs.org/@hocuspocus/extension-database/-/extension-database-2.13.5.tgz", + "integrity": "sha512-+sS26ZKOM50cbTtV+mti8Z1AEEiv+rZuvMC77ol3SWGlcNGsBx45XklKof4ifQ8oCIMgMC0jzP7+avQ9OtOC0w==", "license": "MIT", "dependencies": { - "@hocuspocus/server": "^3.2.0" + "@hocuspocus/server": "^2.13.5" }, "peerDependencies": { "yjs": "^13.6.8" } }, "node_modules/@hocuspocus/extension-logger": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@hocuspocus/extension-logger/-/extension-logger-3.2.0.tgz", - "integrity": "sha512-C3teP7GGXdP9oEMZ7BEHlywdvVgz9KsIcKmL6j7YOo06Y7CE6Wl0h7YabYGS3D+FIz/WhcKe+YXkQFkDldV8iQ==", + "version": "2.13.6", + "resolved": "https://registry.npmjs.org/@hocuspocus/extension-logger/-/extension-logger-2.13.6.tgz", + "integrity": "sha512-DQ1zBGFdRBCEmGfo3bcR2W3P/6SQmMmSYq4iqKB98U54901fKJz7cI+vrp6Xfr447Z1j2sfdlN9YTPaVMjv4rQ==", "license": "MIT", "dependencies": { - "@hocuspocus/server": "^3.2.0" + "@hocuspocus/server": "^2.13.6" } }, "node_modules/@hocuspocus/server": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@hocuspocus/server/-/server-3.2.0.tgz", - "integrity": "sha512-o9g8nBFwG1o6vTaioDeE1YfUUJoUFpQQX+m9bHiqu02o6hPBWXCAx74ZZbngTJwZ8nuyO17+JGkwlTLN2hBkpw==", + "version": "2.13.6", + "resolved": "https://registry.npmjs.org/@hocuspocus/server/-/server-2.13.6.tgz", + "integrity": "sha512-VqiHkkQlfa2A5mFTe+rdePLt3kHJrk9ZzqDqWJfqQDlYHdyAXpW53cddsXYYDWQ/tZjYj3zQgZAT+78AHrnb/A==", "license": "MIT", "dependencies": { - "@hocuspocus/common": "^3.2.0", + "@hocuspocus/common": "^2.13.6", "async-lock": "^1.3.1", "kleur": "^4.1.4", "lib0": "^0.2.47", - "uuid": "^11.0.3", + "uuid": "^10.0.0", "ws": "^8.5.0" }, "peerDependencies": { @@ -66,13 +66,13 @@ } }, "node_modules/@types/node": { - "version": "22.16.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.16.3.tgz", - "integrity": "sha512-sr4Xz74KOUeYadexo1r8imhRtlVXcs+j3XK3TcoiYk7B1t3YRVJgtaD3cwX73NYb71pmVuMLNRhJ9XKdoDB74g==", + "version": "22.5.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz", + "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~6.21.0" + "undici-types": "~6.19.2" } }, "node_modules/async-lock": { @@ -101,9 +101,9 @@ } }, "node_modules/lib0": { - "version": "0.2.109", - "resolved": "https://registry.npmjs.org/lib0/-/lib0-0.2.109.tgz", - "integrity": "sha512-jP0gbnyW0kwlx1Atc4dcHkBbrVAkdHjuyHxtClUPYla7qCmwIif1qZ6vQeJdR5FrOVdn26HvQT0ko01rgW7/Xw==", + "version": "0.2.97", + "resolved": "https://registry.npmjs.org/lib0/-/lib0-0.2.97.tgz", + "integrity": "sha512-Q4d1ekgvufi9FiHkkL46AhecfNjznSL9MRNoJRQ76gBHS9OqU2ArfQK0FvBpuxgWeJeNI0LVgAYMIpsGeX4gYg==", "license": "MIT", "dependencies": { "isomorphic.js": "^0.2.4" @@ -122,9 +122,9 @@ } }, "node_modules/typescript": { - "version": "5.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", - "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true, "license": "Apache-2.0", "bin": { @@ -136,29 +136,29 @@ } }, "node_modules/undici-types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", "dev": true, "license": "MIT" }, "node_modules/uuid": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz", - "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], "license": "MIT", "bin": { - "uuid": "dist/esm/bin/uuid" + "uuid": "dist/bin/uuid" } }, "node_modules/ws": { - "version": "8.18.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", - "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "license": "MIT", "engines": { "node": ">=10.0.0" @@ -198,13 +198,13 @@ } }, "node_modules/yjs": { - "version": "13.6.27", - "resolved": "https://registry.npmjs.org/yjs/-/yjs-13.6.27.tgz", - "integrity": "sha512-OIDwaflOaq4wC6YlPBy2L6ceKeKuF7DeTxx+jPzv1FHn9tCZ0ZwSRnUBxD05E3yed46fv/FWJbvR+Ud7x0L7zw==", + "version": "13.6.18", + "resolved": "https://registry.npmjs.org/yjs/-/yjs-13.6.18.tgz", + "integrity": "sha512-GBTjO4QCmv2HFKFkYIJl7U77hIB1o22vSCSQD1Ge8ZxWbIbn8AltI4gyXbtL+g5/GJep67HCMq3Y5AmNwDSyEg==", "license": "MIT", "peer": true, "dependencies": { - "lib0": "^0.2.99" + "lib0": "^0.2.86" }, "engines": { "node": ">=16.0.0", diff --git a/package.json b/package.json index 4db0c4c..71be720 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "typescript": "^5.5.4" }, "dependencies": { - "@hocuspocus/extension-database": "^3.2.0", - "@hocuspocus/extension-logger": "^3.2.0", - "@hocuspocus/server": "^3.2.0" + "@hocuspocus/extension-database": "^2.13.5", + "@hocuspocus/extension-logger": "^2.13.6", + "@hocuspocus/server": "^2.13.5" } } diff --git a/src/hooks/access.ts b/src/hooks/access.ts index c94a4e3..cda2335 100644 --- a/src/hooks/access.ts +++ b/src/hooks/access.ts @@ -28,7 +28,7 @@ function parseProxyHeaders(requestHeaders: IncomingHttpHeaders): ProxyAuthHeader } export async function verifyYDocAccess( - { documentName, requestHeaders, connectionConfig }: onAuthenticatePayload + { documentName, requestHeaders, connection }: onAuthenticatePayload ): Promise<{} | ProxyAuthHeadersT> { if (documentName.startsWith("test/")) return {} @@ -48,7 +48,7 @@ export async function verifyYDocAccess( if (data === "read-write") { return proxyAuthHeaders } else if (data === "read-only") { - connectionConfig.readOnly = true + connection.readOnly = true return proxyAuthHeaders } else { throw new HocusPocusError("Access Denied") diff --git a/src/index.ts b/src/index.ts index 2ab0554..ed6a187 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,7 +6,7 @@ import { verifyYDocAccess } from "./hooks/access" import { downloadYDocContent } from "./hooks/download" import { storeYDocContent } from "./hooks/store" -const server = new Server({ +const server = Server.configure({ name: "xi.hocus", port: 1234, timeout: 30000,