@milaboratories/pl-drivers 1.11.59 → 1.11.60

package/dist/clients/download.js

@@ -1,152 +1,130 @@
-import { RestAPI, stringifyWithResourceId, addRTypeToMetadata, createRTypeRoutingHeader } from '@milaboratories/pl-client';
-import { PerfTimer } from '@milaboratories/helpers';
-import { ConcurrencyLimitingExecutor } from '@milaboratories/ts-helpers';
-import * as fs from 'node:fs';
-import * as fsp from 'node:fs/promises';
-import * as path from 'node:path';
-import { Readable } from 'node:stream';
-import { RemoteFileDownloader } from '../helpers/download.js';
-import { validateAbsolute } from '../helpers/validate.js';
-import { DownloadClient } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol.client.js';
+import { RemoteFileDownloader } from "../helpers/download.js";
+import { validateAbsolute } from "../helpers/validate.js";
+import { DownloadClient } from "../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol.client.js";
+import { RestAPI, addRTypeToMetadata, createRTypeRoutingHeader, stringifyWithResourceId } from "@milaboratories/pl-client";
+import * as fsp from "node:fs/promises";
+import { ConcurrencyLimitingExecutor } from "@milaboratories/ts-helpers";
+import { PerfTimer } from "@milaboratories/helpers";
+import * as fs$1 from "node:fs";
+import * as path$1 from "node:path";
+import { Readable } from "node:stream";
 
+//#region src/clients/download.ts
 /** Gets URLs for downloading from pl-core, parses them and reads or downloads
- * files locally and from the web. */
-class ClientDownload {
-    httpClient;
-    logger;
-    wire;
-    remoteFileDownloader;
-    /** Helps to find a storage root directory by a storage id from URL scheme. */
-    localStorageIdsToRoot;
-    /** Concurrency limiter for local file reads - limit to 32 parallel reads */
-    localFileReadLimiter = new ConcurrencyLimitingExecutor(32);
-    constructor(wireClientProviderFactory, httpClient, logger, 
-    /** Pl storages available locally */
-    localProjections) {
-        this.httpClient = httpClient;
-        this.logger = logger;
-        this.wire = wireClientProviderFactory.createWireClientProvider((wireConn) => {
-            if (wireConn.type === "grpc") {
-                return new DownloadClient(wireConn.Transport);
-            }
-            else {
-                return RestAPI.createClient({
-                    hostAndPort: wireConn.Config.hostAndPort,
-                    ssl: wireConn.Config.ssl,
-                    dispatcher: wireConn.Dispatcher,
-                    middlewares: wireConn.Middlewares,
-                });
-            }
-        });
-        this.remoteFileDownloader = new RemoteFileDownloader(httpClient);
-        this.localStorageIdsToRoot = newLocalStorageIdsToRoot(localProjections);
-    }
-    close() { }
-    /**
-     * Gets a presign URL and downloads the file.
-     * An optional range with 2 numbers from what byte and to what byte to download can be provided.
-     * @param fromBytes - from byte including this byte
-     * @param toBytes - to byte excluding this byte
-     */
-    async withBlobContent(info, options, ops, handler) {
-        const { downloadUrl, headers } = await this.grpcGetDownloadUrl(info, options, ops.signal);
-        const remoteHeaders = Object.fromEntries(headers.map(({ name, value }) => [name, value]));
-        this.logger.info(`blob ${stringifyWithResourceId(info)} download started, ` +
-            `url: ${downloadUrl}, ` +
-            `range: ${JSON.stringify(ops.range ?? null)}`);
-        const timer = PerfTimer.start();
-        const result = isLocal(downloadUrl)
-            ? await this.withLocalFileContent(downloadUrl, ops, handler)
-            : await this.remoteFileDownloader.withContent(downloadUrl, remoteHeaders, ops, handler);
-        this.logger.info(`blob ${stringifyWithResourceId(info)} download finished, ` + `took: ${timer.elapsed()}`);
-        return result;
-    }
-    async withLocalFileContent(url, ops, handler) {
-        const { storageId, relativePath } = parseLocalUrl(url);
-        const fullPath = getFullPath(storageId, this.localStorageIdsToRoot, relativePath);
-        return await this.localFileReadLimiter.run(async () => {
-            const readOps = {
-                start: ops.range?.from,
-                end: ops.range?.to !== undefined ? ops.range.to - 1 : undefined,
-                signal: ops.signal,
-            };
-            let stream;
-            let handlerSuccess = false;
-            try {
-                const stat = await fsp.stat(fullPath);
-                stream = fs.createReadStream(fullPath, readOps);
-                const webStream = Readable.toWeb(stream);
-                const result = await handler(webStream, stat.size);
-                handlerSuccess = true;
-                return result;
-            }
-            catch (error) {
-                // Cleanup on error (including handler errors)
-                if (!handlerSuccess && stream && !stream.destroyed) {
-                    stream.destroy();
-                }
-                throw error;
-            }
-        });
-    }
-    async grpcGetDownloadUrl({ id, type }, options, signal) {
-        const withAbort = options ?? {};
-        withAbort.abort = signal;
-        const client = this.wire.get();
-        if (client instanceof DownloadClient) {
-            return await client.getDownloadURL({ resourceId: id, isInternalUse: false }, addRTypeToMetadata(type, withAbort)).response;
-        }
-        else {
-            return (await client.POST("/v1/get-download-url", {
-                body: {
-                    resourceId: id.toString(),
-                    isInternalUse: false,
-                },
-                headers: { ...createRTypeRoutingHeader(type) },
-            })).data;
-        }
-    }
-}
+* files locally and from the web. */
+var ClientDownload = class {
+	wire;
+	remoteFileDownloader;
+	/** Helps to find a storage root directory by a storage id from URL scheme. */
+	localStorageIdsToRoot;
+	/** Concurrency limiter for local file reads - limit to 32 parallel reads */
+	localFileReadLimiter = new ConcurrencyLimitingExecutor(32);
+	constructor(wireClientProviderFactory, httpClient, logger, localProjections) {
+		this.httpClient = httpClient;
+		this.logger = logger;
+		this.wire = wireClientProviderFactory.createWireClientProvider((wireConn) => {
+			if (wireConn.type === "grpc") return new DownloadClient(wireConn.Transport);
+			else return RestAPI.createClient({
+				hostAndPort: wireConn.Config.hostAndPort,
+				ssl: wireConn.Config.ssl,
+				dispatcher: wireConn.Dispatcher,
+				middlewares: wireConn.Middlewares
+			});
+		});
+		this.remoteFileDownloader = new RemoteFileDownloader(httpClient);
+		this.localStorageIdsToRoot = newLocalStorageIdsToRoot(localProjections);
+	}
+	close() {}
+	/**
+	* Gets a presign URL and downloads the file.
+	* An optional range with 2 numbers from what byte and to what byte to download can be provided.
+	* @param fromBytes - from byte including this byte
+	* @param toBytes - to byte excluding this byte
+	*/
+	async withBlobContent(info, options, ops, handler) {
+		const { downloadUrl, headers } = await this.grpcGetDownloadUrl(info, options, ops.signal);
+		const remoteHeaders = Object.fromEntries(headers.map(({ name, value }) => [name, value]));
+		this.logger.info(`blob ${stringifyWithResourceId(info)} download started, url: ${downloadUrl}, range: ${JSON.stringify(ops.range ?? null)}`);
+		const timer = PerfTimer.start();
+		const result = isLocal(downloadUrl) ? await this.withLocalFileContent(downloadUrl, ops, handler) : await this.remoteFileDownloader.withContent(downloadUrl, remoteHeaders, ops, handler);
+		this.logger.info(`blob ${stringifyWithResourceId(info)} download finished, took: ${timer.elapsed()}`);
+		return result;
+	}
+	async withLocalFileContent(url, ops, handler) {
+		const { storageId, relativePath } = parseLocalUrl(url);
+		const fullPath = getFullPath(storageId, this.localStorageIdsToRoot, relativePath);
+		return await this.localFileReadLimiter.run(async () => {
+			const readOps = {
+				start: ops.range?.from,
+				end: ops.range?.to !== void 0 ? ops.range.to - 1 : void 0,
+				signal: ops.signal
+			};
+			let stream;
+			let handlerSuccess = false;
+			try {
+				const stat = await fsp.stat(fullPath);
+				stream = fs$1.createReadStream(fullPath, readOps);
+				const result = await handler(Readable.toWeb(stream), stat.size);
+				handlerSuccess = true;
+				return result;
+			} catch (error) {
+				if (!handlerSuccess && stream && !stream.destroyed) stream.destroy();
+				throw error;
+			}
+		});
+	}
+	async grpcGetDownloadUrl({ id, type }, options, signal) {
+		const withAbort = options ?? {};
+		withAbort.abort = signal;
+		const client = this.wire.get();
+		if (client instanceof DownloadClient) return await client.getDownloadURL({
+			resourceId: id,
+			isInternalUse: false
+		}, addRTypeToMetadata(type, withAbort)).response;
+		else return (await client.POST("/v1/get-download-url", {
+			body: {
+				resourceId: id.toString(),
+				isInternalUse: false
+			},
+			headers: { ...createRTypeRoutingHeader(type) }
+		})).data;
+	}
+};
 function parseLocalUrl(url) {
-    const parsed = new URL(url);
-    if (parsed.pathname == "")
-        throw new WrongLocalFileUrl(`url for local filepath ${url} does not match url scheme`);
-    return {
-        storageId: parsed.host,
-        relativePath: decodeURIComponent(parsed.pathname.slice(1)),
-    };
+	const parsed = new URL(url);
+	if (parsed.pathname == "") throw new WrongLocalFileUrl(`url for local filepath ${url} does not match url scheme`);
+	return {
+		storageId: parsed.host,
+		relativePath: decodeURIComponent(parsed.pathname.slice(1))
+	};
 }
 function getFullPath(storageId, localStorageIdsToRoot, relativePath) {
-    const root = localStorageIdsToRoot.get(storageId);
-    if (root === undefined)
-        throw new UnknownStorageError(`Unknown storage location: ${storageId}`);
-    if (root === "")
-        return relativePath;
-    return path.join(root, relativePath);
+	const root = localStorageIdsToRoot.get(storageId);
+	if (root === void 0) throw new UnknownStorageError(`Unknown storage location: ${storageId}`);
+	if (root === "") return relativePath;
+	return path$1.join(root, relativePath);
 }
 const storageProtocol = "storage://";
 function isLocal(url) {
-    return url.startsWith(storageProtocol);
+	return url.startsWith(storageProtocol);
 }
 /** Throws when a local URL have invalid scheme. */
