comfy-pr 0.2.24 → 0.2.26

package/src/PushedBranch.ts

@@ -1,3 +1,3 @@
-import { makePublishcrBranch } from "./makePublishBranch";
-
-export type PushedBranch = Awaited<ReturnType<typeof makePublishcrBranch>>;
+import { makePublishcrBranch } from "./makePublishBranch";
+
+export type PushedBranch = Awaited<ReturnType<typeof makePublishcrBranch>>;

package/src/Totals.ts

@@ -1,9 +1,24 @@
-import { type Task } from "../packages/mongodb-pipeline-ts/Task";
-import { analyzeTotals } from "./analyzeTotals";
-import { db } from "./db";
-import { type AwaitedReturnType } from "./types/AwaitedReturnType";
-export type Totals = AwaitedReturnType<typeof analyzeTotals>;
-export const Totals = db.collection<{
-  today?: string;
-  totals?: Task<Totals>;
-}>("Totals");
+import { $pipeline } from "@/packages/mongodb-pipeline-ts/$pipeline";
+import { flatten } from "flat";
+import { sf } from "snoflow";
+import { type Task } from "../packages/mongodb-pipeline-ts/Task";
+import { analyzeTotals } from "./analyzeTotals";
+import { db } from "./db";
+import { type AwaitedReturnType } from "./types/AwaitedReturnType";
+export type Totals = AwaitedReturnType<typeof analyzeTotals>;
+export const Totals = db.collection<{
+  /** @deprecated use totals.mtime */
+  today?: string;
+  totals?: Task<Totals>;
+}>("Totals");
+if (import.meta.main) {
+  sf(
+    $pipeline(Totals)
+      .match({ "totals.data": { $exists: true } })
+      .set({ "totals.data.date": "$totals.mtime" })
+      .replaceRoot({ newRoot: "$totals.data" })
+      .aggregate(),
+  )
+    .map((e) => flatten(e) as { date: string } & Record<string, number>)
+    .toLog();
+}

package/src/TrackingPRs.ts

@@ -1,12 +1,12 @@
-import { db } from "./db";
-
-// 2) tracking the statuses of the PRs we've sent out (edited)
-// "status [open, closed, merged]",
-// "comments [int]",
-// "last active [date]",
-// "last updated [date]",
-
-export const TrackingPulls = db.collection("TrackingPulls");
-// bun --env-file .env.production.local src/dump.ts > dump.log
-if (import.meta.main) {
-}
+import { db } from "./db";
+
+// 2) tracking the statuses of the PRs we've sent out (edited)
+// "status [open, closed, merged]",
+// "comments [int]",
+// "last active [date]",
+// "last updated [date]",
+
+export const TrackingPulls = db.collection("TrackingPulls");
+// bun --env-file .env.production.local src/dump.ts > dump.log
+if (import.meta.main) {
+}

package/src/WorkerInstances.ts

