@durable-streams/cli 0.1.8 → 0.2.0

package/dist/index.cjs

@@ -23,6 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
+const node_fs = __toESM(require("node:fs"));
 const node_http = __toESM(require("node:http"));
 const node_path = __toESM(require("node:path"));
 const node_process = __toESM(require("node:process"));
@@ -53,6 +54,34 @@ function* flattenJsonForAppend(parsed) {
 //#endregion
 //#region src/parseWriteArgs.ts
 /**
+* Extract a flag value from args, supporting both --flag=value and --flag value syntax.
+* Returns { value, consumed } where consumed is the number of args used (0 if no match).
+*/
+function extractFlagValue$1(args, index, flagName) {
+	const arg = args[index];
+	const prefix = `${flagName}=`;
+	if (arg.startsWith(prefix)) {
+		const value = arg.slice(prefix.length);
+		if (!value) throw new Error(`${flagName} requires a value`);
+		return {
+			value,
+			consumed: 1
+		};
+	}
+	if (arg === flagName) {
+		const value = args[index + 1];
+		if (!value || value.startsWith(`--`)) throw new Error(`${flagName} requires a value`);
+		return {
+			value,
+			consumed: 2
+		};
+	}
+	return {
+		value: null,
+		consumed: 0
+	};
+}
+/**
 * Parse write command arguments, extracting content-type flags and content.
 * @param args - Arguments after the stream_id (starting from index 2)
 * @returns Parsed content type and content string
@@ -73,11 +102,10 @@ function parseWriteArgs(args) {
 			contentType = `application/json`;
 			continue;
 		}
-		if (arg === `--content-type`) {
-			const nextArg = args[i + 1];
-			if (!nextArg || nextArg.startsWith(`--`)) throw new Error(`--content-type requires a value`);
-			contentType = nextArg;
-			i++;
+		const contentTypeResult = extractFlagValue$1(args, i, `--content-type`);
+		if (contentTypeResult.value !== null) {
+			contentType = contentTypeResult.value;
+			i += contentTypeResult.consumed - 1;
 			continue;
 		}
 		if (arg.startsWith(`--`)) throw new Error(`unknown flag: ${arg}`);
@@ -128,6 +156,20 @@ function normalizeBaseUrl(url) {
 	return url.replace(/\/+$/, ``);
 }
 /**
+* Build the full stream URL from a base URL and stream ID.
+* Simply concatenates the stream ID to the base URL.
+*
+* Examples:
+*   buildStreamUrl("http://localhost:4437/v1/stream", "my-stream")
+*     => "http://localhost:4437/v1/stream/my-stream"
+*
+*   buildStreamUrl("http://localhost:3002/v1/stream/my-group", "my-stream")
+*     => "http://localhost:3002/v1/stream/my-group/my-stream"
+*/
+function buildStreamUrl(baseUrl, streamId) {
+	return `${baseUrl}/${streamId}`;
+}
+/**
 * Validate an authorization header value.
 * Returns valid=true for any non-empty value, but includes a warning
 * if the value doesn't match common auth schemes (Bearer, Basic, ApiKey, Token).
@@ -175,9 +217,37 @@ function validateStreamId(streamId) {
 
 //#endregion
 //#region src/index.ts
-const STREAM_URL = process.env.STREAM_URL || `http://localhost:4437`;
+const STREAM_URL = process.env.STREAM_URL || `http://localhost:4437/v1/stream`;
 const STREAM_AUTH = process.env.STREAM_AUTH;
 /**
+* Extract a flag value from args, supporting both --flag=value and --flag value syntax.
+* Returns { value, consumed } where consumed is the number of args used (0 if no match).
+*/
+function extractFlagValue(args, index, flagName, example) {
+	const arg = args[index];
+	const prefix = `${flagName}=`;
+	if (arg.startsWith(prefix)) {
+		const value = arg.slice(prefix.length);
+		if (!value) throw new Error(`${flagName} requires a value\n  Example: ${flagName}="${example}"`);
+		return {
+			value,
+			consumed: 1
+		};
+	}
+	if (arg === flagName) {
+		const value = args[index + 1];
+		if (!value || value.startsWith(`--`)) throw new Error(`${flagName} requires a value\n  Example: ${flagName} "${example}"`);
+		return {
+			value,
+			consumed: 2
+		};
+	}
+	return {
+		value: null,
+		consumed: 0
+	};
+}
+/**
 * Parse global options (--url, --auth) from args.
 * Falls back to STREAM_URL/STREAM_AUTH env vars when flags not provided.
 * Returns the parsed options, remaining args, and any warnings.
@@ -188,22 +258,24 @@ function parseGlobalOptions(args) {
 	const warnings = [];
 	for (let i = 0; i < args.length; i++) {
 		const arg = args[i];
-		if (arg === `--url`) {
-			const value = args[i + 1];
-			if (!value || value.startsWith(`--`)) throw new Error(`--url requires a value\n  Example: --url "http://localhost:4437"`);
-			const urlValidation = validateUrl(value);
+		const urlResult = extractFlagValue(args, i, `--url`, `http://localhost:4437`);
+		if (urlResult.value !== null) {
+			const urlValidation = validateUrl(urlResult.value);
 			if (!urlValidation.valid) throw new Error(urlValidation.error);
-			options.url = normalizeBaseUrl(value);
-			i++;
-		} else if (arg === `--auth`) {
-			const value = args[i + 1];
-			if (!value || value.startsWith(`--`)) throw new Error(`--auth requires a value\n  Example: --auth "Bearer my-token"`);
-			const authValidation = validateAuth(value);
+			options.url = normalizeBaseUrl(urlResult.value);
+			i += urlResult.consumed - 1;
+			continue;
+		}
+		const authResult = extractFlagValue(args, i, `--auth`, `Bearer my-token`);
+		if (authResult.value !== null) {
+			const authValidation = validateAuth(authResult.value);
 			if (!authValidation.valid) throw new Error(authValidation.error);
 			if (authValidation.warning) warnings.push(authValidation.warning);
-			options.auth = value;
-			i++;
-		} else remainingArgs.push(arg);
+			options.auth = authResult.value;
+			i += authResult.consumed - 1;
+			continue;
+		}
+		remainingArgs.push(arg);
 	}
 	if (!options.url) {
 		const urlValidation = validateUrl(STREAM_URL);
@@ -242,13 +314,15 @@ Global Options:
   --auth <value>          Authorization header value (e.g., "Bearer my-token")
   --help, -h              Show this help message
 
-Write Options:
-  --content-type <type>   Content-Type for the message (default: application/octet-stream)
-  --json                  Write as JSON (input stored as single message)
+Create/Write Options:
+  --content-type <type>   Content-Type for the stream (default: application/octet-stream)
+  --json                  Shorthand for --content-type application/json
+
+Write-only Options:
   --batch-json            Write as JSON array of messages (each array element stored separately)
 
 Environment Variables:
-  STREAM_URL    Base URL of the stream server (default: http://localhost:4437)
+  STREAM_URL    Base URL of the stream server (default: http://localhost:4437/v1/stream)
   STREAM_AUTH   Authorization header value (overridden by --auth flag)
 `;
 }
@@ -256,13 +330,38 @@ function printUsage({ to = `stderr` } = {}) {
 	const out = to === `stderr` ? node_process.stderr : node_process.stdout;
 	out.write(getUsageText());
 }
-async function createStream(baseUrl, streamId, headers) {
-	const url = `${baseUrl}/v1/stream/${streamId}`;
+/**
+* Parse create command arguments, extracting content-type flags.
+* @param args - Arguments after the stream_id
+* @returns Parsed content type
+* @throws Error if --content-type is missing its value or if unknown flags are provided
+*/
+function parseCreateArgs(args) {
+	let contentType = `application/octet-stream`;
+	for (let i = 0; i < args.length; i++) {
+		const arg = args[i];
+		if (arg === `--json`) {
+			contentType = `application/json`;
+			continue;
+		}
+		const contentTypeResult = extractFlagValue(args, i, `--content-type`, `application/json`);
+		if (contentTypeResult.value !== null) {
+			contentType = contentTypeResult.value;
+			i += contentTypeResult.consumed - 1;
+			continue;
+		}
+		if (arg.startsWith(`--`)) throw new Error(`unknown flag: ${arg}`);
+		throw new Error(`unexpected argument: ${arg}`);
+	}
+	return { contentType };
+}
+async function createStream(baseUrl, streamId, headers, contentType) {
+	const url = buildStreamUrl(baseUrl, streamId);
 	try {
 		await __durable_streams_client.DurableStream.create({
 			url,
 			headers,
-			contentType: `application/octet-stream`
+			contentType
 		});
 		console.log(`Stream created successfully: "${streamId}"`);
 		console.log(`  URL: ${url}`);
@@ -322,7 +421,7 @@ function processEscapeSequences(content) {
 	return content.replace(/\\n/g, `\n`).replace(/\\t/g, `\t`).replace(/\\r/g, `\r`).replace(/\\\\/g, `\\`);
 }
 async function writeStream(baseUrl, streamId, contentType, batchJson, headers, content) {
-	const url = `${baseUrl}/v1/stream/${streamId}`;
+	const url = buildStreamUrl(baseUrl, streamId);
 	const isJson = isJsonContentType(contentType);
 	let data;
 	let source;
@@ -387,7 +486,7 @@ function formatBytes(bytes) {
 	return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
 }
 async function readStream(baseUrl, streamId, headers) {
-	const url = `${baseUrl}/v1/stream/${streamId}`;
+	const url = buildStreamUrl(baseUrl, streamId);
 	try {
 		const stream = new __durable_streams_client.DurableStream({
 			url,
@@ -402,7 +501,7 @@ async function readStream(baseUrl, streamId, headers) {
 	}
 }
 async function deleteStream(baseUrl, streamId, headers) {
-	const url = `${baseUrl}/v1/stream/${streamId}`;
+	const url = buildStreamUrl(baseUrl, streamId);
 	try {
 		const stream = new __durable_streams_client.DurableStream({
 			url,
@@ -459,7 +558,14 @@ async function main() {
 	switch (command) {
 		case `create`: {
 			const streamId = getStreamId();
-			await createStream(options.url, streamId, headers);
+			let createArgs;
+			try {
+				createArgs = parseCreateArgs(args.slice(2));
+			} catch (error) {
+				node_process.stderr.write(`Error: ${getErrorMessage(error)}\n`);
+				process.exit(1);
+			}
+			await createStream(options.url, streamId, headers, createArgs.contentType);
 			break;
 		}
 		case `write`: {
@@ -492,21 +598,37 @@ async function main() {
 			await deleteStream(options.url, streamId, headers);
 			break;
 		}
-		default:
-			if (command?.startsWith(`-`)) node_process.stderr.write(`Error: Unknown option "${command}"\n`);
+		default: {
+			const commandSpecificFlags = [
+				`--content-type`,
+				`--json`,
+				`--batch-json`
+			];
+			if (command && commandSpecificFlags.includes(command)) {
+				node_process.stderr.write(`Error: "${command}" must come after the command and stream_id\n`);
+				node_process.stderr.write(`  Example: durable-stream create <stream_id> ${command} ...\n`);
+				node_process.stderr.write(`  Example: durable-stream write <stream_id> ${command} ...\n`);
+			} else if (command?.startsWith(`-`)) node_process.stderr.write(`Error: Unknown option "${command}"\n`);
 			else {
 				node_process.stderr.write(`Error: Unknown command "${command}"\n`);
 				node_process.stderr.write(`  Available commands: create, write, read, delete\n`);
 			}
 			node_process.stderr.write(`  Run "durable-stream --help" for usage information\n`);
 			process.exit(1);
+		}
 	}
 }
 function isMainModule() {
 	if (!process.argv[1]) return false;
-	const scriptPath = (0, node_path.resolve)(process.argv[1]);
-	const modulePath = (0, node_url.fileURLToPath)(require("url").pathToFileURL(__filename).href);
-	return scriptPath === modulePath;
+	try {
+		const scriptPath = (0, node_fs.realpathSync)((0, node_path.resolve)(process.argv[1]));
+		const modulePath = (0, node_fs.realpathSync)((0, node_url.fileURLToPath)(require("url").pathToFileURL(__filename).href));
+		return scriptPath === modulePath;
+	} catch {
+		const scriptPath = (0, node_path.resolve)(process.argv[1]);
+		const modulePath = (0, node_url.fileURLToPath)(require("url").pathToFileURL(__filename).href);
+		return scriptPath === modulePath;
+	}
 }
 if (isMainModule()) main().catch((error) => {
 	node_process.stderr.write(`Fatal error: ${getErrorMessage(error)}\n`);
@@ -515,6 +637,7 @@ if (isMainModule()) main().catch((error) => {
 
 //#endregion
 exports.buildHeaders = buildHeaders
+exports.buildStreamUrl = buildStreamUrl
 exports.flattenJsonForAppend = flattenJsonForAppend
 exports.getUsageText = getUsageText
 exports.isJsonContentType = isJsonContentType

package/dist/index.d.cts

@@ -50,6 +50,18 @@ declare function validateUrl(url: string): ValidationResult;
 */
 declare function normalizeBaseUrl(url: string): string;
 /**
+* Build the full stream URL from a base URL and stream ID.
+* Simply concatenates the stream ID to the base URL.
+*
+* Examples:
+*   buildStreamUrl("http://localhost:4437/v1/stream", "my-stream")
+*     => "http://localhost:4437/v1/stream/my-stream"
+*
+*   buildStreamUrl("http://localhost:3002/v1/stream/my-group", "my-stream")
+*     => "http://localhost:3002/v1/stream/my-group/my-stream"
+*/
+declare function buildStreamUrl(baseUrl: string, streamId: string): string;
+/**
 * Validate an authorization header value.
 * Returns valid=true for any non-empty value, but includes a warning
 * if the value doesn't match common auth schemes (Bearer, Basic, ApiKey, Token).
@@ -82,4 +94,4 @@ declare function buildHeaders(options: GlobalOptions): Record<string, string>;
 declare function getUsageText(): string;
 
 //#endregion
-export { GlobalOptions, ParsedWriteArgs, buildHeaders, flattenJsonForAppend, getUsageText, isJsonContentType, normalizeBaseUrl, parseGlobalOptions, parseWriteArgs, validateAuth, validateStreamId, validateUrl };
+export { GlobalOptions, ParsedWriteArgs, buildHeaders, buildStreamUrl, flattenJsonForAppend, getUsageText, isJsonContentType, normalizeBaseUrl, parseGlobalOptions, parseWriteArgs, validateAuth, validateStreamId, validateUrl };

package/dist/index.d.ts

@@ -50,6 +50,18 @@ declare function validateUrl(url: string): ValidationResult;
 */
 declare function normalizeBaseUrl(url: string): string;
 /**
+* Build the full stream URL from a base URL and stream ID.
+* Simply concatenates the stream ID to the base URL.
+*
+* Examples:
+*   buildStreamUrl("http://localhost:4437/v1/stream", "my-stream")
+*     => "http://localhost:4437/v1/stream/my-stream"
+*
+*   buildStreamUrl("http://localhost:3002/v1/stream/my-group", "my-stream")
+*     => "http://localhost:3002/v1/stream/my-group/my-stream"
+*/
+declare function buildStreamUrl(baseUrl: string, streamId: string): string;
+/**
 * Validate an authorization header value.
 * Returns valid=true for any non-empty value, but includes a warning
 * if the value doesn't match common auth schemes (Bearer, Basic, ApiKey, Token).
@@ -82,4 +94,4 @@ declare function buildHeaders(options: GlobalOptions): Record<string, string>;
 declare function getUsageText(): string;
 
 //#endregion
-export { GlobalOptions, ParsedWriteArgs, buildHeaders, flattenJsonForAppend, getUsageText, isJsonContentType, normalizeBaseUrl, parseGlobalOptions, parseWriteArgs, validateAuth, validateStreamId, validateUrl };
+export { GlobalOptions, ParsedWriteArgs, buildHeaders, buildStreamUrl, flattenJsonForAppend, getUsageText, isJsonContentType, normalizeBaseUrl, parseGlobalOptions, parseWriteArgs, validateAuth, validateStreamId, validateUrl };

package/dist/index.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { realpathSync } from "node:fs";
 import { STATUS_CODES } from "node:http";
 import { resolve } from "node:path";
 import { stderr, stdin, stdout } from "node:process";
@@ -29,6 +30,34 @@ function* flattenJsonForAppend(parsed) {
 //#endregion
 //#region src/parseWriteArgs.ts
 /**
+* Extract a flag value from args, supporting both --flag=value and --flag value syntax.
+* Returns { value, consumed } where consumed is the number of args used (0 if no match).
+*/
+function extractFlagValue$1(args, index, flagName) {
+	const arg = args[index];
+	const prefix = `${flagName}=`;
+	if (arg.startsWith(prefix)) {
+		const value = arg.slice(prefix.length);
+		if (!value) throw new Error(`${flagName} requires a value`);
+		return {
+			value,
+			consumed: 1
+		};
+	}
+	if (arg === flagName) {
+		const value = args[index + 1];
+		if (!value || value.startsWith(`--`)) throw new Error(`${flagName} requires a value`);
+		return {
+			value,
+			consumed: 2
+		};
+	}
+	return {
+		value: null,
+		consumed: 0
+	};
+}
+/**
 * Parse write command arguments, extracting content-type flags and content.
 * @param args - Arguments after the stream_id (starting from index 2)
 * @returns Parsed content type and content string
@@ -49,11 +78,10 @@ function parseWriteArgs(args) {
 			contentType = `application/json`;
 			continue;
 		}
-		if (arg === `--content-type`) {
-			const nextArg = args[i + 1];
-			if (!nextArg || nextArg.startsWith(`--`)) throw new Error(`--content-type requires a value`);
-			contentType = nextArg;
-			i++;
+		const contentTypeResult = extractFlagValue$1(args, i, `--content-type`);
+		if (contentTypeResult.value !== null) {
+			contentType = contentTypeResult.value;
+			i += contentTypeResult.consumed - 1;
 			continue;
 		}
 		if (arg.startsWith(`--`)) throw new Error(`unknown flag: ${arg}`);
@@ -104,6 +132,20 @@ function normalizeBaseUrl(url) {
 	return url.replace(/\/+$/, ``);
 }
 /**
+* Build the full stream URL from a base URL and stream ID.
+* Simply concatenates the stream ID to the base URL.
+*
+* Examples:
+*   buildStreamUrl("http://localhost:4437/v1/stream", "my-stream")
+*     => "http://localhost:4437/v1/stream/my-stream"
+*
+*   buildStreamUrl("http://localhost:3002/v1/stream/my-group", "my-stream")
+*     => "http://localhost:3002/v1/stream/my-group/my-stream"
+*/
+function buildStreamUrl(baseUrl, streamId) {
+	return `${baseUrl}/${streamId}`;
+}
+/**
 * Validate an authorization header value.
 * Returns valid=true for any non-empty value, but includes a warning
 * if the value doesn't match common auth schemes (Bearer, Basic, ApiKey, Token).
@@ -151,9 +193,37 @@ function validateStreamId(streamId) {
 
 //#endregion
 //#region src/index.ts
-const STREAM_URL = process.env.STREAM_URL || `http://localhost:4437`;
+const STREAM_URL = process.env.STREAM_URL || `http://localhost:4437/v1/stream`;
 const STREAM_AUTH = process.env.STREAM_AUTH;
 /**
+* Extract a flag value from args, supporting both --flag=value and --flag value syntax.
+* Returns { value, consumed } where consumed is the number of args used (0 if no match).
+*/
+function extractFlagValue(args, index, flagName, example) {
+	const arg = args[index];
+	const prefix = `${flagName}=`;
+	if (arg.startsWith(prefix)) {
+		const value = arg.slice(prefix.length);
+		if (!value) throw new Error(`${flagName} requires a value\n  Example: ${flagName}="${example}"`);
+		return {
+			value,
+			consumed: 1
+		};
+	}
+	if (arg === flagName) {
+		const value = args[index + 1];
+		if (!value || value.startsWith(`--`)) throw new Error(`${flagName} requires a value\n  Example: ${flagName} "${example}"`);
+		return {
+			value,
+			consumed: 2
+		};
+	}
+	return {
+		value: null,
+		consumed: 0
+	};
+}
+/**
 * Parse global options (--url, --auth) from args.
 * Falls back to STREAM_URL/STREAM_AUTH env vars when flags not provided.
 * Returns the parsed options, remaining args, and any warnings.
@@ -164,22 +234,24 @@ function parseGlobalOptions(args) {
 	const warnings = [];
 	for (let i = 0; i < args.length; i++) {
 		const arg = args[i];
-		if (arg === `--url`) {
-			const value = args[i + 1];
-			if (!value || value.startsWith(`--`)) throw new Error(`--url requires a value\n  Example: --url "http://localhost:4437"`);
-			const urlValidation = validateUrl(value);
+		const urlResult = extractFlagValue(args, i, `--url`, `http://localhost:4437`);
+		if (urlResult.value !== null) {
+			const urlValidation = validateUrl(urlResult.value);
 			if (!urlValidation.valid) throw new Error(urlValidation.error);
-			options.url = normalizeBaseUrl(value);
-			i++;
-		} else if (arg === `--auth`) {
-			const value = args[i + 1];
-			if (!value || value.startsWith(`--`)) throw new Error(`--auth requires a value\n  Example: --auth "Bearer my-token"`);
-			const authValidation = validateAuth(value);
+			options.url = normalizeBaseUrl(urlResult.value);
+			i += urlResult.consumed - 1;
+			continue;
+		}
+		const authResult = extractFlagValue(args, i, `--auth`, `Bearer my-token`);
+		if (authResult.value !== null) {
+			const authValidation = validateAuth(authResult.value);
 			if (!authValidation.valid) throw new Error(authValidation.error);
 			if (authValidation.warning) warnings.push(authValidation.warning);
-			options.auth = value;
-			i++;
-		} else remainingArgs.push(arg);
+			options.auth = authResult.value;
+			i += authResult.consumed - 1;
+			continue;
+		}
+		remainingArgs.push(arg);
 	}
 	if (!options.url) {
 		const urlValidation = validateUrl(STREAM_URL);
@@ -218,13 +290,15 @@ Global Options:
   --auth <value>          Authorization header value (e.g., "Bearer my-token")
   --help, -h              Show this help message
 
-Write Options:
-  --content-type <type>   Content-Type for the message (default: application/octet-stream)
-  --json                  Write as JSON (input stored as single message)
+Create/Write Options:
+  --content-type <type>   Content-Type for the stream (default: application/octet-stream)
+  --json                  Shorthand for --content-type application/json
+
+Write-only Options:
   --batch-json            Write as JSON array of messages (each array element stored separately)
 
 Environment Variables:
-  STREAM_URL    Base URL of the stream server (default: http://localhost:4437)
+  STREAM_URL    Base URL of the stream server (default: http://localhost:4437/v1/stream)
   STREAM_AUTH   Authorization header value (overridden by --auth flag)
 `;
 }
@@ -232,13 +306,38 @@ function printUsage({ to = `stderr` } = {}) {
 	const out = to === `stderr` ? stderr : stdout;
 	out.write(getUsageText());
 }
-async function createStream(baseUrl, streamId, headers) {
-	const url = `${baseUrl}/v1/stream/${streamId}`;
+/**
+* Parse create command arguments, extracting content-type flags.
+* @param args - Arguments after the stream_id
+* @returns Parsed content type
+* @throws Error if --content-type is missing its value or if unknown flags are provided
+*/
+function parseCreateArgs(args) {
+	let contentType = `application/octet-stream`;
+	for (let i = 0; i < args.length; i++) {
+		const arg = args[i];
+		if (arg === `--json`) {
+			contentType = `application/json`;
+			continue;
+		}
+		const contentTypeResult = extractFlagValue(args, i, `--content-type`, `application/json`);
+		if (contentTypeResult.value !== null) {
+			contentType = contentTypeResult.value;
+			i += contentTypeResult.consumed - 1;
+			continue;
+		}
+		if (arg.startsWith(`--`)) throw new Error(`unknown flag: ${arg}`);
+		throw new Error(`unexpected argument: ${arg}`);
+	}
+	return { contentType };
+}
+async function createStream(baseUrl, streamId, headers, contentType) {
+	const url = buildStreamUrl(baseUrl, streamId);
 	try {
 		await DurableStream.create({
 			url,
 			headers,
-			contentType: `application/octet-stream`
+			contentType
 		});
 		console.log(`Stream created successfully: "${streamId}"`);
 		console.log(`  URL: ${url}`);
@@ -298,7 +397,7 @@ function processEscapeSequences(content) {
 	return content.replace(/\\n/g, `\n`).replace(/\\t/g, `\t`).replace(/\\r/g, `\r`).replace(/\\\\/g, `\\`);
 }
 async function writeStream(baseUrl, streamId, contentType, batchJson, headers, content) {
-	const url = `${baseUrl}/v1/stream/${streamId}`;
+	const url = buildStreamUrl(baseUrl, streamId);
 	const isJson = isJsonContentType(contentType);
 	let data;
 	let source;
@@ -363,7 +462,7 @@ function formatBytes(bytes) {
 	return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
 }
 async function readStream(baseUrl, streamId, headers) {
-	const url = `${baseUrl}/v1/stream/${streamId}`;
+	const url = buildStreamUrl(baseUrl, streamId);
 	try {
 		const stream = new DurableStream({
 			url,
@@ -378,7 +477,7 @@ async function readStream(baseUrl, streamId, headers) {
 	}
 }
 async function deleteStream(baseUrl, streamId, headers) {
-	const url = `${baseUrl}/v1/stream/${streamId}`;
+	const url = buildStreamUrl(baseUrl, streamId);
 	try {
 		const stream = new DurableStream({
 			url,
@@ -435,7 +534,14 @@ async function main() {
 	switch (command) {
 		case `create`: {
 			const streamId = getStreamId();
-			await createStream(options.url, streamId, headers);
+			let createArgs;
+			try {
+				createArgs = parseCreateArgs(args.slice(2));
+			} catch (error) {
+				stderr.write(`Error: ${getErrorMessage(error)}\n`);
+				process.exit(1);
+			}
+			await createStream(options.url, streamId, headers, createArgs.contentType);
 			break;
 		}
 		case `write`: {
@@ -468,21 +574,37 @@ async function main() {
 			await deleteStream(options.url, streamId, headers);
 			break;
 		}
-		default:
-			if (command?.startsWith(`-`)) stderr.write(`Error: Unknown option "${command}"\n`);
+		default: {
+			const commandSpecificFlags = [
+				`--content-type`,
+				`--json`,
+				`--batch-json`
+			];
+			if (command && commandSpecificFlags.includes(command)) {
+				stderr.write(`Error: "${command}" must come after the command and stream_id\n`);
+				stderr.write(`  Example: durable-stream create <stream_id> ${command} ...\n`);
+				stderr.write(`  Example: durable-stream write <stream_id> ${command} ...\n`);
+			} else if (command?.startsWith(`-`)) stderr.write(`Error: Unknown option "${command}"\n`);
 			else {
 				stderr.write(`Error: Unknown command "${command}"\n`);
 				stderr.write(`  Available commands: create, write, read, delete\n`);
 			}
 			stderr.write(`  Run "durable-stream --help" for usage information\n`);
 			process.exit(1);
+		}
 	}
 }
 function isMainModule() {
 	if (!process.argv[1]) return false;
-	const scriptPath = resolve(process.argv[1]);
-	const modulePath = fileURLToPath(import.meta.url);
-	return scriptPath === modulePath;
+	try {
+		const scriptPath = realpathSync(resolve(process.argv[1]));
+		const modulePath = realpathSync(fileURLToPath(import.meta.url));
+		return scriptPath === modulePath;
+	} catch {
+		const scriptPath = resolve(process.argv[1]);
+		const modulePath = fileURLToPath(import.meta.url);
+		return scriptPath === modulePath;
+	}
 }
 if (isMainModule()) main().catch((error) => {
 	stderr.write(`Fatal error: ${getErrorMessage(error)}\n`);
@@ -490,4 +612,4 @@ if (isMainModule()) main().catch((error) => {
 });
 
 //#endregion
-export { buildHeaders, flattenJsonForAppend, getUsageText, isJsonContentType, normalizeBaseUrl, parseGlobalOptions, parseWriteArgs, validateAuth, validateStreamId, validateUrl };
+export { buildHeaders, buildStreamUrl, flattenJsonForAppend, getUsageText, isJsonContentType, normalizeBaseUrl, parseGlobalOptions, parseWriteArgs, validateAuth, validateStreamId, validateUrl };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@durable-streams/cli",
   "description": "CLI tool for working with Durable Streams",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "author": "Durable Stream contributors",
   "bin": {
     "cli": "./dist/index.js",
@@ -20,7 +20,7 @@
     "tsx": "^4.19.2",
     "typescript": "^5.5.2",
     "vitest": "^3.1.3",
-    "@durable-streams/server": "0.1.7"
+    "@durable-streams/server": "0.2.0"
   },
   "engines": {
     "node": ">=18.0.0"