@itsmrtr/bunkoshelf 1.3.0 → 1.3.2

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itsmrtr/bunkoshelf",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Self-hosted personal manga library.",
   "keywords": [
     "bunko",
@@ -30,7 +30,7 @@
     "runtime"
   ],
   "bin": {
-    "bunkoshelf": "./bin/bunkoshelf.mjs"
+    "bunko": "./bin/bunkoshelf.mjs"
   },
   "engines": {
     "node": ">=20"
@@ -40,10 +40,12 @@
     "provenance": true
   },
   "scripts": {
+    "bunko": "node ./runtime/cli.mjs",
     "dev": "node ./scripts/dev.mjs",
     "build": "next build",
     "db:migrate": "node ./scripts/migrate.mjs",
     "start": "node ./scripts/start.mjs",
+    "update": "node ./runtime/cli.mjs update",
     "build:release": "node ./scripts/build-release.mjs",
     "lint": "eslint ."
   },

package/dist/runtime/cli.mjs

@@ -27,6 +27,7 @@ switch (command) {
     await init(projectName, options);
     break;
   }
+  case "shelf":
   case "start": {
     const { start } = await import("./commands/start.mjs");
     await start();
@@ -43,7 +44,9 @@ switch (command) {
       const { options } = parseInitArgs(args);
       await init(command, options);
     } else {
-      console.error("Usage: bunkoshelf <init|start|update> [project-name|version]");
+      console.error(
+        "Usage: bunko <init|shelf|start|update> [project-name|version]"
+      );
       process.exit(1);
     }
 }

package/dist/runtime/commands/init.mjs