@@ -1,89 +1,89 @@
-import { getMAC } from "@ctrl/mac-address";
-import { defer } from "lodash-es";
-import md5 from "md5";
-import type { WithId } from "mongodb";
-import { db } from "./db";
-import { fetchCurrentGeoInfo } from "./fetchCurrentGeoInfo";
-import { createInstanceId } from "./utils/createInstanceId";
-export type GeoInfo = Awaited<ReturnType<typeof fetchCurrentGeoInfo>>;
-export type WorkerInstance = {
-  /** id: rand */
-  id: string;
-  up: Date;
-  active: Date;
-  geo: GeoInfo;
-  workerId: string;
-  task?: string;
-};
-
-const k = "COMFY_PR_WorkerInstanceKey";
-type g = typeof globalThis & { [k]: any };
-function getWorkerInstanceId() {
-  // ensure only one instance
-  if (!(global as any as g)[k])
-    defer(async function () {
-      await Promise.all([postWorkerHeartBeatLoop(), watchWorkerInstancesLoop()]);
-    });
-  const instanceId = ((global as any as g)[k] ??= createInstanceId());
-  return instanceId;
-}
-export const WorkerInstances = db.collection<WorkerInstance>("WorkerInstances");
-await WorkerInstances.createIndex({ id: 1 }, { unique: true });
-await WorkerInstances.createIndex({ ip: 1 });
-export const _geoPromise = fetchCurrentGeoInfo(); // in background
-
-if (import.meta.main) {
-  console.log(await getWorkerInstance());
-}
-
-async function postWorkerHeartBeatLoop() {
-  // 30s heartbeat
-  while (true) {
-    await new Promise((r) => setTimeout(r, 30e3));
-    await getWorkerInstance();
-  }
-}
-
-async function watchWorkerInstancesLoop() {
-  const me = await getWorkerInstance();
-  console.log("[INIT] Worker instance " + me.id + " is up.");
-  for await (const event of WorkerInstances.watch([], {
-    fullDocument: "whenAvailable",
-  })) {
-    const { fullDocument: updated } = event as typeof event & {
-      fullDocument?: WithId<WorkerInstance>;
-    };
-    if (updated && updated.id !== me.id) {
-      console.log("Another worker is updated", updated);
-      if (+updated.up > +me.up && updated.task === me.task) {
-        console.log("[EXIT] I'm outdated, new instance is: " + updated.id);
-        process.exit(0);
-      }
-    }
-  }
-}
-
-export async function getWorkerInstance(task?: string) {
-  const id = getWorkerInstanceId();
-  if (task) {
-    console.log("Working on task: ", task);
-  }
-  return (await WorkerInstances.findOneAndUpdate(
-    { id },
-    {
-      $set: {
-        id,
-        active: new Date(),
-        workerId: getWorkerId(),
-        geo: await _geoPromise,
-        ...(task && { task }),
-      },
-      $setOnInsert: { up: new Date() },
-    },
-    { upsert: true, returnDocument: "after" },
-  ))!;
-}
-function getWorkerId() {
-  const hostname = process.env.HOSTNAME || process.env.COMPUTERNAME;
-  return md5(`SALT=v9yJQouMC22do66t ${hostname} ${getMAC()}`).slice(0, 8);
-}
+import { getMAC } from "@ctrl/mac-address";
+import { defer } from "lodash-es";
+import md5 from "md5";
+import type { WithId } from "mongodb";
+import { db } from "./db";
+import { fetchCurrentGeoInfo } from "./fetchCurrentGeoInfo";
+import { createInstanceId } from "./utils/createInstanceId";
+export type GeoInfo = Awaited<ReturnType<typeof fetchCurrentGeoInfo>>;
+export type WorkerInstance = {
+  /** id: rand */
+  id: string;
+  up: Date;
+  active: Date;
+  geo: GeoInfo;
+  workerId: string;
+  task?: string;
+};
+
+const k = "COMFY_PR_WorkerInstanceKey";
+type g = typeof globalThis & { [k]: any };
+function getWorkerInstanceId() {
+  // ensure only one instance
+  if (!(global as any as g)[k])
+    defer(async function () {
+      await Promise.all([postWorkerHeartBeatLoop(), watchWorkerInstancesLoop()]);
+    });
+  const instanceId = ((global as any as g)[k] ??= createInstanceId());
+  return instanceId;
+}
+export const WorkerInstances = db.collection<WorkerInstance>("WorkerInstances");
+await WorkerInstances.createIndex({ id: 1 }, { unique: true });
+await WorkerInstances.createIndex({ ip: 1 });
+export const _geoPromise = fetchCurrentGeoInfo(); // in background
+
+if (import.meta.main) {
+  console.log(await getWorkerInstance());
+}
+
+async function postWorkerHeartBeatLoop() {
+  // 30s heartbeat
+  while (true) {
+    await new Promise((r) => setTimeout(r, 30e3));
+    await getWorkerInstance();
+  }
+}
+
+async function watchWorkerInstancesLoop() {
+  const me = await getWorkerInstance();
+  console.log("[INIT] Worker instance " + me.id + " is up.");
+  for await (const event of WorkerInstances.watch([], {
+    fullDocument: "whenAvailable",
+  })) {
+    const { fullDocument: updated } = event as typeof event & {
+      fullDocument?: WithId<WorkerInstance>;
+    };
+    if (updated && updated.id !== me.id) {
+      console.log("Another worker is updated", updated);
+      if (+updated.up > +me.up && updated.task === me.task) {
+        console.log("[EXIT] I'm outdated, new instance is: " + updated.id);
+        process.exit(0);
+      }
+    }
+  }
+}
+
+export async function getWorkerInstance(task?: string) {
+  const id = getWorkerInstanceId();
+  if (task) {
+    console.log("Working on task: ", task);
+  }
+  return (await WorkerInstances.findOneAndUpdate(
+    { id },
+    {
+      $set: {
+        id,
+        active: new Date(),
+        workerId: getWorkerId(),
+        geo: await _geoPromise,
+        ...(task && { task }),
+      },
+      $setOnInsert: { up: new Date() },
+    },
+    { upsert: true, returnDocument: "after" },
+  ))!;
+}
+function getWorkerId() {
+  const hostname = process.env.HOSTNAME || process.env.COMPUTERNAME;
+  return md5(`SALT=v9yJQouMC22do66t ${hostname} ${getMAC()}`).slice(0, 8);
+}

