@xapp/arachne-web-service 1.33.0 → 1.34.1

package/lib/services/readServicePages.js

@@ -0,0 +1,58 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readServicePages = readServicePages;
+/*! Copyright (c) 2026, XAPP AI */
+const arachne_utils_1 = require("@xapp/arachne-utils");
+const stentor_logger_1 = require("stentor-logger");
+const subpageDetection_1 = require("../utils/subpageDetection");
+/**
+ * Loads each target on its own tab, in order, and returns its text.
+ *
+ * A page that errors, times out or redirects off-site is skipped.  Pages are not started once the deadline is
+ * near.
+ */
+function readServicePages(props) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { openTab, homepageUrl, targets, toMarkdown, pageTimeoutMs, deadline, loaded } = props;
+        const pages = [];
+        for (const [index, target] of targets.entries()) {
+            if (target.kind === "homepage") {
+                continue;
+            }
+            const cached = loaded === null || loaded === void 0 ? void 0 : loaded.get(target.url);
+            if (cached !== undefined) {
+                pages.push({ url: target.url, kind: target.kind, markdown: toMarkdown(cached) });
+                continue;
+            }
+            const remaining = deadline - Date.now();
+            if (remaining < subpageDetection_1.MIN_SUBPAGE_BUDGET_MS) {
+                (0, stentor_logger_1.log)().info(`Service pages: budget exhausted, not reading ${targets.length - index} more page(s).`);
+                break;
+            }
+            const budget = Math.min(pageTimeoutMs, remaining);
+            // A fresh tab per page, so a navigation that outlives its budget is cancelled by closing the tab
+            const tab = (0, subpageDetection_1.createLazyTab)(openTab);
+            try {
+                const html = yield (0, arachne_utils_1.promiseWithTimeout)(budget, () => __awaiter(this, void 0, void 0, function* () { return (0, subpageDetection_1.loadSameSitePage)(yield tab.get(), target.url, homepageUrl, budget); }), `Service page ${target.url} exceeded its budget of ${budget}ms`);
+                pages.push({ url: target.url, kind: target.kind, markdown: toMarkdown(html) });
+            }
+            catch (e) {
+                (0, stentor_logger_1.log)().warn(`Service pages: skipping ${target.url}: ${e instanceof Error ? e.message : e}`);
+            }
+            finally {
+                yield tab.close();
+            }
+        }
+        return pages;
+    });
+}
+//# sourceMappingURL=readServicePages.js.map

package/lib/services/readServicePages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"readServicePages.js","sourceRoot":"","sources":["../../src/services/readServicePages.ts"],"names":[],"mappings":";;;;;;;;;;;AA0CA,4CAuCC;AAjFD,kCAAkC;AAClC,uDAAyD;AACzD,mDAAqC;AAErC,gEAA+G;AAgC/G;;;;;GAKG;AACH,SAAsB,gBAAgB,CAAC,KAA4B;;QAC/D,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QAC7F,MAAM,KAAK,GAAsB,EAAE,CAAC;QAEpC,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YAC9C,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC7B,SAAS;YACb,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACvC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACvB,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACjF,SAAS;YACb,CAAC;YAED,MAAM,SAAS,GAAG,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACxC,IAAI,SAAS,GAAG,wCAAqB,EAAE,CAAC;gBACpC,IAAA,oBAAG,GAAE,CAAC,IAAI,CAAC,gDAAgD,OAAO,CAAC,MAAM,GAAG,KAAK,gBAAgB,CAAC,CAAC;gBACnG,MAAM;YACV,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;YAClD,iGAAiG;YACjG,MAAM,GAAG,GAAG,IAAA,gCAAa,EAAC,OAAO,CAAC,CAAC;YACnC,IAAI,CAAC;gBACD,MAAM,IAAI,GAAG,MAAM,IAAA,kCAAkB,EACjC,MAAM,EACN,GAAS,EAAE,gDAAC,OAAA,IAAA,mCAAgB,EAAC,MAAM,GAAG,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,CAAC,CAAA,GAAA,EAC9E,gBAAgB,MAAM,CAAC,GAAG,2BAA2B,MAAM,IAAI,CAClE,CAAC;gBACF,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACnF,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,IAAA,oBAAG,GAAE,CAAC,IAAI,CAAC,2BAA2B,MAAM,CAAC,GAAG,KAAK,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC/F,CAAC;oBAAS,CAAC;gBACP,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;YACtB,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CAAA"}