@@ -5,6 +5,13 @@ import { resolve, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import fs from "fs-extra";
 import { execa } from "execa";
+import {
+  detectPackageManager,
+  getInstallCommand,
+  getPackageManagerVersion,
+  getStartCommand,
+  getUpdateCommand,
+} from "../package-manager.mjs";
 
 const PACKAGE_NAME = "@itsmrtr/bunkoshelf";
 const DEFAULT_PORT = 3060;
@@ -36,14 +43,20 @@ export function buildEnv(jwtSecret, provider = "local") {
   return lines.join("\n") + "\n";
 }
 
-function buildPackageJson(name) {
+function buildPackageJson(name, packageManager, packageManagerVersion) {
   return {
     name,
     version: "0.1.0",
     private: true,
+    ...(packageManager === "pnpm" && packageManagerVersion
+      ? {
+          packageManager: `pnpm@${packageManagerVersion}`,
+        }
+      : {}),
     scripts: {
-      start: "bunkoshelf start",
-      update: "bunkoshelf update",
+      bunko: "bunko",
+      start: "bunko shelf",
+      update: "bunko update",
     },
     dependencies: {
       [PACKAGE_NAME]: packageVersion,
@@ -54,6 +67,11 @@ function buildPackageJson(name) {
 export async function init(projectName, options = {}) {
   intro(chalk.bold("▲ Bunko Shelf"));
   const provider = options.cloud ? "cloud" : "local";
+  const packageManager = await detectPackageManager(process.cwd());
+  const packageManagerVersion = getPackageManagerVersion(packageManager);
+  const installCommand = getInstallCommand(packageManager);
+  const startCommand = getStartCommand(packageManager);
+  const updateCommand = getUpdateCommand(packageManager);
 
   const useCurrentDir = projectName === ".";
   let name = useCurrentDir ? undefined : projectName;
@@ -98,14 +116,21 @@ export async function init(projectName, options = {}) {
   progress.start("Creating project...");
   await fs.ensureDir(projectDir);
   await fs.writeFile(join(projectDir, ".env"), buildEnv(generateSecret(), provider));
-  await fs.writeJson(join(projectDir, "package.json"), buildPackageJson(name), {
-    spaces: 2,
-  });
+  await fs.writeJson(
+    join(projectDir, "package.json"),
+    buildPackageJson(name, packageManager, packageManagerVersion),
+    {
+      spaces: 2,
+    }
+  );
   await fs.writeFile(join(projectDir, ".gitignore"), ".env\nnode_modules\n");
   progress.stop("Project created");
 
   progress.start("Installing dependencies...");
-  await execa("npm", ["install"], { cwd: projectDir, stdio: "inherit" });
+  await execa(installCommand.command, installCommand.args, {
+    cwd: projectDir,
+    stdio: "inherit",
+  });
   progress.stop("Dependencies installed");
 
   note(
@@ -118,13 +143,13 @@ export async function init(projectName, options = {}) {
       "",
       "Then start Bunko Shelf:",
       "",
-      `  ${chalk.cyan("npm start")}`,
+      `  ${chalk.cyan(startCommand)}`,
       "",
       `Keep ${chalk.cyan("JWT_SECRET")} configured in production.`,
       "",
       "To update Bunko Shelf later:",
       "",
-      `  ${chalk.cyan("npm run update")}`,
+      `  ${chalk.cyan(updateCommand)}`,
     ].join("\n"),
     "Next steps"
   );

package/dist/runtime/commands/update.mjs

@@ -3,6 +3,10 @@ import chalk from "chalk";
 import { execa } from "execa";
 import fs from "fs-extra";
 import { join } from "node:path";
+import {
+  detectPackageManager,
+  getUpdateDependencyCommand,
+} from "../package-manager.mjs";
 
 const PACKAGE_NAME = "@itsmrtr/bunkoshelf";
 const REPOSITORY_NAME = "martirale/bunkoshelf";
@@ -70,11 +74,13 @@ export async function update(version = "latest") {
 
   const progress = spinner();
   const target = `${PACKAGE_NAME}@${version}`;
+  const packageManager = await detectPackageManager(process.cwd());
+  const updateCommand = getUpdateDependencyCommand(packageManager, target);
 
   progress.start(`Updating ${PACKAGE_NAME} to ${chalk.cyan(version)}...`);
 
   try {
-    await execa("npm", ["install", "--save-exact", target], {
+    await execa(updateCommand.command, updateCommand.args, {
       cwd: process.cwd(),
       stdio: "inherit",
     });
@@ -91,7 +97,12 @@ export async function update(version = "latest") {
     );
 
     try {
-      await execa("npm", ["install", "--save-exact", fallbackTarget], {
+      const fallbackCommand = getUpdateDependencyCommand(
+        packageManager,
+        fallbackTarget
+      );
+
+      await execa(fallbackCommand.command, fallbackCommand.args, {
         cwd: process.cwd(),
         stdio: "inherit",
       });

package/dist/runtime/package-manager.mjs

@@ -0,0 +1,108 @@
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+import fs from "fs-extra";
+
+function parsePackageManagerName(value) {
+  if (!value) return null;
+  if (value.startsWith("pnpm@") || value === "pnpm") return "pnpm";
+  if (value.startsWith("npm@") || value === "npm") return "npm";
+  return null;
+}
+
+function parseUserAgentPackageManager(
+  userAgent = process.env.npm_config_user_agent
+) {
+  if (!userAgent) return null;
+
+  const [descriptor] = userAgent.split(" ");
+  const [name, version] = descriptor.split("/");
+  const parsedName = parsePackageManagerName(name);
+
+  if (!parsedName) return null;
+
+  return {
+    name: parsedName,
+    version: version || null,
+  };
+}
+
+async function readProjectPackageManager(projectDir) {
+  const packageJsonPath = join(projectDir, "package.json");
+
+  if (!(await fs.pathExists(packageJsonPath))) {
+    return null;
+  }
+
+  const raw = await readFile(packageJsonPath, "utf8");
+  const parsed = JSON.parse(raw);
+
+  return parsePackageManagerName(parsed.packageManager);
+}
+
+async function readLockfilePackageManager(projectDir) {
+  if (await fs.pathExists(join(projectDir, "pnpm-lock.yaml"))) {
+    return "pnpm";
+  }
+
+  if (await fs.pathExists(join(projectDir, "package-lock.json"))) {
+    return "npm";
+  }
+
+  return null;
+}
+
+export async function detectPackageManager(projectDir) {
+  const projectPackageManager = await readProjectPackageManager(projectDir);
+  if (projectPackageManager) return projectPackageManager;
+
+  const lockfilePackageManager = await readLockfilePackageManager(projectDir);
+  if (lockfilePackageManager) return lockfilePackageManager;
+
+  return parseUserAgentPackageManager()?.name ?? "npm";
+}
+
+export function getPackageManagerVersion(name) {
+  const userAgentPackageManager = parseUserAgentPackageManager();
+
+  if (userAgentPackageManager?.name === name) {
+    return userAgentPackageManager.version;
+  }
+
+  return null;
+}
+
+export function getInstallCommand(name) {
+  if (name === "pnpm") {
+    return {
+      command: "pnpm",
+      args: ["install"],
+    };
+  }
+
+  return {
+    command: "npm",
+    args: ["install"],
+  };
+}
+
+export function getUpdateDependencyCommand(name, target) {
+  if (name === "pnpm") {
+    return {
+      command: "pnpm",
+      args: ["add", "--save-exact", target],
+    };
+  }
+
+  return {
+    command: "npm",
+    args: ["install", "--save-exact", target],
+  };
+}
+
+export function getStartCommand(name) {
+  return name === "pnpm" ? "pnpm bunko shelf" : "npm run bunko -- shelf";
+}
+
+export function getUpdateCommand(name) {
+  return name === "pnpm" ? "pnpm bunko update" : "npm run bunko -- update";
+}

package/dist/src/actions/search.ts

@@ -3,6 +3,7 @@
 import MiniSearch from "minisearch";
 import { verifySession } from "@/lib/auth/verifySession";
 import { listSeries, listVolumes } from "@/lib/db/library";
+import { getLibrarySection } from "@/lib/librarySection";
 import type { SearchResult } from "@/lib/types";
 
 interface SearchParams {
@@ -14,6 +15,7 @@ interface SeriesDoc {
   title: string;
   slug: string;
   isOneshot: boolean;
+  section: "manga" | "others";
   writer: string;
   series: string;
 }
@@ -25,6 +27,7 @@ interface VolumeDoc {
   series: string;
   slug: string;
   isOneshot: boolean;
+  section: "manga" | "others";
   genres: string;
   tags: string;
 }
@@ -56,6 +59,7 @@ export async function searchManga({ query }: SearchParams) {
 
   const writerBySeriesId = new Map<string, string>();
   const seriesNameById = new Map<string, string>();
+  const sectionBySeriesId = new Map<string, "manga" | "others">();
 
   for (const vol of volumes) {
     const writer = vol.metadataObj?.writer?.trim();
@@ -67,6 +71,12 @@ export async function searchManga({ query }: SearchParams) {
     if (seriesName && !seriesNameById.has(vol.seriesId)) {
       seriesNameById.set(vol.seriesId, seriesName);
     }
+    if (!sectionBySeriesId.has(vol.seriesId)) {
+      sectionBySeriesId.set(
+        vol.seriesId,
+        getLibrarySection(vol.metadataObj?.mangaStyle)
+      );
+    }
   }
 
   const seriesList = await listSeries();
@@ -76,6 +86,7 @@ export async function searchManga({ query }: SearchParams) {
     title: s.title,
     slug: s.slug,
     isOneshot: s.isOneshot,
+    section: sectionBySeriesId.get(s.id) ?? "manga",
     writer: writerBySeriesId.get(s.id) || "",
     series: seriesNameById.get(s.id) || s.title,
   }));
@@ -98,6 +109,7 @@ export async function searchManga({ query }: SearchParams) {
     const doc = seriesMap.get(res.id as string)!;
     return {
       id: doc.id,
+      section: doc.section,
       type: "series",
       title: doc.title,
       slug: doc.slug,
@@ -124,6 +136,7 @@ export async function searchManga({ query }: SearchParams) {
       series: vol.metadataObj?.series || "",
       slug: vol.slug,
       isOneshot: vol.series?.isOneshot ?? false,
+      section: getLibrarySection(vol.metadataObj?.mangaStyle),
       genres: genreNames.join(", "),
       tags: tagNames.join(", "),
     };
@@ -147,6 +160,7 @@ export async function searchManga({ query }: SearchParams) {
     const doc = volumesMap.get(res.id as string)!;
     return {
       id: doc.id,
+      section: doc.section,
       type: "volume",
       title: doc.title,
       writer: doc.writer,

package/dist/src/components/search/SearchComp.tsx

@@ -118,8 +118,8 @@ export default function SearchComp({ lang, intl }: SearchCompProps) {
           {filteredResults.map((res) => {
             const isSeries = res.type === "series";
             const href = isSeries
-              ? `/${lang}/manga/${res.slug}`
-              : `/${lang}/manga/volume/${res.slug}`;
+              ? `/${lang}/${res.section}/${res.slug}`
+              : `/${lang}/${res.section}/volume/${res.slug}`;
 
             let genres = res.genres || "";
             let tags = res.tags || "";

package/dist/src/components/search/SearchModal.tsx

@@ -140,8 +140,8 @@ export default function SearchModal({ lang, intl }: SearchModalProps) {
           {filteredResults.map((res) => {
             const isSeries = res.type === "series";
             const href = isSeries
-              ? `/${lang}/manga/${res.slug}`
-              : `/${lang}/manga/volume/${res.slug}`;
+              ? `/${lang}/${res.section}/${res.slug}`
+              : `/${lang}/${res.section}/volume/${res.slug}`;
 
             let genres = res.genres || "";
             let tags = res.tags || "";

package/dist/src/lib/db/library.ts

@@ -1080,6 +1080,7 @@ export async function listSeries(
   return query<{
     id: string;
     slug: string;
+    sort_title: string;
     title: string;
     path: string;
     is_oneshot: boolean;
@@ -1092,6 +1093,7 @@ export async function listSeries(
       SELECT DISTINCT
         ms.id,
         ms.slug,
+        ms.sort_title,
         ms.title,
         ms.path,
         ms.is_oneshot,

package/dist/src/lib/types/search.ts

@@ -1,5 +1,6 @@
 export interface SearchResult {
   id: string;
+  section: "manga" | "others";
   type: "series" | "volume";
   title: string;
   slug: string;

package/dist/src/lib/utils.ts

@@ -1,4 +1,5 @@
 import { connection } from "next/server";
+import { cache } from "react";
 import { query, queryOne } from "./db/query";
 import { buildNaturalSortKey } from "./naturalSort";
 import type { Session } from "@/lib/types";
@@ -38,10 +39,20 @@ export function ageRatingMap(ageRating: string | null | undefined): number | nul
   return mapping[ageRating] ?? null;
 }
 
-export async function getChallengeData(user: Session | null) {
-  if (!user) return null;
+function isTransientDatabaseConnectionError(error: unknown): boolean {
+  if (!(error instanceof Error)) return false;
+
+  const message = error.message.toLowerCase();
+
+  return (
+    message.includes("timeout exceeded when trying to connect") ||
+    message.includes("connect econnrefused") ||
+    message.includes("the database system is starting up")
+  );
+}
+
+const resolveChallengeData = cache(async (userId: string, currentYear: number) => {
   await connection();
-  const currentYear = new Date().getFullYear();
 
   const challenge = await queryOne<{ goal: number }>(
     `
@@ -51,7 +62,7 @@ export async function getChallengeData(user: Session | null) {
         AND year = $2
       LIMIT 1
     `,
-    [user.id, currentYear]
+    [userId, currentYear]
   );
 
   const userVolumes = await query<{ last_read_at: Date | null }>(
@@ -61,7 +72,7 @@ export async function getChallengeData(user: Session | null) {
       WHERE user_id = $1
         AND is_read = TRUE
     `,
-    [user.id]
+    [userId]
   );
 
   const goal = challenge?.goal ?? 0;
@@ -72,4 +83,24 @@ export async function getChallengeData(user: Session | null) {
   const percentage = goal === 0 ? 0 : Math.min((progress / goal) * 100, 100);
 
   return { goal, progress, percentage };
+});
+
+export async function getChallengeData(user: Session | null) {
+  if (!user) return null;
+
+  const currentYear = new Date().getFullYear();
+
+  try {
+    return await resolveChallengeData(user.id, currentYear);
+  } catch (error) {
+    if (isTransientDatabaseConnectionError(error)) {
+      console.warn(
+        "[bunko/db] Challenge data unavailable:",
+        error instanceof Error ? error.message : String(error)
+      );
+      return null;
+    }
+
+    throw error;
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itsmrtr/bunkoshelf",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Self-hosted personal manga library.",
   "keywords": [
     "bunko",
@@ -30,7 +30,7 @@
     "runtime"
   ],
   "bin": {
-    "bunkoshelf": "./bin/bunkoshelf.mjs"
+    "bunko": "./bin/bunkoshelf.mjs"
   },
   "engines": {
     "node": ">=20"
@@ -91,10 +91,12 @@
     "typescript": "6.0.2"
   },
   "scripts": {
+    "bunko": "node ./runtime/cli.mjs",
     "dev": "node ./scripts/dev.mjs",
     "build": "next build",
     "db:migrate": "node ./scripts/migrate.mjs",
     "start": "node ./scripts/start.mjs",
+    "update": "node ./runtime/cli.mjs update",
     "build:release": "node ./scripts/build-release.mjs",
     "lint": "eslint ."
   }

package/runtime/cli.mjs

@@ -27,6 +27,7 @@ switch (command) {
     await init(projectName, options);
     break;
   }
+  case "shelf":
   case "start": {
     const { start } = await import("./commands/start.mjs");
     await start();
@@ -43,7 +44,9 @@ switch (command) {
       const { options } = parseInitArgs(args);
       await init(command, options);
     } else {
-      console.error("Usage: bunkoshelf <init|start|update> [project-name|version]");
+      console.error(
+        "Usage: bunko <init|shelf|start|update> [project-name|version]"
+      );
       process.exit(1);
     }
 }

package/runtime/commands/init.mjs

@@ -5,6 +5,13 @@ import { resolve, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import fs from "fs-extra";
 import { execa } from "execa";
+import {
+  detectPackageManager,
+  getInstallCommand,
+  getPackageManagerVersion,
+  getStartCommand,
+  getUpdateCommand,
+} from "../package-manager.mjs";
 
 const PACKAGE_NAME = "@itsmrtr/bunkoshelf";
 const DEFAULT_PORT = 3060;
@@ -36,14 +43,20 @@ export function buildEnv(jwtSecret, provider = "local") {
   return lines.join("\n") + "\n";
 }
 
-function buildPackageJson(name) {
+function buildPackageJson(name, packageManager, packageManagerVersion) {
   return {
     name,
     version: "0.1.0",
     private: true,
+    ...(packageManager === "pnpm" && packageManagerVersion
+      ? {
+          packageManager: `pnpm@${packageManagerVersion}`,
+        }
+      : {}),
     scripts: {
-      start: "bunkoshelf start",
-      update: "bunkoshelf update",
+      bunko: "bunko",
+      start: "bunko shelf",
+      update: "bunko update",
     },
     dependencies: {
       [PACKAGE_NAME]: packageVersion,
@@ -54,6 +67,11 @@ function buildPackageJson(name) {
 export async function init(projectName, options = {}) {
   intro(chalk.bold("▲ Bunko Shelf"));
   const provider = options.cloud ? "cloud" : "local";
+  const packageManager = await detectPackageManager(process.cwd());
+  const packageManagerVersion = getPackageManagerVersion(packageManager);
+  const installCommand = getInstallCommand(packageManager);
+  const startCommand = getStartCommand(packageManager);
+  const updateCommand = getUpdateCommand(packageManager);
 
   const useCurrentDir = projectName === ".";
   let name = useCurrentDir ? undefined : projectName;
@@ -98,14 +116,21 @@ export async function init(projectName, options = {}) {
   progress.start("Creating project...");
   await fs.ensureDir(projectDir);
   await fs.writeFile(join(projectDir, ".env"), buildEnv(generateSecret(), provider));
-  await fs.writeJson(join(projectDir, "package.json"), buildPackageJson(name), {
-    spaces: 2,
-  });
+  await fs.writeJson(
+    join(projectDir, "package.json"),
+    buildPackageJson(name, packageManager, packageManagerVersion),
+    {
+      spaces: 2,
+    }
+  );
   await fs.writeFile(join(projectDir, ".gitignore"), ".env\nnode_modules\n");
   progress.stop("Project created");
 
   progress.start("Installing dependencies...");
-  await execa("npm", ["install"], { cwd: projectDir, stdio: "inherit" });
+  await execa(installCommand.command, installCommand.args, {
+    cwd: projectDir,
+    stdio: "inherit",
+  });
   progress.stop("Dependencies installed");
 
   note(
@@ -118,13 +143,13 @@ export async function init(projectName, options = {}) {
       "",
       "Then start Bunko Shelf:",
       "",
-      `  ${chalk.cyan("npm start")}`,
+      `  ${chalk.cyan(startCommand)}`,
       "",
       `Keep ${chalk.cyan("JWT_SECRET")} configured in production.`,
       "",
       "To update Bunko Shelf later:",
       "",
-      `  ${chalk.cyan("npm run update")}`,
+      `  ${chalk.cyan(updateCommand)}`,
     ].join("\n"),
     "Next steps"
   );

package/runtime/commands/update.mjs

@@ -3,6 +3,10 @@ import chalk from "chalk";
 import { execa } from "execa";
 import fs from "fs-extra";
 import { join } from "node:path";
+import {
+  detectPackageManager,
+  getUpdateDependencyCommand,
+} from "../package-manager.mjs";
 
 const PACKAGE_NAME = "@itsmrtr/bunkoshelf";
 const REPOSITORY_NAME = "martirale/bunkoshelf";
@@ -70,11 +74,13 @@ export async function update(version = "latest") {
 
   const progress = spinner();
   const target = `${PACKAGE_NAME}@${version}`;
+  const packageManager = await detectPackageManager(process.cwd());
+  const updateCommand = getUpdateDependencyCommand(packageManager, target);
 
   progress.start(`Updating ${PACKAGE_NAME} to ${chalk.cyan(version)}...`);
 
   try {
-    await execa("npm", ["install", "--save-exact", target], {
+    await execa(updateCommand.command, updateCommand.args, {
       cwd: process.cwd(),
       stdio: "inherit",
     });
@@ -91,7 +97,12 @@ export async function update(version = "latest") {
     );
 
     try {
-      await execa("npm", ["install", "--save-exact", fallbackTarget], {
+      const fallbackCommand = getUpdateDependencyCommand(
+        packageManager,
+        fallbackTarget
+      );
+
+      await execa(fallbackCommand.command, fallbackCommand.args, {
         cwd: process.cwd(),
         stdio: "inherit",
       });