comfy-pr 0.2.19 → 0.2.24

package/src/fetchComfyRegistryNodes.ts

@@ -1,11 +1,11 @@
-import type { mockPublishedNodes } from "../mocks/mockPublishedNodes";
-import DIE from "@snomiao/die";
-import { fetchJson } from "./utils/fetchJson";
-
-export async function fetchCRNodes() {
-  const r = (await fetchJson<typeof mockPublishedNodes>(
-    "https://api.comfy.org/nodes?page=1&limit=99999999"
-  )) as typeof mockPublishedNodes;
-  r.totalPages === 1 || DIE("FAIL TO FETCH ALL NODES");
-  return r.nodes;
-}
+import type { mockPublishedNodes } from "../mocks/mockPublishedNodes";
+import DIE from "@snomiao/die";
+import { fetchJson } from "./utils/fetchJson";
+
+export async function fetchCRNodes() {
+  const r = (await fetchJson<typeof mockPublishedNodes>(
+    "https://api.comfy.org/nodes?page=1&limit=99999999"
+  )) as typeof mockPublishedNodes;
+  r.totalPages === 1 || DIE("FAIL TO FETCH ALL NODES");
+  return r.nodes;
+}

package/src/fetchCurrentGeoInfo.ts

@@ -1,6 +1,6 @@
-import { fetchJson } from "./utils/fetchJson";
-export async function fetchCurrentGeoInfo() {
-  const { query, city, iat, lon, countryCode, region, regionName } = (await fetchJson("http://ip-api.com/json")) as any;
-  const geo = { ip: query, city, iat, lon, countryCode, region, regionName };
-  return geo;
-}
+import { fetchJson } from "./utils/fetchJson";
+export async function fetchCurrentGeoInfo() {
+  const { query, city, iat, lon, countryCode, region, regionName } = (await fetchJson("http://ip-api.com/json")) as any;
+  const geo = { ip: query, city, iat, lon, countryCode, region, regionName };
+  return geo;
+}

package/src/fetchRelatedPullWithComments.ts

@@ -1,15 +1,15 @@
-import pMap from "p-map";
-import { fetchIssueComments } from "./gh/fetchIssueComments";
-import { matchRelatedPulls } from "./matchRelatedPulls";
-import type { GithubPullParsed } from "./parsePullsState";
-import { summaryLastPullComment } from "./summaryLastPullComment";
-/** @deprecated */
-export async function fetchRelatedPullWithComments(repository: string, pulls: GithubPullParsed[]) {
-  const relatedPulls = await matchRelatedPulls(pulls);
-  const relatedPullsWithComment = await pMap(relatedPulls, async (data) => {
-    const comments = await fetchIssueComments(repository, data.pull);
-    const lastText = summaryLastPullComment(comments);
-    return { ...data, comments, lastText };
-  });
-  return relatedPullsWithComment;
-}
+import pMap from "p-map";
+import { fetchIssueComments } from "./gh/fetchIssueComments";
+import { matchRelatedPulls } from "./matchRelatedPulls";
+import type { GithubPullParsed } from "./parsePullsState";
+import { summaryLastPullComment } from "./summaryLastPullComment";
+/** @deprecated */
+export async function fetchRelatedPullWithComments(repository: string, pulls: GithubPullParsed[]) {
+  const relatedPulls = await matchRelatedPulls(pulls);
+  const relatedPullsWithComment = await pMap(relatedPulls, async (data) => {
+    const comments = await fetchIssueComments(repository, data.pull);
+    const lastText = summaryLastPullComment(comments);
+    return { ...data, comments, lastText };
+  });
+  return relatedPullsWithComment;
+}

package/src/fetchRepoDescriptionMap.ts

@@ -1,15 +1,15 @@
-import { fromPairs } from "rambda";
-import { fetchCMNodes } from "./fetchCMNodes";
-
-
-export async function fetchRepoDescriptionMap() {
-  const nodeList = await fetchCMNodes();
-  const repoDescriptionMap = fromPairs(
-    nodeList.map((e) => [e.reference, e.description])
-  );
-  repoDescriptionMap["https://github.com/snomiao/ComfyNode-Registry-test"] =
-    "ComfyNode-Registry-test-description";
-
-  console.log("Fetched " + nodeList.length + " CustomNode descriptions");
-  return repoDescriptionMap;
-}
+import { fromPairs } from "rambda";
+import { fetchCMNodes } from "./fetchCMNodes";
+
+
+export async function fetchRepoDescriptionMap() {
+  const nodeList = await fetchCMNodes();
+  const repoDescriptionMap = fromPairs(
+    nodeList.map((e) => [e.reference, e.description])
+  );
+  repoDescriptionMap["https://github.com/snomiao/ComfyNode-Registry-test"] =
+    "ComfyNode-Registry-test-description";
+
+  console.log("Fetched " + nodeList.length + " CustomNode descriptions");
+  return repoDescriptionMap;
+}