package/lib/services/selectServicePages.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Why a page was picked, in priority order: the homepage, pages that describe services, about/FAQ/financing/careers
+ * pages (which name licences and brands), service-area pages and brand pages.
+ */
+export type ServicePageKind = "homepage" | "service" | "about" | "area" | "brand";
+export interface ServicePage {
+    url: string;
+    kind: ServicePageKind;
+}
+export interface SelectServicePagesOptions {
+    /**
+     * Most pages to return, homepage included.  Default `DEFAULT_MAX_SERVICE_PAGES`.
+     */
+    maxPages?: number;
+    /**
+     * Pages already discovered elsewhere, e.g. from the sitemap.  Added when the homepage does not link them.
+     */
+    known?: {
+        aboutUs?: string;
+        faqPage?: string;
+    };
+}
+export declare const DEFAULT_MAX_SERVICE_PAGES = 12;
+/**
+ * Picks the same-site pages worth reading for the services a business offers.
+ *
+ * The homepage comes first and counts against `maxPages`.  When there are more candidates than room, one about,
+ * one service-area and one brand page are kept (while services keep at least half the room) and the rest goes to
+ * service pages, breadth first.
+ *
+ * @param html The homepage HTML
+ * @param homepageUrl The homepage URL, also the base for relative links
+ */
+export declare function selectServicePages(html: string, homepageUrl: string, options?: SelectServicePagesOptions): ServicePage[];

package/lib/services/selectServicePages.js

