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

package/dist/reset-notes.js

@@ -9,28 +9,22 @@ import {
   makeUserId
 } from "./chunk-RLAYINCA.js";
 import {
-  createPushoverService
-} from "./chunk-7PVU2Z32.js";
+  cliNotifications,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/reset-notes.ts
 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 ?? "");
   async function resetNotes() {
     const commandRepository = createNotesCommandRepository(prisma);
@@ -45,18 +39,9 @@ async function main() {
     await resetNotes();
     await notificationService.notifyInfo("reset-notes completed", {
       caller: "reset-notes"
-    }).catch((error) => console.error("\u901A\u77E5\u5931\u6557:", error));
-  } catch (error) {
-    console.error("\u274C \u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
-    await notificationService.notifyError(`reset-notes failed: ${String(error)}`, {
-      caller: "reset-notes"
-    }).catch((notifyError) => console.error("\u901A\u77E5\u5931\u6557:", notifyError));
-    process.exitCode = 1;
+    });
   } finally {
     await prisma.$disconnect();
   }
 }
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
+await runCli("reset-notes", main);

package/dist/revert-articles.js

@@ -9,28 +9,22 @@ import {
   makeUserId
 } from "./chunk-RLAYINCA.js";
 import {
-  createPushoverService
-} from "./chunk-7PVU2Z32.js";
+  cliNotifications,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/revert-articles.ts
 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 ?? "");
   try {
     const commandRepository = createArticlesCommandRepository(prisma);
@@ -41,18 +35,9 @@ async function main() {
     );
     await notificationService.notifyInfo("revert-articles completed", {
       caller: "revert-articles"
-    }).catch((error) => console.error("\u901A\u77E5\u5931\u6557:", error));
-  } catch (error) {
-    console.error("\u274C \u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
-    await notificationService.notifyError(`revert-articles failed: ${String(error)}`, {
-      caller: "revert-articles"
-    }).catch((notifyError) => console.error("\u901A\u77E5\u5931\u6557:", notifyError));
-    process.exitCode = 1;
+    });
   } finally {
     await prisma.$disconnect();
   }
 }
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
+await runCli("revert-articles", main);

package/dist/revert-books.js

@@ -9,28 +9,22 @@ import {
   makeUserId
 } from "./chunk-RLAYINCA.js";
 import {
-  createPushoverService
-} from "./chunk-7PVU2Z32.js";
+  cliNotifications,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/revert-books.ts
 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 ?? "");
   try {
     const commandRepository = createBooksCommandRepository(prisma);
@@ -41,18 +35,9 @@ async function main() {
     );
     await notificationService.notifyInfo("revert-books completed", {
       caller: "revert-books"
-    }).catch((error) => console.error("\u901A\u77E5\u5931\u6557:", error));
-  } catch (error) {
-    console.error("\u274C \u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
-    await notificationService.notifyError(`revert-books failed: ${String(error)}`, {
-      caller: "revert-books"
-    }).catch((notifyError) => console.error("\u901A\u77E5\u5931\u6557:", notifyError));
-    process.exitCode = 1;
+    });
   } finally {
     await prisma.$disconnect();
   }
 }
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
+await runCli("revert-books", main);

package/dist/revert-images.js

@@ -9,28 +9,22 @@ import {
   makeUserId
 } from "./chunk-RLAYINCA.js";
 import {
-  createPushoverService
-} from "./chunk-7PVU2Z32.js";
+  cliNotifications,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/revert-images.ts
 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 ?? "");
   try {
     const commandRepository = createImagesCommandRepository(prisma);
@@ -41,18 +35,9 @@ async function main() {
     );
     await notificationService.notifyInfo("revert-images completed", {
       caller: "revert-images"
-    }).catch((error) => console.error("\u901A\u77E5\u5931\u6557:", error));
-  } catch (error) {
-    console.error("\u274C \u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
-    await notificationService.notifyError(`revert-images failed: ${String(error)}`, {
-      caller: "revert-images"
-    }).catch((notifyError) => console.error("\u901A\u77E5\u5931\u6557:", notifyError));
-    process.exitCode = 1;
+    });
   } finally {
     await prisma.$disconnect();
   }
 }
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
+await runCli("revert-images", main);