-class WrongLocalFileUrl extends Error {
-    name = "WrongLocalFileUrl";
-}
+var WrongLocalFileUrl = class extends Error {
+	name = "WrongLocalFileUrl";
+};
 /** Happens when a storage for a local file can't be found.  */
-class UnknownStorageError extends Error {
-    name = "UnknownStorageError";
-}
+var UnknownStorageError = class extends Error {
+	name = "UnknownStorageError";
+};
 function newLocalStorageIdsToRoot(projections) {
-    const idToRoot = new Map();
-    for (const lp of projections) {
-        // Empty string means no prefix, i.e. any file on this machine can be got from the storage.
-        if (lp.localPath !== "") {
-            validateAbsolute(lp.localPath);
-        }
-        idToRoot.set(lp.storageId, lp.localPath);
-    }
-    return idToRoot;
+	const idToRoot = /* @__PURE__ */ new Map();
+	for (const lp of projections) {
+		if (lp.localPath !== "") validateAbsolute(lp.localPath);
+		idToRoot.set(lp.storageId, lp.localPath);
+	}
+	return idToRoot;
 }
 
+//#endregion
 export { ClientDownload, UnknownStorageError, WrongLocalFileUrl, getFullPath, newLocalStorageIdsToRoot, parseLocalUrl };
-//# sourceMappingURL=download.js.map
+//# sourceMappingURL=download.js.map

package/dist/clients/download.js.map

