@milaboratories/pl-drivers 1.11.19 → 1.11.20

package/dist/clients/logs.js

@@ -1,15 +1,25 @@
-import { StreamingClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.client.js';
 import { notEmpty } from '@milaboratories/ts-helpers';
-import { addRTypeToMetadata } from '@milaboratories/pl-client';
+import { RestAPI, addRTypeToMetadata, createRTypeRoutingHeader } from '@milaboratories/pl-client';
+import { StreamingClient } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.client.js';
 
 class ClientLogs {
     httpClient;
     logger;
-    grpcClient;
-    constructor(grpcClientProviderFactory, httpClient, logger) {
+    wire;
+    constructor(wireClientProviderFactory, httpClient, logger) {
         this.httpClient = httpClient;
         this.logger = logger;
-        this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new StreamingClient(transport));
+        this.wire = wireClientProviderFactory.createWireClientProvider((wire) => {
+            if (wire.type === 'grpc') {
+                return new StreamingClient(wire.Transport);
+            }
+            return RestAPI.createClient({
+                hostAndPort: wire.Config.hostAndPort,
+                ssl: wire.Config.ssl,
+                dispatcher: wire.Dispatcher,
+                middlewares: wire.Middlewares,
+            });
+        });
     }
     close() { }
     /** Reads text back and returns the text,
@@ -17,24 +27,55 @@ class ClientLogs {
      * 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) {
-        return (await this.grpcClient.get().lastLines({
-            resourceId: rId,
-            lineCount: lineCount,
-            offset: offsetBytes,
-            search: searchStr,
-        }, addRTypeToMetadata(rType, options))).response;
+        const client = this.wire.get();
+        if (client instanceof StreamingClient) {
+            return (await client.lastLines({ resourceId: rId, lineCount: lineCount, offset: offsetBytes, search: searchStr }, 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: { ...createRTypeRoutingHeader(rType) },
+        })).data;
+        return {
+            data: new Uint8Array(Buffer.from(resp.data)),
+            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) {
-        return (await this.grpcClient.get().readText({
-            resourceId: notEmpty(rId),
-            readLimit: BigInt(lineCount),
-            offset: offsetBytes,
-            search: searchStr,
-        }, addRTypeToMetadata(rType, options))).response;
+        const client = this.wire.get();
+        if (client instanceof StreamingClient) {
+            return (await client.readText({
+                resourceId: notEmpty(rId),
+                readLimit: BigInt(lineCount),
+                offset: offsetBytes,
+                search: searchStr,
+            }, 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: { ...createRTypeRoutingHeader(rType) },
+        })).data;
+        return {
+            data: new Uint8Array(Buffer.from(resp.data)),
+            size: BigInt(resp.size),
+            newOffset: BigInt(resp.newOffset),
+        };
     }
 }
 

package/dist/clients/logs.js.map

@@ -1 +1 @@
-{"version":3,"file":"logs.js","sources":["../../src/clients/logs.ts"],"sourcesContent":["import { StreamingClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.client';\nimport 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 { GrpcClientProvider, GrpcClientProviderFactory } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata } from '@milaboratories/pl-client';\nimport type { StreamingAPI_Response } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol';\nimport type { ResourceInfo } from '@milaboratories/pl-tree';\n\nexport class ClientLogs {\n  public readonly grpcClient: GrpcClientProvider<StreamingClient>;\n\n  constructor(\n    grpcClientProviderFactory: GrpcClientProviderFactory,\n    public readonly httpClient: Dispatcher,\n    public readonly logger: MiLogger,\n  ) {\n    this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new StreamingClient(transport));\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    return (\n      await this.grpcClient.get().lastLines(\n        {\n          resourceId: rId,\n          lineCount: lineCount,\n          offset: offsetBytes,\n          search: searchStr,\n        },\n        addRTypeToMetadata(rType, options),\n      )\n    ).response;\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    return (\n      await this.grpcClient.get().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"],"names":[],"mappings":";;;;MAUa,UAAU,CAAA;AAKH,IAAA,UAAA;AACA,IAAA,MAAA;AALF,IAAA,UAAU;AAE1B,IAAA,WAAA,CACE,yBAAoD,EACpC,UAAsB,EACtB,MAAgB,EAAA;QADhB,IAAA,CAAA,UAAU,GAAV,UAAU;QACV,IAAA,CAAA,MAAM,GAAN,MAAM;AAEtB,QAAA,IAAI,CAAC,UAAU,GAAG,yBAAyB,CAAC,wBAAwB,CAAC,CAAC,SAAS,KAAK,IAAI,eAAe,CAAC,SAAS,CAAC,CAAC;IACrH;AAEA,IAAA,KAAK,KAAI;AAET;;AAE0D;AACnD,IAAA,MAAM,SAAS,CACpB,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAgB,EACtC,SAAiB,EACjB,WAAA,GAAsB,EAAE;AACxB,IAAA,SAAkB,EAClB,OAAoB,EAAA;QAEpB,OAAO,CACL,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,CACnC;AACE,YAAA,UAAU,EAAE,GAAG;AACf,YAAA,SAAS,EAAE,SAAS;AACpB,YAAA,MAAM,EAAE,WAAW;AACnB,YAAA,MAAM,EAAE,SAAS;SAClB,EACD,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CACnC,EACD,QAAQ;IACZ;AAEA;;AAE0D;AACnD,IAAA,MAAM,QAAQ,CACnB,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAgB,EACtC,SAAiB,EACjB,WAAA,GAAsB,EAAE;AACxB,IAAA,SAAkB,EAClB,OAAoB,EAAA;QAEpB,OAAO,CACL,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,CAClC;AACE,YAAA,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC;AACzB,YAAA,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC;AAC5B,YAAA,MAAM,EAAE,WAAW;AACnB,YAAA,MAAM,EAAE,SAAS;SAClB,EACD,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CACnC,EACD,QAAQ;IACZ;AACD;;;;"}
+{"version":3,"file":"logs.js","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(\n      (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 = (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    })).data!;\n\n    return {\n      data: new Uint8Array(Buffer.from(resp.data)),\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 (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 = (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    })).data!;\n\n    return {\n      data: new Uint8Array(Buffer.from(resp.data)),\n      size: BigInt(resp.size),\n      newOffset: BigInt(resp.newOffset),\n    };\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/clients/ls_api.cjs

@@ -1,21 +1,57 @@
 'use strict';
 
-var protocol_client = require('../proto/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol.client.cjs');
 var plClient = require('@milaboratories/pl-client');
+var protocol_client = require('../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol.client.cjs');
 
 class ClientLs {
     logger;
-    grpcClient;
-    constructor(grpcClientProviderFactory, logger) {
+    wire;
+    constructor(wireClientProviderFactory, logger) {
         this.logger = logger;
-        this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new protocol_client.LSClient(transport));
+        this.wire = wireClientProviderFactory.createWireClientProvider((wire) => {
+            if (wire.type === 'grpc') {
+                return new protocol_client.LSClient(wire.Transport);
+            }
+            return plClient.RestAPI.createClient({
+                hostAndPort: wire.Config.hostAndPort,
+                ssl: wire.Config.ssl,
+                dispatcher: wire.Dispatcher,
+                middlewares: wire.Middlewares,
+            });
+        });
     }
     close() { }
     async list(rInfo, path, options) {
-        return await this.grpcClient.get().list({
-            resourceId: rInfo.id,
-            location: path,
-        }, plClient.addRTypeToMetadata(rInfo.type, options)).response;
+        const client = this.wire.get();
+        if (client instanceof protocol_client.LSClient) {
+            return await client.list({
+                resourceId: rInfo.id,
+                location: path,
+            }, plClient.addRTypeToMetadata(rInfo.type, options)).response;
+        }
+        else {
+            const resp = (await client.POST('/v1/list', {
+                body: {
+                    resourceId: rInfo.id.toString(),
+                    location: path,
+                },
+                headers: { ...plClient.createRTypeRoutingHeader(rInfo.type) },
+            })).data;
+            const items = resp.items.map((item) => ({
+                name: item.name,
+                size: BigInt(item.size),
+                isDir: item.isDir,
+                fullName: item.fullName,
+                directory: item.directory,
+                // TODO: check we get value in a correct way here
+                lastModified: { seconds: BigInt(item.lastModified), nanos: 0 },
+                version: item.version,
+            }));
+            return {
+                items,
+                delimiter: resp.delimiter,
+            };
+        }
     }
 }
 

package/dist/clients/ls_api.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ls_api.cjs","sources":["../../src/clients/ls_api.ts"],"sourcesContent":["import type { MiLogger } from '@milaboratories/ts-helpers';\nimport type { LsAPI_List_Response } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol';\nimport { LSClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol.client';\nimport type { RpcOptions } from '@protobuf-ts/runtime-rpc';\nimport type { GrpcClientProvider, GrpcClientProviderFactory } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata } from '@milaboratories/pl-client';\nimport type { ResourceInfo } from '@milaboratories/pl-tree';\n\nexport class ClientLs {\n  private readonly grpcClient: GrpcClientProvider<LSClient>;\n\n  constructor(\n    grpcClientProviderFactory: GrpcClientProviderFactory,\n    private readonly logger: MiLogger,\n  ) {\n    this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new LSClient(transport));\n  }\n\n  close() {}\n\n  public async list(\n    rInfo: ResourceInfo,\n    path: string,\n    options?: RpcOptions,\n  ): Promise<LsAPI_List_Response> {\n    return await this.grpcClient.get().list(\n      {\n        resourceId: rInfo.id,\n        location: path,\n      },\n      addRTypeToMetadata(rInfo.type, options),\n    ).response;\n  }\n}\n"],"names":["LSClient","addRTypeToMetadata"],"mappings":";;;;;MAQa,QAAQ,CAAA;AAKA,IAAA,MAAA;AAJF,IAAA,UAAU;IAE3B,WAAA,CACE,yBAAoD,EACnC,MAAgB,EAAA;QAAhB,IAAA,CAAA,MAAM,GAAN,MAAM;AAEvB,QAAA,IAAI,CAAC,UAAU,GAAG,yBAAyB,CAAC,wBAAwB,CAAC,CAAC,SAAS,KAAK,IAAIA,wBAAQ,CAAC,SAAS,CAAC,CAAC;IAC9G;AAEA,IAAA,KAAK,KAAI;AAEF,IAAA,MAAM,IAAI,CACf,KAAmB,EACnB,IAAY,EACZ,OAAoB,EAAA;QAEpB,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CACrC;YACE,UAAU,EAAE,KAAK,CAAC,EAAE;AACpB,YAAA,QAAQ,EAAE,IAAI;SACf,EACDC,2BAAkB,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CACxC,CAAC,QAAQ;IACZ;AACD;;;;"}
+{"version":3,"file":"ls_api.cjs","sources":["../../src/clients/ls_api.ts"],"sourcesContent":["import type { MiLogger } from '@milaboratories/ts-helpers';\nimport type { RpcOptions } from '@protobuf-ts/runtime-rpc';\nimport type { WireClientProvider, WireClientProviderFactory } from '@milaboratories/pl-client';\nimport { RestAPI } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata, createRTypeRoutingHeader } from '@milaboratories/pl-client';\nimport type { LsAPI_List_Response, LsAPI_ListItem } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol';\nimport { LSClient } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol.client';\nimport type { LsApiPaths, LsRestClientType } from '../proto-rest';\n\nimport type { ResourceInfo } from '@milaboratories/pl-tree';\n\nexport class ClientLs {\n  private readonly wire: WireClientProvider<LsRestClientType | LSClient>;\n\n  constructor(\n    wireClientProviderFactory: WireClientProviderFactory,\n    private readonly logger: MiLogger,\n  ) {\n    this.wire = wireClientProviderFactory.createWireClientProvider(\n      (wire) => {\n        if (wire.type === 'grpc') {\n          return new LSClient(wire.Transport);\n        }\n\n        return RestAPI.createClient<LsApiPaths>({\n          hostAndPort: wire.Config.hostAndPort,\n          ssl: wire.Config.ssl,\n          dispatcher: wire.Dispatcher,\n          middlewares: wire.Middlewares,\n        });\n      },\n    );\n  }\n\n  close() {}\n\n  public async list(\n    rInfo: ResourceInfo,\n    path: string,\n    options?: RpcOptions,\n  ): Promise<LsAPI_List_Response> {\n    const client = this.wire.get();\n\n    if (client instanceof LSClient) {\n      return await client.list(\n        {\n          resourceId: rInfo.id,\n          location: path,\n        },\n        addRTypeToMetadata(rInfo.type, options),\n      ).response;\n    } else {\n      const resp = (await client.POST('/v1/list', {\n        body: {\n          resourceId: rInfo.id.toString(),\n          location: path,\n        },\n        headers: { ...createRTypeRoutingHeader(rInfo.type) },\n      })).data!;\n\n      const items: LsAPI_ListItem[] = resp.items.map((item) => ({\n        name: item.name,\n        size: BigInt(item.size),\n        isDir: item.isDir,\n        fullName: item.fullName,\n        directory: item.directory,\n        // TODO: check we get value in a correct way here\n        lastModified: { seconds: BigInt(item.lastModified), nanos: 0 },\n        version: item.version,\n      }));\n\n      return {\n        items,\n        delimiter: resp.delimiter,\n      };\n    }\n  }\n}\n"],"names":["LSClient","RestAPI","addRTypeToMetadata","createRTypeRoutingHeader"],"mappings":";;;;;MAWa,QAAQ,CAAA;AAKA,IAAA,MAAA;AAJF,IAAA,IAAI;IAErB,WAAA,CACE,yBAAoD,EACnC,MAAgB,EAAA;QAAhB,IAAA,CAAA,MAAM,GAAN,MAAM;QAEvB,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC,wBAAwB,CAC5D,CAAC,IAAI,KAAI;AACP,YAAA,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;AACxB,gBAAA,OAAO,IAAIA,wBAAQ,CAAC,IAAI,CAAC,SAAS,CAAC;YACrC;YAEA,OAAOC,gBAAO,CAAC,YAAY,CAAa;AACtC,gBAAA,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;AACpC,gBAAA,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACpB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;AAC9B,aAAA,CAAC;AACJ,QAAA,CAAC,CACF;IACH;AAEA,IAAA,KAAK,KAAI;AAEF,IAAA,MAAM,IAAI,CACf,KAAmB,EACnB,IAAY,EACZ,OAAoB,EAAA;QAEpB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;AAE9B,QAAA,IAAI,MAAM,YAAYD,wBAAQ,EAAE;AAC9B,YAAA,OAAO,MAAM,MAAM,CAAC,IAAI,CACtB;gBACE,UAAU,EAAE,KAAK,CAAC,EAAE;AACpB,gBAAA,QAAQ,EAAE,IAAI;aACf,EACDE,2BAAkB,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CACxC,CAAC,QAAQ;QACZ;aAAO;YACL,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE;AAC1C,gBAAA,IAAI,EAAE;AACJ,oBAAA,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE;AAC/B,oBAAA,QAAQ,EAAE,IAAI;AACf,iBAAA;gBACD,OAAO,EAAE,EAAE,GAAGC,iCAAwB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;aACrD,CAAC,EAAE,IAAK;AAET,YAAA,MAAM,KAAK,GAAqB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM;gBACxD,IAAI,EAAE,IAAI,CAAC,IAAI;AACf,gBAAA,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gBACvB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,SAAS,EAAE,IAAI,CAAC,SAAS;;AAEzB,gBAAA,YAAY,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;gBAC9D,OAAO,EAAE,IAAI,CAAC,OAAO;AACtB,aAAA,CAAC,CAAC;YAEH,OAAO;gBACL,KAAK;gBACL,SAAS,EAAE,IAAI,CAAC,SAAS;aAC1B;QACH;IACF;AACD;;;;"}

package/dist/clients/ls_api.d.ts

@@ -1,12 +1,12 @@
 import type { MiLogger } from '@milaboratories/ts-helpers';
-import type { LsAPI_List_Response } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol';
 import type { RpcOptions } from '@protobuf-ts/runtime-rpc';
-import type { GrpcClientProviderFactory } from '@milaboratories/pl-client';
+import type { WireClientProviderFactory } from '@milaboratories/pl-client';
+import type { LsAPI_List_Response } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol';
 import type { ResourceInfo } from '@milaboratories/pl-tree';
 export declare class ClientLs {
     private readonly logger;
-    private readonly grpcClient;
-    constructor(grpcClientProviderFactory: GrpcClientProviderFactory, logger: MiLogger);
+    private readonly wire;
+    constructor(wireClientProviderFactory: WireClientProviderFactory, logger: MiLogger);
     close(): void;
     list(rInfo: ResourceInfo, path: string, options?: RpcOptions): Promise<LsAPI_List_Response>;
 }

package/dist/clients/ls_api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ls_api.d.ts","sourceRoot":"","sources":["../../src/clients/ls_api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4EAA4E,CAAC;AAEtH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAsB,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAE/F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,qBAAa,QAAQ;IAKjB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJzB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA+B;gBAGxD,yBAAyB,EAAE,yBAAyB,EACnC,MAAM,EAAE,QAAQ;IAKnC,KAAK;IAEQ,IAAI,CACf,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,mBAAmB,CAAC;CAShC"}
+{"version":3,"file":"ls_api.d.ts","sourceRoot":"","sources":["../../src/clients/ls_api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAsB,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAG/F,OAAO,KAAK,EAAE,mBAAmB,EAAkB,MAAM,iFAAiF,CAAC;AAI3I,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,qBAAa,QAAQ;IAKjB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAkD;gBAGrE,yBAAyB,EAAE,yBAAyB,EACnC,MAAM,EAAE,QAAQ;IAkBnC,KAAK;IAEQ,IAAI,CACf,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,mBAAmB,CAAC;CAqChC"}

package/dist/clients/ls_api.js

@@ -1,19 +1,55 @@
-import { LSClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol.client.js';
-import { addRTypeToMetadata } from '@milaboratories/pl-client';
+import { RestAPI, addRTypeToMetadata, createRTypeRoutingHeader } from '@milaboratories/pl-client';
+import { LSClient } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol.client.js';
 
 class ClientLs {
     logger;
-    grpcClient;
-    constructor(grpcClientProviderFactory, logger) {
+    wire;
+    constructor(wireClientProviderFactory, logger) {
         this.logger = logger;
-        this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new LSClient(transport));
+        this.wire = wireClientProviderFactory.createWireClientProvider((wire) => {
+            if (wire.type === 'grpc') {
+                return new LSClient(wire.Transport);
+            }
+            return RestAPI.createClient({
+                hostAndPort: wire.Config.hostAndPort,
+                ssl: wire.Config.ssl,
+                dispatcher: wire.Dispatcher,
+                middlewares: wire.Middlewares,
+            });
+        });
     }
     close() { }
     async list(rInfo, path, options) {
-        return await this.grpcClient.get().list({
-            resourceId: rInfo.id,
-            location: path,
-        }, addRTypeToMetadata(rInfo.type, options)).response;
+        const client = this.wire.get();
+        if (client instanceof LSClient) {
+            return await client.list({
+                resourceId: rInfo.id,
+                location: path,
+            }, addRTypeToMetadata(rInfo.type, options)).response;
+        }
+        else {
+            const resp = (await client.POST('/v1/list', {
+                body: {
+                    resourceId: rInfo.id.toString(),
+                    location: path,
+                },
+                headers: { ...createRTypeRoutingHeader(rInfo.type) },
+            })).data;
+            const items = resp.items.map((item) => ({
+                name: item.name,
+                size: BigInt(item.size),
+                isDir: item.isDir,
+                fullName: item.fullName,
+                directory: item.directory,
+                // TODO: check we get value in a correct way here
+                lastModified: { seconds: BigInt(item.lastModified), nanos: 0 },
+                version: item.version,
+            }));
+            return {
+                items,
+                delimiter: resp.delimiter,
+            };
+        }
     }
 }
 

package/dist/clients/ls_api.js.map

@@ -1 +1 @@
-{"version":3,"file":"ls_api.js","sources":["../../src/clients/ls_api.ts"],"sourcesContent":["import type { MiLogger } from '@milaboratories/ts-helpers';\nimport type { LsAPI_List_Response } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol';\nimport { LSClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol.client';\nimport type { RpcOptions } from '@protobuf-ts/runtime-rpc';\nimport type { GrpcClientProvider, GrpcClientProviderFactory } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata } from '@milaboratories/pl-client';\nimport type { ResourceInfo } from '@milaboratories/pl-tree';\n\nexport class ClientLs {\n  private readonly grpcClient: GrpcClientProvider<LSClient>;\n\n  constructor(\n    grpcClientProviderFactory: GrpcClientProviderFactory,\n    private readonly logger: MiLogger,\n  ) {\n    this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new LSClient(transport));\n  }\n\n  close() {}\n\n  public async list(\n    rInfo: ResourceInfo,\n    path: string,\n    options?: RpcOptions,\n  ): Promise<LsAPI_List_Response> {\n    return await this.grpcClient.get().list(\n      {\n        resourceId: rInfo.id,\n        location: path,\n      },\n      addRTypeToMetadata(rInfo.type, options),\n    ).response;\n  }\n}\n"],"names":[],"mappings":";;;MAQa,QAAQ,CAAA;AAKA,IAAA,MAAA;AAJF,IAAA,UAAU;IAE3B,WAAA,CACE,yBAAoD,EACnC,MAAgB,EAAA;QAAhB,IAAA,CAAA,MAAM,GAAN,MAAM;AAEvB,QAAA,IAAI,CAAC,UAAU,GAAG,yBAAyB,CAAC,wBAAwB,CAAC,CAAC,SAAS,KAAK,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC9G;AAEA,IAAA,KAAK,KAAI;AAEF,IAAA,MAAM,IAAI,CACf,KAAmB,EACnB,IAAY,EACZ,OAAoB,EAAA;QAEpB,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CACrC;YACE,UAAU,EAAE,KAAK,CAAC,EAAE;AACpB,YAAA,QAAQ,EAAE,IAAI;SACf,EACD,kBAAkB,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CACxC,CAAC,QAAQ;IACZ;AACD;;;;"}
+{"version":3,"file":"ls_api.js","sources":["../../src/clients/ls_api.ts"],"sourcesContent":["import type { MiLogger } from '@milaboratories/ts-helpers';\nimport type { RpcOptions } from '@protobuf-ts/runtime-rpc';\nimport type { WireClientProvider, WireClientProviderFactory } from '@milaboratories/pl-client';\nimport { RestAPI } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata, createRTypeRoutingHeader } from '@milaboratories/pl-client';\nimport type { LsAPI_List_Response, LsAPI_ListItem } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol';\nimport { LSClient } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/lsapi/protocol.client';\nimport type { LsApiPaths, LsRestClientType } from '../proto-rest';\n\nimport type { ResourceInfo } from '@milaboratories/pl-tree';\n\nexport class ClientLs {\n  private readonly wire: WireClientProvider<LsRestClientType | LSClient>;\n\n  constructor(\n    wireClientProviderFactory: WireClientProviderFactory,\n    private readonly logger: MiLogger,\n  ) {\n    this.wire = wireClientProviderFactory.createWireClientProvider(\n      (wire) => {\n        if (wire.type === 'grpc') {\n          return new LSClient(wire.Transport);\n        }\n\n        return RestAPI.createClient<LsApiPaths>({\n          hostAndPort: wire.Config.hostAndPort,\n          ssl: wire.Config.ssl,\n          dispatcher: wire.Dispatcher,\n          middlewares: wire.Middlewares,\n        });\n      },\n    );\n  }\n\n  close() {}\n\n  public async list(\n    rInfo: ResourceInfo,\n    path: string,\n    options?: RpcOptions,\n  ): Promise<LsAPI_List_Response> {\n    const client = this.wire.get();\n\n    if (client instanceof LSClient) {\n      return await client.list(\n        {\n          resourceId: rInfo.id,\n          location: path,\n        },\n        addRTypeToMetadata(rInfo.type, options),\n      ).response;\n    } else {\n      const resp = (await client.POST('/v1/list', {\n        body: {\n          resourceId: rInfo.id.toString(),\n          location: path,\n        },\n        headers: { ...createRTypeRoutingHeader(rInfo.type) },\n      })).data!;\n\n      const items: LsAPI_ListItem[] = resp.items.map((item) => ({\n        name: item.name,\n        size: BigInt(item.size),\n        isDir: item.isDir,\n        fullName: item.fullName,\n        directory: item.directory,\n        // TODO: check we get value in a correct way here\n        lastModified: { seconds: BigInt(item.lastModified), nanos: 0 },\n        version: item.version,\n      }));\n\n      return {\n        items,\n        delimiter: resp.delimiter,\n      };\n    }\n  }\n}\n"],"names":[],"mappings":";;;MAWa,QAAQ,CAAA;AAKA,IAAA,MAAA;AAJF,IAAA,IAAI;IAErB,WAAA,CACE,yBAAoD,EACnC,MAAgB,EAAA;QAAhB,IAAA,CAAA,MAAM,GAAN,MAAM;QAEvB,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC,wBAAwB,CAC5D,CAAC,IAAI,KAAI;AACP,YAAA,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;AACxB,gBAAA,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC;YACrC;YAEA,OAAO,OAAO,CAAC,YAAY,CAAa;AACtC,gBAAA,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;AACpC,gBAAA,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACpB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;AAC9B,aAAA,CAAC;AACJ,QAAA,CAAC,CACF;IACH;AAEA,IAAA,KAAK,KAAI;AAEF,IAAA,MAAM,IAAI,CACf,KAAmB,EACnB,IAAY,EACZ,OAAoB,EAAA;QAEpB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;AAE9B,QAAA,IAAI,MAAM,YAAY,QAAQ,EAAE;AAC9B,YAAA,OAAO,MAAM,MAAM,CAAC,IAAI,CACtB;gBACE,UAAU,EAAE,KAAK,CAAC,EAAE;AACpB,gBAAA,QAAQ,EAAE,IAAI;aACf,EACD,kBAAkB,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CACxC,CAAC,QAAQ;QACZ;aAAO;YACL,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE;AAC1C,gBAAA,IAAI,EAAE;AACJ,oBAAA,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE;AAC/B,oBAAA,QAAQ,EAAE,IAAI;AACf,iBAAA;gBACD,OAAO,EAAE,EAAE,GAAG,wBAAwB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;aACrD,CAAC,EAAE,IAAK;AAET,YAAA,MAAM,KAAK,GAAqB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM;gBACxD,IAAI,EAAE,IAAI,CAAC,IAAI;AACf,gBAAA,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gBACvB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,SAAS,EAAE,IAAI,CAAC,SAAS;;AAEzB,gBAAA,YAAY,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;gBAC9D,OAAO,EAAE,IAAI,CAAC,OAAO;AACtB,aAAA,CAAC,CAAC;YAEH,OAAO;gBACL,KAAK;gBACL,SAAS,EAAE,IAAI,CAAC,SAAS;aAC1B;QACH;IACF;AACD;;;;"}

package/dist/clients/progress.cjs

@@ -1,9 +1,8 @@
 'use strict';
 
-var protocol_client = require('../proto/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol.client.cjs');
-var duration = require('../proto/google/protobuf/duration.cjs');
 var plClient = require('@milaboratories/pl-client');
 var tsHelpers = require('@milaboratories/ts-helpers');
+var protocol_client = require('../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol.client.cjs');
 
 // ClientProgress holds a grpc connection to the platform
 // but for Progress API service.
@@ -12,17 +11,43 @@ var tsHelpers = require('@milaboratories/ts-helpers');
 class ClientProgress {
     client;
     logger;
-    grpcClient;
-    constructor(grpcClientProviderFactory, _, client, logger) {
+    wire;
+    constructor(wireClientProviderFactory, _, client, logger) {
         this.client = client;
         this.logger = logger;
-        this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new protocol_client.ProgressClient(transport));
+        this.wire = wireClientProviderFactory.createWireClientProvider((wire) => {
+            if (wire.type === 'grpc') {
+                return new protocol_client.ProgressClient(wire.Transport);
+            }
+            return plClient.RestAPI.createClient({
+                hostAndPort: wire.Config.hostAndPort,
+                ssl: wire.Config.ssl,
+                dispatcher: wire.Dispatcher,
+                middlewares: wire.Middlewares,
+            });
+        });
     }
     close() { }
     /** getStatus gets a progress status by given rId and rType. */
     async getStatus({ id, type }, options) {
-        const status = await this.grpcClient.get().getStatus({ resourceId: id }, plClient.addRTypeToMetadata(type, options));
-        const report = tsHelpers.notEmpty(status.response.report);
+        const client = this.wire.get();
+        let report;
+        if (client instanceof protocol_client.ProgressClient) {
+            report = tsHelpers.notEmpty((await client.getStatus({ resourceId: id }, plClient.addRTypeToMetadata(type, options)).response).report);
+        }
+        else {
+            const resp = (await client.POST('/v1/get-progress', {
+                body: { resourceId: id.toString() },
+                headers: { ...plClient.createRTypeRoutingHeader(type) },
+            })).data.report;
+            report = {
+                done: resp.done,
+                progress: resp.progress,
+                bytesProcessed: BigInt(resp.bytesProcessed),
+                bytesTotal: BigInt(resp.bytesTotal),
+                name: resp.name,
+            };
+        }
         return {
             done: report.done,
             progress: report.progress,
@@ -30,28 +55,6 @@ class ClientProgress {
             bytesTotal: String(report.bytesTotal),
         };
     }
-    // realtimeStatus returns a async generator that takes statuses from
-    // GRPC stream every updateIntervalMs milliseconds.
-    async *realtimeStatus({ id, type }, updateIntervalMs = 100, options) {
-        options = plClient.addRTypeToMetadata(type, options);
-        const secs = Math.floor(updateIntervalMs / 1000);
-        const nanos = (updateIntervalMs - secs * 1000) * 1000000;
-        const updateInterval = duration.Duration.create({
-            seconds: BigInt(secs),
-            nanos: nanos,
-        });
-        try {
-            const { responses } = this.grpcClient.get().realtimeStatus({
-                resourceId: id,
-                updateInterval: updateInterval,
-            }, options);
-            yield* responses;
-        }
-        catch (e) {
-            this.logger.warn('Failed to get realtime status' + String(e));
-            throw e;
-        }
-    }
 }
 
 exports.ClientProgress = ClientProgress;

package/dist/clients/progress.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"progress.cjs","sources":["../../src/clients/progress.ts"],"sourcesContent":["import { ProgressClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol.client';\nimport type { RpcOptions } from '@protobuf-ts/runtime-rpc';\nimport { Duration } from '../proto/google/protobuf/duration';\nimport type { GrpcClientProvider, GrpcClientProviderFactory, PlClient } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata } from '@milaboratories/pl-client';\nimport type { MiLogger } from '@milaboratories/ts-helpers';\nimport { notEmpty } from '@milaboratories/ts-helpers';\nimport type { Dispatcher } from 'undici';\nimport type { ResourceInfo } from '@milaboratories/pl-tree';\n\nexport type ProgressStatus = {\n  done: boolean;\n  progress: number;\n  bytesProcessed?: string;\n  bytesTotal?: string;\n};\n\n// ClientProgress holds a grpc connection to the platform\n// but for Progress API service.\n// When blobs are transfered, one can got a status of transfering\n// using this API.\nexport class ClientProgress {\n  public readonly grpcClient: GrpcClientProvider<ProgressClient>;\n\n  constructor(\n    grpcClientProviderFactory: GrpcClientProviderFactory,\n    _: Dispatcher,\n    public readonly client: PlClient,\n    public readonly logger: MiLogger,\n  ) {\n    this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new ProgressClient(transport));\n  }\n\n  close() {}\n\n  /** getStatus gets a progress status by given rId and rType. */\n  async getStatus({ id, type }: ResourceInfo, options?: RpcOptions): Promise<ProgressStatus> {\n    const status = await this.grpcClient.get().getStatus(\n      { resourceId: id },\n      addRTypeToMetadata(type, options),\n    );\n\n    const report = notEmpty(status.response.report);\n\n    return {\n      done: report.done,\n      progress: report.progress,\n      bytesProcessed: String(report.bytesProcessed),\n      bytesTotal: String(report.bytesTotal),\n    };\n  }\n\n  // realtimeStatus returns a async generator that takes statuses from\n  // GRPC stream every updateIntervalMs milliseconds.\n  async *realtimeStatus(\n    { id, type }: ResourceInfo,\n    updateIntervalMs: number = 100,\n    options?: RpcOptions,\n  ) {\n    options = addRTypeToMetadata(type, options);\n\n    const secs = Math.floor(updateIntervalMs / 1000);\n    const nanos = (updateIntervalMs - secs * 1000) * 1000000;\n    const updateInterval = Duration.create({\n      seconds: BigInt(secs),\n      nanos: nanos,\n    });\n\n    try {\n      const { responses } = this.grpcClient.get().realtimeStatus(\n        {\n          resourceId: id,\n          updateInterval: updateInterval,\n        },\n        options,\n      );\n\n      yield * responses;\n    } catch (e) {\n      this.logger.warn('Failed to get realtime status' + String(e));\n      throw e;\n    }\n  }\n}\n"],"names":["ProgressClient","addRTypeToMetadata","notEmpty","Duration"],"mappings":";;;;;;;AAiBA;AACA;AACA;AACA;MACa,cAAc,CAAA;AAMP,IAAA,MAAA;AACA,IAAA,MAAA;AANF,IAAA,UAAU;AAE1B,IAAA,WAAA,CACE,yBAAoD,EACpD,CAAa,EACG,MAAgB,EAChB,MAAgB,EAAA;QADhB,IAAA,CAAA,MAAM,GAAN,MAAM;QACN,IAAA,CAAA,MAAM,GAAN,MAAM;AAEtB,QAAA,IAAI,CAAC,UAAU,GAAG,yBAAyB,CAAC,wBAAwB,CAAC,CAAC,SAAS,KAAK,IAAIA,8BAAc,CAAC,SAAS,CAAC,CAAC;IACpH;AAEA,IAAA,KAAK,KAAI;;IAGT,MAAM,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,EAAgB,EAAE,OAAoB,EAAA;QAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,CAClD,EAAE,UAAU,EAAE,EAAE,EAAE,EAClBC,2BAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAClC;QAED,MAAM,MAAM,GAAGC,kBAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QAE/C,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;AACzB,YAAA,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;AAC7C,YAAA,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;SACtC;IACH;;;AAIA,IAAA,OAAO,cAAc,CACnB,EAAE,EAAE,EAAE,IAAI,EAAgB,EAC1B,gBAAA,GAA2B,GAAG,EAC9B,OAAoB,EAAA;AAEpB,QAAA,OAAO,GAAGD,2BAAkB,CAAC,IAAI,EAAE,OAAO,CAAC;QAE3C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAChD,MAAM,KAAK,GAAG,CAAC,gBAAgB,GAAG,IAAI,GAAG,IAAI,IAAI,OAAO;AACxD,QAAA,MAAM,cAAc,GAAGE,iBAAQ,CAAC,MAAM,CAAC;AACrC,YAAA,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC;AACrB,YAAA,KAAK,EAAE,KAAK;AACb,SAAA,CAAC;AAEF,QAAA,IAAI;AACF,YAAA,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,cAAc,CACxD;AACE,gBAAA,UAAU,EAAE,EAAE;AACd,gBAAA,cAAc,EAAE,cAAc;aAC/B,EACD,OAAO,CACR;YAED,OAAQ,SAAS;QACnB;QAAE,OAAO,CAAC,EAAE;AACV,YAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;AAC7D,YAAA,MAAM,CAAC;QACT;IACF;AACD;;;;"}
+{"version":3,"file":"progress.cjs","sources":["../../src/clients/progress.ts"],"sourcesContent":["import type { RpcOptions } from '@protobuf-ts/runtime-rpc';\nimport type { WireClientProvider, WireClientProviderFactory, PlClient } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata, createRTypeRoutingHeader, RestAPI } from '@milaboratories/pl-client';\nimport type { MiLogger } from '@milaboratories/ts-helpers';\nimport { notEmpty } from '@milaboratories/ts-helpers';\nimport type { Dispatcher } from 'undici';\nimport { ProgressClient } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol.client';\nimport type { ProgressAPI_Report } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol';\nimport type { ProgressApiPaths, ProgressRestClientType } from '../proto-rest';\nimport type { ResourceInfo } from '@milaboratories/pl-tree';\n\nexport type ProgressStatus = {\n  done: boolean;\n  progress: number;\n  bytesProcessed?: string;\n  bytesTotal?: string;\n};\n\n// ClientProgress holds a grpc connection to the platform\n// but for Progress API service.\n// When blobs are transfered, one can got a status of transfering\n// using this API.\nexport class ClientProgress {\n  public readonly wire: WireClientProvider<ProgressRestClientType | ProgressClient>;\n\n  constructor(\n    wireClientProviderFactory: WireClientProviderFactory,\n    _: Dispatcher,\n    public readonly client: PlClient,\n    public readonly logger: MiLogger,\n  ) {\n    this.wire = wireClientProviderFactory.createWireClientProvider(\n      (wire) => {\n        if (wire.type === 'grpc') {\n          return new ProgressClient(wire.Transport);\n        }\n\n        return RestAPI.createClient<ProgressApiPaths>({\n          hostAndPort: wire.Config.hostAndPort,\n          ssl: wire.Config.ssl,\n          dispatcher: wire.Dispatcher,\n          middlewares: wire.Middlewares,\n        });\n      },\n    );\n  }\n\n  close() {}\n\n  /** getStatus gets a progress status by given rId and rType. */\n  async getStatus({ id, type }: ResourceInfo, options?: RpcOptions): Promise<ProgressStatus> {\n    const client = this.wire.get();\n\n    let report: ProgressAPI_Report;\n    if (client instanceof ProgressClient) {\n      report = notEmpty((await client.getStatus(\n        { resourceId: id },\n        addRTypeToMetadata(type, options),\n      ).response).report);\n    } else {\n      const resp = (await client.POST('/v1/get-progress', {\n        body: { resourceId: id.toString() },\n        headers: { ...createRTypeRoutingHeader(type) },\n      })).data!.report;\n      report = {\n        done: resp.done,\n        progress: resp.progress,\n        bytesProcessed: BigInt(resp.bytesProcessed),\n        bytesTotal: BigInt(resp.bytesTotal),\n        name: resp.name,\n      };\n    }\n\n    return {\n      done: report.done,\n      progress: report.progress,\n      bytesProcessed: String(report.bytesProcessed),\n      bytesTotal: String(report.bytesTotal),\n    };\n  }\n}\n"],"names":["ProgressClient","RestAPI","notEmpty","addRTypeToMetadata","createRTypeRoutingHeader"],"mappings":";;;;;;AAkBA;AACA;AACA;AACA;MACa,cAAc,CAAA;AAMP,IAAA,MAAA;AACA,IAAA,MAAA;AANF,IAAA,IAAI;AAEpB,IAAA,WAAA,CACE,yBAAoD,EACpD,CAAa,EACG,MAAgB,EAChB,MAAgB,EAAA;QADhB,IAAA,CAAA,MAAM,GAAN,MAAM;QACN,IAAA,CAAA,MAAM,GAAN,MAAM;QAEtB,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC,wBAAwB,CAC5D,CAAC,IAAI,KAAI;AACP,YAAA,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;AACxB,gBAAA,OAAO,IAAIA,8BAAc,CAAC,IAAI,CAAC,SAAS,CAAC;YAC3C;YAEA,OAAOC,gBAAO,CAAC,YAAY,CAAmB;AAC5C,gBAAA,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;AACpC,gBAAA,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACpB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;AAC9B,aAAA,CAAC;AACJ,QAAA,CAAC,CACF;IACH;AAEA,IAAA,KAAK,KAAI;;IAGT,MAAM,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,EAAgB,EAAE,OAAoB,EAAA;QAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;AAE9B,QAAA,IAAI,MAA0B;AAC9B,QAAA,IAAI,MAAM,YAAYD,8BAAc,EAAE;AACpC,YAAA,MAAM,GAAGE,kBAAQ,CAAC,CAAC,MAAM,MAAM,CAAC,SAAS,CACvC,EAAE,UAAU,EAAE,EAAE,EAAE,EAClBC,2BAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAClC,CAAC,QAAQ,EAAE,MAAM,CAAC;QACrB;aAAO;YACL,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBAClD,IAAI,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE;AACnC,gBAAA,OAAO,EAAE,EAAE,GAAGC,iCAAwB,CAAC,IAAI,CAAC,EAAE;AAC/C,aAAA,CAAC,EAAE,IAAK,CAAC,MAAM;AAChB,YAAA,MAAM,GAAG;gBACP,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;AACvB,gBAAA,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC;AAC3C,gBAAA,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;gBACnC,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB;QACH;QAEA,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;AACzB,YAAA,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;AAC7C,YAAA,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;SACtC;IACH;AACD;;;;"}

package/dist/clients/progress.d.ts

@@ -1,8 +1,9 @@
-import { ProgressClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol.client';
 import type { RpcOptions } from '@protobuf-ts/runtime-rpc';
-import type { GrpcClientProvider, GrpcClientProviderFactory, PlClient } from '@milaboratories/pl-client';
+import type { WireClientProvider, WireClientProviderFactory, PlClient } from '@milaboratories/pl-client';
 import type { MiLogger } from '@milaboratories/ts-helpers';
 import type { Dispatcher } from 'undici';
+import { ProgressClient } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol.client';
+import type { ProgressRestClientType } from '../proto-rest';
 import type { ResourceInfo } from '@milaboratories/pl-tree';
 export type ProgressStatus = {
     done: boolean;
@@ -13,11 +14,10 @@ export type ProgressStatus = {
 export declare class ClientProgress {
     readonly client: PlClient;
     readonly logger: MiLogger;
-    readonly grpcClient: GrpcClientProvider<ProgressClient>;
-    constructor(grpcClientProviderFactory: GrpcClientProviderFactory, _: Dispatcher, client: PlClient, logger: MiLogger);
+    readonly wire: WireClientProvider<ProgressRestClientType | ProgressClient>;
+    constructor(wireClientProviderFactory: WireClientProviderFactory, _: Dispatcher, client: PlClient, logger: MiLogger);
     close(): void;
     /** getStatus gets a progress status by given rId and rType. */
     getStatus({ id, type }: ResourceInfo, options?: RpcOptions): Promise<ProgressStatus>;
-    realtimeStatus({ id, type }: ResourceInfo, updateIntervalMs?: number, options?: RpcOptions): AsyncGenerator<import("../proto/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol").ProgressAPI_RealtimeStatus_Response, void, any>;
 }
 //# sourceMappingURL=progress.d.ts.map

package/dist/clients/progress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/clients/progress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yFAAyF,CAAC;AACzH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAEzG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAMF,qBAAa,cAAc;aAMP,MAAM,EAAE,QAAQ;aAChB,MAAM,EAAE,QAAQ;IANlC,SAAgB,UAAU,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;gBAG7D,yBAAyB,EAAE,yBAAyB,EACpD,CAAC,EAAE,UAAU,EACG,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,QAAQ;IAKlC,KAAK;IAEL,+DAA+D;IACzD,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBnF,cAAc,CACnB,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,YAAY,EAC1B,gBAAgB,GAAE,MAAY,EAC9B,OAAO,CAAC,EAAE,UAAU;CA0BvB"}
+{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/clients/progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAEzG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,8FAA8F,CAAC;AAE9H,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAMF,qBAAa,cAAc;aAMP,MAAM,EAAE,QAAQ;aAChB,MAAM,EAAE,QAAQ;IANlC,SAAgB,IAAI,EAAE,kBAAkB,CAAC,sBAAsB,GAAG,cAAc,CAAC,CAAC;gBAGhF,yBAAyB,EAAE,yBAAyB,EACpD,CAAC,EAAE,UAAU,EACG,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,QAAQ;IAkBlC,KAAK;IAEL,+DAA+D;IACzD,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC;CA8B3F"}

package/dist/clients/progress.js

@@ -1,7 +1,6 @@
-import { ProgressClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol.client.js';
-import { Duration } from '../proto/google/protobuf/duration.js';
-import { addRTypeToMetadata } from '@milaboratories/pl-client';
+import { RestAPI, addRTypeToMetadata, createRTypeRoutingHeader } from '@milaboratories/pl-client';
 import { notEmpty } from '@milaboratories/ts-helpers';
+import { ProgressClient } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol.client.js';
 
 // ClientProgress holds a grpc connection to the platform
 // but for Progress API service.
@@ -10,17 +9,43 @@ import { notEmpty } from '@milaboratories/ts-helpers';
 class ClientProgress {
     client;
     logger;
-    grpcClient;
-    constructor(grpcClientProviderFactory, _, client, logger) {
+    wire;
+    constructor(wireClientProviderFactory, _, client, logger) {
         this.client = client;
         this.logger = logger;
-        this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new ProgressClient(transport));
+        this.wire = wireClientProviderFactory.createWireClientProvider((wire) => {
+            if (wire.type === 'grpc') {
+                return new ProgressClient(wire.Transport);
+            }
+            return RestAPI.createClient({
+                hostAndPort: wire.Config.hostAndPort,
+                ssl: wire.Config.ssl,
+                dispatcher: wire.Dispatcher,
+                middlewares: wire.Middlewares,
+            });
+        });
     }
     close() { }
     /** getStatus gets a progress status by given rId and rType. */
     async getStatus({ id, type }, options) {
-        const status = await this.grpcClient.get().getStatus({ resourceId: id }, addRTypeToMetadata(type, options));
-        const report = notEmpty(status.response.report);
+        const client = this.wire.get();
+        let report;
+        if (client instanceof ProgressClient) {
+            report = notEmpty((await client.getStatus({ resourceId: id }, addRTypeToMetadata(type, options)).response).report);
+        }
+        else {
+            const resp = (await client.POST('/v1/get-progress', {
+                body: { resourceId: id.toString() },
+                headers: { ...createRTypeRoutingHeader(type) },
+            })).data.report;
+            report = {
+                done: resp.done,
+                progress: resp.progress,
+                bytesProcessed: BigInt(resp.bytesProcessed),
+                bytesTotal: BigInt(resp.bytesTotal),
+                name: resp.name,
+            };
+        }
         return {
             done: report.done,
             progress: report.progress,
@@ -28,28 +53,6 @@ class ClientProgress {
             bytesTotal: String(report.bytesTotal),
         };
     }
-    // realtimeStatus returns a async generator that takes statuses from
-    // GRPC stream every updateIntervalMs milliseconds.
-    async *realtimeStatus({ id, type }, updateIntervalMs = 100, options) {
-        options = addRTypeToMetadata(type, options);
-        const secs = Math.floor(updateIntervalMs / 1000);
-        const nanos = (updateIntervalMs - secs * 1000) * 1000000;
-        const updateInterval = Duration.create({
-            seconds: BigInt(secs),
-            nanos: nanos,
-        });
-        try {
-            const { responses } = this.grpcClient.get().realtimeStatus({
-                resourceId: id,
-                updateInterval: updateInterval,
-            }, options);
-            yield* responses;
-        }
-        catch (e) {
-            this.logger.warn('Failed to get realtime status' + String(e));
-            throw e;
-        }
-    }
 }
 
 export { ClientProgress };

package/dist/clients/progress.js.map

@@ -1 +1 @@
-{"version":3,"file":"progress.js","sources":["../../src/clients/progress.ts"],"sourcesContent":["import { ProgressClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol.client';\nimport type { RpcOptions } from '@protobuf-ts/runtime-rpc';\nimport { Duration } from '../proto/google/protobuf/duration';\nimport type { GrpcClientProvider, GrpcClientProviderFactory, PlClient } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata } from '@milaboratories/pl-client';\nimport type { MiLogger } from '@milaboratories/ts-helpers';\nimport { notEmpty } from '@milaboratories/ts-helpers';\nimport type { Dispatcher } from 'undici';\nimport type { ResourceInfo } from '@milaboratories/pl-tree';\n\nexport type ProgressStatus = {\n  done: boolean;\n  progress: number;\n  bytesProcessed?: string;\n  bytesTotal?: string;\n};\n\n// ClientProgress holds a grpc connection to the platform\n// but for Progress API service.\n// When blobs are transfered, one can got a status of transfering\n// using this API.\nexport class ClientProgress {\n  public readonly grpcClient: GrpcClientProvider<ProgressClient>;\n\n  constructor(\n    grpcClientProviderFactory: GrpcClientProviderFactory,\n    _: Dispatcher,\n    public readonly client: PlClient,\n    public readonly logger: MiLogger,\n  ) {\n    this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new ProgressClient(transport));\n  }\n\n  close() {}\n\n  /** getStatus gets a progress status by given rId and rType. */\n  async getStatus({ id, type }: ResourceInfo, options?: RpcOptions): Promise<ProgressStatus> {\n    const status = await this.grpcClient.get().getStatus(\n      { resourceId: id },\n      addRTypeToMetadata(type, options),\n    );\n\n    const report = notEmpty(status.response.report);\n\n    return {\n      done: report.done,\n      progress: report.progress,\n      bytesProcessed: String(report.bytesProcessed),\n      bytesTotal: String(report.bytesTotal),\n    };\n  }\n\n  // realtimeStatus returns a async generator that takes statuses from\n  // GRPC stream every updateIntervalMs milliseconds.\n  async *realtimeStatus(\n    { id, type }: ResourceInfo,\n    updateIntervalMs: number = 100,\n    options?: RpcOptions,\n  ) {\n    options = addRTypeToMetadata(type, options);\n\n    const secs = Math.floor(updateIntervalMs / 1000);\n    const nanos = (updateIntervalMs - secs * 1000) * 1000000;\n    const updateInterval = Duration.create({\n      seconds: BigInt(secs),\n      nanos: nanos,\n    });\n\n    try {\n      const { responses } = this.grpcClient.get().realtimeStatus(\n        {\n          resourceId: id,\n          updateInterval: updateInterval,\n        },\n        options,\n      );\n\n      yield * responses;\n    } catch (e) {\n      this.logger.warn('Failed to get realtime status' + String(e));\n      throw e;\n    }\n  }\n}\n"],"names":[],"mappings":";;;;;AAiBA;AACA;AACA;AACA;MACa,cAAc,CAAA;AAMP,IAAA,MAAA;AACA,IAAA,MAAA;AANF,IAAA,UAAU;AAE1B,IAAA,WAAA,CACE,yBAAoD,EACpD,CAAa,EACG,MAAgB,EAChB,MAAgB,EAAA;QADhB,IAAA,CAAA,MAAM,GAAN,MAAM;QACN,IAAA,CAAA,MAAM,GAAN,MAAM;AAEtB,QAAA,IAAI,CAAC,UAAU,GAAG,yBAAyB,CAAC,wBAAwB,CAAC,CAAC,SAAS,KAAK,IAAI,cAAc,CAAC,SAAS,CAAC,CAAC;IACpH;AAEA,IAAA,KAAK,KAAI;;IAGT,MAAM,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,EAAgB,EAAE,OAAoB,EAAA;QAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,CAClD,EAAE,UAAU,EAAE,EAAE,EAAE,EAClB,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAClC;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QAE/C,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;AACzB,YAAA,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;AAC7C,YAAA,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;SACtC;IACH;;;AAIA,IAAA,OAAO,cAAc,CACnB,EAAE,EAAE,EAAE,IAAI,EAAgB,EAC1B,gBAAA,GAA2B,GAAG,EAC9B,OAAoB,EAAA;AAEpB,QAAA,OAAO,GAAG,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC;QAE3C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAChD,MAAM,KAAK,GAAG,CAAC,gBAAgB,GAAG,IAAI,GAAG,IAAI,IAAI,OAAO;AACxD,QAAA,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC;AACrC,YAAA,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC;AACrB,YAAA,KAAK,EAAE,KAAK;AACb,SAAA,CAAC;AAEF,QAAA,IAAI;AACF,YAAA,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,cAAc,CACxD;AACE,gBAAA,UAAU,EAAE,EAAE;AACd,gBAAA,cAAc,EAAE,cAAc;aAC/B,EACD,OAAO,CACR;YAED,OAAQ,SAAS;QACnB;QAAE,OAAO,CAAC,EAAE;AACV,YAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;AAC7D,YAAA,MAAM,CAAC;QACT;IACF;AACD;;;;"}
+{"version":3,"file":"progress.js","sources":["../../src/clients/progress.ts"],"sourcesContent":["import type { RpcOptions } from '@protobuf-ts/runtime-rpc';\nimport type { WireClientProvider, WireClientProviderFactory, PlClient } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata, createRTypeRoutingHeader, RestAPI } from '@milaboratories/pl-client';\nimport type { MiLogger } from '@milaboratories/ts-helpers';\nimport { notEmpty } from '@milaboratories/ts-helpers';\nimport type { Dispatcher } from 'undici';\nimport { ProgressClient } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol.client';\nimport type { ProgressAPI_Report } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/progressapi/protocol';\nimport type { ProgressApiPaths, ProgressRestClientType } from '../proto-rest';\nimport type { ResourceInfo } from '@milaboratories/pl-tree';\n\nexport type ProgressStatus = {\n  done: boolean;\n  progress: number;\n  bytesProcessed?: string;\n  bytesTotal?: string;\n};\n\n// ClientProgress holds a grpc connection to the platform\n// but for Progress API service.\n// When blobs are transfered, one can got a status of transfering\n// using this API.\nexport class ClientProgress {\n  public readonly wire: WireClientProvider<ProgressRestClientType | ProgressClient>;\n\n  constructor(\n    wireClientProviderFactory: WireClientProviderFactory,\n    _: Dispatcher,\n    public readonly client: PlClient,\n    public readonly logger: MiLogger,\n  ) {\n    this.wire = wireClientProviderFactory.createWireClientProvider(\n      (wire) => {\n        if (wire.type === 'grpc') {\n          return new ProgressClient(wire.Transport);\n        }\n\n        return RestAPI.createClient<ProgressApiPaths>({\n          hostAndPort: wire.Config.hostAndPort,\n          ssl: wire.Config.ssl,\n          dispatcher: wire.Dispatcher,\n          middlewares: wire.Middlewares,\n        });\n      },\n    );\n  }\n\n  close() {}\n\n  /** getStatus gets a progress status by given rId and rType. */\n  async getStatus({ id, type }: ResourceInfo, options?: RpcOptions): Promise<ProgressStatus> {\n    const client = this.wire.get();\n\n    let report: ProgressAPI_Report;\n    if (client instanceof ProgressClient) {\n      report = notEmpty((await client.getStatus(\n        { resourceId: id },\n        addRTypeToMetadata(type, options),\n      ).response).report);\n    } else {\n      const resp = (await client.POST('/v1/get-progress', {\n        body: { resourceId: id.toString() },\n        headers: { ...createRTypeRoutingHeader(type) },\n      })).data!.report;\n      report = {\n        done: resp.done,\n        progress: resp.progress,\n        bytesProcessed: BigInt(resp.bytesProcessed),\n        bytesTotal: BigInt(resp.bytesTotal),\n        name: resp.name,\n      };\n    }\n\n    return {\n      done: report.done,\n      progress: report.progress,\n      bytesProcessed: String(report.bytesProcessed),\n      bytesTotal: String(report.bytesTotal),\n    };\n  }\n}\n"],"names":[],"mappings":";;;;AAkBA;AACA;AACA;AACA;MACa,cAAc,CAAA;AAMP,IAAA,MAAA;AACA,IAAA,MAAA;AANF,IAAA,IAAI;AAEpB,IAAA,WAAA,CACE,yBAAoD,EACpD,CAAa,EACG,MAAgB,EAChB,MAAgB,EAAA;QADhB,IAAA,CAAA,MAAM,GAAN,MAAM;QACN,IAAA,CAAA,MAAM,GAAN,MAAM;QAEtB,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC,wBAAwB,CAC5D,CAAC,IAAI,KAAI;AACP,YAAA,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;AACxB,gBAAA,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC;YAC3C;YAEA,OAAO,OAAO,CAAC,YAAY,CAAmB;AAC5C,gBAAA,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;AACpC,gBAAA,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACpB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;AAC9B,aAAA,CAAC;AACJ,QAAA,CAAC,CACF;IACH;AAEA,IAAA,KAAK,KAAI;;IAGT,MAAM,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,EAAgB,EAAE,OAAoB,EAAA;QAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;AAE9B,QAAA,IAAI,MAA0B;AAC9B,QAAA,IAAI,MAAM,YAAY,cAAc,EAAE;AACpC,YAAA,MAAM,GAAG,QAAQ,CAAC,CAAC,MAAM,MAAM,CAAC,SAAS,CACvC,EAAE,UAAU,EAAE,EAAE,EAAE,EAClB,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAClC,CAAC,QAAQ,EAAE,MAAM,CAAC;QACrB;aAAO;YACL,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBAClD,IAAI,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE;AACnC,gBAAA,OAAO,EAAE,EAAE,GAAG,wBAAwB,CAAC,IAAI,CAAC,EAAE;AAC/C,aAAA,CAAC,EAAE,IAAK,CAAC,MAAM;AAChB,YAAA,MAAM,GAAG;gBACP,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;AACvB,gBAAA,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC;AAC3C,gBAAA,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;gBACnC,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB;QACH;QAEA,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;AACzB,YAAA,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;AAC7C,YAAA,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;SACtC;IACH;AACD;;;;"}