@reclaimprotocol/attestor-core 5.0.8 → 5.1.0-dev.1

package/lib/external-rpc/index.js

@@ -8427,22 +8427,233 @@ import {
 } from "esprima-next";
 import { JSONPath } from "jsonpath-plus";
 import { parse } from "parse5";
-import { adapter as htmlAdapter } from "parse5-htmlparser2-tree-adapter";
+
+// node_modules/parse5-htmlparser2-tree-adapter/dist/index.js
+import { html } from "parse5";
+function enquoteDoctypeId(id) {
+  const quote = id.includes('"') ? "'" : '"';
+  return quote + id + quote;
+}
+function serializeDoctypeContent(name, publicId, systemId) {
+  let str = "!DOCTYPE ";
+  if (name) {
+    str += name;
+  }
+  if (publicId) {
+    str += ` PUBLIC ${enquoteDoctypeId(publicId)}`;
+  } else if (systemId) {
+    str += " SYSTEM";
+  }
+  if (systemId) {
+    str += ` ${enquoteDoctypeId(systemId)}`;
+  }
+  return str;
+}
+var adapter = {
+  // Re-exports from domhandler
+  isCommentNode: isComment,
+  isElementNode: isTag2,
+  isTextNode: isText,
+  //Node construction
+  createDocument() {
+    const node = new Document([]);
+    node["x-mode"] = html.DOCUMENT_MODE.NO_QUIRKS;
+    return node;
+  },
+  createDocumentFragment() {
+    return new Document([]);
+  },
+  createElement(tagName, namespaceURI, attrs) {
+    const attribs = /* @__PURE__ */ Object.create(null);
+    const attribsNamespace = /* @__PURE__ */ Object.create(null);
+    const attribsPrefix = /* @__PURE__ */ Object.create(null);
+    for (let i = 0; i < attrs.length; i++) {
+      const attrName = attrs[i].name;
+      attribs[attrName] = attrs[i].value;
+      attribsNamespace[attrName] = attrs[i].namespace;
+      attribsPrefix[attrName] = attrs[i].prefix;
+    }
+    const node = new Element(tagName, attribs, []);
+    node.namespace = namespaceURI;
+    node["x-attribsNamespace"] = attribsNamespace;
+    node["x-attribsPrefix"] = attribsPrefix;
+    return node;
+  },
+  createCommentNode(data) {
+    return new Comment2(data);
+  },
+  createTextNode(value) {
+    return new Text2(value);
+  },
+  //Tree mutation
+  appendChild(parentNode, newNode) {
+    const prev = parentNode.children[parentNode.children.length - 1];
+    if (prev) {
+      prev.next = newNode;
+      newNode.prev = prev;
+    }
+    parentNode.children.push(newNode);
+    newNode.parent = parentNode;
+  },
+  insertBefore(parentNode, newNode, referenceNode) {
+    const insertionIdx = parentNode.children.indexOf(referenceNode);
+    const { prev } = referenceNode;
+    if (prev) {
+      prev.next = newNode;
+      newNode.prev = prev;
+    }
+    referenceNode.prev = newNode;
+    newNode.next = referenceNode;
+    parentNode.children.splice(insertionIdx, 0, newNode);
+    newNode.parent = parentNode;
+  },
+  setTemplateContent(templateElement, contentElement) {
+    adapter.appendChild(templateElement, contentElement);
+  },
+  getTemplateContent(templateElement) {
+    return templateElement.children[0];
+  },
+  setDocumentType(document, name, publicId, systemId) {
+    const data = serializeDoctypeContent(name, publicId, systemId);
+    let doctypeNode = document.children.find((node) => isDirective(node) && node.name === "!doctype");
+    if (doctypeNode) {
+      doctypeNode.data = data !== null && data !== void 0 ? data : null;
+    } else {
+      doctypeNode = new ProcessingInstruction("!doctype", data);
+      adapter.appendChild(document, doctypeNode);
+    }
+    doctypeNode["x-name"] = name;
+    doctypeNode["x-publicId"] = publicId;
+    doctypeNode["x-systemId"] = systemId;
+  },
+  setDocumentMode(document, mode) {
+    document["x-mode"] = mode;
+  },
+  getDocumentMode(document) {
+    return document["x-mode"];
+  },
+  detachNode(node) {
+    if (node.parent) {
+      const idx = node.parent.children.indexOf(node);
+      const { prev, next } = node;
+      node.prev = null;
+      node.next = null;
+      if (prev) {
+        prev.next = next;
+      }
+      if (next) {
+        next.prev = prev;
+      }
+      node.parent.children.splice(idx, 1);
+      node.parent = null;
+    }
+  },
+  insertText(parentNode, text) {
+    const lastChild = parentNode.children[parentNode.children.length - 1];
+    if (lastChild && isText(lastChild)) {
+      lastChild.data += text;
+    } else {
+      adapter.appendChild(parentNode, adapter.createTextNode(text));
+    }
+  },
+  insertTextBefore(parentNode, text, referenceNode) {
+    const prevNode = parentNode.children[parentNode.children.indexOf(referenceNode) - 1];
+    if (prevNode && isText(prevNode)) {
+      prevNode.data += text;
+    } else {
+      adapter.insertBefore(parentNode, adapter.createTextNode(text), referenceNode);
+    }
+  },
+  adoptAttributes(recipient, attrs) {
+    for (let i = 0; i < attrs.length; i++) {
+      const attrName = attrs[i].name;
+      if (recipient.attribs[attrName] === void 0) {
+        recipient.attribs[attrName] = attrs[i].value;
+        recipient["x-attribsNamespace"][attrName] = attrs[i].namespace;
+        recipient["x-attribsPrefix"][attrName] = attrs[i].prefix;
+      }
+    }
+  },
+  //Tree traversing
+  getFirstChild(node) {
+    return node.children[0];
+  },
+  getChildNodes(node) {
+    return node.children;
+  },
+  getParentNode(node) {
+    return node.parent;
+  },
+  getAttrList(element) {
+    return element.attributes;
+  },
+  //Node data
+  getTagName(element) {
+    return element.name;
+  },
+  getNamespaceURI(element) {
+    return element.namespace;
+  },
+  getTextNodeContent(textNode) {
+    return textNode.data;
+  },
+  getCommentNodeContent(commentNode) {
+    return commentNode.data;
+  },
+  getDocumentTypeNodeName(doctypeNode) {
+    var _a;
+    return (_a = doctypeNode["x-name"]) !== null && _a !== void 0 ? _a : "";
+  },
+  getDocumentTypeNodePublicId(doctypeNode) {
+    var _a;
+    return (_a = doctypeNode["x-publicId"]) !== null && _a !== void 0 ? _a : "";
+  },
+  getDocumentTypeNodeSystemId(doctypeNode) {
+    var _a;
+    return (_a = doctypeNode["x-systemId"]) !== null && _a !== void 0 ? _a : "";
+  },
+  //Node types
+  isDocumentTypeNode(node) {
+    return isDirective(node) && node.name === "!doctype";
+  },
+  // Source code location
+  setNodeSourceCodeLocation(node, location) {
+    if (location) {
+      node.startIndex = location.startOffset;
+      node.endIndex = location.endOffset;
+    }
+    node.sourceCodeLocation = location;
+  },
+  getNodeSourceCodeLocation(node) {
+    return node.sourceCodeLocation;
+  },
+  updateNodeSourceCodeLocation(node, endLocation) {
+    if (endLocation.endOffset != null)
+      node.endIndex = endLocation.endOffset;
+    node.sourceCodeLocation = {
+      ...node.sourceCodeLocation,
+      ...endLocation
+    };
+  }
+};
+
+// src/providers/http/utils.ts
+import RE2 from "re2";
 import xpath from "xpath";
