@ever-works/bluesky-connector-plugin 1.0.2 → 1.0.4

package/dist/index.cjs

@@ -257,10 +257,10 @@ var util;
     return void 0;
   };
   util2.isInteger = typeof Number.isInteger === "function" ? (val) => Number.isInteger(val) : (val) => typeof val === "number" && Number.isFinite(val) && Math.floor(val) === val;
-  function joinValues(array2, separator = " | ") {
+  function joinValues2(array2, separator = " | ") {
     return array2.map((val) => typeof val === "string" ? `'${val}'` : val).join(separator);
   }
-  util2.joinValues = joinValues;
+  util2.joinValues = joinValues2;
   util2.jsonStringifyReplacer = (_, value) => {
     if (typeof value === "bigint") {
       return value.toString();
@@ -1159,11 +1159,11 @@ var ZodString = class _ZodString extends ZodType {
           status.dirty();
         }
       } else if (check.kind === "length") {
-        const tooBig = input.data.length > check.value;
-        const tooSmall = input.data.length < check.value;
-        if (tooBig || tooSmall) {
+        const tooBig2 = input.data.length > check.value;
+        const tooSmall2 = input.data.length < check.value;
+        if (tooBig2 || tooSmall2) {
           ctx = this._getOrReturnCtx(input, ctx);
-          if (tooBig) {
+          if (tooBig2) {
             addIssueToContext(ctx, {
               code: ZodIssueCode.too_big,
               maximum: check.value,
@@ -1172,7 +1172,7 @@ var ZodString = class _ZodString extends ZodType {
               exact: true,
               message: check.message
             });
-          } else if (tooSmall) {
+          } else if (tooSmall2) {
             addIssueToContext(ctx, {
               code: ZodIssueCode.too_small,
               minimum: check.value,
@@ -1704,8 +1704,8 @@ var ZodNumber = class _ZodNumber extends ZodType {
           status.dirty();
         }
       } else if (check.kind === "min") {
-        const tooSmall = check.inclusive ? input.data < check.value : input.data <= check.value;
-        if (tooSmall) {
+        const tooSmall2 = check.inclusive ? input.data < check.value : input.data <= check.value;
+        if (tooSmall2) {
           ctx = this._getOrReturnCtx(input, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_small,
@@ -1718,8 +1718,8 @@ var ZodNumber = class _ZodNumber extends ZodType {
           status.dirty();
         }
       } else if (check.kind === "max") {
-        const tooBig = check.inclusive ? input.data > check.value : input.data >= check.value;
-        if (tooBig) {
+        const tooBig2 = check.inclusive ? input.data > check.value : input.data >= check.value;
+        if (tooBig2) {
           ctx = this._getOrReturnCtx(input, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_big,
@@ -1922,8 +1922,8 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
     const status = new ParseStatus();
     for (const check of this._def.checks) {
       if (check.kind === "min") {
-        const tooSmall = check.inclusive ? input.data < check.value : input.data <= check.value;
-        if (tooSmall) {
+        const tooSmall2 = check.inclusive ? input.data < check.value : input.data <= check.value;
+        if (tooSmall2) {
           ctx = this._getOrReturnCtx(input, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_small,
@@ -1935,8 +1935,8 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
           status.dirty();
         }
       } else if (check.kind === "max") {
-        const tooBig = check.inclusive ? input.data > check.value : input.data >= check.value;
-        if (tooBig) {
+        const tooBig2 = check.inclusive ? input.data > check.value : input.data >= check.value;
+        if (tooBig2) {
           ctx = this._getOrReturnCtx(input, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_big,
@@ -2350,13 +2350,13 @@ var ZodArray = class _ZodArray extends ZodType {
       return INVALID;
     }
     if (def2.exactLength !== null) {
-      const tooBig = ctx.data.length > def2.exactLength.value;
-      const tooSmall = ctx.data.length < def2.exactLength.value;
-      if (tooBig || tooSmall) {
+      const tooBig2 = ctx.data.length > def2.exactLength.value;
+      const tooSmall2 = ctx.data.length < def2.exactLength.value;
+      if (tooBig2 || tooSmall2) {
         addIssueToContext(ctx, {
-          code: tooBig ? ZodIssueCode.too_big : ZodIssueCode.too_small,
-          minimum: tooSmall ? def2.exactLength.value : void 0,
-          maximum: tooBig ? def2.exactLength.value : void 0,
+          code: tooBig2 ? ZodIssueCode.too_big : ZodIssueCode.too_small,
+          minimum: tooSmall2 ? def2.exactLength.value : void 0,
+          maximum: tooBig2 ? def2.exactLength.value : void 0,
           type: "array",
           inclusive: true,
           exact: true,
@@ -40847,6 +40847,7 @@ function isSafeWebhookUrl(rawUrl) {
   if (host.startsWith("[") && host.endsWith("]")) {
     host = host.slice(1, -1);
   }
+  host = host.replace(/\.+$/, "");
   if (CLOUD_METADATA_HOSTNAMES.has(host)) {
     return false;
   }
@@ -40876,23 +40877,69 @@ function isPrivateIPv4(ip) {
   if (a === 172 && b >= 16 && b <= 31) return true;
   if (a === 192 && b === 168) return true;
   if (a === 192 && b === 0 && parts[2] === 0) return true;
+  if (a === 198 && (b === 18 || b === 19)) return true;
+  if (a === 192 && b === 0 && parts[2] === 2) return true;
+  if (a === 198 && b === 51 && parts[2] === 100) return true;
+  if (a === 203 && b === 0 && parts[2] === 113) return true;
   if (a === 100 && b >= 64 && b <= 127) return true;
   if (a >= 224) return true;
   return false;
 }
-function isPrivateIPv6(ip) {
-  const lower = ip.toLowerCase();
-  if (lower === "::1" || lower === "::") return true;
-  if (lower.startsWith("fc") || lower.startsWith("fd")) return true;
-  const firstHextet = lower.split(":", 1)[0];
-  if (/^[0-9a-f]{1,4}$/.test(firstHextet)) {
-    const group0 = parseInt(firstHextet, 16);
-    if ((group0 & 65472) === 65152) return true;
-  }
-  if (lower.startsWith("::ffff:")) {
-    const v4 = lower.slice("::ffff:".length);
-    if (net.isIP(v4) === 4) return isPrivateIPv4(v4);
+function parseIPv6Groups(ip) {
+  let text = ip.trim().toLowerCase();
+  const zone = text.indexOf("%");
+  if (zone >= 0) text = text.slice(0, zone);
+  if (net.isIP(text) !== 6) return null;
+  const lastColon = text.lastIndexOf(":");
+  const tail = text.slice(lastColon + 1);
+  if (tail.includes(".")) {
+    if (net.isIP(tail) !== 4) return null;
+    const [a, b, c, d] = tail.split(".").map((part) => Number(part));
+    text = `${text.slice(0, lastColon + 1)}${(a << 8 | b).toString(16)}:${(c << 8 | d).toString(16)}`;
+  }
+  const halves = text.split("::");
+  if (halves.length > 2) return null;
+  const head = halves[0] ? halves[0].split(":") : [];
+  const rest = halves.length === 2 && halves[1] ? halves[1].split(":") : [];
+  const fill = halves.length === 2 ? 8 - head.length - rest.length : 0;
+  if (fill < 0) return null;
+  const groups = [...head, ...new Array(fill).fill("0"), ...rest].map((group) => parseInt(group, 16));
+  if (groups.length !== 8 || groups.some((group) => Number.isNaN(group) || group < 0 || group > 65535)) {
+    return null;
   }
+  return groups;
+}
+function ipv4FromGroups(high, low) {
+  return `${high >> 8}.${high & 255}.${low >> 8}.${low & 255}`;
+}
+function embeddedIPv4(ip) {
+  const g = parseIPv6Groups(ip);
+  if (!g) return null;
+  const zeros = (from3, to) => g.slice(from3, to).every((group) => group === 0);
+  if (zeros(0, 5) && g[5] === 65535) return ipv4FromGroups(g[6], g[7]);
+  if (zeros(0, 4) && g[4] === 65535 && g[5] === 0) return ipv4FromGroups(g[6], g[7]);
+  if (zeros(0, 6) && (g[6] !== 0 || g[7] > 1)) return ipv4FromGroups(g[6], g[7]);
+  if (g[0] === 100 && g[1] === 65435 && zeros(2, 6)) return ipv4FromGroups(g[6], g[7]);
+  if (g[0] === 8194) return ipv4FromGroups(g[1], g[2]);
+  if (g[0] === 8193 && g[1] === 0) return ipv4FromGroups(g[6] ^ 65535, g[7] ^ 65535);
+  return null;
+}
+function isPrivateIPv6(ip) {
+  const g = parseIPv6Groups(ip);
+  if (!g) {
+    const lower = ip.toLowerCase();
+    return lower === "::1" || lower === "::" || lower.startsWith("fc") || lower.startsWith("fd");
+  }
+  if (g.every((group) => group === 0)) return true;
+  if (g.slice(0, 7).every((group) => group === 0) && g[7] === 1) return true;
+  if ((g[0] & 65024) === 64512) return true;
+  if ((g[0] & 65472) === 65152) return true;
+  if ((g[0] & 65472) === 65216) return true;
+  if ((g[0] & 65280) === 65280) return true;
+  if (g[0] === 8193 && g[1] === 3512) return true;
+  if (g[0] === 100 && g[1] === 65435 && g[2] === 1) return true;
+  const v4 = embeddedIPv4(ip);
+  if (v4 && isPrivateIPv4(v4)) return true;
   return false;
 }
 

package/dist/index.js

@@ -249,10 +249,10 @@ var util;
     return void 0;
   };
   util2.isInteger = typeof Number.isInteger === "function" ? (val) => Number.isInteger(val) : (val) => typeof val === "number" && Number.isFinite(val) && Math.floor(val) === val;
-  function joinValues(array2, separator = " | ") {
+  function joinValues2(array2, separator = " | ") {
     return array2.map((val) => typeof val === "string" ? `'${val}'` : val).join(separator);
   }
-  util2.joinValues = joinValues;
+  util2.joinValues = joinValues2;
   util2.jsonStringifyReplacer = (_, value) => {
     if (typeof value === "bigint") {
       return value.toString();
@@ -1151,11 +1151,11 @@ var ZodString = class _ZodString extends ZodType {
           status.dirty();
         }
       } else if (check.kind === "length") {
-        const tooBig = input.data.length > check.value;
-        const tooSmall = input.data.length < check.value;
-        if (tooBig || tooSmall) {
+        const tooBig2 = input.data.length > check.value;
+        const tooSmall2 = input.data.length < check.value;
+        if (tooBig2 || tooSmall2) {
           ctx = this._getOrReturnCtx(input, ctx);
-          if (tooBig) {
+          if (tooBig2) {
             addIssueToContext(ctx, {
               code: ZodIssueCode.too_big,
               maximum: check.value,
@@ -1164,7 +1164,7 @@ var ZodString = class _ZodString extends ZodType {
               exact: true,
               message: check.message
             });
-          } else if (tooSmall) {
+          } else if (tooSmall2) {
             addIssueToContext(ctx, {
               code: ZodIssueCode.too_small,
               minimum: check.value,
@@ -1696,8 +1696,8 @@ var ZodNumber = class _ZodNumber extends ZodType {
           status.dirty();
         }
       } else if (check.kind === "min") {
-        const tooSmall = check.inclusive ? input.data < check.value : input.data <= check.value;
-        if (tooSmall) {
+        const tooSmall2 = check.inclusive ? input.data < check.value : input.data <= check.value;
+        if (tooSmall2) {
           ctx = this._getOrReturnCtx(input, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_small,
@@ -1710,8 +1710,8 @@ var ZodNumber = class _ZodNumber extends ZodType {
           status.dirty();
         }
       } else if (check.kind === "max") {
-        const tooBig = check.inclusive ? input.data > check.value : input.data >= check.value;
-        if (tooBig) {
+        const tooBig2 = check.inclusive ? input.data > check.value : input.data >= check.value;
+        if (tooBig2) {
           ctx = this._getOrReturnCtx(input, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_big,
@@ -1914,8 +1914,8 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
     const status = new ParseStatus();
     for (const check of this._def.checks) {
       if (check.kind === "min") {
-        const tooSmall = check.inclusive ? input.data < check.value : input.data <= check.value;
-        if (tooSmall) {
+        const tooSmall2 = check.inclusive ? input.data < check.value : input.data <= check.value;
+        if (tooSmall2) {
           ctx = this._getOrReturnCtx(input, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_small,
@@ -1927,8 +1927,8 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
           status.dirty();
         }
       } else if (check.kind === "max") {
-        const tooBig = check.inclusive ? input.data > check.value : input.data >= check.value;
-        if (tooBig) {
+        const tooBig2 = check.inclusive ? input.data > check.value : input.data >= check.value;
+        if (tooBig2) {
           ctx = this._getOrReturnCtx(input, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_big,
@@ -2342,13 +2342,13 @@ var ZodArray = class _ZodArray extends ZodType {
       return INVALID;
     }
     if (def2.exactLength !== null) {
-      const tooBig = ctx.data.length > def2.exactLength.value;
-      const tooSmall = ctx.data.length < def2.exactLength.value;
-      if (tooBig || tooSmall) {
+      const tooBig2 = ctx.data.length > def2.exactLength.value;
+      const tooSmall2 = ctx.data.length < def2.exactLength.value;
+      if (tooBig2 || tooSmall2) {
         addIssueToContext(ctx, {
-          code: tooBig ? ZodIssueCode.too_big : ZodIssueCode.too_small,
-          minimum: tooSmall ? def2.exactLength.value : void 0,
-          maximum: tooBig ? def2.exactLength.value : void 0,
+          code: tooBig2 ? ZodIssueCode.too_big : ZodIssueCode.too_small,
+          minimum: tooSmall2 ? def2.exactLength.value : void 0,
+          maximum: tooBig2 ? def2.exactLength.value : void 0,
           type: "array",
           inclusive: true,
           exact: true,
@@ -40839,6 +40839,7 @@ function isSafeWebhookUrl(rawUrl) {
   if (host.startsWith("[") && host.endsWith("]")) {
     host = host.slice(1, -1);
   }
+  host = host.replace(/\.+$/, "");
   if (CLOUD_METADATA_HOSTNAMES.has(host)) {
     return false;
   }
@@ -40868,23 +40869,69 @@ function isPrivateIPv4(ip) {
   if (a === 172 && b >= 16 && b <= 31) return true;
   if (a === 192 && b === 168) return true;
   if (a === 192 && b === 0 && parts[2] === 0) return true;
+  if (a === 198 && (b === 18 || b === 19)) return true;
+  if (a === 192 && b === 0 && parts[2] === 2) return true;
+  if (a === 198 && b === 51 && parts[2] === 100) return true;
+  if (a === 203 && b === 0 && parts[2] === 113) return true;
   if (a === 100 && b >= 64 && b <= 127) return true;
   if (a >= 224) return true;
   return false;
 }
-function isPrivateIPv6(ip) {
-  const lower = ip.toLowerCase();
-  if (lower === "::1" || lower === "::") return true;
-  if (lower.startsWith("fc") || lower.startsWith("fd")) return true;
-  const firstHextet = lower.split(":", 1)[0];
-  if (/^[0-9a-f]{1,4}$/.test(firstHextet)) {
-    const group0 = parseInt(firstHextet, 16);
-    if ((group0 & 65472) === 65152) return true;
-  }
-  if (lower.startsWith("::ffff:")) {
-    const v4 = lower.slice("::ffff:".length);
-    if (isIP(v4) === 4) return isPrivateIPv4(v4);
+function parseIPv6Groups(ip) {
+  let text = ip.trim().toLowerCase();
+  const zone = text.indexOf("%");
+  if (zone >= 0) text = text.slice(0, zone);
+  if (isIP(text) !== 6) return null;
+  const lastColon = text.lastIndexOf(":");
+  const tail = text.slice(lastColon + 1);
+  if (tail.includes(".")) {
+    if (isIP(tail) !== 4) return null;
+    const [a, b, c, d] = tail.split(".").map((part) => Number(part));
+    text = `${text.slice(0, lastColon + 1)}${(a << 8 | b).toString(16)}:${(c << 8 | d).toString(16)}`;
+  }
+  const halves = text.split("::");
+  if (halves.length > 2) return null;
+  const head = halves[0] ? halves[0].split(":") : [];
+  const rest = halves.length === 2 && halves[1] ? halves[1].split(":") : [];
+  const fill = halves.length === 2 ? 8 - head.length - rest.length : 0;
+  if (fill < 0) return null;
+  const groups = [...head, ...new Array(fill).fill("0"), ...rest].map((group) => parseInt(group, 16));
+  if (groups.length !== 8 || groups.some((group) => Number.isNaN(group) || group < 0 || group > 65535)) {
+    return null;
   }
+  return groups;
+}
+function ipv4FromGroups(high, low) {
+  return `${high >> 8}.${high & 255}.${low >> 8}.${low & 255}`;
+}
+function embeddedIPv4(ip) {
+  const g = parseIPv6Groups(ip);
+  if (!g) return null;
+  const zeros = (from3, to) => g.slice(from3, to).every((group) => group === 0);
+  if (zeros(0, 5) && g[5] === 65535) return ipv4FromGroups(g[6], g[7]);
+  if (zeros(0, 4) && g[4] === 65535 && g[5] === 0) return ipv4FromGroups(g[6], g[7]);
+  if (zeros(0, 6) && (g[6] !== 0 || g[7] > 1)) return ipv4FromGroups(g[6], g[7]);
+  if (g[0] === 100 && g[1] === 65435 && zeros(2, 6)) return ipv4FromGroups(g[6], g[7]);
+  if (g[0] === 8194) return ipv4FromGroups(g[1], g[2]);
+  if (g[0] === 8193 && g[1] === 0) return ipv4FromGroups(g[6] ^ 65535, g[7] ^ 65535);
+  return null;
+}
+function isPrivateIPv6(ip) {
+  const g = parseIPv6Groups(ip);
+  if (!g) {
+    const lower = ip.toLowerCase();
+    return lower === "::1" || lower === "::" || lower.startsWith("fc") || lower.startsWith("fd");
+  }
+  if (g.every((group) => group === 0)) return true;
+  if (g.slice(0, 7).every((group) => group === 0) && g[7] === 1) return true;
+  if ((g[0] & 65024) === 64512) return true;
+  if ((g[0] & 65472) === 65152) return true;
+  if ((g[0] & 65472) === 65216) return true;
+  if ((g[0] & 65280) === 65280) return true;
+  if (g[0] === 8193 && g[1] === 3512) return true;
+  if (g[0] === 100 && g[1] === 65435 && g[2] === 1) return true;
+  const v4 = embeddedIPv4(ip);
+  if (v4 && isPrivateIPv4(v4)) return true;
   return false;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ever-works/bluesky-connector-plugin",
-	"version": "1.0.2",
+	"version": "1.0.4",
 	"description": "Bluesky social connector plugin for Ever Works platform (outbound posts via the official @atproto/api SDK, and event-source pull of mentions/replies plus the account's own timeline into the event-ingest pipeline, with opt-in historical backfill)",
 	"author": {
 		"name": "Ever Co. LTD",
@@ -33,8 +33,8 @@
 	},
 	"dependencies": {
 		"@atproto/api": "^0.20.34",
-		"@ever-works/contracts": "^1.0.6",
-		"@ever-works/plugin": "^1.2.5"
+		"@ever-works/contracts": "^1.0.16",
+		"@ever-works/plugin": "^1.2.12"
 	},
 	"devDependencies": {
 		"@types/node": "^26.6.4",
@@ -101,8 +101,8 @@
 		"url": "https://github.com/ever-works/ever-works/issues"
 	},
 	"everworksRelease": {
-		"contentHash": "sha256:3b2e9b2f7e88dab55139549e9bca2ca2d9e108f8dc4835991dadf89c380a1409",
-		"commit": "19905c70cf05be3bc523db030597046067cd322a",
-		"source": "https://github.com/ever-works/ever-works/tree/19905c70cf05be3bc523db030597046067cd322a/packages/plugins/bluesky-connector"
+		"contentHash": "sha256:6ef090bdfddc9db024309a536d547a6dff05d3bdc41460c297f0f0bbce7883c1",
+		"commit": "4b0b642a5bf671c9b0480d49307c2c4442730f28",
+		"source": "https://github.com/ever-works/ever-works/tree/4b0b642a5bf671c9b0480d49307c2c4442730f28/packages/plugins/bluesky-connector"
 	}
 }