@onozaty/growi-uploader 1.3.0 → 1.5.0

package/README.md

@@ -69,6 +69,7 @@ growi-uploader <source-dir> [options]
 
 **Options:**
 - `-c, --config <path>`: Path to config file (default: `growi-uploader.json`)
+- `-v, --verbose`: Enable verbose error output with detailed information
 - `-V, --version`: Output the version number
 - `-h, --help`: Display help information
 
@@ -80,6 +81,9 @@ npx @onozaty/growi-uploader ./docs
 
 # Upload with custom config file
 npx @onozaty/growi-uploader ./docs -c my-config.json
+
+# Upload with verbose error output
+npx @onozaty/growi-uploader ./docs --verbose
 ```
 
 ## Directory Structure Example
@@ -117,7 +121,8 @@ Create a `growi-uploader.json` file in your project root:
   "url": "https://your-growi-instance.com",
   "token": "your-api-token",
   "basePath": "/imported",
-  "update": true
+  "update": true,
+  "verbose": false
 }
 ```
 
@@ -129,6 +134,7 @@ Create a `growi-uploader.json` file in your project root:
 | `token` | string | ✅ | - | GROWI API access token |
 | `basePath` | string | ❌ | `/` | Base path for imported pages |
 | `update` | boolean | ❌ | `false` | Update existing pages if true, skip if false |
+| `verbose` | boolean | ❌ | `false` | Enable verbose error output with detailed information |
 
 ### Getting an API Token
 
@@ -194,6 +200,8 @@ All referenced files (`logo.png`, `screenshot.png`, and `banner.png`) will be up
 [File](./docs/my%20file.pdf)              # URL-encoded space
 [File](<./path/file (1).png>)             # Special chars with angle brackets
 ![Image](./path/file\\(1\\).png)          # Special chars with escaping
