@loaders.gl/zip 4.1.0-alpha.3 → 4.1.0-alpha.4
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/dist/dist.dev.js +43 -38
- package/dist/index.cjs +46 -41
- package/dist/parse-zip/cd-file-header.d.ts +1 -1
- package/dist/parse-zip/cd-file-header.js +2 -2
- package/dist/parse-zip/cd-file-header.js.map +1 -1
- package/dist/parse-zip/end-of-central-directory.d.ts +19 -0
- package/dist/parse-zip/end-of-central-directory.d.ts.map +1 -1
- package/dist/parse-zip/end-of-central-directory.js +42 -8
- package/dist/parse-zip/end-of-central-directory.js.map +1 -1
- package/dist/parse-zip/zip-compozition.d.ts +8 -0
- package/dist/parse-zip/zip-compozition.d.ts.map +1 -0
- package/dist/parse-zip/zip-compozition.js +43 -0
- package/dist/parse-zip/zip-compozition.js.map +1 -0
- package/dist/parse-zip/zip64-info-generation.d.ts +1 -1
- package/dist/parse-zip/zip64-info-generation.d.ts.map +1 -1
- package/dist/parse-zip/zip64-info-generation.js +1 -1
- package/dist/parse-zip/zip64-info-generation.js.map +1 -1
- package/dist/zip-loader.js +1 -1
- package/dist/zip-writer.js +1 -1
- package/package.json +5 -5
- package/src/parse-zip/cd-file-header.ts +3 -3
- package/src/parse-zip/end-of-central-directory.ts +95 -8
- package/src/parse-zip/zip-compozition.ts +113 -0
- package/src/parse-zip/zip64-info-generation.ts +2 -2
package/dist/dist.dev.js
CHANGED
|
@@ -6970,7 +6970,7 @@ var __exports__ = (() => {
|
|
|
6970
6970
|
|
|
6971
6971
|
// src/zip-loader.ts
|
|
6972
6972
|
var import_jszip = __toESM(require_jszip_min(), 1);
|
|
6973
|
-
var VERSION = true ? "4.1.0-alpha.
|
|
6973
|
+
var VERSION = true ? "4.1.0-alpha.4" : "latest";
|
|
6974
6974
|
var ZipLoader = {
|
|
6975
6975
|
id: "zip",
|
|
6976
6976
|
module: "zip",
|
|
@@ -7015,7 +7015,7 @@ var __exports__ = (() => {
|
|
|
7015
7015
|
|
|
7016
7016
|
// src/zip-writer.ts
|
|
7017
7017
|
var import_jszip2 = __toESM(require_jszip_min(), 1);
|
|
7018
|
-
var VERSION2 = true ? "4.1.0-alpha.
|
|
7018
|
+
var VERSION2 = true ? "4.1.0-alpha.4" : "latest";
|
|
7019
7019
|
var ZipWriter = {
|
|
7020
7020
|
name: "Zip Archive",
|
|
7021
7021
|
id: "zip",
|
|
@@ -7467,39 +7467,6 @@ var __exports__ = (() => {
|
|
|
7467
7467
|
return targetOffset;
|
|
7468
7468
|
};
|
|
7469
7469
|
|
|
7470
|
-
// src/parse-zip/end-of-central-directory.ts
|
|
7471
|
-
var eoCDSignature = new Uint8Array([80, 75, 5, 6]);
|
|
7472
|
-
var zip64EoCDLocatorSignature = new Uint8Array([80, 75, 6, 7]);
|
|
7473
|
-
var zip64EoCDSignature = new Uint8Array([80, 75, 6, 6]);
|
|
7474
|
-
var CD_RECORDS_NUMBER_OFFSET = 8n;
|
|
7475
|
-
var CD_START_OFFSET_OFFSET = 16n;
|
|
7476
|
-
var ZIP64_EOCD_START_OFFSET_OFFSET = 8n;
|
|
7477
|
-
var ZIP64_CD_RECORDS_NUMBER_OFFSET = 24n;
|
|
7478
|
-
var ZIP64_CD_START_OFFSET_OFFSET = 48n;
|
|
7479
|
-
var parseEoCDRecord = async (file) => {
|
|
7480
|
-
const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);
|
|
7481
|
-
let cdRecordsNumber = BigInt(await file.getUint16(zipEoCDOffset + CD_RECORDS_NUMBER_OFFSET));
|
|
7482
|
-
let cdStartOffset = BigInt(await file.getUint32(zipEoCDOffset + CD_START_OFFSET_OFFSET));
|
|
7483
|
-
if (cdStartOffset === BigInt(4294967295) || cdRecordsNumber === BigInt(4294967295)) {
|
|
7484
|
-
const zip64EoCDLocatorOffset = zipEoCDOffset - 20n;
|
|
7485
|
-
const magicBytes = await file.slice(zip64EoCDLocatorOffset, zip64EoCDLocatorOffset + 4n);
|
|
7486
|
-
if (!compareArrayBuffers(magicBytes, zip64EoCDLocatorSignature)) {
|
|
7487
|
-
throw new Error("zip64 EoCD locator not found");
|
|
7488
|
-
}
|
|
7489
|
-
const zip64EoCDOffset = await file.getBigUint64(zip64EoCDLocatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET);
|
|
7490
|
-
const endOfCDMagicBytes = await file.slice(zip64EoCDOffset, zip64EoCDOffset + 4n);
|
|
7491
|
-
if (!compareArrayBuffers(endOfCDMagicBytes, zip64EoCDSignature.buffer)) {
|
|
7492
|
-
throw new Error("zip64 EoCD not found");
|
|
7493
|
-
}
|
|
7494
|
-
cdRecordsNumber = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_RECORDS_NUMBER_OFFSET);
|
|
7495
|
-
cdStartOffset = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_START_OFFSET_OFFSET);
|
|
7496
|
-
}
|
|
7497
|
-
return {
|
|
7498
|
-
cdRecordsNumber,
|
|
7499
|
-
cdStartOffset
|
|
7500
|
-
};
|
|
7501
|
-
};
|
|
7502
|
-
|
|
7503
7470
|
// src/parse-zip/zip64-info-generation.ts
|
|
7504
7471
|
var signature = new Uint8Array([1, 0]);
|
|
7505
7472
|
function createZip64Info(options) {
|
|
@@ -7519,7 +7486,7 @@ var __exports__ = (() => {
|
|
|
7519
7486
|
return concatenateArrayBuffers(...arraysToConcat);
|
|
7520
7487
|
}
|
|
7521
7488
|
function setFieldToNumber(header, fieldSize, fieldOffset, value) {
|
|
7522
|
-
NUMBER_SETTERS[fieldSize](header, fieldOffset, value);
|
|
7489
|
+
NUMBER_SETTERS[fieldSize](header, Number(fieldOffset), value);
|
|
7523
7490
|
}
|
|
7524
7491
|
var NUMBER_SETTERS = {
|
|
7525
7492
|
2: (header, offset, value) => {
|
|
@@ -7549,6 +7516,44 @@ var __exports__ = (() => {
|
|
|
7549
7516
|
name: "offset"
|
|
7550
7517
|
}];
|
|
7551
7518
|
|
|
7519
|
+
// src/parse-zip/end-of-central-directory.ts
|
|
7520
|
+
var eoCDSignature = new Uint8Array([80, 75, 5, 6]);
|
|
7521
|
+
var zip64EoCDLocatorSignature = new Uint8Array([80, 75, 6, 7]);
|
|
7522
|
+
var zip64EoCDSignature = new Uint8Array([80, 75, 6, 6]);
|
|
7523
|
+
var CD_RECORDS_NUMBER_OFFSET = 8n;
|
|
7524
|
+
var CD_START_OFFSET_OFFSET = 16n;
|
|
7525
|
+
var ZIP64_EOCD_START_OFFSET_OFFSET = 8n;
|
|
7526
|
+
var ZIP64_CD_RECORDS_NUMBER_OFFSET = 24n;
|
|
7527
|
+
var ZIP64_CD_START_OFFSET_OFFSET = 48n;
|
|
7528
|
+
var parseEoCDRecord = async (file) => {
|
|
7529
|
+
const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);
|
|
7530
|
+
let cdRecordsNumber = BigInt(await file.getUint16(zipEoCDOffset + CD_RECORDS_NUMBER_OFFSET));
|
|
7531
|
+
let cdStartOffset = BigInt(await file.getUint32(zipEoCDOffset + CD_START_OFFSET_OFFSET));
|
|
7532
|
+
let zip64EoCDLocatorOffset = zipEoCDOffset - 20n;
|
|
7533
|
+
let zip64EoCDOffset = 0n;
|
|
7534
|
+
const magicBytes = await file.slice(zip64EoCDLocatorOffset, zip64EoCDLocatorOffset + 4n);
|
|
7535
|
+
if (compareArrayBuffers(magicBytes, zip64EoCDLocatorSignature)) {
|
|
7536
|
+
zip64EoCDOffset = await file.getBigUint64(zip64EoCDLocatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET);
|
|
7537
|
+
const endOfCDMagicBytes = await file.slice(zip64EoCDOffset, zip64EoCDOffset + 4n);
|
|
7538
|
+
if (!compareArrayBuffers(endOfCDMagicBytes, zip64EoCDSignature.buffer)) {
|
|
7539
|
+
throw new Error("zip64 EoCD not found");
|
|
7540
|
+
}
|
|
7541
|
+
cdRecordsNumber = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_RECORDS_NUMBER_OFFSET);
|
|
7542
|
+
cdStartOffset = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_START_OFFSET_OFFSET);
|
|
7543
|
+
} else {
|
|
7544
|
+
zip64EoCDLocatorOffset = 0n;
|
|
7545
|
+
}
|
|
7546
|
+
return {
|
|
7547
|
+
cdRecordsNumber,
|
|
7548
|
+
cdStartOffset,
|
|
7549
|
+
offsets: {
|
|
7550
|
+
zip64EoCDOffset,
|
|
7551
|
+
zip64EoCDLocatorOffset,
|
|
7552
|
+
zipEoCDOffset
|
|
7553
|
+
}
|
|
7554
|
+
};
|
|
7555
|
+
};
|
|
7556
|
+
|
|
7552
7557
|
// src/parse-zip/cd-file-header.ts
|
|
7553
7558
|
var CD_COMPRESSED_SIZE_OFFSET = 20n;
|
|
7554
7559
|
var CD_UNCOMPRESSED_SIZE_OFFSET = 24n;
|
|
@@ -7656,7 +7661,7 @@ var __exports__ = (() => {
|
|
|
7656
7661
|
const optionsToZip64 = {};
|
|
7657
7662
|
if (optionsToUse.offset >= 4294967295) {
|
|
7658
7663
|
optionsToZip64.offset = optionsToUse.offset;
|
|
7659
|
-
optionsToUse.offset = 4294967295;
|
|
7664
|
+
optionsToUse.offset = BigInt(4294967295);
|
|
7660
7665
|
}
|
|
7661
7666
|
if (optionsToUse.length >= 4294967295) {
|
|
7662
7667
|
optionsToZip64.size = optionsToUse.length;
|
|
@@ -7666,7 +7671,7 @@ var __exports__ = (() => {
|
|
|
7666
7671
|
zip64header = createZip64Info(optionsToZip64);
|
|
7667
7672
|
optionsToUse.extraLength = zip64header.byteLength;
|
|
7668
7673
|
}
|
|
7669
|
-
const header = new DataView(new ArrayBuffer(
|
|
7674
|
+
const header = new DataView(new ArrayBuffer(Number(CD_FILE_NAME_OFFSET)));
|
|
7670
7675
|
for (const field of ZIP_HEADER_FIELDS) {
|
|
7671
7676
|
setFieldToNumber(header, field.size, field.offset, optionsToUse[field.name ?? ""] ?? field.default ?? 0);
|
|
7672
7677
|
}
|
package/dist/index.cjs
CHANGED
|
@@ -353,7 +353,7 @@ var TarBuilder = class {
|
|
|
353
353
|
var import_loader_utils3 = require("@loaders.gl/loader-utils");
|
|
354
354
|
|
|
355
355
|
// src/parse-zip/end-of-central-directory.ts
|
|
356
|
-
var
|
|
356
|
+
var import_loader_utils2 = require("@loaders.gl/loader-utils");
|
|
357
357
|
|
|
358
358
|
// src/parse-zip/search-from-the-end.ts
|
|
359
359
|
var searchFromTheEnd = async (file, target) => {
|
|
@@ -377,43 +377,8 @@ var searchFromTheEnd = async (file, target) => {
|
|
|
377
377
|
return targetOffset;
|
|
378
378
|
};
|
|
379
379
|
|
|
380
|
-
// src/parse-zip/end-of-central-directory.ts
|
|
381
|
-
var eoCDSignature = new Uint8Array([80, 75, 5, 6]);
|
|
382
|
-
var zip64EoCDLocatorSignature = new Uint8Array([80, 75, 6, 7]);
|
|
383
|
-
var zip64EoCDSignature = new Uint8Array([80, 75, 6, 6]);
|
|
384
|
-
var CD_RECORDS_NUMBER_OFFSET = 8n;
|
|
385
|
-
var CD_START_OFFSET_OFFSET = 16n;
|
|
386
|
-
var ZIP64_EOCD_START_OFFSET_OFFSET = 8n;
|
|
387
|
-
var ZIP64_CD_RECORDS_NUMBER_OFFSET = 24n;
|
|
388
|
-
var ZIP64_CD_START_OFFSET_OFFSET = 48n;
|
|
389
|
-
var parseEoCDRecord = async (file) => {
|
|
390
|
-
const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);
|
|
391
|
-
let cdRecordsNumber = BigInt(await file.getUint16(zipEoCDOffset + CD_RECORDS_NUMBER_OFFSET));
|
|
392
|
-
let cdStartOffset = BigInt(await file.getUint32(zipEoCDOffset + CD_START_OFFSET_OFFSET));
|
|
393
|
-
if (cdStartOffset === BigInt(4294967295) || cdRecordsNumber === BigInt(4294967295)) {
|
|
394
|
-
const zip64EoCDLocatorOffset = zipEoCDOffset - 20n;
|
|
395
|
-
const magicBytes = await file.slice(zip64EoCDLocatorOffset, zip64EoCDLocatorOffset + 4n);
|
|
396
|
-
if (!(0, import_loader_utils.compareArrayBuffers)(magicBytes, zip64EoCDLocatorSignature)) {
|
|
397
|
-
throw new Error("zip64 EoCD locator not found");
|
|
398
|
-
}
|
|
399
|
-
const zip64EoCDOffset = await file.getBigUint64(
|
|
400
|
-
zip64EoCDLocatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET
|
|
401
|
-
);
|
|
402
|
-
const endOfCDMagicBytes = await file.slice(zip64EoCDOffset, zip64EoCDOffset + 4n);
|
|
403
|
-
if (!(0, import_loader_utils.compareArrayBuffers)(endOfCDMagicBytes, zip64EoCDSignature.buffer)) {
|
|
404
|
-
throw new Error("zip64 EoCD not found");
|
|
405
|
-
}
|
|
406
|
-
cdRecordsNumber = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_RECORDS_NUMBER_OFFSET);
|
|
407
|
-
cdStartOffset = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_START_OFFSET_OFFSET);
|
|
408
|
-
}
|
|
409
|
-
return {
|
|
410
|
-
cdRecordsNumber,
|
|
411
|
-
cdStartOffset
|
|
412
|
-
};
|
|
413
|
-
};
|
|
414
|
-
|
|
415
380
|
// src/parse-zip/zip64-info-generation.ts
|
|
416
|
-
var
|
|
381
|
+
var import_loader_utils = require("@loaders.gl/loader-utils");
|
|
417
382
|
var signature = new Uint8Array([1, 0]);
|
|
418
383
|
function createZip64Info(options) {
|
|
419
384
|
const optionsToUse = {
|
|
@@ -429,10 +394,10 @@ function createZip64Info(options) {
|
|
|
429
394
|
NUMBER_SETTERS[field.size](newValue, 0, optionsToUse[field.name ?? ""] ?? field.default);
|
|
430
395
|
arraysToConcat.push(newValue.buffer);
|
|
431
396
|
}
|
|
432
|
-
return (0,
|
|
397
|
+
return (0, import_loader_utils.concatenateArrayBuffers)(...arraysToConcat);
|
|
433
398
|
}
|
|
434
399
|
function setFieldToNumber(header, fieldSize, fieldOffset, value) {
|
|
435
|
-
NUMBER_SETTERS[fieldSize](header, fieldOffset, value);
|
|
400
|
+
NUMBER_SETTERS[fieldSize](header, Number(fieldOffset), value);
|
|
436
401
|
}
|
|
437
402
|
var NUMBER_SETTERS = {
|
|
438
403
|
2: (header, offset, value) => {
|
|
@@ -473,6 +438,46 @@ var ZIP64_FIELDS = [
|
|
|
473
438
|
}
|
|
474
439
|
];
|
|
475
440
|
|
|
441
|
+
// src/parse-zip/end-of-central-directory.ts
|
|
442
|
+
var eoCDSignature = new Uint8Array([80, 75, 5, 6]);
|
|
443
|
+
var zip64EoCDLocatorSignature = new Uint8Array([80, 75, 6, 7]);
|
|
444
|
+
var zip64EoCDSignature = new Uint8Array([80, 75, 6, 6]);
|
|
445
|
+
var CD_RECORDS_NUMBER_OFFSET = 8n;
|
|
446
|
+
var CD_START_OFFSET_OFFSET = 16n;
|
|
447
|
+
var ZIP64_EOCD_START_OFFSET_OFFSET = 8n;
|
|
448
|
+
var ZIP64_CD_RECORDS_NUMBER_OFFSET = 24n;
|
|
449
|
+
var ZIP64_CD_START_OFFSET_OFFSET = 48n;
|
|
450
|
+
var parseEoCDRecord = async (file) => {
|
|
451
|
+
const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);
|
|
452
|
+
let cdRecordsNumber = BigInt(await file.getUint16(zipEoCDOffset + CD_RECORDS_NUMBER_OFFSET));
|
|
453
|
+
let cdStartOffset = BigInt(await file.getUint32(zipEoCDOffset + CD_START_OFFSET_OFFSET));
|
|
454
|
+
let zip64EoCDLocatorOffset = zipEoCDOffset - 20n;
|
|
455
|
+
let zip64EoCDOffset = 0n;
|
|
456
|
+
const magicBytes = await file.slice(zip64EoCDLocatorOffset, zip64EoCDLocatorOffset + 4n);
|
|
457
|
+
if ((0, import_loader_utils2.compareArrayBuffers)(magicBytes, zip64EoCDLocatorSignature)) {
|
|
458
|
+
zip64EoCDOffset = await file.getBigUint64(
|
|
459
|
+
zip64EoCDLocatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET
|
|
460
|
+
);
|
|
461
|
+
const endOfCDMagicBytes = await file.slice(zip64EoCDOffset, zip64EoCDOffset + 4n);
|
|
462
|
+
if (!(0, import_loader_utils2.compareArrayBuffers)(endOfCDMagicBytes, zip64EoCDSignature.buffer)) {
|
|
463
|
+
throw new Error("zip64 EoCD not found");
|
|
464
|
+
}
|
|
465
|
+
cdRecordsNumber = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_RECORDS_NUMBER_OFFSET);
|
|
466
|
+
cdStartOffset = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_START_OFFSET_OFFSET);
|
|
467
|
+
} else {
|
|
468
|
+
zip64EoCDLocatorOffset = 0n;
|
|
469
|
+
}
|
|
470
|
+
return {
|
|
471
|
+
cdRecordsNumber,
|
|
472
|
+
cdStartOffset,
|
|
473
|
+
offsets: {
|
|
474
|
+
zip64EoCDOffset,
|
|
475
|
+
zip64EoCDLocatorOffset,
|
|
476
|
+
zipEoCDOffset
|
|
477
|
+
}
|
|
478
|
+
};
|
|
479
|
+
};
|
|
480
|
+
|
|
476
481
|
// src/parse-zip/cd-file-header.ts
|
|
477
482
|
var CD_COMPRESSED_SIZE_OFFSET = 20n;
|
|
478
483
|
var CD_UNCOMPRESSED_SIZE_OFFSET = 24n;
|
|
@@ -576,7 +581,7 @@ function generateCDHeader(options) {
|
|
|
576
581
|
const optionsToZip64 = {};
|
|
577
582
|
if (optionsToUse.offset >= 4294967295) {
|
|
578
583
|
optionsToZip64.offset = optionsToUse.offset;
|
|
579
|
-
optionsToUse.offset = 4294967295;
|
|
584
|
+
optionsToUse.offset = BigInt(4294967295);
|
|
580
585
|
}
|
|
581
586
|
if (optionsToUse.length >= 4294967295) {
|
|
582
587
|
optionsToZip64.size = optionsToUse.length;
|
|
@@ -586,7 +591,7 @@ function generateCDHeader(options) {
|
|
|
586
591
|
zip64header = createZip64Info(optionsToZip64);
|
|
587
592
|
optionsToUse.extraLength = zip64header.byteLength;
|
|
588
593
|
}
|
|
589
|
-
const header = new DataView(new ArrayBuffer(
|
|
594
|
+
const header = new DataView(new ArrayBuffer(Number(CD_FILE_NAME_OFFSET)));
|
|
590
595
|
for (const field of ZIP_HEADER_FIELDS) {
|
|
591
596
|
setFieldToNumber(
|
|
592
597
|
header,
|
|
@@ -107,7 +107,7 @@ export function generateCDHeader(options) {
|
|
|
107
107
|
const optionsToZip64 = {};
|
|
108
108
|
if (optionsToUse.offset >= 0xffffffff) {
|
|
109
109
|
optionsToZip64.offset = optionsToUse.offset;
|
|
110
|
-
optionsToUse.offset = 0xffffffff;
|
|
110
|
+
optionsToUse.offset = BigInt(0xffffffff);
|
|
111
111
|
}
|
|
112
112
|
if (optionsToUse.length >= 0xffffffff) {
|
|
113
113
|
optionsToZip64.size = optionsToUse.length;
|
|
@@ -117,7 +117,7 @@ export function generateCDHeader(options) {
|
|
|
117
117
|
zip64header = createZip64Info(optionsToZip64);
|
|
118
118
|
optionsToUse.extraLength = zip64header.byteLength;
|
|
119
119
|
}
|
|
120
|
-
const header = new DataView(new ArrayBuffer(
|
|
120
|
+
const header = new DataView(new ArrayBuffer(Number(CD_FILE_NAME_OFFSET)));
|
|
121
121
|
for (const field of ZIP_HEADER_FIELDS) {
|
|
122
122
|
var _ref, _optionsToUse, _field$name;
|
|
123
123
|
setFieldToNumber(header, field.size, field.offset, (_ref = (_optionsToUse = optionsToUse[(_field$name = field.name) !== null && _field$name !== void 0 ? _field$name : '']) !== null && _optionsToUse !== void 0 ? _optionsToUse : field.default) !== null && _ref !== void 0 ? _ref : 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cd-file-header.js","names":["compareArrayBuffers","concatenateArrayBuffers","parseEoCDRecord","createZip64Info","setFieldToNumber","CD_COMPRESSED_SIZE_OFFSET","CD_UNCOMPRESSED_SIZE_OFFSET","CD_FILE_NAME_LENGTH_OFFSET","CD_EXTRA_FIELD_LENGTH_OFFSET","CD_START_DISK_OFFSET","CD_LOCAL_HEADER_OFFSET_OFFSET","CD_FILE_NAME_OFFSET","signature","Uint8Array","parseZipCDFileHeader","headerOffset","file","magicBytes","slice","buffer","compressedSize","BigInt","getUint32","uncompressedSize","extraFieldLength","getUint16","startDisk","fileNameLength","filenameBytes","fileName","TextDecoder","decode","extraOffset","oldFormatOffset","localHeaderOffset","extraField","DataView","zip64data","res","findZip64DataInExtra","makeZipCDHeaderIterator","fileProvider","cdStartOffset","cdHeader","arguments","length","undefined","zip64dataList","findExpectedData","zip64DataRes","zip64chunkSize","reduce","sum","curr","offsetInExtraData","findIndex","_val","i","arr","bytesRead","note","offset","name","getBigUint64","push","generateCDHeader","options","optionsToUse","fnlength","extraLength","zip64header","ArrayBuffer","optionsToZip64","size","Object","keys","byteLength","header","field","ZIP_HEADER_FIELDS","_ref","_optionsToUse","_field$name","default","encodedName","TextEncoder","encode","resHeader"],"sources":["../../src/parse-zip/cd-file-header.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {FileProvider, compareArrayBuffers, concatenateArrayBuffers} from '@loaders.gl/loader-utils';\nimport {parseEoCDRecord} from './end-of-central-directory';\nimport {ZipSignature} from './search-from-the-end';\nimport {createZip64Info, setFieldToNumber} from './zip64-info-generation';\n\n/**\n * zip central directory file header info\n * according to https://en.wikipedia.org/wiki/ZIP_(file_format)\n */\nexport type ZipCDFileHeader = {\n /** Compressed size */\n compressedSize: bigint;\n /** Uncompressed size */\n uncompressedSize: bigint;\n /** Extra field size */\n extraFieldLength: number;\n /** File name length */\n fileNameLength: number;\n /** File name */\n fileName: string;\n /** Extra field offset */\n extraOffset: bigint;\n /** Relative offset of local file header */\n localHeaderOffset: bigint;\n};\n\n/**\n * Data that might be in Zip64 notation inside extra data\n */\ntype Zip64Data = {\n /** Uncompressed size */\n uncompressedSize: bigint;\n /** Compressed size */\n compressedSize: bigint;\n /** Relative offset of local file header */\n localHeaderOffset: bigint;\n /** Start disk */\n startDisk: bigint;\n};\n\n// offsets accroding to https://en.wikipedia.org/wiki/ZIP_(file_format)\nconst CD_COMPRESSED_SIZE_OFFSET = 20n;\nconst CD_UNCOMPRESSED_SIZE_OFFSET = 24n;\nconst CD_FILE_NAME_LENGTH_OFFSET = 28n;\nconst CD_EXTRA_FIELD_LENGTH_OFFSET = 30n;\nconst CD_START_DISK_OFFSET = 32n;\nconst CD_LOCAL_HEADER_OFFSET_OFFSET = 42n;\nconst CD_FILE_NAME_OFFSET = 46n;\n\nexport const signature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x01, 0x02]);\n\n/**\n * Parses central directory file header of zip file\n * @param headerOffset - offset in the archive where header starts\n * @param buffer - buffer containing whole array\n * @returns Info from the header\n */\nexport const parseZipCDFileHeader = async (\n headerOffset: bigint,\n file: FileProvider\n): Promise<ZipCDFileHeader | null> => {\n const magicBytes = await file.slice(headerOffset, headerOffset + 4n);\n if (!compareArrayBuffers(magicBytes, signature.buffer)) {\n return null;\n }\n\n const compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));\n const uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));\n const extraFieldLength = await file.getUint16(headerOffset + CD_EXTRA_FIELD_LENGTH_OFFSET);\n const startDisk = BigInt(await file.getUint16(headerOffset + CD_START_DISK_OFFSET));\n const fileNameLength = await file.getUint16(headerOffset + CD_FILE_NAME_LENGTH_OFFSET);\n const filenameBytes = await file.slice(\n headerOffset + CD_FILE_NAME_OFFSET,\n headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength)\n );\n const fileName = new TextDecoder().decode(filenameBytes);\n\n const extraOffset = headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength);\n const oldFormatOffset = await file.getUint32(headerOffset + CD_LOCAL_HEADER_OFFSET_OFFSET);\n\n const localHeaderOffset = BigInt(oldFormatOffset);\n const extraField = new DataView(\n await file.slice(extraOffset, extraOffset + BigInt(extraFieldLength))\n );\n // looking for info that might be also be in zip64 extra field\n\n const zip64data: Zip64Data = {\n uncompressedSize,\n compressedSize,\n localHeaderOffset,\n startDisk\n };\n\n const res = findZip64DataInExtra(zip64data, extraField);\n\n return {\n ...zip64data,\n ...res,\n extraFieldLength,\n fileNameLength,\n fileName,\n extraOffset\n };\n};\n\n/**\n * Create iterator over files of zip archive\n * @param fileProvider - file provider that provider random access to the file\n */\nexport async function* makeZipCDHeaderIterator(\n fileProvider: FileProvider\n): AsyncIterable<ZipCDFileHeader> {\n const {cdStartOffset} = await parseEoCDRecord(fileProvider);\n let cdHeader = await parseZipCDFileHeader(cdStartOffset, fileProvider);\n while (cdHeader) {\n yield cdHeader;\n cdHeader = await parseZipCDFileHeader(\n cdHeader.extraOffset + BigInt(cdHeader.extraFieldLength),\n fileProvider\n );\n }\n}\n/**\n * returns the number written in the provided bytes\n * @param bytes two bytes containing the number\n * @returns the number written in the provided bytes\n */\nconst getUint16 = (...bytes: [number, number]) => {\n return bytes[0] + bytes[1] * 16;\n};\n\n/**\n * reads all nesessary data from zip64 record in the extra data\n * @param zip64data values that might be in zip64 record\n * @param extraField full extra data\n * @returns data read from zip64\n */\n\nconst findZip64DataInExtra = (zip64data: Zip64Data, extraField: DataView): Partial<Zip64Data> => {\n const zip64dataList = findExpectedData(zip64data);\n\n const zip64DataRes: Partial<Zip64Data> = {};\n if (zip64dataList.length > 0) {\n // total length of data in zip64 notation in bytes\n const zip64chunkSize = zip64dataList.reduce((sum, curr) => sum + curr.length, 0);\n // we're looking for the zip64 nontation header (0x0001)\n // and a size field with a correct value next to it\n const offsetInExtraData = new Uint8Array(extraField.buffer).findIndex(\n (_val, i, arr) =>\n getUint16(arr[i], arr[i + 1]) === 0x0001 &&\n getUint16(arr[i + 2], arr[i + 3]) === zip64chunkSize\n );\n // then we read all the nesessary fields from the zip64 data\n let bytesRead = 0;\n for (const note of zip64dataList) {\n const offset = bytesRead;\n zip64DataRes[note.name] = extraField.getBigUint64(offsetInExtraData + 4 + offset, true);\n bytesRead = offset + note.length;\n }\n }\n\n return zip64DataRes;\n};\n\n/**\n * frind data that's expected to be in zip64\n * @param zip64data values that might be in zip64 record\n * @returns zip64 data description\n */\n\nconst findExpectedData = (zip64data: Zip64Data): {length: number; name: string}[] => {\n // We define fields that should be in zip64 data\n const zip64dataList: {length: number; name: string}[] = [];\n if (zip64data.uncompressedSize === BigInt(0xffffffff)) {\n zip64dataList.push({name: 'uncompressedSize', length: 8});\n }\n if (zip64data.compressedSize === BigInt(0xffffffff)) {\n zip64dataList.push({name: 'compressedSize', length: 8});\n }\n if (zip64data.localHeaderOffset === BigInt(0xffffffff)) {\n zip64dataList.push({name: 'localHeaderOffset', length: 8});\n }\n if (zip64data.startDisk === BigInt(0xffffffff)) {\n zip64dataList.push({name: 'startDisk', length: 4});\n }\n\n return zip64dataList;\n};\n\n/** info that can be placed into cd header */\ntype GenerateCDOptions = {\n /** CRC-32 of uncompressed data */\n crc32: number;\n /** File name */\n fileName: string;\n /** File size */\n length: number;\n /** Relative offset of local file header */\n offset: number;\n};\n\n/**\n * generates cd header for the file\n * @param options info that can be placed into cd header\n * @returns buffer with header\n */\nexport function generateCDHeader(options: GenerateCDOptions): ArrayBuffer {\n const optionsToUse = {\n ...options,\n fnlength: options.fileName.length,\n extraLength: 0\n };\n\n let zip64header: ArrayBuffer = new ArrayBuffer(0);\n\n const optionsToZip64: any = {};\n if (optionsToUse.offset >= 0xffffffff) {\n optionsToZip64.offset = optionsToUse.offset;\n optionsToUse.offset = 0xffffffff;\n }\n if (optionsToUse.length >= 0xffffffff) {\n optionsToZip64.size = optionsToUse.length;\n optionsToUse.length = 0xffffffff;\n }\n\n if (Object.keys(optionsToZip64).length) {\n zip64header = createZip64Info(optionsToZip64);\n optionsToUse.extraLength = zip64header.byteLength;\n }\n const header = new DataView(new ArrayBuffer(46));\n\n for (const field of ZIP_HEADER_FIELDS) {\n setFieldToNumber(\n header,\n field.size,\n field.offset,\n optionsToUse[field.name ?? ''] ?? field.default ?? 0\n );\n }\n\n const encodedName = new TextEncoder().encode(optionsToUse.fileName);\n\n const resHeader = concatenateArrayBuffers(header.buffer, encodedName, zip64header);\n\n return resHeader;\n}\n\n/** Fields map */\nconst ZIP_HEADER_FIELDS = [\n // Central directory file header signature = 0x02014b50\n {\n offset: 0,\n size: 4,\n default: new DataView(signature.buffer).getUint32(0, true)\n },\n\n // Version made by\n {\n offset: 4,\n size: 2,\n default: 45\n },\n\n // Version needed to extract (minimum)\n {\n offset: 6,\n size: 2,\n default: 45\n },\n\n // General purpose bit flag\n {\n offset: 8,\n size: 2,\n default: 0\n },\n\n // Compression method\n {\n offset: 10,\n size: 2,\n default: 0\n },\n\n // File last modification time\n {\n offset: 12,\n size: 2,\n default: 0\n },\n\n // File last modification date\n {\n offset: 14,\n size: 2,\n default: 0\n },\n\n // CRC-32 of uncompressed data\n {\n offset: 16,\n size: 4,\n name: 'crc32'\n },\n\n // Compressed size (or 0xffffffff for ZIP64)\n {\n offset: 20,\n size: 4,\n name: 'length'\n },\n\n // Uncompressed size (or 0xffffffff for ZIP64)\n {\n offset: 24,\n size: 4,\n name: 'length'\n },\n\n // File name length (n)\n {\n offset: 28,\n size: 2,\n name: 'fnlength'\n },\n\n // Extra field length (m)\n {\n offset: 30,\n size: 2,\n default: 0,\n name: 'extraLength'\n },\n\n // File comment length (k)\n {\n offset: 32,\n size: 2,\n default: 0\n },\n\n // Disk number where file starts (or 0xffff for ZIP64)\n {\n offset: 34,\n size: 2,\n default: 0\n },\n\n // Internal file attributes\n {\n offset: 36,\n size: 2,\n default: 0\n },\n\n // External file attributes\n {\n offset: 38,\n size: 4,\n default: 0\n },\n\n // Relative offset of local file header\n {\n offset: 42,\n size: 4,\n name: 'offset'\n }\n];\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cd-file-header.js","names":["compareArrayBuffers","concatenateArrayBuffers","parseEoCDRecord","createZip64Info","setFieldToNumber","CD_COMPRESSED_SIZE_OFFSET","CD_UNCOMPRESSED_SIZE_OFFSET","CD_FILE_NAME_LENGTH_OFFSET","CD_EXTRA_FIELD_LENGTH_OFFSET","CD_START_DISK_OFFSET","CD_LOCAL_HEADER_OFFSET_OFFSET","CD_FILE_NAME_OFFSET","signature","Uint8Array","parseZipCDFileHeader","headerOffset","file","magicBytes","slice","buffer","compressedSize","BigInt","getUint32","uncompressedSize","extraFieldLength","getUint16","startDisk","fileNameLength","filenameBytes","fileName","TextDecoder","decode","extraOffset","oldFormatOffset","localHeaderOffset","extraField","DataView","zip64data","res","findZip64DataInExtra","makeZipCDHeaderIterator","fileProvider","cdStartOffset","cdHeader","arguments","length","undefined","zip64dataList","findExpectedData","zip64DataRes","zip64chunkSize","reduce","sum","curr","offsetInExtraData","findIndex","_val","i","arr","bytesRead","note","offset","name","getBigUint64","push","generateCDHeader","options","optionsToUse","fnlength","extraLength","zip64header","ArrayBuffer","optionsToZip64","size","Object","keys","byteLength","header","Number","field","ZIP_HEADER_FIELDS","_ref","_optionsToUse","_field$name","default","encodedName","TextEncoder","encode","resHeader"],"sources":["../../src/parse-zip/cd-file-header.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {FileProvider, compareArrayBuffers, concatenateArrayBuffers} from '@loaders.gl/loader-utils';\nimport {parseEoCDRecord} from './end-of-central-directory';\nimport {ZipSignature} from './search-from-the-end';\nimport {createZip64Info, setFieldToNumber} from './zip64-info-generation';\n\n/**\n * zip central directory file header info\n * according to https://en.wikipedia.org/wiki/ZIP_(file_format)\n */\nexport type ZipCDFileHeader = {\n /** Compressed size */\n compressedSize: bigint;\n /** Uncompressed size */\n uncompressedSize: bigint;\n /** Extra field size */\n extraFieldLength: number;\n /** File name length */\n fileNameLength: number;\n /** File name */\n fileName: string;\n /** Extra field offset */\n extraOffset: bigint;\n /** Relative offset of local file header */\n localHeaderOffset: bigint;\n};\n\n/**\n * Data that might be in Zip64 notation inside extra data\n */\ntype Zip64Data = {\n /** Uncompressed size */\n uncompressedSize: bigint;\n /** Compressed size */\n compressedSize: bigint;\n /** Relative offset of local file header */\n localHeaderOffset: bigint;\n /** Start disk */\n startDisk: bigint;\n};\n\n// offsets accroding to https://en.wikipedia.org/wiki/ZIP_(file_format)\nconst CD_COMPRESSED_SIZE_OFFSET = 20n;\nconst CD_UNCOMPRESSED_SIZE_OFFSET = 24n;\nconst CD_FILE_NAME_LENGTH_OFFSET = 28n;\nconst CD_EXTRA_FIELD_LENGTH_OFFSET = 30n;\nconst CD_START_DISK_OFFSET = 32n;\nconst CD_LOCAL_HEADER_OFFSET_OFFSET = 42n;\nconst CD_FILE_NAME_OFFSET = 46n;\n\nexport const signature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x01, 0x02]);\n\n/**\n * Parses central directory file header of zip file\n * @param headerOffset - offset in the archive where header starts\n * @param buffer - buffer containing whole array\n * @returns Info from the header\n */\nexport const parseZipCDFileHeader = async (\n headerOffset: bigint,\n file: FileProvider\n): Promise<ZipCDFileHeader | null> => {\n const magicBytes = await file.slice(headerOffset, headerOffset + 4n);\n if (!compareArrayBuffers(magicBytes, signature.buffer)) {\n return null;\n }\n\n const compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));\n const uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));\n const extraFieldLength = await file.getUint16(headerOffset + CD_EXTRA_FIELD_LENGTH_OFFSET);\n const startDisk = BigInt(await file.getUint16(headerOffset + CD_START_DISK_OFFSET));\n const fileNameLength = await file.getUint16(headerOffset + CD_FILE_NAME_LENGTH_OFFSET);\n const filenameBytes = await file.slice(\n headerOffset + CD_FILE_NAME_OFFSET,\n headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength)\n );\n const fileName = new TextDecoder().decode(filenameBytes);\n\n const extraOffset = headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength);\n const oldFormatOffset = await file.getUint32(headerOffset + CD_LOCAL_HEADER_OFFSET_OFFSET);\n\n const localHeaderOffset = BigInt(oldFormatOffset);\n const extraField = new DataView(\n await file.slice(extraOffset, extraOffset + BigInt(extraFieldLength))\n );\n // looking for info that might be also be in zip64 extra field\n\n const zip64data: Zip64Data = {\n uncompressedSize,\n compressedSize,\n localHeaderOffset,\n startDisk\n };\n\n const res = findZip64DataInExtra(zip64data, extraField);\n\n return {\n ...zip64data,\n ...res,\n extraFieldLength,\n fileNameLength,\n fileName,\n extraOffset\n };\n};\n\n/**\n * Create iterator over files of zip archive\n * @param fileProvider - file provider that provider random access to the file\n */\nexport async function* makeZipCDHeaderIterator(\n fileProvider: FileProvider\n): AsyncIterable<ZipCDFileHeader> {\n const {cdStartOffset} = await parseEoCDRecord(fileProvider);\n let cdHeader = await parseZipCDFileHeader(cdStartOffset, fileProvider);\n while (cdHeader) {\n yield cdHeader;\n cdHeader = await parseZipCDFileHeader(\n cdHeader.extraOffset + BigInt(cdHeader.extraFieldLength),\n fileProvider\n );\n }\n}\n/**\n * returns the number written in the provided bytes\n * @param bytes two bytes containing the number\n * @returns the number written in the provided bytes\n */\nconst getUint16 = (...bytes: [number, number]) => {\n return bytes[0] + bytes[1] * 16;\n};\n\n/**\n * reads all nesessary data from zip64 record in the extra data\n * @param zip64data values that might be in zip64 record\n * @param extraField full extra data\n * @returns data read from zip64\n */\n\nconst findZip64DataInExtra = (zip64data: Zip64Data, extraField: DataView): Partial<Zip64Data> => {\n const zip64dataList = findExpectedData(zip64data);\n\n const zip64DataRes: Partial<Zip64Data> = {};\n if (zip64dataList.length > 0) {\n // total length of data in zip64 notation in bytes\n const zip64chunkSize = zip64dataList.reduce((sum, curr) => sum + curr.length, 0);\n // we're looking for the zip64 nontation header (0x0001)\n // and a size field with a correct value next to it\n const offsetInExtraData = new Uint8Array(extraField.buffer).findIndex(\n (_val, i, arr) =>\n getUint16(arr[i], arr[i + 1]) === 0x0001 &&\n getUint16(arr[i + 2], arr[i + 3]) === zip64chunkSize\n );\n // then we read all the nesessary fields from the zip64 data\n let bytesRead = 0;\n for (const note of zip64dataList) {\n const offset = bytesRead;\n zip64DataRes[note.name] = extraField.getBigUint64(offsetInExtraData + 4 + offset, true);\n bytesRead = offset + note.length;\n }\n }\n\n return zip64DataRes;\n};\n\n/**\n * frind data that's expected to be in zip64\n * @param zip64data values that might be in zip64 record\n * @returns zip64 data description\n */\n\nconst findExpectedData = (zip64data: Zip64Data): {length: number; name: string}[] => {\n // We define fields that should be in zip64 data\n const zip64dataList: {length: number; name: string}[] = [];\n if (zip64data.uncompressedSize === BigInt(0xffffffff)) {\n zip64dataList.push({name: 'uncompressedSize', length: 8});\n }\n if (zip64data.compressedSize === BigInt(0xffffffff)) {\n zip64dataList.push({name: 'compressedSize', length: 8});\n }\n if (zip64data.localHeaderOffset === BigInt(0xffffffff)) {\n zip64dataList.push({name: 'localHeaderOffset', length: 8});\n }\n if (zip64data.startDisk === BigInt(0xffffffff)) {\n zip64dataList.push({name: 'startDisk', length: 4});\n }\n\n return zip64dataList;\n};\n\n/** info that can be placed into cd header */\ntype GenerateCDOptions = {\n /** CRC-32 of uncompressed data */\n crc32: number;\n /** File name */\n fileName: string;\n /** File size */\n length: number;\n /** Relative offset of local file header */\n offset: bigint;\n};\n\n/**\n * generates cd header for the file\n * @param options info that can be placed into cd header\n * @returns buffer with header\n */\nexport function generateCDHeader(options: GenerateCDOptions): ArrayBuffer {\n const optionsToUse = {\n ...options,\n fnlength: options.fileName.length,\n extraLength: 0\n };\n\n let zip64header: ArrayBuffer = new ArrayBuffer(0);\n\n const optionsToZip64: any = {};\n if (optionsToUse.offset >= 0xffffffff) {\n optionsToZip64.offset = optionsToUse.offset;\n optionsToUse.offset = BigInt(0xffffffff);\n }\n if (optionsToUse.length >= 0xffffffff) {\n optionsToZip64.size = optionsToUse.length;\n optionsToUse.length = 0xffffffff;\n }\n\n if (Object.keys(optionsToZip64).length) {\n zip64header = createZip64Info(optionsToZip64);\n optionsToUse.extraLength = zip64header.byteLength;\n }\n const header = new DataView(new ArrayBuffer(Number(CD_FILE_NAME_OFFSET)));\n\n for (const field of ZIP_HEADER_FIELDS) {\n setFieldToNumber(\n header,\n field.size,\n field.offset,\n optionsToUse[field.name ?? ''] ?? field.default ?? 0\n );\n }\n\n const encodedName = new TextEncoder().encode(optionsToUse.fileName);\n\n const resHeader = concatenateArrayBuffers(header.buffer, encodedName, zip64header);\n\n return resHeader;\n}\n\n/** Fields map */\nconst ZIP_HEADER_FIELDS = [\n // Central directory file header signature = 0x02014b50\n {\n offset: 0,\n size: 4,\n default: new DataView(signature.buffer).getUint32(0, true)\n },\n\n // Version made by\n {\n offset: 4,\n size: 2,\n default: 45\n },\n\n // Version needed to extract (minimum)\n {\n offset: 6,\n size: 2,\n default: 45\n },\n\n // General purpose bit flag\n {\n offset: 8,\n size: 2,\n default: 0\n },\n\n // Compression method\n {\n offset: 10,\n size: 2,\n default: 0\n },\n\n // File last modification time\n {\n offset: 12,\n size: 2,\n default: 0\n },\n\n // File last modification date\n {\n offset: 14,\n size: 2,\n default: 0\n },\n\n // CRC-32 of uncompressed data\n {\n offset: 16,\n size: 4,\n name: 'crc32'\n },\n\n // Compressed size (or 0xffffffff for ZIP64)\n {\n offset: 20,\n size: 4,\n name: 'length'\n },\n\n // Uncompressed size (or 0xffffffff for ZIP64)\n {\n offset: 24,\n size: 4,\n name: 'length'\n },\n\n // File name length (n)\n {\n offset: 28,\n size: 2,\n name: 'fnlength'\n },\n\n // Extra field length (m)\n {\n offset: 30,\n size: 2,\n default: 0,\n name: 'extraLength'\n },\n\n // File comment length (k)\n {\n offset: 32,\n size: 2,\n default: 0\n },\n\n // Disk number where file starts (or 0xffff for ZIP64)\n {\n offset: 34,\n size: 2,\n default: 0\n },\n\n // Internal file attributes\n {\n offset: 36,\n size: 2,\n default: 0\n },\n\n // External file attributes\n {\n offset: 38,\n size: 4,\n default: 0\n },\n\n // Relative offset of local file header\n {\n offset: 42,\n size: 4,\n name: 'offset'\n }\n];\n"],"mappings":"AAIA,SAAsBA,mBAAmB,EAAEC,uBAAuB,QAAO,0BAA0B;AAAC,SAC5FC,eAAe;AAAA,SAEfC,eAAe,EAAEC,gBAAgB;AAsCzC,MAAMC,yBAAyB,GAAG,GAAG;AACrC,MAAMC,2BAA2B,GAAG,GAAG;AACvC,MAAMC,0BAA0B,GAAG,GAAG;AACtC,MAAMC,4BAA4B,GAAG,GAAG;AACxC,MAAMC,oBAAoB,GAAG,GAAG;AAChC,MAAMC,6BAA6B,GAAG,GAAG;AACzC,MAAMC,mBAAmB,GAAG,GAAG;AAE/B,OAAO,MAAMC,SAAuB,GAAG,IAAIC,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAQ/E,OAAO,MAAMC,oBAAoB,GAAG,MAAAA,CAClCC,YAAoB,EACpBC,IAAkB,KACkB;EACpC,MAAMC,UAAU,GAAG,MAAMD,IAAI,CAACE,KAAK,CAACH,YAAY,EAAEA,YAAY,GAAG,EAAE,CAAC;EACpE,IAAI,CAACf,mBAAmB,CAACiB,UAAU,EAAEL,SAAS,CAACO,MAAM,CAAC,EAAE;IACtD,OAAO,IAAI;EACb;EAEA,MAAMC,cAAc,GAAGC,MAAM,CAAC,MAAML,IAAI,CAACM,SAAS,CAACP,YAAY,GAAGV,yBAAyB,CAAC,CAAC;EAC7F,MAAMkB,gBAAgB,GAAGF,MAAM,CAAC,MAAML,IAAI,CAACM,SAAS,CAACP,YAAY,GAAGT,2BAA2B,CAAC,CAAC;EACjG,MAAMkB,gBAAgB,GAAG,MAAMR,IAAI,CAACS,SAAS,CAACV,YAAY,GAAGP,4BAA4B,CAAC;EAC1F,MAAMkB,SAAS,GAAGL,MAAM,CAAC,MAAML,IAAI,CAACS,SAAS,CAACV,YAAY,GAAGN,oBAAoB,CAAC,CAAC;EACnF,MAAMkB,cAAc,GAAG,MAAMX,IAAI,CAACS,SAAS,CAACV,YAAY,GAAGR,0BAA0B,CAAC;EACtF,MAAMqB,aAAa,GAAG,MAAMZ,IAAI,CAACE,KAAK,CACpCH,YAAY,GAAGJ,mBAAmB,EAClCI,YAAY,GAAGJ,mBAAmB,GAAGU,MAAM,CAACM,cAAc,CAC5D,CAAC;EACD,MAAME,QAAQ,GAAG,IAAIC,WAAW,CAAC,CAAC,CAACC,MAAM,CAACH,aAAa,CAAC;EAExD,MAAMI,WAAW,GAAGjB,YAAY,GAAGJ,mBAAmB,GAAGU,MAAM,CAACM,cAAc,CAAC;EAC/E,MAAMM,eAAe,GAAG,MAAMjB,IAAI,CAACM,SAAS,CAACP,YAAY,GAAGL,6BAA6B,CAAC;EAE1F,MAAMwB,iBAAiB,GAAGb,MAAM,CAACY,eAAe,CAAC;EACjD,MAAME,UAAU,GAAG,IAAIC,QAAQ,CAC7B,MAAMpB,IAAI,CAACE,KAAK,CAACc,WAAW,EAAEA,WAAW,GAAGX,MAAM,CAACG,gBAAgB,CAAC,CACtE,CAAC;EAGD,MAAMa,SAAoB,GAAG;IAC3Bd,gBAAgB;IAChBH,cAAc;IACdc,iBAAiB;IACjBR;EACF,CAAC;EAED,MAAMY,GAAG,GAAGC,oBAAoB,CAACF,SAAS,EAAEF,UAAU,CAAC;EAEvD,OAAO;IACL,GAAGE,SAAS;IACZ,GAAGC,GAAG;IACNd,gBAAgB;IAChBG,cAAc;IACdE,QAAQ;IACRG;EACF,CAAC;AACH,CAAC;AAMD,OAAO,gBAAgBQ,uBAAuBA,CAC5CC,YAA0B,EACM;EAChC,MAAM;IAACC;EAAa,CAAC,GAAG,MAAMxC,eAAe,CAACuC,YAAY,CAAC;EAC3D,IAAIE,QAAQ,GAAG,MAAM7B,oBAAoB,CAAC4B,aAAa,EAAED,YAAY,CAAC;EACtE,OAAOE,QAAQ,EAAE;IACf,MAAMA,QAAQ;IACdA,QAAQ,GAAG,MAAM7B,oBAAoB,CACnC6B,QAAQ,CAACX,WAAW,GAAGX,MAAM,CAACsB,QAAQ,CAACnB,gBAAgB,CAAC,EACxDiB,YACF,CAAC;EACH;AACF;AAMA,MAAMhB,SAAS,GAAG,SAAAA,CAAA,EAAgC;EAChD,OAAO,CAAAmB,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,OAAW,CAAAA,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,OAAW,EAAE;AACjC,CAAC;AASD,MAAML,oBAAoB,GAAGA,CAACF,SAAoB,EAAEF,UAAoB,KAAyB;EAC/F,MAAMY,aAAa,GAAGC,gBAAgB,CAACX,SAAS,CAAC;EAEjD,MAAMY,YAAgC,GAAG,CAAC,CAAC;EAC3C,IAAIF,aAAa,CAACF,MAAM,GAAG,CAAC,EAAE;IAE5B,MAAMK,cAAc,GAAGH,aAAa,CAACI,MAAM,CAAC,CAACC,GAAG,EAAEC,IAAI,KAAKD,GAAG,GAAGC,IAAI,CAACR,MAAM,EAAE,CAAC,CAAC;IAGhF,MAAMS,iBAAiB,GAAG,IAAIzC,UAAU,CAACsB,UAAU,CAAChB,MAAM,CAAC,CAACoC,SAAS,CACnE,CAACC,IAAI,EAAEC,CAAC,EAAEC,GAAG,KACXjC,SAAS,CAACiC,GAAG,CAACD,CAAC,CAAC,EAAEC,GAAG,CAACD,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,MAAM,IACxChC,SAAS,CAACiC,GAAG,CAACD,CAAC,GAAG,CAAC,CAAC,EAAEC,GAAG,CAACD,CAAC,GAAG,CAAC,CAAC,CAAC,KAAKP,cAC1C,CAAC;IAED,IAAIS,SAAS,GAAG,CAAC;IACjB,KAAK,MAAMC,IAAI,IAAIb,aAAa,EAAE;MAChC,MAAMc,MAAM,GAAGF,SAAS;MACxBV,YAAY,CAACW,IAAI,CAACE,IAAI,CAAC,GAAG3B,UAAU,CAAC4B,YAAY,CAACT,iBAAiB,GAAG,CAAC,GAAGO,MAAM,EAAE,IAAI,CAAC;MACvFF,SAAS,GAAGE,MAAM,GAAGD,IAAI,CAACf,MAAM;IAClC;EACF;EAEA,OAAOI,YAAY;AACrB,CAAC;AAQD,MAAMD,gBAAgB,GAAIX,SAAoB,IAAuC;EAEnF,MAAMU,aAA+C,GAAG,EAAE;EAC1D,IAAIV,SAAS,CAACd,gBAAgB,KAAKF,MAAM,CAAC,UAAU,CAAC,EAAE;IACrD0B,aAAa,CAACiB,IAAI,CAAC;MAACF,IAAI,EAAE,kBAAkB;MAAEjB,MAAM,EAAE;IAAC,CAAC,CAAC;EAC3D;EACA,IAAIR,SAAS,CAACjB,cAAc,KAAKC,MAAM,CAAC,UAAU,CAAC,EAAE;IACnD0B,aAAa,CAACiB,IAAI,CAAC;MAACF,IAAI,EAAE,gBAAgB;MAAEjB,MAAM,EAAE;IAAC,CAAC,CAAC;EACzD;EACA,IAAIR,SAAS,CAACH,iBAAiB,KAAKb,MAAM,CAAC,UAAU,CAAC,EAAE;IACtD0B,aAAa,CAACiB,IAAI,CAAC;MAACF,IAAI,EAAE,mBAAmB;MAAEjB,MAAM,EAAE;IAAC,CAAC,CAAC;EAC5D;EACA,IAAIR,SAAS,CAACX,SAAS,KAAKL,MAAM,CAAC,UAAU,CAAC,EAAE;IAC9C0B,aAAa,CAACiB,IAAI,CAAC;MAACF,IAAI,EAAE,WAAW;MAAEjB,MAAM,EAAE;IAAC,CAAC,CAAC;EACpD;EAEA,OAAOE,aAAa;AACtB,CAAC;AAmBD,OAAO,SAASkB,gBAAgBA,CAACC,OAA0B,EAAe;EACxE,MAAMC,YAAY,GAAG;IACnB,GAAGD,OAAO;IACVE,QAAQ,EAAEF,OAAO,CAACrC,QAAQ,CAACgB,MAAM;IACjCwB,WAAW,EAAE;EACf,CAAC;EAED,IAAIC,WAAwB,GAAG,IAAIC,WAAW,CAAC,CAAC,CAAC;EAEjD,MAAMC,cAAmB,GAAG,CAAC,CAAC;EAC9B,IAAIL,YAAY,CAACN,MAAM,IAAI,UAAU,EAAE;IACrCW,cAAc,CAACX,MAAM,GAAGM,YAAY,CAACN,MAAM;IAC3CM,YAAY,CAACN,MAAM,GAAGxC,MAAM,CAAC,UAAU,CAAC;EAC1C;EACA,IAAI8C,YAAY,CAACtB,MAAM,IAAI,UAAU,EAAE;IACrC2B,cAAc,CAACC,IAAI,GAAGN,YAAY,CAACtB,MAAM;IACzCsB,YAAY,CAACtB,MAAM,GAAG,UAAU;EAClC;EAEA,IAAI6B,MAAM,CAACC,IAAI,CAACH,cAAc,CAAC,CAAC3B,MAAM,EAAE;IACtCyB,WAAW,GAAGnE,eAAe,CAACqE,cAAc,CAAC;IAC7CL,YAAY,CAACE,WAAW,GAAGC,WAAW,CAACM,UAAU;EACnD;EACA,MAAMC,MAAM,GAAG,IAAIzC,QAAQ,CAAC,IAAImC,WAAW,CAACO,MAAM,CAACnE,mBAAmB,CAAC,CAAC,CAAC;EAEzE,KAAK,MAAMoE,KAAK,IAAIC,iBAAiB,EAAE;IAAA,IAAAC,IAAA,EAAAC,aAAA,EAAAC,WAAA;IACrC/E,gBAAgB,CACdyE,MAAM,EACNE,KAAK,CAACN,IAAI,EACVM,KAAK,CAAClB,MAAM,GAAAoB,IAAA,IAAAC,aAAA,GACZf,YAAY,EAAAgB,WAAA,GAACJ,KAAK,CAACjB,IAAI,cAAAqB,WAAA,cAAAA,WAAA,GAAI,EAAE,CAAC,cAAAD,aAAA,cAAAA,aAAA,GAAIH,KAAK,CAACK,OAAO,cAAAH,IAAA,cAAAA,IAAA,GAAI,CACrD,CAAC;EACH;EAEA,MAAMI,WAAW,GAAG,IAAIC,WAAW,CAAC,CAAC,CAACC,MAAM,CAACpB,YAAY,CAACtC,QAAQ,CAAC;EAEnE,MAAM2D,SAAS,GAAGvF,uBAAuB,CAAC4E,MAAM,CAAC1D,MAAM,EAAEkE,WAAW,EAAEf,WAAW,CAAC;EAElF,OAAOkB,SAAS;AAClB;AAGA,MAAMR,iBAAiB,GAAG,CAExB;EACEnB,MAAM,EAAE,CAAC;EACTY,IAAI,EAAE,CAAC;EACPW,OAAO,EAAE,IAAIhD,QAAQ,CAACxB,SAAS,CAACO,MAAM,CAAC,CAACG,SAAS,CAAC,CAAC,EAAE,IAAI;AAC3D,CAAC,EAGD;EACEuC,MAAM,EAAE,CAAC;EACTY,IAAI,EAAE,CAAC;EACPW,OAAO,EAAE;AACX,CAAC,EAGD;EACEvB,MAAM,EAAE,CAAC;EACTY,IAAI,EAAE,CAAC;EACPW,OAAO,EAAE;AACX,CAAC,EAGD;EACEvB,MAAM,EAAE,CAAC;EACTY,IAAI,EAAE,CAAC;EACPW,OAAO,EAAE;AACX,CAAC,EAGD;EACEvB,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPW,OAAO,EAAE;AACX,CAAC,EAGD;EACEvB,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPW,OAAO,EAAE;AACX,CAAC,EAGD;EACEvB,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPW,OAAO,EAAE;AACX,CAAC,EAGD;EACEvB,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPX,IAAI,EAAE;AACR,CAAC,EAGD;EACED,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPX,IAAI,EAAE;AACR,CAAC,EAGD;EACED,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPX,IAAI,EAAE;AACR,CAAC,EAGD;EACED,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPX,IAAI,EAAE;AACR,CAAC,EAGD;EACED,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPW,OAAO,EAAE,CAAC;EACVtB,IAAI,EAAE;AACR,CAAC,EAGD;EACED,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPW,OAAO,EAAE;AACX,CAAC,EAGD;EACEvB,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPW,OAAO,EAAE;AACX,CAAC,EAGD;EACEvB,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPW,OAAO,EAAE;AACX,CAAC,EAGD;EACEvB,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPW,OAAO,EAAE;AACX,CAAC,EAGD;EACEvB,MAAM,EAAE,EAAE;EACVY,IAAI,EAAE,CAAC;EACPX,IAAI,EAAE;AACR,CAAC,CACF"}
|
|
@@ -8,6 +8,16 @@ export type ZipEoCDRecord = {
|
|
|
8
8
|
cdStartOffset: bigint;
|
|
9
9
|
/** Relative offset of local file header */
|
|
10
10
|
cdRecordsNumber: bigint;
|
|
11
|
+
offsets: ZipEoCDRecordOffsets;
|
|
12
|
+
};
|
|
13
|
+
/**
|
|
14
|
+
* End of central directory offsets
|
|
15
|
+
* according to https://en.wikipedia.org/wiki/ZIP_(file_format)
|
|
16
|
+
*/
|
|
17
|
+
export type ZipEoCDRecordOffsets = {
|
|
18
|
+
zipEoCDOffset: bigint;
|
|
19
|
+
zip64EoCDOffset?: bigint;
|
|
20
|
+
zip64EoCDLocatorOffset?: bigint;
|
|
11
21
|
};
|
|
12
22
|
/**
|
|
13
23
|
* Parses end of central directory record of zip file
|
|
@@ -15,4 +25,13 @@ export type ZipEoCDRecord = {
|
|
|
15
25
|
* @returns Info from the header
|
|
16
26
|
*/
|
|
17
27
|
export declare const parseEoCDRecord: (file: FileProvider) => Promise<ZipEoCDRecord>;
|
|
28
|
+
/**
|
|
29
|
+
* updates EoCD record to add more files to the archieve
|
|
30
|
+
* @param eocdBody buffer containing header
|
|
31
|
+
* @param oldEoCDOffsets info read from EoCD record befor updating
|
|
32
|
+
* @param newCDStartOffset CD start offset to be updated
|
|
33
|
+
* @param eocdStartOffset EoCD start offset to be updated
|
|
34
|
+
* @returns new EoCD header
|
|
35
|
+
*/
|
|
36
|
+
export declare function updateEoCD(eocdBody: ArrayBuffer, oldEoCDOffsets: ZipEoCDRecordOffsets, newCDStartOffset: bigint, eocdStartOffset: bigint, newCDRecordsNumber: bigint): Promise<Uint8Array>;
|
|
18
37
|
//# sourceMappingURL=end-of-central-directory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"end-of-central-directory.d.ts","sourceRoot":"","sources":["../../src/parse-zip/end-of-central-directory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAsB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"end-of-central-directory.d.ts","sourceRoot":"","sources":["../../src/parse-zip/end-of-central-directory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAsB,MAAM,0BAA0B,CAAC;AAI3E;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,2CAA2C;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,aAAa,EAAE,MAAM,CAAC;IAEtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC,CAAC;AAiBF;;;;GAIG;AACH,eAAO,MAAM,eAAe,SAAgB,YAAY,KAAG,QAAQ,aAAa,CAmC/E,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,WAAW,EACrB,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,MAAM,EACxB,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,UAAU,CAAC,CAiDrB"}
|
|
@@ -1,34 +1,68 @@
|
|
|
1
1
|
import { compareArrayBuffers } from '@loaders.gl/loader-utils';
|
|
2
2
|
import { searchFromTheEnd } from "./search-from-the-end.js";
|
|
3
|
+
import { setFieldToNumber } from "./zip64-info-generation.js";
|
|
3
4
|
const eoCDSignature = new Uint8Array([0x50, 0x4b, 0x05, 0x06]);
|
|
4
5
|
const zip64EoCDLocatorSignature = new Uint8Array([0x50, 0x4b, 0x06, 0x07]);
|
|
5
6
|
const zip64EoCDSignature = new Uint8Array([0x50, 0x4b, 0x06, 0x06]);
|
|
6
7
|
const CD_RECORDS_NUMBER_OFFSET = 8n;
|
|
8
|
+
const CD_RECORDS_NUMBER_ON_DISC_OFFSET = 10n;
|
|
9
|
+
const CD_CD_BYTE_SIZE_OFFSET = 12n;
|
|
7
10
|
const CD_START_OFFSET_OFFSET = 16n;
|
|
8
11
|
const ZIP64_EOCD_START_OFFSET_OFFSET = 8n;
|
|
9
12
|
const ZIP64_CD_RECORDS_NUMBER_OFFSET = 24n;
|
|
13
|
+
const ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET = 32n;
|
|
14
|
+
const ZIP64_CD_CD_BYTE_SIZE_OFFSET = 40n;
|
|
10
15
|
const ZIP64_CD_START_OFFSET_OFFSET = 48n;
|
|
11
16
|
export const parseEoCDRecord = async file => {
|
|
12
17
|
const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);
|
|
13
18
|
let cdRecordsNumber = BigInt(await file.getUint16(zipEoCDOffset + CD_RECORDS_NUMBER_OFFSET));
|
|
14
19
|
let cdStartOffset = BigInt(await file.getUint32(zipEoCDOffset + CD_START_OFFSET_OFFSET));
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
}
|
|
21
|
-
const zip64EoCDOffset = await file.getBigUint64(zip64EoCDLocatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET);
|
|
20
|
+
let zip64EoCDLocatorOffset = zipEoCDOffset - 20n;
|
|
21
|
+
let zip64EoCDOffset = 0n;
|
|
22
|
+
const magicBytes = await file.slice(zip64EoCDLocatorOffset, zip64EoCDLocatorOffset + 4n);
|
|
23
|
+
if (compareArrayBuffers(magicBytes, zip64EoCDLocatorSignature)) {
|
|
24
|
+
zip64EoCDOffset = await file.getBigUint64(zip64EoCDLocatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET);
|
|
22
25
|
const endOfCDMagicBytes = await file.slice(zip64EoCDOffset, zip64EoCDOffset + 4n);
|
|
23
26
|
if (!compareArrayBuffers(endOfCDMagicBytes, zip64EoCDSignature.buffer)) {
|
|
24
27
|
throw new Error('zip64 EoCD not found');
|
|
25
28
|
}
|
|
26
29
|
cdRecordsNumber = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_RECORDS_NUMBER_OFFSET);
|
|
27
30
|
cdStartOffset = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_START_OFFSET_OFFSET);
|
|
31
|
+
} else {
|
|
32
|
+
zip64EoCDLocatorOffset = 0n;
|
|
28
33
|
}
|
|
29
34
|
return {
|
|
30
35
|
cdRecordsNumber,
|
|
31
|
-
cdStartOffset
|
|
36
|
+
cdStartOffset,
|
|
37
|
+
offsets: {
|
|
38
|
+
zip64EoCDOffset,
|
|
39
|
+
zip64EoCDLocatorOffset,
|
|
40
|
+
zipEoCDOffset
|
|
41
|
+
}
|
|
32
42
|
};
|
|
33
43
|
};
|
|
44
|
+
export async function updateEoCD(eocdBody, oldEoCDOffsets, newCDStartOffset, eocdStartOffset, newCDRecordsNumber) {
|
|
45
|
+
var _oldEoCDOffsets$zip;
|
|
46
|
+
const eocd = new DataView(eocdBody);
|
|
47
|
+
const classicEoCDOffset = oldEoCDOffsets.zipEoCDOffset - ((_oldEoCDOffsets$zip = oldEoCDOffsets.zip64EoCDOffset) !== null && _oldEoCDOffsets$zip !== void 0 ? _oldEoCDOffsets$zip : 0n);
|
|
48
|
+
if (Number(newCDRecordsNumber) <= 0xffff) {
|
|
49
|
+
setFieldToNumber(eocd, 2, classicEoCDOffset + CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);
|
|
50
|
+
setFieldToNumber(eocd, 2, classicEoCDOffset + CD_RECORDS_NUMBER_ON_DISC_OFFSET, newCDRecordsNumber);
|
|
51
|
+
}
|
|
52
|
+
if (eocdStartOffset - newCDStartOffset <= 0xffffffff) {
|
|
53
|
+
setFieldToNumber(eocd, 4, classicEoCDOffset + CD_CD_BYTE_SIZE_OFFSET, eocdStartOffset - newCDStartOffset);
|
|
54
|
+
}
|
|
55
|
+
if (newCDStartOffset < 0xffffffff) {
|
|
56
|
+
setFieldToNumber(eocd, 4, classicEoCDOffset + CD_START_OFFSET_OFFSET, newCDStartOffset);
|
|
57
|
+
}
|
|
58
|
+
if (oldEoCDOffsets.zip64EoCDLocatorOffset && oldEoCDOffsets.zip64EoCDOffset) {
|
|
59
|
+
const locatorOffset = oldEoCDOffsets.zip64EoCDLocatorOffset - oldEoCDOffsets.zip64EoCDOffset;
|
|
60
|
+
setFieldToNumber(eocd, 8, locatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET, eocdStartOffset);
|
|
61
|
+
setFieldToNumber(eocd, 8, ZIP64_CD_START_OFFSET_OFFSET, newCDStartOffset);
|
|
62
|
+
setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);
|
|
63
|
+
setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET, newCDRecordsNumber);
|
|
64
|
+
setFieldToNumber(eocd, 8, ZIP64_CD_CD_BYTE_SIZE_OFFSET, eocdStartOffset - newCDStartOffset);
|
|
65
|
+
}
|
|
66
|
+
return new Uint8Array(eocd.buffer);
|
|
67
|
+
}
|
|
34
68
|
//# sourceMappingURL=end-of-central-directory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"end-of-central-directory.js","names":["compareArrayBuffers","searchFromTheEnd","eoCDSignature","Uint8Array","zip64EoCDLocatorSignature","zip64EoCDSignature","CD_RECORDS_NUMBER_OFFSET","CD_START_OFFSET_OFFSET","ZIP64_EOCD_START_OFFSET_OFFSET","ZIP64_CD_RECORDS_NUMBER_OFFSET","ZIP64_CD_START_OFFSET_OFFSET","parseEoCDRecord","file","zipEoCDOffset","cdRecordsNumber","BigInt","getUint16","cdStartOffset","getUint32","zip64EoCDLocatorOffset","magicBytes","slice","Error","
|
|
1
|
+
{"version":3,"file":"end-of-central-directory.js","names":["compareArrayBuffers","searchFromTheEnd","setFieldToNumber","eoCDSignature","Uint8Array","zip64EoCDLocatorSignature","zip64EoCDSignature","CD_RECORDS_NUMBER_OFFSET","CD_RECORDS_NUMBER_ON_DISC_OFFSET","CD_CD_BYTE_SIZE_OFFSET","CD_START_OFFSET_OFFSET","ZIP64_EOCD_START_OFFSET_OFFSET","ZIP64_CD_RECORDS_NUMBER_OFFSET","ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET","ZIP64_CD_CD_BYTE_SIZE_OFFSET","ZIP64_CD_START_OFFSET_OFFSET","parseEoCDRecord","file","zipEoCDOffset","cdRecordsNumber","BigInt","getUint16","cdStartOffset","getUint32","zip64EoCDLocatorOffset","zip64EoCDOffset","magicBytes","slice","getBigUint64","endOfCDMagicBytes","buffer","Error","offsets","updateEoCD","eocdBody","oldEoCDOffsets","newCDStartOffset","eocdStartOffset","newCDRecordsNumber","_oldEoCDOffsets$zip","eocd","DataView","classicEoCDOffset","Number","locatorOffset"],"sources":["../../src/parse-zip/end-of-central-directory.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {FileProvider, compareArrayBuffers} from '@loaders.gl/loader-utils';\nimport {ZipSignature, searchFromTheEnd} from './search-from-the-end';\nimport {setFieldToNumber} from './zip64-info-generation';\n\n/**\n * End of central directory info\n * according to https://en.wikipedia.org/wiki/ZIP_(file_format)\n */\nexport type ZipEoCDRecord = {\n /** Relative offset of local file header */\n cdStartOffset: bigint;\n /** Relative offset of local file header */\n cdRecordsNumber: bigint;\n offsets: ZipEoCDRecordOffsets;\n};\n\n/**\n * End of central directory offsets\n * according to https://en.wikipedia.org/wiki/ZIP_(file_format)\n */\nexport type ZipEoCDRecordOffsets = {\n zipEoCDOffset: bigint;\n\n zip64EoCDOffset?: bigint;\n zip64EoCDLocatorOffset?: bigint;\n};\n\nconst eoCDSignature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x05, 0x06]);\nconst zip64EoCDLocatorSignature = new Uint8Array([0x50, 0x4b, 0x06, 0x07]);\nconst zip64EoCDSignature = new Uint8Array([0x50, 0x4b, 0x06, 0x06]);\n\n// offsets accroding to https://en.wikipedia.org/wiki/ZIP_(file_format)\nconst CD_RECORDS_NUMBER_OFFSET = 8n;\nconst CD_RECORDS_NUMBER_ON_DISC_OFFSET = 10n;\nconst CD_CD_BYTE_SIZE_OFFSET = 12n;\nconst CD_START_OFFSET_OFFSET = 16n;\nconst ZIP64_EOCD_START_OFFSET_OFFSET = 8n;\nconst ZIP64_CD_RECORDS_NUMBER_OFFSET = 24n;\nconst ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET = 32n;\nconst ZIP64_CD_CD_BYTE_SIZE_OFFSET = 40n;\nconst ZIP64_CD_START_OFFSET_OFFSET = 48n;\n\n/**\n * Parses end of central directory record of zip file\n * @param file - FileProvider instance\n * @returns Info from the header\n */\nexport const parseEoCDRecord = async (file: FileProvider): Promise<ZipEoCDRecord> => {\n const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);\n\n let cdRecordsNumber = BigInt(await file.getUint16(zipEoCDOffset + CD_RECORDS_NUMBER_OFFSET));\n let cdStartOffset = BigInt(await file.getUint32(zipEoCDOffset + CD_START_OFFSET_OFFSET));\n\n let zip64EoCDLocatorOffset = zipEoCDOffset - 20n;\n let zip64EoCDOffset = 0n;\n\n const magicBytes = await file.slice(zip64EoCDLocatorOffset, zip64EoCDLocatorOffset + 4n);\n if (compareArrayBuffers(magicBytes, zip64EoCDLocatorSignature)) {\n zip64EoCDOffset = await file.getBigUint64(\n zip64EoCDLocatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET\n );\n\n const endOfCDMagicBytes = await file.slice(zip64EoCDOffset, zip64EoCDOffset + 4n);\n if (!compareArrayBuffers(endOfCDMagicBytes, zip64EoCDSignature.buffer)) {\n throw new Error('zip64 EoCD not found');\n }\n\n cdRecordsNumber = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_RECORDS_NUMBER_OFFSET);\n cdStartOffset = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_START_OFFSET_OFFSET);\n } else {\n zip64EoCDLocatorOffset = 0n;\n }\n\n return {\n cdRecordsNumber,\n cdStartOffset,\n offsets: {\n zip64EoCDOffset,\n zip64EoCDLocatorOffset,\n zipEoCDOffset\n }\n };\n};\n\n/**\n * updates EoCD record to add more files to the archieve\n * @param eocdBody buffer containing header\n * @param oldEoCDOffsets info read from EoCD record befor updating\n * @param newCDStartOffset CD start offset to be updated\n * @param eocdStartOffset EoCD start offset to be updated\n * @returns new EoCD header\n */\nexport async function updateEoCD(\n eocdBody: ArrayBuffer,\n oldEoCDOffsets: ZipEoCDRecordOffsets,\n newCDStartOffset: bigint,\n eocdStartOffset: bigint,\n newCDRecordsNumber: bigint\n): Promise<Uint8Array> {\n const eocd = new DataView(eocdBody);\n\n const classicEoCDOffset = oldEoCDOffsets.zipEoCDOffset - (oldEoCDOffsets.zip64EoCDOffset ?? 0n);\n\n // updating classic EoCD record with new CD records number in general and on disc\n if (Number(newCDRecordsNumber) <= 0xffff) {\n setFieldToNumber(eocd, 2, classicEoCDOffset + CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);\n setFieldToNumber(\n eocd,\n 2,\n classicEoCDOffset + CD_RECORDS_NUMBER_ON_DISC_OFFSET,\n newCDRecordsNumber\n );\n }\n\n // updating zip64 EoCD record with new size of CD\n if (eocdStartOffset - newCDStartOffset <= 0xffffffff) {\n setFieldToNumber(\n eocd,\n 4,\n classicEoCDOffset + CD_CD_BYTE_SIZE_OFFSET,\n eocdStartOffset - newCDStartOffset\n );\n }\n\n // updating classic EoCD record with new CD start offset\n if (newCDStartOffset < 0xffffffff) {\n setFieldToNumber(eocd, 4, classicEoCDOffset + CD_START_OFFSET_OFFSET, newCDStartOffset);\n }\n\n // updating zip64 EoCD locator and record with new EoCD record start offset and cd records number\n if (oldEoCDOffsets.zip64EoCDLocatorOffset && oldEoCDOffsets.zip64EoCDOffset) {\n // updating zip64 EoCD locator with new EoCD record start offset\n const locatorOffset = oldEoCDOffsets.zip64EoCDLocatorOffset - oldEoCDOffsets.zip64EoCDOffset;\n setFieldToNumber(eocd, 8, locatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET, eocdStartOffset);\n\n // updating zip64 EoCD record with new cd start offset\n setFieldToNumber(eocd, 8, ZIP64_CD_START_OFFSET_OFFSET, newCDStartOffset);\n\n // updating zip64 EoCD record with new cd records number\n setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);\n setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET, newCDRecordsNumber);\n\n // updating zip64 EoCD record with new size of CD\n setFieldToNumber(eocd, 8, ZIP64_CD_CD_BYTE_SIZE_OFFSET, eocdStartOffset - newCDStartOffset);\n }\n\n return new Uint8Array(eocd.buffer);\n}\n"],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* adds one file in the end of the archieve
|
|
3
|
+
* @param zipUrl path to the file
|
|
4
|
+
* @param fileToAdd new file body
|
|
5
|
+
* @param fileName new file name
|
|
6
|
+
*/
|
|
7
|
+
export declare function addOneFile(zipUrl: string, fileToAdd: ArrayBuffer, fileName: string): Promise<void>;
|
|
8
|
+
//# sourceMappingURL=zip-compozition.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"zip-compozition.d.ts","sourceRoot":"","sources":["../../src/parse-zip/zip-compozition.ts"],"names":[],"mappings":"AAuEA;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,iBAmCxF"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { FileHandleFile, concatenateArrayBuffers } from '@loaders.gl/loader-utils';
|
|
2
|
+
import { parseEoCDRecord, updateEoCD } from "./end-of-central-directory.js";
|
|
3
|
+
import { CRC32Hash } from '@loaders.gl/crypto';
|
|
4
|
+
import { generateLocalHeader } from "./local-file-header.js";
|
|
5
|
+
import { generateCDHeader } from "./cd-file-header.js";
|
|
6
|
+
async function cutTheTailOff(provider) {
|
|
7
|
+
const oldEoCDinfo = await parseEoCDRecord(provider);
|
|
8
|
+
const oldCDStartOffset = oldEoCDinfo.cdStartOffset;
|
|
9
|
+
const oldCDLength = Number(oldEoCDinfo.offsets.zip64EoCDOffset ? oldEoCDinfo.offsets.zip64EoCDOffset - oldCDStartOffset : oldEoCDinfo.offsets.zipEoCDOffset - oldCDStartOffset);
|
|
10
|
+
const zipEnding = await provider.slice(oldCDStartOffset, provider.length);
|
|
11
|
+
await provider.truncate(Number(oldCDStartOffset));
|
|
12
|
+
const oldCDBody = zipEnding.slice(0, oldCDLength);
|
|
13
|
+
const eocdBody = zipEnding.slice(oldCDLength, zipEnding.byteLength);
|
|
14
|
+
return [oldCDBody, eocdBody, oldEoCDinfo];
|
|
15
|
+
}
|
|
16
|
+
async function generateFileHeaders(fileName, fileToAdd, localFileHeaderOffset) {
|
|
17
|
+
const newFileCRC322 = parseInt(await new CRC32Hash().hash(fileToAdd, 'hex'), 16);
|
|
18
|
+
const newFileLocalHeader = generateLocalHeader({
|
|
19
|
+
crc32: newFileCRC322,
|
|
20
|
+
fileName,
|
|
21
|
+
length: fileToAdd.byteLength
|
|
22
|
+
});
|
|
23
|
+
const newFileCDHeader = generateCDHeader({
|
|
24
|
+
crc32: newFileCRC322,
|
|
25
|
+
fileName,
|
|
26
|
+
offset: localFileHeaderOffset,
|
|
27
|
+
length: fileToAdd.byteLength
|
|
28
|
+
});
|
|
29
|
+
return [new Uint8Array(concatenateArrayBuffers(newFileLocalHeader, fileToAdd)), new Uint8Array(newFileCDHeader)];
|
|
30
|
+
}
|
|
31
|
+
export async function addOneFile(zipUrl, fileToAdd, fileName) {
|
|
32
|
+
const provider = new FileHandleFile(zipUrl, true);
|
|
33
|
+
const [oldCDBody, eocdBody, oldEoCDinfo] = await cutTheTailOff(provider);
|
|
34
|
+
const newFileOffset = provider.length;
|
|
35
|
+
const [localPart, cdHeaderPart] = await generateFileHeaders(fileName, fileToAdd, newFileOffset);
|
|
36
|
+
await provider.append(localPart);
|
|
37
|
+
const newCDBody = concatenateArrayBuffers(oldCDBody, cdHeaderPart);
|
|
38
|
+
const newCDStartOffset = provider.length;
|
|
39
|
+
await provider.append(new Uint8Array(newCDBody));
|
|
40
|
+
const eocdOffset = provider.length;
|
|
41
|
+
await provider.append(await updateEoCD(eocdBody, oldEoCDinfo.offsets, newCDStartOffset, eocdOffset, oldEoCDinfo.cdRecordsNumber + 1n));
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=zip-compozition.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"zip-compozition.js","names":["FileHandleFile","concatenateArrayBuffers","parseEoCDRecord","updateEoCD","CRC32Hash","generateLocalHeader","generateCDHeader","cutTheTailOff","provider","oldEoCDinfo","oldCDStartOffset","cdStartOffset","oldCDLength","Number","offsets","zip64EoCDOffset","zipEoCDOffset","zipEnding","slice","length","truncate","oldCDBody","eocdBody","byteLength","generateFileHeaders","fileName","fileToAdd","localFileHeaderOffset","newFileCRC322","parseInt","hash","newFileLocalHeader","crc32","newFileCDHeader","offset","Uint8Array","addOneFile","zipUrl","newFileOffset","localPart","cdHeaderPart","append","newCDBody","newCDStartOffset","eocdOffset","cdRecordsNumber"],"sources":["../../src/parse-zip/zip-compozition.ts"],"sourcesContent":["import {FileHandleFile, concatenateArrayBuffers} from '@loaders.gl/loader-utils';\nimport {ZipEoCDRecord, parseEoCDRecord, updateEoCD} from './end-of-central-directory';\nimport {CRC32Hash} from '@loaders.gl/crypto';\nimport {generateLocalHeader} from './local-file-header';\nimport {generateCDHeader} from './cd-file-header';\n\n/**\n * cut off CD and EoCD records from zip file\n * @param provider zip file\n * @returns tuple with three values: CD, EoCD record, EoCD information\n */\nasync function cutTheTailOff(\n provider: FileHandleFile\n): Promise<[ArrayBuffer, ArrayBuffer, ZipEoCDRecord]> {\n // define where the body ends\n const oldEoCDinfo = await parseEoCDRecord(provider);\n const oldCDStartOffset = oldEoCDinfo.cdStartOffset;\n\n // define cd length\n const oldCDLength = Number(\n oldEoCDinfo.offsets.zip64EoCDOffset\n ? oldEoCDinfo.offsets.zip64EoCDOffset - oldCDStartOffset\n : oldEoCDinfo.offsets.zipEoCDOffset - oldCDStartOffset\n );\n\n // cut off everything except of archieve body\n const zipEnding = await provider.slice(oldCDStartOffset, provider.length);\n await provider.truncate(Number(oldCDStartOffset));\n\n // divide cd body and eocd record\n const oldCDBody = zipEnding.slice(0, oldCDLength);\n const eocdBody = zipEnding.slice(oldCDLength, zipEnding.byteLength);\n\n return [oldCDBody, eocdBody, oldEoCDinfo];\n}\n\n/**\n * generates CD and local headers for the file\n * @param fileName name of the file\n * @param fileToAdd buffer with the file\n * @param localFileHeaderOffset offset of the file local header\n * @returns tuple with two values: local header and file body, cd header\n */\nasync function generateFileHeaders(\n fileName: string,\n fileToAdd: ArrayBuffer,\n localFileHeaderOffset: bigint\n): Promise<[Uint8Array, Uint8Array]> {\n // generating CRC32 of the content\n const newFileCRC322 = parseInt(await new CRC32Hash().hash(fileToAdd, 'hex'), 16);\n\n // generate local header for the file\n const newFileLocalHeader = generateLocalHeader({\n crc32: newFileCRC322,\n fileName,\n length: fileToAdd.byteLength\n });\n\n // generate hash file cd header\n const newFileCDHeader = generateCDHeader({\n crc32: newFileCRC322,\n fileName,\n offset: localFileHeaderOffset,\n length: fileToAdd.byteLength\n });\n return [\n new Uint8Array(concatenateArrayBuffers(newFileLocalHeader, fileToAdd)),\n new Uint8Array(newFileCDHeader)\n ];\n}\n\n/**\n * adds one file in the end of the archieve\n * @param zipUrl path to the file\n * @param fileToAdd new file body\n * @param fileName new file name\n */\nexport async function addOneFile(zipUrl: string, fileToAdd: ArrayBuffer, fileName: string) {\n // init file handler\n const provider = new FileHandleFile(zipUrl, true);\n\n const [oldCDBody, eocdBody, oldEoCDinfo] = await cutTheTailOff(provider);\n\n // remember the new file local header start offset\n const newFileOffset = provider.length;\n\n const [localPart, cdHeaderPart] = await generateFileHeaders(fileName, fileToAdd, newFileOffset);\n\n // write down the file local header\n await provider.append(localPart);\n\n // add the file CD header to the CD\n const newCDBody = concatenateArrayBuffers(oldCDBody, cdHeaderPart);\n\n // remember the CD start offset\n const newCDStartOffset = provider.length;\n\n // write down new CD\n await provider.append(new Uint8Array(newCDBody));\n\n // remember where eocd starts\n const eocdOffset = provider.length;\n\n await provider.append(\n await updateEoCD(\n eocdBody,\n oldEoCDinfo.offsets,\n newCDStartOffset,\n eocdOffset,\n oldEoCDinfo.cdRecordsNumber + 1n\n )\n );\n}\n"],"mappings":"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"}
|
|
@@ -19,6 +19,6 @@ export declare function createZip64Info(options: Zip64Options): ArrayBuffer;
|
|
|
19
19
|
* @param fieldOffset offset of the field
|
|
20
20
|
* @param value value to be written
|
|
21
21
|
*/
|
|
22
|
-
export declare function setFieldToNumber(header: DataView, fieldSize: number, fieldOffset: number, value: number | bigint): void;
|
|
22
|
+
export declare function setFieldToNumber(header: DataView, fieldSize: number, fieldOffset: number | bigint, value: number | bigint): void;
|
|
23
23
|
export {};
|
|
24
24
|
//# sourceMappingURL=zip64-info-generation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zip64-info-generation.d.ts","sourceRoot":"","sources":["../../src/parse-zip/zip64-info-generation.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,YAA+B,CAAC;AAEtD,2GAA2G;AAC3G,KAAK,YAAY,GAAG;IAClB,kEAAkE;IAClE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oCAAoC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,WAAW,CAkBlE;AAUD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,QAAQ,EAChB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"zip64-info-generation.d.ts","sourceRoot":"","sources":["../../src/parse-zip/zip64-info-generation.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,YAA+B,CAAC;AAEtD,2GAA2G;AAC3G,KAAK,YAAY,GAAG;IAClB,kEAAkE;IAClE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oCAAoC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,WAAW,CAkBlE;AAUD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,QAAQ,EAChB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,MAAM,EAC5B,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,IAAI,CAEN"}
|
|
@@ -18,7 +18,7 @@ export function createZip64Info(options) {
|
|
|
18
18
|
return concatenateArrayBuffers(...arraysToConcat);
|
|
19
19
|
}
|
|
20
20
|
export function setFieldToNumber(header, fieldSize, fieldOffset, value) {
|
|
21
|
-
NUMBER_SETTERS[fieldSize](header, fieldOffset, value);
|
|
21
|
+
NUMBER_SETTERS[fieldSize](header, Number(fieldOffset), value);
|
|
22
22
|
}
|
|
23
23
|
const NUMBER_SETTERS = {
|
|
24
24
|
2: (header, offset, value) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zip64-info-generation.js","names":["concatenateArrayBuffers","signature","Uint8Array","createZip64Info","options","optionsToUse","zip64Length","offset","size","arraysToConcat","field","ZIP64_FIELDS","_field$name","_optionsToUse","_field$name2","name","default","newValue","DataView","ArrayBuffer","NUMBER_SETTERS","push","buffer","setFieldToNumber","header","fieldSize","fieldOffset","value","
|
|
1
|
+
{"version":3,"file":"zip64-info-generation.js","names":["concatenateArrayBuffers","signature","Uint8Array","createZip64Info","options","optionsToUse","zip64Length","offset","size","arraysToConcat","field","ZIP64_FIELDS","_field$name","_optionsToUse","_field$name2","name","default","newValue","DataView","ArrayBuffer","NUMBER_SETTERS","push","buffer","setFieldToNumber","header","fieldSize","fieldOffset","value","Number","setUint16","setUint32","setBigUint64","BigInt","getUint16"],"sources":["../../src/parse-zip/zip64-info-generation.ts"],"sourcesContent":["import {concatenateArrayBuffers} from '@loaders.gl/loader-utils';\n\nexport const signature = new Uint8Array([0x01, 0x00]);\n\n/** info that can be placed into zip64 field, doc: https://en.wikipedia.org/wiki/ZIP_(file_format)#ZIP64 */\ntype Zip64Options = {\n /** Original uncompressed file size and Size of compressed data */\n size?: number;\n /** Offset of local header record */\n offset?: number;\n};\n\n/**\n * creates zip64 extra field\n * @param options info that can be placed into zip64 field\n * @returns buffer with field\n */\nexport function createZip64Info(options: Zip64Options): ArrayBuffer {\n const optionsToUse = {\n ...options,\n zip64Length: (options.offset ? 1 : 0) * 8 + (options.size ? 1 : 0) * 16\n };\n\n const arraysToConcat: ArrayBuffer[] = [];\n\n for (const field of ZIP64_FIELDS) {\n if (!optionsToUse[field.name ?? ''] && !field.default) {\n continue;\n }\n const newValue = new DataView(new ArrayBuffer(field.size));\n NUMBER_SETTERS[field.size](newValue, 0, optionsToUse[field.name ?? ''] ?? field.default);\n arraysToConcat.push(newValue.buffer);\n }\n\n return concatenateArrayBuffers(...arraysToConcat);\n}\n\n/**\n * Function to write values into buffer\n * @param header buffer where to write a value\n * @param offset offset of the writing start\n * @param value value to be written\n */\ntype NumberSetter = (header: DataView, offset: number, value: number | bigint) => void;\n\n/**\n * Writes values into buffer according to the bytes amount\n * @param header header where to write the data\n * @param fieldSize size of the field in bytes\n * @param fieldOffset offset of the field\n * @param value value to be written\n */\nexport function setFieldToNumber(\n header: DataView,\n fieldSize: number,\n fieldOffset: number | bigint,\n value: number | bigint\n): void {\n NUMBER_SETTERS[fieldSize](header, Number(fieldOffset), value);\n}\n\n/** functions to write values into buffer according to the bytes amount */\nconst NUMBER_SETTERS: {[key: number]: NumberSetter} = {\n 2: (header, offset, value) => {\n header.setUint16(offset, Number(value), true);\n },\n 4: (header, offset, value) => {\n header.setUint32(offset, Number(value), true);\n },\n 8: (header, offset, value) => {\n header.setBigUint64(offset, BigInt(value), true);\n }\n};\n\n/** zip64 info fields description, we need it as a pattern to build a zip64 info */\nconst ZIP64_FIELDS = [\n // Header ID 0x0001\n {\n size: 2,\n default: new DataView(signature.buffer).getUint16(0, true)\n },\n\n // Size of the extra field chunk (8, 16, 24 or 28)\n {\n size: 2,\n name: 'zip64Length'\n },\n\n // Original uncompressed file size\n {\n size: 8,\n name: 'size'\n },\n\n // Size of compressed data\n {\n size: 8,\n name: 'size'\n },\n\n // Offset of local header record\n {\n size: 8,\n name: 'offset'\n }\n];\n"],"mappings":"AAAA,SAAQA,uBAAuB,QAAO,0BAA0B;AAEhE,OAAO,MAAMC,SAAS,GAAG,IAAIC,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAerD,OAAO,SAASC,eAAeA,CAACC,OAAqB,EAAe;EAClE,MAAMC,YAAY,GAAG;IACnB,GAAGD,OAAO;IACVE,WAAW,EAAE,CAACF,OAAO,CAACG,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAACH,OAAO,CAACI,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI;EACvE,CAAC;EAED,MAAMC,cAA6B,GAAG,EAAE;EAExC,KAAK,MAAMC,KAAK,IAAIC,YAAY,EAAE;IAAA,IAAAC,WAAA,EAAAC,aAAA,EAAAC,YAAA;IAChC,IAAI,CAACT,YAAY,EAAAO,WAAA,GAACF,KAAK,CAACK,IAAI,cAAAH,WAAA,cAAAA,WAAA,GAAI,EAAE,CAAC,IAAI,CAACF,KAAK,CAACM,OAAO,EAAE;MACrD;IACF;IACA,MAAMC,QAAQ,GAAG,IAAIC,QAAQ,CAAC,IAAIC,WAAW,CAACT,KAAK,CAACF,IAAI,CAAC,CAAC;IAC1DY,cAAc,CAACV,KAAK,CAACF,IAAI,CAAC,CAACS,QAAQ,EAAE,CAAC,GAAAJ,aAAA,GAAER,YAAY,EAAAS,YAAA,GAACJ,KAAK,CAACK,IAAI,cAAAD,YAAA,cAAAA,YAAA,GAAI,EAAE,CAAC,cAAAD,aAAA,cAAAA,aAAA,GAAIH,KAAK,CAACM,OAAO,CAAC;IACxFP,cAAc,CAACY,IAAI,CAACJ,QAAQ,CAACK,MAAM,CAAC;EACtC;EAEA,OAAOtB,uBAAuB,CAAC,GAAGS,cAAc,CAAC;AACnD;AAiBA,OAAO,SAASc,gBAAgBA,CAC9BC,MAAgB,EAChBC,SAAiB,EACjBC,WAA4B,EAC5BC,KAAsB,EAChB;EACNP,cAAc,CAACK,SAAS,CAAC,CAACD,MAAM,EAAEI,MAAM,CAACF,WAAW,CAAC,EAAEC,KAAK,CAAC;AAC/D;AAGA,MAAMP,cAA6C,GAAG;EACpD,CAAC,EAAE,CAACI,MAAM,EAAEjB,MAAM,EAAEoB,KAAK,KAAK;IAC5BH,MAAM,CAACK,SAAS,CAACtB,MAAM,EAAEqB,MAAM,CAACD,KAAK,CAAC,EAAE,IAAI,CAAC;EAC/C,CAAC;EACD,CAAC,EAAE,CAACH,MAAM,EAAEjB,MAAM,EAAEoB,KAAK,KAAK;IAC5BH,MAAM,CAACM,SAAS,CAACvB,MAAM,EAAEqB,MAAM,CAACD,KAAK,CAAC,EAAE,IAAI,CAAC;EAC/C,CAAC;EACD,CAAC,EAAE,CAACH,MAAM,EAAEjB,MAAM,EAAEoB,KAAK,KAAK;IAC5BH,MAAM,CAACO,YAAY,CAACxB,MAAM,EAAEyB,MAAM,CAACL,KAAK,CAAC,EAAE,IAAI,CAAC;EAClD;AACF,CAAC;AAGD,MAAMhB,YAAY,GAAG,CAEnB;EACEH,IAAI,EAAE,CAAC;EACPQ,OAAO,EAAE,IAAIE,QAAQ,CAACjB,SAAS,CAACqB,MAAM,CAAC,CAACW,SAAS,CAAC,CAAC,EAAE,IAAI;AAC3D,CAAC,EAGD;EACEzB,IAAI,EAAE,CAAC;EACPO,IAAI,EAAE;AACR,CAAC,EAGD;EACEP,IAAI,EAAE,CAAC;EACPO,IAAI,EAAE;AACR,CAAC,EAGD;EACEP,IAAI,EAAE,CAAC;EACPO,IAAI,EAAE;AACR,CAAC,EAGD;EACEP,IAAI,EAAE,CAAC;EACPO,IAAI,EAAE;AACR,CAAC,CACF"}
|
package/dist/zip-loader.js
CHANGED
package/dist/zip-writer.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/zip",
|
|
3
|
-
"version": "4.1.0-alpha.
|
|
3
|
+
"version": "4.1.0-alpha.4",
|
|
4
4
|
"description": "Zip Archive Loader",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -38,11 +38,11 @@
|
|
|
38
38
|
"build-bundle": "ocular-bundle ./src/index.ts"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@loaders.gl/compression": "4.1.0-alpha.
|
|
42
|
-
"@loaders.gl/crypto": "4.1.0-alpha.
|
|
43
|
-
"@loaders.gl/loader-utils": "4.1.0-alpha.
|
|
41
|
+
"@loaders.gl/compression": "4.1.0-alpha.4",
|
|
42
|
+
"@loaders.gl/crypto": "4.1.0-alpha.4",
|
|
43
|
+
"@loaders.gl/loader-utils": "4.1.0-alpha.4",
|
|
44
44
|
"jszip": "^3.1.5",
|
|
45
45
|
"md5": "^2.3.0"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "b18ba1d63be704fd021e4470e8ab84175621e62d"
|
|
48
48
|
}
|
|
@@ -200,7 +200,7 @@ type GenerateCDOptions = {
|
|
|
200
200
|
/** File size */
|
|
201
201
|
length: number;
|
|
202
202
|
/** Relative offset of local file header */
|
|
203
|
-
offset:
|
|
203
|
+
offset: bigint;
|
|
204
204
|
};
|
|
205
205
|
|
|
206
206
|
/**
|
|
@@ -220,7 +220,7 @@ export function generateCDHeader(options: GenerateCDOptions): ArrayBuffer {
|
|
|
220
220
|
const optionsToZip64: any = {};
|
|
221
221
|
if (optionsToUse.offset >= 0xffffffff) {
|
|
222
222
|
optionsToZip64.offset = optionsToUse.offset;
|
|
223
|
-
optionsToUse.offset = 0xffffffff;
|
|
223
|
+
optionsToUse.offset = BigInt(0xffffffff);
|
|
224
224
|
}
|
|
225
225
|
if (optionsToUse.length >= 0xffffffff) {
|
|
226
226
|
optionsToZip64.size = optionsToUse.length;
|
|
@@ -231,7 +231,7 @@ export function generateCDHeader(options: GenerateCDOptions): ArrayBuffer {
|
|
|
231
231
|
zip64header = createZip64Info(optionsToZip64);
|
|
232
232
|
optionsToUse.extraLength = zip64header.byteLength;
|
|
233
233
|
}
|
|
234
|
-
const header = new DataView(new ArrayBuffer(
|
|
234
|
+
const header = new DataView(new ArrayBuffer(Number(CD_FILE_NAME_OFFSET)));
|
|
235
235
|
|
|
236
236
|
for (const field of ZIP_HEADER_FIELDS) {
|
|
237
237
|
setFieldToNumber(
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
import {FileProvider, compareArrayBuffers} from '@loaders.gl/loader-utils';
|
|
6
6
|
import {ZipSignature, searchFromTheEnd} from './search-from-the-end';
|
|
7
|
+
import {setFieldToNumber} from './zip64-info-generation';
|
|
7
8
|
|
|
8
9
|
/**
|
|
9
10
|
* End of central directory info
|
|
@@ -14,6 +15,18 @@ export type ZipEoCDRecord = {
|
|
|
14
15
|
cdStartOffset: bigint;
|
|
15
16
|
/** Relative offset of local file header */
|
|
16
17
|
cdRecordsNumber: bigint;
|
|
18
|
+
offsets: ZipEoCDRecordOffsets;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* End of central directory offsets
|
|
23
|
+
* according to https://en.wikipedia.org/wiki/ZIP_(file_format)
|
|
24
|
+
*/
|
|
25
|
+
export type ZipEoCDRecordOffsets = {
|
|
26
|
+
zipEoCDOffset: bigint;
|
|
27
|
+
|
|
28
|
+
zip64EoCDOffset?: bigint;
|
|
29
|
+
zip64EoCDLocatorOffset?: bigint;
|
|
17
30
|
};
|
|
18
31
|
|
|
19
32
|
const eoCDSignature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x05, 0x06]);
|
|
@@ -22,9 +35,13 @@ const zip64EoCDSignature = new Uint8Array([0x50, 0x4b, 0x06, 0x06]);
|
|
|
22
35
|
|
|
23
36
|
// offsets accroding to https://en.wikipedia.org/wiki/ZIP_(file_format)
|
|
24
37
|
const CD_RECORDS_NUMBER_OFFSET = 8n;
|
|
38
|
+
const CD_RECORDS_NUMBER_ON_DISC_OFFSET = 10n;
|
|
39
|
+
const CD_CD_BYTE_SIZE_OFFSET = 12n;
|
|
25
40
|
const CD_START_OFFSET_OFFSET = 16n;
|
|
26
41
|
const ZIP64_EOCD_START_OFFSET_OFFSET = 8n;
|
|
27
42
|
const ZIP64_CD_RECORDS_NUMBER_OFFSET = 24n;
|
|
43
|
+
const ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET = 32n;
|
|
44
|
+
const ZIP64_CD_CD_BYTE_SIZE_OFFSET = 40n;
|
|
28
45
|
const ZIP64_CD_START_OFFSET_OFFSET = 48n;
|
|
29
46
|
|
|
30
47
|
/**
|
|
@@ -38,14 +55,12 @@ export const parseEoCDRecord = async (file: FileProvider): Promise<ZipEoCDRecord
|
|
|
38
55
|
let cdRecordsNumber = BigInt(await file.getUint16(zipEoCDOffset + CD_RECORDS_NUMBER_OFFSET));
|
|
39
56
|
let cdStartOffset = BigInt(await file.getUint32(zipEoCDOffset + CD_START_OFFSET_OFFSET));
|
|
40
57
|
|
|
41
|
-
|
|
42
|
-
|
|
58
|
+
let zip64EoCDLocatorOffset = zipEoCDOffset - 20n;
|
|
59
|
+
let zip64EoCDOffset = 0n;
|
|
43
60
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
}
|
|
48
|
-
const zip64EoCDOffset = await file.getBigUint64(
|
|
61
|
+
const magicBytes = await file.slice(zip64EoCDLocatorOffset, zip64EoCDLocatorOffset + 4n);
|
|
62
|
+
if (compareArrayBuffers(magicBytes, zip64EoCDLocatorSignature)) {
|
|
63
|
+
zip64EoCDOffset = await file.getBigUint64(
|
|
49
64
|
zip64EoCDLocatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET
|
|
50
65
|
);
|
|
51
66
|
|
|
@@ -56,10 +71,82 @@ export const parseEoCDRecord = async (file: FileProvider): Promise<ZipEoCDRecord
|
|
|
56
71
|
|
|
57
72
|
cdRecordsNumber = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_RECORDS_NUMBER_OFFSET);
|
|
58
73
|
cdStartOffset = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_START_OFFSET_OFFSET);
|
|
74
|
+
} else {
|
|
75
|
+
zip64EoCDLocatorOffset = 0n;
|
|
59
76
|
}
|
|
60
77
|
|
|
61
78
|
return {
|
|
62
79
|
cdRecordsNumber,
|
|
63
|
-
cdStartOffset
|
|
80
|
+
cdStartOffset,
|
|
81
|
+
offsets: {
|
|
82
|
+
zip64EoCDOffset,
|
|
83
|
+
zip64EoCDLocatorOffset,
|
|
84
|
+
zipEoCDOffset
|
|
85
|
+
}
|
|
64
86
|
};
|
|
65
87
|
};
|
|
88
|
+
|
|
89
|
+
/**
|
|
90
|
+
* updates EoCD record to add more files to the archieve
|
|
91
|
+
* @param eocdBody buffer containing header
|
|
92
|
+
* @param oldEoCDOffsets info read from EoCD record befor updating
|
|
93
|
+
* @param newCDStartOffset CD start offset to be updated
|
|
94
|
+
* @param eocdStartOffset EoCD start offset to be updated
|
|
95
|
+
* @returns new EoCD header
|
|
96
|
+
*/
|
|
97
|
+
export async function updateEoCD(
|
|
98
|
+
eocdBody: ArrayBuffer,
|
|
99
|
+
oldEoCDOffsets: ZipEoCDRecordOffsets,
|
|
100
|
+
newCDStartOffset: bigint,
|
|
101
|
+
eocdStartOffset: bigint,
|
|
102
|
+
newCDRecordsNumber: bigint
|
|
103
|
+
): Promise<Uint8Array> {
|
|
104
|
+
const eocd = new DataView(eocdBody);
|
|
105
|
+
|
|
106
|
+
const classicEoCDOffset = oldEoCDOffsets.zipEoCDOffset - (oldEoCDOffsets.zip64EoCDOffset ?? 0n);
|
|
107
|
+
|
|
108
|
+
// updating classic EoCD record with new CD records number in general and on disc
|
|
109
|
+
if (Number(newCDRecordsNumber) <= 0xffff) {
|
|
110
|
+
setFieldToNumber(eocd, 2, classicEoCDOffset + CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);
|
|
111
|
+
setFieldToNumber(
|
|
112
|
+
eocd,
|
|
113
|
+
2,
|
|
114
|
+
classicEoCDOffset + CD_RECORDS_NUMBER_ON_DISC_OFFSET,
|
|
115
|
+
newCDRecordsNumber
|
|
116
|
+
);
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
// updating zip64 EoCD record with new size of CD
|
|
120
|
+
if (eocdStartOffset - newCDStartOffset <= 0xffffffff) {
|
|
121
|
+
setFieldToNumber(
|
|
122
|
+
eocd,
|
|
123
|
+
4,
|
|
124
|
+
classicEoCDOffset + CD_CD_BYTE_SIZE_OFFSET,
|
|
125
|
+
eocdStartOffset - newCDStartOffset
|
|
126
|
+
);
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
// updating classic EoCD record with new CD start offset
|
|
130
|
+
if (newCDStartOffset < 0xffffffff) {
|
|
131
|
+
setFieldToNumber(eocd, 4, classicEoCDOffset + CD_START_OFFSET_OFFSET, newCDStartOffset);
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
// updating zip64 EoCD locator and record with new EoCD record start offset and cd records number
|
|
135
|
+
if (oldEoCDOffsets.zip64EoCDLocatorOffset && oldEoCDOffsets.zip64EoCDOffset) {
|
|
136
|
+
// updating zip64 EoCD locator with new EoCD record start offset
|
|
137
|
+
const locatorOffset = oldEoCDOffsets.zip64EoCDLocatorOffset - oldEoCDOffsets.zip64EoCDOffset;
|
|
138
|
+
setFieldToNumber(eocd, 8, locatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET, eocdStartOffset);
|
|
139
|
+
|
|
140
|
+
// updating zip64 EoCD record with new cd start offset
|
|
141
|
+
setFieldToNumber(eocd, 8, ZIP64_CD_START_OFFSET_OFFSET, newCDStartOffset);
|
|
142
|
+
|
|
143
|
+
// updating zip64 EoCD record with new cd records number
|
|
144
|
+
setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);
|
|
145
|
+
setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET, newCDRecordsNumber);
|
|
146
|
+
|
|
147
|
+
// updating zip64 EoCD record with new size of CD
|
|
148
|
+
setFieldToNumber(eocd, 8, ZIP64_CD_CD_BYTE_SIZE_OFFSET, eocdStartOffset - newCDStartOffset);
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
return new Uint8Array(eocd.buffer);
|
|
152
|
+
}
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
import {FileHandleFile, concatenateArrayBuffers} from '@loaders.gl/loader-utils';
|
|
2
|
+
import {ZipEoCDRecord, parseEoCDRecord, updateEoCD} from './end-of-central-directory';
|
|
3
|
+
import {CRC32Hash} from '@loaders.gl/crypto';
|
|
4
|
+
import {generateLocalHeader} from './local-file-header';
|
|
5
|
+
import {generateCDHeader} from './cd-file-header';
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* cut off CD and EoCD records from zip file
|
|
9
|
+
* @param provider zip file
|
|
10
|
+
* @returns tuple with three values: CD, EoCD record, EoCD information
|
|
11
|
+
*/
|
|
12
|
+
async function cutTheTailOff(
|
|
13
|
+
provider: FileHandleFile
|
|
14
|
+
): Promise<[ArrayBuffer, ArrayBuffer, ZipEoCDRecord]> {
|
|
15
|
+
// define where the body ends
|
|
16
|
+
const oldEoCDinfo = await parseEoCDRecord(provider);
|
|
17
|
+
const oldCDStartOffset = oldEoCDinfo.cdStartOffset;
|
|
18
|
+
|
|
19
|
+
// define cd length
|
|
20
|
+
const oldCDLength = Number(
|
|
21
|
+
oldEoCDinfo.offsets.zip64EoCDOffset
|
|
22
|
+
? oldEoCDinfo.offsets.zip64EoCDOffset - oldCDStartOffset
|
|
23
|
+
: oldEoCDinfo.offsets.zipEoCDOffset - oldCDStartOffset
|
|
24
|
+
);
|
|
25
|
+
|
|
26
|
+
// cut off everything except of archieve body
|
|
27
|
+
const zipEnding = await provider.slice(oldCDStartOffset, provider.length);
|
|
28
|
+
await provider.truncate(Number(oldCDStartOffset));
|
|
29
|
+
|
|
30
|
+
// divide cd body and eocd record
|
|
31
|
+
const oldCDBody = zipEnding.slice(0, oldCDLength);
|
|
32
|
+
const eocdBody = zipEnding.slice(oldCDLength, zipEnding.byteLength);
|
|
33
|
+
|
|
34
|
+
return [oldCDBody, eocdBody, oldEoCDinfo];
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* generates CD and local headers for the file
|
|
39
|
+
* @param fileName name of the file
|
|
40
|
+
* @param fileToAdd buffer with the file
|
|
41
|
+
* @param localFileHeaderOffset offset of the file local header
|
|
42
|
+
* @returns tuple with two values: local header and file body, cd header
|
|
43
|
+
*/
|
|
44
|
+
async function generateFileHeaders(
|
|
45
|
+
fileName: string,
|
|
46
|
+
fileToAdd: ArrayBuffer,
|
|
47
|
+
localFileHeaderOffset: bigint
|
|
48
|
+
): Promise<[Uint8Array, Uint8Array]> {
|
|
49
|
+
// generating CRC32 of the content
|
|
50
|
+
const newFileCRC322 = parseInt(await new CRC32Hash().hash(fileToAdd, 'hex'), 16);
|
|
51
|
+
|
|
52
|
+
// generate local header for the file
|
|
53
|
+
const newFileLocalHeader = generateLocalHeader({
|
|
54
|
+
crc32: newFileCRC322,
|
|
55
|
+
fileName,
|
|
56
|
+
length: fileToAdd.byteLength
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
// generate hash file cd header
|
|
60
|
+
const newFileCDHeader = generateCDHeader({
|
|
61
|
+
crc32: newFileCRC322,
|
|
62
|
+
fileName,
|
|
63
|
+
offset: localFileHeaderOffset,
|
|
64
|
+
length: fileToAdd.byteLength
|
|
65
|
+
});
|
|
66
|
+
return [
|
|
67
|
+
new Uint8Array(concatenateArrayBuffers(newFileLocalHeader, fileToAdd)),
|
|
68
|
+
new Uint8Array(newFileCDHeader)
|
|
69
|
+
];
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* adds one file in the end of the archieve
|
|
74
|
+
* @param zipUrl path to the file
|
|
75
|
+
* @param fileToAdd new file body
|
|
76
|
+
* @param fileName new file name
|
|
77
|
+
*/
|
|
78
|
+
export async function addOneFile(zipUrl: string, fileToAdd: ArrayBuffer, fileName: string) {
|
|
79
|
+
// init file handler
|
|
80
|
+
const provider = new FileHandleFile(zipUrl, true);
|
|
81
|
+
|
|
82
|
+
const [oldCDBody, eocdBody, oldEoCDinfo] = await cutTheTailOff(provider);
|
|
83
|
+
|
|
84
|
+
// remember the new file local header start offset
|
|
85
|
+
const newFileOffset = provider.length;
|
|
86
|
+
|
|
87
|
+
const [localPart, cdHeaderPart] = await generateFileHeaders(fileName, fileToAdd, newFileOffset);
|
|
88
|
+
|
|
89
|
+
// write down the file local header
|
|
90
|
+
await provider.append(localPart);
|
|
91
|
+
|
|
92
|
+
// add the file CD header to the CD
|
|
93
|
+
const newCDBody = concatenateArrayBuffers(oldCDBody, cdHeaderPart);
|
|
94
|
+
|
|
95
|
+
// remember the CD start offset
|
|
96
|
+
const newCDStartOffset = provider.length;
|
|
97
|
+
|
|
98
|
+
// write down new CD
|
|
99
|
+
await provider.append(new Uint8Array(newCDBody));
|
|
100
|
+
|
|
101
|
+
// remember where eocd starts
|
|
102
|
+
const eocdOffset = provider.length;
|
|
103
|
+
|
|
104
|
+
await provider.append(
|
|
105
|
+
await updateEoCD(
|
|
106
|
+
eocdBody,
|
|
107
|
+
oldEoCDinfo.offsets,
|
|
108
|
+
newCDStartOffset,
|
|
109
|
+
eocdOffset,
|
|
110
|
+
oldEoCDinfo.cdRecordsNumber + 1n
|
|
111
|
+
)
|
|
112
|
+
);
|
|
113
|
+
}
|
|
@@ -53,10 +53,10 @@ type NumberSetter = (header: DataView, offset: number, value: number | bigint) =
|
|
|
53
53
|
export function setFieldToNumber(
|
|
54
54
|
header: DataView,
|
|
55
55
|
fieldSize: number,
|
|
56
|
-
fieldOffset: number,
|
|
56
|
+
fieldOffset: number | bigint,
|
|
57
57
|
value: number | bigint
|
|
58
58
|
): void {
|
|
59
|
-
NUMBER_SETTERS[fieldSize](header, fieldOffset, value);
|
|
59
|
+
NUMBER_SETTERS[fieldSize](header, Number(fieldOffset), value);
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
/** functions to write values into buffer according to the bytes amount */
|