@@ -1 +1 @@
-{"version":3,"file":"download.js","sources":["../../src/clients/download.ts"],"sourcesContent":["/* eslint-disable n/no-unsupported-features/node-builtins */\nimport type { WireClientProvider, WireClientProviderFactory } from \"@milaboratories/pl-client\";\nimport {\n  addRTypeToMetadata,\n  stringifyWithResourceId,\n  RestAPI,\n  createRTypeRoutingHeader,\n} from \"@milaboratories/pl-client\";\nimport type { ResourceInfo } from \"@milaboratories/pl-tree\";\nimport { PerfTimer } from \"@milaboratories/helpers\";\nimport type { MiLogger } from \"@milaboratories/ts-helpers\";\nimport { ConcurrencyLimitingExecutor } from \"@milaboratories/ts-helpers\";\nimport type { RpcOptions } from \"@protobuf-ts/runtime-rpc\";\nimport * as fs from \"node:fs\";\nimport * as fsp from \"node:fs/promises\";\nimport * as path from \"node:path\";\nimport { Readable } from \"node:stream\";\nimport type { Dispatcher } from \"undici\";\nimport type { LocalStorageProjection } from \"../drivers/types\";\nimport { type ContentHandler, RemoteFileDownloader } from \"../helpers/download\";\nimport { validateAbsolute } from \"../helpers/validate\";\nimport type { DownloadAPI_GetDownloadURL_Response } from \"../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol\";\nimport { DownloadClient } from \"../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol.client\";\nimport type { DownloadApiPaths, DownloadRestClientType } from \"../proto-rest\";\nimport { type GetContentOptions } from \"@milaboratories/pl-model-common\";\n\n/** Gets URLs for downloading from pl-core, parses them and reads or downloads\n * files locally and from the web. */\nexport class ClientDownload {\n  public readonly wire: WireClientProvider<DownloadRestClientType | DownloadClient>;\n  private readonly remoteFileDownloader: RemoteFileDownloader;\n\n  /** Helps to find a storage root directory by a storage id from URL scheme. */\n  private readonly localStorageIdsToRoot: Map<string, string>;\n\n  /** Concurrency limiter for local file reads - limit to 32 parallel reads */\n  private readonly localFileReadLimiter = new ConcurrencyLimitingExecutor(32);\n\n  constructor(\n    wireClientProviderFactory: WireClientProviderFactory,\n    public readonly httpClient: Dispatcher,\n    public readonly logger: MiLogger,\n    /** Pl storages available locally */\n    localProjections: LocalStorageProjection[],\n  ) {\n    this.wire = wireClientProviderFactory.createWireClientProvider((wireConn) => {\n      if (wireConn.type === \"grpc\") {\n        return new DownloadClient(wireConn.Transport);\n      } else {\n        return RestAPI.createClient<DownloadApiPaths>({\n          hostAndPort: wireConn.Config.hostAndPort,\n          ssl: wireConn.Config.ssl,\n          dispatcher: wireConn.Dispatcher,\n          middlewares: wireConn.Middlewares,\n        });\n      }\n    });\n    this.remoteFileDownloader = new RemoteFileDownloader(httpClient);\n    this.localStorageIdsToRoot = newLocalStorageIdsToRoot(localProjections);\n  }\n\n  close() {}\n\n  /**\n   * Gets a presign URL and downloads the file.\n   * An optional range with 2 numbers from what byte and to what byte to download can be provided.\n   * @param fromBytes - from byte including this byte\n   * @param toBytes - to byte excluding this byte\n   */\n  async withBlobContent<T>(\n    info: ResourceInfo,\n    options: RpcOptions | undefined,\n    ops: GetContentOptions,\n    handler: ContentHandler<T>,\n  ): Promise<T> {\n    const { downloadUrl, headers } = await this.grpcGetDownloadUrl(info, options, ops.signal);\n\n    const remoteHeaders = Object.fromEntries(headers.map(({ name, value }) => [name, value]));\n    this.logger.info(\n      `blob ${stringifyWithResourceId(info)} download started, ` +\n        `url: ${downloadUrl}, ` +\n        `range: ${JSON.stringify(ops.range ?? null)}`,\n    );\n\n    const timer = PerfTimer.start();\n    const result = isLocal(downloadUrl)\n      ? await this.withLocalFileContent(downloadUrl, ops, handler)\n      : await this.remoteFileDownloader.withContent(downloadUrl, remoteHeaders, ops, handler);\n\n    this.logger.info(\n      `blob ${stringifyWithResourceId(info)} download finished, ` + `took: ${timer.elapsed()}`,\n    );\n    return result;\n  }\n\n  async withLocalFileContent<T>(\n    url: string,\n    ops: GetContentOptions,\n    handler: ContentHandler<T>,\n  ): Promise<T> {\n    const { storageId, relativePath } = parseLocalUrl(url);\n    const fullPath = getFullPath(storageId, this.localStorageIdsToRoot, relativePath);\n\n    return await this.localFileReadLimiter.run(async () => {\n      const readOps = {\n        start: ops.range?.from,\n        end: ops.range?.to !== undefined ? ops.range.to - 1 : undefined,\n        signal: ops.signal,\n      };\n      let stream: fs.ReadStream | undefined;\n      let handlerSuccess = false;\n\n      try {\n        const stat = await fsp.stat(fullPath);\n        stream = fs.createReadStream(fullPath, readOps);\n        const webStream = Readable.toWeb(stream);\n\n        const result = await handler(webStream, stat.size);\n        handlerSuccess = true;\n        return result;\n      } catch (error) {\n        // Cleanup on error (including handler errors)\n        if (!handlerSuccess && stream && !stream.destroyed) {\n          stream.destroy();\n        }\n        throw error;\n      }\n    });\n  }\n\n  private async grpcGetDownloadUrl(\n    { id, type }: ResourceInfo,\n    options?: RpcOptions,\n    signal?: AbortSignal,\n  ): Promise<DownloadAPI_GetDownloadURL_Response> {\n    const withAbort = options ?? {};\n    withAbort.abort = signal;\n\n    const client = this.wire.get();\n    if (client instanceof DownloadClient) {\n      return await client.getDownloadURL(\n        { resourceId: id, isInternalUse: false },\n        addRTypeToMetadata(type, withAbort),\n      ).response;\n    } else {\n      return (\n        await client.POST(\"/v1/get-download-url\", {\n          body: {\n            resourceId: id.toString(),\n            isInternalUse: false,\n          },\n          headers: { ...createRTypeRoutingHeader(type) },\n        })\n      ).data!;\n    }\n  }\n}\n\nexport function parseLocalUrl(url: string) {\n  const parsed = new URL(url);\n  if (parsed.pathname == \"\")\n    throw new WrongLocalFileUrl(`url for local filepath ${url} does not match url scheme`);\n\n  return {\n    storageId: parsed.host,\n    relativePath: decodeURIComponent(parsed.pathname.slice(1)),\n  };\n}\n\nexport function getFullPath(\n  storageId: string,\n  localStorageIdsToRoot: Map<string, string>,\n  relativePath: string,\n) {\n  const root = localStorageIdsToRoot.get(storageId);\n  if (root === undefined) throw new UnknownStorageError(`Unknown storage location: ${storageId}`);\n\n  if (root === \"\") return relativePath;\n\n  return path.join(root, relativePath);\n}\n\nconst storageProtocol = \"storage://\";\nfunction isLocal(url: string) {\n  return url.startsWith(storageProtocol);\n}\n\n/** Throws when a local URL have invalid scheme. */\nexport class WrongLocalFileUrl extends Error {\n  name = \"WrongLocalFileUrl\";\n}\n\n/** Happens when a storage for a local file can't be found.  */\nexport class UnknownStorageError extends Error {\n  name = \"UnknownStorageError\";\n}\n\nexport function newLocalStorageIdsToRoot(projections: LocalStorageProjection[]) {\n  const idToRoot: Map<string, string> = new Map();\n  for (const lp of projections) {\n    // Empty string means no prefix, i.e. any file on this machine can be got from the storage.\n    if (lp.localPath !== \"\") {\n      validateAbsolute(lp.localPath);\n    }\n    idToRoot.set(lp.storageId, lp.localPath);\n  }\n\n  return idToRoot;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"download.js","names":["fs","path"],"sources":["../../src/clients/download.ts"],"sourcesContent":["/* eslint-disable n/no-unsupported-features/node-builtins */\nimport type { WireClientProvider, WireClientProviderFactory } from \"@milaboratories/pl-client\";\nimport {\n  addRTypeToMetadata,\n  stringifyWithResourceId,\n  RestAPI,\n  createRTypeRoutingHeader,\n} from \"@milaboratories/pl-client\";\nimport type { ResourceInfo } from \"@milaboratories/pl-tree\";\nimport { PerfTimer } from \"@milaboratories/helpers\";\nimport type { MiLogger } from \"@milaboratories/ts-helpers\";\nimport { ConcurrencyLimitingExecutor } from \"@milaboratories/ts-helpers\";\nimport type { RpcOptions } from \"@protobuf-ts/runtime-rpc\";\nimport * as fs from \"node:fs\";\nimport * as fsp from \"node:fs/promises\";\nimport * as path from \"node:path\";\nimport { Readable } from \"node:stream\";\nimport type { Dispatcher } from \"undici\";\nimport type { LocalStorageProjection } from \"../drivers/types\";\nimport { type ContentHandler, RemoteFileDownloader } from \"../helpers/download\";\nimport { validateAbsolute } from \"../helpers/validate\";\nimport type { DownloadAPI_GetDownloadURL_Response } from \"../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol\";\nimport { DownloadClient } from \"../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol.client\";\nimport type { DownloadApiPaths, DownloadRestClientType } from \"../proto-rest\";\nimport { type GetContentOptions } from \"@milaboratories/pl-model-common\";\n\n/** Gets URLs for downloading from pl-core, parses them and reads or downloads\n * files locally and from the web. */\nexport class ClientDownload {\n  public readonly wire: WireClientProvider<DownloadRestClientType | DownloadClient>;\n  private readonly remoteFileDownloader: RemoteFileDownloader;\n\n  /** Helps to find a storage root directory by a storage id from URL scheme. */\n  private readonly localStorageIdsToRoot: Map<string, string>;\n\n  /** Concurrency limiter for local file reads - limit to 32 parallel reads */\n  private readonly localFileReadLimiter = new ConcurrencyLimitingExecutor(32);\n\n  constructor(\n    wireClientProviderFactory: WireClientProviderFactory,\n    public readonly httpClient: Dispatcher,\n    public readonly logger: MiLogger,\n    /** Pl storages available locally */\n    localProjections: LocalStorageProjection[],\n  ) {\n    this.wire = wireClientProviderFactory.createWireClientProvider((wireConn) => {\n      if (wireConn.type === \"grpc\") {\n        return new DownloadClient(wireConn.Transport);\n      } else {\n        return RestAPI.createClient<DownloadApiPaths>({\n          hostAndPort: wireConn.Config.hostAndPort,\n          ssl: wireConn.Config.ssl,\n          dispatcher: wireConn.Dispatcher,\n          middlewares: wireConn.Middlewares,\n        });\n      }\n    });\n    this.remoteFileDownloader = new RemoteFileDownloader(httpClient);\n    this.localStorageIdsToRoot = newLocalStorageIdsToRoot(localProjections);\n  }\n\n  close() {}\n\n  /**\n   * Gets a presign URL and downloads the file.\n   * An optional range with 2 numbers from what byte and to what byte to download can be provided.\n   * @param fromBytes - from byte including this byte\n   * @param toBytes - to byte excluding this byte\n   */\n  async withBlobContent<T>(\n    info: ResourceInfo,\n    options: RpcOptions | undefined,\n    ops: GetContentOptions,\n    handler: ContentHandler<T>,\n  ): Promise<T> {\n    const { downloadUrl, headers } = await this.grpcGetDownloadUrl(info, options, ops.signal);\n\n    const remoteHeaders = Object.fromEntries(headers.map(({ name, value }) => [name, value]));\n    this.logger.info(\n      `blob ${stringifyWithResourceId(info)} download started, ` +\n        `url: ${downloadUrl}, ` +\n        `range: ${JSON.stringify(ops.range ?? null)}`,\n    );\n\n    const timer = PerfTimer.start();\n    const result = isLocal(downloadUrl)\n      ? await this.withLocalFileContent(downloadUrl, ops, handler)\n      : await this.remoteFileDownloader.withContent(downloadUrl, remoteHeaders, ops, handler);\n\n    this.logger.info(\n      `blob ${stringifyWithResourceId(info)} download finished, ` + `took: ${timer.elapsed()}`,\n    );\n    return result;\n  }\n\n  async withLocalFileContent<T>(\n    url: string,\n    ops: GetContentOptions,\n    handler: ContentHandler<T>,\n  ): Promise<T> {\n    const { storageId, relativePath } = parseLocalUrl(url);\n    const fullPath = getFullPath(storageId, this.localStorageIdsToRoot, relativePath);\n\n    return await this.localFileReadLimiter.run(async () => {\n      const readOps = {\n        start: ops.range?.from,\n        end: ops.range?.to !== undefined ? ops.range.to - 1 : undefined,\n        signal: ops.signal,\n      };\n      let stream: fs.ReadStream | undefined;\n      let handlerSuccess = false;\n\n      try {\n        const stat = await fsp.stat(fullPath);\n        stream = fs.createReadStream(fullPath, readOps);\n        const webStream = Readable.toWeb(stream);\n\n        const result = await handler(webStream, stat.size);\n        handlerSuccess = true;\n        return result;\n      } catch (error) {\n        // Cleanup on error (including handler errors)\n        if (!handlerSuccess && stream && !stream.destroyed) {\n          stream.destroy();\n        }\n        throw error;\n      }\n    });\n  }\n\n  private async grpcGetDownloadUrl(\n    { id, type }: ResourceInfo,\n    options?: RpcOptions,\n    signal?: AbortSignal,\n  ): Promise<DownloadAPI_GetDownloadURL_Response> {\n    const withAbort = options ?? {};\n    withAbort.abort = signal;\n\n    const client = this.wire.get();\n    if (client instanceof DownloadClient) {\n      return await client.getDownloadURL(\n        { resourceId: id, isInternalUse: false },\n        addRTypeToMetadata(type, withAbort),\n      ).response;\n    } else {\n      return (\n        await client.POST(\"/v1/get-download-url\", {\n          body: {\n            resourceId: id.toString(),\n            isInternalUse: false,\n          },\n          headers: { ...createRTypeRoutingHeader(type) },\n        })\n      ).data!;\n    }\n  }\n}\n\nexport function parseLocalUrl(url: string) {\n  const parsed = new URL(url);\n  if (parsed.pathname == \"\")\n    throw new WrongLocalFileUrl(`url for local filepath ${url} does not match url scheme`);\n\n  return {\n    storageId: parsed.host,\n    relativePath: decodeURIComponent(parsed.pathname.slice(1)),\n  };\n}\n\nexport function getFullPath(\n  storageId: string,\n  localStorageIdsToRoot: Map<string, string>,\n  relativePath: string,\n) {\n  const root = localStorageIdsToRoot.get(storageId);\n  if (root === undefined) throw new UnknownStorageError(`Unknown storage location: ${storageId}`);\n\n  if (root === \"\") return relativePath;\n\n  return path.join(root, relativePath);\n}\n\nconst storageProtocol = \"storage://\";\nfunction isLocal(url: string) {\n  return url.startsWith(storageProtocol);\n}\n\n/** Throws when a local URL have invalid scheme. */\nexport class WrongLocalFileUrl extends Error {\n  name = \"WrongLocalFileUrl\";\n}\n\n/** Happens when a storage for a local file can't be found.  */\nexport class UnknownStorageError extends Error {\n  name = \"UnknownStorageError\";\n}\n\nexport function newLocalStorageIdsToRoot(projections: LocalStorageProjection[]) {\n  const idToRoot: Map<string, string> = new Map();\n  for (const lp of projections) {\n    // Empty string means no prefix, i.e. any file on this machine can be got from the storage.\n    if (lp.localPath !== \"\") {\n      validateAbsolute(lp.localPath);\n    }\n    idToRoot.set(lp.storageId, lp.localPath);\n  }\n\n  return idToRoot;\n}\n"],"mappings":"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"}