package/src/followRuleSchema.ts

@@ -1,75 +1,76 @@
-import { $before, $fresh, $stale } from "@/packages/mongodb-pipeline-ts/$fresh";
-import { tryCatch } from "rambda";
-import { z } from "zod";
-
-const znot_include = z.object({ "not-include": z.string() }).transform((x) => ({ $nin: x["not-include"] }));
-const mString = z.string().transform((x) =>
-  tryCatch<string, string | RegExp>(
-    (x) => new RegExp(x) as RegExp,
-    (x) => x as string | RegExp,
-  )(x),
-);
-const zbefore = z
-  .object({ $before: z.coerce.date().or(z.string()).or(z.number()) })
-  .transform((x) => $before(x.$before));
-const zfresh = z.object({ $fresh: z.coerce.date().or(z.string()).or(z.number()) }).transform((x) => $fresh(x.$fresh));
-const mstale = z.object({ $stale: z.coerce.date().or(z.string()).or(z.number()) }).transform((x) => $stale(x.$stale));
-const mDate = z.date().or(zbefore).or(zfresh).or(mstale);
-const mAny = z.number().or(znot_include).or(mString).or(zbefore).or(zfresh);
-const mNumber = z
-  .number()
-  .or(z.object({ $gt: z.number() }))
-  .or(z.object({ $lt: z.number() }))
-  .or(z.object({ $eq: z.number() }))
-  .or(z.object({ $ne: z.number() }))
-  .or(z.object({ $gte: z.number() }))
-  .or(z.object({ $lte: z.number() }));
-export const zAddCommentAction = z
-  .object({
-    by: z.string(),
-    body: z.string(),
-  })
-  .strict();
-const zFollowUpRule = z.object({
-  name: z.string(),
-  $match: z
-    .object({
-      actived_at: mDate,
-      author_email: mString,
-      comments: mNumber,
-      created_at: mDate,
-      comments_author: mString,
-      head: mString,
-      lastwords: mString,
-      on_registry: z.boolean(),
-      ownername: mString,
-      state: z.enum(["OPEN", "CLOSED", "MERGED"]),
-      updated_at: mDate,
-      url: mString,
-    })
-    .strict()
-    .partial(),
-  action: z
-    .object({
-      "add-comment": zAddCommentAction,
-      "send-email": z
-        .object({
-          provider: z.string(),
-          from: z.string(),
-          to: z.string(),
-          subject: z.string(),
-          body: z.string(),
-        })
-        .strict(), // WARN: not implementd
-      "update-issue": z
-        .object({
-          tags: mAny,
-        })
-        .strict(),
-      // close: z.any(),
-    })
-    .partial()
-    .strict(),
-});
-// zPullsStatus
-export const zFollowUpRules = zFollowUpRule.array();
+import { $before, $fresh, $stale } from "@/packages/mongodb-pipeline-ts/$fresh";
+import { tryCatch } from "rambda";
+import { z } from "zod";
+
+const znot_include = z.object({ "not-include": z.string() }).transform((x) => ({ $nin: x["not-include"] }));
+const mString = z.string().transform((x) =>
+  tryCatch<string, string | RegExp>(
+    (x) => new RegExp(x) as RegExp,
+    (x) => x as string | RegExp,
+  )(x),
+);
+const zbefore = z
+  .object({ $before: z.coerce.date().or(z.string()).or(z.number()) })
+  .transform((x) => $before(x.$before));
+const zfresh = z.object({ $fresh: z.coerce.date().or(z.string()).or(z.number()) }).transform((x) => $fresh(x.$fresh));
+const mstale = z.object({ $stale: z.coerce.date().or(z.string()).or(z.number()) }).transform((x) => $stale(x.$stale));
+const mDate = z.date().or(zbefore).or(zfresh).or(mstale);
+const mAny = z.number().or(znot_include).or(mString).or(zbefore).or(zfresh);
+const mNumber = z
+  .number()
+  .or(z.object({ $gt: z.number() }))
+  .or(z.object({ $lt: z.number() }))
+  .or(z.object({ $eq: z.number() }))
+  .or(z.object({ $ne: z.number() }))
+  .or(z.object({ $gte: z.number() }))
+  .or(z.object({ $lte: z.number() }));
+export const zAddCommentAction = z
+  .object({
+    by: z.string(),
+    body: z.string(),
+  })
+  .strict();
+const zFollowUpRule = z.object({
+  name: z.string(),
+  $match: z
+    .object({
+      actived_at: mDate,
+      email: mString,
+      comments: mNumber,
+      created_at: mDate,
+      comments_author: mString,
+      head: mString,
+      lastwords: mString,
+      on_registry: z.boolean(),
+      nickName: mString,
+      ownername: mString,
+      state: z.enum(["OPEN", "CLOSED", "MERGED"]),
+      updated_at: mDate,
+      url: mString,
+    })
+    .strict()
+    .partial(),
+  action: z
+    .object({
+      "add-comment": zAddCommentAction,
+      "send-email": z
+        .object({
+          provider: z.string(),
+          from: z.string(),
+          to: z.string(),
+          subject: z.string(),
+          body: z.string(),
+        })
+        .strict(), // WARN: not implementd
+      "update-issue": z
+        .object({
+          tags: mAny,
+        })
+        .strict(),
+      // close: z.any(),
+    })
+    .strict()
+    .partial(),
+});
+// zPullsStatus
+export const zFollowUpRules = zFollowUpRule.array();

