@durable-streams/server 0.3.5 → 0.3.6

package/dist/index.cjs

@@ -187,6 +187,7 @@ var StreamStore = class {
 			if (sourceStream.softDeleted) throw new Error(`Source stream is soft-deleted: ${options.forkedFrom}`);
 			if (this.isExpired(sourceStream)) throw new Error(`Source stream not found: ${options.forkedFrom}`);
 			sourceContentType = sourceStream.contentType;
+			if (options.contentType && options.contentType.trim() !== `` && normalizeContentType(options.contentType) !== normalizeContentType(sourceContentType)) throw new Error(`Content type mismatch with source stream`);
 			if (options.forkOffset) forkOffset = options.forkOffset;
 			else forkOffset = sourceStream.currentOffset;
 			const zeroOffset = `0000000000000000_0000000000000000`;
@@ -197,7 +198,7 @@ var StreamStore = class {
 		let contentType = options.contentType;
 		if (!contentType || contentType.trim() === ``) {
 			if (isFork) contentType = sourceContentType;
-		} else if (isFork && normalizeContentType(contentType) !== normalizeContentType(sourceContentType)) throw new Error(`Content type mismatch with source stream`);
+		}
 		let effectiveExpiresAt = options.expiresAt;
 		let effectiveTtlSeconds = options.ttlSeconds;
 		if (isFork) {
@@ -1385,6 +1386,7 @@ var FileBackedStreamStore = class {
 			if (sourceMeta.softDeleted) throw new Error(`Source stream is soft-deleted: ${options.forkedFrom}`);
 			if (this.isExpired(sourceMeta)) throw new Error(`Source stream not found: ${options.forkedFrom}`);
 			sourceContentType = sourceMeta.contentType;
+			if (options.contentType && options.contentType.trim() !== `` && normalizeContentType(options.contentType) !== normalizeContentType(sourceContentType)) throw new Error(`Content type mismatch with source stream`);
 			if (options.forkOffset) forkOffset = options.forkOffset;
 			else forkOffset = sourceMeta.currentOffset;
 			const zeroOffset = `0000000000000000_0000000000000000`;
@@ -1400,7 +1402,7 @@ var FileBackedStreamStore = class {
 		let contentType = options.contentType;
 		if (!contentType || contentType.trim() === ``) {
 			if (isFork) contentType = sourceContentType;
-		} else if (isFork && normalizeContentType(contentType) !== normalizeContentType(sourceContentType)) throw new Error(`Content type mismatch with source stream`);
+		}
 		let effectiveExpiresAt = options.expiresAt;
 		let effectiveTtlSeconds = options.ttlSeconds;
 		if (isFork) {

package/dist/index.js

@@ -163,6 +163,7 @@ var StreamStore = class {
 			if (sourceStream.softDeleted) throw new Error(`Source stream is soft-deleted: ${options.forkedFrom}`);
 			if (this.isExpired(sourceStream)) throw new Error(`Source stream not found: ${options.forkedFrom}`);
 			sourceContentType = sourceStream.contentType;
+			if (options.contentType && options.contentType.trim() !== `` && normalizeContentType(options.contentType) !== normalizeContentType(sourceContentType)) throw new Error(`Content type mismatch with source stream`);
 			if (options.forkOffset) forkOffset = options.forkOffset;
 			else forkOffset = sourceStream.currentOffset;
 			const zeroOffset = `0000000000000000_0000000000000000`;
@@ -173,7 +174,7 @@ var StreamStore = class {
 		let contentType = options.contentType;
 		if (!contentType || contentType.trim() === ``) {
 			if (isFork) contentType = sourceContentType;
-		} else if (isFork && normalizeContentType(contentType) !== normalizeContentType(sourceContentType)) throw new Error(`Content type mismatch with source stream`);
+		}
 		let effectiveExpiresAt = options.expiresAt;
 		let effectiveTtlSeconds = options.ttlSeconds;
 		if (isFork) {
@@ -1361,6 +1362,7 @@ var FileBackedStreamStore = class {
 			if (sourceMeta.softDeleted) throw new Error(`Source stream is soft-deleted: ${options.forkedFrom}`);
 			if (this.isExpired(sourceMeta)) throw new Error(`Source stream not found: ${options.forkedFrom}`);
 			sourceContentType = sourceMeta.contentType;
+			if (options.contentType && options.contentType.trim() !== `` && normalizeContentType(options.contentType) !== normalizeContentType(sourceContentType)) throw new Error(`Content type mismatch with source stream`);
 			if (options.forkOffset) forkOffset = options.forkOffset;
 			else forkOffset = sourceMeta.currentOffset;
 			const zeroOffset = `0000000000000000_0000000000000000`;
@@ -1376,7 +1378,7 @@ var FileBackedStreamStore = class {
 		let contentType = options.contentType;
 		if (!contentType || contentType.trim() === ``) {
 			if (isFork) contentType = sourceContentType;
-		} else if (isFork && normalizeContentType(contentType) !== normalizeContentType(sourceContentType)) throw new Error(`Content type mismatch with source stream`);
+		}
 		let effectiveExpiresAt = options.expiresAt;
 		let effectiveTtlSeconds = options.ttlSeconds;
 		if (isFork) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@durable-streams/server",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "Node.js reference server implementation for Durable Streams",
   "author": "Durable Stream contributors",
   "license": "Apache-2.0",
@@ -40,14 +40,14 @@
     "@neophi/sieve-cache": "^1.0.0",
     "lmdb": "^3.3.0",
     "@durable-streams/client": "0.2.6",
-    "@durable-streams/state": "0.2.9"
+    "@durable-streams/state": "0.3.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
     "tsdown": "^0.9.0",
     "typescript": "^5.0.0",
     "vitest": "^4.0.0",
-    "@durable-streams/server-conformance-tests": "0.3.4"
+    "@durable-streams/server-conformance-tests": "0.3.5"
   },
   "files": [
     "dist",

package/src/file-store.ts

@@ -818,6 +818,18 @@ export class FileBackedStreamStore {
 
       sourceContentType = sourceMeta.contentType
 
+      // Reject a content-type mismatch up front, before taking a reference on
+      // the source. Doing this after the refCount increment below would leak a
+      // reference on the failed fork and pin the source in a soft-deleted state.
+      if (
+        options.contentType &&
+        options.contentType.trim() !== `` &&
+        normalizeContentType(options.contentType) !==
+          normalizeContentType(sourceContentType)
+      ) {
+        throw new Error(`Content type mismatch with source stream`)
+      }
+
       // Resolve fork offset: use provided or source's currentOffset
       if (options.forkOffset) {
         forkOffset = options.forkOffset
@@ -851,18 +863,14 @@ export class FileBackedStreamStore {
       this.db.putSync(sourceKey, updatedSource)
     }
 
-    // Determine content type: use options, or inherit from source if fork
+    // Determine content type: use options, or inherit from source if fork. A
+    // fork content-type mismatch is already rejected above, before the source
+    // refCount is taken.
     let contentType = options.contentType
     if (!contentType || contentType.trim() === ``) {
       if (isFork) {
         contentType = sourceContentType
       }
-    } else if (
-      isFork &&
-      normalizeContentType(contentType) !==
-        normalizeContentType(sourceContentType)
-    ) {
-      throw new Error(`Content type mismatch with source stream`)
     }
 
     // Compute effective expiry for forks

package/src/store.ts

@@ -329,6 +329,18 @@ export class StreamStore {
 
       sourceContentType = sourceStream.contentType
 
+      // Reject a content-type mismatch up front, before taking a reference on
+      // the source. Doing this after the refCount increment below would leak a
+      // reference on the failed fork and pin the source in a soft-deleted state.
+      if (
+        options.contentType &&
+        options.contentType.trim() !== `` &&
+        normalizeContentType(options.contentType) !==
+          normalizeContentType(sourceContentType)
+      ) {
+        throw new Error(`Content type mismatch with source stream`)
+      }
+
       // Resolve fork offset: use provided or source's currentOffset
       if (options.forkOffset) {
         forkOffset = options.forkOffset
@@ -358,18 +370,14 @@ export class StreamStore {
       sourceStream.refCount++
     }
 
-    // Determine content type: use options, or inherit from source if fork
+    // Determine content type: use options, or inherit from source if fork. A
+    // fork content-type mismatch is already rejected above, before the source
+    // refCount is taken.
     let contentType = options.contentType
     if (!contentType || contentType.trim() === ``) {
       if (isFork) {
         contentType = sourceContentType
       }
-    } else if (
-      isFork &&
-      normalizeContentType(contentType) !==
-        normalizeContentType(sourceContentType)
-    ) {
-      throw new Error(`Content type mismatch with source stream`)
     }
 
     // Compute effective expiry for forks