@softure-ai/files 0.1.2 → 0.2.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.
Files changed (90) hide show
  1. package/CHANGELOG.md +19 -0
  2. package/README.md +113 -10
  3. package/dist/contract.d.ts +41 -1
  4. package/dist/contract.d.ts.map +1 -1
  5. package/dist/index.d.ts +35 -1
  6. package/dist/index.d.ts.map +1 -1
  7. package/dist/index.js +17 -4
  8. package/dist/index.js.map +1 -1
  9. package/dist/mcp/index.d.ts +41 -0
  10. package/dist/mcp/index.d.ts.map +1 -0
  11. package/dist/mcp/index.js +114 -0
  12. package/dist/mcp/index.js.map +1 -0
  13. package/dist/messages/en.d.ts +15 -0
  14. package/dist/messages/en.d.ts.map +1 -1
  15. package/dist/messages/en.js +14 -0
  16. package/dist/messages/en.js.map +1 -1
  17. package/dist/messages/index.d.ts +15 -0
  18. package/dist/messages/index.d.ts.map +1 -1
  19. package/dist/next/index.d.ts +1 -0
  20. package/dist/next/index.d.ts.map +1 -1
  21. package/dist/next/index.js +2 -1
  22. package/dist/next/index.js.map +1 -1
  23. package/dist/next/upload-route.d.ts +3 -0
  24. package/dist/next/upload-route.d.ts.map +1 -0
  25. package/dist/next/upload-route.js +11 -0
  26. package/dist/next/upload-route.js.map +1 -0
  27. package/dist/options.d.ts +6 -0
  28. package/dist/options.d.ts.map +1 -1
  29. package/dist/options.js +27 -0
  30. package/dist/options.js.map +1 -1
  31. package/dist/schema.d.ts +255 -0
  32. package/dist/schema.d.ts.map +1 -1
  33. package/dist/schema.js +17 -2
  34. package/dist/schema.js.map +1 -1
  35. package/dist/server/index.d.ts +6 -2
  36. package/dist/server/index.d.ts.map +1 -1
  37. package/dist/server/index.js +6 -2
  38. package/dist/server/index.js.map +1 -1
  39. package/dist/server/options.d.ts +2 -0
  40. package/dist/server/options.d.ts.map +1 -1
  41. package/dist/server/options.js +8 -0
  42. package/dist/server/options.js.map +1 -1
  43. package/dist/server/privacy.d.ts +6 -1
  44. package/dist/server/privacy.d.ts.map +1 -1
  45. package/dist/server/privacy.js +6 -3
  46. package/dist/server/privacy.js.map +1 -1
  47. package/dist/server/prune.d.ts +4 -0
  48. package/dist/server/prune.d.ts.map +1 -1
  49. package/dist/server/prune.js +4 -2
  50. package/dist/server/prune.js.map +1 -1
  51. package/dist/server/save.d.ts +15 -0
  52. package/dist/server/save.d.ts.map +1 -1
  53. package/dist/server/save.js +11 -9
  54. package/dist/server/save.js.map +1 -1
  55. package/dist/server/serve-upload.d.ts +6 -0
  56. package/dist/server/serve-upload.d.ts.map +1 -0
  57. package/dist/server/serve-upload.js +110 -0
  58. package/dist/server/serve-upload.js.map +1 -0
  59. package/dist/server/upload-page.d.ts +5 -0
  60. package/dist/server/upload-page.d.ts.map +1 -0
  61. package/dist/server/upload-page.js +94 -0
  62. package/dist/server/upload-page.js.map +1 -0
  63. package/dist/server/upload-tokens.d.ts +9 -0
  64. package/dist/server/upload-tokens.d.ts.map +1 -0
  65. package/dist/server/upload-tokens.js +43 -0
  66. package/dist/server/upload-tokens.js.map +1 -0
  67. package/dist/server/uploads.d.ts +73 -0
  68. package/dist/server/uploads.d.ts.map +1 -0
  69. package/dist/server/uploads.js +403 -0
  70. package/dist/server/uploads.js.map +1 -0
  71. package/migrations/0002_create_uploads.sql +33 -0
  72. package/module.json +9 -4
  73. package/package.json +12 -2
  74. package/src/contract.ts +45 -1
  75. package/src/index.ts +32 -5
  76. package/src/mcp/index.ts +169 -0
  77. package/src/messages/en.ts +14 -0
  78. package/src/next/index.ts +2 -1
  79. package/src/next/upload-route.ts +11 -0
  80. package/src/options.ts +28 -0
  81. package/src/schema.ts +20 -2
  82. package/src/server/index.ts +20 -2
  83. package/src/server/options.ts +8 -0
  84. package/src/server/privacy.ts +12 -4
  85. package/src/server/prune.ts +8 -2
  86. package/src/server/save.ts +25 -11
  87. package/src/server/serve-upload.ts +116 -0
  88. package/src/server/upload-page.ts +103 -0
  89. package/src/server/upload-tokens.ts +43 -0
  90. package/src/server/uploads.ts +437 -0
