@loaders.gl/tile-converter 4.1.0-alpha.10 → 4.1.0-alpha.11

package/dist/lib/utils/compress-util.js

@@ -1,13 +1,5 @@
 import { createGzip } from 'zlib';
-import { join } from 'path';
-import { promises as fs, createReadStream, createWriteStream } from 'fs';
-import archiver from 'archiver';
-import { removeFile } from "./file-utils.js";
-import { ChildProcessProxy } from '@loaders.gl/worker-utils';
-import JSZip from 'jszip';
-import { MD5Hash } from '@loaders.gl/crypto';
-import crypt from 'crypt';
-import { getAbsoluteFilePath } from "./file-utils.js";
+import { createReadStream, createWriteStream } from 'fs';
 export function compressFileWithGzip(pathFile) {
   const compressedPathFile = `${pathFile}.gz`;
   const gzip = createGzip();
@@ -25,144 +17,4 @@ export function compressFileWithGzip(pathFile) {
     input.pipe(gzip).pipe(output);
   });
 }
-export async function compressFilesWithZip(fileMap, outputFile) {
-  let level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  try {
-    await removeFile(outputFile);
-  } catch (e) {}
-  const output = createWriteStream(outputFile);
-  const archive = archiver('zip', {
-    zlib: {
-      level
-    }
-  });
-  return new Promise(async (resolve, reject) => {
-    output.on('close', function () {
-      console.log(`${outputFile} saved.`);
-      console.log(`${archive.pointer()} total bytes`);
-      resolve(null);
-    });
-    output.on('end', function () {
-      console.log('Data has been drained');
-      resolve(null);
-    });
-    archive.on('warning', function (err) {
-      console.log(err);
-      reject(err);
-    });
-    archive.on('error', function (err) {
-      reject(err);
-    });
-    archive.pipe(output);
-    for (const subFileName in fileMap) {
-      const subFileData = fileMap[subFileName];
-      await appendFileToArchive(archive, subFileName, subFileData);
-    }
-    archive.finalize();
-  });
-}
-export async function compressWithChildProcess(inputFolder, outputFile, level, inputFiles, sevenZipExe) {
-  if (process.platform === 'win32') {
-    await compressWithChildProcessWindows(inputFolder, outputFile, level, inputFiles, sevenZipExe);
-  } else {
-    await compressWithChildProcessUnix(inputFolder, outputFile, level, inputFiles);
-  }
-}
-async function compressWithChildProcessUnix(inputFolder, outputFile) {
-  let level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  let inputFiles = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '.';
-  const fullOutputFile = getAbsoluteFilePath(outputFile);
-  const args = [`-${level}`, '-r', fullOutputFile, inputFiles];
-  const childProcess = new ChildProcessProxy();
-  await childProcess.start({
-    command: 'zip',
-    arguments: args,
-    spawn: {
-      cwd: inputFolder
-    },
-    wait: 0
-  });
-}
-async function compressWithChildProcessWindows(inputFolder, outputFile) {
-  let level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  let inputFiles = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : join('.', '*');
-  let sevenZipExe = arguments.length > 4 ? arguments[4] : undefined;
-  if (inputFiles[0] === '@') {
-    inputFiles = `*${inputFiles.substr(1)}`;
-  }
-  const fullOutputFile = getAbsoluteFilePath(outputFile);
-  const args = ['a', '-tzip', `-mx=${level}`, fullOutputFile, inputFiles];
-  const childProcess = new ChildProcessProxy();
-  await childProcess.start({
-    command: sevenZipExe,
-    arguments: args,
-    spawn: {
-      cwd: `${inputFolder}`
-    },
-    wait: 0
-  });
-}
-export async function generateHash128FromZip(inputZipFile, outputFile) {
-  const input = await fs.readFile(inputZipFile);
-  const zip = await JSZip.loadAsync(input);
-  const hashTable = [];
-  const zipFiles = zip.files;
-  for (const relativePath in zipFiles) {
-    const zipEntry = zipFiles[relativePath];
-    const _data = '_data';
-    const content = zipEntry[_data].compressedContent;
-    if (zipEntry.dir) continue;
-    const hash = await new MD5Hash().hash(Buffer.from(relativePath.toLowerCase()), 'base64');
-    hashTable.push({
-      key: atob(hash),
-      value: content.byteOffset
-    });
-  }
-  hashTable.sort((prev, next) => {
-    if (prev.key === next.key) {
-      return prev.value < next.value ? -1 : 1;
-    }
-    return prev.key < next.key ? -1 : 1;
-  });
-  const output = createWriteStream(outputFile);
-  return new Promise((resolve, reject) => {
-    output.on('close', function () {
-      console.log(`${outputFile} generated and saved`);
-      resolve(null);
-    });
-    output.on('error', function (err) {
-      console.log(err);
-      reject(err);
-    });
-    for (const key in hashTable) {
-      const item = hashTable[key];
-      const value = longToByteArray(item.value);
-      output.write(Buffer.from(crypt.hexToBytes(item.key).concat(value)));
-    }
-    output.close();
-  });
-}
-function longToByteArray(long) {
-  const buffer = new ArrayBuffer(8);
-  const longNum = new Float64Array(buffer);
-  longNum[0] = parseInt(long);
-  return Array.from(new Uint8Array(buffer)).reverse();
-}
-export async function addFileToZip(inputFolder, fileName, zipFile, sevenZipExe) {
-  await compressWithChildProcess(inputFolder, zipFile, 0, fileName, sevenZipExe);
-  console.log(`${fileName} added to ${zipFile}.`);
-}
-function appendFileToArchive(archive, subFileName, subFileData) {
-  return new Promise(resolve => {
-    const fileStream = createReadStream(subFileData);
-    console.log(`Compression start: ${subFileName}`);
-    fileStream.on('close', () => {
-      console.log(`Compression finish: ${subFileName}`);
-      resolve(null);
-    });
-    archive.append(fileStream, {
-      name: subFileName
-    });
-  });
-}
 //# sourceMappingURL=compress-util.js.map