@@ -0,0 +1,177 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_MAX_SERVICE_PAGES = void 0;
+exports.selectServicePages = selectServicePages;
+/*! Copyright (c) 2026, XAPP AI */
+const cheerio = __importStar(require("cheerio"));
+const subpageDetection_1 = require("../utils/subpageDetection");
+exports.DEFAULT_MAX_SERVICE_PAGES = 12;
+const KIND_ORDER = ["homepage", "service", "about", "area", "brand"];
+const FILE = /\.(pdf|jpe?g|png|gif|svg|webp|docx?|xlsx?|zip|mp3|mp4|mov)$/i;
+const SKIP = /\/(\d{4})\/|(^|[/_-])(blog|news|articles?|posts?|tags?|category|author|feed|wp-|privacy|terms|legal|accessibility|sitemap|login|account|cart|checkout|contact|reviews?|testimonials|gallery|coupons?|specials|promotions?)([/_-]|$)/i;
+const AREA = /service[\s_-]?areas?|areas?[\s_-]we[\s_-]serve|locations?|cities|communities|counties|where[\s_-]we[\s_-]work|serving[\s_-]/i;
+const BRAND = /brands?|manufacturers?|products|equipment|dealer/i;
+const ABOUT = /about|our[\s_-]story|who[\s_-]we[\s_-]are|faqs?\b|frequently|why[\s_-]|financing|warrant|guarantee|careers|join[\s_-]our/i;
+const SERVICE = /services?|what[\s_-]we[\s_-]do|repair|install|replac|maintenance|clean|remodel|inspection|hvac|heating|cooling|air[\s_-]condition|\bac\b|furnace|heat[\s_-]pump|boiler|duct|plumb|drain|sewer|water[\s_-]heater|tankless|leak|pipe|toilet|faucet|electric|panel|wiring|generator|ev[\s_-]charg|lighting|roof|gutter|siding|window|door|insulation|solar|pest|termite|lawn|landscap|tree|irrigation|sprinkler|pool|garage|fence|deck|concrete|paving|masonry|chimney|paint|floor|carpet|tile|kitchen|bath|handyman|appliance|mold|water[\s_-]damage|restoration|septic|well[\s_-]pump|pressure[\s_-]wash|junk|moving|locksmith|foundation|waterproof|drywall|cabinet|countertop/i;
+function siteKey(url) {
+    return `${url.hostname.toLowerCase().replace(/^www\./, "")}${url.pathname.replace(/\/+$/, "")}${url.search}`;
+}
+function classify(pathname, text) {
+    if (FILE.test(pathname) || SKIP.test(pathname)) {
+        return undefined;
+    }
+    let path = pathname;
+    try {
+        path = decodeURIComponent(pathname);
+    }
+    catch (_a) {
+        // keep it encoded
+    }
+    const subject = `${path} ${text}`;
+    if (AREA.test(subject)) {
+        return "area";
+    }
+    if (BRAND.test(subject)) {
+        return "brand";
+    }
+    if (ABOUT.test(subject)) {
+        return "about";
+    }
+    if (SERVICE.test(subject)) {
+        return "service";
+    }
+    return undefined;
+}
+/**
+ * Breadth over depth: shallower pages first, and within a depth one page per parent section before any section's
+ * second page.
+ */
+function breadthFirst(urls) {
+    var _a, _b;
+    const byDepth = new Map();
+    for (const url of urls) {
+        const segments = new URL(url).pathname.split("/").filter(Boolean);
+        const parent = segments.slice(0, -1).join("/");
+        const sections = (_a = byDepth.get(segments.length)) !== null && _a !== void 0 ? _a : new Map();
+        sections.set(parent, [...((_b = sections.get(parent)) !== null && _b !== void 0 ? _b : []), url]);
+        byDepth.set(segments.length, sections);
+    }
+    const ordered = [];
+    for (const d of [...byDepth.keys()].sort((a, b) => a - b)) {
+        const queues = [...byDepth.get(d).values()];
+        while (queues.some((q) => q.length > 0)) {
+            for (const queue of queues) {
+                const next = queue.shift();
+                if (next) {
+                    ordered.push(next);
+                }
+            }
+        }
+    }
+    return ordered;
+}
+/**
+ * Picks the same-site pages worth reading for the services a business offers.
+ *
+ * The homepage comes first and counts against `maxPages`.  When there are more candidates than room, one about,
+ * one service-area and one brand page are kept (while services keep at least half the room) and the rest goes to
+ * service pages, breadth first.
+ *
+ * @param html The homepage HTML
+ * @param homepageUrl The homepage URL, also the base for relative links
+ */
+function selectServicePages(html, homepageUrl, options = {}) {
+    var _a, _b, _c;
+    const maxPages = Math.max(1, (_a = options.maxPages) !== null && _a !== void 0 ? _a : exports.DEFAULT_MAX_SERVICE_PAGES);
+    const home = new URL(homepageUrl);
+    const seen = new Set([siteKey(home)]);
+    const candidates = {
+        service: [],
+        about: [],
+        area: [],
+        brand: [],
+    };
+    const consider = (href, text, forced) => {
+        if (!href || /^(mailto|tel|javascript):/i.test(href)) {
+            return;
+        }
+        let url;
+        try {
+            url = new URL(href, home);
+        }
+        catch (_a) {
+            return;
+        }
+        url.hash = "";
+        if (!(0, subpageDetection_1.isSameSite)(url.toString(), homepageUrl)) {
+            return;
+        }
+        const key = siteKey(url);
+        if (seen.has(key)) {
+            return;
+        }
+        const kind = forced !== null && forced !== void 0 ? forced : classify(url.pathname, text);
+        if (!kind || kind === "homepage") {
+            return;
+        }
+        seen.add(key);
+        candidates[kind].push(url.toString());
+    };
+    const $ = cheerio.load(html);
+    $("a[href]").each((_, el) => {
+        consider($(el).attr("href"), $(el).text().replace(/\s+/g, " ").trim());
+    });
+    consider((_b = options.known) === null || _b === void 0 ? void 0 : _b.aboutUs, "", "about");
+    consider((_c = options.known) === null || _c === void 0 ? void 0 : _c.faqPage, "", "about");
+    candidates.service = breadthFirst(candidates.service);
+    const budget = maxPages - 1;
+    const picked = [];
+    const take = (kind, count) => {
+        for (const url of candidates[kind].splice(0, Math.max(0, Math.min(count, budget - picked.length)))) {
+            picked.push({ url, kind });
+        }
+    };
+    const reserved = ["about", "area", "brand"]
+        .filter((kind) => candidates[kind].length > 0)
+        .slice(0, Math.floor(budget / 2));
+    take("service", budget - reserved.length);
+    reserved.forEach((kind) => take(kind, 1));
+    take("service", budget);
+    ["about", "area", "brand"].forEach((kind) => take(kind, budget));
+    picked.sort((a, b) => KIND_ORDER.indexOf(a.kind) - KIND_ORDER.indexOf(b.kind));
+    return [{ url: homepageUrl, kind: "homepage" }, ...picked];
+}
+//# sourceMappingURL=selectServicePages.js.map

