website-scrap-engine 0.4.0 → 0.6.0
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/CHANGELOG.md +167 -0
- package/lib/downloader/index.js +5 -1
- package/lib/downloader/index.js.map +1 -1
- package/lib/downloader/main.d.ts +1 -1
- package/lib/downloader/main.js +7 -6
- package/lib/downloader/main.js.map +1 -1
- package/lib/downloader/pipeline-executor-impl.js +4 -4
- package/lib/downloader/pipeline-executor-impl.js.map +1 -1
- package/lib/downloader/types.d.ts +1 -1
- package/lib/downloader/worker-pool.d.ts +1 -0
- package/lib/downloader/worker-pool.js +17 -3
- package/lib/downloader/worker-pool.js.map +1 -1
- package/lib/downloader/worker.js +5 -4
- package/lib/downloader/worker.js.map +1 -1
- package/lib/index.js +5 -1
- package/lib/index.js.map +1 -1
- package/lib/io.js +3 -3
- package/lib/io.js.map +1 -1
- package/lib/life-cycle/adapters.js +10 -8
- package/lib/life-cycle/adapters.js.map +1 -1
- package/lib/life-cycle/detect-resource-type.js +2 -2
- package/lib/life-cycle/detect-resource-type.js.map +1 -1
- package/lib/life-cycle/download-resource.d.ts +6 -1
- package/lib/life-cycle/download-resource.js +27 -13
- package/lib/life-cycle/download-resource.js.map +1 -1
- package/lib/life-cycle/download-streaming-resource.d.ts +1 -1
- package/lib/life-cycle/download-streaming-resource.js +12 -7
- package/lib/life-cycle/download-streaming-resource.js.map +1 -1
- package/lib/life-cycle/index.js +5 -1
- package/lib/life-cycle/index.js.map +1 -1
- package/lib/life-cycle/process-css.js +2 -2
- package/lib/life-cycle/process-css.js.map +1 -1
- package/lib/life-cycle/process-html.js +3 -3
- package/lib/life-cycle/process-html.js.map +1 -1
- package/lib/life-cycle/process-site-map.js +2 -5
- package/lib/life-cycle/process-site-map.js.map +1 -1
- package/lib/life-cycle/process-source-map.js +2 -2
- package/lib/life-cycle/process-source-map.js.map +1 -1
- package/lib/life-cycle/process-svg.js +2 -2
- package/lib/life-cycle/process-svg.js.map +1 -1
- package/lib/life-cycle/read-or-copy-local-resource.js +5 -1
- package/lib/life-cycle/read-or-copy-local-resource.js.map +1 -1
- package/lib/life-cycle/save-html-to-disk.js +10 -10
- package/lib/life-cycle/save-html-to-disk.js.map +1 -1
- package/lib/life-cycle/save-resource-to-disk.js +5 -5
- package/lib/life-cycle/save-resource-to-disk.js.map +1 -1
- package/lib/life-cycle/types.d.ts +4 -3
- package/lib/logger/config-logger.js +6 -2
- package/lib/logger/config-logger.js.map +1 -1
- package/lib/logger/logger-worker.d.ts +1 -1
- package/lib/logger/logger-worker.js +2 -2
- package/lib/logger/logger-worker.js.map +1 -1
- package/lib/options.d.ts +1 -1
- package/lib/options.js +1 -1
- package/lib/options.js.map +1 -1
- package/lib/resource.d.ts +11 -3
- package/lib/resource.js +25 -18
- package/lib/resource.js.map +1 -1
- package/lib/types.d.ts +5 -5
- package/lib/util.d.ts +2 -2
- package/lib/util.js +2 -3
- package/lib/util.js.map +1 -1
- package/package.json +19 -19
- package/src/downloader/main.ts +3 -2
- package/src/downloader/pipeline-executor-impl.ts +3 -2
- package/src/downloader/types.ts +1 -1
- package/src/downloader/worker-pool.ts +10 -2
- package/src/downloader/worker.ts +2 -1
- package/src/io.ts +1 -1
- package/src/life-cycle/adapters.ts +8 -3
- package/src/life-cycle/download-resource.ts +29 -12
- package/src/life-cycle/download-streaming-resource.ts +3 -2
- package/src/life-cycle/process-site-map.ts +2 -2
- package/src/life-cycle/types.ts +2 -0
- package/src/logger/logger-worker.ts +1 -1
- package/src/resource.ts +14 -3
- package/src/types.ts +3 -3
- package/src/util.ts +2 -3
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import type { Options as GotOptions } from 'got/dist/source/as-promise';
|
|
2
|
-
import type { createResource, Resource, ResourceBody, ResourceType } from '../resource';
|
|
2
|
+
import type { createResource, GenerateSavePathFn, Resource, ResourceBody, ResourceType } from '../resource';
|
|
3
3
|
import type { StaticDownloadOptions } from '../options';
|
|
4
4
|
import type { PipelineExecutor } from './pipeline-executor';
|
|
5
5
|
import type { Cheerio } from '../types';
|
|
6
6
|
import type { DownloaderWithMeta } from '../downloader/types';
|
|
7
7
|
import type { WorkerInfo } from '../downloader/worker-pool';
|
|
8
|
-
export
|
|
8
|
+
export type AsyncResult<T> = T | Promise<T>;
|
|
9
9
|
export interface InitLifeCycleFunc {
|
|
10
10
|
/**
|
|
11
11
|
* The init life cycle would be called:
|
|
@@ -67,7 +67,7 @@ export interface ProcessResourceBeforeDownloadFunc {
|
|
|
67
67
|
*/
|
|
68
68
|
(res: Resource, element: Cheerio | null, parent: Resource | null, options: StaticDownloadOptions, pipeline: PipelineExecutor): AsyncResult<Resource | void>;
|
|
69
69
|
}
|
|
70
|
-
export
|
|
70
|
+
export type RequestOptions = GotOptions;
|
|
71
71
|
/**
|
|
72
72
|
* Process and filter resource,
|
|
73
73
|
* resource should only be downloaded once,
|
|
@@ -141,6 +141,7 @@ export interface ProcessingLifeCycle {
|
|
|
141
141
|
init: InitLifeCycleFunc[];
|
|
142
142
|
linkRedirect: LinkRedirectFunc[];
|
|
143
143
|
detectResourceType: DetectResourceTypeFunc[];
|
|
144
|
+
generateSavePath?: GenerateSavePathFn | void;
|
|
144
145
|
createResource: typeof createResource;
|
|
145
146
|
/**
|
|
146
147
|
* link in parent resource would be replaced after this
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -22,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
22
26
|
exports.configureLogger = void 0;
|
|
23
27
|
const log4js_1 = require("log4js");
|
|
24
28
|
const path = __importStar(require("path"));
|
|
25
|
-
const configureLogger = (localRoot, subDir) => log4js_1.configure({
|
|
29
|
+
const configureLogger = (localRoot, subDir) => (0, log4js_1.configure)({
|
|
26
30
|
appenders: {
|
|
27
31
|
'retry': {
|
|
28
32
|
type: 'file',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-logger.js","sourceRoot":"","sources":["../../src/logger/config-logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config-logger.js","sourceRoot":"","sources":["../../src/logger/config-logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Logger } from 'log4js';
|
|
2
2
|
import type { WorkerLog } from '../downloader/worker-type';
|
|
3
|
-
export declare const logLevels: readonly ["
|
|
3
|
+
export declare const logLevels: readonly ["trace", "debug", "info", "warn", "error", "fatal", "mark"];
|
|
4
4
|
export declare function getWorkerLogger(category: WorkerLog['logger']): Logger;
|
|
@@ -5,10 +5,10 @@ const log4js_1 = require("log4js");
|
|
|
5
5
|
const worker_threads_1 = require("worker_threads");
|
|
6
6
|
const types_1 = require("../downloader/types");
|
|
7
7
|
exports.logLevels = [
|
|
8
|
-
'
|
|
8
|
+
'trace', 'debug', 'info', 'warn', 'error', 'fatal', 'mark'
|
|
9
9
|
];
|
|
10
10
|
function getWorkerLogger(category) {
|
|
11
|
-
const logger = log4js_1.getLogger(category);
|
|
11
|
+
const logger = (0, log4js_1.getLogger)(category);
|
|
12
12
|
exports.logLevels.forEach((level) => {
|
|
13
13
|
logger[level] = (...content) => {
|
|
14
14
|
const msg = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-worker.js","sourceRoot":"","sources":["../../src/logger/logger-worker.ts"],"names":[],"mappings":";;;AAAA,mCAAyC;AACzC,mDAA0C;AAE1C,+CAAsD;AAEzC,QAAA,SAAS,GAAG;IACvB,
|
|
1
|
+
{"version":3,"file":"logger-worker.js","sourceRoot":"","sources":["../../src/logger/logger-worker.ts"],"names":[],"mappings":";;;AAAA,mCAAyC;AACzC,mDAA0C;AAE1C,+CAAsD;AAEzC,QAAA,SAAS,GAAG;IACvB,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM;CAClD,CAAC;AAEX,SAAgB,eAAe,CAAC,QAA6B;IAC3D,MAAM,MAAM,GAAW,IAAA,kBAAS,EAAC,QAAQ,CAAC,CAAC;IAC3C,iBAAS,CAAC,OAAO,CAAC,CAAC,KAA+B,EAAE,EAAE;QACpD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAI,GAAG,OAAY,EAAE,EAAE;YACrC,MAAM,GAAG,GAAwB;gBAC/B,MAAM,EAAE,CAAC,CAAC;gBACV,IAAI,EAAE,yBAAiB,CAAC,GAAG;gBAC3B,IAAI,EAAE;oBACJ,KAAK;oBACL,MAAM,EAAE,QAAQ;oBAChB,OAAO;iBACR;aACF,CAAC;YACF,2BAAU,aAAV,2BAAU,uBAAV,2BAAU,CAAE,WAAW,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAjBD,0CAiBC"}
|
package/lib/options.d.ts
CHANGED
|
@@ -134,7 +134,7 @@ export interface DownloadOptions extends StaticDownloadOptions, ProcessingLifeCy
|
|
|
134
134
|
*/
|
|
135
135
|
configureLogger: typeof configureLogger;
|
|
136
136
|
}
|
|
137
|
-
export
|
|
137
|
+
export type ExtendedError = (TimeoutError | RequestError) & {
|
|
138
138
|
retryLimitExceeded: boolean;
|
|
139
139
|
};
|
|
140
140
|
/**
|
package/lib/options.js
CHANGED
|
@@ -132,7 +132,7 @@ const defaultOptions = {
|
|
|
132
132
|
deduplicateStripSearch: true
|
|
133
133
|
};
|
|
134
134
|
function defaultDownloadOptions(options) {
|
|
135
|
-
const merged = util_1.weakAssign(options, defaultOptions);
|
|
135
|
+
const merged = (0, util_1.weakAssign)(options, defaultOptions);
|
|
136
136
|
// merged = weakAssign(merged, defaultOptions);
|
|
137
137
|
if (!merged.concurrency || merged.concurrency < 1) {
|
|
138
138
|
merged.concurrency = 12;
|
package/lib/options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"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"}
|
package/lib/resource.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
/// <reference types="node" />
|
|
2
3
|
import URI from 'urijs';
|
|
3
4
|
import type { IncomingHttpHeaders } from 'http';
|
|
4
5
|
import type { CheerioStatic } from './types';
|
|
@@ -37,8 +38,8 @@ export declare enum ResourceType {
|
|
|
37
38
|
*/
|
|
38
39
|
StreamingBinary = 7
|
|
39
40
|
}
|
|
40
|
-
export
|
|
41
|
-
export
|
|
41
|
+
export type ResourceEncoding = null | BufferEncoding;
|
|
42
|
+
export type ResourceBody = Buffer | ArrayBuffer | ArrayBufferView | string;
|
|
42
43
|
export interface RawResource {
|
|
43
44
|
/**
|
|
44
45
|
* The type of this resource
|
|
@@ -230,6 +231,10 @@ export interface CreateResourceArgument {
|
|
|
230
231
|
* https://github.com/website-local/website-scrap-engine/issues/107
|
|
231
232
|
*/
|
|
232
233
|
skipReplacePathError?: boolean;
|
|
234
|
+
/**
|
|
235
|
+
* Set this to use a custom implementation of {@link generateSavePath}
|
|
236
|
+
*/
|
|
237
|
+
generateSavePathFn?: GenerateSavePathFn | void;
|
|
233
238
|
}
|
|
234
239
|
/**
|
|
235
240
|
* Generate save path from HTTP/HTTPS absolute uri
|
|
@@ -237,8 +242,10 @@ export interface CreateResourceArgument {
|
|
|
237
242
|
* @param isHtml should the savePath endsWith .html
|
|
238
243
|
* @param keepSearch keep url search params in file name
|
|
239
244
|
* @param localSrcRoot local source path to download from
|
|
245
|
+
* @return string must return non-empty string
|
|
240
246
|
*/
|
|
241
247
|
export declare function generateSavePath(uri: URI, isHtml?: boolean, keepSearch?: boolean, localSrcRoot?: string): string;
|
|
248
|
+
export type GenerateSavePathFn = typeof generateSavePath;
|
|
242
249
|
export declare const urlOfSavePath: (savePath: string) => string;
|
|
243
250
|
/**
|
|
244
251
|
* Check an absolute uri
|
|
@@ -266,7 +273,8 @@ export declare function resolveFileUrl(url: string, refUrl: string, localSrcRoot
|
|
|
266
273
|
* @param encoding {@link CreateResourceArgument.encoding}
|
|
267
274
|
* @param keepSearch {@link CreateResourceArgument.keepSearch}
|
|
268
275
|
* @param skipReplacePathError {@link CreateResourceArgument.skipReplacePathError}
|
|
276
|
+
* @param generateSavePathFn {@link CreateResourceArgument.generateSavePathFn}
|
|
269
277
|
* @return the resource
|
|
270
278
|
*/
|
|
271
|
-
export declare function createResource({ type, depth, url, refUrl, refSavePath, refType, localRoot, localSrcRoot, encoding, keepSearch, skipReplacePathError }: CreateResourceArgument): Resource;
|
|
279
|
+
export declare function createResource({ type, depth, url, refUrl, refSavePath, refType, localRoot, localSrcRoot, encoding, keepSearch, skipReplacePathError, generateSavePathFn }: CreateResourceArgument): Resource;
|
|
272
280
|
export declare function normalizeResource(res: RawResource): Resource;
|
package/lib/resource.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -97,6 +101,7 @@ exports.prepareResourceForClone = prepareResourceForClone;
|
|
|
97
101
|
* @param isHtml should the savePath endsWith .html
|
|
98
102
|
* @param keepSearch keep url search params in file name
|
|
99
103
|
* @param localSrcRoot local source path to download from
|
|
104
|
+
* @return string must return non-empty string
|
|
100
105
|
*/
|
|
101
106
|
function generateSavePath(uri, isHtml, keepSearch, localSrcRoot) {
|
|
102
107
|
if (uri.is('relative') && uri.protocol() !== 'file') {
|
|
@@ -123,7 +128,7 @@ function generateSavePath(uri, isHtml, keepSearch, localSrcRoot) {
|
|
|
123
128
|
}
|
|
124
129
|
else {
|
|
125
130
|
const host = uri.hostname();
|
|
126
|
-
savePath = path.join(host || '', util_1.escapePath(uri.path()));
|
|
131
|
+
savePath = path.join(host || '', (0, util_1.escapePath)(uri.path()));
|
|
127
132
|
}
|
|
128
133
|
if (isHtml && !savePath.endsWith('.html')) {
|
|
129
134
|
if (uri.protocol() === 'file' && savePath === '' ||
|
|
@@ -141,15 +146,15 @@ function generateSavePath(uri, isHtml, keepSearch, localSrcRoot) {
|
|
|
141
146
|
let search = uri.search();
|
|
142
147
|
if (search && search.length > 0) {
|
|
143
148
|
if (search.length > 43) {
|
|
144
|
-
const ordered = util_1.orderUrlSearch(search);
|
|
145
|
-
const hashed = util_1.simpleHashString(ordered);
|
|
149
|
+
const ordered = (0, util_1.orderUrlSearch)(search);
|
|
150
|
+
const hashed = (0, util_1.simpleHashString)(ordered);
|
|
146
151
|
logger_1.error.debug('search too long, replacing with hash', ordered, hashed);
|
|
147
152
|
// avoid too long search
|
|
148
153
|
search = '_' + hashed;
|
|
149
154
|
}
|
|
150
155
|
else {
|
|
151
156
|
// order it
|
|
152
|
-
search = util_1.escapePath(util_1.orderUrlSearch(search));
|
|
157
|
+
search = (0, util_1.escapePath)((0, util_1.orderUrlSearch)(search));
|
|
153
158
|
}
|
|
154
159
|
const ext = path.extname(savePath);
|
|
155
160
|
if (ext) {
|
|
@@ -212,7 +217,7 @@ function checkAbsoluteUri(uri, refUri, skipReplacePathError, url, refUrl, type)
|
|
|
212
217
|
exports.checkAbsoluteUri = checkAbsoluteUri;
|
|
213
218
|
const FILE_PROTOCOL_PREFIX = 'file:///';
|
|
214
219
|
function resolveFileUrl(url, refUrl, localSrcRoot, skipReplacePathError) {
|
|
215
|
-
if (util_1.isUrlHttp(url)) {
|
|
220
|
+
if ((0, util_1.isUrlHttp)(url)) {
|
|
216
221
|
return url;
|
|
217
222
|
}
|
|
218
223
|
let error;
|
|
@@ -243,9 +248,9 @@ function resolveFileUrl(url, refUrl, localSrcRoot, skipReplacePathError) {
|
|
|
243
248
|
}
|
|
244
249
|
else if (!url.startsWith(FILE_PROTOCOL_PREFIX)) {
|
|
245
250
|
// relative url
|
|
246
|
-
const absoluteRefUri = urijs_1.default(FILE_PROTOCOL_PREFIX +
|
|
251
|
+
const absoluteRefUri = (0, urijs_1.default)(FILE_PROTOCOL_PREFIX +
|
|
247
252
|
refUrl.slice(FILE_PROTOCOL_PREFIX.length + localSrcRoot.length));
|
|
248
|
-
const uri = urijs_1.default(url).absoluteTo(absoluteRefUri);
|
|
253
|
+
const uri = (0, urijs_1.default)(url).absoluteTo(absoluteRefUri);
|
|
249
254
|
url = FILE_PROTOCOL_PREFIX + localSrcRoot + uri.pathname() + uri.hash();
|
|
250
255
|
}
|
|
251
256
|
}
|
|
@@ -275,11 +280,12 @@ exports.resolveFileUrl = resolveFileUrl;
|
|
|
275
280
|
* @param encoding {@link CreateResourceArgument.encoding}
|
|
276
281
|
* @param keepSearch {@link CreateResourceArgument.keepSearch}
|
|
277
282
|
* @param skipReplacePathError {@link CreateResourceArgument.skipReplacePathError}
|
|
283
|
+
* @param generateSavePathFn {@link CreateResourceArgument.generateSavePathFn}
|
|
278
284
|
* @return the resource
|
|
279
285
|
*/
|
|
280
|
-
function createResource({ type, depth, url, refUrl, refSavePath, refType, localRoot, localSrcRoot, encoding, keepSearch, skipReplacePathError }) {
|
|
286
|
+
function createResource({ type, depth, url, refUrl, refSavePath, refType, localRoot, localSrcRoot, encoding, keepSearch, skipReplacePathError, generateSavePathFn }) {
|
|
281
287
|
const rawUrl = url;
|
|
282
|
-
const refUri = urijs_1.default(refUrl);
|
|
288
|
+
const refUri = (0, urijs_1.default)(refUrl);
|
|
283
289
|
let replacePathHasError = false;
|
|
284
290
|
if (url.startsWith(FILE_PROTOCOL_PREFIX) ||
|
|
285
291
|
refUrl.startsWith(FILE_PROTOCOL_PREFIX)) {
|
|
@@ -299,7 +305,7 @@ function createResource({ type, depth, url, refUrl, refSavePath, refType, localR
|
|
|
299
305
|
// absolute path
|
|
300
306
|
url = refUri.protocol() + '://' + refUri.host() + url;
|
|
301
307
|
}
|
|
302
|
-
let uri = urijs_1.default(url);
|
|
308
|
+
let uri = (0, urijs_1.default)(url);
|
|
303
309
|
if (!replacePathHasError && uri.is('relative')) {
|
|
304
310
|
uri = uri.absoluteTo(refUri);
|
|
305
311
|
url = uri.toString();
|
|
@@ -316,13 +322,14 @@ function createResource({ type, depth, url, refUrl, refSavePath, refType, localR
|
|
|
316
322
|
else {
|
|
317
323
|
downloadLink = uri.clone().hash('').toString();
|
|
318
324
|
}
|
|
325
|
+
const implGenerateSavePath = generateSavePathFn || generateSavePath;
|
|
319
326
|
// make savePath and replaceUri
|
|
320
|
-
const savePath = replacePathHasError ? rawUrl :
|
|
327
|
+
const savePath = replacePathHasError ? rawUrl : implGenerateSavePath(uri, type === ResourceType.Html, keepSearch, localSrcRoot);
|
|
321
328
|
if (!refSavePath) {
|
|
322
|
-
refSavePath =
|
|
329
|
+
refSavePath = implGenerateSavePath(refUri, refType === ResourceType.Html, false, localSrcRoot);
|
|
323
330
|
}
|
|
324
|
-
const replaceUri = replacePathHasError ? urijs_1.default(rawUrl) :
|
|
325
|
-
urijs_1.default(exports.urlOfSavePath(savePath)).relativeTo(exports.urlOfSavePath(refSavePath));
|
|
331
|
+
const replaceUri = replacePathHasError ? (0, urijs_1.default)(rawUrl) :
|
|
332
|
+
(0, urijs_1.default)((0, exports.urlOfSavePath)(savePath)).relativeTo((0, exports.urlOfSavePath)(refSavePath));
|
|
326
333
|
// recover hash
|
|
327
334
|
if (uri.hash()) {
|
|
328
335
|
replaceUri.hash(uri.hash());
|
|
@@ -363,13 +370,13 @@ function normalizeResource(res) {
|
|
|
363
370
|
var _a;
|
|
364
371
|
const resource = res;
|
|
365
372
|
if (!resource.uri) {
|
|
366
|
-
resource.uri = urijs_1.default(resource.url);
|
|
373
|
+
resource.uri = (0, urijs_1.default)(resource.url);
|
|
367
374
|
}
|
|
368
375
|
if (!resource.refUri) {
|
|
369
|
-
resource.refUri = urijs_1.default(resource.refUrl);
|
|
376
|
+
resource.refUri = (0, urijs_1.default)(resource.refUrl);
|
|
370
377
|
}
|
|
371
378
|
if (!resource.replaceUri) {
|
|
372
|
-
resource.replaceUri = urijs_1.default(resource.replacePath);
|
|
379
|
+
resource.replaceUri = (0, urijs_1.default)(resource.replacePath);
|
|
373
380
|
}
|
|
374
381
|
if (!resource.host) {
|
|
375
382
|
resource.host = (_a = resource.uri) === null || _a === void 0 ? void 0 : _a.hostname();
|
package/lib/resource.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"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"}
|
package/lib/types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type
|
|
2
|
-
export
|
|
3
|
-
export
|
|
4
|
-
export
|
|
5
|
-
export
|
|
1
|
+
import type { load } from 'cheerio';
|
|
2
|
+
export type CheerioStatic = ReturnType<typeof load>;
|
|
3
|
+
export type Cheerio = ReturnType<CheerioStatic>;
|
|
4
|
+
export type CheerioOptionsInterface = NonNullable<Parameters<typeof load>[1]>;
|
|
5
|
+
export type CheerioElement = Cheerio[number];
|
package/lib/util.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { ResourceBody, ResourceEncoding } from './resource';
|
|
2
2
|
export declare const sleep: (ms: number) => Promise<void>;
|
|
3
3
|
export declare const escapePath: (str: string) => string;
|
|
4
|
-
export declare const isSiteMap: (url?: string
|
|
5
|
-
export declare const arrayToMap: (array: (string | number)[], freeze?: boolean
|
|
4
|
+
export declare const isSiteMap: (url?: string) => boolean | '' | void;
|
|
5
|
+
export declare const arrayToMap: (array: (string | number)[], freeze?: boolean) => Record<string | number, number>;
|
|
6
6
|
export declare const toString: (body: ResourceBody, encoding: ResourceEncoding) => string;
|
|
7
7
|
export declare const importDefaultFromPath: (path: string) => any;
|
|
8
8
|
export declare const orderUrlSearch: (search: string) => string;
|
package/lib/util.js
CHANGED
|
@@ -70,7 +70,7 @@ const orderUrlSearch = (search) => {
|
|
|
70
70
|
.join('&');
|
|
71
71
|
};
|
|
72
72
|
exports.orderUrlSearch = orderUrlSearch;
|
|
73
|
-
const simpleHashString = (str) => crypto_1.createHash('sha256')
|
|
73
|
+
const simpleHashString = (str) => (0, crypto_1.createHash)('sha256')
|
|
74
74
|
.update(str)
|
|
75
75
|
.digest()
|
|
76
76
|
.toString('base64')
|
|
@@ -90,8 +90,7 @@ const weakAssign = (target, source) => {
|
|
|
90
90
|
return Object.assign({}, source);
|
|
91
91
|
if (!source)
|
|
92
92
|
return target;
|
|
93
|
-
|
|
94
|
-
for (key in source) {
|
|
93
|
+
for (const key in source) {
|
|
95
94
|
if (exports.hasOwnProperty.call(source, key) &&
|
|
96
95
|
!exports.hasOwnProperty.call(target, key)) {
|
|
97
96
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
package/lib/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "website-scrap-engine",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.6.0",
|
|
4
4
|
"description": "Configurable website scraper in typescript",
|
|
5
|
-
"main": "lib
|
|
5
|
+
"main": "lib",
|
|
6
|
+
"types": "lib",
|
|
6
7
|
"engines": {
|
|
7
8
|
"node": ">=12.16.0"
|
|
8
9
|
},
|
|
@@ -20,26 +21,25 @@
|
|
|
20
21
|
"preset": "ts-jest"
|
|
21
22
|
},
|
|
22
23
|
"dependencies": {
|
|
23
|
-
"cheerio": "^1.0.0-rc.
|
|
24
|
+
"cheerio": "^1.0.0-rc.12",
|
|
24
25
|
"css-url-parser": "^1.1.3",
|
|
25
|
-
"got": "^11.8.
|
|
26
|
-
"log4js": "^6.
|
|
27
|
-
"mkdirp": "^1.
|
|
26
|
+
"got": "^11.8.6",
|
|
27
|
+
"log4js": "^6.8.0",
|
|
28
|
+
"mkdirp": "^2.1.3",
|
|
28
29
|
"p-queue": "^6.6.2",
|
|
29
30
|
"srcset": "^4.0.0",
|
|
30
|
-
"urijs": "^1.19.
|
|
31
|
+
"urijs": "^1.19.11"
|
|
31
32
|
},
|
|
32
33
|
"devDependencies": {
|
|
33
|
-
"@types/jest": "^
|
|
34
|
-
"@types/
|
|
35
|
-
"@types/
|
|
36
|
-
"@
|
|
37
|
-
"@typescript-eslint/
|
|
38
|
-
"
|
|
39
|
-
"
|
|
40
|
-
"jest": "^
|
|
41
|
-
"
|
|
42
|
-
"typescript": "^4.3.5"
|
|
34
|
+
"@types/jest": "^27.5.2",
|
|
35
|
+
"@types/node": "^18.14.1",
|
|
36
|
+
"@types/urijs": "^1.19.19",
|
|
37
|
+
"@typescript-eslint/eslint-plugin": "^5.53.0",
|
|
38
|
+
"@typescript-eslint/parser": "^5.53.0",
|
|
39
|
+
"eslint": "^8.34.0",
|
|
40
|
+
"jest": "^27.5.1",
|
|
41
|
+
"ts-jest": "^27.1.5",
|
|
42
|
+
"typescript": "^4.9.5"
|
|
43
43
|
},
|
|
44
44
|
"files": [
|
|
45
45
|
".editorconfig",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"author": "myfreeer",
|
|
61
61
|
"license": "ISC",
|
|
62
62
|
"bugs": {
|
|
63
|
-
"url": "https://github.com/
|
|
63
|
+
"url": "https://github.com/website-local/website-scrap-engine/issues"
|
|
64
64
|
},
|
|
65
|
-
"homepage": "https://github.com/
|
|
65
|
+
"homepage": "https://github.com/website-local/website-scrap-engine#readme"
|
|
66
66
|
}
|
package/src/downloader/main.ts
CHANGED
|
@@ -112,8 +112,9 @@ export abstract class AbstractDownloader implements DownloaderWithMeta {
|
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
114
|
|
|
115
|
-
handleError(err: Error | null, cause: string, resource: RawResource): void {
|
|
116
|
-
|
|
115
|
+
handleError(err: Error | unknown | null, cause: string, resource: RawResource): void {
|
|
116
|
+
// force cast in case of typescript 4.4
|
|
117
|
+
if (err && (err as {name?: string}).name === 'HTTPError' &&
|
|
117
118
|
(err as HTTPError)?.response?.statusCode === 404) {
|
|
118
119
|
notFound.error(resource.url, resource.downloadLink, resource.refUrl);
|
|
119
120
|
} else if (err) {
|
|
@@ -114,8 +114,9 @@ export class PipelineExecutorImpl implements PipelineExecutor {
|
|
|
114
114
|
localRoot: localRoot ?? this.options.localRoot,
|
|
115
115
|
localSrcRoot: this.options.localSrcRoot,
|
|
116
116
|
encoding: encoding ?? this.options.encoding[type] ?? 'utf8',
|
|
117
|
-
keepSearch: this.options.deduplicateStripSearch,
|
|
118
|
-
skipReplacePathError: this.options.skipReplacePathError
|
|
117
|
+
keepSearch: !this.options.deduplicateStripSearch,
|
|
118
|
+
skipReplacePathError: this.options.skipReplacePathError,
|
|
119
|
+
generateSavePathFn: this.lifeCycle.generateSavePath,
|
|
119
120
|
};
|
|
120
121
|
return this.lifeCycle.createResource(arg);
|
|
121
122
|
}
|
package/src/downloader/types.ts
CHANGED
|
@@ -74,8 +74,16 @@ export class WorkerPool<T = unknown, R extends WorkerMessage = WorkerMessage> {
|
|
|
74
74
|
}
|
|
75
75
|
|
|
76
76
|
takeLog(info: WorkerInfo, message: LogWorkerMessage): void {
|
|
77
|
-
|
|
78
|
-
|
|
77
|
+
if (!message?.body) {
|
|
78
|
+
logger.error.warn('Invalid formatted log', info.id);
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
const content = message?.body?.content;
|
|
82
|
+
if (content?.length) {
|
|
83
|
+
logger?.[message.body.logger]?.[message.body.level]?.(info.id, ...content);
|
|
84
|
+
} else {
|
|
85
|
+
logger?.[message.body.logger]?.[message.body.level]?.(info.id);
|
|
86
|
+
}
|
|
79
87
|
}
|
|
80
88
|
|
|
81
89
|
complete(info: WorkerInfo, message: WorkerMessage): void {
|
package/src/downloader/worker.ts
CHANGED
|
@@ -37,7 +37,7 @@ const init = pipeline.init(pipeline);
|
|
|
37
37
|
|
|
38
38
|
parentPort?.addListener('message', async (msg: WorkerTaskMessage<RawResource>) => {
|
|
39
39
|
const collectedResource: RawResource[] = [];
|
|
40
|
-
let error: Error | void;
|
|
40
|
+
let error: Error | unknown | void;
|
|
41
41
|
let redirectedUrl: string | undefined;
|
|
42
42
|
try {
|
|
43
43
|
await init;
|
|
@@ -67,6 +67,7 @@ parentPort?.addListener('message', async (msg: WorkerTaskMessage<RawResource>) =
|
|
|
67
67
|
redirectedUrl = processedResource.redirectedUrl;
|
|
68
68
|
}
|
|
69
69
|
} catch (e) {
|
|
70
|
+
// TODO: handle if object could not be cloned here
|
|
70
71
|
error = e;
|
|
71
72
|
} finally {
|
|
72
73
|
const message: DownloadWorkerMessage = {
|
package/src/io.ts
CHANGED
|
@@ -6,7 +6,7 @@ import type {ResourceBody, ResourceEncoding} from './resource';
|
|
|
6
6
|
import {mkdir as mkdirLogger, error as errorLogger} from './logger/logger';
|
|
7
7
|
|
|
8
8
|
export const mkdirRetry = async (dir: string, retry = 3): Promise<void> => {
|
|
9
|
-
let error:
|
|
9
|
+
let error: unknown | void;
|
|
10
10
|
for (let i = 0; i < retry; i++) {
|
|
11
11
|
error = undefined;
|
|
12
12
|
try {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import {load} from 'cheerio';
|
|
2
2
|
import {Resource, ResourceEncoding, ResourceType} from '../resource';
|
|
3
3
|
import type {
|
|
4
4
|
AsyncResult,
|
|
@@ -78,6 +78,11 @@ export async function processRedirectedUrl(
|
|
|
78
78
|
res.redirectedUrl, res.type, res.depth, null, res);
|
|
79
79
|
if (redirectedRes) {
|
|
80
80
|
res.redirectedUrl = redirectedRes.url;
|
|
81
|
+
// https://github.com/website-local/website-scrap-engine/issues/385
|
|
82
|
+
// 2011/11/15
|
|
83
|
+
if (redirectedRes.savePath) {
|
|
84
|
+
res.redirectedSavePath = redirectedRes.savePath;
|
|
85
|
+
}
|
|
81
86
|
}
|
|
82
87
|
}
|
|
83
88
|
return res;
|
|
@@ -94,9 +99,9 @@ export const parseHtml = (
|
|
|
94
99
|
const encoding: ResourceEncoding =
|
|
95
100
|
res.encoding || options.encoding[res.type] || 'utf8';
|
|
96
101
|
if (options.cheerioParse) {
|
|
97
|
-
return
|
|
102
|
+
return load(toString(res.body, encoding), options.cheerioParse);
|
|
98
103
|
}
|
|
99
|
-
return
|
|
104
|
+
return load(toString(res.body, encoding));
|
|
100
105
|
};
|
|
101
106
|
|
|
102
107
|
export const processHtml = (fn: HtmlProcessFunc): ProcessResourceAfterDownloadFunc =>
|