@xapp/arachne-cli 1.10.7 → 1.10.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/crawl.js +41 -22
- package/lib/crawl.js.map +1 -1
- package/package.json +5 -5
package/lib/crawl.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/*! Copyright (c) 2023, XAPP AI */
|
|
2
2
|
/* eslint-disable no-console */
|
|
3
3
|
import { Arachne, ArachneURLPattern, autoScroll, enqueueLinks, MemoryRequestQueue, } from "@xapp/arachne";
|
|
4
|
-
import { ArachneJSONLD, ArachneHTMLtoText, isAnswer } from "@xapp/arachne-parsers";
|
|
4
|
+
import { ArachneJSONLD, ArachneHTMLtoText, isAnswer, DEFAULT_STRIP_TAGS } from "@xapp/arachne-parsers";
|
|
5
5
|
import { generateFollowThroughPattern } from "@xapp/arachne-utils";
|
|
6
6
|
import { URL } from "url";
|
|
7
7
|
import { existsSync, mkdirSync, writeFileSync, readFileSync } from "fs";
|
|
@@ -34,7 +34,7 @@ export async function crawl(argv) {
|
|
|
34
34
|
// make sure it is less than the timeout
|
|
35
35
|
const timeout = argv.o || 4000;
|
|
36
36
|
if (argv.b > timeout) {
|
|
37
|
-
throw new Error(`Settling time is greater than page handler timeout, please adjust your inputs. -o ${argv.b + 4000}
|
|
37
|
+
throw new Error(`Settling time is greater than page handler timeout, please adjust your inputs. -o ${argv.b + 4000}`);
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
let saveDir;
|
|
@@ -53,7 +53,11 @@ export async function crawl(argv) {
|
|
|
53
53
|
maxCrawlAttempts: argv.m,
|
|
54
54
|
pageHandlerTimeout: argv.o,
|
|
55
55
|
stealth: argv.s,
|
|
56
|
-
launchOptions: {
|
|
56
|
+
launchOptions: {
|
|
57
|
+
headless: argv.h,
|
|
58
|
+
timeout: 5000,
|
|
59
|
+
executablePath: argv.e,
|
|
60
|
+
} /* timeout set to 5 seconds, default of 30 is too long */,
|
|
57
61
|
queue,
|
|
58
62
|
pageHandler: async (page, request, response) => {
|
|
59
63
|
const title = await page.title();
|
|
@@ -62,7 +66,7 @@ export async function crawl(argv) {
|
|
|
62
66
|
const pageWaitTime = argv.b;
|
|
63
67
|
console.log(`Waiting for ${pageWaitTime} ms for page to completely load....`);
|
|
64
68
|
await autoScroll(page, pageWaitTime);
|
|
65
|
-
console.log(
|
|
69
|
+
console.log("...and done waiting.");
|
|
66
70
|
}
|
|
67
71
|
// Get the raw HTML
|
|
68
72
|
// It is important to use page.content() versus response.text() since
|
|
@@ -72,8 +76,15 @@ export async function crawl(argv) {
|
|
|
72
76
|
// Pull out the raw html
|
|
73
77
|
if (saveDir) {
|
|
74
78
|
const requestURL = new URL(request.url);
|
|
75
|
-
const cleanHost = requestURL.host
|
|
76
|
-
|
|
79
|
+
const cleanHost = requestURL.host
|
|
80
|
+
.replace(/(\.|\/)/g, "_")
|
|
81
|
+
.replace(/_+$/g, "")
|
|
82
|
+
.replace(/^_+/g, "");
|
|
83
|
+
const cleanRequestPath = requestURL.pathname
|
|
84
|
+
.replace(/\//g, "_")
|
|
85
|
+
.replace(".html", "")
|
|
86
|
+
.replace(/_+$/g, "")
|
|
87
|
+
.replace(/^_+/g, "");
|
|
77
88
|
const cleanFileName = `${cleanHost}_${cleanRequestPath}`.replace(/_+$/g, "");
|
|
78
89
|
const htmlName = `${cleanFileName}.html`;
|
|
79
90
|
console.log(`File Name: ${htmlName}`);
|
|
@@ -87,10 +98,10 @@ export async function crawl(argv) {
|
|
|
87
98
|
Attributes: {
|
|
88
99
|
_created_at: date,
|
|
89
100
|
_source_uri: request.url,
|
|
90
|
-
_last_updated_at: date
|
|
101
|
+
_last_updated_at: date,
|
|
91
102
|
},
|
|
92
103
|
Title: title,
|
|
93
|
-
ContentType: "HTML"
|
|
104
|
+
ContentType: "HTML",
|
|
94
105
|
};
|
|
95
106
|
const metadataFileName = `${htmlName}.metadata.json`;
|
|
96
107
|
const metadataFilePath = resolve(saveDir, metadataFileName);
|
|
@@ -99,9 +110,12 @@ export async function crawl(argv) {
|
|
|
99
110
|
writeFileSync(metadataFilePath, metadataText);
|
|
100
111
|
}
|
|
101
112
|
if (typeof argv.t === "string") {
|
|
102
|
-
const toMD = argv.t === "markdown"
|
|
113
|
+
const toMD = argv.t === "markdown";
|
|
103
114
|
// Write some MARKDOWN!
|
|
104
|
-
const convertedHTML = new ArachneHTMLtoText(
|
|
115
|
+
const convertedHTML = new ArachneHTMLtoText({
|
|
116
|
+
stripTags: [...DEFAULT_STRIP_TAGS, "header", "footer"],
|
|
117
|
+
articleFocus: true,
|
|
118
|
+
}).convert(text, toMD);
|
|
105
119
|
const extension = toMD ? `md` : `txt`;
|
|
106
120
|
const markdownName = `${cleanFileName}.${extension}`;
|
|
107
121
|
const markdownFilePath = resolve(saveDir, markdownName);
|
|
@@ -123,7 +137,10 @@ export async function crawl(argv) {
|
|
|
123
137
|
const answerText = typeof acceptedAnswer.text === "string" ? acceptedAnswer.text : "";
|
|
124
138
|
if (answerText.length > 0) {
|
|
125
139
|
// Clean it
|
|
126
|
-
const cleanAnswer = new ArachneHTMLtoText(
|
|
140
|
+
const cleanAnswer = new ArachneHTMLtoText({
|
|
141
|
+
stripTags: [...DEFAULT_STRIP_TAGS, "header", "footer"],
|
|
142
|
+
articleFocus: true,
|
|
143
|
+
}).convert(answerText);
|
|
127
144
|
let existingAnswer = answers.get(cleanAnswer);
|
|
128
145
|
if (existingAnswer) {
|
|
129
146
|
existingAnswer.questions.push(questionText);
|
|
@@ -132,7 +149,7 @@ export async function crawl(argv) {
|
|
|
132
149
|
existingAnswer = {
|
|
133
150
|
answer: cleanAnswer,
|
|
134
151
|
questions: [questionText],
|
|
135
|
-
url: request.url
|
|
152
|
+
url: request.url,
|
|
136
153
|
};
|
|
137
154
|
}
|
|
138
155
|
// Add it back!
|
|
@@ -144,32 +161,34 @@ export async function crawl(argv) {
|
|
|
144
161
|
await enqueueLinks(page, queue, crawlPatterns);
|
|
145
162
|
const info = await queue.getInfo();
|
|
146
163
|
console.log(`Completed ${info.completeRequests} of ${info.totalRequests}, ${info.inProgressRequests} are in progress with ${info.pendingRequests} pending and ${info.failedRequests} failed.`);
|
|
147
|
-
}
|
|
164
|
+
},
|
|
148
165
|
});
|
|
149
166
|
try {
|
|
150
167
|
await crawler.run();
|
|
151
168
|
}
|
|
152
169
|
catch (e) {
|
|
153
|
-
console.log(
|
|
170
|
+
console.log("Unable to start the crawler.");
|
|
154
171
|
console.error(e);
|
|
155
172
|
}
|
|
156
|
-
console.log(
|
|
173
|
+
console.log("Crawler complete.");
|
|
157
174
|
const info = await queue.getInfo();
|
|
158
175
|
console.log(`Final count, completed ${info.completeRequests} of ${info.totalRequests}, ${info.failedRequests} failed.`);
|
|
159
176
|
const failed = queue.getFailed();
|
|
160
177
|
if (failed.length > 0) {
|
|
161
|
-
console.log(
|
|
178
|
+
console.log("Failures....");
|
|
162
179
|
failed.forEach((failedRequest) => {
|
|
163
|
-
const sourceInfo = failedRequest.sourceUrl ? ` (found on ${failedRequest.sourceUrl})` :
|
|
164
|
-
console.log(`\t${failedRequest.url}${sourceInfo} failed after ${failedRequest.requestAttempts} attempts with final error: ${failedRequest.errorMessages
|
|
180
|
+
const sourceInfo = failedRequest.sourceUrl ? ` (found on ${failedRequest.sourceUrl})` : "";
|
|
181
|
+
console.log(`\t${failedRequest.url}${sourceInfo} failed after ${failedRequest.requestAttempts} attempts with final error: ${failedRequest.errorMessages
|
|
182
|
+
? failedRequest.errorMessages[failedRequest.errorMessages.length - 1]
|
|
183
|
+
: "unknown"}`);
|
|
165
184
|
});
|
|
166
185
|
}
|
|
167
186
|
console.log(`Found ${answers.size} answers.`);
|
|
168
187
|
if (argv.faq && saveDir) {
|
|
169
188
|
// This follows the JSON format https://docs.aws.amazon.com/kendra/latest/dg/in-creating-faq.html#faq-custom-json
|
|
170
189
|
const qaJSON = {
|
|
171
|
-
|
|
172
|
-
|
|
190
|
+
SchemaVersion: 1,
|
|
191
|
+
FaqDocuments: [],
|
|
173
192
|
};
|
|
174
193
|
let qaCSV = `"Question","Answer","URL"`;
|
|
175
194
|
answers.forEach((answer) => {
|
|
@@ -179,8 +198,8 @@ export async function crawl(argv) {
|
|
|
179
198
|
Question: question,
|
|
180
199
|
Answer: answer.answer,
|
|
181
200
|
Attributes: {
|
|
182
|
-
_source_uri: answer.url
|
|
183
|
-
}
|
|
201
|
+
_source_uri: answer.url,
|
|
202
|
+
},
|
|
184
203
|
});
|
|
185
204
|
qaCSV += `\r\n"${question}","${answer.answer}","${answer.url}"`;
|
|
186
205
|
});
|
package/lib/crawl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crawl.js","sourceRoot":"","sources":["../src/crawl.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,+BAA+B;AAC/B,OAAO,EACH,OAAO,EAIP,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,kBAAkB,GACrB,MAAM,eAAe,CAAC;AACvB,OAAO,
|
|
1
|
+
{"version":3,"file":"crawl.js","sourceRoot":"","sources":["../src/crawl.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xapp/arachne-cli",
|
|
3
3
|
"preferGlobal": true,
|
|
4
|
-
"version": "1.10.
|
|
4
|
+
"version": "1.10.9",
|
|
5
5
|
"types": "lib/index",
|
|
6
6
|
"main": "lib/index",
|
|
7
7
|
"type": "module",
|
|
@@ -38,9 +38,9 @@
|
|
|
38
38
|
"why-is-node-running": "3.2.2"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@xapp/arachne": "1.10.
|
|
42
|
-
"@xapp/arachne-parsers": "1.10.
|
|
43
|
-
"@xapp/arachne-web-service": "1.10.
|
|
41
|
+
"@xapp/arachne": "1.10.8",
|
|
42
|
+
"@xapp/arachne-parsers": "1.10.9",
|
|
43
|
+
"@xapp/arachne-web-service": "1.10.9",
|
|
44
44
|
"isomorphic-fetch": "3.0.0",
|
|
45
45
|
"puppeteer": "24.37.5",
|
|
46
46
|
"terminal-image": "3.1.1",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"build": "tsc -d true -p .",
|
|
53
53
|
"clean": "rm -rf ./lib/*"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "d44e721ab47904eee1101ec8e009fe67f5a718a7"
|
|
56
56
|
}
|