package/src/getActivatedShell.ts

@@ -1,18 +1,18 @@
-import { $ as zx } from "zx";
-import { getActivateCMD } from "./cli/getActivateCMD";
-
-if (import.meta.main) {
-  // await checkComfyActivated();
-  zx.verbose = true;
-  const $ = getActivatedShell();
-  const p = await $`comfy-cli --version`;
-  console.log(p.stdout);
-  // zx({ prefix:  })`comfy-cli --help`;
-}
-
-export function getActivatedShell() {
-  const activate = getActivateCMD();
-  return zx({
-    prefix: `echo Comfy CLI version: $(comfy-cli --version) || (apt-get install -y python3-venv && python -m venv .venv && ${activate} && pip install comfy-cli); `,
-  });
-}
+import { $ as zx } from "zx";
+import { getActivateCMD } from "./cli/getActivateCMD";
+
+if (import.meta.main) {
+  // await checkComfyActivated();
+  zx.verbose = true;
+  const $ = getActivatedShell();
+  const p = await $`comfy-cli --version`;
+  console.log(p.stdout);
+  // zx({ prefix:  })`comfy-cli --help`;
+}
+
+export function getActivatedShell() {
+  const activate = getActivateCMD();
+  return zx({
+    prefix: `echo Comfy CLI version: $(comfy-cli --version) || (apt-get install -y python3-venv && python -m venv .venv && ${activate} && pip install comfy-cli); `,
+  });
+}

package/src/getBranchWorkingDir.ts

@@ -1,16 +1,16 @@
-import { rm } from "fs/promises";
-import { getRepoWorkingDir } from "./getRepoWorkingDir";
-import { parseUrlRepoOwner } from "./parseOwnerRepo";
-
-export async function getBranchWorkingDir(
-  upstreamUrl: string,
-  forkUrl: string,
-  branch: string
-) {
-  const src = parseUrlRepoOwner(upstreamUrl);
-  const dir = getRepoWorkingDir(forkUrl);
-  const packageName = src.repo;
-  const cwd = `${dir}/${branch}/${packageName}`;
-  await rm(cwd, { recursive: true }).catch(() => null);
-  return cwd;
-}
+import { rm } from "fs/promises";
+import { getRepoWorkingDir } from "./getRepoWorkingDir";
+import { parseUrlRepoOwner } from "./parseOwnerRepo";
+
+export async function getBranchWorkingDir(
+  upstreamUrl: string,
+  forkUrl: string,
+  branch: string
+) {
+  const src = parseUrlRepoOwner(upstreamUrl);
+  const dir = getRepoWorkingDir(forkUrl);
+  const packageName = src.repo;
+  const cwd = `${dir}/${branch}/${packageName}`;
+  await rm(cwd, { recursive: true }).catch(() => null);
+  return cwd;
+}

package/src/getRepoWorkingDir.ts

@@ -1,6 +1,6 @@
-import { parseUrlRepoOwner } from "./parseOwnerRepo";
-
-export function getRepoWorkingDir(forkUrl: string) {
-  return `prs/${parseUrlRepoOwner(forkUrl).repo}`;
-}
+import { parseUrlRepoOwner } from "./parseOwnerRepo";
+
+export function getRepoWorkingDir(forkUrl: string) {
+  return `prs/${parseUrlRepoOwner(forkUrl).repo}`;
+}
   

package/src/ghUser.ts