+<img src="./images/logo.png" alt="Logo">  # HTML img tag (double quotes)
+<img src='./images/logo.png' alt='Logo'>  # HTML img tag (single quotes)
 ```
 
 **Excluded from detection:**

package/dist/index.mjs

@@ -8,7 +8,7 @@ import { lookup } from "mime-types";
 import { glob } from "glob";
 
 //#region package.json
-var version = "1.3.0";
+var version = "1.5.0";
 
 //#endregion
 //#region src/config.ts
@@ -19,6 +19,7 @@ var version = "1.3.0";
 * @returns Configuration object with defaults applied:
 *   - basePath defaults to "/" if not specified or empty
 *   - update defaults to false if not specified
+*   - verbose defaults to false if not specified
 * @throws Error if config file is not found or required fields (url, token) are missing
 */
 const loadConfig = (configPath) => {
@@ -32,7 +33,8 @@ const loadConfig = (configPath) => {
 			url: input.url,
 			token: input.token,
 			basePath: input.basePath || "/",
-			update: input.update ?? false
+			update: input.update ?? false,
+			verbose: input.verbose ?? false
 		};
 	} catch (error) {
 		if (error.code === "ENOENT") throw new Error(`Config file not found: ${fullPath}`);
@@ -85,7 +87,8 @@ const putPage = (putPageBody, options) => {
 * @param token API token for authentication
 */
 const configureAxios = (growiUrl, token) => {
-	axios.defaults.baseURL = `${growiUrl}/_api/v3`;
+	const baseUrl = growiUrl.replace(/\/+$/, "");
+	axios.defaults.baseURL = `${baseUrl}/_api/v3`;
 	axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
 };
 /**
@@ -95,11 +98,59 @@ const configureAxios = (growiUrl, token) => {
 * @returns Formatted error message string
 */
 const formatErrorMessage = (error) => {
-	if (axios.isAxiosError(error)) return `${error.response?.status} ${error.response?.data?.message || error.message}`;
+	if (axios.isAxiosError(error)) {
+		const status = error.response?.status;
+		const statusText = error.response?.statusText;
+		const data = error.response?.data;
+		const parts = [];
+		if (status) parts.push(`HTTP ${status}${statusText ? ` ${statusText}` : ""}`);
+		if (data && typeof data === "object") {
+			const message = data.message || data.error || data.errors;
+			if (message) parts.push(message);
+			else if (Object.keys(data).length > 0) parts.push(JSON.stringify(data));
+		}
+		if (error.code) parts.push(`(${error.code})`);
+		if (parts.length === 0) return error.message;
+		return parts.join(" ");
+	}
 	if (error instanceof Error) return error.message;
 	return String(error);
 };
 /**
+* Format error into a detailed error message for verbose mode
+*
+* @param error Error object from catch block
+* @returns Detailed multi-line error message with all available information
+*/
+const formatDetailedError = (error) => {
+	const lines = [];
+	if (axios.isAxiosError(error)) {
+		const status = error.response?.status;
+		const statusText = error.response?.statusText;
+		const data = error.response?.data;
+		if (status) lines.push(`  HTTP Status: ${status}${statusText ? ` ${statusText}` : ""}`);
+		if (data) try {
+			const responseStr = typeof data === "object" ? JSON.stringify(data, null, 2).split("\n").map((line) => `    ${line}`).join("\n") : String(data);
+			lines.push(`  Response Body:\n${responseStr}`);
+		} catch {
+			lines.push(`  Response Body: ${String(data)}`);
+		}
+		if (error.code) lines.push(`  Error Code: ${error.code}`);
+		if (error.config) lines.push(`  Request: ${error.config.method?.toUpperCase()} ${error.config.url}`);
+		if (error.stack) {
+			const stackLines = error.stack.split("\n").slice(0, 5);
+			lines.push(`  Stack Trace:\n${stackLines.map((line) => `    ${line}`).join("\n")}`);
+		}
+	} else if (error instanceof Error) {
+		lines.push(`  Error: ${error.message}`);
+		if (error.stack) {
+			const stackLines = error.stack.split("\n").slice(0, 5);
+			lines.push(`  Stack Trace:\n${stackLines.map((line) => `    ${line}`).join("\n")}`);
+		}
+	} else lines.push(`  Error: ${String(error)}`);
+	return lines.length > 0 ? `  Details:\n${lines.join("\n")}` : "";
+};
+/**
 * Create a new page or update an existing page in GROWI
 *
 * @param file Markdown file to upload
@@ -133,7 +184,8 @@ const createOrUpdatePage = async (file, content, shouldUpdate) => {
 			pageId: void 0,
 			revisionId: void 0,
 			action: "error",
-			errorMessage: formatErrorMessage(error)
+			errorMessage: formatErrorMessage(error),
+			error
 		};
 	}
 	try {
@@ -151,7 +203,8 @@ const createOrUpdatePage = async (file, content, shouldUpdate) => {
 			pageId: void 0,
 			revisionId: void 0,
 			action: "error",
-			errorMessage: formatErrorMessage(error)
+			errorMessage: formatErrorMessage(error),
+			error
 		};
 	}
 };
@@ -177,7 +230,8 @@ const updatePageContent = async (pageId, revisionId, content) => {
 	} catch (error) {
 		return {
 			success: false,
-			errorMessage: formatErrorMessage(error)
+			errorMessage: formatErrorMessage(error),
+			error
 		};
 	}
 };
@@ -207,7 +261,8 @@ const uploadAttachment = async (attachment, pageId, sourceDir) => {
 	} catch (error) {
 		return {
 			success: false,
-			errorMessage: formatErrorMessage(error)
+			errorMessage: formatErrorMessage(error),
+			error
 		};
 	}
 };
@@ -215,6 +270,37 @@ const uploadAttachment = async (attachment, pageId, sourceDir) => {
 //#endregion
 //#region src/scanner.ts
 /**
+* Process a link path and convert it to an AttachmentFile if it exists
+*
+* @param linkPath The link path from markdown
+* @param originalLinkPath The original format of the link (for replacement)
+* @param markdownFilePath Path to the markdown file (relative to sourceDir)
+* @param sourceDir Source directory (absolute path)
+* @returns AttachmentFile if the path resolves to an existing file, null otherwise
+*/
+const processLinkPath = (linkPath, originalLinkPath, markdownFilePath, sourceDir) => {
+	if (linkPath.startsWith("http://") || linkPath.startsWith("https://")) return null;
+	if (linkPath.endsWith(".md")) return null;
+	const unescapedPath = linkPath.replace(/\\([\\`*_{}[\]()#+\-.!])/g, "$1");
+	let decodedPath;
+	try {
+		decodedPath = decodeURIComponent(unescapedPath);
+	} catch {
+		decodedPath = unescapedPath;
+	}
+	let absolutePath;
+	if (linkPath.startsWith("/")) absolutePath = resolve(sourceDir, decodedPath.slice(1));
+	else absolutePath = resolve(dirname(join(sourceDir, markdownFilePath)), decodedPath);
+	if (!existsSync(absolutePath)) return null;
+	const normalizedPath = relative(sourceDir, absolutePath).replace(/\\/g, "/");
+	return {
+		localPath: normalizedPath,
+		fileName: basename(normalizedPath),
+		detectionPattern: "link",
+		originalLinkPaths: [originalLinkPath]
+	};
+};
+/**
 * Extract attachment files from markdown links
 *
 * Scans markdown content for image and link references, resolves their paths,
@@ -243,27 +329,15 @@ const extractLinkedAttachments = (content, markdownFilePath, sourceDir) => {
 		const { anglePath, regularPath } = match.groups;
 		const linkPath = anglePath || regularPath;
 		if (!linkPath) continue;
-		const originalLinkPath = anglePath ? `<${anglePath}>` : regularPath;
-		if (linkPath.startsWith("http://") || linkPath.startsWith("https://")) continue;
-		if (linkPath.endsWith(".md")) continue;
-		const unescapedPath = linkPath.replace(/\\([\\`*_{}[\]()#+\-.!])/g, "$1");
-		let decodedPath;
-		try {
-			decodedPath = decodeURIComponent(unescapedPath);
-		} catch {
-			decodedPath = unescapedPath;
-		}
-		let absolutePath;
-		if (linkPath.startsWith("/")) absolutePath = resolve(sourceDir, decodedPath.slice(1));
-		else absolutePath = resolve(dirname(join(sourceDir, markdownFilePath)), decodedPath);
-		if (!existsSync(absolutePath)) continue;
-		const normalizedPath = relative(sourceDir, absolutePath).replace(/\\/g, "/");
-		attachments.push({
-			localPath: normalizedPath,
-			fileName: basename(normalizedPath),
-			detectionPattern: "link",
-			originalLinkPaths: [originalLinkPath]
-		});
+		const attachment = processLinkPath(linkPath, anglePath ? `<${anglePath}>` : regularPath, markdownFilePath, sourceDir);
+		if (attachment) attachments.push(attachment);
+	}
+	const imgTagRegex = /<img\s+[^>]*src=(?<quote>["'])(?<src>.*?)\k<quote>[^>]*>/gi;
+	while ((match = imgTagRegex.exec(content)) !== null) {
+		const { src } = match.groups;
+		if (!src) continue;
+		const attachment = processLinkPath(src, src, markdownFilePath, sourceDir);
+		if (attachment) attachments.push(attachment);
 	}
 	return attachments;
 };
@@ -368,6 +442,11 @@ const replaceAttachmentLinks = (markdown, attachments, pageName) => {
 				replaced = true;
 				result = result.replace(linkRegex, `[$1](${growiPath})`);
 			}
+			const imgTagRegex = new RegExp(`(<img\\s+[^>]*src=)(["'])${pattern}\\2([^>]*>)`, "gi");
+			if (imgTagRegex.test(result)) {
+				replaced = true;
+				result = result.replace(imgTagRegex, `$1$2${growiPath}$2$3`);
+			}
 		}
 	}
 	return {
@@ -445,6 +524,7 @@ const uploadFiles = async (files, sourceDir, config) => {
 		} else if (result.action === "error") {
 			stats.pageErrors++;
 			console.error(`[ERROR] ${file.localPath} → ${file.growiPath} (${result.errorMessage || "unknown error"})`);
+			if (config.verbose && result.error) console.error(formatDetailedError(result.error));
 		}
 		if (result.pageId && (result.action === "created" || result.action === "updated")) {
 			let currentContent = content;
@@ -465,6 +545,7 @@ const uploadFiles = async (files, sourceDir, config) => {
 					} else {
 						stats.attachmentErrors++;
 						console.error(`[ERROR] ${attachment.localPath} → ${file.growiPath} (${attachmentResult.errorMessage || "failed to upload attachment"})`);
+						if (config.verbose && attachmentResult.error) console.error(formatDetailedError(attachmentResult.error));
 					}
 				}
 				if (hasAttachments && latestRevisionId) {
@@ -479,6 +560,7 @@ const uploadFiles = async (files, sourceDir, config) => {
 							currentRevisionId = updateResult.revisionId;
 						} else {
 							console.error(`[ERROR] ${file.localPath} → ${file.growiPath} (failed to update attachment links: ${updateResult.errorMessage || "unknown error"})`);
+							if (config.verbose && updateResult.error) console.error(formatDetailedError(updateResult.error));
 							stats.linkReplacementErrors++;
 						}
 					}
@@ -493,6 +575,7 @@ const uploadFiles = async (files, sourceDir, config) => {
 						currentRevisionId = updateResult.revisionId;
 					} else {
 						console.error(`[ERROR] ${file.localPath} → ${file.growiPath} (failed to update page links: ${updateResult.errorMessage || "unknown error"})`);
+						if (config.verbose && updateResult.error) console.error(formatDetailedError(updateResult.error));
 						stats.linkReplacementErrors++;
 					}
 				}
@@ -508,8 +591,9 @@ const uploadFiles = async (files, sourceDir, config) => {
 //#endregion
 //#region src/index.ts
 const program = new Command();
-const main = async (sourceDir, configPath) => {
+const main = async (sourceDir, configPath, verboseOverride) => {
 	const config = loadConfig(configPath);
+	if (verboseOverride !== void 0) config.verbose = verboseOverride;
 	const sourceDirPath = resolve(sourceDir);
 	configureAxios(config.url, config.token);
 	const files = await scanMarkdownFiles(sourceDirPath, config.basePath);
@@ -526,9 +610,9 @@ const main = async (sourceDir, configPath) => {
 	console.log(`- Attachment errors: ${stats.attachmentErrors}`);
 	console.log(`- Link replacement errors: ${stats.linkReplacementErrors}`);
 };
-program.name("growi-uploader").description("A content uploader for GROWI").version(version).argument("<source-dir>", "Source directory containing Markdown files").option("-c, --config <path>", "Path to config file", "growi-uploader.json").action(async (sourceDir, options) => {
+program.name("growi-uploader").description("A content uploader for GROWI").version(version).argument("<source-dir>", "Source directory containing Markdown files").option("-c, --config <path>", "Path to config file", "growi-uploader.json").option("-v, --verbose", "Enable verbose error output with detailed information").action(async (sourceDir, options) => {
 	try {
-		await main(sourceDir, options.config);
+		await main(sourceDir, options.config, options.verbose);
 	} catch (error) {
 		console.error("Error:", error instanceof Error ? error.message : error);
 		process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onozaty/growi-uploader",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "A content uploader for GROWI",
   "type": "module",
   "bin": {