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,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];
|
|
@@ -18,12 +22,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
18
22
|
__setModuleDefault(result, mod);
|
|
19
23
|
return result;
|
|
20
24
|
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
21
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
29
|
exports.downloadResource = exports.requestForResource = exports.getRetry = exports.beforeRetryHook = void 0;
|
|
23
30
|
const got_1 = __importStar(require("got"));
|
|
24
31
|
const resource_1 = require("../resource");
|
|
25
32
|
const logger = __importStar(require("../logger/logger"));
|
|
26
33
|
const util_1 = require("../util");
|
|
34
|
+
const urijs_1 = __importDefault(require("urijs"));
|
|
27
35
|
/** Take logs before retry */
|
|
28
36
|
const beforeRetryHook = (options, error, retryCount) => {
|
|
29
37
|
if (!error) {
|
|
@@ -55,7 +63,7 @@ async function getRetry(url, options) {
|
|
|
55
63
|
err = void 0;
|
|
56
64
|
try {
|
|
57
65
|
optionsClone = Object.assign({}, options);
|
|
58
|
-
res = (await got_1.default(url, optionsClone));
|
|
66
|
+
res = (await (0, got_1.default)(url, optionsClone));
|
|
59
67
|
if (!res || !res.body || !res.body.length) {
|
|
60
68
|
logger.retry.warn(i, url, 'manually retry on empty response or body', res && res.body);
|
|
61
69
|
continue;
|
|
@@ -63,21 +71,22 @@ async function getRetry(url, options) {
|
|
|
63
71
|
break;
|
|
64
72
|
}
|
|
65
73
|
catch (e) {
|
|
74
|
+
// force cast for typescript 4.4
|
|
66
75
|
err = e;
|
|
67
|
-
if (
|
|
68
|
-
logger.retry.warn(i, url, 'manually retry on premature close',
|
|
69
|
-
await util_1.sleep(i * 200);
|
|
76
|
+
if (err && err.message === 'premature close') {
|
|
77
|
+
logger.retry.warn(i, url, 'manually retry on premature close', err.name, err.code, err.event, err.message);
|
|
78
|
+
await (0, util_1.sleep)(i * 200);
|
|
70
79
|
continue;
|
|
71
80
|
}
|
|
72
81
|
// these events might be accidentally unhandled
|
|
73
|
-
if (
|
|
74
|
-
(
|
|
82
|
+
if (err && !err.retryLimitExceeded &&
|
|
83
|
+
(err.name === 'RequestError' || err.name === 'TimeoutError') &&
|
|
75
84
|
// RequestError: Cannot read property 'request' of undefined
|
|
76
85
|
// at Object.exports.default (got\dist\source\core\utils\timed-out.js:56:23)
|
|
77
86
|
// error.code === undefined
|
|
78
|
-
(
|
|
79
|
-
logger.retry.warn(i, url, `manually retry on ${
|
|
80
|
-
await util_1.sleep(i * 300);
|
|
87
|
+
(err.code === 'ETIMEDOUT' || err.code === undefined)) {
|
|
88
|
+
logger.retry.warn(i, url, `manually retry on ${err.event} timeout`, err.name, err.code, err.message);
|
|
89
|
+
await (0, util_1.sleep)(i * 300);
|
|
81
90
|
continue;
|
|
82
91
|
}
|
|
83
92
|
throw e;
|
|
@@ -90,7 +99,7 @@ async function getRetry(url, options) {
|
|
|
90
99
|
return res;
|
|
91
100
|
}
|
|
92
101
|
exports.getRetry = getRetry;
|
|
93
|
-
async function requestForResource(res, requestOptions) {
|
|
102
|
+
async function requestForResource(res, requestOptions, options) {
|
|
94
103
|
const downloadLink = encodeURI(decodeURI(res.downloadLink));
|
|
95
104
|
const reqOptions = Object.assign({}, requestOptions);
|
|
96
105
|
reqOptions.responseType = 'buffer';
|
|
@@ -116,6 +125,11 @@ async function requestForResource(res, requestOptions) {
|
|
|
116
125
|
res.finishTimestamp = Date.now();
|
|
117
126
|
res.downloadTime = res.finishTimestamp - res.downloadStartTimestamp;
|
|
118
127
|
res.redirectedUrl = response.url;
|
|
128
|
+
// https://github.com/website-local/website-scrap-engine/issues/385
|
|
129
|
+
// 2011/11/15
|
|
130
|
+
if (res.redirectedUrl !== res.url) {
|
|
131
|
+
res.redirectedSavePath = (0, resource_1.generateSavePath)((0, urijs_1.default)(res.redirectedUrl), res.type === resource_1.ResourceType.Html, !(options === null || options === void 0 ? void 0 : options.deduplicateStripSearch), options === null || options === void 0 ? void 0 : options.localSrcRoot);
|
|
132
|
+
}
|
|
119
133
|
res.body = response.body;
|
|
120
134
|
return res;
|
|
121
135
|
}
|
|
@@ -127,14 +141,14 @@ async function downloadResource(res, requestOptions, options) {
|
|
|
127
141
|
if (res.type === resource_1.ResourceType.StreamingBinary) {
|
|
128
142
|
return res;
|
|
129
143
|
}
|
|
130
|
-
if (!util_1.isUrlHttp(res.downloadLink)) {
|
|
144
|
+
if (!(0, util_1.isUrlHttp)(res.downloadLink)) {
|
|
131
145
|
return res;
|
|
132
146
|
}
|
|
133
147
|
if (!res.downloadStartTimestamp) {
|
|
134
148
|
res.downloadStartTimestamp = Date.now();
|
|
135
149
|
res.waitTime = res.downloadStartTimestamp - res.createTimestamp;
|
|
136
150
|
}
|
|
137
|
-
let downloadedResource = await requestForResource(res, requestOptions);
|
|
151
|
+
let downloadedResource = await requestForResource(res, requestOptions, options);
|
|
138
152
|
if (!downloadedResource || !downloadedResource.body) {
|
|
139
153
|
return downloadedResource;
|
|
140
154
|
}
|
|
@@ -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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"}
|
|
@@ -46,6 +46,6 @@ export interface StreamingDownloadErrorHook {
|
|
|
46
46
|
* @param options
|
|
47
47
|
* @param pipeline
|
|
48
48
|
*/
|
|
49
|
-
(e: Error, res: Resource, requestOptions: RequestOptions, options: StaticDownloadOptions, pipeline: PipelineExecutor): AsyncResult<void>;
|
|
49
|
+
(e: Error | unknown, res: Resource, requestOptions: RequestOptions, options: StaticDownloadOptions, pipeline: PipelineExecutor): AsyncResult<void>;
|
|
50
50
|
}
|
|
51
51
|
export declare function downloadStreamingResourceWithHook(beforeDownload?: StreamingBeforeDownloadHook, afterDownload?: StreamingAfterDownloadHook, downloadError?: StreamingDownloadErrorHook): DownloadResourceFunc;
|
|
@@ -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];
|
|
@@ -32,7 +36,7 @@ const stream_1 = require("stream");
|
|
|
32
36
|
const util_1 = require("util");
|
|
33
37
|
const logger_1 = require("../logger/logger");
|
|
34
38
|
const util_2 = require("../util");
|
|
35
|
-
const promisifyPipeline = util_1.promisify(stream_1.pipeline);
|
|
39
|
+
const promisifyPipeline = (0, util_1.promisify)(stream_1.pipeline);
|
|
36
40
|
function isBytesAccepted(acceptRange) {
|
|
37
41
|
if (!acceptRange) {
|
|
38
42
|
return false;
|
|
@@ -65,8 +69,9 @@ async function streamingDownloadToFile(res, requestOptions) {
|
|
|
65
69
|
await fs_1.promises.access(savePath, fs_1.constants.W_OK);
|
|
66
70
|
}
|
|
67
71
|
catch (e) {
|
|
68
|
-
|
|
69
|
-
|
|
72
|
+
// force cast for typescript 4.4
|
|
73
|
+
if (e && e.code === 'ENOENT') {
|
|
74
|
+
await (0, io_1.mkdirRetry)(path_1.default.dirname(savePath));
|
|
70
75
|
}
|
|
71
76
|
else {
|
|
72
77
|
throw e;
|
|
@@ -91,7 +96,7 @@ async function streamingDownloadToFile(res, requestOptions) {
|
|
|
91
96
|
options.headers = {};
|
|
92
97
|
}
|
|
93
98
|
options.headers.range = `bytes=${rangeStart}-`;
|
|
94
|
-
fileWriteStream = fs_1.createWriteStream(savePath, {
|
|
99
|
+
fileWriteStream = (0, fs_1.createWriteStream)(savePath, {
|
|
95
100
|
flags: 'a',
|
|
96
101
|
start: rangeStart
|
|
97
102
|
});
|
|
@@ -122,7 +127,7 @@ async function streamingDownloadToFile(res, requestOptions) {
|
|
|
122
127
|
}
|
|
123
128
|
// Download body
|
|
124
129
|
if (!fileWriteStream) {
|
|
125
|
-
fileWriteStream = fs_1.createWriteStream(savePath, {
|
|
130
|
+
fileWriteStream = (0, fs_1.createWriteStream)(savePath, {
|
|
126
131
|
flags: 'w'
|
|
127
132
|
});
|
|
128
133
|
}
|
|
@@ -263,7 +268,7 @@ function downloadStreamingResourceWithHook(beforeDownload, afterDownload, downlo
|
|
|
263
268
|
if (res.type !== resource_1.ResourceType.StreamingBinary) {
|
|
264
269
|
return res;
|
|
265
270
|
}
|
|
266
|
-
if (!util_2.isUrlHttp(res.downloadLink)) {
|
|
271
|
+
if (!(0, util_2.isUrlHttp)(res.downloadLink)) {
|
|
267
272
|
return res;
|
|
268
273
|
}
|
|
269
274
|
let resource = res;
|
|
@@ -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"}
|
|
@@ -8,7 +8,7 @@ const css_url_parser_1 = __importDefault(require("css-url-parser"));
|
|
|
8
8
|
const resource_1 = require("../resource");
|
|
9
9
|
const util_1 = require("../util");
|
|
10
10
|
async function processCssText(cssText, res, options, pipeline, depth, resources) {
|
|
11
|
-
const cssUrls = css_url_parser_1.default(cssText);
|
|
11
|
+
const cssUrls = (0, css_url_parser_1.default)(cssText);
|
|
12
12
|
let rawUrl, r;
|
|
13
13
|
// noinspection DuplicatedCode
|
|
14
14
|
for (let i = 0, l = cssUrls.length; i < l; i++) {
|
|
@@ -30,7 +30,7 @@ async function processCss(res, submit, options, pipeline) {
|
|
|
30
30
|
}
|
|
31
31
|
const depth = res.depth + 1;
|
|
32
32
|
const resources = [];
|
|
33
|
-
let cssText = util_1.toString(res.body, res.encoding ||
|
|
33
|
+
let cssText = (0, util_1.toString)(res.body, res.encoding ||
|
|
34
34
|
options.encoding[resource_1.ResourceType.Css]);
|
|
35
35
|
cssText = await processCssText(cssText, res, options, pipeline, depth, resources);
|
|
36
36
|
res.body = cssText;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-css.js","sourceRoot":"","sources":["../../src/life-cycle/process-css.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA0C;AAG1C,0CAAmD;AACnD,kCAAiC;AAG1B,KAAK,UAAU,cAAc,CAClC,OAAe,EACf,GAAqB,EACrB,OAA8B,EAC9B,QAA0B,EAC1B,KAAa,EACb,SAAqB;IACrB,MAAM,OAAO,GAAa,wBAAY,
|
|
1
|
+
{"version":3,"file":"process-css.js","sourceRoot":"","sources":["../../src/life-cycle/process-css.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA0C;AAG1C,0CAAmD;AACnD,kCAAiC;AAG1B,KAAK,UAAU,cAAc,CAClC,OAAe,EACf,GAAqB,EACrB,OAA8B,EAC9B,QAA0B,EAC1B,KAAa,EACb,SAAqB;IACrB,MAAM,OAAO,GAAa,IAAA,wBAAY,EAAC,OAAO,CAAC,CAAC;IAChD,IAAI,MAAc,EAAE,CAAkB,CAAC;IACvC,8BAA8B;IAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QAC9C,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC,GAAG,MAAM,QAAQ,CAAC,wBAAwB,CACzC,MAAM,EAAE,uBAAY,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QACjD,IAAI,CAAC,CAAC;YAAE,SAAS;QACjB,IAAI,CAAC,CAAC,CAAC,6BAA6B,EAAE;YACpC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACnB;QACD,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;KACrD;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AArBD,wCAqBC;AAEM,KAAK,UAAU,UAAU,CAC9B,GAAqB,EACrB,MAA0B,EAC1B,OAA8B,EAC9B,QAA0B;IAC1B,IAAI,GAAG,CAAC,IAAI,KAAK,uBAAY,CAAC,GAAG,EAAE;QACjC,OAAO,GAAG,CAAC;KACZ;IACD,MAAM,KAAK,GAAW,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC;IACpC,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,IAAI,OAAO,GAAW,IAAA,eAAQ,EAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ;QACnD,OAAO,CAAC,QAAQ,CAAC,uBAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IACtC,OAAO,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IAClF,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;IACnB,GAAG,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IAC1B,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;IACxB,OAAO,GAAG,CAAC;AACb,CAAC;AAjBD,gCAiBC"}
|
|
@@ -23,7 +23,7 @@ async function processHtml(res, submit, options, pipeline) {
|
|
|
23
23
|
const resources = [];
|
|
24
24
|
let doc = res.meta.doc;
|
|
25
25
|
if (!doc) {
|
|
26
|
-
res.meta.doc = doc = adapters_1.parseHtml(res, options);
|
|
26
|
+
res.meta.doc = doc = (0, adapters_1.parseHtml)(res, options);
|
|
27
27
|
}
|
|
28
28
|
const sources = options.sources || sources_1.sources;
|
|
29
29
|
for (const { selector, attr, type } of sources) {
|
|
@@ -37,13 +37,13 @@ async function processHtml(res, submit, options, pipeline) {
|
|
|
37
37
|
let content = elem.html();
|
|
38
38
|
if (!content)
|
|
39
39
|
continue;
|
|
40
|
-
content = await process_css_1.processCssText(content, res, options, pipeline, depth, resources);
|
|
40
|
+
content = await (0, process_css_1.processCssText)(content, res, options, pipeline, depth, resources);
|
|
41
41
|
elem.html(content);
|
|
42
42
|
}
|
|
43
43
|
continue;
|
|
44
44
|
}
|
|
45
45
|
else if (type === resource_1.ResourceType.CssInline) {
|
|
46
|
-
const content = await process_css_1.processCssText(attrValue, res, options, pipeline, depth, resources);
|
|
46
|
+
const content = await (0, process_css_1.processCssText)(attrValue, res, options, pipeline, depth, resources);
|
|
47
47
|
elem.attr(attr, content);
|
|
48
48
|
continue;
|
|
49
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-html.js","sourceRoot":"","sources":["../../src/life-cycle/process-html.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAgD;AAChD,wCAAqD;AAGrD,0CAAmD;AACnD,+CAA6C;AAC7C,6CAA6C;AAE7C,yCAAqC;AAG9B,KAAK,UAAU,WAAW,CAC/B,GAAqB,EACrB,MAA0B,EAC1B,OAA8B,EAC9B,QAA0B;IAC1B,IAAI,GAAG,CAAC,IAAI,KAAK,uBAAY,CAAC,IAAI,EAAE;QAClC,OAAO,GAAG,CAAC;KACZ;IACD,MAAM,MAAM,GAAW,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,GAAG,CAAC;IACpD,MAAM,QAAQ,GAAG,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/D,wDAAwD;IACxD,qEAAqE;IAErE,MAAM,KAAK,GAAW,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC;IACpC,4BAA4B;IAC5B,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,IAAI,GAAG,GAAyB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;IAC7C,IAAI,CAAC,GAAG,EAAE;QACR,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,GAAG,GAAG,oBAAS,
|
|
1
|
+
{"version":3,"file":"process-html.js","sourceRoot":"","sources":["../../src/life-cycle/process-html.ts"],"names":[],"mappings":"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"}
|
|
@@ -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"}
|
|
@@ -99,7 +99,7 @@ async function processSourceMap(res, submit, options, pipeline) {
|
|
|
99
99
|
let url = '';
|
|
100
100
|
if (Buffer.isBuffer(body)) {
|
|
101
101
|
while (endIndex < body.length) {
|
|
102
|
-
if (!exports.isUriChar(body[endIndex])) {
|
|
102
|
+
if (!(0, exports.isUriChar)(body[endIndex])) {
|
|
103
103
|
break;
|
|
104
104
|
}
|
|
105
105
|
endIndex++;
|
|
@@ -112,7 +112,7 @@ async function processSourceMap(res, submit, options, pipeline) {
|
|
|
112
112
|
else {
|
|
113
113
|
// string
|
|
114
114
|
while (endIndex < body.length) {
|
|
115
|
-
if (!exports.isUriChar(body.charCodeAt(endIndex))) {
|
|
115
|
+
if (!(0, exports.isUriChar)(body.charCodeAt(endIndex))) {
|
|
116
116
|
break;
|
|
117
117
|
}
|
|
118
118
|
endIndex++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-source-map.js","sourceRoot":"","sources":["../../src/life-cycle/process-source-map.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"process-source-map.js","sourceRoot":"","sources":["../../src/life-cycle/process-source-map.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ async function processSvg(res, submit, options, pipeline) {
|
|
|
20
20
|
const depth = res.depth + 1;
|
|
21
21
|
let doc = res.meta.doc;
|
|
22
22
|
if (!doc) {
|
|
23
|
-
res.meta.doc = doc = adapters_1.parseHtml(res, options);
|
|
23
|
+
res.meta.doc = doc = (0, adapters_1.parseHtml)(res, options);
|
|
24
24
|
}
|
|
25
25
|
for (const { selector, attr, type } of svgSelectors) {
|
|
26
26
|
const elements = doc(selector);
|
|
@@ -74,7 +74,7 @@ async function processSvg(res, submit, options, pipeline) {
|
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
|
-
res.body = save_html_to_disk_1.getResourceBodyFromHtml(res, options);
|
|
77
|
+
res.body = (0, save_html_to_disk_1.getResourceBodyFromHtml)(res, options);
|
|
78
78
|
return res;
|
|
79
79
|
}
|
|
80
80
|
exports.processSvg = processSvg;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-svg.js","sourceRoot":"","sources":["../../src/life-cycle/process-svg.ts"],"names":[],"mappings":";;;AAGA,0CAAmD;AACnD,6CAA6C;AAE7C,yCAAqC;AACrC,2DAA4D;AAG5D,MAAM,YAAY,GAAuB;IACvC,EAAC,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,uBAAY,CAAC,MAAM,EAAC;IAC5E,EAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,uBAAY,CAAC,MAAM,EAAC;CAC/D,CAAC;AAEK,KAAK,UAAU,UAAU,CAC9B,GAAqB,EACrB,MAA0B,EAC1B,OAA8B,EAC9B,QAA0B;IAC1B,IAAI,GAAG,CAAC,IAAI,KAAK,uBAAY,CAAC,GAAG,EAAE;QACjC,OAAO,GAAG,CAAC;KACZ;IACD,MAAM,MAAM,GAAW,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,GAAG,CAAC;IACpD,MAAM,QAAQ,GAAG,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/D,wDAAwD;IACxD,qEAAqE;IAErE,MAAM,KAAK,GAAW,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC;IACpC,IAAI,GAAG,GAAyB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;IAC7C,IAAI,CAAC,GAAG,EAAE;QACR,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,GAAG,GAAG,oBAAS,
|
|
1
|
+
{"version":3,"file":"process-svg.js","sourceRoot":"","sources":["../../src/life-cycle/process-svg.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":"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"}
|
|
@@ -45,35 +45,35 @@ async function saveHtmlToDisk(res, options, pipeline) {
|
|
|
45
45
|
if (res.redirectedUrl && res.redirectedUrl !== res.url) {
|
|
46
46
|
if (res.redirectedSavePath) {
|
|
47
47
|
if (res.redirectedSavePath !== res.savePath) {
|
|
48
|
-
const replaceUri = urijs_1.default(resource_1.urlOfSavePath(res.redirectedSavePath))
|
|
49
|
-
.relativeTo(resource_1.urlOfSavePath(res.savePath));
|
|
50
|
-
const relativePath = util_1.escapePath(replaceUri.toString());
|
|
51
|
-
await io_1.writeFile(path_1.default.join(localRoot, decodeURI(res.savePath)), redirectHtml(relativePath, res.encoding), res.encoding, mtime);
|
|
48
|
+
const replaceUri = (0, urijs_1.default)((0, resource_1.urlOfSavePath)(res.redirectedSavePath))
|
|
49
|
+
.relativeTo((0, resource_1.urlOfSavePath)(res.savePath));
|
|
50
|
+
const relativePath = (0, util_1.escapePath)(replaceUri.toString());
|
|
51
|
+
await (0, io_1.writeFile)(path_1.default.join(localRoot, decodeURI(res.savePath)), redirectHtml(relativePath, res.encoding), res.encoding, mtime);
|
|
52
52
|
const body = getResourceBodyFromHtml(res, options);
|
|
53
|
-
await io_1.writeFile(path_1.default.join(localRoot, decodeURI(res.redirectedSavePath)), body, res.encoding, mtime);
|
|
53
|
+
await (0, io_1.writeFile)(path_1.default.join(localRoot, decodeURI(res.redirectedSavePath)), body, res.encoding, mtime);
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
56
|
const body = getResourceBodyFromHtml(res, options);
|
|
57
57
|
const filePath = path_1.default.join(localRoot, decodeURI(res.savePath));
|
|
58
|
-
await io_1.writeFile(filePath, body, res.encoding, mtime);
|
|
58
|
+
await (0, io_1.writeFile)(filePath, body, res.encoding, mtime);
|
|
59
59
|
}
|
|
60
60
|
return;
|
|
61
61
|
}
|
|
62
62
|
const redirectResource = await pipeline.createResource(resource_1.ResourceType.Html, res.depth, res.redirectedUrl, res.url, localRoot, undefined, res.refSavePath);
|
|
63
63
|
if (redirectResource.replacePath) {
|
|
64
|
-
const relativePath = util_1.escapePath(redirectResource.replacePath);
|
|
64
|
+
const relativePath = (0, util_1.escapePath)(redirectResource.replacePath);
|
|
65
65
|
const savePath = decodeURI(res.savePath);
|
|
66
|
-
await io_1.writeFile(path_1.default.join(localRoot, savePath), redirectHtml(relativePath, res.encoding), res.encoding, mtime);
|
|
66
|
+
await (0, io_1.writeFile)(path_1.default.join(localRoot, savePath), redirectHtml(relativePath, res.encoding), res.encoding, mtime);
|
|
67
67
|
const redirectedResource = await pipeline.createResource(resource_1.ResourceType.Html, res.depth, res.redirectedUrl, res.refUrl, res.localRoot, res.encoding, undefined, resource_1.ResourceType.Html);
|
|
68
68
|
const redirectedSavePath = decodeURI(redirectedResource.savePath);
|
|
69
69
|
const body = getResourceBodyFromHtml(res, options);
|
|
70
|
-
await io_1.writeFile(path_1.default.join(localRoot, redirectedSavePath), body, res.encoding, mtime);
|
|
70
|
+
await (0, io_1.writeFile)(path_1.default.join(localRoot, redirectedSavePath), body, res.encoding, mtime);
|
|
71
71
|
return;
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
const body = getResourceBodyFromHtml(res, options);
|
|
75
75
|
const filePath = path_1.default.join(localRoot, decodeURI(res.savePath));
|
|
76
|
-
await io_1.writeFile(filePath, body, res.encoding, mtime);
|
|
76
|
+
await (0, io_1.writeFile)(filePath, body, res.encoding, mtime);
|
|
77
77
|
return;
|
|
78
78
|
}
|
|
79
79
|
exports.saveHtmlToDisk = saveHtmlToDisk;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save-html-to-disk.js","sourceRoot":"","sources":["../../src/life-cycle/save-html-to-disk.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,kDAAwB;AAGxB,0CAKqB;AACrB,kCAAmC;AACnC,8BAAgC;AAGhC,SAAgB,uBAAuB,CACrC,GAAmD,EACnD,OAA8B;IAE9B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;QACjB,OAAO,GAAG,CAAC,IAAI,CAAC;KACjB;IACD,IAAI,OAAO,CAAC,gBAAgB,EAAE;QAC5B,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;KACpD;IACD,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;AAC7B,CAAC;AAXD,0DAWC;AAED,SAAgB,YAAY,CAAC,YAAoB,EAAE,QAA2B;IAC5E,gBAAgB;IAChB,OAAO;;iBAEQ,QAAQ,IAAI,MAAM;6CACU,YAAY;4BAC7B,YAAY;;;QAGhC,CAAC;AACT,CAAC;AAVD,oCAUC;AAEM,KAAK,UAAU,cAAc,CAClC,GAAqB,EACrB,OAA8B,EAC9B,QAA0B;;IAC1B,IAAI,GAAG,CAAC,IAAI,KAAK,uBAAY,CAAC,IAAI,EAAE;QAClC,OAAO,GAAG,CAAC;KACZ;IACD,MAAM,SAAS,GAAW,MAAA,GAAG,CAAC,SAAS,mCAAI,OAAO,CAAC,SAAS,CAAC;IAC7D,mEAAmE;IACnE,IAAI,KAAoB,CAAC;IACzB,IAAI,OAAO,CAAC,4BAA4B,KAAI,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,OAAO,0CAAG,eAAe,CAAC,CAAA,EAAE;QAChF,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAA,GAAG,CAAC,IAAI,CAAC,OAAO,0CAAG,eAAe,CAAC,CAAC,CAAC;KACzD;IACD,IAAI,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,aAAa,KAAK,GAAG,CAAC,GAAG,EAAE;QACtD,IAAI,GAAG,CAAC,kBAAkB,EAAE;YAC1B,IAAI,GAAG,CAAC,kBAAkB,KAAK,GAAG,CAAC,QAAQ,EAAE;gBAC3C,MAAM,UAAU,GAAG,eAAG,
|
|
1
|
+
{"version":3,"file":"save-html-to-disk.js","sourceRoot":"","sources":["../../src/life-cycle/save-html-to-disk.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,25 +18,25 @@ async function saveResourceToDisk(res, options, pipeline) {
|
|
|
18
18
|
if (res.redirectedSavePath) {
|
|
19
19
|
if (res.redirectedSavePath !== res.savePath) {
|
|
20
20
|
const redirectedSavePath = decodeURI(res.redirectedSavePath);
|
|
21
|
-
await io_1.writeFile(path_1.default.join(localRoot, redirectedSavePath), res.body, res.encoding, mtime);
|
|
21
|
+
await (0, io_1.writeFile)(path_1.default.join(localRoot, redirectedSavePath), res.body, res.encoding, mtime);
|
|
22
22
|
}
|
|
23
23
|
const savePath = decodeURI(res.savePath);
|
|
24
|
-
await io_1.writeFile(path_1.default.join(localRoot, savePath), res.body, res.encoding, mtime);
|
|
24
|
+
await (0, io_1.writeFile)(path_1.default.join(localRoot, savePath), res.body, res.encoding, mtime);
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
27
|
const redirectResource = await pipeline.createResource(res.type, res.depth, res.url, res.redirectedUrl, localRoot, res.encoding, undefined, res.type);
|
|
28
28
|
// maybe we can try module:fs/promises.symlink first
|
|
29
29
|
if (redirectResource.replacePath) {
|
|
30
30
|
const savePath = decodeURI(res.savePath);
|
|
31
|
-
await io_1.writeFile(path_1.default.join(localRoot, savePath), res.body, res.encoding, mtime);
|
|
31
|
+
await (0, io_1.writeFile)(path_1.default.join(localRoot, savePath), res.body, res.encoding, mtime);
|
|
32
32
|
const redirectedResource = await pipeline.createResource(res.type, res.depth, res.redirectedUrl, res.refUrl, res.localRoot, res.encoding, undefined, res.type);
|
|
33
33
|
const redirectedSavePath = decodeURI(redirectedResource.savePath);
|
|
34
|
-
await io_1.writeFile(path_1.default.join(localRoot, redirectedSavePath), res.body, res.encoding, mtime);
|
|
34
|
+
await (0, io_1.writeFile)(path_1.default.join(localRoot, redirectedSavePath), res.body, res.encoding, mtime);
|
|
35
35
|
return;
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
const filePath = path_1.default.join(localRoot, decodeURI(res.savePath));
|
|
39
|
-
await io_1.writeFile(filePath, res.body, res.encoding, mtime);
|
|
39
|
+
await (0, io_1.writeFile)(filePath, res.body, res.encoding, mtime);
|
|
40
40
|
return;
|
|
41
41
|
}
|
|
42
42
|
exports.saveResourceToDisk = saveResourceToDisk;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save-resource-to-disk.js","sourceRoot":"","sources":["../../src/life-cycle/save-resource-to-disk.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAGxB,8BAAgC;AAGzB,KAAK,UAAU,kBAAkB,CACtC,GAAqB,EACrB,OAA8B,EAC9B,QAA0B;;IAC1B,MAAM,SAAS,GAAW,MAAA,GAAG,CAAC,SAAS,mCAAI,OAAO,CAAC,SAAS,CAAC;IAC7D,mEAAmE;IACnE,IAAI,KAAoB,CAAC;IACzB,IAAI,OAAO,CAAC,4BAA4B,KAAI,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,OAAO,0CAAG,eAAe,CAAC,CAAA,EAAE;QAChF,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAA,GAAG,CAAC,IAAI,CAAC,OAAO,0CAAG,eAAe,CAAC,CAAC,CAAC;KACzD;IACD,IAAI,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,aAAa,KAAK,GAAG,CAAC,GAAG,EAAE;QACtD,IAAI,GAAG,CAAC,kBAAkB,EAAE;YAC1B,IAAI,GAAG,CAAC,kBAAkB,KAAK,GAAG,CAAC,QAAQ,EAAE;gBAC3C,MAAM,kBAAkB,GAAG,SAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAC7D,MAAM,cAAS,
|
|
1
|
+
{"version":3,"file":"save-resource-to-disk.js","sourceRoot":"","sources":["../../src/life-cycle/save-resource-to-disk.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAGxB,8BAAgC;AAGzB,KAAK,UAAU,kBAAkB,CACtC,GAAqB,EACrB,OAA8B,EAC9B,QAA0B;;IAC1B,MAAM,SAAS,GAAW,MAAA,GAAG,CAAC,SAAS,mCAAI,OAAO,CAAC,SAAS,CAAC;IAC7D,mEAAmE;IACnE,IAAI,KAAoB,CAAC;IACzB,IAAI,OAAO,CAAC,4BAA4B,KAAI,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,OAAO,0CAAG,eAAe,CAAC,CAAA,EAAE;QAChF,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAA,GAAG,CAAC,IAAI,CAAC,OAAO,0CAAG,eAAe,CAAC,CAAC,CAAC;KACzD;IACD,IAAI,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,aAAa,KAAK,GAAG,CAAC,GAAG,EAAE;QACtD,IAAI,GAAG,CAAC,kBAAkB,EAAE;YAC1B,IAAI,GAAG,CAAC,kBAAkB,KAAK,GAAG,CAAC,QAAQ,EAAE;gBAC3C,MAAM,kBAAkB,GAAG,SAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAC7D,MAAM,IAAA,cAAS,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,EAAE,GAAG,CAAC,IAAI,EAChE,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;aACxB;YACD,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACzC,MAAM,IAAA,cAAS,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC/E,OAAO;SACR;QACD,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAC7D,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAChD,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACrC,oDAAoD;QACpD,IAAI,gBAAgB,CAAC,WAAW,EAAE;YAChC,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACzC,MAAM,IAAA,cAAS,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC/E,MAAM,kBAAkB,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAC/D,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,EACvD,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YACrC,MAAM,kBAAkB,GAAG,SAAS,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YAClE,MAAM,IAAA,cAAS,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,EAAE,GAAG,CAAC,IAAI,EAChE,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACvB,OAAO;SACR;KACF;IACD,MAAM,QAAQ,GAAW,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvE,MAAM,IAAA,cAAS,EAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACzD,OAAO;AACT,CAAC;AAxCD,gDAwCC"}
|