@@ -1,6 +1,6 @@
-import { gh } from "./gh";
-
-export const ghUser = (await gh.users.getAuthenticated()).data;
-
-console.log("Fetch Current Github User...");
-console.log(`Current Github User: ${ghUser.login} <${ghUser.email}>`);
+import { gh } from "./gh";
+
+export const ghUser = (await gh.users.getAuthenticated()).data;
+
+console.log("Fetch Current Github User...");
+console.log(`Current Github User: ${ghUser.login} <${ghUser.email}>`);

package/src/index.ts

@@ -1,21 +1,22 @@
-#!/usr/bin/env bun
-import "dotenv/config";
-import { checkComfyActivated } from "./checkComfyActivated";
-import { initializeFollowRules } from "./initializeFollowRules";
-import { updateCNRepos } from "./updateCNRepos";
-import { runFollowRuleSet } from "./updateFollowRuleSet";
-import { updateSlackMessages } from "./updateSlackMessages";
-import { tLog } from "./utils/tLog";
-
-if (import.meta.main) {
-  await Promise.all([
-    // try send msgs that didn't send in last run
-    updateSlackMessages(),
-    checkComfyActivated(), // needed if make pr
-    updateCNRepos(),
-  ]);
-  await initializeFollowRules();
-  await tLog("runFollowRuleSet", runFollowRuleSet);
-  console.log("All done");
-  process.exit(0);
-}
+import "dotenv/config";
+import { checkComfyActivated } from "./checkComfyActivated";
+import { initializeFollowRules } from "./initializeFollowRules";
+import { updateAuthors } from "./updateAuthors";
+import { updateCNRepos } from "./updateCNRepos";
+import { runFollowRuleSet } from "./updateFollowRuleSet";
+import { updateSlackMessages } from "./updateSlackMessages";
+import { tLog } from "./utils/tLog";
+
+if (import.meta.main) {
+  await Promise.all([
+    // try send msgs that didn't send in last run
+    updateSlackMessages(),
+    checkComfyActivated(), // needed if make pr
+    updateCNRepos(),
+    updateAuthors(),
+  ]);
+  await initializeFollowRules();
+  await tLog("runFollowRuleSet", runFollowRuleSet);
+  console.log("All done");
+  process.exit(0);
+}

package/src/initializeFollowRules.ts

@@ -1,26 +1,26 @@
-import DIE from "@snomiao/die";
-import { readFile } from "fs/promises";
-import { FollowRuleSets } from "./FollowRules";
-
-if (import.meta.main) {
-  const followRules = await initializeFollowRules();
-  const ruleset = (await FollowRuleSets.findOne({ name: "default" })) ?? DIE("default ruleset not found");
-  if (!ruleset?.enabled) DIE("default ruleset not enabled");
-
-  console.log("initialized follow rules");
-}
-/**
- *
- * @author: snomiao <snomiao@gmail.com>
- */
-export async function initializeFollowRules() {
-  return await updateFollowRules("default", await readFile("./templates/follow-rules.yaml", "utf8"));
-}
-
-export async function updateFollowRules(name: string, rawRuleYaml: string) {
-  return (await FollowRuleSets.findOneAndUpdate(
-    { name },
-    { $setOnInsert: { yaml: rawRuleYaml, enabled: false } },
-    { upsert: true, returnDocument: "after" },
-  ))!;
-}
+import DIE from "@snomiao/die";
+import { readFile } from "fs/promises";
+import { FollowRuleSets } from "./FollowRules";
+
+if (import.meta.main) {
+  const followRules = await initializeFollowRules();
+  const ruleset = (await FollowRuleSets.findOne({ name: "default" })) ?? DIE("default ruleset not found");
+  if (!ruleset?.enabled) DIE("default ruleset not enabled");
+
+  console.log("initialized follow rules");
+}
+/**
+ *
+ * @author: snomiao <snomiao@gmail.com>
+ */
+export async function initializeFollowRules() {
+  return await updateFollowRules("default", await readFile("./templates/follow-rules.yaml", "utf8"));
+}
+
+export async function updateFollowRules(name: string, rawRuleYaml: string) {
+  return (await FollowRuleSets.findOneAndUpdate(
+    { name },
+    { $setOnInsert: { yaml: rawRuleYaml, enabled: false } },
+    { upsert: true, returnDocument: "after" },
+  ))!;
+}

package/src/makePublishBranch.ts

