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

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.1.0",
+  "version": "4.3.0",
   "description": "CLI scripts for s-private data operations",
   "engines": {
     "node": "26.x"
@@ -49,19 +49,21 @@
   },
   "license": "AGPL-3.0",
   "dependencies": {
+    "@aws-sdk/client-s3": "3.1166.0",
     "@googleapis/books": "13.0.1",
-    "@prisma/adapter-pg": "7.10.0",
-    "@prisma/client-runtime-utils": "7.10.0",
-    "@qdrant/js-client-rest": "1.19.0",
+    "@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.4.2",
-    "minio": "8.0.7",
-    "oxfmt": "0.72.0",
+    "js-yaml": "5.5.0",
+    "oxfmt": "0.78.0",
+    "pino": "10.4.0",
     "sharp": "0.35.5",
-    "turndown": "7.2.4",
-    "uuid": "14.0.2",
-    "web-push": "3.6.7",
-    "zod": "4.6.5"
+    "turndown": "7.2.5",
+    "uuid": "14.0.3",
+    "web-push": "4.0.0",
+    "zod": "4.6.7"
   },
   "publishConfig": {
     "access": "public"

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
-};

package/dist/chunk-F4J6JBR4.js

@@ -1,115 +0,0 @@
-import { createRequire as __cliCreateRequire } from "node:module"; const require = __cliCreateRequire(import.meta.url);
-
-// ../storage/dist/src/client.js
-import { Client } from "minio";
-
-// ../storage/dist/src/cf-access-transport.js
-import * as https from "node:https";
-function createCfAccessTransport(config) {
-  if (!config?.clientId || !config.clientSecret) {
-    return void 0;
-  }
-  return {
-    request(options, ...rest) {
-      if (typeof options === "object" && !(options instanceof URL)) {
-        const headers = options.headers ?? {};
-        headers["CF-Access-Client-Id"] = config.clientId;
-        headers["CF-Access-Client-Secret"] = config.clientSecret;
-        options.headers = headers;
-      }
-      const request2 = https.request;
-      return request2(options, ...rest);
-    }
-  };
-}
-
-// ../storage/dist/src/client.js
-function createMinioClient(config, cfAccess) {
-  const resolved = config ?? {
-    endPoint: process.env.MINIO_HOST ?? "",
-    port: Number(process.env.MINIO_PORT),
-    useSSL: process.env.MINIO_USE_SSL === void 0 ? !["localhost", "127.0.0.1"].includes(process.env.MINIO_HOST ?? "") : process.env.MINIO_USE_SSL === "true",
-    accessKey: process.env.MINIO_ACCESS_KEY ?? "",
-    secretKey: process.env.MINIO_SECRET_KEY ?? ""
-  };
-  const resolvedCfAccess = cfAccess ?? {
-    clientId: process.env.CF_ACCESS_CLIENT_ID ?? "",
-    clientSecret: process.env.CF_ACCESS_CLIENT_SECRET ?? ""
-  };
-  const transport = resolved.useSSL ? createCfAccessTransport(resolvedCfAccess) : void 0;
-  if (resolved.useSSL && !transport) {
-    throw new Error("CF_ACCESS_CLIENT_ID and CF_ACCESS_CLIENT_SECRET are required when useSSL is true.");
-  }
-  return new Client({
-    endPoint: resolved.endPoint,
-    port: resolved.port,
-    useSSL: resolved.useSSL,
-    accessKey: resolved.accessKey,
-    secretKey: resolved.secretKey,
-    ...transport && { transport }
-  });
-}
-
-// ../storage/dist/index.js
-import { S3Error } from "minio";
-
-// ../storage/dist/src/errors.js
-var StorageOperationError = class extends Error {
-  context;
-  constructor(context, cause) {
-    super(`Storage ${context.operation} failed for ${context.objectKey}`, {
-      cause
-    });
-    this.name = "StorageOperationError";
-    this.context = context;
-  }
-};
-
-// ../storage/dist/src/storage-service.js
-function createStorageService(client, bucketName, pathConfig) {
-  function buildObjectKey(path, isThumbnail) {
-    return `${isThumbnail ? pathConfig.thumbnailPrefix : pathConfig.originalPrefix}/${path}`;
-  }
-  function wrapStorageError(operation, objectKey, isThumbnail, error) {
-    throw new StorageOperationError({ operation, objectKey, bucketName, isThumbnail }, error);
-  }
-  return {
-    async uploadImage(path, bytes, isThumbnail) {
-      const objKey = buildObjectKey(path, isThumbnail);
-      try {
-        await client.putObject(bucketName, objKey, Buffer.from(bytes));
-      } catch (error) {
-        wrapStorageError("uploadImage", objKey, isThumbnail, error);
-      }
-    },
-    async getImage(path, isThumbnail) {
-      const objKey = buildObjectKey(path, isThumbnail);
-      try {
-        return await client.getObject(bucketName, objKey);
-      } catch (error) {
-        return wrapStorageError("getImage", objKey, isThumbnail, error);
-      }
-    },
-    async getImageOrThrow(path, isThumbnail) {
-      const objKey = buildObjectKey(path, isThumbnail);
-      try {
-        await client.statObject(bucketName, objKey);
-      } catch (error) {
-        wrapStorageError("getImageOrThrow", objKey, isThumbnail, error);
-      }
-    },
-    async deleteImage(path, isThumbnail) {
-      const objKey = buildObjectKey(path, isThumbnail);
-      try {
-        await client.removeObject(bucketName, objKey);
-      } catch (error) {
-        wrapStorageError("deleteImage", objKey, isThumbnail, error);
-      }
-    }
-  };
-}
-
-export {
-  createMinioClient,
-  createStorageService
-};