package/dist/clients/logs.cjs

@@ -1,85 +1,81 @@
-'use strict';
+const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
+const require_protocol_client = require('../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.client.cjs');
+let _milaboratories_pl_client = require("@milaboratories/pl-client");
+let _milaboratories_ts_helpers = require("@milaboratories/ts-helpers");
 
-var tsHelpers = require('@milaboratories/ts-helpers');
-var plClient = require('@milaboratories/pl-client');
-var protocol_client = require('../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.client.cjs');
-
-class ClientLogs {
-    httpClient;
-    logger;
-    wire;
-    constructor(wireClientProviderFactory, httpClient, logger) {
-        this.httpClient = httpClient;
-        this.logger = logger;
-        this.wire = wireClientProviderFactory.createWireClientProvider((wire) => {
-            if (wire.type === "grpc") {
-                return new protocol_client.StreamingClient(wire.Transport);
-            }
-            return plClient.RestAPI.createClient({
-                hostAndPort: wire.Config.hostAndPort,
-                ssl: wire.Config.ssl,
-                dispatcher: wire.Dispatcher,
-                middlewares: wire.Middlewares,
-            });
-        });
-    }
-    close() { }
-    /** Reads text back and returns the text,
-     * the new offset
-     * and the total size of the (currently existing) file. */
-    async lastLines({ id: rId, type: rType }, lineCount, offsetBytes = 0n, // if 0n, then start from the end.
-    searchStr, options) {
-        const client = this.wire.get();
-        if (client instanceof protocol_client.StreamingClient) {
-            return (await client.lastLines({ resourceId: rId, lineCount: lineCount, offset: offsetBytes, search: searchStr }, plClient.addRTypeToMetadata(rType, options))).response;
-        }
-        const resp = (await client.POST("/v1/last-lines", {
-            body: {
-                resourceId: rId.toString(),
-                lineCount: lineCount,
-                offset: offsetBytes.toString(),
-                search: searchStr ?? "",
-                searchRe: "",
-            },
-            headers: { ...plClient.createRTypeRoutingHeader(rType) },
-        })).data;
-        return {
-            data: Buffer.from(resp.data, "base64"),
-            size: BigInt(resp.size),
-            newOffset: BigInt(resp.newOffset),
-        };
-    }
-    /** Reads the file forward and returns the text,
-     * the new offset
-     * and the total size of the (currently existing) file. */
-    async readText({ id: rId, type: rType }, lineCount, offsetBytes = 0n, // if 0n, then start from the beginning.
-    searchStr, options) {
-        const client = this.wire.get();
-        if (client instanceof protocol_client.StreamingClient) {
-            return (await client.readText({
-                resourceId: tsHelpers.notEmpty(rId),
-                readLimit: BigInt(lineCount),
-                offset: offsetBytes,
-                search: searchStr,
-            }, plClient.addRTypeToMetadata(rType, options))).response;
-        }
-        const resp = (await client.POST("/v1/read/text", {
-            body: {
-                resourceId: rId.toString(),
-                readLimit: lineCount.toString(),
-                offset: offsetBytes.toString(),
-                search: searchStr ?? "",
-                searchRe: "",
-            },
-            headers: { ...plClient.createRTypeRoutingHeader(rType) },
-        })).data;
-        return {
-            data: Buffer.from(resp.data, "base64"),
-            size: BigInt(resp.size),
-            newOffset: BigInt(resp.newOffset),
-        };
-    }
-}
+//#region src/clients/logs.ts
+var ClientLogs = class {
+	wire;
+	constructor(wireClientProviderFactory, httpClient, logger) {
+		this.httpClient = httpClient;
+		this.logger = logger;
+		this.wire = wireClientProviderFactory.createWireClientProvider((wire) => {
+			if (wire.type === "grpc") return new require_protocol_client.StreamingClient(wire.Transport);
+			return _milaboratories_pl_client.RestAPI.createClient({
+				hostAndPort: wire.Config.hostAndPort,
+				ssl: wire.Config.ssl,
+				dispatcher: wire.Dispatcher,
+				middlewares: wire.Middlewares
+			});
+		});
+	}
+	close() {}
+	/** Reads text back and returns the text,
+	* the new offset
+	* and the total size of the (currently existing) file. */
+	async lastLines({ id: rId, type: rType }, lineCount, offsetBytes = 0n, searchStr, options) {
+		const client = this.wire.get();
+		if (client instanceof require_protocol_client.StreamingClient) return (await client.lastLines({
+			resourceId: rId,
+			lineCount,
+			offset: offsetBytes,
+			search: searchStr
+		}, (0, _milaboratories_pl_client.addRTypeToMetadata)(rType, options))).response;
+		const resp = (await client.POST("/v1/last-lines", {
+			body: {
+				resourceId: rId.toString(),
+				lineCount,
+				offset: offsetBytes.toString(),
+				search: searchStr ?? "",
+				searchRe: ""
+			},
+			headers: { ...(0, _milaboratories_pl_client.createRTypeRoutingHeader)(rType) }
+		})).data;
+		return {
+			data: Buffer.from(resp.data, "base64"),
+			size: BigInt(resp.size),
+			newOffset: BigInt(resp.newOffset)
+		};
+	}
+	/** Reads the file forward and returns the text,
+	* the new offset
+	* and the total size of the (currently existing) file. */
+	async readText({ id: rId, type: rType }, lineCount, offsetBytes = 0n, searchStr, options) {
+		const client = this.wire.get();
+		if (client instanceof require_protocol_client.StreamingClient) return (await client.readText({
+			resourceId: (0, _milaboratories_ts_helpers.notEmpty)(rId),
+			readLimit: BigInt(lineCount),
+			offset: offsetBytes,
+			search: searchStr
+		}, (0, _milaboratories_pl_client.addRTypeToMetadata)(rType, options))).response;
+		const resp = (await client.POST("/v1/read/text", {
+			body: {
+				resourceId: rId.toString(),
+				readLimit: lineCount.toString(),
+				offset: offsetBytes.toString(),
+				search: searchStr ?? "",
+				searchRe: ""
+			},
+			headers: { ...(0, _milaboratories_pl_client.createRTypeRoutingHeader)(rType) }
+		})).data;
+		return {
+			data: Buffer.from(resp.data, "base64"),
+			size: BigInt(resp.size),
+			newOffset: BigInt(resp.newOffset)
+		};
+	}
+};
 
