@softure-ai/files 0.1.2 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +43 -0
- package/README.md +237 -10
- package/dist/client/index.d.ts +3 -0
- package/dist/client/index.d.ts.map +1 -0
- package/dist/client/index.js +6 -0
- package/dist/client/index.js.map +1 -0
- package/dist/client/send-upload.d.ts +26 -0
- package/dist/client/send-upload.d.ts.map +1 -0
- package/dist/client/send-upload.js +66 -0
- package/dist/client/send-upload.js.map +1 -0
- package/dist/client/upload-queue.d.ts +52 -0
- package/dist/client/upload-queue.d.ts.map +1 -0
- package/dist/client/upload-queue.js +164 -0
- package/dist/client/upload-queue.js.map +1 -0
- package/dist/contract.d.ts +41 -1
- package/dist/contract.d.ts.map +1 -1
- package/dist/index.d.ts +40 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +17 -4
- package/dist/index.js.map +1 -1
- package/dist/mcp/index.d.ts +65 -0
- package/dist/mcp/index.d.ts.map +1 -0
- package/dist/mcp/index.js +131 -0
- package/dist/mcp/index.js.map +1 -0
- package/dist/messages/en.d.ts +20 -0
- package/dist/messages/en.d.ts.map +1 -1
- package/dist/messages/en.js +20 -0
- package/dist/messages/en.js.map +1 -1
- package/dist/messages/index.d.ts +20 -0
- package/dist/messages/index.d.ts.map +1 -1
- package/dist/next/index.d.ts +2 -0
- package/dist/next/index.d.ts.map +1 -1
- package/dist/next/index.js +4 -2
- package/dist/next/index.js.map +1 -1
- package/dist/next/stored-file-route.d.ts +25 -0
- package/dist/next/stored-file-route.d.ts.map +1 -0
- package/dist/next/stored-file-route.js +14 -0
- package/dist/next/stored-file-route.js.map +1 -0
- package/dist/next/upload-route.d.ts +3 -0
- package/dist/next/upload-route.d.ts.map +1 -0
- package/dist/next/upload-route.js +11 -0
- package/dist/next/upload-route.js.map +1 -0
- package/dist/options.d.ts +6 -0
- package/dist/options.d.ts.map +1 -1
- package/dist/options.js +27 -0
- package/dist/options.js.map +1 -1
- package/dist/schema.d.ts +255 -0
- package/dist/schema.d.ts.map +1 -1
- package/dist/schema.js +17 -2
- package/dist/schema.js.map +1 -1
- package/dist/server/index.d.ts +7 -3
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +7 -3
- package/dist/server/index.js.map +1 -1
- package/dist/server/options.d.ts +2 -0
- package/dist/server/options.d.ts.map +1 -1
- package/dist/server/options.js +8 -0
- package/dist/server/options.js.map +1 -1
- package/dist/server/privacy.d.ts +6 -1
- package/dist/server/privacy.d.ts.map +1 -1
- package/dist/server/privacy.js +6 -3
- package/dist/server/privacy.js.map +1 -1
- package/dist/server/prune.d.ts +4 -0
- package/dist/server/prune.d.ts.map +1 -1
- package/dist/server/prune.js +4 -2
- package/dist/server/prune.js.map +1 -1
- package/dist/server/save.d.ts +15 -0
- package/dist/server/save.d.ts.map +1 -1
- package/dist/server/save.js +11 -9
- package/dist/server/save.js.map +1 -1
- package/dist/server/serve-upload.d.ts +6 -0
- package/dist/server/serve-upload.d.ts.map +1 -0
- package/dist/server/serve-upload.js +110 -0
- package/dist/server/serve-upload.js.map +1 -0
- package/dist/server/serve.d.ts +15 -0
- package/dist/server/serve.d.ts.map +1 -1
- package/dist/server/serve.js +38 -14
- package/dist/server/serve.js.map +1 -1
- package/dist/server/upload-page.d.ts +5 -0
- package/dist/server/upload-page.d.ts.map +1 -0
- package/dist/server/upload-page.js +87 -0
- package/dist/server/upload-page.js.map +1 -0
- package/dist/server/upload-tokens.d.ts +9 -0
- package/dist/server/upload-tokens.d.ts.map +1 -0
- package/dist/server/upload-tokens.js +43 -0
- package/dist/server/upload-tokens.js.map +1 -0
- package/dist/server/uploads.d.ts +73 -0
- package/dist/server/uploads.d.ts.map +1 -0
- package/dist/server/uploads.js +403 -0
- package/dist/server/uploads.js.map +1 -0
- package/migrations/0002_create_uploads.sql +33 -0
- package/module.json +9 -4
- package/package.json +17 -2
- package/src/client/index.ts +12 -0
- package/src/client/send-upload.ts +89 -0
- package/src/client/upload-queue.ts +220 -0
- package/src/contract.ts +45 -1
- package/src/index.ts +32 -5
- package/src/mcp/index.ts +206 -0
- package/src/messages/en.ts +20 -0
- package/src/next/index.ts +10 -2
- package/src/next/stored-file-route.ts +43 -0
- package/src/next/upload-route.ts +11 -0
- package/src/options.ts +28 -0
- package/src/schema.ts +20 -2
- package/src/server/index.ts +21 -3
- package/src/server/options.ts +8 -0
- package/src/server/privacy.ts +12 -4
- package/src/server/prune.ts +8 -2
- package/src/server/save.ts +25 -11
- package/src/server/serve-upload.ts +116 -0
- package/src/server/serve.ts +51 -14
- package/src/server/upload-page.ts +96 -0
- package/src/server/upload-tokens.ts +43 -0
- package/src/server/uploads.ts +437 -0
package/dist/server/options.js
CHANGED
|
@@ -21,6 +21,14 @@ export function getLinksRoute(config) {
|
|
|
21
21
|
throw new Error("@softure-ai/files: the links route is missing from the module manifest");
|
|
22
22
|
return trimTrailingSlashes(links);
|
|
23
23
|
}
|
|
24
|
+
/** The path prefix of upload URLs after the app's override (`files({ routes: { uploads } })`), without a trailing slash. */
|
|
25
|
+
export function getUploadsRoute(config) {
|
|
26
|
+
const { uploads } = getFilesModule(config).routes;
|
|
27
|
+
// The manifest declares it, so a missing one means a broken module definition.
|
|
28
|
+
if (uploads === undefined)
|
|
29
|
+
throw new Error("@softure-ai/files: the uploads route is missing from the module manifest");
|
|
30
|
+
return trimTrailingSlashes(uploads);
|
|
31
|
+
}
|
|
24
32
|
/** The path without trailing slashes; a loop, not `/\/+$/`, which backtracks quadratically on a run of slashes. */
|
|
25
33
|
function trimTrailingSlashes(path) {
|
|
26
34
|
let end = path.length;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/server/options.ts"],"names":[],"mappings":"AAAA,2FAA2F;AAC3F,OAAO,EAAE,SAAS,EAAsB,MAAM,kBAAkB,CAAC;AAGjE,MAAM,SAAS,GAAG,OAAO,CAAC;AAE1B,sGAAsG;AACtG,MAAM,UAAU,cAAc,CAAC,MAAqB;IAClD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC5C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,sGAAsG,CAAC,CAAC;IAC1H,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAqB;IACnD,mEAAmE;IACnE,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,OAAuB,CAAC;AACxD,CAAC;AAED,2HAA2H;AAC3H,MAAM,UAAU,aAAa,CAAC,MAAqB;IACjD,MAAM,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;IAChD,+EAA+E;IAC/E,IAAI,KAAK,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;IACnH,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC;AAED,mHAAmH;AACnH,SAAS,mBAAmB,CAAC,IAAY;IACvC,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;IACtB,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG;QAAE,GAAG,IAAI,CAAC,CAAC;IAClD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC"}
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/server/options.ts"],"names":[],"mappings":"AAAA,2FAA2F;AAC3F,OAAO,EAAE,SAAS,EAAsB,MAAM,kBAAkB,CAAC;AAGjE,MAAM,SAAS,GAAG,OAAO,CAAC;AAE1B,sGAAsG;AACtG,MAAM,UAAU,cAAc,CAAC,MAAqB;IAClD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC5C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,sGAAsG,CAAC,CAAC;IAC1H,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAqB;IACnD,mEAAmE;IACnE,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,OAAuB,CAAC;AACxD,CAAC;AAED,2HAA2H;AAC3H,MAAM,UAAU,aAAa,CAAC,MAAqB;IACjD,MAAM,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;IAChD,+EAA+E;IAC/E,IAAI,KAAK,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;IACnH,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC;AAED,4HAA4H;AAC5H,MAAM,UAAU,eAAe,CAAC,MAAqB;IACnD,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;IAClD,+EAA+E;IAC/E,IAAI,OAAO,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;IACvH,OAAO,mBAAmB,CAAC,OAAO,CAAC,CAAC;AACtC,CAAC;AAED,mHAAmH;AACnH,SAAS,mBAAmB,CAAC,IAAY;IACvC,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;IACtB,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG;QAAE,GAAG,IAAI,CAAC,CAAC;IAClD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC"}
|
package/dist/server/privacy.d.ts
CHANGED
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
import { type Ok, type PrivacyContributor } from "@softure-ai/core";
|
|
2
|
-
import type { StoredFile } from "../contract.js";
|
|
2
|
+
import type { StoredFile, UploadStatus } from "../contract.js";
|
|
3
3
|
import { type FilesContext } from "./context.js";
|
|
4
4
|
/** What files holds about one user, as it appears in their export. */
|
|
5
5
|
export interface FilesUserData {
|
|
6
6
|
readonly files: readonly StoredFile[];
|
|
7
|
+
/** Upload sessions still taking chunks. */
|
|
8
|
+
readonly uploads: readonly UploadStatus[];
|
|
7
9
|
}
|
|
8
10
|
export interface FilesDeletionReport {
|
|
9
11
|
readonly deletedFiles: number;
|
|
10
12
|
/** Files whose storage delete failed; their rows stay marked deleted and `pruneFiles` removes them. */
|
|
11
13
|
readonly pendingFiles: number;
|
|
14
|
+
readonly deletedUploads: number;
|
|
15
|
+
/** Sessions whose parts could not be deleted; `pruneFiles` removes them once they expire. */
|
|
16
|
+
readonly pendingUploads: number;
|
|
12
17
|
}
|
|
13
18
|
export declare function exportFilesUserData(ctx: FilesContext, userId: string): Promise<Ok<FilesUserData>>;
|
|
14
19
|
export declare function deleteFilesUserData(ctx: FilesContext, userId: string): Promise<Ok<FilesDeletionReport>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"privacy.d.ts","sourceRoot":"","sources":["../../src/server/privacy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"privacy.d.ts","sourceRoot":"","sources":["../../src/server/privacy.ts"],"names":[],"mappings":"AAIA,OAAO,EAAM,KAAK,EAAE,EAAE,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGxE,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE/D,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAK/D,sEAAsE;AACtE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,CAAC;IACtC,2CAA2C;IAC3C,QAAQ,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;CAC3C;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,uGAAuG;IACvG,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,6FAA6F;IAC7F,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAOvG;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAW7G;AAED,eAAO,MAAM,uBAAuB,EAAE,kBAQrC,CAAC"}
|
package/dist/server/privacy.js
CHANGED
|
@@ -1,19 +1,21 @@
|
|
|
1
1
|
// The files part of a GDPR export and deletion (`@softure-ai/privacy`). A file belongs to its owner: the export
|
|
2
2
|
// lists the owner's live files (never the bytes or the storage key; the app links them itself when it wants), and
|
|
3
|
-
// the deletion removes every file of the owner from storage and the table.
|
|
3
|
+
// the deletion removes every file of the owner from storage and the table. Upload sessions are the owner's too: the
|
|
4
|
+
// export lists the open ones, the deletion removes all of them with their parts.
|
|
4
5
|
import { ok } from "@softure-ai/core";
|
|
5
6
|
import { and, asc, eq } from "drizzle-orm";
|
|
6
7
|
import { files } from "../schema.js";
|
|
7
8
|
import { toStoredFile } from "./context.js";
|
|
8
9
|
import { removeMarkedFile } from "./files.js";
|
|
9
10
|
import { isLive } from "./queries.js";
|
|
11
|
+
import { deleteOwnerUploads, listOpenUploads } from "./uploads.js";
|
|
10
12
|
export async function exportFilesUserData(ctx, userId) {
|
|
11
13
|
const rows = await ctx.db
|
|
12
14
|
.select()
|
|
13
15
|
.from(files)
|
|
14
16
|
.where(and(eq(files.ownerId, userId), isLive(ctx.clock.now())))
|
|
15
17
|
.orderBy(asc(files.createdAt), asc(files.id));
|
|
16
|
-
return ok({ files: rows.map(toStoredFile) });
|
|
18
|
+
return ok({ files: rows.map(toStoredFile), uploads: await listOpenUploads(ctx, userId) });
|
|
17
19
|
}
|
|
18
20
|
export async function deleteFilesUserData(ctx, userId) {
|
|
19
21
|
const now = ctx.clock.now();
|
|
@@ -25,7 +27,8 @@ export async function deleteFilesUserData(ctx, userId) {
|
|
|
25
27
|
if (await removeMarkedFile(ctx, row))
|
|
26
28
|
deletedFiles += 1;
|
|
27
29
|
}
|
|
28
|
-
|
|
30
|
+
const removedUploads = await deleteOwnerUploads(ctx, userId);
|
|
31
|
+
return ok({ deletedFiles, pendingFiles: rows.length - deletedFiles, deletedUploads: removedUploads.deletedUploads, pendingUploads: removedUploads.failedUploads });
|
|
29
32
|
}
|
|
30
33
|
export const filesPrivacyContributor = {
|
|
31
34
|
// Core types `db` as unknown; privacy passes the @softure-ai/db handle or its transaction.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"privacy.js","sourceRoot":"","sources":["../../src/server/privacy.ts"],"names":[],"mappings":"AAAA,gHAAgH;AAChH,kHAAkH;AAClH,
|
|
1
|
+
{"version":3,"file":"privacy.js","sourceRoot":"","sources":["../../src/server/privacy.ts"],"names":[],"mappings":"AAAA,gHAAgH;AAChH,kHAAkH;AAClH,oHAAoH;AACpH,iFAAiF;AACjF,OAAO,EAAE,EAAE,EAAoC,MAAM,kBAAkB,CAAC;AAExE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,YAAY,EAAqB,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAkBnE,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAiB,EAAE,MAAc;IACzE,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,EAAE;SACtB,MAAM,EAAE;SACR,IAAI,CAAC,KAAK,CAAC;SACX,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SAC9D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAChD,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;AAC5F,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAiB,EAAE,MAAc;IACzE,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IAC5B,2GAA2G;IAC3G,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IACpF,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IAChF,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,MAAM,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC;YAAE,YAAY,IAAI,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC7D,OAAO,EAAE,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,MAAM,GAAG,YAAY,EAAE,cAAc,EAAE,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC;AACrK,CAAC;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAuB;IACzD,2FAA2F;IAC3F,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,mBAAmB,CAAC,EAAE,GAAG,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAe,EAAE,EAAE,MAAM,CAAC;IAC7G,wGAAwG;IACxG,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACxC,MAAM,mBAAmB,CAAC,EAAE,GAAG,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAe,EAAE,EAAE,MAAM,CAAC,CAAC;QAC/E,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;CACF,CAAC"}
|
package/dist/server/prune.d.ts
CHANGED
|
@@ -8,6 +8,10 @@ export interface PruneFilesReport {
|
|
|
8
8
|
readonly freedBytes: number;
|
|
9
9
|
/** Files whose storage delete failed; they stay for the next run. */
|
|
10
10
|
readonly failedFiles: number;
|
|
11
|
+
/** Expired upload sessions removed with their parts. */
|
|
12
|
+
readonly deletedUploads: number;
|
|
13
|
+
/** Expired upload sessions whose parts could not be deleted; they stay for the next run. */
|
|
14
|
+
readonly failedUploads: number;
|
|
11
15
|
}
|
|
12
16
|
export declare function pruneFiles(ctx: FilesContext, options?: PruneFilesOptions): Promise<PruneFilesReport>;
|
|
13
17
|
//# sourceMappingURL=prune.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../src/server/prune.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../src/server/prune.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAMjD,MAAM,WAAW,iBAAiB;IAChC,qEAAqE;IACrE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,qEAAqE;IACrE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,wDAAwD;IACxD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,4FAA4F;IAC5F,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwB9G"}
|
package/dist/server/prune.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
// Retention: files past their expiry and files deleted but not yet out of storage leave storage, then the table
|
|
1
|
+
// Retention: files past their expiry and files deleted but not yet out of storage leave storage, then the table;
|
|
2
|
+
// upload sessions past their expiry leave with their parts.
|
|
2
3
|
// Run it from the `files.prune` job (`@softure-ai/files/jobs`) or a cron calling `pruneFiles(ctx)`.
|
|
3
4
|
import { asc, isNotNull, lte, or } from "drizzle-orm";
|
|
4
5
|
import { files } from "../schema.js";
|
|
5
6
|
import { removeMarkedFile } from "./files.js";
|
|
7
|
+
import { pruneUploads } from "./uploads.js";
|
|
6
8
|
const DEFAULT_BATCH_SIZE = 500;
|
|
7
9
|
export async function pruneFiles(ctx, options = {}) {
|
|
8
10
|
const batchSize = Math.max(1, Math.trunc(options.batchSize ?? DEFAULT_BATCH_SIZE));
|
|
@@ -28,7 +30,7 @@ export async function pruneFiles(ctx, options = {}) {
|
|
|
28
30
|
}
|
|
29
31
|
}
|
|
30
32
|
if (rows.length < batchSize)
|
|
31
|
-
return { deletedFiles, freedBytes, failedFiles };
|
|
33
|
+
return { deletedFiles, freedBytes, failedFiles, ...(await pruneUploads(ctx, batchSize)) };
|
|
32
34
|
}
|
|
33
35
|
}
|
|
34
36
|
//# sourceMappingURL=prune.js.map
|
package/dist/server/prune.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../src/server/prune.ts"],"names":[],"mappings":"AAAA,iHAAiH;AACjH,oGAAoG;AACpG,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../src/server/prune.ts"],"names":[],"mappings":"AAAA,iHAAiH;AACjH,4DAA4D;AAC5D,oGAAoG;AACpG,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAkB/B,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAiB,EAAE,UAA6B,EAAE;IACjF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,IAAI,kBAAkB,CAAC,CAAC,CAAC;IACnF,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IAC5B,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,SAAS,CAAC;QACR,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,EAAE;aACtB,MAAM,EAAE;aACR,IAAI,CAAC,KAAK,CAAC;aACX,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;aAChE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aAC5C,KAAK,CAAC,SAAS,CAAC;aAChB,MAAM,CAAC,WAAW,CAAC,CAAC;QACvB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,MAAM,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;gBACrC,YAAY,IAAI,CAAC,CAAC;gBAClB,UAAU,IAAI,GAAG,CAAC,IAAI,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,WAAW,IAAI,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,GAAG,SAAS;YAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,CAAC,MAAM,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;IACzH,CAAC;AACH,CAAC"}
|
package/dist/server/save.d.ts
CHANGED
|
@@ -25,5 +25,20 @@ export type SaveFileInput = SaveFileFields & ({
|
|
|
25
25
|
export type SaveFileResult = Ok<StoredFile> | Err<FilesSaveErrorCode>;
|
|
26
26
|
/** Saves a file for `ownerId`. A storage failure propagates; refusals are codes. */
|
|
27
27
|
export declare function saveFile(ctx: FilesContext, input: SaveFileInput): Promise<SaveFileResult>;
|
|
28
|
+
/** What describes a file before its bytes, as a caller gives it. */
|
|
29
|
+
export interface FileDescriptionInput {
|
|
30
|
+
readonly ownerId: string;
|
|
31
|
+
readonly name: string;
|
|
32
|
+
readonly contentType?: string;
|
|
33
|
+
readonly kind?: string;
|
|
34
|
+
}
|
|
35
|
+
/** The description made safe to store: the owner checked, the name sanitised, the media type normalised. */
|
|
36
|
+
export interface FileDescription {
|
|
37
|
+
readonly originalName: string;
|
|
38
|
+
readonly contentType: string;
|
|
39
|
+
readonly kind: string;
|
|
40
|
+
}
|
|
41
|
+
/** Checks the owner, kind and media type of a file to save or upload, and sanitises its name. */
|
|
42
|
+
export declare function validateFileDescription(input: FileDescriptionInput): Ok<FileDescription> | Err<"files.invalid_input">;
|
|
28
43
|
export {};
|
|
29
44
|
//# sourceMappingURL=save.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../../src/server/save.ts"],"names":[],"mappings":"AAMA,OAAO,EAA0B,KAAK,GAAG,EAAE,KAAK,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAG7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGrE,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,eAAe,CAAC;AAC3D,OAAO,EAA+B,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAO9E,UAAU,cAAc;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,+EAA+E;IAC/E,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,8CAA8C;IAC9C,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,kDAAkD;IAClD,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,2GAA2G;IAC3G,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC;IAC1B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,sGAAsG;AACtG,MAAM,MAAM,aAAa,GAAG,cAAc,GAAG,CAAC;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC,CAAC;AAErJ,MAAM,MAAM,cAAc,GAAG,EAAE,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAyBtE,oFAAoF;AACpF,wBAAsB,QAAQ,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,CA6D/F"}
|
|
1
|
+
{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../../src/server/save.ts"],"names":[],"mappings":"AAMA,OAAO,EAA0B,KAAK,GAAG,EAAE,KAAK,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAG7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGrE,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,eAAe,CAAC;AAC3D,OAAO,EAA+B,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAO9E,UAAU,cAAc;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,+EAA+E;IAC/E,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,8CAA8C;IAC9C,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,kDAAkD;IAClD,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,2GAA2G;IAC3G,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC;IAC1B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,sGAAsG;AACtG,MAAM,MAAM,aAAa,GAAG,cAAc,GAAG,CAAC;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC,CAAC;AAErJ,MAAM,MAAM,cAAc,GAAG,EAAE,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAyBtE,oFAAoF;AACpF,wBAAsB,QAAQ,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,CA6D/F;AAcD,oEAAoE;AACpE,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,4GAA4G;AAC5G,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,iGAAiG;AACjG,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,oBAAoB,GAAG,EAAE,CAAC,eAAe,CAAC,GAAG,GAAG,CAAC,qBAAqB,CAAC,CAOrH"}
|
package/dist/server/save.js
CHANGED
|
@@ -99,6 +99,16 @@ export async function saveFile(ctx, input) {
|
|
|
99
99
|
return stored.ok ? ok(stored.value.row) : stored;
|
|
100
100
|
}
|
|
101
101
|
function validateFields(input, now, defaultTtlSeconds) {
|
|
102
|
+
const described = validateFileDescription(input);
|
|
103
|
+
if (!described.ok)
|
|
104
|
+
return described;
|
|
105
|
+
const expiresAt = resolveExpiry(input, now, defaultTtlSeconds);
|
|
106
|
+
if (expiresAt === false)
|
|
107
|
+
return err("files.invalid_input");
|
|
108
|
+
return ok({ ...described.value, expiresAt });
|
|
109
|
+
}
|
|
110
|
+
/** Checks the owner, kind and media type of a file to save or upload, and sanitises its name. */
|
|
111
|
+
export function validateFileDescription(input) {
|
|
102
112
|
if (input.ownerId.length === 0 || input.ownerId.length > MAX_OWNER_ID_LENGTH)
|
|
103
113
|
return err("files.invalid_input");
|
|
104
114
|
const kind = input.kind ?? DEFAULT_FILE_KIND;
|
|
@@ -107,15 +117,7 @@ function validateFields(input, now, defaultTtlSeconds) {
|
|
|
107
117
|
const contentType = normalizeContentType(input.contentType ?? DEFAULT_CONTENT_TYPE);
|
|
108
118
|
if (contentType === null)
|
|
109
119
|
return err("files.invalid_input");
|
|
110
|
-
|
|
111
|
-
if (expiresAt === false)
|
|
112
|
-
return err("files.invalid_input");
|
|
113
|
-
return ok({
|
|
114
|
-
originalName: sanitizeFileName(input.name),
|
|
115
|
-
contentType,
|
|
116
|
-
kind,
|
|
117
|
-
expiresAt,
|
|
118
|
-
});
|
|
120
|
+
return ok({ originalName: sanitizeFileName(input.name), contentType, kind });
|
|
119
121
|
}
|
|
120
122
|
/** The expiry from `expiresAt`, `ttlSeconds` or the default; false when the input is contradictory or in the past. */
|
|
121
123
|
function resolveExpiry(input, now, defaultTtlSeconds) {
|
package/dist/server/save.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save.js","sourceRoot":"","sources":["../../src/server/save.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"save.js","sourceRoot":"","sources":["../../src/server/save.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { FilesContext } from "./context.js";
|
|
2
|
+
/** The security bucket the upload route counts in; `FILES_RATE_LIMIT_BUCKETS` holds its default. */
|
|
3
|
+
export declare const FILES_UPLOAD_RATE_LIMIT_BUCKET = "files-upload";
|
|
4
|
+
/** Answers a request to an upload URL (`GET`, `HEAD` or `PUT`). */
|
|
5
|
+
export declare function serveUpload(ctx: FilesContext, request: Request): Promise<Response>;
|
|
6
|
+
//# sourceMappingURL=serve-upload.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serve-upload.d.ts","sourceRoot":"","sources":["../../src/server/serve-upload.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAKjD,oGAAoG;AACpG,eAAO,MAAM,8BAA8B,iBAAiB,CAAC;AAe7D,mEAAmE;AACnE,wBAAsB,WAAW,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAmBxF"}
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
// The upload route, framework-free: `PUT` writes one chunk (`Content-Range: bytes a-b/total`, or no range when the
|
|
2
|
+
// file fits one chunk), `HEAD` answers what arrived in headers so a client can resume, `GET` answers the same as JSON
|
|
3
|
+
// or, to a browser, the upload page. The URL's signature is checked before any database read, and every dead URL
|
|
4
|
+
// (forged, expired, finalized for a `PUT`) gets the same `404`. With the security module enabled each request counts
|
|
5
|
+
// in the `files-upload` bucket, keyed by the session.
|
|
6
|
+
import { errorLogLabel, getModule } from "@softure-ai/core";
|
|
7
|
+
import { consumeRateLimit, subjectKey } from "@softure-ai/security/server";
|
|
8
|
+
import { getUpload, writeUploadChunk } from "./uploads.js";
|
|
9
|
+
import { renderUploadPage } from "./upload-page.js";
|
|
10
|
+
import { verifyUploadPath } from "./upload-tokens.js";
|
|
11
|
+
/** The security bucket the upload route counts in; `FILES_RATE_LIMIT_BUCKETS` holds its default. */
|
|
12
|
+
export const FILES_UPLOAD_RATE_LIMIT_BUCKET = "files-upload";
|
|
13
|
+
const BASE_HEADERS = {
|
|
14
|
+
"cache-control": "private, no-store",
|
|
15
|
+
"x-content-type-options": "nosniff",
|
|
16
|
+
"referrer-policy": "no-referrer",
|
|
17
|
+
};
|
|
18
|
+
const ALLOWED_METHODS = "GET, HEAD, PUT";
|
|
19
|
+
const CONTENT_RANGE_PATTERN = /^bytes (\d{1,15})-(\d{1,15})\/(\d{1,15})$/;
|
|
20
|
+
const ERROR_STATUS = {
|
|
21
|
+
"files.not_found": 404,
|
|
22
|
+
"files.invalid_range": 416,
|
|
23
|
+
"files.chunk_length_mismatch": 400,
|
|
24
|
+
};
|
|
25
|
+
/** Answers a request to an upload URL (`GET`, `HEAD` or `PUT`). */
|
|
26
|
+
export async function serveUpload(ctx, request) {
|
|
27
|
+
if (request.method !== "GET" && request.method !== "HEAD" && request.method !== "PUT") {
|
|
28
|
+
return new Response(null, { status: 405, headers: { ...BASE_HEADERS, allow: ALLOWED_METHODS } });
|
|
29
|
+
}
|
|
30
|
+
const verified = verifyUploadPath(ctx, new URL(request.url).pathname);
|
|
31
|
+
if (!verified.ok) {
|
|
32
|
+
if (verified.error !== "files.not_found")
|
|
33
|
+
console.error(`@softure-ai/files: an upload URL could not be checked: ${verified.error}`);
|
|
34
|
+
return answerError("files.not_found");
|
|
35
|
+
}
|
|
36
|
+
const uploadId = verified.value;
|
|
37
|
+
const limited = await countRequest(ctx, uploadId);
|
|
38
|
+
if (limited !== null)
|
|
39
|
+
return limited;
|
|
40
|
+
if (request.method === "PUT")
|
|
41
|
+
return putChunk(ctx, uploadId, request);
|
|
42
|
+
const status = await getUpload(ctx, uploadId);
|
|
43
|
+
if (status === null)
|
|
44
|
+
return answerError("files.not_found");
|
|
45
|
+
if (request.method === "HEAD")
|
|
46
|
+
return new Response(null, { status: 200, headers: { ...BASE_HEADERS, ...describeInHeaders(status) } });
|
|
47
|
+
if (acceptsHtml(request))
|
|
48
|
+
return renderUploadPage(ctx, status);
|
|
49
|
+
return answerJson(status);
|
|
50
|
+
}
|
|
51
|
+
async function putChunk(ctx, uploadId, request) {
|
|
52
|
+
const header = request.headers.get("content-range");
|
|
53
|
+
const match = header === null ? null : CONTENT_RANGE_PATTERN.exec(header.trim());
|
|
54
|
+
if (header !== null && match === null)
|
|
55
|
+
return answerError("files.invalid_range");
|
|
56
|
+
const range = match === null ? null : { start: Number(match[1]), end: Number(match[2]) };
|
|
57
|
+
const declaredLength = request.headers.get("content-length");
|
|
58
|
+
// A body that cannot fit its range is refused before a byte of it is read.
|
|
59
|
+
if (range !== null && declaredLength !== null && Number(declaredLength) !== range.end - range.start + 1)
|
|
60
|
+
return answerError("files.chunk_length_mismatch");
|
|
61
|
+
try {
|
|
62
|
+
const written = await writeUploadChunk(ctx, uploadId, {
|
|
63
|
+
range,
|
|
64
|
+
...(match === null ? {} : { total: Number(match[3]) }),
|
|
65
|
+
body: request.body ?? emptyBody(),
|
|
66
|
+
});
|
|
67
|
+
return written.ok ? answerJson(written.value) : answerError(written.error);
|
|
68
|
+
}
|
|
69
|
+
catch (error) {
|
|
70
|
+
console.error(`@softure-ai/files: storing a chunk of upload ${uploadId} failed: ${errorLogLabel(error)}`);
|
|
71
|
+
throw error;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
/** Counts the request in the security bucket when the app enabled that module; a `429` when over the limit. */
|
|
75
|
+
async function countRequest(ctx, uploadId) {
|
|
76
|
+
const security = getModule(ctx.config, "security");
|
|
77
|
+
if (security === undefined)
|
|
78
|
+
return null;
|
|
79
|
+
const buckets = security.options.buckets;
|
|
80
|
+
if (buckets?.[FILES_UPLOAD_RATE_LIMIT_BUCKET] === undefined) {
|
|
81
|
+
throw new Error(`@softure-ai/files: the security module has no "${FILES_UPLOAD_RATE_LIMIT_BUCKET}" bucket; spread FILES_RATE_LIMIT_BUCKETS into security({ buckets })`);
|
|
82
|
+
}
|
|
83
|
+
const counted = await consumeRateLimit(ctx, { bucket: FILES_UPLOAD_RATE_LIMIT_BUCKET, key: subjectKey(`upload:${uploadId}`) });
|
|
84
|
+
if (counted.ok)
|
|
85
|
+
return null;
|
|
86
|
+
return new Response(null, { status: 429, headers: { ...BASE_HEADERS, "retry-after": String(counted.retryAfterSeconds) } });
|
|
87
|
+
}
|
|
88
|
+
/** What arrived, for `HEAD`: `upload-received` lists the byte ranges (`0-1023,2048-2559`), empty when none. */
|
|
89
|
+
function describeInHeaders(status) {
|
|
90
|
+
return {
|
|
91
|
+
"upload-state": status.state,
|
|
92
|
+
"upload-size": String(status.size),
|
|
93
|
+
"upload-chunk-size": String(status.chunkSize),
|
|
94
|
+
"upload-received": status.received.map((range) => `${String(range.start)}-${String(range.end)}`).join(","),
|
|
95
|
+
"upload-expires": status.expiresAt.toISOString(),
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
function answerJson(status) {
|
|
99
|
+
return Response.json({ ...status, expiresAt: status.expiresAt.toISOString() }, { status: 200, headers: { ...BASE_HEADERS, ...describeInHeaders(status) } });
|
|
100
|
+
}
|
|
101
|
+
function answerError(code) {
|
|
102
|
+
return Response.json({ error: code }, { status: ERROR_STATUS[code], headers: BASE_HEADERS });
|
|
103
|
+
}
|
|
104
|
+
function acceptsHtml(request) {
|
|
105
|
+
return (request.headers.get("accept") ?? "").includes("text/html");
|
|
106
|
+
}
|
|
107
|
+
async function* emptyBody() {
|
|
108
|
+
// A PUT without a body: nothing to yield.
|
|
109
|
+
}
|
|
110
|
+
//# sourceMappingURL=serve-upload.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serve-upload.js","sourceRoot":"","sources":["../../src/server/serve-upload.ts"],"names":[],"mappings":"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"}
|
package/dist/server/serve.d.ts
CHANGED
|
@@ -1,7 +1,22 @@
|
|
|
1
1
|
import type { ByteRange } from "../contract.js";
|
|
2
2
|
import type { FilesContext } from "./context.js";
|
|
3
|
+
/** The one answer for every link or lookup that does not lead to a live file. */
|
|
4
|
+
export declare function notFound(): Response;
|
|
3
5
|
/** Answers a request for a public link (`GET` or `HEAD`). */
|
|
4
6
|
export declare function serveFileLink(ctx: FilesContext, request: Request): Promise<Response>;
|
|
7
|
+
export interface ServeStoredFileOptions {
|
|
8
|
+
/** The signed-in user the app's session names; another owner's file reads as missing. */
|
|
9
|
+
readonly ownerId: string;
|
|
10
|
+
/** `inline` (the default: shown in the app's own page, a player or an image) or `attachment` (a download). */
|
|
11
|
+
readonly disposition?: "attachment" | "inline";
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Answers a request (`GET` or `HEAD`) for a stored file on behalf of its signed-in owner: the answer of a public link
|
|
15
|
+
* (single byte ranges, `private, no-store`, `nosniff`, the sandboxing CSP) under the file's stored name, with no link
|
|
16
|
+
* to mint or verify. The caller has already checked the session; a file that is missing, expired, deleted or another
|
|
17
|
+
* owner's gets the same `404`.
|
|
18
|
+
*/
|
|
19
|
+
export declare function serveStoredFile(ctx: FilesContext, fileId: string, request: Request, options: ServeStoredFileOptions): Promise<Response>;
|
|
5
20
|
/**
|
|
6
21
|
* The single byte range a `Range` header asks for in a file of `size` bytes (RFC 9110 §14): null to answer the whole
|
|
7
22
|
* file (no header, a malformed one, another unit or several ranges, which a server may ignore), `"unsatisfiable"`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/server/serve.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/server/serve.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAejD,iFAAiF;AACjF,wBAAgB,QAAQ,IAAI,QAAQ,CASnC;AAED,6DAA6D;AAC7D,wBAAsB,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAW1F;AAED,MAAM,WAAW,sBAAsB;IACrC,yFAAyF;IACzF,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,8GAA8G;IAC9G,QAAQ,CAAC,WAAW,CAAC,EAAE,YAAY,GAAG,QAAQ,CAAC;CAChD;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAK7I;AAqDD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,eAAe,GAAG,IAAI,CAiBvG"}
|
package/dist/server/serve.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
// The
|
|
2
|
-
//
|
|
3
|
-
//
|
|
1
|
+
// The answer for a stored file, framework-free, behind a public link (`serveFileLink`) or for its signed-in owner
|
|
2
|
+
// (`serveStoredFile`): `GET` and `HEAD` with `Content-Length`, `Accept-Ranges`, single byte ranges (`206`, `416`),
|
|
3
|
+
// `Content-Disposition`, and `Cache-Control: private, no-store` so no CDN keeps a copy. Every dead link or lookup
|
|
4
|
+
// (forged, expired, revoked, deleted, another owner's, missing from storage) gets the same `404`. A stored file is user
|
|
4
5
|
// content on the app's origin, so it is sent with `nosniff` and a sandboxing CSP: an HTML or SVG file never runs.
|
|
5
6
|
import { errorLogLabel } from "@softure-ai/core";
|
|
6
7
|
import { findLiveRow } from "./files.js";
|
|
@@ -14,8 +15,8 @@ const BASE_HEADERS = {
|
|
|
14
15
|
};
|
|
15
16
|
const ALLOWED_METHODS = "GET, HEAD";
|
|
16
17
|
const NOT_FOUND_BODY = "Not found\n";
|
|
17
|
-
/** The one answer for every link that does not lead to a live file. */
|
|
18
|
-
function notFound() {
|
|
18
|
+
/** The one answer for every link or lookup that does not lead to a live file. */
|
|
19
|
+
export function notFound() {
|
|
19
20
|
return new Response(NOT_FOUND_BODY, {
|
|
20
21
|
status: 404,
|
|
21
22
|
headers: {
|
|
@@ -27,12 +28,8 @@ function notFound() {
|
|
|
27
28
|
}
|
|
28
29
|
/** Answers a request for a public link (`GET` or `HEAD`). */
|
|
29
30
|
export async function serveFileLink(ctx, request) {
|
|
30
|
-
if (request
|
|
31
|
-
return
|
|
32
|
-
status: 405,
|
|
33
|
-
headers: { ...BASE_HEADERS, allow: ALLOWED_METHODS },
|
|
34
|
-
});
|
|
35
|
-
}
|
|
31
|
+
if (!isReadMethod(request))
|
|
32
|
+
return methodNotAllowed();
|
|
36
33
|
const link = verifyFileLink(ctx, new URL(request.url).pathname);
|
|
37
34
|
if (!link.ok) {
|
|
38
35
|
if (link.error !== "files.not_found")
|
|
@@ -42,12 +39,39 @@ export async function serveFileLink(ctx, request) {
|
|
|
42
39
|
const row = await findLiveRow(ctx, link.value.fileId);
|
|
43
40
|
if (row?.linkGeneration !== link.value.generation)
|
|
44
41
|
return notFound();
|
|
45
|
-
const
|
|
42
|
+
const disposition = getFilesOptions(ctx.config).links.disposition;
|
|
43
|
+
return answerStoredFile(ctx, request, row, { name: link.value.name, disposition });
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Answers a request (`GET` or `HEAD`) for a stored file on behalf of its signed-in owner: the answer of a public link
|
|
47
|
+
* (single byte ranges, `private, no-store`, `nosniff`, the sandboxing CSP) under the file's stored name, with no link
|
|
48
|
+
* to mint or verify. The caller has already checked the session; a file that is missing, expired, deleted or another
|
|
49
|
+
* owner's gets the same `404`.
|
|
50
|
+
*/
|
|
51
|
+
export async function serveStoredFile(ctx, fileId, request, options) {
|
|
52
|
+
if (!isReadMethod(request))
|
|
53
|
+
return methodNotAllowed();
|
|
54
|
+
const row = await findLiveRow(ctx, fileId, { ownerId: options.ownerId });
|
|
55
|
+
if (row === undefined)
|
|
56
|
+
return notFound();
|
|
57
|
+
return answerStoredFile(ctx, request, row, { name: row.originalName, disposition: options.disposition ?? "inline" });
|
|
58
|
+
}
|
|
59
|
+
function isReadMethod(request) {
|
|
60
|
+
return request.method === "GET" || request.method === "HEAD";
|
|
61
|
+
}
|
|
62
|
+
function methodNotAllowed() {
|
|
63
|
+
return new Response(null, {
|
|
64
|
+
status: 405,
|
|
65
|
+
headers: { ...BASE_HEADERS, allow: ALLOWED_METHODS },
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
/** The bytes of a live row as the answer to a `GET` or `HEAD`, honouring a single byte range. */
|
|
69
|
+
async function answerStoredFile(ctx, request, row, options) {
|
|
46
70
|
const headers = {
|
|
47
71
|
...BASE_HEADERS,
|
|
48
72
|
"content-type": row.contentType,
|
|
49
73
|
"accept-ranges": "bytes",
|
|
50
|
-
"content-disposition": formatContentDisposition(options.
|
|
74
|
+
"content-disposition": formatContentDisposition(options.disposition, options.name),
|
|
51
75
|
"content-security-policy": "sandbox; default-src 'none'",
|
|
52
76
|
};
|
|
53
77
|
const range = parseRangeHeader(request.headers.get("range"), row.size);
|
|
@@ -65,7 +89,7 @@ export async function serveFileLink(ctx, request) {
|
|
|
65
89
|
return new Response(null, { status, headers });
|
|
66
90
|
let body;
|
|
67
91
|
try {
|
|
68
|
-
body = await
|
|
92
|
+
body = await getFilesOptions(ctx.config).storage.get(row.storageKey, range ?? undefined);
|
|
69
93
|
}
|
|
70
94
|
catch (error) {
|
|
71
95
|
console.error(`@softure-ai/files: reading file ${row.id} from storage failed: ${errorLogLabel(error)}`);
|
package/dist/server/serve.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../src/server/serve.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../src/server/serve.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { UploadStatus } from "../contract.js";
|
|
2
|
+
import type { FilesContext } from "./context.js";
|
|
3
|
+
/** The page for a session; a finalized or complete one shows that it is done. */
|
|
4
|
+
export declare function renderUploadPage(ctx: Pick<FilesContext, "config">, status: UploadStatus): Response;
|
|
5
|
+
//# sourceMappingURL=upload-page.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upload-page.d.ts","sourceRoot":"","sources":["../../src/server/upload-page.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAiCjD,iFAAiF;AACjF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,YAAY,GAAG,QAAQ,CA0ClG"}
|