@@ -1,58 +1,58 @@
-import { readFile } from "fs/promises";
-import { dirname } from "path";
-import { GIT_USEREMAIL } from "./GIT_USEREMAIL";
-import { GIT_USERNAME } from "./GIT_USERNAME";
-import { $ } from "./cli/echoBunShell";
-import { getBranchWorkingDir } from "./getBranchWorkingDir";
-import { gh } from "./gh";
-import { parseUrlRepoOwner, stringifyGithubOrigin, stringifyGithubRepoUrl } from "./parseOwnerRepo";
-import { parseTitleBodyOfMarkdown } from "./parseTitleBodyOfMarkdown";
-
-/**
- * Clone from upstream
- * push to fork url
- * @param dir
- * @param upstreamUrl
- * @param origin
- * @returns
- */
-export async function makePublishcrBranch(upstreamUrl: string, forkUrl: Readonly<string>) {
-  const type = "publishcr" as const;
-
-  const origin = await stringifyGithubOrigin(parseUrlRepoOwner(forkUrl));
-  const branch = "publish";
-  const tmpl = await readFile("./templates/add-action.md", "utf8");
-  const { title, body } = parseTitleBodyOfMarkdown(tmpl);
-  const repo = parseUrlRepoOwner(origin);
-
-  if (await gh.repos.getBranch({ ...repo, branch }).catch(() => null)) {
-    console.log("Skip changes as branch existed: " + branch);
-    return { type, title, body, branch };
-  }
-
-  const cwd = await getBranchWorkingDir(upstreamUrl, forkUrl, branch);
-
-  const file = `${cwd}/.github/workflows/publish.yml`;
-  const publishYmlPath = "./templates/publish.yaml";
-
-  // commit & push changes
-  await $`
-git clone ${upstreamUrl} ${cwd}
-
-mkdir -p ${dirname(file)}
-cat ${publishYmlPath} > ${file}
-
-cd ${cwd}
-
-git config user.name ${GIT_USERNAME} && \
-git config user.email ${GIT_USEREMAIL} && \
-git checkout -b ${branch} && \
-git add . && \ 
-git commit -am "chore(${branch}): ${title}" && \
-git push "${origin}" ${branch}:${branch}
-    `;
-
-  const branchUrl = `${stringifyGithubRepoUrl(repo)}/tree/${branch}`;
-  console.log(`Branch Push OK: ${branchUrl}`);
-  return { type, title, body, branch };
-}
+import { readFile } from "fs/promises";
+import { dirname } from "path";
+import { GIT_USEREMAIL } from "./GIT_USEREMAIL";
+import { GIT_USERNAME } from "./GIT_USERNAME";
+import { $ } from "./cli/echoBunShell";
+import { getBranchWorkingDir } from "./getBranchWorkingDir";
+import { gh } from "./gh";
+import { parseUrlRepoOwner, stringifyGithubOrigin, stringifyGithubRepoUrl } from "./parseOwnerRepo";
+import { parseTitleBodyOfMarkdown } from "./parseTitleBodyOfMarkdown";
+
+/**
+ * Clone from upstream
+ * push to fork url
+ * @param dir
+ * @param upstreamUrl
+ * @param origin
+ * @returns
+ */
+export async function makePublishcrBranch(upstreamUrl: string, forkUrl: Readonly<string>) {
+  const type = "publishcr" as const;
+
+  const origin = await stringifyGithubOrigin(parseUrlRepoOwner(forkUrl));
+  const branch = "publish";
+  const tmpl = await readFile("./templates/add-action.md", "utf8");
+  const { title, body } = parseTitleBodyOfMarkdown(tmpl);
+  const repo = parseUrlRepoOwner(origin);
+
+  if (await gh.repos.getBranch({ ...repo, branch }).catch(() => null)) {
+    console.log("Skip changes as branch existed: " + branch);
+    return { type, title, body, branch };
+  }
+
+  const cwd = await getBranchWorkingDir(upstreamUrl, forkUrl, branch);
+
+  const file = `${cwd}/.github/workflows/publish.yml`;
+  const publishYmlPath = "./templates/publish.yaml";
+
+  // commit & push changes
+  await $`
+git clone ${upstreamUrl} ${cwd}
+
+mkdir -p ${dirname(file)}
+cat ${publishYmlPath} > ${file}
+
+cd ${cwd}
+
+git config user.name ${GIT_USERNAME} && \
+git config user.email ${GIT_USEREMAIL} && \
+git checkout -b ${branch} && \
+git add . && \ 
+git commit -am "chore(${branch}): ${title}" && \
+git push "${origin}" ${branch}:${branch}
+    `;
+
+  const branchUrl = `${stringifyGithubRepoUrl(repo)}/tree/${branch}`;
+  console.log(`Branch Push OK: ${branchUrl}`);
+  return { type, title, body, branch };
+}