+//#endregion
 exports.ClientLogs = ClientLogs;
-//# sourceMappingURL=logs.cjs.map
+//# sourceMappingURL=logs.cjs.map

package/dist/clients/logs.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"logs.cjs","sources":["../../src/clients/logs.ts"],"sourcesContent":["import type { RpcOptions } from \"@protobuf-ts/runtime-rpc\";\nimport type { MiLogger } from \"@milaboratories/ts-helpers\";\nimport { notEmpty } from \"@milaboratories/ts-helpers\";\nimport type { Dispatcher } from \"undici\";\nimport type { WireClientProvider, WireClientProviderFactory } from \"@milaboratories/pl-client\";\nimport { addRTypeToMetadata, createRTypeRoutingHeader, RestAPI } from \"@milaboratories/pl-client\";\nimport type { StreamingAPI_Response } from \"../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol\";\nimport { StreamingClient } from \"../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.client\";\nimport type { StreamingApiPaths, StreamingRestClientType } from \"../proto-rest\";\nimport type { ResourceInfo } from \"@milaboratories/pl-tree\";\n\nexport class ClientLogs {\n  public readonly wire: WireClientProvider<StreamingRestClientType | StreamingClient>;\n\n  constructor(\n    wireClientProviderFactory: WireClientProviderFactory,\n    public readonly httpClient: Dispatcher,\n    public readonly logger: MiLogger,\n  ) {\n    this.wire = wireClientProviderFactory.createWireClientProvider((wire) => {\n      if (wire.type === \"grpc\") {\n        return new StreamingClient(wire.Transport);\n      }\n\n      return RestAPI.createClient<StreamingApiPaths>({\n        hostAndPort: wire.Config.hostAndPort,\n        ssl: wire.Config.ssl,\n        dispatcher: wire.Dispatcher,\n        middlewares: wire.Middlewares,\n      });\n    });\n  }\n\n  close() {}\n\n  /** Reads text back and returns the text,\n   * the new offset\n   * and the total size of the (currently existing) file. */\n  public async lastLines(\n    { id: rId, type: rType }: ResourceInfo,\n    lineCount: number,\n    offsetBytes: bigint = 0n, // if 0n, then start from the end.\n    searchStr?: string,\n    options?: RpcOptions,\n  ): Promise<StreamingAPI_Response> {\n    const client = this.wire.get();\n    if (client instanceof StreamingClient) {\n      return (\n        await client.lastLines(\n          { resourceId: rId, lineCount: lineCount, offset: offsetBytes, search: searchStr },\n          addRTypeToMetadata(rType, options),\n        )\n      ).response;\n    }\n\n    const resp = (\n      await client.POST(\"/v1/last-lines\", {\n        body: {\n          resourceId: rId.toString(),\n          lineCount: lineCount,\n          offset: offsetBytes.toString(),\n          search: searchStr ?? \"\",\n          searchRe: \"\",\n        },\n        headers: { ...createRTypeRoutingHeader(rType) },\n      })\n    ).data!;\n\n    return {\n      data: Buffer.from(resp.data, \"base64\"),\n      size: BigInt(resp.size),\n      newOffset: BigInt(resp.newOffset),\n    };\n  }\n\n  /** Reads the file forward and returns the text,\n   * the new offset\n   * and the total size of the (currently existing) file. */\n  public async readText(\n    { id: rId, type: rType }: ResourceInfo,\n    lineCount: number,\n    offsetBytes: bigint = 0n, // if 0n, then start from the beginning.\n    searchStr?: string,\n    options?: RpcOptions,\n  ): Promise<StreamingAPI_Response> {\n    const client = this.wire.get();\n\n    if (client instanceof StreamingClient) {\n      return (\n        await client.readText(\n          {\n            resourceId: notEmpty(rId),\n            readLimit: BigInt(lineCount),\n            offset: offsetBytes,\n            search: searchStr,\n          },\n          addRTypeToMetadata(rType, options),\n        )\n      ).response;\n    }\n\n    const resp = (\n      await client.POST(\"/v1/read/text\", {\n        body: {\n          resourceId: rId.toString(),\n          readLimit: lineCount.toString(),\n          offset: offsetBytes.toString(),\n          search: searchStr ?? \"\",\n          searchRe: \"\",\n        },\n        headers: { ...createRTypeRoutingHeader(rType) },\n      })\n    ).data!;\n\n    return {\n      data: Buffer.from(resp.data, \"base64\"),\n      size: BigInt(resp.size),\n      newOffset: BigInt(resp.newOffset),\n    };\n  }\n}\n"],"names":["StreamingClient","RestAPI","addRTypeToMetadata","createRTypeRoutingHeader","notEmpty"],"mappings":"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"}
+{"version":3,"file":"logs.cjs","names":["StreamingClient","RestAPI"],"sources":["../../src/clients/logs.ts"],"sourcesContent":["import type { RpcOptions } from \"@protobuf-ts/runtime-rpc\";\nimport type { MiLogger } from \"@milaboratories/ts-helpers\";\nimport { notEmpty } from \"@milaboratories/ts-helpers\";\nimport type { Dispatcher } from \"undici\";\nimport type { WireClientProvider, WireClientProviderFactory } from \"@milaboratories/pl-client\";\nimport { addRTypeToMetadata, createRTypeRoutingHeader, RestAPI } from \"@milaboratories/pl-client\";\nimport type { StreamingAPI_Response } from \"../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol\";\nimport { StreamingClient } from \"../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.client\";\nimport type { StreamingApiPaths, StreamingRestClientType } from \"../proto-rest\";\nimport type { ResourceInfo } from \"@milaboratories/pl-tree\";\n\nexport class ClientLogs {\n  public readonly wire: WireClientProvider<StreamingRestClientType | StreamingClient>;\n\n  constructor(\n    wireClientProviderFactory: WireClientProviderFactory,\n    public readonly httpClient: Dispatcher,\n    public readonly logger: MiLogger,\n  ) {\n    this.wire = wireClientProviderFactory.createWireClientProvider((wire) => {\n      if (wire.type === \"grpc\") {\n        return new StreamingClient(wire.Transport);\n      }\n\n      return RestAPI.createClient<StreamingApiPaths>({\n        hostAndPort: wire.Config.hostAndPort,\n        ssl: wire.Config.ssl,\n        dispatcher: wire.Dispatcher,\n        middlewares: wire.Middlewares,\n      });\n    });\n  }\n\n  close() {}\n\n  /** Reads text back and returns the text,\n   * the new offset\n   * and the total size of the (currently existing) file. */\n  public async lastLines(\n    { id: rId, type: rType }: ResourceInfo,\n    lineCount: number,\n    offsetBytes: bigint = 0n, // if 0n, then start from the end.\n    searchStr?: string,\n    options?: RpcOptions,\n  ): Promise<StreamingAPI_Response> {\n    const client = this.wire.get();\n    if (client instanceof StreamingClient) {\n      return (\n        await client.lastLines(\n          { resourceId: rId, lineCount: lineCount, offset: offsetBytes, search: searchStr },\n          addRTypeToMetadata(rType, options),\n        )\n      ).response;\n    }\n\n    const resp = (\n      await client.POST(\"/v1/last-lines\", {\n        body: {\n          resourceId: rId.toString(),\n          lineCount: lineCount,\n          offset: offsetBytes.toString(),\n          search: searchStr ?? \"\",\n          searchRe: \"\",\n        },\n        headers: { ...createRTypeRoutingHeader(rType) },\n      })\n    ).data!;\n\n    return {\n      data: Buffer.from(resp.data, \"base64\"),\n      size: BigInt(resp.size),\n      newOffset: BigInt(resp.newOffset),\n    };\n  }\n\n  /** Reads the file forward and returns the text,\n   * the new offset\n   * and the total size of the (currently existing) file. */\n  public async readText(\n    { id: rId, type: rType }: ResourceInfo,\n    lineCount: number,\n    offsetBytes: bigint = 0n, // if 0n, then start from the beginning.\n    searchStr?: string,\n    options?: RpcOptions,\n  ): Promise<StreamingAPI_Response> {\n    const client = this.wire.get();\n\n    if (client instanceof StreamingClient) {\n      return (\n        await client.readText(\n          {\n            resourceId: notEmpty(rId),\n            readLimit: BigInt(lineCount),\n            offset: offsetBytes,\n            search: searchStr,\n          },\n          addRTypeToMetadata(rType, options),\n        )\n      ).response;\n    }\n\n    const resp = (\n      await client.POST(\"/v1/read/text\", {\n        body: {\n          resourceId: rId.toString(),\n          readLimit: lineCount.toString(),\n          offset: offsetBytes.toString(),\n          search: searchStr ?? \"\",\n          searchRe: \"\",\n        },\n        headers: { ...createRTypeRoutingHeader(rType) },\n      })\n    ).data!;\n\n    return {\n      data: Buffer.from(resp.data, \"base64\"),\n      size: BigInt(resp.size),\n      newOffset: BigInt(resp.newOffset),\n    };\n  }\n}\n"],"mappings":";;;;;;AAWA,IAAa,aAAb,MAAwB;CACtB,AAAgB;CAEhB,YACE,2BACA,AAAgB,YAChB,AAAgB,QAChB;EAFgB;EACA;AAEhB,OAAK,OAAO,0BAA0B,0BAA0B,SAAS;AACvE,OAAI,KAAK,SAAS,OAChB,QAAO,IAAIA,wCAAgB,KAAK,UAAU;AAG5C,UAAOC,kCAAQ,aAAgC;IAC7C,aAAa,KAAK,OAAO;IACzB,KAAK,KAAK,OAAO;IACjB,YAAY,KAAK;IACjB,aAAa,KAAK;IACnB,CAAC;IACF;;CAGJ,QAAQ;;;;CAKR,MAAa,UACX,EAAE,IAAI,KAAK,MAAM,SACjB,WACA,cAAsB,IACtB,WACA,SACgC;EAChC,MAAM,SAAS,KAAK,KAAK,KAAK;AAC9B,MAAI,kBAAkBD,wCACpB,SACE,MAAM,OAAO,UACX;GAAE,YAAY;GAAgB;GAAW,QAAQ;GAAa,QAAQ;GAAW,oDAC9D,OAAO,QAAQ,CACnC,EACD;EAGJ,MAAM,QACJ,MAAM,OAAO,KAAK,kBAAkB;GAClC,MAAM;IACJ,YAAY,IAAI,UAAU;IACf;IACX,QAAQ,YAAY,UAAU;IAC9B,QAAQ,aAAa;IACrB,UAAU;IACX;GACD,SAAS,EAAE,2DAA4B,MAAM,EAAE;GAChD,CAAC,EACF;AAEF,SAAO;GACL,MAAM,OAAO,KAAK,KAAK,MAAM,SAAS;GACtC,MAAM,OAAO,KAAK,KAAK;GACvB,WAAW,OAAO,KAAK,UAAU;GAClC;;;;;CAMH,MAAa,SACX,EAAE,IAAI,KAAK,MAAM,SACjB,WACA,cAAsB,IACtB,WACA,SACgC;EAChC,MAAM,SAAS,KAAK,KAAK,KAAK;AAE9B,MAAI,kBAAkBA,wCACpB,SACE,MAAM,OAAO,SACX;GACE,qDAAqB,IAAI;GACzB,WAAW,OAAO,UAAU;GAC5B,QAAQ;GACR,QAAQ;GACT,oDACkB,OAAO,QAAQ,CACnC,EACD;EAGJ,MAAM,QACJ,MAAM,OAAO,KAAK,iBAAiB;GACjC,MAAM;IACJ,YAAY,IAAI,UAAU;IAC1B,WAAW,UAAU,UAAU;IAC/B,QAAQ,YAAY,UAAU;IAC9B,QAAQ,aAAa;IACrB,UAAU;IACX;GACD,SAAS,EAAE,2DAA4B,MAAM,EAAE;GAChD,CAAC,EACF;AAEF,SAAO;GACL,MAAM,OAAO,KAAK,KAAK,MAAM,SAAS;GACtC,MAAM,OAAO,KAAK,KAAK;GACvB,WAAW,OAAO,KAAK,UAAU;GAClC"}

