@cogeotiff/cli 7.2.0 → 8.0.1

package/build/log.js

@@ -0,0 +1,37 @@
+import { FsHttp, fsa } from '@chunkd/fs';
+import { SourceCache, SourceChunk } from '@chunkd/middleware';
+import { log } from '@linzjs/tracing';
+import { FetchLog } from './fs.js';
+// Cache the last 10MB of chunks for reuse
+export const sourceCache = new SourceCache({ size: 10 * 1024 * 1024 });
+export const sourceChunk = new SourceChunk({ size: 32 * 1024 });
+export function setupLogger(cfg) {
+    if (cfg.verbose) {
+        log.level = 'debug';
+    }
+    else if (cfg.extraVerbose) {
+        log.level = 'trace';
+    }
+    else {
+        log.level = 'warn';
+    }
+    fsa.register('http://', new FsHttp());
+    fsa.register('https://', new FsHttp());
+    // Order of these are really important
+    // Chunk all requests into 32KB chunks
+    fsa.middleware.push(sourceChunk);
+    // Cache the last 10MB of chunks for reuse
+    fsa.middleware.push(sourceCache);
+    fsa.middleware.push(FetchLog);
+    return log;
+}
+export const logger = log;
+/** S3 client adds approx 300ms to the cli startup time, so only register it if needed */
+export async function ensureS3fs() {
+    if (fsa.systems.find((f) => f.prefix.startsWith('s3')))
+        return;
+    const S3Client = await import('@aws-sdk/client-s3');
+    const FsAwsS3 = await import('@chunkd/fs-aws');
+    fsa.register('s3://', new FsAwsS3.FsAwsS3(new S3Client.S3Client({})));
+}
+//# sourceMappingURL=log.js.map

package/build/log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,0CAA0C;AAC1C,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;AACvE,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AAEhE,MAAM,UAAU,WAAW,CAAC,GAAkD;IAC5E,IAAI,GAAG,CAAC,OAAO,EAAE;QACf,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC;KACrB;SAAM,IAAI,GAAG,CAAC,YAAY,EAAE;QAC3B,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC;KACrB;SAAM;QACL,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC;KACpB;IAED,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,MAAM,EAAE,CAAC,CAAC;IACtC,GAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,MAAM,EAAE,CAAC,CAAC;IAEvC,sCAAsC;IACtC,sCAAsC;IACtC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACjC,0CAA0C;IAC1C,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEjC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAE9B,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,CAAC;AAE1B,yFAAyF;AACzF,MAAM,CAAC,KAAK,UAAU,UAAU;IAC9B,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO;IAE/D,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAE/C,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACxE,CAAC"}

package/build/util.bytes.d.ts

@@ -6,4 +6,3 @@
  * @param bytes  byte count to convert
  */
 export declare function toByteSizeString(bytes: number): string;
-//# sourceMappingURL=util.bytes.d.ts.map

package/build/util.bytes.js