package/src/addCommentAction.ts

@@ -1,65 +1,73 @@
-"use server";
-import { $elemMatch } from "@/packages/mongodb-pipeline-ts/$elemMatch";
-import { $pipeline } from "@/packages/mongodb-pipeline-ts/$pipeline";
-import { TaskDataOrNull, type Task } from "@/packages/mongodb-pipeline-ts/Task";
-import DIE from "@snomiao/die";
-import pMap from "p-map";
-import { CNRepos, type CRPull } from "./CNRepos";
-import { createIssueComment } from "./createIssueComment";
-import { $filaten } from "./db";
-import { ghUser } from "./ghUser";
-import type { GithubIssueComment } from "./GithubIssueComments";
-import { notifySlackLinks } from "./slack/notifySlackLinks";
-
-export async function addCommentAction({ matched, action, runAction, rule }: { matched: { state: "ok"; mtime: Date; data: { lastwords: string; email: string | ""; comments: number; head: string; on_registry: boolean; comments_author: string; ownername: string; nickName: string; repository: string; state: "OPEN" | "MERGED" | "CLOSED"; url: string; updated: string; pull_updated: string; repo_updated: string; }[]; } | { state: "error"; mtime: Date; error: string; }; action: { by: string; body: string; }; runAction: boolean; rule: { name: string; $match: { actived_at?: Date | { $lt: Date; } | { $gte: Date; } | { $not: { $gt: Date; }; } | undefined; email?: string | RegExp | undefined; comments?: number | { $gt: number; } | { $lt: number; } | { $eq: number; } | { $ne: number; } | { $gte: number; } | { $lte: number; } | undefined; created_at?: Date | { $lt: Date; } | { $gte: Date; } | { $not: { $gt: Date; }; } | undefined; comments_author?: string | RegExp | undefined; head?: string | RegExp | undefined; lastwords?: string | RegExp | undefined; on_registry?: boolean | undefined; nickName?: string | RegExp | undefined; ownername?: string | RegExp | undefined; state?: "OPEN" | "CLOSED" | "MERGED" | undefined; updated_at?: Date | { $lt: Date; } | { $gte: Date; } | { $not: { $gt: Date; }; } | undefined; url?: string | RegExp | undefined; }; action: { "add-comment"?: { by: string; body: string; } | undefined; "send-email"?: { body: string; provider: string; from: string; to: string; subject: string; } | undefined; "update-issue"?: { tags: string | number | RegExp | { $lt: Date; } | { $gte: Date; } | { $nin: string; }; } | undefined; }; }; }) {
-  return await pMap(
-    TaskDataOrNull(matched) ?? DIE("NO-PAYLOAD-AVAILABLE"),
-    async (payload) => {
-      const loadedAction = {
-        action: "add-comment",
-        url: payload.url,
-        by: action.by,
-        body: action.body.replace(
-          /{{\$(\w+)}}/,
-          (_, key: string) => (payload as any)[key] ||
-            DIE("Missing key: " + key + " in payload: " + JSON.stringify(payload))
-        ),
-      };
-
-      if (runAction && loadedAction.by === ghUser.login) {
-        const existedCommentsTask = (await $pipeline(CNRepos)
-          .unwind("$crPulls.data")
-          .match({ "crPulls.data.pull.html_url": loadedAction.url })
-          .with<{ "crPulls.data": CRPull; }>()
-          .replaceRoot({ newRoot: "$crPulls.data.comments" })
-          .as<Task<GithubIssueComment[]>>()
-          .aggregate()
-          .next()) ??
-          DIE("comments is not fetched before, plz check " + loadedAction.url + " in CNRepos");
-
-        const existedComments = TaskDataOrNull(existedCommentsTask) ??
-          DIE("NO-COMMENTS-FOUND should never happen here, bcz pipeline filtered at first");
-        const existedComment = existedComments.find((e) => e.body === loadedAction.body);
-
-        if (!existedComment) {
-          const { comments, comment } = await createIssueComment(
-            loadedAction.url,
-            loadedAction.body,
-            loadedAction.by
-          );
-          const updateResult = await CNRepos.updateOne(
-            $filaten({ crPulls: { data: $elemMatch({ pull: { html_url: loadedAction.url } }) } }),
-            { $set: { "crPulls.data.$.comments": comments } }
-          );
-          if (!updateResult.matchedCount) DIE("created issue not matched");
-          await notifySlackLinks("A New issue comment are created from rule " + rule.name, [
-            comment.html_url,
-          ]);
-        }
-      }
-
-      return loadedAction;
-    },
-    { concurrency: 1 }
-  );
-}
+"use server";
+import { $elemMatch } from "@/packages/mongodb-pipeline-ts/$elemMatch";
+import { $pipeline } from "@/packages/mongodb-pipeline-ts/$pipeline";
+import { TaskDataOrNull, type Task } from "@/packages/mongodb-pipeline-ts/Task";
+import DIE from "@snomiao/die";
+import pMap from "p-map";
+import type { z } from "zod";
+import type { PullStatusShown } from "./analyzePullsStatus";
+import { CNRepos, type CRPull } from "./CNRepos";
+import { createIssueComment } from "./createIssueComment";
+import { $filaten } from "./db";
+import type { zAddCommentAction } from "./followRuleSchema";
+import { ghUser } from "./ghUser";
+import type { GithubIssueComment } from "./GithubIssueComments";
+import { notifySlackLinks } from "./slack/notifySlackLinks";
+
+export async function addCommentAction({
+  matched,
+  action,
+  runAction,
+  rule,
+}: {
+  matched: Task<PullStatusShown[]>;
+  action: z.infer<typeof zAddCommentAction>;
+  runAction: boolean;
+  rule: { name: string };
+}) {
+  return await pMap(
+    TaskDataOrNull(matched) ?? DIE("NO-PAYLOAD-AVAILABLE"),
+    async (payload) => {
+      const loadedAction = {
+        action: "add-comment",
+        url: payload.url,
+        by: action.by,
+        body: action.body.replace(
+          /{{\$([_A-Za-z0-9]+)}}/g,
+          (_, key: string) =>
+            (payload as any)[key] || DIE("Missing key: " + key + " in payload: " + JSON.stringify(payload)),
+        ),
+      };
+
+      if (runAction && loadedAction.by === ghUser.login) {
+        const existedCommentsTask =
+          (await $pipeline(CNRepos)
+            .unwind("$crPulls.data")
+            .match({ "crPulls.data.pull.html_url": loadedAction.url })
+            .with<{ "crPulls.data": CRPull }>()
+            .replaceRoot({ newRoot: "$crPulls.data.comments" })
+            .as<Task<GithubIssueComment[]>>()
+            .aggregate()
+            .next()) ?? DIE("comments is not fetched before, plz check " + loadedAction.url + " in CNRepos");
+
+        const existedComments =
+          TaskDataOrNull(existedCommentsTask) ??
+          DIE("NO-COMMENTS-FOUND should never happen here, bcz pipeline filtered at first");
+        const existedComment = existedComments.find((e) => e.body === loadedAction.body);
+
+        if (!existedComment) {
+          const { comments, comment } = await createIssueComment(loadedAction.url, loadedAction.body, loadedAction.by);
+          const updateResult = await CNRepos.updateOne(
+            $filaten({ crPulls: { data: $elemMatch({ pull: { html_url: loadedAction.url } }) } }),
+            { $set: { "crPulls.data.$.comments": comments } },
+          );
+          if (!updateResult.matchedCount) DIE("created issue not matched");
+          await notifySlackLinks("A New issue comment are created from rule " + rule.name, [comment.html_url]);
+        }
+      }
+
+      return loadedAction;
+    },
+    { concurrency: 1 },
+  );
+}