@@ -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
- return ok({ deletedFiles, pendingFiles: rows.length - deletedFiles });
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,2EAA2E;AAC3E,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;AAatC,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,CAAC,CAAC;AAC/C,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,OAAO,EAAE,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,MAAM,GAAG,YAAY,EAAE,CAAC,CAAC;AACxE,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"}
1
+ {"version":3,"file":"privacy.js","sourceRoot":"","sources":["../../src/server/privacy.ts"],"names":[],"mappings":"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"}
@@ -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":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAKjD,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;CAC9B;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwB9G"}
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"}
@@ -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
@@ -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;AAE9C,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAc/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,CAAC;IAChF,CAAC;AACH,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"}
@@ -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"}
@@ -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
- const expiresAt = resolveExpiry(input, now, defaultTtlSeconds);
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) {
@@ -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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"}
@@ -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":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AA0CjD,iFAAiF;AACjF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,YAAY,GAAG,QAAQ,CA0ClG"}
@@ -0,0 +1,94 @@
1
+ // The browser fallback for an upload session: a small page on the upload URL itself, for a person on a phone or an
2
+ // assistant that cannot run `curl`. It sends the missing chunks of the chosen file one by one with `fetch`, so a
3
+ // broken connection resumes where it stopped. No framework and no external asset: one inline script and one inline
4
+ // style, allowed by a per-response nonce. The copy comes from the module dictionary (`uploadPage`).
5
+ import { randomBytes } from "node:crypto";
6
+ import { selectMessages } from "@softure-ai/core";
7
+ import { getFilesModule } from "./options.js";
8
+ const STYLE = `body{font:16px/1.5 system-ui,sans-serif;max-width:32rem;margin:2rem auto;padding:0 1rem}
9
+ button,input{font:inherit}button{margin-top:1rem;padding:.5rem 1rem}progress{width:100%;margin-top:1rem}
10
+ p[role=status]{min-height:1.5em}`;
11
+ const SCRIPT = `const config = JSON.parse(document.getElementById("upload-config").textContent);
12
+ const input = document.getElementById("file");
13
+ const button = document.getElementById("start");
14
+ const bar = document.getElementById("bar");
15
+ const status = document.getElementById("status");
16
+ const megabytes = (bytes) => (bytes / 1048576).toFixed(1) + " MB";
17
+ function show(text) { status.textContent = text; }
18
+ async function upload() {
19
+ const file = input.files[0];
20
+ if (!file) return;
21
+ if (file.size !== config.size) { show(config.text.wrongSize); return; }
22
+ button.disabled = true;
23
+ try {
24
+ const answer = await fetch(location.href, { headers: { accept: "application/json" } });
25
+ if (!answer.ok) throw new Error("status " + answer.status);
26
+ const state = await answer.json();
27
+ let done = state.receivedBytes;
28
+ for (const index of state.missingChunks) {
29
+ const start = index * config.chunkSize;
30
+ const end = Math.min(start + config.chunkSize, config.size) - 1;
31
+ const sent = await fetch(location.href, { method: "PUT", headers: { "content-range": "bytes " + start + "-" + end + "/" + config.size }, body: file.slice(start, end + 1) });
32
+ if (!sent.ok) throw new Error("status " + sent.status);
33
+ done += end - start + 1;
34
+ bar.value = done / config.size;
35
+ show(config.text.progress.replace("{done}", megabytes(done)).replace("{total}", megabytes(config.size)));
36
+ }
37
+ bar.value = 1;
38
+ show(config.text.done);
39
+ } catch {
40
+ show(config.text.failed);
41
+ button.disabled = false;
42
+ }
43
+ }
44
+ button.addEventListener("click", upload);`;
45
+ /** The page for a session; a finalized or complete one shows that it is done. */
46
+ export function renderUploadPage(ctx, status) {
47
+ const text = selectMessages(getFilesModule(ctx.config).messages, ctx.config.locale).uploadPage;
48
+ const nonce = randomBytes(16).toString("base64");
49
+ const isDone = status.state === "complete" || status.state === "finalized";
50
+ const config = { size: status.size, chunkSize: status.chunkSize, text };
51
+ const expected = text.expected.replace("{name}", status.name).replace("{size}", `${(status.size / 1048576).toFixed(1)} MB`);
52
+ const html = `<!doctype html>
53
+ <html lang="${escapeHtml(ctx.config.locale)}">
54
+ <head>
55
+ <meta charset="utf-8">
56
+ <meta name="viewport" content="width=device-width, initial-scale=1">
57
+ <meta name="robots" content="noindex">
58
+ <title>${escapeHtml(text.title)}</title>
59
+ <style nonce="${nonce}">${STYLE}</style>
60
+ </head>
61
+ <body>
62
+ <h1>${escapeHtml(text.title)}</h1>
63
+ <p>${escapeHtml(text.intro)}</p>
64
+ <p>${escapeHtml(expected)}</p>
65
+ ${isDone
66
+ ? `<p role="status">${escapeHtml(text.done)}</p>`
67
+ : `<label for="file">${escapeHtml(text.choose)}</label><br>
68
+ <input id="file" type="file">
69
+ <br><button id="start" type="button">${escapeHtml(text.start)}</button>
70
+ <progress id="bar" max="1" value="${String(status.receivedBytes / status.size)}"></progress>
71
+ <p id="status" role="status"></p>
72
+ <script id="upload-config" type="application/json">${toScriptJson(config)}</script>
73
+ <script nonce="${nonce}">${SCRIPT}</script>`}
74
+ </body>
75
+ </html>`;
76
+ return new Response(html, {
77
+ status: 200,
78
+ headers: {
79
+ "content-type": "text/html; charset=utf-8",
80
+ "cache-control": "private, no-store",
81
+ "x-content-type-options": "nosniff",
82
+ "referrer-policy": "no-referrer",
83
+ "content-security-policy": `default-src 'none'; script-src 'nonce-${nonce}'; style-src 'nonce-${nonce}'; connect-src 'self'; form-action 'none'; frame-ancestors 'none'; base-uri 'none'`,
84
+ },
85
+ });
86
+ }
87
+ function escapeHtml(value) {
88
+ return value.replace(/[&<>"']/g, (char) => `&#${String(char.charCodeAt(0))};`);
89
+ }
90
+ /** JSON safe inside a `<script>` element: no `<` can close it. */
91
+ function toScriptJson(value) {
92
+ return JSON.stringify(value).replace(/</g, "\\u003c");
93
+ }
94
+ //# sourceMappingURL=upload-page.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upload-page.js","sourceRoot":"","sources":["../../src/server/upload-page.ts"],"names":[],"mappings":"AAAA,mHAAmH;AACnH,iHAAiH;AACjH,mHAAmH;AACnH,oGAAoG;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,KAAK,GAAG;;iCAEmB,CAAC;AAElC,MAAM,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0CAiC2B,CAAC;AAE3C,iFAAiF;AACjF,MAAM,UAAU,gBAAgB,CAAC,GAAiC,EAAE,MAAoB;IACtF,MAAM,IAAI,GAAI,cAAc,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAmB,CAAC,UAAU,CAAC;IAClH,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,KAAK,UAAU,IAAI,MAAM,CAAC,KAAK,KAAK,WAAW,CAAC;IAC3E,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC5H,MAAM,IAAI,GAAG;cACD,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;;;;;SAKlC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;gBACf,KAAK,KAAK,KAAK;;;MAGzB,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;KACvB,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;KACtB,UAAU,CAAC,QAAQ,CAAC;EAEvB,MAAM;QACJ,CAAC,CAAC,oBAAoB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM;QACjD,CAAC,CAAC,qBAAqB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;;uCAEX,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;oCACzB,MAAM,CAAC,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC;;qDAEzB,YAAY,CAAC,MAAM,CAAC;iBACxD,KAAK,KAAK,MAAM,WACjC;;QAEQ,CAAC;IACP,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;QACxB,MAAM,EAAE,GAAG;QACX,OAAO,EAAE;YACP,cAAc,EAAE,0BAA0B;YAC1C,eAAe,EAAE,mBAAmB;YACpC,wBAAwB,EAAE,SAAS;YACnC,iBAAiB,EAAE,aAAa;YAChC,yBAAyB,EAAE,yCAAyC,KAAK,uBAAuB,KAAK,oFAAoF;SAC1L;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AACjF,CAAC;AAED,kEAAkE;AAClE,SAAS,YAAY,CAAC,KAAc;IAClC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AACxD,CAAC"}
@@ -0,0 +1,9 @@
1
+ import { type Err, type Ok } from "@softure-ai/core";
2
+ import type { FilesKeyErrorCode } from "../contract.js";
3
+ import type { FilesContext } from "./context.js";
4
+ import { type LinkKeyring } from "./keys.js";
5
+ /** The path of a session's upload URL. */
6
+ export declare function signUploadPath(ctx: Pick<FilesContext, "config">, keyring: LinkKeyring, uploadId: string, expiresAt: Date): string;
7
+ /** The session an upload path is for, once its MAC and expiry are checked. Every refusal of the URL is `files.not_found`. */
8
+ export declare function verifyUploadPath(ctx: Pick<FilesContext, "clock" | "config" | "env">, pathname: string): Ok<string> | Err<"files.not_found" | FilesKeyErrorCode>;
9
+ //# sourceMappingURL=upload-tokens.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upload-tokens.d.ts","sourceRoot":"","sources":["../../src/server/upload-tokens.ts"],"names":[],"mappings":"AAKA,OAAO,EAAW,KAAK,GAAG,EAAE,KAAK,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAM9D,0CAA0C;AAC1C,wBAAgB,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,GAAG,MAAM,CAGjI;AAED,6HAA6H;AAC7H,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,CAgB/J"}
@@ -0,0 +1,43 @@
1
+ // Upload URLs: `<route>/<id>/<expiry>.<mac>`, where `expiry` is the session's expiry as a Unix time in seconds and
2
+ // `mac` an HMAC-SHA256 (base64url) over both under the link keyring's first key, with a context string of its own so
3
+ // an upload MAC never passes as a link MAC. The MAC and the expiry are checked before any database read, so a forged
4
+ // or stale URL costs no query.
5
+ import { createHmac, timingSafeEqual } from "node:crypto";
6
+ import { err, ok } from "@softure-ai/core";
7
+ import { UUID_PATTERN } from "./files.js";
8
+ import { readLinkKeyring } from "./keys.js";
9
+ import { getUploadsRoute } from "./options.js";
10
+ const MAC_CONTEXT = "softure-files-upload/v1";
11
+ const TOKEN_PATTERN = /^([1-9]\d{0,11})\.([A-Za-z0-9_-]{43})$/;
12
+ /** The path of a session's upload URL. */
13
+ export function signUploadPath(ctx, keyring, uploadId, expiresAt) {
14
+ const expiry = String(Math.floor(expiresAt.getTime() / 1000));
15
+ return `${getUploadsRoute(ctx.config)}/${uploadId}/${expiry}.${signUpload(keyring.current, uploadId, expiry)}`;
16
+ }
17
+ /** The session an upload path is for, once its MAC and expiry are checked. Every refusal of the URL is `files.not_found`. */
18
+ export function verifyUploadPath(ctx, pathname) {
19
+ const route = getUploadsRoute(ctx.config);
20
+ if (!pathname.startsWith(`${route}/`))
21
+ return err("files.not_found");
22
+ const segments = pathname.slice(route.length + 1).split("/");
23
+ const [uploadId = "", token = ""] = segments;
24
+ const match = TOKEN_PATTERN.exec(token);
25
+ if (segments.length !== 2 || !UUID_PATTERN.test(uploadId) || match === null)
26
+ return err("files.not_found");
27
+ const [, expiry = "", mac = ""] = match;
28
+ const keyring = readLinkKeyring(ctx.env ?? process.env);
29
+ if (!keyring.ok)
30
+ return keyring;
31
+ const given = Buffer.from(mac, "ascii");
32
+ // Every key is tried, so the time taken does not tell which one matched.
33
+ const isValid = keyring.value.keys.reduce((isMatch, key) => timingSafeEqual(Buffer.from(signUpload(key, uploadId, expiry), "ascii"), given) || isMatch, false);
34
+ if (!isValid)
35
+ return err("files.not_found");
36
+ if (Number(expiry) * 1000 <= ctx.clock.now().getTime())
37
+ return err("files.not_found");
38
+ return ok(uploadId);
39
+ }
40
+ function signUpload(key, uploadId, expiry) {
41
+ return createHmac("sha256", key).update([MAC_CONTEXT, uploadId, expiry].join("\n")).digest("base64url");
42
+ }
43
+ //# sourceMappingURL=upload-tokens.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upload-tokens.js","sourceRoot":"","sources":["../../src/server/upload-tokens.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,73 @@
1
+ import { type Err, type Ok } from "@softure-ai/core";
2
+ import type { ByteRange, CreatedUpload, FilesKeyErrorCode, FilesSaveErrorCode, StoredFile, UploadStatus } from "../contract.js";
3
+ import type { FileBody } from "../storage.js";
4
+ import type { FilesContext } from "./context.js";
5
+ export interface CreateUploadInput {
6
+ readonly ownerId: string;
7
+ /** The name the file will be saved under; only its last path part is kept, sanitised. */
8
+ readonly name: string;
9
+ /** Defaults to `application/octet-stream`; must match `uploads.contentTypes` when the app set it. */
10
+ readonly contentType?: string;
11
+ /** The exact size in bytes, at least 1 and at most `maxFileBytes`. */
12
+ readonly size: number;
13
+ /** The lowercase hex SHA-256 the bytes must have; checked at finalize. */
14
+ readonly sha256?: string;
15
+ /** The saved file's category; defaults to `file`. */
16
+ readonly kind?: string;
17
+ /** How long the session works, at most `uploads.ttlSeconds` (its default). */
18
+ readonly ttlSeconds?: number;
19
+ }
20
+ export type CreateUploadResult = Ok<CreatedUpload> | Err<"files.invalid_input" | "files.too_large" | "files.quota_exceeded" | "files.content_type_not_allowed" | "files.too_many_uploads" | FilesKeyErrorCode>;
21
+ /** Opens an upload session for `ownerId` and answers the URL the client sends the chunks to. */
22
+ export declare function createUpload(ctx: FilesContext, input: CreateUploadInput): Promise<CreateUploadResult>;
23
+ export interface UploadLookupOptions {
24
+ /** Only this owner's session; another owner's reads as missing. */
25
+ readonly ownerId?: string;
26
+ }
27
+ /** A session that has not expired, or null. A finalized one is answered too (state `finalized`). */
28
+ export declare function getUpload(ctx: FilesContext, uploadId: string, options?: UploadLookupOptions): Promise<UploadStatus | null>;
29
+ /** The chunk a request carries: a byte range of the file, or null for the whole file in one request. */
30
+ export interface WriteUploadChunkInput {
31
+ readonly range: ByteRange | null;
32
+ /** The total the client declared (`Content-Range: bytes a-b/<total>`); must be the session's size. */
33
+ readonly total?: number;
34
+ readonly body: FileBody;
35
+ }
36
+ /** Why a chunk was refused. */
37
+ export type UploadChunkErrorCode =
38
+ /** No open session has this id (unknown, finalized or expired). */
39
+ "files.not_found"
40
+ /** The range is not one chunk of this session (misaligned, wrong length, wrong total, a file larger than one chunk without a range). */
41
+ | "files.invalid_range"
42
+ /** The body had fewer or more bytes than the range. */
43
+ | "files.chunk_length_mismatch";
44
+ export type WriteUploadChunkResult = Ok<UploadStatus> | Err<UploadChunkErrorCode>;
45
+ /**
46
+ * Stores one chunk of an open session. A chunk that already arrived is answered as is, without reading the body:
47
+ * a client that resends it after a lost answer loses nothing. A storage failure propagates.
48
+ */
49
+ export declare function writeUploadChunk(ctx: FilesContext, uploadId: string, input: WriteUploadChunkInput): Promise<WriteUploadChunkResult>;
50
+ export type FinalizeUploadResult = Ok<StoredFile> | Err<"files.not_found" | "files.upload_incomplete" | "files.checksum_mismatch" | FilesSaveErrorCode>;
51
+ /**
52
+ * Turns a complete session into a stored file: every chunk present, the size and the declared SHA-256 checked while
53
+ * the parts stream into `saveFile` (quota and dedupe as there), then the parts are removed. Calling it again answers
54
+ * the same file; two parallel calls keep one.
55
+ */
56
+ export declare function finalizeUpload(ctx: FilesContext, uploadId: string, options?: UploadLookupOptions): Promise<FinalizeUploadResult>;
57
+ /** Removes sessions whose time is up, with their parts; answers how many went and how many must wait for the next run. */
58
+ export declare function pruneUploads(ctx: FilesContext, batchSize: number): Promise<{
59
+ readonly deletedUploads: number;
60
+ readonly failedUploads: number;
61
+ }>;
62
+ /** An owner's sessions with their parts (the privacy deletion); answers how many went and how many stay for prune. */
63
+ export declare function deleteOwnerUploads(ctx: FilesContext, ownerId: string): Promise<{
64
+ readonly deletedUploads: number;
65
+ readonly failedUploads: number;
66
+ }>;
67
+ /** An owner's sessions that still take chunks (the privacy export). */
68
+ export declare function listOpenUploads(ctx: FilesContext, ownerId: string): Promise<UploadStatus[]>;
69
+ /** The storage key of one chunk of a session. */
70
+ export declare function getPartKey(uploadId: string, index: number): string;
71
+ /** How many chunks a file of `size` bytes takes. */
72
+ export declare function countChunks(size: number, chunkSize: number): number;
73
+ //# sourceMappingURL=uploads.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"uploads.d.ts","sourceRoot":"","sources":["../../src/server/uploads.ts"],"names":[],"mappings":"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"}