package/dist/lib/utils/compress-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"compress-util.js","names":["createGzip","join","promises","fs","createReadStream","createWriteStream","archiver","removeFile","ChildProcessProxy","JSZip","MD5Hash","crypt","getAbsoluteFilePath","compressFileWithGzip","pathFile","compressedPathFile","gzip","input","output","Promise","resolve","reject","on","console","log","error","pipe","compressFilesWithZip","fileMap","outputFile","level","arguments","length","undefined","e","archive","zlib","pointer","err","subFileName","subFileData","appendFileToArchive","finalize","compressWithChildProcess","inputFolder","inputFiles","sevenZipExe","process","platform","compressWithChildProcessWindows","compressWithChildProcessUnix","fullOutputFile","args","childProcess","start","command","spawn","cwd","wait","substr","generateHash128FromZip","inputZipFile","readFile","zip","loadAsync","hashTable","zipFiles","files","relativePath","zipEntry","_data","content","compressedContent","dir","hash","Buffer","from","toLowerCase","push","key","atob","value","byteOffset","sort","prev","next","item","longToByteArray","write","hexToBytes","concat","close","long","buffer","ArrayBuffer","longNum","Float64Array","parseInt","Array","Uint8Array","reverse","addFileToZip","fileName","zipFile","fileStream","append","name"],"sources":["../../../src/lib/utils/compress-util.ts"],"sourcesContent":["import {createGzip} from 'zlib';\nimport {join} from 'path';\nimport {promises as fs, createReadStream, createWriteStream} from 'fs';\nimport archiver from 'archiver';\nimport {removeFile} from './file-utils';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\nimport JSZip from 'jszip';\nimport {MD5Hash} from '@loaders.gl/crypto';\nimport crypt from 'crypt';\nimport {getAbsoluteFilePath} from './file-utils';\n\n/**\n * Compress file to gzip file\n *\n * @param pathFile - the path to the file\n * @return the path to the gzip file\n */\nexport function compressFileWithGzip(pathFile: string): Promise<string> {\n  const compressedPathFile = `${pathFile}.gz`;\n  const gzip = createGzip();\n  const input = createReadStream(pathFile);\n  const output = createWriteStream(compressedPathFile);\n\n  return new Promise((resolve, reject) => {\n    input.on('end', () => {\n      console.log(`${compressedPathFile} compressed and saved.`); // eslint-disable-line no-undef,no-console\n      resolve(compressedPathFile);\n    });\n    input.on('error', (error) => {\n      console.log(`${compressedPathFile}: compression error!`); // eslint-disable-line no-undef,no-console\n      reject(error);\n    });\n    input.pipe(gzip).pipe(output);\n  });\n}\n\n/**\n * Compress files from map into slpk file\n *\n * @param fileMap - map with file paths (key: output path, value: input path)\n * @param outputFile - output slpk file\n * @param level - compression level\n */\nexport async function compressFilesWithZip(\n  fileMap: {[key: string]: string},\n  outputFile: string,\n  level: number = 0\n) {\n  // Before creating a new file, we need to delete the old file\n  try {\n    await removeFile(outputFile);\n  } catch (e) {\n    // Do nothing if old file doesn't exist\n  }\n\n  const output = createWriteStream(outputFile);\n  const archive = archiver('zip', {\n    zlib: {level} // Sets the compression level.\n  });\n\n  return new Promise(async (resolve, reject) => {\n    // listen for all archive data to be writte\n    // 'close' event is fired only when a file descriptor is involved\n    output.on('close', function () {\n      console.log(`${outputFile} saved.`); // eslint-disable-line no-undef,no-console\n      console.log(`${archive.pointer()} total bytes`); // eslint-disable-line no-undef,no-console\n      resolve(null);\n    });\n\n    // This event is fired when the data source is drained no matter what was the data source.\n    // It is not part of this library but rather from the NodeJS Stream API.\n    // @see: https://nodejs.org/api/stream.html#stream_event_end\n    output.on('end', function () {\n      console.log('Data has been drained'); // eslint-disable-line no-undef,no-console\n      resolve(null);\n    });\n\n    // good practice to catch warnings (ie stat failures and other non-blocking errors)\n    archive.on('warning', function (err) {\n      console.log(err); // eslint-disable-line no-undef,no-console\n      reject(err);\n    });\n\n    // good practice to catch this error explicitly\n    archive.on('error', function (err) {\n      reject(err);\n    });\n\n    // pipe archive data to the file\n    archive.pipe(output);\n\n    for (const subFileName in fileMap) {\n      const subFileData = fileMap[subFileName];\n      await appendFileToArchive(archive, subFileName, subFileData);\n    }\n\n    // finalize the archive (ie we are done appending files but streams have to finish yet)\n    archive.finalize();\n  });\n}\n\n/**\n * Compress files using external tool 'zip'/'7z'\n *\n * @param inputFolder - folder to archive - for cwd option\n * @param outputFile - output slpk file\n * @param level - compression level\n * @param inputFiles - input files path to pass to the executable as option\n * @param sevenZipExe - path to 7z.exe executable\n */\nexport async function compressWithChildProcess(\n  inputFolder: string,\n  outputFile: string,\n  level: number,\n  inputFiles: string,\n  sevenZipExe: string\n) {\n  // eslint-disable-next-line no-undef\n  if (process.platform === 'win32') {\n    await compressWithChildProcessWindows(inputFolder, outputFile, level, inputFiles, sevenZipExe);\n  } else {\n    await compressWithChildProcessUnix(inputFolder, outputFile, level, inputFiles);\n  }\n}\n\n/**\n * Compress files using external linux tool 'zip'\n *\n * @param inputFolder - folder to archive - for cwd option\n * @param outputFile - output slpk file\n * @param level - compression level\n * @param inputFiles - input files path to pass to the executable as option\n */\nasync function compressWithChildProcessUnix(\n  inputFolder: string,\n  outputFile: string,\n  level: number = 0,\n  inputFiles: string = '.'\n) {\n  const fullOutputFile = getAbsoluteFilePath(outputFile);\n  const args = [`-${level}`, '-r', fullOutputFile, inputFiles];\n  const childProcess = new ChildProcessProxy();\n  await childProcess.start({\n    command: 'zip',\n    arguments: args,\n    spawn: {\n      cwd: inputFolder\n    },\n    wait: 0\n  });\n}\n\n/**\n * Compress files using windows external tool '7z'\n *\n * @param inputFolder - folder to archive - for cwd option\n * @param outputFile - output slpk file\n * @param level - compression level\n * @param inputFiles - input files path to pass to the executable as option\n * @param sevenZipExe - path to 7z.exe executable\n */\nasync function compressWithChildProcessWindows(\n  inputFolder: string,\n  outputFile: string,\n  level: number = 0,\n  inputFiles: string = join('.', '*'),\n  sevenZipExe: string\n) {\n  // Workaround for @listfile issue. In 7z.exe @-leading files are handled as listfiles\n  // https://sevenzip.osdn.jp/chm/cmdline/syntax.htm\n  if (inputFiles[0] === '@') {\n    inputFiles = `*${inputFiles.substr(1)}`;\n  }\n\n  const fullOutputFile = getAbsoluteFilePath(outputFile);\n  const args = ['a', '-tzip', `-mx=${level}`, fullOutputFile, inputFiles];\n  const childProcess = new ChildProcessProxy();\n  await childProcess.start({\n    command: sevenZipExe,\n    arguments: args,\n    spawn: {\n      cwd: `${inputFolder}`\n    },\n    wait: 0\n  });\n}\n\n/**\n * Generate hash file from zip archive\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.7/slpk_hashtable.cmn.md\n *\n * @param inputZipFile\n * @param outputFile\n */\nexport async function generateHash128FromZip(inputZipFile: string, outputFile: string) {\n  const input = await fs.readFile(inputZipFile);\n  const zip = await JSZip.loadAsync(input);\n  const hashTable: {key: string; value: string}[] = [];\n  const zipFiles = zip.files;\n  for (const relativePath in zipFiles) {\n    const zipEntry = zipFiles[relativePath];\n    // Had to use a workaround because the correct string is getting the wrong data\n    // const content = await zipEntry.async('nodebuffer');\n    // _data isn't described in the interface, so lint thought it was wrong\n    const _data = '_data';\n    const content = zipEntry[_data].compressedContent;\n    if (zipEntry.dir) continue; // eslint-disable-line no-continue\n    // eslint-disable-next-line no-undef\n    const hash = await new MD5Hash().hash(Buffer.from(relativePath.toLowerCase()), 'base64');\n    // eslint-disable-next-line no-undef\n    hashTable.push({key: atob(hash), value: content.byteOffset});\n  }\n\n  hashTable.sort((prev, next) => {\n    if (prev.key === next.key) {\n      return prev.value < next.value ? -1 : 1;\n    }\n    return prev.key < next.key ? -1 : 1;\n  });\n\n  const output = createWriteStream(outputFile);\n  return new Promise((resolve, reject) => {\n    output.on('close', function () {\n      console.log(`${outputFile} generated and saved`); // eslint-disable-line\n      resolve(null);\n    });\n    output.on('error', function (err) {\n      console.log(err); // eslint-disable-line\n      reject(err);\n    });\n    for (const key in hashTable) {\n      const item = hashTable[key];\n      const value = longToByteArray(item.value);\n      // TODO: perhaps you need to wait for the 'drain' event if the write returns 'false'\n      // eslint-disable-next-line no-undef\n      output.write(Buffer.from(crypt.hexToBytes(item.key).concat(value)));\n    }\n    output.close();\n  });\n}\n\n/**\n * Encode 64 bit value to byte array\n *\n * @param long - stringified number\n * @returns\n */\nfunction longToByteArray(long: string): number[] {\n  const buffer = new ArrayBuffer(8); // JS numbers are 8 bytes long, or 64 bits\n  const longNum = new Float64Array(buffer); // so equivalent to Float64\n  longNum[0] = parseInt(long);\n  return Array.from(new Uint8Array(buffer)).reverse(); // reverse to get little endian\n}\n\n/**\n * Add file to zip archive\n *\n * @param inputFile\n * @param fileName\n * @param zipFile\n * @param sevenZipExe\n */\nexport async function addFileToZip(\n  inputFolder: string,\n  fileName: string,\n  zipFile: string,\n  sevenZipExe: string\n) {\n  await compressWithChildProcess(inputFolder, zipFile, 0, fileName, sevenZipExe);\n  console.log(`${fileName} added to ${zipFile}.`); // eslint-disable-line\n}\n\n/**\n *\n * @param archive zip archive instance\n * @param subFileName file path inside archive\n * @param subFileData source file path\n * @returns\n */\nfunction appendFileToArchive(archive: any, subFileName: string, subFileData: string) {\n  return new Promise((resolve) => {\n    const fileStream = createReadStream(subFileData);\n    console.log(`Compression start: ${subFileName}`); // eslint-disable-line no-undef,no-console\n    fileStream.on('close', () => {\n      console.log(`Compression finish: ${subFileName}`); // eslint-disable-line no-undef,no-console\n      resolve(null);\n    });\n    archive.append(fileStream, {name: subFileName});\n  });\n}\n"],"mappings":"AAAA,SAAQA,UAAU,QAAO,MAAM;AAC/B,SAAQC,IAAI,QAAO,MAAM;AACzB,SAAQC,QAAQ,IAAIC,EAAE,EAAEC,gBAAgB,EAAEC,iBAAiB,QAAO,IAAI;AACtE,OAAOC,QAAQ,MAAM,UAAU;AAAC,SACxBC,UAAU;AAClB,SAAQC,iBAAiB,QAAO,0BAA0B;AAC1D,OAAOC,KAAK,MAAM,OAAO;AACzB,SAAQC,OAAO,QAAO,oBAAoB;AAC1C,OAAOC,KAAK,MAAM,OAAO;AAAC,SAClBC,mBAAmB;AAQ3B,OAAO,SAASC,oBAAoBA,CAACC,QAAgB,EAAmB;EACtE,MAAMC,kBAAkB,GAAI,GAAED,QAAS,KAAI;EAC3C,MAAME,IAAI,GAAGhB,UAAU,CAAC,CAAC;EACzB,MAAMiB,KAAK,GAAGb,gBAAgB,CAACU,QAAQ,CAAC;EACxC,MAAMI,MAAM,GAAGb,iBAAiB,CAACU,kBAAkB,CAAC;EAEpD,OAAO,IAAII,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;IACtCJ,KAAK,CAACK,EAAE,CAAC,KAAK,EAAE,MAAM;MACpBC,OAAO,CAACC,GAAG,CAAE,GAAET,kBAAmB,wBAAuB,CAAC;MAC1DK,OAAO,CAACL,kBAAkB,CAAC;IAC7B,CAAC,CAAC;IACFE,KAAK,CAACK,EAAE,CAAC,OAAO,EAAGG,KAAK,IAAK;MAC3BF,OAAO,CAACC,GAAG,CAAE,GAAET,kBAAmB,sBAAqB,CAAC;MACxDM,MAAM,CAACI,KAAK,CAAC;IACf,CAAC,CAAC;IACFR,KAAK,CAACS,IAAI,CAACV,IAAI,CAAC,CAACU,IAAI,CAACR,MAAM,CAAC;EAC/B,CAAC,CAAC;AACJ;AASA,OAAO,eAAeS,oBAAoBA,CACxCC,OAAgC,EAChCC,UAAkB,EAElB;EAAA,IADAC,KAAa,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC;EAGjB,IAAI;IACF,MAAMxB,UAAU,CAACsB,UAAU,CAAC;EAC9B,CAAC,CAAC,OAAOK,CAAC,EAAE,CAEZ;EAEA,MAAMhB,MAAM,GAAGb,iBAAiB,CAACwB,UAAU,CAAC;EAC5C,MAAMM,OAAO,GAAG7B,QAAQ,CAAC,KAAK,EAAE;IAC9B8B,IAAI,EAAE;MAACN;IAAK;EACd,CAAC,CAAC;EAEF,OAAO,IAAIX,OAAO,CAAC,OAAOC,OAAO,EAAEC,MAAM,KAAK;IAG5CH,MAAM,CAACI,EAAE,CAAC,OAAO,EAAE,YAAY;MAC7BC,OAAO,CAACC,GAAG,CAAE,GAAEK,UAAW,SAAQ,CAAC;MACnCN,OAAO,CAACC,GAAG,CAAE,GAAEW,OAAO,CAACE,OAAO,CAAC,CAAE,cAAa,CAAC;MAC/CjB,OAAO,CAAC,IAAI,CAAC;IACf,CAAC,CAAC;IAKFF,MAAM,CAACI,EAAE,CAAC,KAAK,EAAE,YAAY;MAC3BC,OAAO,CAACC,GAAG,CAAC,uBAAuB,CAAC;MACpCJ,OAAO,CAAC,IAAI,CAAC;IACf,CAAC,CAAC;IAGFe,OAAO,CAACb,EAAE,CAAC,SAAS,EAAE,UAAUgB,GAAG,EAAE;MACnCf,OAAO,CAACC,GAAG,CAACc,GAAG,CAAC;MAChBjB,MAAM,CAACiB,GAAG,CAAC;IACb,CAAC,CAAC;IAGFH,OAAO,CAACb,EAAE,CAAC,OAAO,EAAE,UAAUgB,GAAG,EAAE;MACjCjB,MAAM,CAACiB,GAAG,CAAC;IACb,CAAC,CAAC;IAGFH,OAAO,CAACT,IAAI,CAACR,MAAM,CAAC;IAEpB,KAAK,MAAMqB,WAAW,IAAIX,OAAO,EAAE;MACjC,MAAMY,WAAW,GAAGZ,OAAO,CAACW,WAAW,CAAC;MACxC,MAAME,mBAAmB,CAACN,OAAO,EAAEI,WAAW,EAAEC,WAAW,CAAC;IAC9D;IAGAL,OAAO,CAACO,QAAQ,CAAC,CAAC;EACpB,CAAC,CAAC;AACJ;AAWA,OAAO,eAAeC,wBAAwBA,CAC5CC,WAAmB,EACnBf,UAAkB,EAClBC,KAAa,EACbe,UAAkB,EAClBC,WAAmB,EACnB;EAEA,IAAIC,OAAO,CAACC,QAAQ,KAAK,OAAO,EAAE;IAChC,MAAMC,+BAA+B,CAACL,WAAW,EAAEf,UAAU,EAAEC,KAAK,EAAEe,UAAU,EAAEC,WAAW,CAAC;EAChG,CAAC,MAAM;IACL,MAAMI,4BAA4B,CAACN,WAAW,EAAEf,UAAU,EAAEC,KAAK,EAAEe,UAAU,CAAC;EAChF;AACF;AAUA,eAAeK,4BAA4BA,CACzCN,WAAmB,EACnBf,UAAkB,EAGlB;EAAA,IAFAC,KAAa,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC;EAAA,IACjBc,UAAkB,GAAAd,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,GAAG;EAExB,MAAMoB,cAAc,GAAGvC,mBAAmB,CAACiB,UAAU,CAAC;EACtD,MAAMuB,IAAI,GAAG,CAAE,IAAGtB,KAAM,EAAC,EAAE,IAAI,EAAEqB,cAAc,EAAEN,UAAU,CAAC;EAC5D,MAAMQ,YAAY,GAAG,IAAI7C,iBAAiB,CAAC,CAAC;EAC5C,MAAM6C,YAAY,CAACC,KAAK,CAAC;IACvBC,OAAO,EAAE,KAAK;IACdxB,SAAS,EAAEqB,IAAI;IACfI,KAAK,EAAE;MACLC,GAAG,EAAEb;IACP,CAAC;IACDc,IAAI,EAAE;EACR,CAAC,CAAC;AACJ;AAWA,eAAeT,+BAA+BA,CAC5CL,WAAmB,EACnBf,UAAkB,EAIlB;EAAA,IAHAC,KAAa,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC;EAAA,IACjBc,UAAkB,GAAAd,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG9B,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC;EAAA,IACnC6C,WAAmB,GAAAf,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAE,SAAA;EAInB,IAAIY,UAAU,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;IACzBA,UAAU,GAAI,IAAGA,UAAU,CAACc,MAAM,CAAC,CAAC,CAAE,EAAC;EACzC;EAEA,MAAMR,cAAc,GAAGvC,mBAAmB,CAACiB,UAAU,CAAC;EACtD,MAAMuB,IAAI,GAAG,CAAC,GAAG,EAAE,OAAO,EAAG,OAAMtB,KAAM,EAAC,EAAEqB,cAAc,EAAEN,UAAU,CAAC;EACvE,MAAMQ,YAAY,GAAG,IAAI7C,iBAAiB,CAAC,CAAC;EAC5C,MAAM6C,YAAY,CAACC,KAAK,CAAC;IACvBC,OAAO,EAAET,WAAW;IACpBf,SAAS,EAAEqB,IAAI;IACfI,KAAK,EAAE;MACLC,GAAG,EAAG,GAAEb,WAAY;IACtB,CAAC;IACDc,IAAI,EAAE;EACR,CAAC,CAAC;AACJ;AASA,OAAO,eAAeE,sBAAsBA,CAACC,YAAoB,EAAEhC,UAAkB,EAAE;EACrF,MAAMZ,KAAK,GAAG,MAAMd,EAAE,CAAC2D,QAAQ,CAACD,YAAY,CAAC;EAC7C,MAAME,GAAG,GAAG,MAAMtD,KAAK,CAACuD,SAAS,CAAC/C,KAAK,CAAC;EACxC,MAAMgD,SAAyC,GAAG,EAAE;EACpD,MAAMC,QAAQ,GAAGH,GAAG,CAACI,KAAK;EAC1B,KAAK,MAAMC,YAAY,IAAIF,QAAQ,EAAE;IACnC,MAAMG,QAAQ,GAAGH,QAAQ,CAACE,YAAY,CAAC;IAIvC,MAAME,KAAK,GAAG,OAAO;IACrB,MAAMC,OAAO,GAAGF,QAAQ,CAACC,KAAK,CAAC,CAACE,iBAAiB;IACjD,IAAIH,QAAQ,CAACI,GAAG,EAAE;IAElB,MAAMC,IAAI,GAAG,MAAM,IAAIhE,OAAO,CAAC,CAAC,CAACgE,IAAI,CAACC,MAAM,CAACC,IAAI,CAACR,YAAY,CAACS,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC;IAExFZ,SAAS,CAACa,IAAI,CAAC;MAACC,GAAG,EAAEC,IAAI,CAACN,IAAI,CAAC;MAAEO,KAAK,EAAEV,OAAO,CAACW;IAAU,CAAC,CAAC;EAC9D;EAEAjB,SAAS,CAACkB,IAAI,CAAC,CAACC,IAAI,EAAEC,IAAI,KAAK;IAC7B,IAAID,IAAI,CAACL,GAAG,KAAKM,IAAI,CAACN,GAAG,EAAE;MACzB,OAAOK,IAAI,CAACH,KAAK,GAAGI,IAAI,CAACJ,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC;IACzC;IACA,OAAOG,IAAI,CAACL,GAAG,GAAGM,IAAI,CAACN,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;EACrC,CAAC,CAAC;EAEF,MAAM7D,MAAM,GAAGb,iBAAiB,CAACwB,UAAU,CAAC;EAC5C,OAAO,IAAIV,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;IACtCH,MAAM,CAACI,EAAE,CAAC,OAAO,EAAE,YAAY;MAC7BC,OAAO,CAACC,GAAG,CAAE,GAAEK,UAAW,sBAAqB,CAAC;MAChDT,OAAO,CAAC,IAAI,CAAC;IACf,CAAC,CAAC;IACFF,MAAM,CAACI,EAAE,CAAC,OAAO,EAAE,UAAUgB,GAAG,EAAE;MAChCf,OAAO,CAACC,GAAG,CAACc,GAAG,CAAC;MAChBjB,MAAM,CAACiB,GAAG,CAAC;IACb,CAAC,CAAC;IACF,KAAK,MAAMyC,GAAG,IAAId,SAAS,EAAE;MAC3B,MAAMqB,IAAI,GAAGrB,SAAS,CAACc,GAAG,CAAC;MAC3B,MAAME,KAAK,GAAGM,eAAe,CAACD,IAAI,CAACL,KAAK,CAAC;MAGzC/D,MAAM,CAACsE,KAAK,CAACb,MAAM,CAACC,IAAI,CAACjE,KAAK,CAAC8E,UAAU,CAACH,IAAI,CAACP,GAAG,CAAC,CAACW,MAAM,CAACT,KAAK,CAAC,CAAC,CAAC;IACrE;IACA/D,MAAM,CAACyE,KAAK,CAAC,CAAC;EAChB,CAAC,CAAC;AACJ;AAQA,SAASJ,eAAeA,CAACK,IAAY,EAAY;EAC/C,MAAMC,MAAM,GAAG,IAAIC,WAAW,CAAC,CAAC,CAAC;EACjC,MAAMC,OAAO,GAAG,IAAIC,YAAY,CAACH,MAAM,CAAC;EACxCE,OAAO,CAAC,CAAC,CAAC,GAAGE,QAAQ,CAACL,IAAI,CAAC;EAC3B,OAAOM,KAAK,CAACtB,IAAI,CAAC,IAAIuB,UAAU,CAACN,MAAM,CAAC,CAAC,CAACO,OAAO,CAAC,CAAC;AACrD;AAUA,OAAO,eAAeC,YAAYA,CAChCzD,WAAmB,EACnB0D,QAAgB,EAChBC,OAAe,EACfzD,WAAmB,EACnB;EACA,MAAMH,wBAAwB,CAACC,WAAW,EAAE2D,OAAO,EAAE,CAAC,EAAED,QAAQ,EAAExD,WAAW,CAAC;EAC9EvB,OAAO,CAACC,GAAG,CAAE,GAAE8E,QAAS,aAAYC,OAAQ,GAAE,CAAC;AACjD;AASA,SAAS9D,mBAAmBA,CAACN,OAAY,EAAEI,WAAmB,EAAEC,WAAmB,EAAE;EACnF,OAAO,IAAIrB,OAAO,CAAEC,OAAO,IAAK;IAC9B,MAAMoF,UAAU,GAAGpG,gBAAgB,CAACoC,WAAW,CAAC;IAChDjB,OAAO,CAACC,GAAG,CAAE,sBAAqBe,WAAY,EAAC,CAAC;IAChDiE,UAAU,CAAClF,EAAE,CAAC,OAAO,EAAE,MAAM;MAC3BC,OAAO,CAACC,GAAG,CAAE,uBAAsBe,WAAY,EAAC,CAAC;MACjDnB,OAAO,CAAC,IAAI,CAAC;IACf,CAAC,CAAC;IACFe,OAAO,CAACsE,MAAM,CAACD,UAAU,EAAE;MAACE,IAAI,EAAEnE;IAAW,CAAC,CAAC;EACjD,CAAC,CAAC;AACJ"}
+{"version":3,"file":"compress-util.js","names":["createGzip","createReadStream","createWriteStream","compressFileWithGzip","pathFile","compressedPathFile","gzip","input","output","Promise","resolve","reject","on","console","log","error","pipe"],"sources":["../../../src/lib/utils/compress-util.ts"],"sourcesContent":["import {createGzip} from 'zlib';\nimport {createReadStream, createWriteStream} from 'fs';\n\n/**\n * Compress file to gzip file\n *\n * @param pathFile - the path to the file\n * @return the path to the gzip file\n */\nexport function compressFileWithGzip(pathFile: string): Promise<string> {\n  const compressedPathFile = `${pathFile}.gz`;\n  const gzip = createGzip();\n  const input = createReadStream(pathFile);\n  const output = createWriteStream(compressedPathFile);\n\n  return new Promise((resolve, reject) => {\n    input.on('end', () => {\n      console.log(`${compressedPathFile} compressed and saved.`); // eslint-disable-line no-undef,no-console\n      resolve(compressedPathFile);\n    });\n    input.on('error', (error) => {\n      console.log(`${compressedPathFile}: compression error!`); // eslint-disable-line no-undef,no-console\n      reject(error);\n    });\n    input.pipe(gzip).pipe(output);\n  });\n}\n"],"mappings":"AAAA,SAAQA,UAAU,QAAO,MAAM;AAC/B,SAAQC,gBAAgB,EAAEC,iBAAiB,QAAO,IAAI;AAQtD,OAAO,SAASC,oBAAoBA,CAACC,QAAgB,EAAmB;EACtE,MAAMC,kBAAkB,GAAI,GAAED,QAAS,KAAI;EAC3C,MAAME,IAAI,GAAGN,UAAU,CAAC,CAAC;EACzB,MAAMO,KAAK,GAAGN,gBAAgB,CAACG,QAAQ,CAAC;EACxC,MAAMI,MAAM,GAAGN,iBAAiB,CAACG,kBAAkB,CAAC;EAEpD,OAAO,IAAII,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;IACtCJ,KAAK,CAACK,EAAE,CAAC,KAAK,EAAE,MAAM;MACpBC,OAAO,CAACC,GAAG,CAAE,GAAET,kBAAmB,wBAAuB,CAAC;MAC1DK,OAAO,CAACL,kBAAkB,CAAC;IAC7B,CAAC,CAAC;IACFE,KAAK,CAACK,EAAE,CAAC,OAAO,EAAGG,KAAK,IAAK;MAC3BF,OAAO,CAACC,GAAG,CAAE,GAAET,kBAAmB,sBAAqB,CAAC;MACxDM,MAAM,CAACI,KAAK,CAAC;IACf,CAAC,CAAC;IACFR,KAAK,CAACS,IAAI,CAACV,IAAI,CAAC,CAACU,IAAI,CAACR,MAAM,CAAC;EAC/B,CAAC,CAAC;AACJ"}