-function extractHTMLElement(html, xpathExpression, contentsOnly) {
-  const { start, end } = extractHTMLElementIndex(html, xpathExpression, contentsOnly);
-  return html.slice(start, end);
+function extractHTMLElement(html2, xpathExpression, contentsOnly) {
+  const { start, end } = extractHTMLElementIndex(html2, xpathExpression, contentsOnly);
+  return html2.slice(start, end);
 }
-function extractHTMLElementIndex(html, xpathExpression, contentsOnly) {
-  return extractHTMLElementsIndexes(html, xpathExpression, contentsOnly)[0];
+function extractHTMLElementIndex(html2, xpathExpression, contentsOnly) {
+  return extractHTMLElementsIndexes(html2, xpathExpression, contentsOnly)[0];
 }
-function extractHTMLElementsIndexes(html, xpathExpression, contentsOnly) {
-  return extractHTMLElementIndexesParse5(html, xpathExpression, contentsOnly);
+function extractHTMLElementsIndexes(html2, xpathExpression, contentsOnly) {
+  return extractHTMLElementIndexesParse5(html2, xpathExpression, contentsOnly);
 }
-function extractHTMLElementIndexesParse5(html, xpathExpression, contentsOnly) {
+function extractHTMLElementIndexesParse5(html2, xpathExpression, contentsOnly) {
   const domLight = parse(
-    html,
-    { treeAdapter: htmlAdapter, sourceCodeLocationInfo: true }
+    html2,
+    { treeAdapter: adapter, sourceCodeLocationInfo: true }
   );
   domLight["name"] = "root";
   const parsedPath = xpath.parse(xpathExpression);
@@ -8594,16 +8805,8 @@ function parseHttpResponse(buff) {
   parser.streamEnded();
   return parser.res;
 }
-var RE2;
-import("re2").then((m) => {
-  RE2 = m.default;
-}).catch(() => {
-});
 function makeRegex(str) {
-  if (RE2) {
-    return RE2(str, "sgiu");
-  }
-  return new RegExp(str, "sgiu");
+  return RE2(str, "sgiu");
 }
 var TEMPLATE_START_CHARCODE = "{".charCodeAt(0);
 var TEMPLATE_END_CHARCODE = "}".charCodeAt(0);

package/lib/index.js

@@ -6736,15 +6736,241 @@ import {
 } from "esprima-next";
 import { JSONPath } from "jsonpath-plus";
 import { parse } from "parse5";
-import { adapter as htmlAdapter } from "parse5-htmlparser2-tree-adapter";
+
+// node_modules/parse5-htmlparser2-tree-adapter/dist/index.js
+import { html } from "parse5";
+function enquoteDoctypeId(id) {
+  const quote = id.includes('"') ? "'" : '"';
+  return quote + id + quote;
+}
+function serializeDoctypeContent(name, publicId, systemId) {
+  let str = "!DOCTYPE ";
+  if (name) {
+    str += name;
+  }
+  if (publicId) {
+    str += ` PUBLIC ${enquoteDoctypeId(publicId)}`;
+  } else if (systemId) {
+    str += " SYSTEM";
+  }
+  if (systemId) {
+    str += ` ${enquoteDoctypeId(systemId)}`;
+  }
+  return str;
+}
+var adapter = {
+  // Re-exports from domhandler
+  isCommentNode: isComment,
+  isElementNode: isTag2,
+  isTextNode: isText,
+  //Node construction
+  createDocument() {
+    const node = new Document([]);
+    node["x-mode"] = html.DOCUMENT_MODE.NO_QUIRKS;
+    return node;
+  },
+  createDocumentFragment() {
+    return new Document([]);
+  },
+  createElement(tagName, namespaceURI, attrs) {
+    const attribs = /* @__PURE__ */ Object.create(null);
+    const attribsNamespace = /* @__PURE__ */ Object.create(null);
+    const attribsPrefix = /* @__PURE__ */ Object.create(null);
+    for (let i = 0; i < attrs.length; i++) {
+      const attrName = attrs[i].name;
+      attribs[attrName] = attrs[i].value;
+      attribsNamespace[attrName] = attrs[i].namespace;
+      attribsPrefix[attrName] = attrs[i].prefix;
+    }
+    const node = new Element(tagName, attribs, []);
+    node.namespace = namespaceURI;
+    node["x-attribsNamespace"] = attribsNamespace;
+    node["x-attribsPrefix"] = attribsPrefix;
+    return node;
+  },
+  createCommentNode(data) {
+    return new Comment2(data);
+  },
+  createTextNode(value) {
+    return new Text2(value);
+  },
+  //Tree mutation
+  appendChild(parentNode, newNode) {
+    const prev = parentNode.children[parentNode.children.length - 1];
+    if (prev) {
+      prev.next = newNode;
+      newNode.prev = prev;
+    }
+    parentNode.children.push(newNode);
+    newNode.parent = parentNode;
+  },
+  insertBefore(parentNode, newNode, referenceNode) {
+    const insertionIdx = parentNode.children.indexOf(referenceNode);
+    const { prev } = referenceNode;
+    if (prev) {
+      prev.next = newNode;
+      newNode.prev = prev;
+    }
+    referenceNode.prev = newNode;
+    newNode.next = referenceNode;
+    parentNode.children.splice(insertionIdx, 0, newNode);
+    newNode.parent = parentNode;
+  },
+  setTemplateContent(templateElement, contentElement) {
+    adapter.appendChild(templateElement, contentElement);
+  },
+  getTemplateContent(templateElement) {
+    return templateElement.children[0];
+  },
+  setDocumentType(document, name, publicId, systemId) {
+    const data = serializeDoctypeContent(name, publicId, systemId);
+    let doctypeNode = document.children.find((node) => isDirective(node) && node.name === "!doctype");
+    if (doctypeNode) {
+      doctypeNode.data = data !== null && data !== void 0 ? data : null;
+    } else {
+      doctypeNode = new ProcessingInstruction("!doctype", data);
+      adapter.appendChild(document, doctypeNode);
+    }
+    doctypeNode["x-name"] = name;
+    doctypeNode["x-publicId"] = publicId;
+    doctypeNode["x-systemId"] = systemId;
+  },
+  setDocumentMode(document, mode) {
+    document["x-mode"] = mode;
+  },
+  getDocumentMode(document) {
+    return document["x-mode"];
+  },
+  detachNode(node) {
+    if (node.parent) {
+      const idx = node.parent.children.indexOf(node);
+      const { prev, next } = node;
+      node.prev = null;
+      node.next = null;
+      if (prev) {
+        prev.next = next;
+      }
+      if (next) {
+        next.prev = prev;
+      }
+      node.parent.children.splice(idx, 1);
+      node.parent = null;
+    }
+  },
+  insertText(parentNode, text) {
+    const lastChild = parentNode.children[parentNode.children.length - 1];
+    if (lastChild && isText(lastChild)) {
+      lastChild.data += text;
+    } else {
+      adapter.appendChild(parentNode, adapter.createTextNode(text));
+    }
+  },
+  insertTextBefore(parentNode, text, referenceNode) {
+    const prevNode = parentNode.children[parentNode.children.indexOf(referenceNode) - 1];
+    if (prevNode && isText(prevNode)) {
+      prevNode.data += text;
+    } else {
+      adapter.insertBefore(parentNode, adapter.createTextNode(text), referenceNode);
+    }
+  },
+  adoptAttributes(recipient, attrs) {
+    for (let i = 0; i < attrs.length; i++) {
+      const attrName = attrs[i].name;
+      if (recipient.attribs[attrName] === void 0) {
+        recipient.attribs[attrName] = attrs[i].value;
+        recipient["x-attribsNamespace"][attrName] = attrs[i].namespace;
+        recipient["x-attribsPrefix"][attrName] = attrs[i].prefix;
+      }
+    }
+  },
+  //Tree traversing
+  getFirstChild(node) {
+    return node.children[0];
+  },
+  getChildNodes(node) {
+    return node.children;
+  },
+  getParentNode(node) {
+    return node.parent;
+  },
+  getAttrList(element) {
+    return element.attributes;
+  },
+  //Node data
+  getTagName(element) {
+    return element.name;
+  },
+  getNamespaceURI(element) {
+    return element.namespace;
+  },
+  getTextNodeContent(textNode) {
+    return textNode.data;
+  },
+  getCommentNodeContent(commentNode) {
+    return commentNode.data;
+  },
+  getDocumentTypeNodeName(doctypeNode) {
+    var _a;
+    return (_a = doctypeNode["x-name"]) !== null && _a !== void 0 ? _a : "";
+  },
+  getDocumentTypeNodePublicId(doctypeNode) {
+    var _a;
+    return (_a = doctypeNode["x-publicId"]) !== null && _a !== void 0 ? _a : "";
+  },
+  getDocumentTypeNodeSystemId(doctypeNode) {
+    var _a;
+    return (_a = doctypeNode["x-systemId"]) !== null && _a !== void 0 ? _a : "";
+  },
+  //Node types
+  isDocumentTypeNode(node) {
+    return isDirective(node) && node.name === "!doctype";
+  },
+  // Source code location
+  setNodeSourceCodeLocation(node, location) {
+    if (location) {
+      node.startIndex = location.startOffset;
+      node.endIndex = location.endOffset;
+    }
+    node.sourceCodeLocation = location;
+  },
+  getNodeSourceCodeLocation(node) {
+    return node.sourceCodeLocation;
+  },
+  updateNodeSourceCodeLocation(node, endLocation) {
+    if (endLocation.endOffset != null)
+      node.endIndex = endLocation.endOffset;
+    node.sourceCodeLocation = {
+      ...node.sourceCodeLocation,
+      ...endLocation
+    };
+  }
+};
+
+// src/providers/http/utils.ts
+import RE2 from "re2";
 import xpath from "xpath";
-function extractHTMLElementsIndexes(html, xpathExpression, contentsOnly) {
-  return extractHTMLElementIndexesParse5(html, xpathExpression, contentsOnly);
+function extractHTMLElement(html2, xpathExpression, contentsOnly) {
+  const { start, end } = extractHTMLElementIndex(html2, xpathExpression, contentsOnly);
+  return html2.slice(start, end);
+}
+function extractHTMLElements(html2, xpathExpression, contentsOnly) {
+  const indexes = extractHTMLElementsIndexes(html2, xpathExpression, contentsOnly);
+  const res = [];
+  for (const { start, end } of indexes) {
+    res.push(html2.slice(start, end));
+  }
+  return res;
+}
+function extractHTMLElementIndex(html2, xpathExpression, contentsOnly) {
+  return extractHTMLElementsIndexes(html2, xpathExpression, contentsOnly)[0];
+}
+function extractHTMLElementsIndexes(html2, xpathExpression, contentsOnly) {
+  return extractHTMLElementIndexesParse5(html2, xpathExpression, contentsOnly);
 }
-function extractHTMLElementIndexesParse5(html, xpathExpression, contentsOnly) {
+function extractHTMLElementIndexesParse5(html2, xpathExpression, contentsOnly) {
   const domLight = parse(
-    html,
-    { treeAdapter: htmlAdapter, sourceCodeLocationInfo: true }
+    html2,
+    { treeAdapter: adapter, sourceCodeLocationInfo: true }
   );
   domLight["name"] = "root";
   const parsedPath = xpath.parse(xpathExpression);
@@ -6769,6 +6995,9 @@ function getNodeRange(node, contentsOnly) {
     end: node.lastChild.endIndex
   };
 }
+function extractJSONValueIndex(json, jsonPath) {
+  return extractJSONValueIndexes(json, jsonPath)[0];
+}
 function extractJSONValueIndexes(json, jsonPath) {
   const pointers = JSONPath({
     path: jsonPath,
@@ -6893,16 +7122,8 @@ function parseHttpResponse(buff) {
   parser.streamEnded();
   return parser.res;
 }
-var RE2;
-import("re2").then((m) => {
-  RE2 = m.default;
-}).catch(() => {
-});
 function makeRegex(str) {
-  if (RE2) {
-    return RE2(str, "sgiu");
-  }
-  return new RegExp(str, "sgiu");
+  return RE2(str, "sgiu");
 }
 var TEMPLATE_START_CHARCODE = "{".charCodeAt(0);
 var TEMPLATE_END_CHARCODE = "}".charCodeAt(0);
@@ -8394,7 +8615,13 @@ export {
   ethersStructToPlainObject,
   extractApplicationDataFromTranscript,
   extractArrayBufferFromWsData,
+  extractHTMLElement,
+  extractHTMLElementIndex,
+  extractHTMLElements,
+  extractHTMLElementsIndexes,
   extractHandshakeFromTranscript,
+  extractJSONValueIndex,
+  extractJSONValueIndexes,
   extractRequestBufferFromTranscript,
   findIndexInUint8Array,
   generateRpcMessageId,

package/lib/providers/http/utils.d.ts

@@ -1,4 +1,5 @@
 import '../../providers/http/patch-parse5-tree.ts';
+import RE2 from 're2';
 import type { ArraySlice, CompleteTLSPacket, ProviderParams, Transcript } from '../../types/index.ts';
 import type { HttpRequest, HttpResponse } from '../../utils/index.ts';
 export type JSONIndex = {
@@ -63,7 +64,7 @@ export declare function convertResponsePosToAbsolutePos(pos: number, bodyStartId
  */
 export declare function getRedactionsForChunkHeaders(from: number, to: number, chunks?: ArraySlice[]): ArraySlice[];
 export declare function parseHttpResponse(buff: Uint8Array): HttpResponse;
-export declare function makeRegex(str: string): RegExp;
+export declare function makeRegex(str: string): RE2;
 /**
  * Try to match strings that contain templates like {{param}}
  * against redacted string that has *** instead of that param

package/lib/providers/index.d.ts

@@ -1,4 +1,5 @@
 import type { Provider, ProviderName } from '../types/index.ts';
+export { extractHTMLElement, extractHTMLElementIndex, extractHTMLElements, extractHTMLElementsIndexes, extractJSONValueIndex, extractJSONValueIndexes, } from '../providers/http/utils.ts';
 export declare const providers: {
     [T in ProviderName]: Provider<T>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reclaimprotocol/attestor-core",
-  "version": "5.0.8",
+  "version": "5.1.0-dev.1",
   "description": "",
   "type": "module",
   "imports": {
@@ -105,14 +105,12 @@
     "parse5": "^8.0.0",
     "parse5-htmlparser2-tree-adapter": "^8.0.0",
     "pino": "^9.14.0",
+    "re2": "^1.24.0",
     "serve-static": "^1.16.3",
     "snarkjs": "^0.7.6",
     "ws": "^8.20.0",
     "xpath": "^0.0.34"
   },
-  "optionalDependencies": {
-    "re2": "*"
-  },
   "devDependencies": {
     "@adiwajshing/eslint-config": "github:adiwajshing/eslint-config",
     "@commitlint/cli": "^17.8.1",
@@ -136,7 +134,6 @@
     "tsc-alias": "^1.8.17",
     "typechain": "^8.3.2",
     "typescript": "^5.9.3",
-    "re2": "^1.24.0",
     "whatwg-url": "^14.2.0",
     "yaml": "^2.8.3"
   },