package/dist/clients/logs.d.ts

@@ -1,26 +1,36 @@
-import type { RpcOptions } from "@protobuf-ts/runtime-rpc";
-import type { MiLogger } from "@milaboratories/ts-helpers";
-import type { Dispatcher } from "undici";
-import type { WireClientProvider, WireClientProviderFactory } from "@milaboratories/pl-client";
-import type { StreamingAPI_Response } from "../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol";
-import { StreamingClient } from "../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.client";
-import type { StreamingRestClientType } from "../proto-rest";
-import type { ResourceInfo } from "@milaboratories/pl-tree";
-export declare class ClientLogs {
-    readonly httpClient: Dispatcher;
-    readonly logger: MiLogger;
-    readonly wire: WireClientProvider<StreamingRestClientType | StreamingClient>;
-    constructor(wireClientProviderFactory: WireClientProviderFactory, httpClient: Dispatcher, logger: MiLogger);
-    close(): void;
-    /** Reads text back and returns the text,
-     * the new offset
-     * and the total size of the (currently existing) file. */
-    lastLines({ id: rId, type: rType }: ResourceInfo, lineCount: number, offsetBytes?: bigint, // if 0n, then start from the end.
-    searchStr?: string, options?: RpcOptions): Promise<StreamingAPI_Response>;
-    /** Reads the file forward and returns the text,
-     * the new offset
-     * and the total size of the (currently existing) file. */
-    readText({ id: rId, type: rType }: ResourceInfo, lineCount: number, offsetBytes?: bigint, // if 0n, then start from the beginning.
-    searchStr?: string, options?: RpcOptions): Promise<StreamingAPI_Response>;
+import { StreamingRestClientType } from "../proto-rest/index.js";
+import { StreamingAPI_Response } from "../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.js";
+import { StreamingClient } from "../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.client.js";
+import { WireClientProvider, WireClientProviderFactory } from "@milaboratories/pl-client";
+import { Dispatcher } from "undici";
+import { RpcOptions } from "@protobuf-ts/runtime-rpc";
+import { MiLogger } from "@milaboratories/ts-helpers";
+import { ResourceInfo } from "@milaboratories/pl-tree";
+
+//#region src/clients/logs.d.ts
+declare class ClientLogs {
+  readonly httpClient: Dispatcher;
+  readonly logger: MiLogger;
+  readonly wire: WireClientProvider<StreamingRestClientType | StreamingClient>;
+  constructor(wireClientProviderFactory: WireClientProviderFactory, httpClient: Dispatcher, logger: MiLogger);
+  close(): void;
+  /** Reads text back and returns the text,
+   * the new offset
+   * and the total size of the (currently existing) file. */
+  lastLines({
+    id: rId,
+    type: rType
+  }: ResourceInfo, lineCount: number, offsetBytes?: bigint, // if 0n, then start from the end.
+  searchStr?: string, options?: RpcOptions): Promise<StreamingAPI_Response>;
+  /** Reads the file forward and returns the text,
+   * the new offset
+   * and the total size of the (currently existing) file. */
+  readText({
+    id: rId,
+    type: rType
+  }: ResourceInfo, lineCount: number, offsetBytes?: bigint, // if 0n, then start from the beginning.
+  searchStr?: string, options?: RpcOptions): Promise<StreamingAPI_Response>;
 }
+//#endregion
+export { ClientLogs };
 //# sourceMappingURL=logs.d.ts.map