@lacrous/omnicloud 0.2.16 → 0.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lacrous/omnicloud",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "description": "SDK and core building blocks for OmniCloud — self-hosted cloud storage powered by your Telegram account.",
   "license": "MIT",
   "type": "module",
@@ -48,9 +48,9 @@
     "prisma": "^6.2.0"
   },
   "devDependencies": {
-    "@omnicloud/core": "0.2.16",
-    "@omnicloud/shared": "0.2.16",
-    "@omnicloud/telegram": "0.2.16",
+    "@omnicloud/core": "0.2.17",
+    "@omnicloud/shared": "0.2.17",
+    "@omnicloud/telegram": "0.2.17",
     "@types/node": "^22.10.0",
     "esbuild": "0.25.12",
     "tsup": "^8.3.0",

package/server/index.js

@@ -1078,6 +1078,20 @@ function sanitizeFileName(name) {
   return cleaned.slice(0, 255);
 }
 
+// ../core/src/utils/request-fingerprint.ts
+import { createHash as createHash4 } from "node:crypto";
+function uploadRequestFingerprint(input) {
+  const contentHash = input.spooled?.sha256 ?? sha256Hex(input.data ?? Buffer.alloc(0));
+  const canonical = JSON.stringify({
+    name: sanitizeFileName(input.name),
+    folderId: input.folderId ?? null,
+    replaceFileId: input.replaceFileId ?? null,
+    contentHash,
+    size: input.spooled?.size ?? input.data?.byteLength ?? 0
+  });
+  return createHash4("sha256").update(canonical).digest("hex");
+}
+
 // ../core/src/services/file-service.ts
 var FileService = class {
   constructor(files, folders, engineFor, activity = noopActivityRecorder, operations = null, log = null) {
@@ -1110,7 +1124,13 @@ var FileService = class {
     if (!isValidOperationId(operationId)) {
       throw new ValidationError("Invalid upload operation id");
     }
+    const fingerprint = uploadRequestFingerprint(input);
     let op = await operations.findByOperationId(userId, operationId);
+    if (op?.requestFingerprint && op.requestFingerprint !== fingerprint) {
+      throw new ConflictError(
+        "This upload key was already used for a different file. Use a new key for a new upload."
+      );
+    }
     if (op?.status === "COMPLETED" && op.fileId) {
       return this.get(userId, op.fileId);
     }
@@ -1119,7 +1139,7 @@ var FileService = class {
     }
     if (!op) {
       try {
-        op = await operations.create({ userId, operationId });
+        op = await operations.create({ userId, operationId, requestFingerprint: fingerprint });
       } catch (error) {
         if (!(error instanceof OperationAlreadyExistsError)) throw error;
         const outcome = await this.followWinner(userId, input, operationId, operations);
@@ -2214,7 +2234,7 @@ var RecentService = class {
 };
 
 // ../core/src/utils/spool.ts
-import { createHash as createHash4 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 import { createWriteStream } from "node:fs";
 import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
@@ -2226,7 +2246,7 @@ async function spoolToFile(source, maxBytes) {
   const dir = await mkdtemp(join(tmpdir(), `${SPOOL_PREFIX}${process.pid}-`));
   const path = join(dir, "payload");
   const discard = () => rm(dir, { recursive: true, force: true });
-  const hash = createHash4("sha256");
+  const hash = createHash5("sha256");
   let size = 0;
   const meter = new Transform2({
     transform(chunk, _encoding, callback) {
@@ -3554,6 +3574,7 @@ function mapUploadOperation(row) {
     telegramMessageId: row.telegramMessageId === null ? null : Number(row.telegramMessageId),
     sha256: row.sha256,
     size: row.size === null ? null : Number(row.size),
+    requestFingerprint: row.requestFingerprint,
     fileId: row.fileId,
     error: row.error,
     createdAt: row.createdAt,
@@ -3575,7 +3596,12 @@ function createUploadOperationRepo(prisma) {
     async create(input) {
       try {
         const row = await prisma.uploadOperation.create({
-          data: { userId: input.userId, operationId: input.operationId, status: "PENDING" }
+          data: {
+            userId: input.userId,
+            operationId: input.operationId,
+            status: "PENDING",
+            requestFingerprint: input.requestFingerprint ?? null
+          }
         });
         return mapUploadOperation(row);
       } catch (error) {
@@ -4128,9 +4154,9 @@ import { readFileSync } from "node:fs";
 import { join as join2 } from "node:path";
 
 // ../../apps/api/src/csp.ts
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 function sha256Source(content) {
-  return `'sha256-${createHash5("sha256").update(content, "utf8").digest("base64")}'`;
+  return `'sha256-${createHash6("sha256").update(content, "utf8").digest("base64")}'`;
 }
 function buildContentSecurityPolicy(inlineScripts, inlineStyles) {
   const scriptSources = ["'self'", ...inlineScripts.map(sha256Source)];
@@ -5004,7 +5030,7 @@ function encryptionCheck(configured) {
 }
 
 // ../../apps/api/src/routes/storage.ts
-var VERSION = "0.2.16";
+var VERSION = "0.2.17";
 function registerStorageRoutes(app2, container2) {
   app2.get("/api/health", async () => {
     const database = await probeDatabase(container2);

package/server/prisma/migrations/5_upload_request_fingerprint/migration.sql

@@ -0,0 +1,3 @@
+-- Binds an upload idempotency key to the request that created it. Nullable so
+-- operations created before this migration keep their existing behaviour.
+ALTER TABLE "UploadOperation" ADD COLUMN "requestFingerprint" TEXT;

package/server/prisma/schema.prisma

@@ -24,29 +24,29 @@ model User {
   createdAt      DateTime @default(now())
   updatedAt      DateTime @updatedAt
 
-  telegramSession TelegramSession?
-  storages        Storage[]
-  folders         Folder[]
-  files           File[]
-  fileVersions    FileVersion[]
-  activityEvents  ActivityEvent[]
-  browserSessions BrowserSession[]
+  telegramSession  TelegramSession?
+  storages         Storage[]
+  folders          Folder[]
+  files            File[]
+  fileVersions     FileVersion[]
+  activityEvents   ActivityEvent[]
+  browserSessions  BrowserSession[]
   uploadOperations UploadOperation[]
 }
 
 /// A signed-in browser session. Only the SHA-256 of the cookie token is stored,
 /// so revoking the row ends the session on the next request.
 model BrowserSession {
-  id          String    @id @default(cuid())
-  userId      String
-  user        User      @relation(fields: [userId], references: [id], onDelete: Cascade)
-  tokenHash   String    @unique
-  createdAt   DateTime  @default(now())
-  expiresAt   DateTime
-  revokedAt   DateTime?
-  lastUsedAt  DateTime?
-  userAgent   String?
-  ip          String?
+  id         String    @id @default(cuid())
+  userId     String
+  user       User      @relation(fields: [userId], references: [id], onDelete: Cascade)
+  tokenHash  String    @unique
+  createdAt  DateTime  @default(now())
+  expiresAt  DateTime
+  revokedAt  DateTime?
+  lastUsedAt DateTime?
+  userAgent  String?
+  ip         String?
 
   @@index([userId, revokedAt])
   @@index([expiresAt])
@@ -56,18 +56,19 @@ model BrowserSession {
 /// second Telegram object. `telegramMessageId` is recorded as soon as Telegram
 /// accepts the object, so recovery can commit the file without uploading again.
 model UploadOperation {
-  id                String    @id @default(cuid())
-  userId            String
-  user              User      @relation(fields: [userId], references: [id], onDelete: Cascade)
-  operationId       String
-  status            String
-  telegramMessageId BigInt?
-  sha256            String?
-  size              BigInt?
-  fileId            String?
-  error             String?
-  createdAt         DateTime  @default(now())
-  updatedAt         DateTime  @updatedAt
+  id                 String   @id @default(cuid())
+  userId             String
+  user               User     @relation(fields: [userId], references: [id], onDelete: Cascade)
+  operationId        String
+  status             String
+  telegramMessageId  BigInt?
+  sha256             String?
+  size               BigInt?
+  requestFingerprint String?
+  fileId             String?
+  error              String?
+  createdAt          DateTime @default(now())
+  updatedAt          DateTime @updatedAt
 
   @@unique([userId, operationId])
   @@index([status, updatedAt])
@@ -102,20 +103,20 @@ model Storage {
 /// Folders are virtual OmniCloud objects — they have no physical
 /// representation on Telegram. `deletedAt` is the Trash marker.
 model Folder {
-  id        String    @id @default(cuid())
-  userId    String
-  user      User      @relation(fields: [userId], references: [id], onDelete: Cascade)
-  parentId  String?
-  parent    Folder?   @relation("FolderTree", fields: [parentId], references: [id], onDelete: Restrict)
-  children  Folder[]  @relation("FolderTree")
-  name      String
-  starred   Boolean   @default(false)
-  deletedAt DateTime?
+  id           String    @id @default(cuid())
+  userId       String
+  user         User      @relation(fields: [userId], references: [id], onDelete: Cascade)
+  parentId     String?
+  parent       Folder?   @relation("FolderTree", fields: [parentId], references: [id], onDelete: Restrict)
+  children     Folder[]  @relation("FolderTree")
+  name         String
+  starred      Boolean   @default(false)
+  deletedAt    DateTime?
   /// Groups everything one trash operation moved, for exact restore.
   trashBatchId String?
-  createdAt DateTime  @default(now())
-  updatedAt DateTime  @updatedAt
-  files     File[]
+  createdAt    DateTime  @default(now())
+  updatedAt    DateTime  @updatedAt
+  files        File[]
 
   @@index([userId, parentId, deletedAt])
   @@index([userId, deletedAt])
@@ -191,4 +192,4 @@ model ActivityEvent {
   @@index([userId, createdAt])
   @@index([userId, resourceId, createdAt])
   @@index([createdAt])
-}
+}