@s-hirano-ist/s-scripts 4.2.0 → 4.3.0

package/dist/fetch-articles.js

@@ -6,8 +6,9 @@ import {
   makeUserId
 } from "./chunk-RLAYINCA.js";
 import {
-  createPushoverService
-} from "./chunk-7PVU2Z32.js";
+  cliNotifications,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/fetch-articles.ts
@@ -50,20 +51,13 @@ async function exportData(data) {
 async function main() {
   const env = {
     DATABASE_URL: process.env.DATABASE_URL,
-    PUSHOVER_URL: process.env.PUSHOVER_URL,
-    PUSHOVER_USER_KEY: process.env.PUSHOVER_USER_KEY,
-    PUSHOVER_APP_TOKEN: process.env.PUSHOVER_APP_TOKEN,
     USERNAME_TO_EXPORT: process.env.USERNAME_TO_EXPORT
   };
   if (Object.values(env).some((v) => !v)) {
     throw new Error("Required environment variables are not set.");
   }
   const prisma = createPrismaClient(env.DATABASE_URL ?? "");
-  const notificationService = createPushoverService({
-    url: env.PUSHOVER_URL ?? "",
-    userKey: env.PUSHOVER_USER_KEY ?? "",
-    appToken: env.PUSHOVER_APP_TOKEN ?? ""
-  });
+  const notificationService = cliNotifications;
   const userId = makeUserId(env.USERNAME_TO_EXPORT ?? "");
   const UNEXPORTED = makeUnexportedStatus();
   async function fetchArticles() {
@@ -96,20 +90,8 @@ async function main() {
     await notificationService.notifyInfo("fetch-articles completed", {
       caller: "fetch-articles"
     });
-  } catch (error) {
-    console.error("\u274C \u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
-    await notificationService.notifyError(
-      `fetch-articles failed: ${String(error)}`,
-      {
-        caller: "fetch-articles"
-      }
-    );
-    process.exit(1);
   } finally {
     await prisma.$disconnect();
   }
 }
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
+await runCli("fetch-articles", main);

package/dist/fetch-books.js

@@ -2,15 +2,16 @@
 import { createRequire as __cliCreateRequire } from "node:module"; const require = __cliCreateRequire(import.meta.url);
 import {
   createObjectStorageClient
-} from "./chunk-M6LFKOUH.js";
+} from "./chunk-MVYAZJB2.js";
 import {
   createPrismaClient,
   makeUnexportedStatus,
   makeUserId
 } from "./chunk-RLAYINCA.js";
 import {
-  createPushoverService
-} from "./chunk-7PVU2Z32.js";
+  cliNotifications,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/fetch-books.ts
@@ -77,9 +78,6 @@ ${frontmatter}---
 async function main() {
   const env = {
     DATABASE_URL: process.env.DATABASE_URL,
-    PUSHOVER_URL: process.env.PUSHOVER_URL,
-    PUSHOVER_USER_KEY: process.env.PUSHOVER_USER_KEY,
-    PUSHOVER_APP_TOKEN: process.env.PUSHOVER_APP_TOKEN,
     USERNAME_TO_EXPORT: process.env.USERNAME_TO_EXPORT,
     S3_BUCKET_NAME: process.env.S3_BUCKET_NAME
   };
@@ -87,11 +85,7 @@ async function main() {
     throw new Error("Required environment variables are not set.");
   }
   const prisma = createPrismaClient(env.DATABASE_URL ?? "");
-  const notificationService = createPushoverService({
-    url: env.PUSHOVER_URL ?? "",
-    userKey: env.PUSHOVER_USER_KEY ?? "",
-    appToken: env.PUSHOVER_APP_TOKEN ?? ""
-  });
+  const notificationService = cliNotifications;
   const storageClient = createObjectStorageClient();
   const userId = makeUserId(env.USERNAME_TO_EXPORT ?? "");
   const UNEXPORTED = makeUnexportedStatus();
@@ -142,20 +136,8 @@ async function main() {
     await notificationService.notifyInfo("fetch-books completed", {
       caller: "fetch-books"
     });
-  } catch (error) {
-    console.error("\u274C \u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
-    await notificationService.notifyError(
-      `fetch-books failed: ${String(error)}`,
-      {
-        caller: "fetch-books"
-      }
-    );
-    process.exit(1);
   } finally {
     await prisma.$disconnect();
   }
 }
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
+await runCli("fetch-books", main);

package/dist/fetch-images.js

@@ -2,15 +2,16 @@
 import { createRequire as __cliCreateRequire } from "node:module"; const require = __cliCreateRequire(import.meta.url);
 import {
   createObjectStorageClient
-} from "./chunk-M6LFKOUH.js";
+} from "./chunk-MVYAZJB2.js";
 import {
   createPrismaClient,
   makeUnexportedStatus,
   makeUserId
 } from "./chunk-RLAYINCA.js";
 import {
-  createPushoverService
-} from "./chunk-7PVU2Z32.js";
+  cliNotifications,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/fetch-images.ts
@@ -33,9 +34,6 @@ async function withRetry(fn, retries = 3) {
 async function main() {
   const env = {
     DATABASE_URL: process.env.DATABASE_URL,
-    PUSHOVER_URL: process.env.PUSHOVER_URL,
-    PUSHOVER_USER_KEY: process.env.PUSHOVER_USER_KEY,
-    PUSHOVER_APP_TOKEN: process.env.PUSHOVER_APP_TOKEN,
     USERNAME_TO_EXPORT: process.env.USERNAME_TO_EXPORT,
     S3_BUCKET_NAME: process.env.S3_BUCKET_NAME
   };
@@ -43,11 +41,7 @@ async function main() {
     throw new Error("Required environment variables are not set.");
   }
   const prisma = createPrismaClient(env.DATABASE_URL ?? "");
-  const notificationService = createPushoverService({
-    url: env.PUSHOVER_URL ?? "",
-    userKey: env.PUSHOVER_USER_KEY ?? "",
-    appToken: env.PUSHOVER_APP_TOKEN ?? ""
-  });
+  const notificationService = cliNotifications;
   const storageClient = createObjectStorageClient();
   const userId = makeUserId(env.USERNAME_TO_EXPORT ?? "");
   const UNEXPORTED = makeUnexportedStatus();
@@ -77,20 +71,8 @@ async function main() {
     await notificationService.notifyInfo("fetch-images completed", {
       caller: "fetch-images"
     });
-  } catch (error) {
-    console.error("\u274C \u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
-    await notificationService.notifyError(
-      `fetch-images failed: ${String(error)}`,
-      {
-        caller: "fetch-images"
-      }
-    );
-    process.exit(1);
   } finally {
     await prisma.$disconnect();
   }
 }
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
+await runCli("fetch-images", main);

package/dist/fetch-notes.js

@@ -6,8 +6,9 @@ import {
   makeUserId
 } from "./chunk-RLAYINCA.js";
 import {
-  createPushoverService
-} from "./chunk-7PVU2Z32.js";
+  cliNotifications,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/fetch-notes.ts
@@ -27,20 +28,13 @@ ${item.markdown}
 async function main() {
   const env = {
     DATABASE_URL: process.env.DATABASE_URL,
-    PUSHOVER_URL: process.env.PUSHOVER_URL,
-    PUSHOVER_USER_KEY: process.env.PUSHOVER_USER_KEY,
-    PUSHOVER_APP_TOKEN: process.env.PUSHOVER_APP_TOKEN,
     USERNAME_TO_EXPORT: process.env.USERNAME_TO_EXPORT
   };
   if (Object.values(env).some((v) => !v)) {
     throw new Error("Required environment variables are not set.");
   }
   const prisma = createPrismaClient(env.DATABASE_URL ?? "");
-  const notificationService = createPushoverService({
-    url: env.PUSHOVER_URL ?? "",
-    userKey: env.PUSHOVER_USER_KEY ?? "",
-    appToken: env.PUSHOVER_APP_TOKEN ?? ""
-  });
+  const notificationService = cliNotifications;
   const userId = makeUserId(env.USERNAME_TO_EXPORT ?? "");
   const UNEXPORTED = makeUnexportedStatus();
   async function fetchNotes() {
@@ -57,20 +51,8 @@ async function main() {
     await notificationService.notifyInfo("fetch-notes completed", {
       caller: "fetch-notes"
     });
-  } catch (error) {
-    console.error("\u274C \u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
-    await notificationService.notifyError(
-      `fetch-notes failed: ${String(error)}`,
-      {
-        caller: "fetch-notes"
-      }
-    );
-    process.exit(1);
   } finally {
     await prisma.$disconnect();
   }
 }
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
+await runCli("fetch-notes", main);

package/dist/find-duplicate-json-articles.js

@@ -1,5 +1,10 @@
 #!/usr/bin/env node
 import { createRequire as __cliCreateRequire } from "node:module"; const require = __cliCreateRequire(import.meta.url);
+import {
+  reportCliError,
+  runCli
+} from "./chunk-4CXH2QIX.js";
+import "./chunk-JZOR5GA2.js";
 
 // src/find-duplicate-json-articles.ts
 import fs from "node:fs";
@@ -42,6 +47,7 @@ function findDuplicateUrls() {
         }
       }
     } catch (error) {
+      reportCliError(error, "find-duplicate-json-articles");
       console.error(`\u30A8\u30E9\u30FC: ${fileName} \u306E\u8AAD\u307F\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F:`, error);
     }
   }
@@ -104,17 +110,9 @@ function displayResults(duplicates) {
   });
 }
 async function main() {
-  try {
-    console.log("json/article\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u5185\u306EURL\u91CD\u8907\u3092\u691C\u7D22\u4E2D...\n");
-    const duplicates = findDuplicateUrls();
-    displayResults(duplicates);
-    console.log("\n\u691C\u7D22\u5B8C\u4E86");
-  } catch (error) {
-    console.error("\u274C \u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
-    process.exit(1);
-  }
+  console.log("json/article\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u5185\u306EURL\u91CD\u8907\u3092\u691C\u7D22\u4E2D...\n");
+  const duplicates = findDuplicateUrls();
+  displayResults(duplicates);
+  console.log("\n\u691C\u7D22\u5B8C\u4E86");
 }
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
+await runCli("find-duplicate-json-articles", main);

package/dist/fix-book-frontmatter.js

@@ -6,6 +6,10 @@ import {
 import {
   globPaths
 } from "./chunk-AJMTRCPJ.js";
+import {
+  reportCliError,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/fix-book-frontmatter.ts
@@ -94,6 +98,7 @@ ${body}`;
     }
     return "fixed";
   } catch (error) {
+    reportCliError(error, "fix-book-frontmatter");
     console.error(`\u274C ${fileName}: ${String(error)}`);
     return "error";
   }
@@ -127,7 +132,4 @@ async function main() {
 \u{1F4CA} \u7D50\u679C: \u4FEE\u6B63 ${fixedCount} \u4EF6, \u30B9\u30AD\u30C3\u30D7 ${skippedCount} \u4EF6, \u30A8\u30E9\u30FC ${errorCount} \u4EF6${dryRun ? " (dry-run)" : ""}`
   );
 }
-main().catch((error) => {
-  console.error("\u274C \u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
-  process.exit(1);
-});
+await runCli("fix-book-frontmatter", main);

package/dist/fix-image-formats.js

@@ -6,6 +6,10 @@ import {
 import {
   globPaths
 } from "./chunk-AJMTRCPJ.js";
+import {
+  reportCliError,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/fix-image-formats.ts
@@ -64,6 +68,7 @@ async function processDirectory(directory, label, dryRun) {
       console.log(`\u2705 \u5909\u63DB\u5B8C\u4E86: ${fileName} \u2192 ${basename(outputPath)}`);
       converted++;
     } catch (error) {
+      reportCliError(error, "fix-image-formats");
       console.error(`\u274C ${fileName}: ${String(error)}`);
       errors++;
     }
@@ -87,10 +92,7 @@ async function main() {
 \u{1F4CA} \u5408\u8A08: \u5909\u63DB ${converted} \u4EF6, \u30B9\u30AD\u30C3\u30D7 ${skipped} \u4EF6, \u30A8\u30E9\u30FC ${errors} \u4EF6${dryRun ? " (dry-run)" : ""}`
   );
   if (errors > 0) {
-    process.exit(1);
+    process.exitCode = 1;
   }
 }
-main().catch((error) => {
-  console.error("\u274C \u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
-  process.exit(1);
-});
+await runCli("fix-image-formats", main);

package/dist/ingest-articles.js

@@ -5,14 +5,16 @@ import {
 } from "./chunk-IYGLKY27.js";
 import {
   runContentImport
-} from "./chunk-R5EI7JXR.js";
+} from "./chunk-GBQOCN2C.js";
 import "./chunk-KKZP7ZF3.js";
-import "./chunk-M6LFKOUH.js";
-import "./chunk-RLAYINCA.js";
-import "./chunk-7PVU2Z32.js";
 import {
   globPaths
 } from "./chunk-AJMTRCPJ.js";
+import "./chunk-MVYAZJB2.js";
+import "./chunk-RLAYINCA.js";
+import {
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/ingest-articles.ts
@@ -33,4 +35,4 @@ async function* source(root) {
       };
   }
 }
-await runContentImport("articles", source);
+await runCli("ingest-articles", () => runContentImport("articles", source));

package/dist/ingest-books.js

@@ -1,19 +1,21 @@
 #!/usr/bin/env node
 import { createRequire as __cliCreateRequire } from "node:module"; const require = __cliCreateRequire(import.meta.url);
+import {
+  parseMarkdownFrontmatter
+} from "./chunk-HDYQV2Y2.js";
 import {
   makeISBN,
   runContentImport
-} from "./chunk-R5EI7JXR.js";
+} from "./chunk-GBQOCN2C.js";
 import "./chunk-KKZP7ZF3.js";
-import "./chunk-M6LFKOUH.js";
-import "./chunk-RLAYINCA.js";
-import "./chunk-7PVU2Z32.js";
-import {
-  parseMarkdownFrontmatter
-} from "./chunk-HDYQV2Y2.js";
 import {
   globPaths
 } from "./chunk-AJMTRCPJ.js";
+import "./chunk-MVYAZJB2.js";
+import "./chunk-RLAYINCA.js";
+import {
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/ingest-books.ts
@@ -65,4 +67,4 @@ async function* source(root) {
     };
   }
 }
-await runContentImport("books", source);
+await runCli("ingest-books", () => runContentImport("books", source));

package/dist/ingest-images.js

@@ -3,14 +3,16 @@ import { createRequire as __cliCreateRequire } from "node:module"; const require
 import {
   runContentImport,
   sharpImageProcessor
-} from "./chunk-R5EI7JXR.js";
+} from "./chunk-GBQOCN2C.js";
 import "./chunk-KKZP7ZF3.js";
-import "./chunk-M6LFKOUH.js";
-import "./chunk-RLAYINCA.js";
-import "./chunk-7PVU2Z32.js";
 import {
   globPaths
 } from "./chunk-AJMTRCPJ.js";
+import "./chunk-MVYAZJB2.js";
+import "./chunk-RLAYINCA.js";
+import {
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/ingest-images.ts
@@ -34,4 +36,4 @@ async function* source(root) {
     };
   }
 }
-await runContentImport("images", source);
+await runCli("ingest-images", () => runContentImport("images", source));

package/dist/ingest-notes.js

@@ -1,18 +1,20 @@
 #!/usr/bin/env node
 import { createRequire as __cliCreateRequire } from "node:module"; const require = __cliCreateRequire(import.meta.url);
-import {
-  runContentImport
-} from "./chunk-R5EI7JXR.js";
-import "./chunk-KKZP7ZF3.js";
-import "./chunk-M6LFKOUH.js";
-import "./chunk-RLAYINCA.js";
-import "./chunk-7PVU2Z32.js";
 import {
   parseMarkdownFrontmatter
 } from "./chunk-HDYQV2Y2.js";
+import {
+  runContentImport
+} from "./chunk-GBQOCN2C.js";
+import "./chunk-KKZP7ZF3.js";
 import {
   globPaths
 } from "./chunk-AJMTRCPJ.js";
+import "./chunk-MVYAZJB2.js";
+import "./chunk-RLAYINCA.js";
+import {
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/ingest-notes.ts
@@ -46,4 +48,4 @@ async function* source(root) {
     if (values) yield { values };
   }
 }
-await runContentImport("notes", source);
+await runCli("ingest-notes", () => runContentImport("notes", source));

package/dist/rag/delete-collection.js

@@ -1,37 +1,12 @@
 #!/usr/bin/env node
 import { createRequire as __cliCreateRequire } from "node:module"; const require = __cliCreateRequire(import.meta.url);
 import {
-  deleteCollection,
-  getQdrantClient
-} from "../chunk-J4VLH4VA.js";
+  runCli
+} from "../chunk-4CXH2QIX.js";
 import "../chunk-JZOR5GA2.js";
 
 // src/rag/delete-collection.ts
-async function main() {
-  const collectionName = process.argv[2];
-  if (!collectionName) {
-    console.error(
-      "Usage: rag-delete-collection <collection-name>\nExample: rag-delete-collection knowledge_v1"
-    );
-    process.exit(1);
-  }
-  if (!process.env.QDRANT_URL) {
-    throw new Error("QDRANT_URL environment variable is required.");
-  }
-  const qdrant = getQdrantClient();
-  const collections = await qdrant.getCollections();
-  const exists = collections.collections.some((c) => c.name === collectionName);
-  if (!exists) {
-    console.log(
-      `Collection "${collectionName}" does not exist. Nothing to delete.`
-    );
-    return;
-  }
-  console.log(`Deleting collection "${collectionName}"...`);
-  await deleteCollection(collectionName);
-  console.log(`Collection "${collectionName}" deleted successfully.`);
-}
-main().catch((error) => {
-  console.error("Failed to delete collection:", error);
-  process.exit(1);
+await runCli("rag-delete-collection", async () => {
+  const { main } = await import("../chunk-67LIMNXH.js");
+  await main();
 });