Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add tus server
Marc Seitz37a20633bf7a
diff --git a/lib/files/tus-upload.ts b/lib/files/tus-upload.tsnew file mode 100644index 00000000..ecc0664a--- /dev/null+++ b/lib/files/tus-upload.ts@@ -0,0 +1,98 @@+import * as tus from "tus-js-client";++import { decodeBase64Url } from "../utils/decode-base64url";++type ResumableUploadParams = {+ file: File;+ onProgress?: (bytesUploaded: number, bytesTotal: number) => void;+ ownerId: string;+ teamId: string;+ numPages: number;+ relativePath: string;+};++type UploadResult = {+ id: string;+ url: string;+ relativePath: string;+ fileName: string;+ fileType: string;+ numPages: number;+ ownerId: string;+ teamId: string;+};++export function resumableUpload({+ file,+ onProgress,+ ownerId,+ teamId,+ numPages,+ relativePath,+}: ResumableUploadParams) {+ return new Promise<{ upload: tus.Upload; complete: Promise<UploadResult> }>(+ (resolve, reject) => {+ let completeResolve: (+ value: UploadResult | PromiseLike<UploadResult>,+ ) => void;+ const complete = new Promise<UploadResult>((res) => {+ completeResolve = res;+ });++ const upload = new tus.Upload(file, {+ endpoint: `${process.env.NEXT_PUBLIC_BASE_URL}/api/file/tus`,+ retryDelays: [0, 3000, 5000, 10000],+ uploadDataDuringCreation: true,+ removeFingerprintOnSuccess: true,+ metadata: {+ fileName: file.name,+ contentType: file.type,+ numPages: String(numPages),+ teamId: teamId,+ ownerId: ownerId,+ relativePath: relativePath,+ },+ chunkSize: 6 * 1024 * 1024,+ onError: (error) => {+ console.error("Failed because: " + error);+ reject(error);+ },+ onProgress,+ onSuccess: () => {+ console.log("Uploaded successfully");+ const id = upload.url!.split("/api/file/tus/")[1];+ // if id contains a slash, then we use it as it otherwise we need to convert from buffer base64URL to utf-8+ const newId = id.includes("/") ? id : decodeBase64Url(id);+ completeResolve({+ id: newId,+ url: upload.url!,+ relativePath,+ fileName: file.name,+ fileType: file.type,+ numPages,+ ownerId,+ teamId,+ });+ },+ });++ // Check if there are any previous uploads to continue.+ upload+ .findPreviousUploads()+ .then((previousUploads) => {+ // Found previous uploads so we select the first one.+ if (previousUploads.length) {+ upload.resumeFromPreviousUpload(previousUploads[0]);+ }++ upload.start();+ resolve({ upload, complete });+ })+ .catch((error) => {+ console.error("Error finding previous uploads:", error);+ upload.start();+ resolve({ upload, complete });+ });+ },+ );+}diff --git a/lib/utils/decode-base64url.ts b/lib/utils/decode-base64url.tsnew file mode 100644index 00000000..e3901cfe--- /dev/null+++ b/lib/utils/decode-base64url.ts@@ -0,0 +1,13 @@+export function decodeBase64Url(base64url: string) {+ base64url = base64url.replace(/-/g, "+").replace(/_/g, "/");+ while (base64url.length % 4) {+ base64url += "=";+ }+ return decodeURIComponent(+ Array.prototype.map+ .call(atob(base64url), function (c) {+ return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);+ })+ .join(""),+ );+}diff --git a/package-lock.json b/package-lock.jsonindex da210080..3ffcddb6 100644--- a/package-lock.json+++ b/package-lock.json@@ -26,7 +26,7 @@"@radix-ui/react-avatar": "^1.0.4","@radix-ui/react-checkbox": "^1.0.4","@radix-ui/react-collapsible": "^1.0.3",- "@radix-ui/react-dialog": "^1.0.5",+ "@radix-ui/react-dialog": "^1.1.1","@radix-ui/react-dropdown-menu": "^2.0.6","@radix-ui/react-label": "^2.0.2","@radix-ui/react-popover": "^1.0.7",@@ -47,6 +47,8 @@"@trigger.dev/nextjs": "^2.3.19","@trigger.dev/react": "^2.3.19","@trigger.dev/sdk": "^2.3.19",+ "@tus/s3-store": "^1.5.0",+ "@tus/server": "^1.7.0","@upstash/qstash": "^2.6.0","@upstash/ratelimit": "^1.2.1","@upstash/redis": "^1.32.0",@@ -111,8 +113,10 @@"tailwindcss": "^3.4.4","tailwindcss-animate": "^1.0.7","ts-pattern": "^5.2.0",+ "tus-js-client": "^4.1.0","typescript": "^5.3.3","ua-parser-js": "^1.0.38",+ "vaul": "^0.9.1","xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz","zod": "^3.23.8"},@@ -3111,31 +3115,89 @@}},"node_modules/@radix-ui/react-dialog": {- "version": "1.0.5",- "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.0.5.tgz",- "integrity": "sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==",- "dependencies": {- "@babel/runtime": "^7.13.10",- "@radix-ui/primitive": "1.0.1",- "@radix-ui/react-compose-refs": "1.0.1",- "@radix-ui/react-context": "1.0.1",- "@radix-ui/react-dismissable-layer": "1.0.5",- "@radix-ui/react-focus-guards": "1.0.1",- "@radix-ui/react-focus-scope": "1.0.4",- "@radix-ui/react-id": "1.0.1",- "@radix-ui/react-portal": "1.0.4",- "@radix-ui/react-presence": "1.0.1",- "@radix-ui/react-primitive": "1.0.3",- "@radix-ui/react-slot": "1.0.2",- "@radix-ui/react-use-controllable-state": "1.0.1",+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.1.tgz",+ "integrity": "sha512-zysS+iU4YP3STKNS6USvFVqI4qqx8EpiwmT5TuCApVEBca+eRCbONi4EgzfNSuVnOXvC5UPHHMjs8RXO6DH9Bg==",+ "dependencies": {+ "@radix-ui/primitive": "1.1.0",+ "@radix-ui/react-compose-refs": "1.1.0",+ "@radix-ui/react-context": "1.1.0",+ "@radix-ui/react-dismissable-layer": "1.1.0",+ "@radix-ui/react-focus-guards": "1.1.0",+ "@radix-ui/react-focus-scope": "1.1.0",+ "@radix-ui/react-id": "1.1.0",+ "@radix-ui/react-portal": "1.1.1",+ "@radix-ui/react-presence": "1.1.0",+ "@radix-ui/react-primitive": "2.0.0",+ "@radix-ui/react-slot": "1.1.0",+ "@radix-ui/react-use-controllable-state": "1.1.0","aria-hidden": "^1.1.1",- "react-remove-scroll": "2.5.5"+ "react-remove-scroll": "2.5.7"},"peerDependencies": {"@types/react": "*","@types/react-dom": "*",- "react": "^16.8 || ^17.0 || ^18.0",- "react-dom": "^16.8 || ^17.0 || ^18.0"+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/primitive": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.0.tgz",+ "integrity": "sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA=="+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-compose-refs": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz",+ "integrity": "sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==",+ "peerDependencies": {+ "@types/react": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-context": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.0.tgz",+ "integrity": "sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==",+ "peerDependencies": {+ "@types/react": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-dismissable-layer": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.0.tgz",+ "integrity": "sha512-/UovfmmXGptwGcBQawLzvn2jOfM0t4z3/uKffoBlj724+n3FvBbZ7M0aaBOmkp6pqFYpO4yx8tSVJjx3Fl2jig==",+ "dependencies": {+ "@radix-ui/primitive": "1.1.0",+ "@radix-ui/react-compose-refs": "1.1.0",+ "@radix-ui/react-primitive": "2.0.0",+ "@radix-ui/react-use-callback-ref": "1.1.0",+ "@radix-ui/react-use-escape-keydown": "1.1.0"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"},"peerDependenciesMeta": {"@types/react": {@@ -3146,6 +3208,232 @@}}},+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-focus-guards": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.0.tgz",+ "integrity": "sha512-w6XZNUPVv6xCpZUqb/yN9DL6auvpGX3C/ee6Hdi16v2UUy25HV2Q5bcflsiDyT/g5RwbPQ/GIT1vLkeRb+ITBw==",+ "peerDependencies": {+ "@types/react": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-focus-scope": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.0.tgz",+ "integrity": "sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==",+ "dependencies": {+ "@radix-ui/react-compose-refs": "1.1.0",+ "@radix-ui/react-primitive": "2.0.0",+ "@radix-ui/react-use-callback-ref": "1.1.0"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-id": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz",+ "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==",+ "dependencies": {+ "@radix-ui/react-use-layout-effect": "1.1.0"+ },+ "peerDependencies": {+ "@types/react": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-portal": {+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.1.tgz",+ "integrity": "sha512-A3UtLk85UtqhzFqtoC8Q0KvR2GbXF3mtPgACSazajqq6A41mEQgo53iPzY4i6BwDxlIFqWIhiQ2G729n+2aw/g==",+ "dependencies": {+ "@radix-ui/react-primitive": "2.0.0",+ "@radix-ui/react-use-layout-effect": "1.1.0"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-presence": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.0.tgz",+ "integrity": "sha512-Gq6wuRN/asf9H/E/VzdKoUtT8GC9PQc9z40/vEr0VCJ4u5XvvhWIrSsCB6vD2/cH7ugTdSfYq9fLJCcM00acrQ==",+ "dependencies": {+ "@radix-ui/react-compose-refs": "1.1.0",+ "@radix-ui/react-use-layout-effect": "1.1.0"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-primitive": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz",+ "integrity": "sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==",+ "dependencies": {+ "@radix-ui/react-slot": "1.1.0"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz",+ "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==",+ "dependencies": {+ "@radix-ui/react-compose-refs": "1.1.0"+ },+ "peerDependencies": {+ "@types/react": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-callback-ref": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz",+ "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==",+ "peerDependencies": {+ "@types/react": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-controllable-state": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz",+ "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==",+ "dependencies": {+ "@radix-ui/react-use-callback-ref": "1.1.0"+ },+ "peerDependencies": {+ "@types/react": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-escape-keydown": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz",+ "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==",+ "dependencies": {+ "@radix-ui/react-use-callback-ref": "1.1.0"+ },+ "peerDependencies": {+ "@types/react": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-layout-effect": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz",+ "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==",+ "peerDependencies": {+ "@types/react": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-dialog/node_modules/react-remove-scroll": {+ "version": "2.5.7",+ "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.7.tgz",+ "integrity": "sha512-FnrTWO4L7/Bhhf3CYBNArEG/yROV0tKmTv7/3h9QCFvH6sndeFf1wPqOcbFVu5VAulS5dV1wGT3GZZ/1GawqiA==",+ "dependencies": {+ "react-remove-scroll-bar": "^2.3.4",+ "react-style-singleton": "^2.2.1",+ "tslib": "^2.1.0",+ "use-callback-ref": "^1.3.0",+ "use-sidecar": "^1.1.2"+ },+ "engines": {+ "node": ">=10"+ },+ "peerDependencies": {+ "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",+ "react": "^16.8.0 || ^17.0.0 || ^18.0.0"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ }+ }+ },"node_modules/@radix-ui/react-direction": {"version": "1.0.1","resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.0.1.tgz",@@ -4224,6 +4512,20 @@"react": "^18.2.0"}},+ "node_modules/@redis/client": {+ "version": "1.5.17",+ "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.5.17.tgz",+ "integrity": "sha512-IPvU9A31qRCZ7lds/x+ksuK/UMndd0EASveAvCvEtFFKIZjZ+m/a4a0L7S28KEWoR5ka8526hlSghDo4Hrc2Hg==",+ "optional": true,+ "dependencies": {+ "cluster-key-slot": "1.1.2",+ "generic-pool": "3.9.0",+ "yallist": "4.0.0"+ },+ "engines": {+ "node": ">=14"+ }+ },"node_modules/@rushstack/eslint-patch": {"version": "1.5.0","resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.5.0.tgz",@@ -4247,6 +4549,14 @@"integrity": "sha512-xjV63pRUBvxA1LsxOUhRKLPh0uUjwBLzAKLdEuYSLIylo71sYuwDcttqNP01Ib1TZlLfO840CXHPlgUUsYFjzg==","peer": true},+ "node_modules/@shopify/semaphore": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/@shopify/semaphore/-/semaphore-3.1.0.tgz",+ "integrity": "sha512-LxonkiWEu12FbZhuOMhsdocpxCqm7By8C/2U9QgNuEoXUx2iMrlXjJv3p93RwfNC6TrdlNRo17gRer1z1309VQ==",+ "engines": {+ "node": ">=18.12.0"+ }+ },"node_modules/@sindresorhus/is": {"version": "4.6.0","resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",@@ -5500,6 +5810,45 @@"node": ">=6.9.0"}},+ "node_modules/@tus/s3-store": {+ "version": "1.5.0",+ "resolved": "https://registry.npmjs.org/@tus/s3-store/-/s3-store-1.5.0.tgz",+ "integrity": "sha512-YpSL+lZ908mIFdVYME9V0oG46kJFB70CRMkBu0vGckL/7C+YXxfSdBxxfd8nc9TPgGp2hABz8LpTH6fcwoy+QQ==",+ "dependencies": {+ "@aws-sdk/client-s3": "^3.490.0",+ "@shopify/semaphore": "^3.0.2",+ "@tus/utils": "^0.3.0",+ "debug": "^4.3.4",+ "multistream": "^4.1.0"+ },+ "engines": {+ "node": ">=16"+ }+ },+ "node_modules/@tus/server": {+ "version": "1.7.0",+ "resolved": "https://registry.npmjs.org/@tus/server/-/server-1.7.0.tgz",+ "integrity": "sha512-2RlQXkTw3+fMFUbIO4AIrgF8C/OI6WtSQ2R0iWEzpSUD9i8TqJNxa7gNAGFe4SQJUtGLTq7OxUWb6+Dndblr+Q==",+ "dependencies": {+ "@tus/utils": "^0.3.0",+ "debug": "^4.3.4",+ "lodash.throttle": "^4.1.1"+ },+ "engines": {+ "node": ">=16"+ },+ "optionalDependencies": {+ "@redis/client": "^1.5.13"+ }+ },+ "node_modules/@tus/utils": {+ "version": "0.3.0",+ "resolved": "https://registry.npmjs.org/@tus/utils/-/utils-0.3.0.tgz",+ "integrity": "sha512-Wt/phitrYEP6T9Tq0ikhJdGKpeEEkOT+vEVUKQKBXBUZdtWubLQKvR2V9jtzekFhLIoqm0KS5uOb7abZgebT3A==",+ "engines": {+ "node": ">=16"+ }+ },"node_modules/@types/acorn": {"version": "4.0.6","resolved": "https://registry.npmjs.org/@types/acorn/-/acorn-4.0.6.tgz",@@ -7589,6 +7938,15 @@"node": ">=6"}},+ "node_modules/cluster-key-slot": {+ "version": "1.1.2",+ "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz",+ "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==",+ "optional": true,+ "engines": {+ "node": ">=0.10.0"+ }+ },"node_modules/cmdk": {"version": "1.0.0","resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.0.0.tgz",@@ -7602,6 +7960,42 @@"react-dom": "^18.0.0"}},+ "node_modules/cmdk/node_modules/@radix-ui/react-dialog": {+ "version": "1.0.5",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.0.5.tgz",+ "integrity": "sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==",+ "dependencies": {+ "@babel/runtime": "^7.13.10",+ "@radix-ui/primitive": "1.0.1",+ "@radix-ui/react-compose-refs": "1.0.1",+ "@radix-ui/react-context": "1.0.1",+ "@radix-ui/react-dismissable-layer": "1.0.5",+ "@radix-ui/react-focus-guards": "1.0.1",+ "@radix-ui/react-focus-scope": "1.0.4",+ "@radix-ui/react-id": "1.0.1",+ "@radix-ui/react-portal": "1.0.4",+ "@radix-ui/react-presence": "1.0.1",+ "@radix-ui/react-primitive": "1.0.3",+ "@radix-ui/react-slot": "1.0.2",+ "@radix-ui/react-use-controllable-state": "1.0.1",+ "aria-hidden": "^1.1.1",+ "react-remove-scroll": "2.5.5"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0",+ "react-dom": "^16.8 || ^17.0 || ^18.0"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },"node_modules/code-red": {"version": "1.0.4","resolved": "https://registry.npmjs.org/code-red/-/code-red-1.0.4.tgz",@@ -7649,6 +8043,15 @@"color-support": "bin.js"}},+ "node_modules/combine-errors": {+ "version": "3.0.3",+ "resolved": "https://registry.npmjs.org/combine-errors/-/combine-errors-3.0.3.tgz",+ "integrity": "sha512-C8ikRNRMygCwaTx+Ek3Yr+OuZzgZjduCOfSQBjbM8V3MfgcjSTeto/GXP6PAwKvJz/v15b7GHZvx5rOlczFw/Q==",+ "dependencies": {+ "custom-error-instance": "2.1.1",+ "lodash.uniqby": "4.5.0"+ }+ },"node_modules/combined-stream": {"version": "1.0.8","resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",@@ -7935,6 +8338,11 @@"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz","integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="},+ "node_modules/custom-error-instance": {+ "version": "2.1.1",+ "resolved": "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz",+ "integrity": "sha512-p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg=="+ },"node_modules/d3-array": {"version": "3.2.4","resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",@@ -9768,6 +10176,15 @@"node": ">=8"}},+ "node_modules/generic-pool": {+ "version": "3.9.0",+ "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz",+ "integrity": "sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==",+ "optional": true,+ "engines": {+ "node": ">= 4"+ }+ },"node_modules/gensync": {"version": "1.0.0-beta.2","resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",@@ -11087,6 +11504,11 @@"url": "https://github.com/sponsors/panva"}},+ "node_modules/js-base64": {+ "version": "3.7.7",+ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.7.tgz",+ "integrity": "sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw=="+ },"node_modules/js-beautify": {"version": "1.14.11","resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.11.tgz",@@ -11422,6 +11844,46 @@"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz","integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="},+ "node_modules/lodash._baseiteratee": {+ "version": "4.7.0",+ "resolved": "https://registry.npmjs.org/lodash._baseiteratee/-/lodash._baseiteratee-4.7.0.tgz",+ "integrity": "sha512-nqB9M+wITz0BX/Q2xg6fQ8mLkyfF7MU7eE+MNBNjTHFKeKaZAPEzEg+E8LWxKWf1DQVflNEn9N49yAuqKh2mWQ==",+ "dependencies": {+ "lodash._stringtopath": "~4.8.0"+ }+ },+ "node_modules/lodash._basetostring": {+ "version": "4.12.0",+ "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz",+ "integrity": "sha512-SwcRIbyxnN6CFEEK4K1y+zuApvWdpQdBHM/swxP962s8HIxPO3alBH5t3m/dl+f4CMUug6sJb7Pww8d13/9WSw=="+ },+ "node_modules/lodash._baseuniq": {+ "version": "4.6.0",+ "resolved": "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz",+ "integrity": "sha512-Ja1YevpHZctlI5beLA7oc5KNDhGcPixFhcqSiORHNsp/1QTv7amAXzw+gu4YOvErqVlMVyIJGgtzeepCnnur0A==",+ "dependencies": {+ "lodash._createset": "~4.0.0",+ "lodash._root": "~3.0.0"+ }+ },+ "node_modules/lodash._createset": {+ "version": "4.0.3",+ "resolved": "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz",+ "integrity": "sha512-GTkC6YMprrJZCYU3zcqZj+jkXkrXzq3IPBcF/fIPpNEAB4hZEtXU8zp/RwKOvZl43NUmwDbyRk3+ZTbeRdEBXA=="+ },+ "node_modules/lodash._root": {+ "version": "3.0.1",+ "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",+ "integrity": "sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ=="+ },+ "node_modules/lodash._stringtopath": {+ "version": "4.8.0",+ "resolved": "https://registry.npmjs.org/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz",+ "integrity": "sha512-SXL66C731p0xPDC5LZg4wI5H+dJo/EO4KTqOMwLYCH3+FmmfAKJEZCm6ohGpI+T1xwsDsJCfL4OnhorllvlTPQ==",+ "dependencies": {+ "lodash._basetostring": "~4.12.0"+ }+ },"node_modules/lodash.castarray": {"version": "4.4.0","resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz",@@ -11437,6 +11899,20 @@"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz","integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="},+ "node_modules/lodash.throttle": {+ "version": "4.1.1",+ "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",+ "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="+ },+ "node_modules/lodash.uniqby": {+ "version": "4.5.0",+ "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.5.0.tgz",+ "integrity": "sha512-IRt7cfTtHy6f1aRVA5n7kT8rgN3N1nH6MOWLcHfpWG2SH19E3JksLK38MktLxZDhlAjCP9jpIXkOnRXlu6oByQ==",+ "dependencies": {+ "lodash._baseiteratee": "~4.7.0",+ "lodash._baseuniq": "~4.6.0"+ }+ },"node_modules/log-symbols": {"version": "4.1.0","resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",@@ -12786,6 +13262,29 @@"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz","integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="},+ "node_modules/multistream": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz",+ "integrity": "sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw==",+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/feross"+ },+ {+ "type": "patreon",+ "url": "https://www.patreon.com/feross"+ },+ {+ "type": "consulting",+ "url": "https://feross.org/support"+ }+ ],+ "dependencies": {+ "once": "^1.4.0",+ "readable-stream": "^3.6.0"+ }+ },"node_modules/mupdf": {"version": "0.2.2","resolved": "https://registry.npmjs.org/mupdf/-/mupdf-0.2.2.tgz",@@ -14108,6 +14607,24 @@"react-is": "^16.13.1"}},+ "node_modules/proper-lockfile": {+ "version": "4.1.2",+ "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.2.tgz",+ "integrity": "sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==",+ "dependencies": {+ "graceful-fs": "^4.2.4",+ "retry": "^0.12.0",+ "signal-exit": "^3.0.2"+ }+ },+ "node_modules/proper-lockfile/node_modules/retry": {+ "version": "0.12.0",+ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",+ "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",+ "engines": {+ "node": ">= 4"+ }+ },"node_modules/property-information": {"version": "6.4.1","resolved": "https://registry.npmjs.org/property-information/-/property-information-6.4.1.tgz",@@ -14153,6 +14670,11 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/querystringify": {+ "version": "2.2.0",+ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",+ "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="+ },"node_modules/queue-microtask": {"version": "1.2.3","resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",@@ -15483,6 +16005,11 @@"url": "https://opencollective.com/unified"}},+ "node_modules/requires-port": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",+ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="+ },"node_modules/resend": {"version": "3.2.0","resolved": "https://registry.npmjs.org/resend/-/resend-3.2.0.tgz",@@ -17066,6 +17593,34 @@"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz","integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="},+ "node_modules/tus-js-client": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/tus-js-client/-/tus-js-client-4.1.0.tgz",+ "integrity": "sha512-e/nC/kJahvNYBcnwcqzuhFIvVELMMpbVXIoOOKdUn74SdQCvJd2JjqV2jZLv2EFOVbV4qLiO0lV7BxBXF21b6Q==",+ "dependencies": {+ "buffer-from": "^1.1.2",+ "combine-errors": "^3.0.3",+ "is-stream": "^2.0.0",+ "js-base64": "^3.7.2",+ "lodash.throttle": "^4.1.1",+ "proper-lockfile": "^4.1.2",+ "url-parse": "^1.5.7"+ },+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tus-js-client/node_modules/is-stream": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/type-check": {"version": "0.4.0","resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",@@ -17443,6 +17998,15 @@"punycode": "^2.1.0"}},+ "node_modules/url-parse": {+ "version": "1.5.10",+ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",+ "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",+ "dependencies": {+ "querystringify": "^2.1.1",+ "requires-port": "^1.0.0"+ }+ },"node_modules/use-callback-ref": {"version": "1.3.0","resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.0.tgz",@@ -17550,6 +18114,18 @@"node": ">= 0.8"}},+ "node_modules/vaul": {+ "version": "0.9.1",+ "resolved": "https://registry.npmjs.org/vaul/-/vaul-0.9.1.tgz",+ "integrity": "sha512-fAhd7i4RNMinx+WEm6pF3nOl78DFkAazcN04ElLPFF9BMCNGbY/kou8UMhIcicm0rJCNePJP0Yyza60gGOD0Jw==",+ "dependencies": {+ "@radix-ui/react-dialog": "^1.0.4"+ },+ "peerDependencies": {+ "react": "^16.8 || ^17.0 || ^18.0",+ "react-dom": "^16.8 || ^17.0 || ^18.0"+ }+ },"node_modules/vfile": {"version": "6.0.1","resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz",diff --git a/package.json b/package.jsonindex 2e761baa..667038c6 100644--- a/package.json+++ b/package.json@@ -35,7 +35,7 @@"@radix-ui/react-avatar": "^1.0.4","@radix-ui/react-checkbox": "^1.0.4","@radix-ui/react-collapsible": "^1.0.3",- "@radix-ui/react-dialog": "^1.0.5",+ "@radix-ui/react-dialog": "^1.1.1","@radix-ui/react-dropdown-menu": "^2.0.6","@radix-ui/react-label": "^2.0.2","@radix-ui/react-popover": "^1.0.7",@@ -56,6 +56,8 @@"@trigger.dev/nextjs": "^2.3.19","@trigger.dev/react": "^2.3.19","@trigger.dev/sdk": "^2.3.19",+ "@tus/s3-store": "^1.5.0",+ "@tus/server": "^1.7.0","@upstash/qstash": "^2.6.0","@upstash/ratelimit": "^1.2.1","@upstash/redis": "^1.32.0",@@ -120,8 +122,10 @@"tailwindcss": "^3.4.4","tailwindcss-animate": "^1.0.7","ts-pattern": "^5.2.0",+ "tus-js-client": "^4.1.0","typescript": "^5.3.3","ua-parser-js": "^1.0.38",+ "vaul": "^0.9.1","xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz","zod": "^3.23.8"},diff --git a/pages/api/file/tus/[[...file]].ts b/pages/api/file/tus/[[...file]].tsnew file mode 100644index 00000000..6a8c172a--- /dev/null+++ b/pages/api/file/tus/[[...file]].ts@@ -0,0 +1,68 @@+import type { NextApiRequest, NextApiResponse } from "next";++import { client } from "@/trigger";+import { DocumentStorageType } from "@prisma/client";+import slugify from "@sindresorhus/slugify";+import { S3Store } from "@tus/s3-store";+import { Server, Upload } from "@tus/server";+import { getServerSession } from "next-auth/next";+import { IncomingMessage } from "node:http";+import path from "node:path";++import { newId } from "@/lib/id-helper";+import prisma from "@/lib/prisma";++import { authOptions } from "../../auth/[...nextauth]";++export const config = {+ api: {+ bodyParser: false,+ },+};++const tusServer = new Server({+ // `path` needs to match the route declared by the next file router+ path: "/api/file/tus",+ datastore: new S3Store({+ partSize: 8 * 1024 * 1024, // each uploaded part will have ~8MiB,+ s3ClientConfig: {+ bucket: process.env.NEXT_PRIVATE_UPLOAD_BUCKET as string,+ region: process.env.NEXT_PRIVATE_UPLOAD_REGION as string,+ credentials: {+ accessKeyId: process.env.NEXT_PRIVATE_UPLOAD_ACCESS_KEY_ID as string,+ secretAccessKey: process.env+ .NEXT_PRIVATE_UPLOAD_SECRET_ACCESS_KEY as string,+ },+ },+ }),+ namingFunction(req, metadata) {+ const { teamId, fileName } = metadata as {+ teamId: string;+ fileName: string;+ };+ const docId = newId("doc");+ const { name, ext } = path.parse(fileName);+ const newName = `${teamId}/${docId}/${slugify(name)}${ext}`;+ return newName;+ },+ generateUrl(req, { proto, host, path, id }) {+ // Encode the ID to be URL safe+ id = Buffer.from(id, "utf-8").toString("base64url");+ return `${proto}://${host}${path}/${id}`;+ },+ getFileIdFromRequest(req) {+ // Extract the ID from the URL+ const id = (req.url as string).split("/api/file/tus/")[1];+ return Buffer.from(id, "base64url").toString("utf-8");+ },+});++export default function handler(req: NextApiRequest, res: NextApiResponse) {+ // Get the session+ const session = getServerSession(req, res, authOptions);+ if (!session) {+ return res.status(401).json({ message: "Unauthorized" });+ }++ return tusServer.handle(req, res);+}