package/dist/revert-notes.js

@@ -9,28 +9,22 @@ import {
   makeUserId
 } from "./chunk-RLAYINCA.js";
 import {
-  createPushoverService
-} from "./chunk-7PVU2Z32.js";
+  cliNotifications,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/revert-notes.ts
 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 ?? "");
   try {
     const commandRepository = createNotesCommandRepository(prisma);
@@ -41,18 +35,9 @@ async function main() {
     );
     await notificationService.notifyInfo("revert-notes completed", {
       caller: "revert-notes"
-    }).catch((error) => console.error("\u901A\u77E5\u5931\u6557:", error));
-  } catch (error) {
-    console.error("\u274C \u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
-    await notificationService.notifyError(`revert-notes failed: ${String(error)}`, {
-      caller: "revert-notes"
-    }).catch((notifyError) => console.error("\u901A\u77E5\u5931\u6557:", notifyError));
-    process.exitCode = 1;
+    });
   } finally {
     await prisma.$disconnect();
   }
 }
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
+await runCli("revert-notes", main);

package/dist/s-content-format.js

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
 import { createRequire as __cliCreateRequire } from "node:module"; const require = __cliCreateRequire(import.meta.url);
+import {
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/s-content-format-runner.ts
@@ -93,16 +96,11 @@ function runContentFormat(rawArgs, cwd = process.cwd(), options = {}) {
 
 // src/s-content-format.ts
 async function main() {
-  try {
-    const { code, signal } = await runContentFormat(process.argv.slice(2));
-    if (signal !== null) {
-      process.kill(process.pid, signal);
-      return;
-    }
-    process.exitCode = code ?? 1;
-  } catch (error) {
-    console.error(error);
-    process.exitCode = 1;
+  const { code, signal } = await runContentFormat(process.argv.slice(2));
+  if (signal !== null) {
+    process.kill(process.pid, signal);
+    return;
   }
+  process.exitCode = code ?? 1;
 }
-void main();
+await runCli("s-content-format", main);

package/dist/update-json-articles.js

@@ -7,8 +7,10 @@ import {
   resolveArticleOgImageUrl
 } from "./chunk-IYGLKY27.js";
 import {
-  createPushoverService
-} from "./chunk-7PVU2Z32.js";
+  cliNotifications,
+  reportCliError,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/update-json-articles.ts
@@ -43,6 +45,7 @@ async function getOgTags(url) {
     const ogDescription = ogTags["og:description"];
     return { ogImageUrl, ogTitle, ogDescription };
   } catch (error) {
+    reportCliError(error, "update-json-articles");
     console.error(`Error fetching OG tags for ${url}:`, error);
     return {};
   }
@@ -73,49 +76,24 @@ async function processArticleFile(filePath) {
     );
     console.log(`Completed processing ${filePath}`);
   } catch (error) {
+    reportCliError(error, "update-json-articles");
     console.error(`Error processing ${filePath}:`, error);
   }
 }
 async function main() {
-  const env = {
-    PUSHOVER_URL: process.env.PUSHOVER_URL,
-    PUSHOVER_USER_KEY: process.env.PUSHOVER_USER_KEY,
-    PUSHOVER_APP_TOKEN: process.env.PUSHOVER_APP_TOKEN
-  };
-  if (Object.values(env).some((v) => !v)) {
-    throw new Error("Required environment variables are not set.");
-  }
-  const notificationService = createPushoverService({
-    url: env.PUSHOVER_URL ?? "",
-    userKey: env.PUSHOVER_USER_KEY ?? "",
-    appToken: env.PUSHOVER_APP_TOKEN ?? ""
-  });
+  const notificationService = cliNotifications;
   const articleDir = join(process.cwd(), "json", "article");
-  try {
-    const files = readdirSync(articleDir).filter(
-      (file) => file.endsWith(".json")
-    );
-    console.log(`Found ${files.length} JSON files to process`);
-    for (const file of files) {
-      const filePath = join(articleDir, file);
-      await processArticleFile(filePath);
-    }
-    console.log("All files processed successfully!");
-    await notificationService.notifyInfo("update-json-articles completed", {
-      caller: "update-json-articles"
-    });
-  } catch (error) {
-    console.error("Error in main process:", error);
-    await notificationService.notifyError(
-      `update-json-articles failed: ${String(error)}`,
-      {
-        caller: "update-json-articles"
-      }
-    );
-    process.exit(1);
+  const files = readdirSync(articleDir).filter(
+    (file) => file.endsWith(".json")
+  );
+  console.log(`Found ${files.length} JSON files to process`);
+  for (const file of files) {
+    const filePath = join(articleDir, file);
+    await processArticleFile(filePath);
   }
+  console.log("All files processed successfully!");
+  await notificationService.notifyInfo("update-json-articles completed", {
+    caller: "update-json-articles"
+  });
 }
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
+await runCli("update-json-articles", main);

package/dist/update-raw-articles.js

@@ -4,8 +4,10 @@ import {
   decodeHtml
 } from "./chunk-UXGLXHQ6.js";
 import {
-  createPushoverService
-} from "./chunk-7PVU2Z32.js";
+  cliNotifications,
+  reportCliError,
+  runCli
+} from "./chunk-4CXH2QIX.js";
 import "./chunk-JZOR5GA2.js";
 
 // src/update-raw-articles.ts
@@ -73,6 +75,7 @@ async function fetchWebsiteMarkdown(url) {
     const markdown = turndownService.turndown(html);
     return markdown.trim();
   } catch (error) {
+    reportCliError(error, "update-raw-articles");
     console.error(`Failed to fetch ${url}:`, error);
     return "";
   }
@@ -118,41 +121,15 @@ ${websiteText}
   }
 }
 async function main() {
-  const env = {
-    PUSHOVER_URL: process.env.PUSHOVER_URL,
-    PUSHOVER_USER_KEY: process.env.PUSHOVER_USER_KEY,
-    PUSHOVER_APP_TOKEN: process.env.PUSHOVER_APP_TOKEN
-  };
-  if (Object.values(env).some((v) => !v)) {
-    throw new Error("Required environment variables are not set.");
+  const notificationService = cliNotifications;
+  const jsonFiles = await readdir(JSON_DIR);
+  const jsonFilePaths = jsonFiles.filter((file) => file.endsWith(".json")).map((file) => path.join(JSON_DIR, file));
+  for (const jsonFile of jsonFilePaths) {
+    console.log(`Processing: ${jsonFile}`);
+    await jsonToMarkdown(jsonFile);
   }
-  const notificationService = createPushoverService({
-    url: env.PUSHOVER_URL ?? "",
-    userKey: env.PUSHOVER_USER_KEY ?? "",
-    appToken: env.PUSHOVER_APP_TOKEN ?? ""
+  await notificationService.notifyInfo("update-raw-articles completed", {
+    caller: "update-raw-articles"
   });
-  try {
-    const jsonFiles = await readdir(JSON_DIR);
-    const jsonFilePaths = jsonFiles.filter((file) => file.endsWith(".json")).map((file) => path.join(JSON_DIR, file));
-    for (const jsonFile of jsonFilePaths) {
-      console.log(`Processing: ${jsonFile}`);
-      await jsonToMarkdown(jsonFile);
-    }
-    await notificationService.notifyInfo("update-raw-articles completed", {
-      caller: "update-raw-articles"
-    });
-  } catch (error) {
-    console.error("Error in main process:", error);
-    await notificationService.notifyError(
-      `update-raw-articles failed: ${String(error)}`,
-      {
-        caller: "update-raw-articles"
-      }
-    );
-    process.exit(1);
-  }
 }
-main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
+await runCli("update-raw-articles", main);

package/dist/validate-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/validate-json-articles.ts
 import fs from "node:fs";
@@ -117,6 +122,7 @@ async function main() {
         );
       }
     } catch (error) {
+      reportCliError(error, "validate-json-articles");
       if (error instanceof SyntaxError) {
         allIssues.push({
           file: fileName,
@@ -137,10 +143,7 @@ async function main() {
   displayResults(allIssues);
   const errorCount = allIssues.filter((i) => i.level === "error").length;
   if (errorCount > 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("validate-json-articles", main);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@s-hirano-ist/s-scripts",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "CLI scripts for s-private data operations",
   "engines": {
     "node": "26.x"
@@ -49,18 +49,20 @@
   },
   "license": "AGPL-3.0",
   "dependencies": {
-    "@aws-sdk/client-s3": "3.1163.0",
+    "@aws-sdk/client-s3": "3.1166.0",
     "@googleapis/books": "13.0.1",
     "@prisma/adapter-pg": "7.10.1",
     "@prisma/client-runtime-utils": "7.10.1",
     "@qdrant/js-client-rest": "1.20.0",
+    "@sentry/node": "11.12.0",
     "cheerio": "1.2.0",
     "js-yaml": "5.5.0",
-    "oxfmt": "0.76.0",
+    "oxfmt": "0.78.0",
+    "pino": "10.4.0",
     "sharp": "0.35.5",
     "turndown": "7.2.5",
     "uuid": "14.0.3",
-    "web-push": "3.6.7",
+    "web-push": "4.0.0",
     "zod": "4.6.7"
   },
   "publishConfig": {

package/dist/chunk-7PVU2Z32.js

@@ -1,71 +0,0 @@
-import { createRequire as __cliCreateRequire } from "node:module"; const require = __cliCreateRequire(import.meta.url);
-
-// ../notification/dist/errors.js
-var NotificationError = class extends Error {
-  constructor(message = "notificationSend") {
-    super(message);
-    this.name = "NotificationError";
-  }
-};
-
-// ../notification/dist/pushover.js
-var PushoverService = class {
-  config;
-  constructor(config) {
-    this.config = config;
-  }
-  /**
-   * Sends a message to the Pushover API.
-   *
-   * @param message - The message to send
-   * @param priority - The priority level (-1 = low, 0 = normal, 1 = high)
-   *
-   * @internal
-   */
-  async sendMessage(message, priority = 0) {
-    try {
-      const body = new URLSearchParams({
-        token: this.config.appToken,
-        user: this.config.userKey,
-        message,
-        priority: String(priority)
-      });
-      const result = await fetch(this.config.url, {
-        method: "POST",
-        headers: { "Content-Type": "application/x-www-form-urlencoded" },
-        body
-      });
-      if (!result.ok) {
-        throw new NotificationError();
-      }
-    } catch (error) {
-      if (error instanceof NotificationError) {
-        console.error(`[NotificationService] Failed to send notification: ${error.message}`);
-      } else {
-        console.error("[NotificationService] Unknown error occurred while sending notification:", error);
-      }
-    }
-  }
-  async notifyError(message, context) {
-    const enrichedMessage = `[ERROR] ${context.caller}: ${message}`;
-    await this.sendMessage(enrichedMessage, 1);
-  }
-  async notifyWarning(message, context) {
-    const enrichedMessage = `[WARN] ${context.caller}: ${message}`;
-    await this.sendMessage(enrichedMessage, 0);
-  }
-  async notifyInfo(message, context) {
-    const enrichedMessage = `[INFO] ${context.caller}: ${message}`;
-    await this.sendMessage(enrichedMessage, -1);
-  }
-};
-function createPushoverService(config) {
-  return new PushoverService(config);
-}
-
-// ../notification/dist/web-push.js
-import webPush from "web-push";
-
-export {
-  createPushoverService
-};