@@ -16,4 +16,4 @@ export function toByteSizeString(bytes) {
         return `${Math.round(output)} ${byteSize}`;
     return `${Math.floor(output * 100) / 100} ${byteSize}`;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5ieXRlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy91dGlsLmJ5dGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sS0FBSyxHQUFHLENBQUMsT0FBTyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO0FBRWhEOzs7Ozs7R0FNRztBQUNILE1BQU0sVUFBVSxnQkFBZ0IsQ0FBQyxLQUFhO0lBQzFDLElBQUksS0FBSyxLQUFLLENBQUM7UUFBRSxPQUFPLFFBQVEsQ0FBQztJQUNqQyxNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQ3ZELE1BQU0sTUFBTSxHQUFHLEtBQUssR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztJQUN6QyxNQUFNLFFBQVEsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFFMUIsSUFBSSxDQUFDLEtBQUssQ0FBQztRQUFFLE9BQU8sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLFFBQVEsRUFBRSxDQUFDO0lBQ3hELE9BQU8sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUMsR0FBRyxHQUFHLElBQUksUUFBUSxFQUFFLENBQUM7QUFDM0QsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImNvbnN0IHNpemVzID0gWydCeXRlcycsICdLQicsICdNQicsICdHQicsICdUQiddO1xuXG4vKipcbiAqIENvbnZlcnQgYSBieXRlIGNvdW50IGludG8gaHVtYW4gcmVhZGFibGUgYnl0ZSBudW1iZXJzXG4gKlxuICogZWcgMTAyNCA9PiAxS0JcbiAqXG4gKiBAcGFyYW0gYnl0ZXMgIGJ5dGUgY291bnQgdG8gY29udmVydFxuICovXG5leHBvcnQgZnVuY3Rpb24gdG9CeXRlU2l6ZVN0cmluZyhieXRlczogbnVtYmVyKTogc3RyaW5nIHtcbiAgICBpZiAoYnl0ZXMgPT09IDEpIHJldHVybiAnMSBCeXRlJztcbiAgICBjb25zdCBpID0gTWF0aC5mbG9vcihNYXRoLmxvZyhieXRlcykgLyBNYXRoLmxvZygxMDI0KSk7XG4gICAgY29uc3Qgb3V0cHV0ID0gYnl0ZXMgLyBNYXRoLnBvdygxMDI0LCBpKTtcbiAgICBjb25zdCBieXRlU2l6ZSA9IHNpemVzW2ldO1xuXG4gICAgaWYgKGkgPT09IDEpIHJldHVybiBgJHtNYXRoLnJvdW5kKG91dHB1dCl9ICR7Ynl0ZVNpemV9YDtcbiAgICByZXR1cm4gYCR7TWF0aC5mbG9vcihvdXRwdXQgKiAxMDApIC8gMTAwfSAke2J5dGVTaXplfWA7XG59XG4iXX0=
+//# sourceMappingURL=util.bytes.js.map

package/build/util.bytes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.bytes.js","sourceRoot":"","sources":["../src/util.bytes.ts"],"names":[],"mappings":"AAAA,MAAM,KAAK,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAEhD;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC5C,IAAI,KAAK,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IACjC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAE1B,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;IACxD,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,GAAG,IAAI,QAAQ,EAAE,CAAC;AACzD,CAAC"}

package/build/util.tile.d.ts

@@ -1,5 +1,5 @@
 import { CogTiff } from '@cogeotiff/core';
-import type pino from 'pino';
+import { log } from '@linzjs/tracing';
 /**
  * Get a human readable tile name
  *
@@ -11,5 +11,4 @@ import type pino from 'pino';
  * @returns tile name eg `001_002_12.png`
  */
 export declare function getTileName(mimeType: string, index: number, x: number, y: number): string;
-export declare function writeTile(tif: CogTiff, x: number, y: number, index: number, outputPath: string, logger: pino.Logger): Promise<void>;
-//# sourceMappingURL=util.tile.d.ts.map
+export declare function writeTile(tiff: CogTiff, x: number, y: number, index: number, outputPath: URL, logger: typeof log): Promise<string | null>;

package/build/util.tile.js

@@ -1,12 +1,16 @@
 import { TiffMimeType } from '@cogeotiff/core';
-import { promises as fs } from 'fs';
-import * as path from 'path';
+import { promises as fs } from 'node:fs';
 const FileExtension = {
-    [TiffMimeType.JPEG]: 'jpeg',
-    [TiffMimeType.JP2]: 'jp2',
-    [TiffMimeType.WEBP]: 'webp',
-    [TiffMimeType.LZW]: 'lzw',
-    [TiffMimeType.DEFLATE]: 'deflate',
+    [TiffMimeType.Jpeg]: 'jpeg',
+    [TiffMimeType.Jp2]: 'jp2',
+    [TiffMimeType.Webp]: 'webp',
+    [TiffMimeType.Lzw]: 'lzw',
+    [TiffMimeType.Deflate]: 'deflate',
+    [TiffMimeType.None]: 'bin',
+    [TiffMimeType.JpegXl]: 'jpeg',
+    [TiffMimeType.Zstd]: 'zstd',
+    [TiffMimeType.Lerc]: 'lerc',
+    [TiffMimeType.Lzma]: 'lzma',
 };
 /**
  * Get a human readable tile name
@@ -21,20 +25,18 @@ const FileExtension = {
 export function getTileName(mimeType, index, x, y) {
     const xS = `${x}`.padStart(3, '0');
     const yS = `${y}`.padStart(3, '0');
-    const fileExt = FileExtension[mimeType];
-    if (fileExt == null) {
-        throw new Error(`Unable to process tile type:${mimeType}`);
-    }
+    const fileExt = FileExtension[mimeType] ?? 'unknown';
     return `${xS}_${yS}_${index}.${fileExt}`;
 }
-export async function writeTile(tif, x, y, index, outputPath, logger) {
-    const tile = await tif.getTile(x, y, index);
+export async function writeTile(tiff, x, y, index, outputPath, logger) {
+    const tile = await tiff.images[index].getTile(x, y);
     if (tile == null) {
-        logger.debug({ index, x, y }, 'TileEmpty');
-        return;
+        logger.debug('Tile:Empty', { source: tiff.source.url.href, index, x, y });
+        return null;
     }
     const fileName = getTileName(tile.mimeType, index, x, y);
-    await fs.writeFile(path.join(outputPath, fileName), tile.bytes);
-    logger.debug({ index, x, y, fileName, bytes: tile.bytes.length }, 'TileWrite');
+    await fs.writeFile(new URL(fileName, outputPath), Buffer.from(tile.bytes));
+    logger.debug('Tile:Write', { source: tiff.source.url.href, index, x, y, fileName, bytes: tile.bytes.byteLength });
+    return fileName;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC50aWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3V0aWwudGlsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQVcsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDeEQsT0FBTyxFQUFFLFFBQVEsSUFBSSxFQUFFLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDcEMsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUM7QUFHN0IsTUFBTSxhQUFhLEdBQThCO0lBQzdDLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxFQUFFLE1BQU07SUFDM0IsQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLEVBQUUsS0FBSztJQUN6QixDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNO0lBQzNCLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEtBQUs7SUFDekIsQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLEVBQUUsU0FBUztDQUNwQyxDQUFDO0FBRUY7Ozs7Ozs7OztHQVNHO0FBQ0gsTUFBTSxVQUFVLFdBQVcsQ0FBQyxRQUFnQixFQUFFLEtBQWEsRUFBRSxDQUFTLEVBQUUsQ0FBUztJQUM3RSxNQUFNLEVBQUUsR0FBRyxHQUFHLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDbkMsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBRW5DLE1BQU0sT0FBTyxHQUFXLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNoRCxJQUFJLE9BQU8sSUFBSSxJQUFJLEVBQUU7UUFDakIsTUFBTSxJQUFJLEtBQUssQ0FBQywrQkFBK0IsUUFBUSxFQUFFLENBQUMsQ0FBQztLQUM5RDtJQUVELE9BQU8sR0FBRyxFQUFFLElBQUksRUFBRSxJQUFJLEtBQUssSUFBSSxPQUFPLEVBQUUsQ0FBQztBQUM3QyxDQUFDO0FBRUQsTUFBTSxDQUFDLEtBQUssVUFBVSxTQUFTLENBQzNCLEdBQVksRUFDWixDQUFTLEVBQ1QsQ0FBUyxFQUNULEtBQWEsRUFDYixVQUFrQixFQUNsQixNQUFtQjtJQUVuQixNQUFNLElBQUksR0FBRyxNQUFNLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUM1QyxJQUFJLElBQUksSUFBSSxJQUFJLEVBQUU7UUFDZCxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxXQUFXLENBQUMsQ0FBQztRQUMzQyxPQUFPO0tBQ1Y7SUFDRCxNQUFNLFFBQVEsR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ3pELE1BQU0sRUFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxRQUFRLENBQUMsRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDaEUsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsRUFBRSxXQUFXLENBQUMsQ0FBQztBQUNuRixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29nVGlmZiwgVGlmZk1pbWVUeXBlIH0gZnJvbSAnQGNvZ2VvdGlmZi9jb3JlJztcbmltcG9ydCB7IHByb21pc2VzIGFzIGZzIH0gZnJvbSAnZnMnO1xuaW1wb3J0ICogYXMgcGF0aCBmcm9tICdwYXRoJztcbmltcG9ydCB0eXBlIHBpbm8gZnJvbSAncGlubyc7XG5cbmNvbnN0IEZpbGVFeHRlbnNpb246IHsgW2tleTogc3RyaW5nXTogc3RyaW5nIH0gPSB7XG4gICAgW1RpZmZNaW1lVHlwZS5KUEVHXTogJ2pwZWcnLFxuICAgIFtUaWZmTWltZVR5cGUuSlAyXTogJ2pwMicsXG4gICAgW1RpZmZNaW1lVHlwZS5XRUJQXTogJ3dlYnAnLFxuICAgIFtUaWZmTWltZVR5cGUuTFpXXTogJ2x6dycsXG4gICAgW1RpZmZNaW1lVHlwZS5ERUZMQVRFXTogJ2RlZmxhdGUnLFxufTtcblxuLyoqXG4gKiBHZXQgYSBodW1hbiByZWFkYWJsZSB0aWxlIG5hbWVcbiAqXG4gKiBAcGFyYW0gbWltZVR5cGUgaW1hZ2UgdHlwZSBvZiB0aWxlIEBzZWUgRmlsZUV4dGVuc2lvblxuICogQHBhcmFtIGluZGV4IEltYWdlIGluZGV4XG4gKiBAcGFyYW0geCBUaWxlIFhcbiAqIEBwYXJhbSB5IFRpbGUgWVxuICpcbiAqIEByZXR1cm5zIHRpbGUgbmFtZSBlZyBgMDAxXzAwMl8xMi5wbmdgXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBnZXRUaWxlTmFtZShtaW1lVHlwZTogc3RyaW5nLCBpbmRleDogbnVtYmVyLCB4OiBudW1iZXIsIHk6IG51bWJlcik6IHN0cmluZyB7XG4gICAgY29uc3QgeFMgPSBgJHt4fWAucGFkU3RhcnQoMywgJzAnKTtcbiAgICBjb25zdCB5UyA9IGAke3l9YC5wYWRTdGFydCgzLCAnMCcpO1xuXG4gICAgY29uc3QgZmlsZUV4dDogc3RyaW5nID0gRmlsZUV4dGVuc2lvblttaW1lVHlwZV07XG4gICAgaWYgKGZpbGVFeHQgPT0gbnVsbCkge1xuICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYFVuYWJsZSB0byBwcm9jZXNzIHRpbGUgdHlwZToke21pbWVUeXBlfWApO1xuICAgIH1cblxuICAgIHJldHVybiBgJHt4U31fJHt5U31fJHtpbmRleH0uJHtmaWxlRXh0fWA7XG59XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiB3cml0ZVRpbGUoXG4gICAgdGlmOiBDb2dUaWZmLFxuICAgIHg6IG51bWJlcixcbiAgICB5OiBudW1iZXIsXG4gICAgaW5kZXg6IG51bWJlcixcbiAgICBvdXRwdXRQYXRoOiBzdHJpbmcsXG4gICAgbG9nZ2VyOiBwaW5vLkxvZ2dlcixcbik6IFByb21pc2U8dm9pZD4ge1xuICAgIGNvbnN0IHRpbGUgPSBhd2FpdCB0aWYuZ2V0VGlsZSh4LCB5LCBpbmRleCk7XG4gICAgaWYgKHRpbGUgPT0gbnVsbCkge1xuICAgICAgICBsb2dnZXIuZGVidWcoeyBpbmRleCwgeCwgeSB9LCAnVGlsZUVtcHR5Jyk7XG4gICAgICAgIHJldHVybjtcbiAgICB9XG4gICAgY29uc3QgZmlsZU5hbWUgPSBnZXRUaWxlTmFtZSh0aWxlLm1pbWVUeXBlLCBpbmRleCwgeCwgeSk7XG4gICAgYXdhaXQgZnMud3JpdGVGaWxlKHBhdGguam9pbihvdXRwdXRQYXRoLCBmaWxlTmFtZSksIHRpbGUuYnl0ZXMpO1xuICAgIGxvZ2dlci5kZWJ1Zyh7IGluZGV4LCB4LCB5LCBmaWxlTmFtZSwgYnl0ZXM6IHRpbGUuYnl0ZXMubGVuZ3RoIH0sICdUaWxlV3JpdGUnKTtcbn1cbiJdfQ==
+//# sourceMappingURL=util.tile.js.map

package/build/util.tile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.tile.js","sourceRoot":"","sources":["../src/util.tile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AAEzC,MAAM,aAAa,GAA2B;IAC5C,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM;IAC3B,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,KAAK;IACzB,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM;IAC3B,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,KAAK;IACzB,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,SAAS;IACjC,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK;IAC1B,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM;IAC7B,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM;IAC3B,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM;IAC3B,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM;CAC5B,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,UAAU,WAAW,CAAC,QAAgB,EAAE,KAAa,EAAE,CAAS,EAAE,CAAS;IAC/E,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACnC,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC;IACrD,OAAO,GAAG,EAAE,IAAI,EAAE,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;AAC3C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,IAAa,EACb,CAAS,EACT,CAAS,EACT,KAAa,EACb,UAAe,EACf,MAAkB;IAElB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpD,IAAI,IAAI,IAAI,IAAI,EAAE;QAChB,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAC1E,OAAO,IAAI,CAAC;KACb;IACD,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3E,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;IAClH,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/package.json

@@ -1,39 +1,39 @@
 {
-    "name": "@cogeotiff/cli",
-    "version": "7.2.0",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/blacha/cogeotiff.git",
-        "directory": "packages/cli"
-    },
-    "author": "Blayne Chard",
-    "license": "MIT",
-    "bin": {
-        "cogeotiff": "bin/cogeotiff.js"
-    },
-    "type": "module",
-    "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-    },
-    "scripts": {},
-    "dependencies": {
-        "@chunkd/core": "^8.1.0",
-        "@chunkd/fs": "^8.1.0",
-        "@cogeotiff/core": "^7.2.0",
-        "@rushstack/ts-command-line": "^4.3.14",
-        "ansi-colors": "^4.1.1",
-        "aws-sdk": "^2.781.0",
-        "p-limit": "^4.0.0",
-        "pino": "^8.0.0",
-        "pretty-json-log": "^1.0.0",
-        "source-map-support": "^0.5.12"
-    },
-    "devDependencies": {
-        "@types/node": "^18.0.0",
-        "@types/pino": "^7.0.5"
-    },
-    "publishConfig": {
-        "access": "public"
-    },
-    "gitHead": "64a437a3590a1fc8395d1f4294a5fc74cbbe6127"
+  "name": "@cogeotiff/cli",
+  "version": "8.0.1",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/blacha/cogeotiff.git",
+    "directory": "packages/cli"
+  },
+  "author": "Blayne Chard",
+  "license": "MIT",
+  "bin": {
+    "cogeotiff": "bin/cogeotiff.js"
+  },
+  "type": "module",
+  "engines": {
+    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+  },
+  "scripts": {},
+  "dependencies": {
+    "@chunkd/fs": "^11.0.2",
+    "@chunkd/fs-aws": "^11.0.2",
+    "@chunkd/middleware": "^11.0.0",
+    "@chunkd/source": "^11.0.0",
+    "@cogeotiff/core": "^8.0.1",
+    "@linzjs/tracing": "^1.1.1",
+    "ansi-colors": "^4.1.1",
+    "cmd-ts": "^0.13.0",
+    "p-limit": "^4.0.0",
+    "pretty-json-log": "^1.4.0"
+  },
+  "devDependencies": {
+    "@types/node": "^20.0.0",
+    "@types/pino": "^7.0.5"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "6e7b4f6250189ce8a3fa88641eaf35538b104ddd"
 }

package/src/action.util.ts

@@ -1,47 +1,32 @@
-import { ChunkSource } from '@chunkd/core';
-import { fsa } from '@chunkd/fs';
-import { CogTiff } from '@cogeotiff/core';
-import { CommandLineStringParameter } from '@rushstack/ts-command-line';
 import c from 'ansi-colors';
 
 export interface CLiResultMapLine {
-    key: string;
-    value: string | number | boolean | number[] | null;
+  key: string;
+  value: string | number | boolean | number[] | null;
+  enabled?: boolean;
 }
 export interface CliResultMap {
-    title?: string;
-    keys: (CLiResultMapLine | null)[];
+  title?: string;
+  keys: (CLiResultMapLine | null)[];
+  enabled?: boolean;
 }
 
 export const ActionUtil = {
-    async getCogSource(file?: CommandLineStringParameter | null): Promise<{ source: ChunkSource; tif: CogTiff }> {
-        if (file == null || file.value == null) {
-            throw new Error(`File "${file} is not valid`);
+  formatResult(title: string, result: CliResultMap[]): string[] {
+    const msg: string[] = [title];
+    for (const group of result) {
+      if (group.enabled === false) continue;
+      msg.push('');
+      if (group.title) msg.push(c.bold(group.title));
+      for (const kv of group.keys) {
+        if (kv == null) continue;
+        if (kv.enabled === false) continue;
+        if (kv.value == null || (typeof kv.value === 'string' && kv.value.trim() === '')) {
+          continue;
         }
-        const source = fsa.source(file.value);
-        if (source == null) throw new Error(`File "${file} is not valid`);
-
-        const tif = new CogTiff(source);
-        await tif.init(false);
-        return { source, tif };
-    },
-    formatResult(title: string, result: CliResultMap[]): string[] {
-        const msg: string[] = [title];
-        for (const group of result) {
-            msg.push('');
-            if (group.title) {
-                msg.push(c.bold(group.title));
-            }
-            for (const kv of group.keys) {
-                if (kv == null) {
-                    continue;
-                }
-                if (kv.value == null || (typeof kv.value === 'string' && kv.value.trim() === '')) {
-                    continue;
-                }
-                msg.push(`    ${kv.key.padEnd(14, ' ')}  ${String(kv.value)}`);
-            }
-        }
-        return msg;
-    },
+        msg.push(`    ${kv.key.padEnd(14, ' ')}  ${String(kv.value)}`);
+      }
+    }
+    return msg;
+  },
 };

package/src/bin.ts

@@ -0,0 +1,14 @@
+// Ensure connection reuse is enabled
+process.env['AWS_NODEJS_CONNECTION_REUSE_ENABLED'] = '1';
+
+import { run } from 'cmd-ts';
+import { cmd } from './index.js';
+import { logger } from './log.js';
+import { otError } from '@linzjs/tracing';
+
+run(cmd, process.argv.slice(2)).catch((err) => {
+  logger.fatal('Command:Failed', { ...otError(err) });
+  logger.pino.flush();
+  // Give the log some time to flush before exiting
+  setTimeout(() => process.exit(1), 25);
+});

package/src/cli.table.ts

@@ -1,34 +1,34 @@
 interface CliTableInfo<T> {
-    /** Header for the table */
-    name: string;
-    /** Pad the field out to this width */
-    width: number;
-    /** Get the field value */
-    get: (obj: T, index?: number) => string | null;
-    /**
-     * Is this field enabled,
-     * Fields are only enabled if every data record returns true for enabled
-     */
-    enabled?: (obj: T) => boolean;
+  /** Header for the table */
+  name: string;
+  /** Pad the field out to this width */
+  width: number;
+  /** Get the field value */
+  get: (obj: T, index?: number) => string | null;
+  /**
+   * Is this field enabled,
+   * Fields are only enabled if every data record returns true for enabled
+   */
+  enabled?: (obj: T) => boolean;
 }
 
 export class CliTable<T> {
-    fields: CliTableInfo<T>[] = [];
-    add(fields: CliTableInfo<T>): void {
-        this.fields.push(fields);
-    }
+  fields: CliTableInfo<T>[] = [];
+  add(fields: CliTableInfo<T>): void {
+    this.fields.push(fields);
+  }
 
-    print(data: T[], rowPadding = ''): string[] {
-        const fields = this.fields.filter((f) => data.every((d) => f.enabled?.(d) ?? true));
-        const rows = data.map((d, index) => {
-            const row = fields.map((f) => {
-                const str = f.get(d, index);
-                return (str ?? '').padEnd(f.width);
-            });
-            return rowPadding + row.join('\t');
-        });
+  print(data: T[], rowPadding = ''): string[] {
+    const fields = this.fields.filter((f) => data.every((d) => f.enabled?.(d) ?? true));
+    const rows = data.map((d, index) => {
+      const row = fields.map((f) => {
+        const str = f.get(d, index);
+        return (str ?? '').padEnd(f.width);
+      });
+      return rowPadding + row.join('\t');
+    });
 
-        rows.unshift(rowPadding + fields.map((f) => f.name.padEnd(f.width)).join('\t'));
-        return rows;
-    }
+    rows.unshift(rowPadding + fields.map((f) => f.name.padEnd(f.width)).join('\t'));
+    return rows;
+  }
 }

