dsh-search-plugin 0.2.0 → 0.2.1

package/lib/cidr.js

@@ -0,0 +1,36 @@
+/** Schemastery serializes this function for browser forms. Keep it closure-free. */
+export function validateCidr(rule) {
+    const [address, prefixText, ...extra] = rule.trim().split('/');
+    if (!address || !prefixText || extra.length || !/^(0|[1-9]\d*)$/.test(prefixText)) {
+        throw new Error(`Invalid CIDR: ${JSON.stringify(rule)}`);
+    }
+    let bytes;
+    if (address.includes(':')) {
+        if (!/^[\da-f:.]+$/i.test(address))
+            throw new Error(`Invalid IPv6 CIDR: ${JSON.stringify(rule)}`);
+        // URL uses the same IPv6 parser in Node and browsers, including embedded IPv4.
+        const normalized = new URL(`http://[${address}]/`).hostname.slice(1, -1);
+        const halves = normalized.split('::').map(part => part ? part.split(':') : []);
+        const groups = halves.length === 1 ? halves[0] : [...halves[0], ...Array(8 - halves[0].length - halves[1].length).fill('0'), ...halves[1]];
+        bytes = groups.flatMap(group => { const n = parseInt(group, 16); return [n >>> 8, n & 255]; });
+    }
+    else {
+        const parts = address.split('.');
+        if (parts.length !== 4 || parts.some(part => !/^(0|[1-9]\d{0,2})$/.test(part) || Number(part) > 255)) {
+            throw new Error(`Invalid IPv4 CIDR: ${JSON.stringify(rule)}`);
+        }
+        bytes = parts.map(Number);
+    }
+    const prefix = Number(prefixText);
+    if (prefix > bytes.length * 8)
+        throw new Error(`Invalid CIDR prefix: ${JSON.stringify(rule)}`);
+    if (bytes.some((byte, i) => (byte & (255 >>> Math.max(0, Math.min(8, prefix - i * 8)))) !== 0)) {
+        throw new Error(`CIDR must use its network base: ${JSON.stringify(rule)}`);
+    }
+    const embeddedV4 = bytes.length === 16 && bytes.slice(0, 10).every(b => b === 0)
+        && ((bytes[10] === 255 && bytes[11] === 255) || (bytes[10] === 0 && bytes[11] === 0));
+    if (embeddedV4 && bytes.some(Boolean) && !(bytes.slice(0, 15).every(b => b === 0) && bytes[15] === 1)) {
+        throw new Error(`Use an IPv4 CIDR for IPv4-mapped or compatible addresses: ${JSON.stringify(rule)}`);
+    }
+    return rule;
+}

package/lib/fetch.js

@@ -1,25 +1,14 @@
 import { lookup } from 'node:dns/promises';
 import { isIP } from 'node:net';
 import ipaddr from 'ipaddr.js';
+import { validateCidr } from './cidr.js';
 import { WebError } from '@deepseek-ai/dsh-web';
 import { HttpFetchProvider } from '@deepseek-ai/dsh-web-fetch-http';
 const bareHost = (host) => host.startsWith('[') && host.endsWith(']') ? host.slice(1, -1) : host;
 function parseCidr(rule) {
-    const [address, prefixText, ...extra] = rule.trim().split('/');
-    if (!address || !prefixText || extra.length || !/^(0|[1-9]\d*)$/.test(prefixText) || !isIP(address) || address.includes('%')) {
-        throw new Error(`Invalid CIDR: ${JSON.stringify(rule)}`);
-    }
+    const [address, prefixText] = validateCidr(rule).trim().split('/');
     const bytes = ipaddr.parse(address).toByteArray();
     const prefix = Number(prefixText);
-    if (prefix > bytes.length * 8)
-        throw new Error(`Invalid CIDR prefix: ${JSON.stringify(rule)}`);
-    // Requiring the network base catches accidental overly broad operator rules.
-    if (bytes.some((byte, i) => (byte & (255 >>> Math.max(0, Math.min(8, prefix - i * 8)))) !== 0)) {
-        throw new Error(`CIDR must use its network base: ${JSON.stringify(rule)}`);
-    }
-    if (bytes.length === 16 && isEmbeddedV4(bytes) && bytes.some(Boolean) && !(bytes.slice(0, 15).every(b => b === 0) && bytes[15] === 1)) {
-        throw new Error(`Use an IPv4 CIDR for IPv4-mapped or compatible addresses: ${JSON.stringify(rule)}`);
-    }
     return { bytes, prefix };
 }
 /** Validate explicit IPv4/IPv6 network CIDRs; no implicit private ranges are added. */

package/lib/index.js

@@ -1,6 +1,7 @@
 import Schema from '@deepseek-ai/schemastery';
 import { ConfiguredSearchProvider } from './connection.js';
-import { ConfiguredFetchProvider, validateCidrs } from './fetch.js';
+import { ConfiguredFetchProvider } from './fetch.js';
+import { validateCidr } from './cidr.js';
 export const name = 'dsh-search-plugin';
 export const inject = ['web'];
 export const Config = Schema.object({
@@ -8,11 +9,7 @@ export const Config = Schema.object({
     deepseekEndpoint: Schema.string().pattern(/^https?:\/\/[^\s]+$/).default('https://api.deepseek.com/v1/tools').volatile(),
     deepseekCredentialRef: Schema.string().pattern(/^[A-Za-z_][A-Za-z0-9_]*$/).default('DEEPSEEK_API_KEY').volatile(),
     deepseekCount: Schema.number().step(1).min(1).max(50).default(10).volatile(),
-    fetchAllowedCidrs: Schema.transform(Schema.array(Schema.string()), value => {
-        if (!validateCidrs(value))
-            throw new Error('Use valid IPv4 or IPv6 network CIDRs');
-        return value;
-    }, true).default([]).volatile(),
+    fetchAllowedCidrs: Schema.array(Schema.transform(Schema.string(), validateCidr, true)).default([]).volatile(),
     fetchTimeoutMs: Schema.number().step(1).min(1).default(30000).volatile(),
     fetchMaxResponseBytes: Schema.number().step(1).min(1).default(5000000).volatile(),
     fetchMaxContentChars: Schema.number().step(1).min(1).default(100000).volatile(),

package/lib/types/cidr.d.ts

@@ -0,0 +1,2 @@
+/** Schemastery serializes this function for browser forms. Keep it closure-free. */
+export declare function validateCidr(rule: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-search-plugin",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/urzz/dsh-search-plugin.git"