website-scrap-engine 0.5.0 → 0.7.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 +35 -0
- package/lib/downloader/index.js +5 -1
- package/lib/downloader/index.js.map +1 -1
- package/lib/downloader/main.js +4 -4
- package/lib/downloader/main.js.map +1 -1
- package/lib/downloader/pipeline-executor-impl.js +3 -3
- package/lib/downloader/pipeline-executor-impl.js.map +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/index.js +5 -1
- package/lib/index.js.map +1 -1
- package/lib/io.js +2 -2
- package/lib/io.js.map +1 -1
- package/lib/life-cycle/adapters.js +3 -6
- package/lib/life-cycle/adapters.js.map +1 -1
- package/lib/life-cycle/download-resource.js +5 -1
- package/lib/life-cycle/download-resource.js.map +1 -1
- package/lib/life-cycle/download-streaming-resource.js +5 -1
- 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-site-map.js +2 -5
- package/lib/life-cycle/process-site-map.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/types.d.ts +4 -3
- package/lib/logger/config-logger.js +5 -1
- package/lib/logger/config-logger.js.map +1 -1
- package/lib/logger/logger-worker.d.ts +1 -1
- package/lib/logger/logger-worker.js +1 -1
- package/lib/logger/logger-worker.js.map +1 -1
- package/lib/options.d.ts +1 -1
- package/lib/resource.d.ts +11 -3
- package/lib/resource.js +11 -4
- 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 +1 -2
- package/lib/util.js.map +1 -1
- package/package.json +15 -16
- package/src/downloader/pipeline-executor-impl.ts +2 -1
- package/src/downloader/worker-pool.ts +10 -2
- package/src/io.ts +4 -4
- package/src/life-cycle/adapters.ts +3 -3
- 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
- package/tsconfig.json +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,38 @@
|
|
|
1
|
+
0.7.0
|
|
2
|
+
============
|
|
3
|
+
|
|
4
|
+
BREAKING
|
|
5
|
+
------------
|
|
6
|
+
* build(deps): bump mkdirp from 2.1.6 to 3.0.0
|
|
7
|
+
* build(deps-dev): bump typescript from 4.9.5 to 5.0.4
|
|
8
|
+
|
|
9
|
+
0.6.0
|
|
10
|
+
============
|
|
11
|
+
|
|
12
|
+
BREAKING
|
|
13
|
+
------------
|
|
14
|
+
* resource: custom callback for rewriting savePath
|
|
15
|
+
* life-cycle: custom callback for rewriting savePath (<https://github.com/website-local/website-scrap-engine/issues/383>)
|
|
16
|
+
|
|
17
|
+
Fix
|
|
18
|
+
------------
|
|
19
|
+
* cheerio: replace deprecated api
|
|
20
|
+
|
|
21
|
+
Test
|
|
22
|
+
------------
|
|
23
|
+
* test: migrating to eslint v8 and typescript-eslint v5
|
|
24
|
+
* cheerio: fix a test
|
|
25
|
+
* resource: add a test
|
|
26
|
+
* ci: run tests on node.js 18.x (<https://github.com/website-local/website-scrap-engine/issues/610>)
|
|
27
|
+
|
|
28
|
+
Misc
|
|
29
|
+
------------
|
|
30
|
+
* package-lock-resolved: process registry.npmmirror.com
|
|
31
|
+
* logger: fix type conflict
|
|
32
|
+
* util: fix compatibility with typescript 4.8
|
|
33
|
+
* npm: drop @types/mkdirp
|
|
34
|
+
* update deps
|
|
35
|
+
|
|
1
36
|
0.5.0
|
|
2
37
|
============
|
|
3
38
|
|
package/lib/downloader/index.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];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/downloader/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/downloader/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2DAA4C;AAApC,4GAAA,MAAM,OAAA;AACd,+BAA0C;AAAlC,0GAAA,kBAAkB,OAAA;AAC1B,iCAA8C;AAAtC,8GAAA,qBAAqB,OAAA;AAC7B,mEAA8D;AAAtD,8HAAA,oBAAoB,OAAA;AAC5B,mCAAgD;AAAxC,gHAAA,sBAAsB,OAAA;AAC9B,iDAAiC;AACjC,6CAAyC;AAAjC,yGAAA,UAAU,OAAA;AAClB,4DAA4C"}
|
package/lib/downloader/main.js
CHANGED
|
@@ -63,14 +63,14 @@ class AbstractDownloader {
|
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
_addProcessedResource(res) {
|
|
66
|
-
var _a
|
|
66
|
+
var _a;
|
|
67
67
|
// noinspection DuplicatedCode
|
|
68
68
|
if (res.depth > this.options.maxDepth) {
|
|
69
69
|
logger_1.skip.info('skipped max depth', res.url, res.refUrl, res.depth);
|
|
70
70
|
return false;
|
|
71
71
|
}
|
|
72
72
|
let url;
|
|
73
|
-
const uri = (((
|
|
73
|
+
const uri = (((_a = res === null || res === void 0 ? void 0 : res.uri) === null || _a === void 0 ? void 0 : _a.clone()) || (0, urijs_1.default)(res.url)).hash('');
|
|
74
74
|
if (this.options.deduplicateStripSearch) {
|
|
75
75
|
url = uri.search('').toString();
|
|
76
76
|
}
|
|
@@ -96,10 +96,10 @@ class AbstractDownloader {
|
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
handleError(err, cause, resource) {
|
|
99
|
-
var _a
|
|
99
|
+
var _a;
|
|
100
100
|
// force cast in case of typescript 4.4
|
|
101
101
|
if (err && err.name === 'HTTPError' &&
|
|
102
|
-
((
|
|
102
|
+
((_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.statusCode) === 404) {
|
|
103
103
|
logger_1.notFound.error(resource.url, resource.downloadLink, resource.refUrl);
|
|
104
104
|
}
|
|
105
105
|
else if (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/downloader/main.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/downloader/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,8 @@ class PipelineExecutorImpl {
|
|
|
65
65
|
localSrcRoot: this.options.localSrcRoot,
|
|
66
66
|
encoding: (_a = encoding !== null && encoding !== void 0 ? encoding : this.options.encoding[type]) !== null && _a !== void 0 ? _a : 'utf8',
|
|
67
67
|
keepSearch: !this.options.deduplicateStripSearch,
|
|
68
|
-
skipReplacePathError: this.options.skipReplacePathError
|
|
68
|
+
skipReplacePathError: this.options.skipReplacePathError,
|
|
69
|
+
generateSavePathFn: this.lifeCycle.generateSavePath,
|
|
69
70
|
};
|
|
70
71
|
return this.lifeCycle.createResource(arg);
|
|
71
72
|
}
|
|
@@ -84,7 +85,6 @@ class PipelineExecutorImpl {
|
|
|
84
85
|
return processedResource;
|
|
85
86
|
}
|
|
86
87
|
async download(res, requestOptions, options) {
|
|
87
|
-
var _a;
|
|
88
88
|
if (res.shouldBeDiscardedFromDownload) {
|
|
89
89
|
return undefined;
|
|
90
90
|
}
|
|
@@ -101,7 +101,7 @@ class PipelineExecutorImpl {
|
|
|
101
101
|
return undefined;
|
|
102
102
|
}
|
|
103
103
|
// if downloaded, end loop and return
|
|
104
|
-
if (
|
|
104
|
+
if (downloadedResource === null || downloadedResource === void 0 ? void 0 : downloadedResource.body) {
|
|
105
105
|
return downloadedResource;
|
|
106
106
|
}
|
|
107
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline-executor-impl.js","sourceRoot":"","sources":["../../src/downloader/pipeline-executor-impl.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pipeline-executor-impl.js","sourceRoot":"","sources":["../../src/downloader/pipeline-executor-impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -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];
|
|
@@ -61,8 +65,18 @@ class WorkerPool {
|
|
|
61
65
|
this.takeLog(info, message);
|
|
62
66
|
}
|
|
63
67
|
takeLog(info, message) {
|
|
64
|
-
var _a, _b, _c;
|
|
65
|
-
|
|
68
|
+
var _a, _b, _c, _d, _e;
|
|
69
|
+
if (!(message === null || message === void 0 ? void 0 : message.body)) {
|
|
70
|
+
logger.error.warn('Invalid formatted log', info.id);
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
const content = (_a = message === null || message === void 0 ? void 0 : message.body) === null || _a === void 0 ? void 0 : _a.content;
|
|
74
|
+
if (content === null || content === void 0 ? void 0 : content.length) {
|
|
75
|
+
(_c = (_b = logger === null || logger === void 0 ? void 0 : logger[message.body.logger]) === null || _b === void 0 ? void 0 : _b[message.body.level]) === null || _c === void 0 ? void 0 : _c.call(_b, info.id, ...content);
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
(_e = (_d = logger === null || logger === void 0 ? void 0 : logger[message.body.logger]) === null || _d === void 0 ? void 0 : _d[message.body.level]) === null || _e === void 0 ? void 0 : _e.call(_d, info.id);
|
|
79
|
+
}
|
|
66
80
|
}
|
|
67
81
|
complete(info, message) {
|
|
68
82
|
--info.load;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-pool.js","sourceRoot":"","sources":["../../src/downloader/worker-pool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker-pool.js","sourceRoot":"","sources":["../../src/downloader/worker-pool.ts"],"names":[],"mappings":"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"}
|
package/lib/index.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];
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA0C;AAC1C,iEAAiD;AACjD,gEAAgD;AAChD,2CAA2B;AAC3B,qDAAqC;AACrC,uDAAuC;AAEvC,+CAA+B"}
|
package/lib/io.js
CHANGED
|
@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.writeFile = exports.mkdirRetry = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const path_1 = require("path");
|
|
9
|
-
const mkdirp_1 =
|
|
9
|
+
const mkdirp_1 = require("mkdirp");
|
|
10
10
|
const logger_1 = require("./logger/logger");
|
|
11
11
|
const mkdirRetry = async (dir, retry = 3) => {
|
|
12
12
|
let error;
|
|
13
13
|
for (let i = 0; i < retry; i++) {
|
|
14
14
|
error = undefined;
|
|
15
15
|
try {
|
|
16
|
-
await (0, mkdirp_1.
|
|
16
|
+
await (0, mkdirp_1.mkdirp)(dir);
|
|
17
17
|
}
|
|
18
18
|
catch (e) {
|
|
19
19
|
error = e;
|
package/lib/io.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io.js","sourceRoot":"","sources":["../src/io.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"io.js","sourceRoot":"","sources":["../src/io.ts"],"names":[],"mappings":";;;;;;AACA,4CAAoB;AACpB,+BAA6B;AAC7B,mCAA8B;AAE9B,4CAA2E;AAEpE,MAAM,UAAU,GAAG,KAAK,EAAE,GAAW,EAAE,KAAK,GAAG,CAAC,EAAiB,EAAE;IACxE,IAAI,KAAqB,CAAC;IAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;QAC9B,KAAK,GAAG,SAAS,CAAC;QAClB,IAAI;YACF,MAAM,IAAA,eAAM,EAAC,GAAG,CAAC,CAAC;SACnB;QAAC,OAAO,CAAC,EAAE;YACV,KAAK,GAAG,CAAC,CAAC;YACV,IAAI,CAAC,GAAG,CAAC,EAAE;gBACT,cAAW,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;aACxD;iBAAM;gBACL,cAAW,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;aACxD;YACD,SAAS;SACV;QACD,KAAK,GAAG,SAAS,CAAC;QAClB,OAAO;KACR;IACD,IAAI,KAAK,EAAE;QACT,MAAM,KAAK,CAAC;KACb;AACH,CAAC,CAAC;AArBW,QAAA,UAAU,cAqBrB;AAEK,MAAM,SAAS,GAAG,KAAK,EAC5B,QAAgB,EAChB,IAAkB,EAClB,QAA0B,EAC1B,KAAqB,EACrB,KAAqB,EACN,EAAE;IACjB,MAAM,GAAG,GAAW,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACvB,MAAM,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAC;KACvB;IACD,IAAI,QAA6B,CAAC;IAClC,IAAI,OAAqC,CAAC;IAC1C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,QAAQ,GAAG,IAAI,CAAC;QAChB,OAAO,GAAG,EAAC,QAAQ,EAAC,CAAC;KACtB;SAAM,IAAI,IAAI,YAAY,WAAW,EAAE;QACtC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAC9B;SAAM,IAAI,IAAI,YAAY,UAAU,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC9D,QAAQ,GAAG,IAAI,CAAC;KACjB;SAAM,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACnC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;KACvE;SAAM;QACL,oBAAoB;QACpB,MAAM,IAAI,SAAS,CAAC,6BAA6B,CAAC,CAAC;KACpD;IACD,IAAI,OAAO,EAAE;QACX,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC1D;SAAM;QACL,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;KACjD;IACD,qBAAqB;IACrB,IAAI,KAAK,EAAE;QACT,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,KAAK,CAAC;SACf;QACD,IAAI;YACF,MAAM,YAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SAClD;QAAC,OAAO,CAAC,EAAE;YACV,cAAW,CAAC,IAAI,CAAC,kBAAkB,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC;SACpD;KACF;AACH,CAAC,CAAC;AA1CW,QAAA,SAAS,aA0CpB"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.processHtmlAsync = exports.processHtml = exports.parseHtml = exports.processRedirectedUrl = exports.redirectFilter = exports.requestRedirect = exports.preProcess = exports.dropResource = exports.skipProcess = void 0;
|
|
7
|
-
const cheerio_1 =
|
|
4
|
+
const cheerio_1 = require("cheerio");
|
|
8
5
|
const resource_1 = require("../resource");
|
|
9
6
|
const util_1 = require("../util");
|
|
10
7
|
const skipProcess = (fn) => (url, element, parent) => fn(url, element, parent) ? undefined : url;
|
|
@@ -57,9 +54,9 @@ exports.processRedirectedUrl = processRedirectedUrl;
|
|
|
57
54
|
const parseHtml = (res, options) => {
|
|
58
55
|
const encoding = res.encoding || options.encoding[res.type] || 'utf8';
|
|
59
56
|
if (options.cheerioParse) {
|
|
60
|
-
return cheerio_1.
|
|
57
|
+
return (0, cheerio_1.load)((0, util_1.toString)(res.body, encoding), options.cheerioParse);
|
|
61
58
|
}
|
|
62
|
-
return cheerio_1.
|
|
59
|
+
return (0, cheerio_1.load)((0, util_1.toString)(res.body, encoding));
|
|
63
60
|
};
|
|
64
61
|
exports.parseHtml = parseHtml;
|
|
65
62
|
const processHtml = (fn) => (res, submit, options) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapters.js","sourceRoot":"","sources":["../../src/life-cycle/adapters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adapters.js","sourceRoot":"","sources":["../../src/life-cycle/adapters.ts"],"names":[],"mappings":"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"}
|
|
@@ -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];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-resource.js","sourceRoot":"","sources":["../../src/life-cycle/download-resource.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"download-resource.js","sourceRoot":"","sources":["../../src/life-cycle/download-resource.ts"],"names":[],"mappings":"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"}
|
|
@@ -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];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-streaming-resource.js","sourceRoot":"","sources":["../../src/life-cycle/download-streaming-resource.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"download-streaming-resource.js","sourceRoot":"","sources":["../../src/life-cycle/download-streaming-resource.ts"],"names":[],"mappings":"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"}
|
package/lib/life-cycle/index.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];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/life-cycle/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/life-cycle/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAsC;AACtC,2DAAsD;AAA9C,sHAAA,gBAAgB,OAAA;AACxB,+DAA0D;AAAlD,0HAAA,kBAAkB,OAAA;AAC1B,yDAE6B;AAD3B,oHAAA,eAAe,OAAA;AAAE,6GAAA,QAAQ,OAAA;AAAE,uHAAA,kBAAkB,OAAA;AAAE,qHAAA,gBAAgB,OAAA;AAEjE,6EAIuC;AAHrC,sIAAA,uBAAuB,OAAA;AACvB,wIAAA,yBAAyB,OAAA;AACzB,gJAAA,iCAAiC,OAAA;AAGnC,6CAAyD;AAAjD,6GAAA,cAAc,OAAA;AAAE,yGAAA,UAAU,OAAA;AAClC,+CAA2C;AAAnC,2GAAA,WAAW,OAAA;AACnB,uDAAkD;AAA1C,kHAAA,cAAc,OAAA;AACtB,6CAAyC;AAAjC,yGAAA,UAAU,OAAA;AAClB,yDAA4E;AAApE,4HAAA,uBAAuB,OAAA;AAAE,mHAAA,cAAc,OAAA;AAC/C,iEAA2D;AAAnD,2HAAA,kBAAkB,OAAA;AAC1B,2CAAuC;AAA/B,uGAAA,SAAS,OAAA;AACjB,iDAAiC"}
|
|
@@ -1,17 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.processSiteMap = void 0;
|
|
7
|
-
const cheerio_1 =
|
|
4
|
+
const cheerio_1 = require("cheerio");
|
|
8
5
|
const resource_1 = require("../resource");
|
|
9
6
|
const util_1 = require("../util");
|
|
10
7
|
async function processSiteMap(res, submit, options, pipeline) {
|
|
11
8
|
if (res.type !== resource_1.ResourceType.SiteMap) {
|
|
12
9
|
return res;
|
|
13
10
|
}
|
|
14
|
-
const $ = cheerio_1.
|
|
11
|
+
const $ = (0, cheerio_1.load)((0, util_1.toString)(res.body, res.encoding || options.encoding[resource_1.ResourceType.SiteMap] || 'utf8'));
|
|
15
12
|
const urlSet = new Set();
|
|
16
13
|
const depth = res.depth + 1;
|
|
17
14
|
// noinspection CssInvalidHtmlTagReference
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-site-map.js","sourceRoot":"","sources":["../../src/life-cycle/process-site-map.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process-site-map.js","sourceRoot":"","sources":["../../src/life-cycle/process-site-map.ts"],"names":[],"mappings":";;;AAAA,qCAA6B;AAG7B,0CAAmD;AACnD,kCAAiC;AAI1B,KAAK,UAAU,cAAc,CAClC,GAAqB,EACrB,MAA0B,EAC1B,OAA8B,EAC9B,QAA0B;IAC1B,IAAI,GAAG,CAAC,IAAI,KAAK,uBAAY,CAAC,OAAO,EAAE;QACrC,OAAO,GAAG,CAAC;KACZ;IACD,MAAM,CAAC,GAAkB,IAAA,cAAI,EAAC,IAAA,eAAQ,EAAC,GAAG,CAAC,IAAI,EAC7C,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,uBAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC;IACrE,MAAM,MAAM,GAAgB,IAAI,GAAG,EAAE,CAAC;IACtC,MAAM,KAAK,GAAW,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC;IACpC,0CAA0C;IAC1C,CAAC,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACtC,IAAI,GAAG,GAAW,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAChC,IAAI,GAAG,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACjD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAa,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,IAAI,GAAkB,EAAE,CAAkB,CAAC;IAC3C,8BAA8B;IAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3C,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACd,CAAC,GAAG,MAAM,QAAQ,CAAC,wBAAwB,CACzC,GAAG,EAAE,uBAAY,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAC5C,IAAI,CAAC,CAAC;YAAE,SAAS;QACjB,IAAI,CAAC,CAAC,CAAC,6BAA6B,EAAE;YACpC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACnB;KACF;IACD,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;IACxB,OAAO,GAAG,CAAC;AACb,CAAC;AAlCD,wCAkCC"}
|
|
@@ -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];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-or-copy-local-resource.js","sourceRoot":"","sources":["../../src/life-cycle/read-or-copy-local-resource.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"read-or-copy-local-resource.js","sourceRoot":"","sources":["../../src/life-cycle/read-or-copy-local-resource.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,2BAAmC;AACnC,0CAAmD;AAGnD,6CAAsD;AAEtD,MAAM,WAAW,GAAG,SAAS,CAAC;AAEvB,KAAK,UAAU,uBAAuB,CAC3C,GAAa,EACb,cAA8B,EAC9B,OAA8B;;IAE9B,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,OAAO,GAAuB,CAAC;KAChC;IACD,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;QAC7C,OAAO,GAAG,CAAC;KACZ;IACD,IAAI,CAAC,GAAG,CAAC,sBAAsB,EAAE;QAC/B,GAAG,CAAC,sBAAsB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACxC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,sBAAsB,GAAG,GAAG,CAAC,eAAe,CAAC;KACjE;IACD,IAAI,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7D,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO;KACR;IACD,sBAAsB;IACtB,IAAI,KAAmB,CAAC;IACxB,IAAI,GAAG,CAAC,IAAI,KAAK,uBAAY,CAAC,IAAI,EAAE;QAClC,KAAK,GAAG,MAAM,aAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;YACvB,KAAK,MAAM,KAAK,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,EAAE;gBAC/C,IAAI,MAAM,aAAQ,CAAC,MAAM,CAAC,WAAW,GAAG,GAAG,GAAG,KAAK,CAAC;qBACjD,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE;oBACtC,WAAW,IAAI,GAAG,GAAG,KAAK,CAAC;oBAC3B,MAAM;iBACP;aACF;SACF;KACF;IACD,IAAI,GAAG,CAAC,IAAI,KAAM,uBAAY,CAAC,eAAe,EAAE;QAC9C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAA,GAAG,CAAC,SAAS,mCAAI,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjF,MAAM,aAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;KACpD;SAAM;QACL,GAAG,CAAC,IAAI,GAAG,MAAM,aAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE;YAC9C,QAAQ,EAAE,GAAG,CAAC,QAAQ;SACvB,CAAC,CAAC;KACJ;IACD,IAAI;QACF,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,MAAM,aAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC1C;QACD,IAAI,KAAK,EAAE;YACT,GAAG,CAAC,IAAI,CAAC,OAAO,GAAG;gBACjB,eAAe,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE;gBAC1C,gBAAgB,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;aACxC,CAAC;SACH;KACF;IAAC,OAAO,CAAC,EAAE;QACV,cAAW,CAAC,IAAI,CAAC,OAAO,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC;KAC5C;IACD,GAAG,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACjC,GAAG,CAAC,YAAY;QACd,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,sBAAsB,CAAC;IAEnD,IAAI,GAAG,CAAC,IAAI,KAAM,uBAAY,CAAC,eAAe,EAAE;QAC9C,OAAO;KACR;IACD,OAAO,GAAuB,CAAC;AACjC,CAAC;AA9DD,0DA8DC"}
|
|
@@ -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];
|
|
@@ -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,7 +5,7 @@ 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
11
|
const logger = (0, log4js_1.getLogger)(category);
|
|
@@ -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/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') {
|
|
@@ -275,9 +280,10 @@ 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
288
|
const refUri = (0, urijs_1.default)(refUrl);
|
|
283
289
|
let replacePathHasError = false;
|
|
@@ -316,10 +322,11 @@ 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
331
|
const replaceUri = replacePathHasError ? (0, urijs_1.default)(rawUrl) :
|
|
325
332
|
(0, urijs_1.default)((0, exports.urlOfSavePath)(savePath)).relativeTo((0, exports.urlOfSavePath)(refSavePath));
|
package/lib/resource.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAwB;AAExB,2CAA6B;AAC7B,iCAA+E;AAE/E,4CAA6C;AAE7C,IAAY,YAkCX;AAlCD,WAAY,YAAY;IACtB;;OAEG;IACH,mDAAU,CAAA;IACV;;OAEG;IACH,+CAAI,CAAA;IACJ;;OAEG;IACH,6CAAG,CAAA;IACH;;;OAGG;IACH,yDAAS,CAAA;IACT;;OAEG;IACH,qDAAO,CAAA;IACP;;;OAGG;IACH,6CAAG,CAAA;IACH;;;;;OAKG;IACH,qEAAe,CAAA;AACjB,CAAC,EAlCW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAkCvB;AAoKD,SAAgB,uBAAuB,CAAC,GAAa;IACnD,MAAM,KAAK,GAAyB,EAAE,CAAC;IACvC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAClC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACpC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,IAAI,GAAG,KAAK,MAAM,EAAE;gBAClB,MAAM,KAAK,GAA4B,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;gBACvD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBACrC,+BAA+B;oBAC/B,IAAI,IAAI,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE;wBACzD,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;qBAC3B;iBACF;aACF;iBAAM,IAAI,GAAG,KAAK,MAAM,IAAI,CAC3B,OAAO,KAAK,KAAK,QAAQ;gBACzB,KAAK,YAAY,WAAW;gBAC5B,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;gBACzB,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;gBACzB,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aACpB;SACF;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;SAChC;KACF;IACD,OAAO,KAAoB,CAAC;AAC9B,CAAC;AAzBD,0DAyBC;AA2DD;;;;;;GAMG;AACH,SAAgB,gBAAgB,CAC9B,GAAQ,EACR,MAAgB,EAChB,UAAoB,EACpB,YAAqB;IAErB,IAAI,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,KAAK,MAAM,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,6CAA6C;cACzD,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;KACrB;IAED,IAAI,QAAgB,CAAC;IACrB,IAAI,GAAG,CAAC,QAAQ,EAAE,KAAK,MAAM,EAAE;QAC7B,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,4DAA4D;kBACxE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;SACrB;QACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;YAC9B,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YAClC,uBAAuB;YACvB,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACzD,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;gBACvB,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAC9B;SACF;aAAM;YACL,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SACtD;KACF;SAAM;QACL,MAAM,IAAI,GAAW,GAAG,CAAC,QAAQ,EAAE,CAAC;QACpC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,EAAE,IAAA,iBAAU,EAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;KAC1D;IAED,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACzC,IAAI,GAAG,CAAC,QAAQ,EAAE,KAAK,MAAM,IAAI,QAAQ,KAAK,EAAE;YAC9C,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACnD,QAAQ,IAAI,YAAY,CAAC;SAC1B;aAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACpC,QAAQ,IAAI,GAAG,CAAC;SACjB;aAAM;YACL,QAAQ,IAAI,OAAO,CAAC;SACrB;KACF;IAED,IAAI,UAAU,EAAE;QACd,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;QAC1B,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,IAAI,MAAM,CAAC,MAAM,GAAG,EAAE,EAAE;gBACtB,MAAM,OAAO,GAAG,IAAA,qBAAc,EAAC,MAAM,CAAC,CAAC;gBACvC,MAAM,MAAM,GAAG,IAAA,uBAAgB,EAAC,OAAO,CAAC,CAAC;gBACzC,cAAG,CAAC,KAAK,CAAC,sCAAsC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;gBACnE,wBAAwB;gBACxB,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC;aACvB;iBAAM;gBACL,WAAW;gBACX,MAAM,GAAG,IAAA,iBAAU,EAAC,IAAA,qBAAc,EAAC,MAAM,CAAC,CAAC,CAAC;aAC7C;YACD,MAAM,GAAG,GAAW,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC3C,IAAI,GAAG,EAAE;gBACP,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,GAAG,CAAC;aAC1D;iBAAM;gBACL,QAAQ,IAAI,MAAM,CAAC;aACpB;SACF;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAjED,4CAiEC;AAEM,MAAM,aAAa,GAAG,CAAC,QAAgB,EAAU,EAAE;IACxD,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC3B,OAAO,WAAW,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;KAClD;IACD,OAAO,WAAW,QAAQ,EAAE,CAAC;AAC/B,CAAC,CAAC;AALW,QAAA,aAAa,iBAKxB;AAEF;;;;;;;;;;GAUG;AACH,SAAgB,gBAAgB,CAC9B,GAAQ,EACR,MAAW,EACX,oBAAyC,EACzC,GAAW,EACX,MAAc,EACd,IAAkB;IAElB,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAChC,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC;IAC9C,IAAI,QAAQ,KAAK,MAAM;QACrB,QAAQ,KAAK,OAAO;QACpB,QAAQ,KAAK,MAAM;QACnB,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,EAAE;QAC9C,IAAI,oBAAoB,EAAE;YACxB,cAAG,CAAC,IAAI,CAAC,kCAAkC,EACzC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAC/B,mBAAmB,GAAG,IAAI,CAAC;SAC5B;aAAM;YACL,cAAG,CAAC,IAAI,CAAC,kCAAkC,EACzC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,YAAY,QAAQ,gBAAgB,CAAC,CAAC;SACvD;KACF;IACD,IAAI,QAAQ,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE;QACtC,IAAI,oBAAoB,EAAE;YACxB,cAAG,CAAC,IAAI,CAAC,qDAAqD,EAC5D,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAC/B,mBAAmB,GAAG,IAAI,CAAC;SAC5B;aAAM;YACL,cAAG,CAAC,IAAI,CAAC,qDAAqD,EAC5D,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAC9D;KACF;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AApCD,4CAoCC;AAED,MAAM,oBAAoB,GAAG,UAAU,CAAC;AAExC,SAAgB,cAAc,CAC5B,GAAW,EACX,MAAc,EACd,YAAqB,EACrB,oBAA8B;IAE9B,IAAI,IAAA,gBAAS,EAAC,GAAG,CAAC,EAAE;QAClB,OAAO,GAAG,CAAC;KACZ;IACD,IAAI,KAAyB,CAAC;IAC9B,IAAI,CAAC,YAAY,EAAE;QACjB,KAAK,GAAG,2CAA2C,CAAC;KACrD;IACD,qBAAqB;IACrB,IAAI,YAAY,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QAC3C,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACtC;IACD,IAAI,CAAC,KAAK,IAAI,YAAY,IAAI,GAAG,CAAC,UAAU,CAAC,oBAAoB,CAAC;QAChE,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QAClE,KAAK,GAAG,sDAAsD,CAAC;KAChE;IACD,IAAI,CAAC,KAAK,IAAI,YAAY,IAAI,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC;QACnE,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QACrE,KAAK,GAAG,yDAAyD,CAAC;KACnE;IACD,IAAI,CAAC,KAAK,IAAI,YAAY,EAAE;QAC1B,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC9B,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC1C;QACD,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACxB,GAAG,GAAG,oBAAoB,GAAG,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC1D;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC9B,GAAG,GAAG,oBAAoB,GAAG,YAAY,GAAG,GAAG,CAAC;SACjD;aAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;YAChD,eAAe;YACf,MAAM,cAAc,GAAG,IAAA,eAAG,EAAC,oBAAoB;gBAC7C,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;YACnE,MAAM,GAAG,GAAG,IAAA,eAAG,EAAC,GAAG,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAChD,GAAG,GAAG,oBAAoB,GAAG,YAAY,GAAG,GAAG,CAAC,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;SACzE;KACF;IACD,IAAI,KAAK,EAAE;QACT,IAAI,oBAAoB,EAAE;YACxB,cAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;YAC3C,OAAO,EAAE,CAAC;SACX;aAAM;YACL,cAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;SACxB;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AApDD,wCAoDC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAgB,cAAc,CAAC,EAC7B,IAAI,EACJ,KAAK,EACL,GAAG,EACH,MAAM,EACN,WAAW,EACX,OAAO,EACP,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,oBAAoB,EACG;IACvB,MAAM,MAAM,GAAW,GAAG,CAAC;IAC3B,MAAM,MAAM,GAAQ,IAAA,eAAG,EAAC,MAAM,CAAC,CAAC;IAChC,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAChC,IAAI,GAAG,CAAC,UAAU,CAAC,oBAAoB,CAAC;QACtC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;QACzC,oCAAoC;QACpC,UAAU,GAAG,KAAK,CAAC;QACnB,GAAG,GAAG,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,oBAAoB,CAAC,CAAC;QACtE,IAAI,CAAC,GAAG,EAAE;YACR,mBAAmB,GAAG,IAAI,CAAC;YAC3B,GAAG,GAAG,MAAM,CAAC;SACd;KACF;IACD,IAAI,CAAC,mBAAmB,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QAChD,6BAA6B;QAC7B,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,GAAG,CAAC;KACrC;SAAM,IAAI,CAAC,mBAAmB,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QACjD,gBAAgB;QAChB,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC;KACvD;IACD,IAAI,GAAG,GAAG,IAAA,eAAG,EAAC,GAAG,CAAC,CAAC;IAEnB,IAAI,CAAC,mBAAmB,IAAI,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QAC9C,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC7B,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;KACtB;IAED,IAAI,CAAC,mBAAmB;QACtB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,oBAAoB,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QACxE,mBAAmB,GAAG,IAAI,CAAC;KAC5B;IAED,IAAI,YAAoB,CAAC;IACzB,IAAI,GAAG,CAAC,QAAQ,EAAE,KAAK,MAAM,EAAE;QAC7B,uCAAuC;QACvC,YAAY,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;KAC3D;SAAM;QACL,YAAY,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;KAChD;IAED,+BAA+B;IAC/B,MAAM,QAAQ,GAAG,mBAAmB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAC9D,GAAG,EAAE,IAAI,KAAK,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;IAC7D,IAAI,CAAC,WAAW,EAAE;QAChB,WAAW,GAAG,gBAAgB,CAAC,MAAM,EAAE,OAAO,KAAK,YAAY,CAAC,IAAI,EAClE,KAAK,EAAE,YAAY,CAAC,CAAC;KACxB;IACD,MAAM,UAAU,GAAG,mBAAmB,CAAC,CAAC,CAAC,IAAA,eAAG,EAAC,MAAM,CAAC,CAAC,CAAC;QACpD,IAAA,eAAG,EAAC,IAAA,qBAAa,EAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAA,qBAAa,EAAC,WAAW,CAAC,CAAC,CAAC;IAEtE,eAAe;IACf,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE;QACd,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;KAC7B;IAED,kCAAkC;IAClC,IAAI,CAAC,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE;QAC/B,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACf,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;KACtB;IAED,MAAM,QAAQ,GAAa;QACzB,IAAI;QACJ,KAAK;QACL,QAAQ,EAAE,QAAQ,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;QACpE,GAAG;QACH,MAAM;QACN,YAAY;QACZ,MAAM;QACN,WAAW;QACX,QAAQ;QACR,SAAS;QACT,WAAW,EAAE,UAAU,CAAC,QAAQ,EAAE;QAClC,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE;QAC3B,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,EAAE;QACR,GAAG;QACH,MAAM;QACN,UAAU;QACV,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE;KACrB,CAAC;IACF,IAAI,mBAAmB,EAAE;QACvB,qDAAqD;QACrD,QAAQ,CAAC,6BAA6B,GAAG,IAAI,CAAC;KAC/C;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAnGD,wCAmGC;AAED,SAAgB,iBAAiB,CAAC,GAAgB;;IAChD,MAAM,QAAQ,GAAG,GAAsC,CAAC;IACxD,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;QACjB,QAAQ,CAAC,GAAG,GAAG,IAAA,eAAG,EAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;KAClC;IACD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QACpB,QAAQ,CAAC,MAAM,GAAG,IAAA,eAAG,EAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;KACxC;IACD,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;QACxB,QAAQ,CAAC,UAAU,GAAG,IAAA,eAAG,EAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;KACjD;IACD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAClB,QAAQ,CAAC,IAAI,GAAG,MAAA,QAAQ,CAAC,GAAG,0CAAE,QAAQ,EAAE,CAAC;KAC1C;IACD,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,sBAAsB,EAAE;QACzD,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,sBAAsB,GAAG,QAAQ,CAAC,eAAe,CAAC;KAChF;IACD,IAAI,CAAC,QAAQ,CAAC,YAAY;QACtB,QAAQ,CAAC,eAAe;QACxB,QAAQ,CAAC,sBAAsB,EAAE;QACnC,QAAQ,CAAC,YAAY;YACnB,QAAQ,CAAC,eAAe,GAAG,QAAQ,CAAC,sBAAsB,CAAC;KAC9D;IACD,IAAI,QAAQ,CAAC,IAAI,YAAY,WAAW,IAAI,QAAQ,CAAC,IAAI,YAAY,UAAU,EAAE;QAC/E,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KAC5C;SAAM,IAAI,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC5C,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CACzB,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KAC7E;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AA9BD,8CA8BC"}
|
|
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
|
@@ -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,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "website-scrap-engine",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.7.0",
|
|
4
4
|
"description": "Configurable website scraper in typescript",
|
|
5
5
|
"main": "lib",
|
|
6
6
|
"types": "lib",
|
|
@@ -21,26 +21,25 @@
|
|
|
21
21
|
"preset": "ts-jest"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"cheerio": "^1.0.0-rc.
|
|
24
|
+
"cheerio": "^1.0.0-rc.12",
|
|
25
25
|
"css-url-parser": "^1.1.3",
|
|
26
|
-
"got": "^11.8.
|
|
27
|
-
"log4js": "^6.
|
|
28
|
-
"mkdirp": "^
|
|
26
|
+
"got": "^11.8.6",
|
|
27
|
+
"log4js": "^6.9.1",
|
|
28
|
+
"mkdirp": "^3.0.0",
|
|
29
29
|
"p-queue": "^6.6.2",
|
|
30
30
|
"srcset": "^4.0.0",
|
|
31
|
-
"urijs": "^1.19.
|
|
31
|
+
"urijs": "^1.19.11"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@types/jest": "^27.
|
|
35
|
-
"@types/
|
|
36
|
-
"@types/
|
|
37
|
-
"@
|
|
38
|
-
"@typescript-eslint/
|
|
39
|
-
"
|
|
40
|
-
"
|
|
41
|
-
"jest": "^27.
|
|
42
|
-
"
|
|
43
|
-
"typescript": "^4.5.2"
|
|
34
|
+
"@types/jest": "^27.5.2",
|
|
35
|
+
"@types/node": "^18.15.13",
|
|
36
|
+
"@types/urijs": "^1.19.19",
|
|
37
|
+
"@typescript-eslint/eslint-plugin": "^5.59.0",
|
|
38
|
+
"@typescript-eslint/parser": "^5.59.0",
|
|
39
|
+
"eslint": "^8.38.0",
|
|
40
|
+
"jest": "^27.5.1",
|
|
41
|
+
"ts-jest": "^27.1.5",
|
|
42
|
+
"typescript": "^5.0.4"
|
|
44
43
|
},
|
|
45
44
|
"files": [
|
|
46
45
|
".editorconfig",
|
|
@@ -115,7 +115,8 @@ export class PipelineExecutorImpl implements PipelineExecutor {
|
|
|
115
115
|
localSrcRoot: this.options.localSrcRoot,
|
|
116
116
|
encoding: encoding ?? this.options.encoding[type] ?? 'utf8',
|
|
117
117
|
keepSearch: !this.options.deduplicateStripSearch,
|
|
118
|
-
skipReplacePathError: this.options.skipReplacePathError
|
|
118
|
+
skipReplacePathError: this.options.skipReplacePathError,
|
|
119
|
+
generateSavePathFn: this.lifeCycle.generateSavePath,
|
|
119
120
|
};
|
|
120
121
|
return this.lifeCycle.createResource(arg);
|
|
121
122
|
}
|
|
@@ -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/io.ts
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import fs from 'fs';
|
|
2
1
|
import type {ObjectEncodingOptions} from 'fs';
|
|
2
|
+
import fs from 'fs';
|
|
3
3
|
import {dirname} from 'path';
|
|
4
|
-
import
|
|
4
|
+
import {mkdirp} from 'mkdirp';
|
|
5
5
|
import type {ResourceBody, ResourceEncoding} from './resource';
|
|
6
|
-
import {
|
|
6
|
+
import {error as errorLogger, mkdir as mkdirLogger} from './logger/logger';
|
|
7
7
|
|
|
8
8
|
export const mkdirRetry = async (dir: string, retry = 3): Promise<void> => {
|
|
9
9
|
let error: unknown | void;
|
|
10
10
|
for (let i = 0; i < retry; i++) {
|
|
11
11
|
error = undefined;
|
|
12
12
|
try {
|
|
13
|
-
await
|
|
13
|
+
await mkdirp(dir);
|
|
14
14
|
} catch (e) {
|
|
15
15
|
error = e;
|
|
16
16
|
if (i > 0) {
|
|
@@ -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,
|
|
@@ -99,9 +99,9 @@ export const parseHtml = (
|
|
|
99
99
|
const encoding: ResourceEncoding =
|
|
100
100
|
res.encoding || options.encoding[res.type] || 'utf8';
|
|
101
101
|
if (options.cheerioParse) {
|
|
102
|
-
return
|
|
102
|
+
return load(toString(res.body, encoding), options.cheerioParse);
|
|
103
103
|
}
|
|
104
|
-
return
|
|
104
|
+
return load(toString(res.body, encoding));
|
|
105
105
|
};
|
|
106
106
|
|
|
107
107
|
export const processHtml = (fn: HtmlProcessFunc): ProcessResourceAfterDownloadFunc =>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import {load} from 'cheerio';
|
|
2
2
|
import type {DownloadResource, SubmitResourceFunc} from './types';
|
|
3
3
|
import type {StaticDownloadOptions} from '../options';
|
|
4
4
|
import {Resource, ResourceType} from '../resource';
|
|
@@ -14,7 +14,7 @@ export async function processSiteMap(
|
|
|
14
14
|
if (res.type !== ResourceType.SiteMap) {
|
|
15
15
|
return res;
|
|
16
16
|
}
|
|
17
|
-
const $: CheerioStatic =
|
|
17
|
+
const $: CheerioStatic = load(toString(res.body,
|
|
18
18
|
res.encoding || options.encoding[ResourceType.SiteMap] || 'utf8'));
|
|
19
19
|
const urlSet: Set<string> = new Set();
|
|
20
20
|
const depth: number = res.depth + 1;
|
package/src/life-cycle/types.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type {Options as GotOptions} from 'got/dist/source/as-promise';
|
|
2
2
|
import type {
|
|
3
3
|
createResource,
|
|
4
|
+
GenerateSavePathFn,
|
|
4
5
|
Resource,
|
|
5
6
|
ResourceBody,
|
|
6
7
|
ResourceType
|
|
@@ -176,6 +177,7 @@ export interface ProcessingLifeCycle {
|
|
|
176
177
|
init: InitLifeCycleFunc[];
|
|
177
178
|
linkRedirect: LinkRedirectFunc[];
|
|
178
179
|
detectResourceType: DetectResourceTypeFunc[];
|
|
180
|
+
generateSavePath?: GenerateSavePathFn | void;
|
|
179
181
|
createResource: typeof createResource;
|
|
180
182
|
/**
|
|
181
183
|
* link in parent resource would be replaced after this
|
|
@@ -4,7 +4,7 @@ import type {LogWorkerMessage, WorkerLog} from '../downloader/worker-type';
|
|
|
4
4
|
import {WorkerMessageType} from '../downloader/types';
|
|
5
5
|
|
|
6
6
|
export const logLevels = [
|
|
7
|
-
'
|
|
7
|
+
'trace', 'debug', 'info', 'warn', 'error', 'fatal', 'mark'
|
|
8
8
|
] as const;
|
|
9
9
|
|
|
10
10
|
export function getWorkerLogger(category: WorkerLog['logger']): Logger {
|
package/src/resource.ts
CHANGED
|
@@ -285,6 +285,10 @@ export interface CreateResourceArgument {
|
|
|
285
285
|
* https://github.com/website-local/website-scrap-engine/issues/107
|
|
286
286
|
*/
|
|
287
287
|
skipReplacePathError?: boolean;
|
|
288
|
+
/**
|
|
289
|
+
* Set this to use a custom implementation of {@link generateSavePath}
|
|
290
|
+
*/
|
|
291
|
+
generateSavePathFn?: GenerateSavePathFn | void;
|
|
288
292
|
}
|
|
289
293
|
|
|
290
294
|
/**
|
|
@@ -293,6 +297,7 @@ export interface CreateResourceArgument {
|
|
|
293
297
|
* @param isHtml should the savePath endsWith .html
|
|
294
298
|
* @param keepSearch keep url search params in file name
|
|
295
299
|
* @param localSrcRoot local source path to download from
|
|
300
|
+
* @return string must return non-empty string
|
|
296
301
|
*/
|
|
297
302
|
export function generateSavePath(
|
|
298
303
|
uri: URI,
|
|
@@ -361,6 +366,8 @@ export function generateSavePath(
|
|
|
361
366
|
return savePath;
|
|
362
367
|
}
|
|
363
368
|
|
|
369
|
+
export type GenerateSavePathFn = typeof generateSavePath;
|
|
370
|
+
|
|
364
371
|
export const urlOfSavePath = (savePath: string): string => {
|
|
365
372
|
if (savePath.includes('\\')) {
|
|
366
373
|
return `file:///${savePath.replace(/\\/g, '/')}`;
|
|
@@ -486,6 +493,7 @@ export function resolveFileUrl(
|
|
|
486
493
|
* @param encoding {@link CreateResourceArgument.encoding}
|
|
487
494
|
* @param keepSearch {@link CreateResourceArgument.keepSearch}
|
|
488
495
|
* @param skipReplacePathError {@link CreateResourceArgument.skipReplacePathError}
|
|
496
|
+
* @param generateSavePathFn {@link CreateResourceArgument.generateSavePathFn}
|
|
489
497
|
* @return the resource
|
|
490
498
|
*/
|
|
491
499
|
export function createResource({
|
|
@@ -499,7 +507,8 @@ export function createResource({
|
|
|
499
507
|
localSrcRoot,
|
|
500
508
|
encoding,
|
|
501
509
|
keepSearch,
|
|
502
|
-
skipReplacePathError
|
|
510
|
+
skipReplacePathError,
|
|
511
|
+
generateSavePathFn
|
|
503
512
|
}: CreateResourceArgument): Resource {
|
|
504
513
|
const rawUrl: string = url;
|
|
505
514
|
const refUri: URI = URI(refUrl);
|
|
@@ -541,11 +550,13 @@ export function createResource({
|
|
|
541
550
|
downloadLink = uri.clone().hash('').toString();
|
|
542
551
|
}
|
|
543
552
|
|
|
553
|
+
const implGenerateSavePath = generateSavePathFn || generateSavePath;
|
|
554
|
+
|
|
544
555
|
// make savePath and replaceUri
|
|
545
|
-
const savePath = replacePathHasError ? rawUrl :
|
|
556
|
+
const savePath = replacePathHasError ? rawUrl : implGenerateSavePath(
|
|
546
557
|
uri, type === ResourceType.Html, keepSearch, localSrcRoot);
|
|
547
558
|
if (!refSavePath) {
|
|
548
|
-
refSavePath =
|
|
559
|
+
refSavePath = implGenerateSavePath(refUri, refType === ResourceType.Html,
|
|
549
560
|
false, localSrcRoot);
|
|
550
561
|
}
|
|
551
562
|
const replaceUri = replacePathHasError ? URI(rawUrl) :
|
package/src/types.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import type {load} from 'cheerio';
|
|
2
2
|
|
|
3
3
|
// adapters for making cheerio's namespace type definitions to module
|
|
4
|
-
export type CheerioStatic = ReturnType<typeof
|
|
4
|
+
export type CheerioStatic = ReturnType<typeof load>;
|
|
5
5
|
export type Cheerio = ReturnType<CheerioStatic>;
|
|
6
|
-
export type CheerioOptionsInterface = NonNullable<Parameters<typeof
|
|
6
|
+
export type CheerioOptionsInterface = NonNullable<Parameters<typeof load>[1]>;
|
|
7
7
|
export type CheerioElement = Cheerio[number];
|
package/src/util.ts
CHANGED
|
@@ -88,10 +88,9 @@ export const hasOwnProperty = Object.prototype.hasOwnProperty;
|
|
|
88
88
|
* may lead to typescript parser errors.
|
|
89
89
|
*/
|
|
90
90
|
export const weakAssign = <T, U>(target: T, source: U): T & U => {
|
|
91
|
-
if (!target) return Object.assign({} as T
|
|
91
|
+
if (!target) return Object.assign({}, source) as T & U;
|
|
92
92
|
if (!source) return target as T & U;
|
|
93
|
-
|
|
94
|
-
for (key in source) {
|
|
93
|
+
for (const key in source) {
|
|
95
94
|
if (hasOwnProperty.call(source, key) &&
|
|
96
95
|
!hasOwnProperty.call(target, key)) {
|
|
97
96
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|