package/src/commands/dump.ts

@@ -0,0 +1,156 @@
+import { fsa } from '@chunkd/fs';
+import { CogTiff, TiffMimeType } from '@cogeotiff/core';
+import { log } from '@linzjs/tracing';
+import { command, number, option, optional, restPositionals } from 'cmd-ts';
+import { promises as fs } from 'node:fs';
+import { basename } from 'node:path';
+import { pathToFileURL } from 'node:url';
+import pLimit from 'p-limit';
+import { DefaultArgs, Url } from '../common.js';
+import { ensureS3fs, setupLogger } from '../log.js';
+import { getTileName, writeTile } from '../util.tile.js';
+
+const TileQueue = pLimit(5);
+
+export interface GeoJsonPolygon {
+  type: 'Feature';
+  geometry: {
+    type: 'Polygon';
+    coordinates: [[[number, number], [number, number], [number, number], [number, number], [number, number]]];
+  };
+  properties: Record<string, unknown>;
+}
+
+function makePolygon(xMin: number, yMin: number, xMax: number, yMax: number): GeoJsonPolygon {
+  return {
+    type: 'Feature',
+    properties: {},
+    geometry: {
+      type: 'Polygon',
+      coordinates: [
+        [
+          [xMin, yMin],
+          [xMin, yMax],
+          [xMax, yMax],
+          [xMax, yMin],
+          [xMin, yMin],
+        ],
+      ],
+    },
+  };
+}
+
+export const commandDump = command({
+  name: 'dump',
+  args: {
+    ...DefaultArgs,
+    path: option({ short: 'f', long: 'file', type: optional(Url) }),
+    image: option({ short: 'i', long: 'image', description: 'Image Id to dump (starting from 0)', type: number }),
+    output: option({ short: 'o', long: 'output', type: optional(Url) }),
+    paths: restPositionals({ type: Url, description: 'Files to process' }),
+  },
+
+  async handler(args) {
+    const cwd = pathToFileURL(process.cwd() + '/');
+    const logger = setupLogger(args);
+    for (const path of [args.path, ...args.paths]) {
+      if (path == null) continue;
+      if (path.protocol === 's3:') await ensureS3fs();
+      const source = fsa.source(path);
+      const tiff = await new CogTiff(source).init();
+      const img = tiff.images[args.image];
+      if (!img.isTiled()) throw Error(`Tiff: ${path.href} file is not tiled.`);
+      const output = new URL(`${basename(path.href)}-i${args.image}/`, args.output ?? cwd);
+      await fs.mkdir(output, { recursive: true });
+
+      await dumpTiles(tiff, output, args.image, logger);
+      await dumpBounds(tiff, output, args.image);
+    }
+  },
+});
+
+async function dumpBounds(tiff: CogTiff, target: URL, index: number): Promise<void> {
+  const img = tiff.images[index];
+  if (!img.isTiled() || !img.isGeoLocated) return;
+
+  const features: GeoJsonPolygon[] = [];
+  const featureCollection: Record<string, unknown> = {
+    type: 'FeatureCollection',
+    features,
+  };
+
+  const tileCount = img.tileCount;
+  const tileInfo = img.tileSize;
+  const tileSize = img.size;
+
+  const firstImage = tiff.images[0];
+  if (firstImage.epsg !== 4326) {
+    featureCollection['crs'] = {
+      type: 'name',
+      properties: { name: `epsg:${firstImage.epsg}` },
+    };
+  }
+  firstImage.compression;
+  const firstTileSize = firstImage.size;
+  const origin = firstImage.origin;
+  const resolution = firstImage.resolution;
+
+  const xScale = (resolution[0] * firstTileSize.width) / tileSize.width;
+  const yScale = (resolution[1] * firstTileSize.height) / tileSize.height;
+
+  for (let y = 0; y < tileCount.y; y++) {
+    const yMax = origin[1] + y * tileInfo.height * yScale;
+    const yMin = yMax + tileInfo.height * yScale;
+    for (let x = 0; x < tileCount.x; x++) {
+      const xMin = origin[0] + x * tileInfo.width * xScale;
+      const xMax = xMin + tileInfo.width * xScale;
+      const poly = makePolygon(xMin, yMin, xMax, yMax);
+      poly.properties = { tile: getTileName(firstImage.compression ?? TiffMimeType.None, index, x, y) };
+      features.push(poly);
+    }
+  }
+
+  await fs.writeFile(new URL(`i${index}.bounds.geojson`, target), JSON.stringify(featureCollection, null, 2));
+}
+
+async function dumpTiles(tiff: CogTiff, target: URL, index: number, logger: typeof log): Promise<number> {
+  const promises: Promise<string | null>[] = [];
+  const img = tiff.images[index];
+  if (!img.isTiled()) return 0;
+
+  logger.info('Tiff:Info', { source: tiff.source.url, ...img.tileSize, ...img.tileCount });
+  const { tileCount, tileSize } = img;
+
+  const html = ['<html>'];
+  const styles = `<style>.c { min-width: ${tileSize.width}px; min-height: ${tileSize.height}px; outline: 1px #ff00fff0 }</style>`;
+  html.push(styles);
+  for (let y = 0; y < tileCount.y; y++) {
+    for (let x = 0; x < tileCount.x; x++) {
+      const promise = TileQueue(() => writeTile(tiff, x, y, index, target, logger));
+      promises.push(promise);
+    }
+  }
+
+  const result = await Promise.all(promises);
+  let i = 0;
+  for (let y = 0; y < tileCount.y; y++) {
+    html.push('\t<div style="display:flex;">');
+
+    for (let x = 0; x < tileCount.x; x++) {
+      const fileName = result[i];
+      if (fileName == null) {
+        html.push(`\t\t<div class="c"></div>`);
+        continue;
+      }
+      html.push(`\t\t<img class="c" src="./${fileName}" >`);
+
+      i++;
+    }
+    html.push('\t</div>');
+  }
+
+  html.push('</html>');
+  await fs.writeFile(new URL('index.html', target), html.join('\n'));
+
+  return promises.length;
+}