package/dist/lib/utils/conversion-dump.d.ts

@@ -15,7 +15,8 @@ export type ConversionDumpOptions = {
 };
 type NodeDoneStatus = {
     nodeId: number;
-    done: Record<string, boolean> | boolean;
+    done: boolean;
+    progress: Record<string, boolean>;
 };
 type TilesConverted = {
     nodes: NodeDoneStatus[];

package/dist/lib/utils/conversion-dump.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversion-dump.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/conversion-dump.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,uBAAuB,EAAE,OAAO,CAAC;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC;CACzC,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,cAAc,EAAE,CAAC;CACzB,CAAC;AAEF,qBAAa,cAAc;IACzB,yBAAyB;IACzB,OAAO,CAAC,OAAO,CAAC,CAAwB;IACxC,2CAA2C;IAC3C,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;;IAM/C;;;OAGG;IACG,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2CnE;;OAEG;YACW,cAAc;IAiB5B;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrC;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAIjB;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAIjB;;;;OAIG;IACG,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAS9C;;;;;;OAMG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IASvF;;;;OAIG;IACG,wBAAwB,CAC5B,cAAc,EAAE;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAC,EAAE,EAC/E,YAAY,EAAE,oBAAoB,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE;CAyBtD"}
+{"version":3,"file":"conversion-dump.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/conversion-dump.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,uBAAuB,EAAE,OAAO,CAAC;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,cAAc,EAAE,CAAC;CACzB,CAAC;AAEF,qBAAa,cAAc;IACzB,yBAAyB;IACzB,OAAO,CAAC,OAAO,CAAC,CAAwB;IACxC,2CAA2C;IAC3C,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;;IAM/C;;;OAGG;IACG,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2CnE;;OAEG;YACW,cAAc;IAiB5B;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrC;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAIjB;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAIjB;;;;OAIG;IACG,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAS9C;;;;;;OAMG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAYvF;;;;OAIG;IACG,wBAAwB,CAC5B,cAAc,EAAE;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAC,EAAE,EAC/E,YAAY,EAAE,oBAAoB,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE;CA0BtD"}

package/dist/lib/utils/conversion-dump.js

@@ -79,7 +79,8 @@ export class ConversionDump {
     };
     nodes.push({
       nodeId,
-      done: {}
+      done: false,
+      progress: {}
     });
     if (nodes.length === 1) {
       this.setRecord(filename, {
@@ -92,7 +93,10 @@ export class ConversionDump {
     var _this$tilesConverted$;
     const nodeDump = (_this$tilesConverted$ = this.tilesConverted[filename]) === null || _this$tilesConverted$ === void 0 ? void 0 : _this$tilesConverted$.nodes.find(element => element.nodeId === nodeId);
     if (nodeDump) {
-      nodeDump.done[resourceType] = value;
+      nodeDump.progress[resourceType] = value;
+      if (!value) {
+        nodeDump.done = false;
+      }
     }
   }
   async updateConvertedTilesDump(changedRecords, writeResults) {
@@ -105,18 +109,18 @@ export class ConversionDump {
         } = changedRecords[i];
         if (!sourceId || !resourceType || !outputId) continue;
         for (const node of this.tilesConverted[sourceId].nodes) {
-          if (typeof node.done !== 'boolean' && node.nodeId === outputId) {
-            node.done[resourceType] = true;
-          }
-          if (typeof node.done !== 'boolean') {
+          if (node.nodeId === outputId) {
+            node.progress[resourceType] = true;
             let done = false;
-            for (const key in node.done) {
-              done = node.done[key];
+            for (const key in node.progress) {
+              done = node.progress[key];
               if (!done) break;
             }
-            if (done) {
-              node.done = true;
+            node.done = done;
+            if (node.done) {
+              node.progress = {};
             }
+            break;
           }
         }
       }

package/dist/lib/utils/conversion-dump.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversion-dump.js","names":["DUMP_FILE_SUFFIX","removeFile","writeFile","join","ConversionDump","constructor","options","tilesConverted","createDumpFile","tilesetName","slpk","egmFilePath","inputUrl","outputPath","draco","maxDepth","token","generateTextures","generateBoundingVolumes","mergeMaterials","metadataClass","analyze","JSON","stringify","error","console","log","updateDumpFile","_this$options","deleteDumpFile","_this$options2","getRecord","fileName","setRecord","object","addNode","filename","nodeId","nodes","push","done","length","updateDoneStatus","resourceType","value","_this$tilesConverted$","nodeDump","find","element","updateConvertedTilesDump","changedRecords","writeResults","i","sourceId","outputId","node","key"],"sources":["../../../src/lib/utils/conversion-dump.ts"],"sourcesContent":["import {DUMP_FILE_SUFFIX} from '../../constants';\nimport {removeFile, writeFile} from './file-utils';\nimport {join} from 'path';\n\nexport type ConversionDumpOptions = {\n  inputUrl: string;\n  outputPath: string;\n  tilesetName: string;\n  maxDepth: number;\n  slpk: boolean;\n  egmFilePath: string;\n  token: string;\n  draco: boolean;\n  mergeMaterials: boolean;\n  generateTextures: boolean;\n  generateBoundingVolumes: boolean;\n  metadataClass: string;\n  analyze: boolean;\n};\n\ntype NodeDoneStatus = {\n  nodeId: number;\n  done: Record<string, boolean> | boolean;\n};\n\ntype TilesConverted = {\n  nodes: NodeDoneStatus[];\n};\n\nexport class ConversionDump {\n  /** Conversion options */\n  private options?: ConversionDumpOptions;\n  /** Tiles conversion progress status map */\n  tilesConverted: Record<string, TilesConverted>;\n\n  constructor() {\n    this.tilesConverted = {};\n  }\n\n  /**\n   * Create a dump file with convertion options\n   * @param options - converter options\n   */\n  async createDumpFile(options: ConversionDumpOptions): Promise<void> {\n    const {\n      tilesetName,\n      slpk,\n      egmFilePath,\n      inputUrl,\n      outputPath,\n      draco = true,\n      maxDepth,\n      token,\n      generateTextures,\n      generateBoundingVolumes,\n      mergeMaterials = true,\n      metadataClass,\n      analyze = false\n    } = options;\n    this.options = {\n      tilesetName,\n      slpk,\n      egmFilePath,\n      inputUrl,\n      outputPath,\n      draco,\n      maxDepth,\n      token,\n      generateTextures,\n      generateBoundingVolumes,\n      mergeMaterials,\n      metadataClass,\n      analyze\n    };\n\n    try {\n      await writeFile(\n        options.outputPath,\n        JSON.stringify({options: this.options}),\n        `${options.tilesetName}${DUMP_FILE_SUFFIX}`\n      );\n    } catch (error) {\n      console.log(\"Can't create dump file\", error);\n    }\n  }\n\n  /**\n   * Update conversion status in the dump file\n   */\n  private async updateDumpFile(): Promise<void> {\n    if (this.options?.outputPath && this.options.tilesetName) {\n      try {\n        await writeFile(\n          this.options.outputPath,\n          JSON.stringify({\n            options: this.options,\n            tilesConverted: this.tilesConverted\n          }),\n          `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`\n        );\n      } catch (error) {\n        console.log(\"Can't update dump file\", error);\n      }\n    }\n  }\n\n  /**\n   * Delete a dump file\n   */\n  async deleteDumpFile(): Promise<void> {\n    if (this.options?.outputPath && this.options.tilesetName) {\n      await removeFile(\n        join(this.options.outputPath, `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`)\n      );\n    }\n  }\n\n  /**\n   * Get record from the tilesConverted Map\n   * @param fileName - source filename\n   * @returns existing object from the tilesConverted Map\n   */\n  private getRecord(fileName: string) {\n    return this.tilesConverted[fileName];\n  }\n\n  /**\n   * Set a record for the dump file\n   * @param fileName - key - source filename\n   * @param object - value\n   */\n  private setRecord(fileName: string, object: any) {\n    this.tilesConverted[fileName] = object;\n  }\n\n  /**\n   * Add a node into the dump file for the source file record\n   * @param fileName - source filename\n   * @param nodeId - nodeId of the node\n   */\n  async addNode(filename: string, nodeId: number) {\n    const {nodes} = this.getRecord(filename) || {nodes: []};\n    nodes.push({nodeId, done: {}});\n    if (nodes.length === 1) {\n      this.setRecord(filename, {nodes});\n    }\n    await this.updateDumpFile();\n  }\n\n  /**\n   * Update done status object for the writing resources\n   * @param fileName - key - source filename\n   * @param nodeId - nodeId for the source filename\n   * @param resourceType - resource type to update status\n   * @param value - value\n   */\n  updateDoneStatus(filename: string, nodeId: number, resourceType: string, value: boolean) {\n    const nodeDump = this.tilesConverted[filename]?.nodes.find(\n      (element) => element.nodeId === nodeId\n    );\n    if (nodeDump) {\n      nodeDump.done[resourceType] = value;\n    }\n  }\n\n  /**\n   * Update dump file according to writing results\n   * @param changedRecords - array of parameters ids for the written resources\n   * @param writeResults - array of writing resource files results\n   */\n  async updateConvertedTilesDump(\n    changedRecords: {outputId?: number; sourceId?: string; resourceType?: string}[],\n    writeResults: PromiseSettledResult<string | null>[]\n  ) {\n    for (let i = 0; i < changedRecords.length; i++) {\n      if (changedRecords[i] && 'value' in writeResults[i]) {\n        const {sourceId, resourceType, outputId} = changedRecords[i];\n        if (!sourceId || !resourceType || !outputId) continue;\n        for (const node of this.tilesConverted[sourceId].nodes) {\n          if (typeof node.done !== 'boolean' && node.nodeId === outputId) {\n            node.done[resourceType] = true;\n          }\n          if (typeof node.done !== 'boolean') {\n            let done = false;\n            for (const key in node.done) {\n              done = node.done[key];\n              if (!done) break;\n            }\n            if (done) {\n              node.done = true;\n            }\n          }\n        }\n      }\n    }\n    await this.updateDumpFile();\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"conversion-dump.js","names":["DUMP_FILE_SUFFIX","removeFile","writeFile","join","ConversionDump","constructor","options","tilesConverted","createDumpFile","tilesetName","slpk","egmFilePath","inputUrl","outputPath","draco","maxDepth","token","generateTextures","generateBoundingVolumes","mergeMaterials","metadataClass","analyze","JSON","stringify","error","console","log","updateDumpFile","_this$options","deleteDumpFile","_this$options2","getRecord","fileName","setRecord","object","addNode","filename","nodeId","nodes","push","done","progress","length","updateDoneStatus","resourceType","value","_this$tilesConverted$","nodeDump","find","element","updateConvertedTilesDump","changedRecords","writeResults","i","sourceId","outputId","node","key"],"sources":["../../../src/lib/utils/conversion-dump.ts"],"sourcesContent":["import {DUMP_FILE_SUFFIX} from '../../constants';\nimport {removeFile, writeFile} from './file-utils';\nimport {join} from 'path';\n\nexport type ConversionDumpOptions = {\n  inputUrl: string;\n  outputPath: string;\n  tilesetName: string;\n  maxDepth: number;\n  slpk: boolean;\n  egmFilePath: string;\n  token: string;\n  draco: boolean;\n  mergeMaterials: boolean;\n  generateTextures: boolean;\n  generateBoundingVolumes: boolean;\n  metadataClass: string;\n  analyze: boolean;\n};\n\ntype NodeDoneStatus = {\n  nodeId: number;\n  done: boolean;\n  progress: Record<string, boolean>;\n};\n\ntype TilesConverted = {\n  nodes: NodeDoneStatus[];\n};\n\nexport class ConversionDump {\n  /** Conversion options */\n  private options?: ConversionDumpOptions;\n  /** Tiles conversion progress status map */\n  tilesConverted: Record<string, TilesConverted>;\n\n  constructor() {\n    this.tilesConverted = {};\n  }\n\n  /**\n   * Create a dump file with convertion options\n   * @param options - converter options\n   */\n  async createDumpFile(options: ConversionDumpOptions): Promise<void> {\n    const {\n      tilesetName,\n      slpk,\n      egmFilePath,\n      inputUrl,\n      outputPath,\n      draco = true,\n      maxDepth,\n      token,\n      generateTextures,\n      generateBoundingVolumes,\n      mergeMaterials = true,\n      metadataClass,\n      analyze = false\n    } = options;\n    this.options = {\n      tilesetName,\n      slpk,\n      egmFilePath,\n      inputUrl,\n      outputPath,\n      draco,\n      maxDepth,\n      token,\n      generateTextures,\n      generateBoundingVolumes,\n      mergeMaterials,\n      metadataClass,\n      analyze\n    };\n\n    try {\n      await writeFile(\n        options.outputPath,\n        JSON.stringify({options: this.options}),\n        `${options.tilesetName}${DUMP_FILE_SUFFIX}`\n      );\n    } catch (error) {\n      console.log(\"Can't create dump file\", error);\n    }\n  }\n\n  /**\n   * Update conversion status in the dump file\n   */\n  private async updateDumpFile(): Promise<void> {\n    if (this.options?.outputPath && this.options.tilesetName) {\n      try {\n        await writeFile(\n          this.options.outputPath,\n          JSON.stringify({\n            options: this.options,\n            tilesConverted: this.tilesConverted\n          }),\n          `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`\n        );\n      } catch (error) {\n        console.log(\"Can't update dump file\", error);\n      }\n    }\n  }\n\n  /**\n   * Delete a dump file\n   */\n  async deleteDumpFile(): Promise<void> {\n    if (this.options?.outputPath && this.options.tilesetName) {\n      await removeFile(\n        join(this.options.outputPath, `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`)\n      );\n    }\n  }\n\n  /**\n   * Get record from the tilesConverted Map\n   * @param fileName - source filename\n   * @returns existing object from the tilesConverted Map\n   */\n  private getRecord(fileName: string) {\n    return this.tilesConverted[fileName];\n  }\n\n  /**\n   * Set a record for the dump file\n   * @param fileName - key - source filename\n   * @param object - value\n   */\n  private setRecord(fileName: string, object: any) {\n    this.tilesConverted[fileName] = object;\n  }\n\n  /**\n   * Add a node into the dump file for the source file record\n   * @param fileName - source filename\n   * @param nodeId - nodeId of the node\n   */\n  async addNode(filename: string, nodeId: number) {\n    const {nodes} = this.getRecord(filename) || {nodes: []};\n    nodes.push({nodeId, done: false, progress: {}});\n    if (nodes.length === 1) {\n      this.setRecord(filename, {nodes});\n    }\n    await this.updateDumpFile();\n  }\n\n  /**\n   * Update done status object for the writing resources\n   * @param fileName - key - source filename\n   * @param nodeId - nodeId for the source filename\n   * @param resourceType - resource type to update status\n   * @param value - value\n   */\n  updateDoneStatus(filename: string, nodeId: number, resourceType: string, value: boolean) {\n    const nodeDump = this.tilesConverted[filename]?.nodes.find(\n      (element) => element.nodeId === nodeId\n    );\n    if (nodeDump) {\n      nodeDump.progress[resourceType] = value;\n      if (!value) {\n        nodeDump.done = false;\n      }\n    }\n  }\n\n  /**\n   * Update dump file according to writing results\n   * @param changedRecords - array of parameters ids for the written resources\n   * @param writeResults - array of writing resource files results\n   */\n  async updateConvertedTilesDump(\n    changedRecords: {outputId?: number; sourceId?: string; resourceType?: string}[],\n    writeResults: PromiseSettledResult<string | null>[]\n  ) {\n    for (let i = 0; i < changedRecords.length; i++) {\n      if (changedRecords[i] && 'value' in writeResults[i]) {\n        const {sourceId, resourceType, outputId} = changedRecords[i];\n        if (!sourceId || !resourceType || !outputId) continue;\n        for (const node of this.tilesConverted[sourceId].nodes) {\n          if (node.nodeId === outputId) {\n            node.progress[resourceType] = true;\n\n            let done = false;\n            for (const key in node.progress) {\n              done = node.progress[key];\n              if (!done) break;\n            }\n            node.done = done;\n            if (node.done) {\n              node.progress = {};\n            }\n            break;\n          }\n        }\n      }\n    }\n    await this.updateDumpFile();\n  }\n}\n"],"mappings":"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"}

package/dist/pgm-loader.js

@@ -1,5 +1,5 @@
 import { Geoid, parsePGM } from '@math.gl/geoid';
-const VERSION = typeof "4.1.0-alpha.10" !== 'undefined' ? "4.1.0-alpha.10" : 'latest';
+const VERSION = typeof "4.1.0-alpha.11" !== 'undefined' ? "4.1.0-alpha.11" : 'latest';
 export { Geoid };
 export const PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "4.1.0-alpha.10",
+  "version": "4.1.0-alpha.11",
   "description": "Converter",
   "license": "MIT",
   "type": "module",
@@ -52,18 +52,18 @@
     "build-i3s-server-bundle": "esbuild src/i3s-server/bin/www.ts --outfile=dist/i3s-server/bin/i3s-server.min.cjs --platform=node --target=esnext,node14 --minify --bundle --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.1.0-alpha.10",
-    "@loaders.gl/crypto": "4.1.0-alpha.10",
-    "@loaders.gl/draco": "4.1.0-alpha.10",
-    "@loaders.gl/gltf": "4.1.0-alpha.10",
-    "@loaders.gl/i3s": "4.1.0-alpha.10",
-    "@loaders.gl/images": "4.1.0-alpha.10",
-    "@loaders.gl/loader-utils": "4.1.0-alpha.10",
-    "@loaders.gl/polyfills": "4.1.0-alpha.10",
-    "@loaders.gl/textures": "4.1.0-alpha.10",
-    "@loaders.gl/tiles": "4.1.0-alpha.10",
-    "@loaders.gl/worker-utils": "4.1.0-alpha.10",
-    "@loaders.gl/zip": "4.1.0-alpha.10",
+    "@loaders.gl/3d-tiles": "4.1.0-alpha.11",
+    "@loaders.gl/crypto": "4.1.0-alpha.11",
+    "@loaders.gl/draco": "4.1.0-alpha.11",
+    "@loaders.gl/gltf": "4.1.0-alpha.11",
+    "@loaders.gl/i3s": "4.1.0-alpha.11",
+    "@loaders.gl/images": "4.1.0-alpha.11",
+    "@loaders.gl/loader-utils": "4.1.0-alpha.11",
+    "@loaders.gl/polyfills": "4.1.0-alpha.11",
+    "@loaders.gl/textures": "4.1.0-alpha.11",
+    "@loaders.gl/tiles": "4.1.0-alpha.11",
+    "@loaders.gl/worker-utils": "4.1.0-alpha.11",
+    "@loaders.gl/zip": "4.1.0-alpha.11",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geoid": "^4.0.0",
@@ -87,7 +87,7 @@
     "join-images": "^1.1.3",
     "sharp": "^0.31.3"
   },
-  "gitHead": "19f43c2d90d8b50860c3f8e487429779a386287d",
+  "gitHead": "5d3e23bf93762b48c8c1d6d926ede7a97fe43ab0",
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/node": "^20.4.2"

package/src/3d-tiles-converter/helpers/b3dm-converter.ts

@@ -9,6 +9,9 @@ import {generateSyntheticIndices} from '../../lib/utils/geometry-utils';
 
 const Z_UP_TO_Y_UP_MATRIX = new Matrix4([1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1]);
 const scratchVector = new Vector3();
+const KHR_MATERIALS_UNLIT = 'KHR_materials_unlit';
+const METALLIC_FACTOR_DEFAULT = 1.0;
+const ROUGHNESS_FACTOR_DEFAULT = 1.0;
 
 export type I3SAttributesData = {
   tileContent: I3STileContent;
@@ -60,6 +63,22 @@ export default class B3dmConverter {
     const gltfBuilder = new GLTFScenegraph();
 
     const textureIndex = await this._addI3sTextureToGLTF(tileContent, textureFormat, gltfBuilder);
+
+    // Add KHR_MATERIALS_UNLIT extension in the following cases:
+    // - metallicFactor or roughnessFactor are set to default values
+    // - metallicFactor or roughnessFactor are not set
+    const pbrMetallicRoughness = material?.pbrMetallicRoughness;
+    if (
+      pbrMetallicRoughness &&
+      (pbrMetallicRoughness.metallicFactor === undefined ||
+        pbrMetallicRoughness.metallicFactor === METALLIC_FACTOR_DEFAULT) &&
+      (pbrMetallicRoughness.roughnessFactor === undefined ||
+        pbrMetallicRoughness.roughnessFactor === ROUGHNESS_FACTOR_DEFAULT)
+    ) {
+      gltfBuilder.addObjectExtension(material, KHR_MATERIALS_UNLIT, {});
+      gltfBuilder.addExtension(KHR_MATERIALS_UNLIT);
+    }
+
     const pbrMaterialInfo = this._convertI3sMaterialToGLTFMaterial(material, textureIndex);
     const materialIndex = gltfBuilder.addMaterial(pbrMaterialInfo);
 

package/src/converter-cli.ts

@@ -11,7 +11,7 @@ import {
   getURLValue,
   validateOptionsWithEqual
 } from './lib/utils/cli-utils';
-import {addOneFile, composeHashFile} from '@loaders.gl/zip';
+import {addOneFile, composeHashFile, makeZipCDHeaderIterator} from '@loaders.gl/zip';
 import {FileHandleFile} from '@loaders.gl/loader-utils';
 import {copyFile} from 'node:fs/promises';
 
@@ -133,7 +133,7 @@ async function main() {
     if (finalPath !== validatedOptions.tileset) {
       await copyFile(validatedOptions.tileset, finalPath);
     }
-    const hashTable = await composeHashFile(new FileHandleFile(finalPath));
+    const hashTable = await composeHashFile(makeZipCDHeaderIterator(new FileHandleFile(finalPath)));
     await addOneFile(finalPath, hashTable, '@specialIndexFileHASH128@');
 
     return;

package/src/i3s-converter/i3s-converter.ts

@@ -30,12 +30,7 @@ import md5 from 'md5';
 
 import NodePages from './helpers/node-pages';
 import {writeFile, removeDir, writeFileForSlpk, removeFile} from '../lib/utils/file-utils';
-import {
-  compressFileWithGzip,
-  compressWithChildProcess
-  // generateHash128FromZip,
-  // addFileToZip
-} from '../lib/utils/compress-util';
+import {compressFileWithGzip} from '../lib/utils/compress-util';
 import {calculateFilesSize, timeConverter} from '../lib/utils/statistic-utills';
 import convertB3dmToI3sGeometry, {getPropertyTable} from './helpers/geometry-converter';
 import {
@@ -51,7 +46,7 @@ import {GEOMETRY_DEFINITION as geometryDefinitionTemlate} from './json-templates
 import {SHARED_RESOURCES as sharedResourcesTemplate} from './json-templates/shared-resources';
 import {validateNodeBoundingVolumes} from './helpers/node-debug';
 import {KTX2BasisWriterWorker} from '@loaders.gl/textures';
-import {FileHandleFile, LoaderWithParser} from '@loaders.gl/loader-utils';
+import {LoaderWithParser} from '@loaders.gl/loader-utils';
 import {I3SMaterialDefinition, TextureSetDefinitionFormats} from '@loaders.gl/i3s';
 import {ImageWriter} from '@loaders.gl/images';
 import {GLTFImagePostprocessed} from '@loaders.gl/gltf';
@@ -82,7 +77,7 @@ import {createBoundingVolume} from '@loaders.gl/tiles';
 import {TraversalConversionProps, traverseDatasetWith} from './helpers/tileset-traversal';
 import {analyzeTileContent, mergePreprocessData} from './helpers/preprocess-3d-tiles';
 import {Progress} from './helpers/progress';
-import {addOneFile, composeHashFile} from '@loaders.gl/zip';
+import {composeHashFile, createZip} from '@loaders.gl/zip';
 import {ConversionDump, ConversionDumpOptions} from '../lib/utils/conversion-dump';
 
 const ION_DEFAULT_TOKEN = process.env?.IonToken;
@@ -567,35 +562,12 @@ export default class I3SConverter {
     if (this.options.slpk) {
       const slpkTilesetPath = join(tilesetPath, 'SceneServer', 'layers', '0');
       const slpkFileName = `${tilesetPath}.slpk`;
-      await compressWithChildProcess(
-        slpkTilesetPath,
-        slpkFileName,
-        0,
-        '.',
-        this.options.sevenZipExe
-      );
 
-      const hashTable = await composeHashFile(new FileHandleFile(slpkFileName));
-      await addOneFile(slpkFileName, hashTable, '@specialIndexFileHASH128@');
-
-      // TODO: `addFileToZip` corrupts archive so it can't be validated with windows i3s_converter.exe
-      // const fileHash128Path = `${tilesetPath}/@specialIndexFileHASH128@`;
-      // try {
-      //   await generateHash128FromZip(slpkFileName, fileHash128Path);
-      //   await addFileToZip(
-      //     tilesetPath,
-      //     '@specialIndexFileHASH128@',
-      //     slpkFileName,
-      //     this.options.sevenZipExe
-      //   );
-      // } catch (error) {
-      //   if (error.code === FS_FILE_TOO_LARGE) {
-      //     console.warn(`${slpkFileName} file is too big to generate a hash`); // eslint-disable-line
-      //   } else {
-      //     console.error(error); // eslint-disable-line
-      //   }
-      // }
-      // All converted files are contained in slpk now they can be deleted
+      await createZip(slpkTilesetPath, slpkFileName, async (fileList) => ({
+        path: '@specialIndexFileHASH128@',
+        file: await composeHashFile(fileList)
+      }));
+
       try {
         await removeDir(tilesetPath);
       } catch (e) {