package/lib/services/selectServicePages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"selectServicePages.js","sourceRoot":"","sources":["../../src/services/selectServicePages.ts"],"names":[],"mappings":"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"}

package/lib/taxonomy/ServiceTaxonomy.d.ts

@@ -103,13 +103,16 @@ export declare const SERVICE_TAXONOMY_V1: Taxonomy;
  * Lookups over a taxonomy: canonical slugs, aliases and the family a job is scored in.
  */
 export declare class ServiceTaxonomy {
-    private readonly taxonomy;
+    readonly definition: Taxonomy;
     readonly version: string;
     readonly jobs: TaxonomyJobEntry[];
     private readonly bySlug;
     private readonly families;
     private readonly trades;
-    constructor(taxonomy?: Taxonomy);
+    /**
+     * @param definition The taxonomy JSON, Service Taxonomy v1 by default
+     */
+    constructor(definition?: Taxonomy);
     job(slug: string): TaxonomyJobEntry | undefined;
     isFamily(slug: string): boolean;
     isTrade(slug: string): boolean;

package/lib/taxonomy/ServiceTaxonomy.js

@@ -14,14 +14,17 @@ exports.SERVICE_TAXONOMY_V1 = v1_json_1.default;
  * Lookups over a taxonomy: canonical slugs, aliases and the family a job is scored in.
  */
 class ServiceTaxonomy {
-    constructor(taxonomy = exports.SERVICE_TAXONOMY_V1) {
+    /**
+     * @param definition The taxonomy JSON, Service Taxonomy v1 by default
+     */
+    constructor(definition = exports.SERVICE_TAXONOMY_V1) {
         var _a, _b;
-        this.taxonomy = taxonomy;
-        this.version = taxonomy.version;
+        this.definition = definition;
+        this.version = definition.version;
         this.jobs = [];
         this.families = new Set();
         this.trades = new Set();
-        for (const trade of taxonomy.trades) {
+        for (const trade of definition.trades) {
             this.trades.add(trade.slug);
             for (const job of (_a = trade.jobs) !== null && _a !== void 0 ? _a : []) {
                 this.jobs.push(Object.assign(Object.assign({}, job), { trade: trade.slug }));
@@ -63,11 +66,11 @@ class ServiceTaxonomy {
         if (!candidate) {
             return undefined;
         }
-        candidate = (_a = this.taxonomy.aliases[candidate]) !== null && _a !== void 0 ? _a : candidate;
+        candidate = (_a = this.definition.aliases[candidate]) !== null && _a !== void 0 ? _a : candidate;
         if (!this.bySlug.has(candidate)) {
-            const prefix = Object.keys(this.taxonomy.alias_prefixes).find((p) => candidate.startsWith(p));
+            const prefix = Object.keys(this.definition.alias_prefixes).find((p) => candidate.startsWith(p));
             if (prefix) {
-                candidate = this.taxonomy.alias_prefixes[prefix] + candidate.slice(prefix.length);
+                candidate = this.definition.alias_prefixes[prefix] + candidate.slice(prefix.length);
             }
         }
         // Follow deprecations, guarding against a cycle

package/lib/taxonomy/ServiceTaxonomy.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceTaxonomy.js","sourceRoot":"","sources":["../../src/taxonomy/ServiceTaxonomy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ServiceTaxonomy.js","sourceRoot":"","sources":["../../src/taxonomy/ServiceTaxonomy.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xapp/arachne-web-service",
-    "version": "1.33.0",
+    "version": "1.34.1",
     "types": "lib/index",
     "main": "lib/index",
     "files": [