@milaboratories/pl-drivers 1.11.19 → 1.11.21

package/dist/clients/constructors.cjs

@@ -9,31 +9,31 @@ var ls_api = require('./ls_api.cjs');
 function createDownloadClient(logger, client, localProjections) {
     return client.getDriver({
         name: 'DownloadBlob',
-        init: (_, grpcClientProviderFactory, httpDispatcher) => new download.ClientDownload(grpcClientProviderFactory, httpDispatcher, logger, localProjections),
+        init: (_, wireClientFactory, httpDispatcher) => new download.ClientDownload(wireClientFactory, httpDispatcher, logger, localProjections),
     });
 }
 function createLogsClient(client, logger) {
     return client.getDriver({
         name: 'StreamLogs',
-        init: (_, grpcClientProviderFactory, httpDispatcher) => new logs.ClientLogs(grpcClientProviderFactory, httpDispatcher, logger),
+        init: (_, wireClientFactory, httpDispatcher) => new logs.ClientLogs(wireClientFactory, httpDispatcher, logger),
     });
 }
 function createUploadProgressClient(client, logger) {
     return client.getDriver({
         name: 'UploadProgress',
-        init: (_, grpcClientProviderFactory, httpDispatcher) => new progress.ClientProgress(grpcClientProviderFactory, httpDispatcher, client, logger),
+        init: (_, wireClientFactory, httpDispatcher) => new progress.ClientProgress(wireClientFactory, httpDispatcher, client, logger),
     });
 }
 function createUploadBlobClient(client, logger) {
     return client.getDriver({
         name: 'UploadBlob',
-        init: (_, grpcClientProviderFactory, httpDispatcher) => new upload.ClientUpload(grpcClientProviderFactory, httpDispatcher, client, logger),
+        init: (_, wireClientFactory, httpDispatcher) => new upload.ClientUpload(wireClientFactory, httpDispatcher, client, logger),
     });
 }
 function createLsFilesClient(client, logger) {
     return client.getDriver({
         name: 'LsFiles',
-        init: (_client, grpcClientProviderFactory, _httpDispatcher) => new ls_api.ClientLs(grpcClientProviderFactory, logger),
+        init: (_client, wireClientFactory, _httpDispatcher) => new ls_api.ClientLs(wireClientFactory, logger),
     });
 }
 

package/dist/clients/constructors.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"constructors.cjs","sources":["../../src/clients/constructors.ts"],"sourcesContent":["import type { GrpcClientProviderFactory, PlClient } from '@milaboratories/pl-client';\nimport type { MiLogger } from '@milaboratories/ts-helpers';\nimport type { Dispatcher } from 'undici';\nimport { ClientDownload } from './download';\nimport { ClientLogs } from './logs';\nimport { ClientProgress } from './progress';\nimport { ClientUpload } from './upload';\nimport { ClientLs } from './ls_api';\nimport type { LocalStorageProjection } from '../drivers/types';\n\nexport function createDownloadClient(\n  logger: MiLogger,\n  client: PlClient,\n  localProjections: LocalStorageProjection[],\n) {\n  return client.getDriver({\n    name: 'DownloadBlob',\n    init: (_: PlClient, grpcClientProviderFactory: GrpcClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientDownload(grpcClientProviderFactory, httpDispatcher, logger, localProjections),\n  });\n}\n\nexport function createLogsClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'StreamLogs',\n    init: (_: PlClient, grpcClientProviderFactory: GrpcClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientLogs(grpcClientProviderFactory, httpDispatcher, logger),\n  });\n}\n\nexport function createUploadProgressClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'UploadProgress',\n    init: (_: PlClient, grpcClientProviderFactory: GrpcClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientProgress(grpcClientProviderFactory, httpDispatcher, client, logger),\n  });\n}\n\nexport function createUploadBlobClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'UploadBlob',\n    init: (_: PlClient, grpcClientProviderFactory: GrpcClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientUpload(grpcClientProviderFactory, httpDispatcher, client, logger),\n  });\n}\n\nexport function createLsFilesClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'LsFiles',\n    init: (_client: PlClient, grpcClientProviderFactory: GrpcClientProviderFactory, _httpDispatcher: Dispatcher) =>\n      new ClientLs(grpcClientProviderFactory, logger),\n  });\n}\n"],"names":["ClientDownload","ClientLogs","ClientProgress","ClientUpload","ClientLs"],"mappings":";;;;;;;;SAUgB,oBAAoB,CAClC,MAAgB,EAChB,MAAgB,EAChB,gBAA0C,EAAA;IAE1C,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,CAAC,CAAW,EAAE,yBAAoD,EAAE,cAA0B,KAClG,IAAIA,uBAAc,CAAC,yBAAyB,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB,CAAC;AAC1F,KAAA,CAAC;AACJ;AAEM,SAAU,gBAAgB,CAAC,MAAgB,EAAE,MAAgB,EAAA;IACjE,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,YAAY;AAClB,QAAA,IAAI,EAAE,CAAC,CAAW,EAAE,yBAAoD,EAAE,cAA0B,KAClG,IAAIC,eAAU,CAAC,yBAAyB,EAAE,cAAc,EAAE,MAAM,CAAC;AACpE,KAAA,CAAC;AACJ;AAEM,SAAU,0BAA0B,CAAC,MAAgB,EAAE,MAAgB,EAAA;IAC3E,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,CAAC,CAAW,EAAE,yBAAoD,EAAE,cAA0B,KAClG,IAAIC,uBAAc,CAAC,yBAAyB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC;AAChF,KAAA,CAAC;AACJ;AAEM,SAAU,sBAAsB,CAAC,MAAgB,EAAE,MAAgB,EAAA;IACvE,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,CAAC,CAAW,EAAE,yBAAoD,EAAE,cAA0B,KAClG,IAAIC,mBAAY,CAAC,yBAAyB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC;AAC9E,KAAA,CAAC;AACJ;AAEM,SAAU,mBAAmB,CAAC,MAAgB,EAAE,MAAgB,EAAA;IACpE,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,SAAS;AACf,QAAA,IAAI,EAAE,CAAC,OAAiB,EAAE,yBAAoD,EAAE,eAA2B,KACzG,IAAIC,eAAQ,CAAC,yBAAyB,EAAE,MAAM,CAAC;AAClD,KAAA,CAAC;AACJ;;;;;;;;"}
+{"version":3,"file":"constructors.cjs","sources":["../../src/clients/constructors.ts"],"sourcesContent":["import type { WireClientProviderFactory, PlClient } from '@milaboratories/pl-client';\nimport type { MiLogger } from '@milaboratories/ts-helpers';\nimport type { Dispatcher } from 'undici';\nimport { ClientDownload } from './download';\nimport { ClientLogs } from './logs';\nimport { ClientProgress } from './progress';\nimport { ClientUpload } from './upload';\nimport { ClientLs } from './ls_api';\nimport type { LocalStorageProjection } from '../drivers/types';\n\nexport function createDownloadClient(\n  logger: MiLogger,\n  client: PlClient,\n  localProjections: LocalStorageProjection[],\n) {\n  return client.getDriver({\n    name: 'DownloadBlob',\n    init: (_: PlClient, wireClientFactory: WireClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientDownload(wireClientFactory, httpDispatcher, logger, localProjections),\n  });\n}\n\nexport function createLogsClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'StreamLogs',\n    init: (_: PlClient, wireClientFactory: WireClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientLogs(wireClientFactory, httpDispatcher, logger),\n  });\n}\n\nexport function createUploadProgressClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'UploadProgress',\n    init: (_: PlClient, wireClientFactory: WireClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientProgress(wireClientFactory, httpDispatcher, client, logger),\n  });\n}\n\nexport function createUploadBlobClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'UploadBlob',\n    init: (_: PlClient, wireClientFactory: WireClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientUpload(wireClientFactory, httpDispatcher, client, logger),\n  });\n}\n\nexport function createLsFilesClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'LsFiles',\n    init: (_client: PlClient, wireClientFactory: WireClientProviderFactory, _httpDispatcher: Dispatcher) =>\n      new ClientLs(wireClientFactory, logger),\n  });\n}\n"],"names":["ClientDownload","ClientLogs","ClientProgress","ClientUpload","ClientLs"],"mappings":";;;;;;;;SAUgB,oBAAoB,CAClC,MAAgB,EAChB,MAAgB,EAChB,gBAA0C,EAAA;IAE1C,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,CAAC,CAAW,EAAE,iBAA4C,EAAE,cAA0B,KAC1F,IAAIA,uBAAc,CAAC,iBAAiB,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB,CAAC;AAClF,KAAA,CAAC;AACJ;AAEM,SAAU,gBAAgB,CAAC,MAAgB,EAAE,MAAgB,EAAA;IACjE,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,YAAY;AAClB,QAAA,IAAI,EAAE,CAAC,CAAW,EAAE,iBAA4C,EAAE,cAA0B,KAC1F,IAAIC,eAAU,CAAC,iBAAiB,EAAE,cAAc,EAAE,MAAM,CAAC;AAC5D,KAAA,CAAC;AACJ;AAEM,SAAU,0BAA0B,CAAC,MAAgB,EAAE,MAAgB,EAAA;IAC3E,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,CAAC,CAAW,EAAE,iBAA4C,EAAE,cAA0B,KAC1F,IAAIC,uBAAc,CAAC,iBAAiB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC;AACxE,KAAA,CAAC;AACJ;AAEM,SAAU,sBAAsB,CAAC,MAAgB,EAAE,MAAgB,EAAA;IACvE,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,CAAC,CAAW,EAAE,iBAA4C,EAAE,cAA0B,KAC1F,IAAIC,mBAAY,CAAC,iBAAiB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC;AACtE,KAAA,CAAC;AACJ;AAEM,SAAU,mBAAmB,CAAC,MAAgB,EAAE,MAAgB,EAAA;IACpE,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,SAAS;AACf,QAAA,IAAI,EAAE,CAAC,OAAiB,EAAE,iBAA4C,EAAE,eAA2B,KACjG,IAAIC,eAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;AAC1C,KAAA,CAAC;AACJ;;;;;;;;"}

package/dist/clients/constructors.js

@@ -7,31 +7,31 @@ import { ClientLs } from './ls_api.js';
 function createDownloadClient(logger, client, localProjections) {
     return client.getDriver({
         name: 'DownloadBlob',
-        init: (_, grpcClientProviderFactory, httpDispatcher) => new ClientDownload(grpcClientProviderFactory, httpDispatcher, logger, localProjections),
+        init: (_, wireClientFactory, httpDispatcher) => new ClientDownload(wireClientFactory, httpDispatcher, logger, localProjections),
     });
 }
 function createLogsClient(client, logger) {
     return client.getDriver({
         name: 'StreamLogs',
-        init: (_, grpcClientProviderFactory, httpDispatcher) => new ClientLogs(grpcClientProviderFactory, httpDispatcher, logger),
+        init: (_, wireClientFactory, httpDispatcher) => new ClientLogs(wireClientFactory, httpDispatcher, logger),
     });
 }
 function createUploadProgressClient(client, logger) {
     return client.getDriver({
         name: 'UploadProgress',
-        init: (_, grpcClientProviderFactory, httpDispatcher) => new ClientProgress(grpcClientProviderFactory, httpDispatcher, client, logger),
+        init: (_, wireClientFactory, httpDispatcher) => new ClientProgress(wireClientFactory, httpDispatcher, client, logger),
     });
 }
 function createUploadBlobClient(client, logger) {
     return client.getDriver({
         name: 'UploadBlob',
-        init: (_, grpcClientProviderFactory, httpDispatcher) => new ClientUpload(grpcClientProviderFactory, httpDispatcher, client, logger),
+        init: (_, wireClientFactory, httpDispatcher) => new ClientUpload(wireClientFactory, httpDispatcher, client, logger),
     });
 }
 function createLsFilesClient(client, logger) {
     return client.getDriver({
         name: 'LsFiles',
-        init: (_client, grpcClientProviderFactory, _httpDispatcher) => new ClientLs(grpcClientProviderFactory, logger),
+        init: (_client, wireClientFactory, _httpDispatcher) => new ClientLs(wireClientFactory, logger),
     });
 }
 

package/dist/clients/constructors.js.map

@@ -1 +1 @@
-{"version":3,"file":"constructors.js","sources":["../../src/clients/constructors.ts"],"sourcesContent":["import type { GrpcClientProviderFactory, PlClient } from '@milaboratories/pl-client';\nimport type { MiLogger } from '@milaboratories/ts-helpers';\nimport type { Dispatcher } from 'undici';\nimport { ClientDownload } from './download';\nimport { ClientLogs } from './logs';\nimport { ClientProgress } from './progress';\nimport { ClientUpload } from './upload';\nimport { ClientLs } from './ls_api';\nimport type { LocalStorageProjection } from '../drivers/types';\n\nexport function createDownloadClient(\n  logger: MiLogger,\n  client: PlClient,\n  localProjections: LocalStorageProjection[],\n) {\n  return client.getDriver({\n    name: 'DownloadBlob',\n    init: (_: PlClient, grpcClientProviderFactory: GrpcClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientDownload(grpcClientProviderFactory, httpDispatcher, logger, localProjections),\n  });\n}\n\nexport function createLogsClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'StreamLogs',\n    init: (_: PlClient, grpcClientProviderFactory: GrpcClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientLogs(grpcClientProviderFactory, httpDispatcher, logger),\n  });\n}\n\nexport function createUploadProgressClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'UploadProgress',\n    init: (_: PlClient, grpcClientProviderFactory: GrpcClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientProgress(grpcClientProviderFactory, httpDispatcher, client, logger),\n  });\n}\n\nexport function createUploadBlobClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'UploadBlob',\n    init: (_: PlClient, grpcClientProviderFactory: GrpcClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientUpload(grpcClientProviderFactory, httpDispatcher, client, logger),\n  });\n}\n\nexport function createLsFilesClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'LsFiles',\n    init: (_client: PlClient, grpcClientProviderFactory: GrpcClientProviderFactory, _httpDispatcher: Dispatcher) =>\n      new ClientLs(grpcClientProviderFactory, logger),\n  });\n}\n"],"names":[],"mappings":";;;;;;SAUgB,oBAAoB,CAClC,MAAgB,EAChB,MAAgB,EAChB,gBAA0C,EAAA;IAE1C,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,CAAC,CAAW,EAAE,yBAAoD,EAAE,cAA0B,KAClG,IAAI,cAAc,CAAC,yBAAyB,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB,CAAC;AAC1F,KAAA,CAAC;AACJ;AAEM,SAAU,gBAAgB,CAAC,MAAgB,EAAE,MAAgB,EAAA;IACjE,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,YAAY;AAClB,QAAA,IAAI,EAAE,CAAC,CAAW,EAAE,yBAAoD,EAAE,cAA0B,KAClG,IAAI,UAAU,CAAC,yBAAyB,EAAE,cAAc,EAAE,MAAM,CAAC;AACpE,KAAA,CAAC;AACJ;AAEM,SAAU,0BAA0B,CAAC,MAAgB,EAAE,MAAgB,EAAA;IAC3E,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,CAAC,CAAW,EAAE,yBAAoD,EAAE,cAA0B,KAClG,IAAI,cAAc,CAAC,yBAAyB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC;AAChF,KAAA,CAAC;AACJ;AAEM,SAAU,sBAAsB,CAAC,MAAgB,EAAE,MAAgB,EAAA;IACvE,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,CAAC,CAAW,EAAE,yBAAoD,EAAE,cAA0B,KAClG,IAAI,YAAY,CAAC,yBAAyB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC;AAC9E,KAAA,CAAC;AACJ;AAEM,SAAU,mBAAmB,CAAC,MAAgB,EAAE,MAAgB,EAAA;IACpE,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,SAAS;AACf,QAAA,IAAI,EAAE,CAAC,OAAiB,EAAE,yBAAoD,EAAE,eAA2B,KACzG,IAAI,QAAQ,CAAC,yBAAyB,EAAE,MAAM,CAAC;AAClD,KAAA,CAAC;AACJ;;;;"}
+{"version":3,"file":"constructors.js","sources":["../../src/clients/constructors.ts"],"sourcesContent":["import type { WireClientProviderFactory, PlClient } from '@milaboratories/pl-client';\nimport type { MiLogger } from '@milaboratories/ts-helpers';\nimport type { Dispatcher } from 'undici';\nimport { ClientDownload } from './download';\nimport { ClientLogs } from './logs';\nimport { ClientProgress } from './progress';\nimport { ClientUpload } from './upload';\nimport { ClientLs } from './ls_api';\nimport type { LocalStorageProjection } from '../drivers/types';\n\nexport function createDownloadClient(\n  logger: MiLogger,\n  client: PlClient,\n  localProjections: LocalStorageProjection[],\n) {\n  return client.getDriver({\n    name: 'DownloadBlob',\n    init: (_: PlClient, wireClientFactory: WireClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientDownload(wireClientFactory, httpDispatcher, logger, localProjections),\n  });\n}\n\nexport function createLogsClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'StreamLogs',\n    init: (_: PlClient, wireClientFactory: WireClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientLogs(wireClientFactory, httpDispatcher, logger),\n  });\n}\n\nexport function createUploadProgressClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'UploadProgress',\n    init: (_: PlClient, wireClientFactory: WireClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientProgress(wireClientFactory, httpDispatcher, client, logger),\n  });\n}\n\nexport function createUploadBlobClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'UploadBlob',\n    init: (_: PlClient, wireClientFactory: WireClientProviderFactory, httpDispatcher: Dispatcher) =>\n      new ClientUpload(wireClientFactory, httpDispatcher, client, logger),\n  });\n}\n\nexport function createLsFilesClient(client: PlClient, logger: MiLogger) {\n  return client.getDriver({\n    name: 'LsFiles',\n    init: (_client: PlClient, wireClientFactory: WireClientProviderFactory, _httpDispatcher: Dispatcher) =>\n      new ClientLs(wireClientFactory, logger),\n  });\n}\n"],"names":[],"mappings":";;;;;;SAUgB,oBAAoB,CAClC,MAAgB,EAChB,MAAgB,EAChB,gBAA0C,EAAA;IAE1C,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,CAAC,CAAW,EAAE,iBAA4C,EAAE,cAA0B,KAC1F,IAAI,cAAc,CAAC,iBAAiB,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB,CAAC;AAClF,KAAA,CAAC;AACJ;AAEM,SAAU,gBAAgB,CAAC,MAAgB,EAAE,MAAgB,EAAA;IACjE,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,YAAY;AAClB,QAAA,IAAI,EAAE,CAAC,CAAW,EAAE,iBAA4C,EAAE,cAA0B,KAC1F,IAAI,UAAU,CAAC,iBAAiB,EAAE,cAAc,EAAE,MAAM,CAAC;AAC5D,KAAA,CAAC;AACJ;AAEM,SAAU,0BAA0B,CAAC,MAAgB,EAAE,MAAgB,EAAA;IAC3E,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,CAAC,CAAW,EAAE,iBAA4C,EAAE,cAA0B,KAC1F,IAAI,cAAc,CAAC,iBAAiB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC;AACxE,KAAA,CAAC;AACJ;AAEM,SAAU,sBAAsB,CAAC,MAAgB,EAAE,MAAgB,EAAA;IACvE,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,CAAC,CAAW,EAAE,iBAA4C,EAAE,cAA0B,KAC1F,IAAI,YAAY,CAAC,iBAAiB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC;AACtE,KAAA,CAAC;AACJ;AAEM,SAAU,mBAAmB,CAAC,MAAgB,EAAE,MAAgB,EAAA;IACpE,OAAO,MAAM,CAAC,SAAS,CAAC;AACtB,QAAA,IAAI,EAAE,SAAS;AACf,QAAA,IAAI,EAAE,CAAC,OAAiB,EAAE,iBAA4C,EAAE,eAA2B,KACjG,IAAI,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;AAC1C,KAAA,CAAC;AACJ;;;;"}

package/dist/clients/download.cjs

@@ -9,7 +9,7 @@ var path = require('node:path');
 var node_stream = require('node:stream');
 var download = require('../helpers/download.cjs');
 var validate = require('../helpers/validate.cjs');
-var protocol_client = require('../proto/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol.client.cjs');
+var protocol_client = require('../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol.client.cjs');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -37,18 +37,30 @@ var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 class ClientDownload {
     httpClient;
     logger;
-    grpcClient;
+    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 tsHelpers.ConcurrencyLimitingExecutor(32);
-    constructor(grpcClientProviderFactory, httpClient, logger, 
+    constructor(wireClientProviderFactory, httpClient, logger, 
     /** Pl storages available locally */
     localProjections) {
         this.httpClient = httpClient;
         this.logger = logger;
-        this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new protocol_client.DownloadClient(transport));
+        this.wire = wireClientProviderFactory.createWireClientProvider((wireConn) => {
+            if (wireConn.type === 'grpc') {
+                return new protocol_client.DownloadClient(wireConn.Transport);
+            }
+            else {
+                return plClient.RestAPI.createClient({
+                    hostAndPort: wireConn.Config.hostAndPort,
+                    ssl: wireConn.Config.ssl,
+                    dispatcher: wireConn.Dispatcher,
+                    middlewares: wireConn.Middlewares,
+                });
+            }
+        });
         this.remoteFileDownloader = new download.RemoteFileDownloader(httpClient);
         this.localStorageIdsToRoot = newLocalStorageIdsToRoot(localProjections);
     }
@@ -104,7 +116,19 @@ class ClientDownload {
     async grpcGetDownloadUrl({ id, type }, options, signal) {
         const withAbort = options ?? {};
         withAbort.abort = signal;
-        return await this.grpcClient.get().getDownloadURL({ resourceId: id, isInternalUse: false }, plClient.addRTypeToMetadata(type, withAbort)).response;
+        const client = this.wire.get();
+        if (client instanceof protocol_client.DownloadClient) {
+            return await client.getDownloadURL({ resourceId: id, isInternalUse: false }, plClient.addRTypeToMetadata(type, withAbort)).response;
+        }
+        else {
+            return (await client.POST('/v1/get-download-url', {
+                body: {
+                    resourceId: id.toString(),
+                    isInternalUse: false,
+                },
+                headers: { ...plClient.createRTypeRoutingHeader(type) },
+            })).data;
+        }
     }
 }
 function parseLocalUrl(url) {

package/dist/clients/download.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"download.cjs","sources":["../../src/clients/download.ts"],"sourcesContent":["/* eslint-disable n/no-unsupported-features/node-builtins */\nimport type { GrpcClientProvider, GrpcClientProviderFactory } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata, stringifyWithResourceId } 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/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol';\nimport { DownloadClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol.client';\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 grpcClient: GrpcClientProvider<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    grpcClientProviderFactory: GrpcClientProviderFactory,\n    public readonly httpClient: Dispatcher,\n    public readonly logger: MiLogger,\n    /** Pl storages available locally */\n    localProjections: LocalStorageProjection[],\n  ) {\n    this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new DownloadClient(transport));\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, `\n      + `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    return await this.grpcClient.get().getDownloadURL(\n      { resourceId: id, isInternalUse: false },\n      addRTypeToMetadata(type, withAbort),\n    ).response;\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":["ConcurrencyLimitingExecutor","DownloadClient","RemoteFileDownloader","stringifyWithResourceId","PerfTimer","fsp","fs","Readable","addRTypeToMetadata","path","validateAbsolute"],"mappings":"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"}
+{"version":3,"file":"download.cjs","sources":["../../src/clients/download.ts"],"sourcesContent":["/* eslint-disable n/no-unsupported-features/node-builtins */\nimport type { WireClientProvider, WireClientProviderFactory } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata, stringifyWithResourceId, RestAPI, createRTypeRoutingHeader } 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, `\n      + `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 (await client.POST('/v1/get-download-url', {\n        body: {\n          resourceId: id.toString(),\n          isInternalUse: false,\n        },\n        headers: { ...createRTypeRoutingHeader(type) },\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":["ConcurrencyLimitingExecutor","DownloadClient","RestAPI","RemoteFileDownloader","stringifyWithResourceId","PerfTimer","fsp","fs","Readable","addRTypeToMetadata","createRTypeRoutingHeader","path","validateAbsolute"],"mappings":"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"}

package/dist/clients/download.d.ts

@@ -1,24 +1,25 @@
-import type { GrpcClientProvider, GrpcClientProviderFactory } from '@milaboratories/pl-client';
+import type { WireClientProvider, WireClientProviderFactory } from '@milaboratories/pl-client';
 import type { ResourceInfo } from '@milaboratories/pl-tree';
 import type { MiLogger } from '@milaboratories/ts-helpers';
 import type { RpcOptions } from '@protobuf-ts/runtime-rpc';
 import type { Dispatcher } from 'undici';
 import type { LocalStorageProjection } from '../drivers/types';
 import { type ContentHandler } from '../helpers/download';
-import { DownloadClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol.client';
+import { DownloadClient } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol.client';
+import type { DownloadRestClientType } from '../proto-rest';
 import { type GetContentOptions } from '@milaboratories/pl-model-common';
 /** Gets URLs for downloading from pl-core, parses them and reads or downloads
  * files locally and from the web. */
 export declare class ClientDownload {
     readonly httpClient: Dispatcher;
     readonly logger: MiLogger;
-    readonly grpcClient: GrpcClientProvider<DownloadClient>;
+    readonly wire: WireClientProvider<DownloadRestClientType | DownloadClient>;
     private readonly remoteFileDownloader;
     /** Helps to find a storage root directory by a storage id from URL scheme. */
     private readonly localStorageIdsToRoot;
     /** Concurrency limiter for local file reads - limit to 32 parallel reads */
     private readonly localFileReadLimiter;
-    constructor(grpcClientProviderFactory: GrpcClientProviderFactory, httpClient: Dispatcher, logger: MiLogger, 
+    constructor(wireClientProviderFactory: WireClientProviderFactory, httpClient: Dispatcher, logger: MiLogger, 
     /** Pl storages available locally */
     localProjections: LocalStorageProjection[]);
     close(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/clients/download.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAE/F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAK3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,qBAAqB,CAAC;AAGhF,OAAO,EAAE,cAAc,EAAE,MAAM,yFAAyF,CAAC;AACzH,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEzE;qCACqC;AACrC,qBAAa,cAAc;aAYP,UAAU,EAAE,UAAU;aACtB,MAAM,EAAE,QAAQ;IAZlC,SAAgB,UAAU,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;IAC/D,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAE5D,8EAA8E;IAC9E,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAsB;IAE5D,4EAA4E;IAC5E,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuC;gBAG1E,yBAAyB,EAAE,yBAAyB,EACpC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,QAAQ;IAChC,oCAAoC;IACpC,gBAAgB,EAAE,sBAAsB,EAAE;IAO5C,KAAK;IAEL;;;;;OAKG;IACG,eAAe,CAAC,CAAC,EACrB,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,UAAU,GAAG,SAAS,EAC/B,GAAG,EAAE,iBAAiB,EACtB,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,GACzB,OAAO,CAAC,CAAC,CAAC;IAsBP,oBAAoB,CAAC,CAAC,EAC1B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,iBAAiB,EACtB,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,GACzB,OAAO,CAAC,CAAC,CAAC;YA+BC,kBAAkB;CAajC;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM;;;EASxC;AAED,wBAAgB,WAAW,CACzB,SAAS,EAAE,MAAM,EACjB,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1C,YAAY,EAAE,MAAM,UAQrB;AAOD,mDAAmD;AACnD,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,IAAI,SAAuB;CAC5B;AAED,+DAA+D;AAC/D,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,IAAI,SAAyB;CAC9B;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,sBAAsB,EAAE,uBAW7E"}
+{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/clients/download.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAE/F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAK3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,qBAAqB,CAAC;AAGhF,OAAO,EAAE,cAAc,EAAE,MAAM,8FAA8F,CAAC;AAC9H,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEzE;qCACqC;AACrC,qBAAa,cAAc;aAYP,UAAU,EAAE,UAAU;aACtB,MAAM,EAAE,QAAQ;IAZlC,SAAgB,IAAI,EAAE,kBAAkB,CAAC,sBAAsB,GAAG,cAAc,CAAC,CAAC;IAClF,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAE5D,8EAA8E;IAC9E,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAsB;IAE5D,4EAA4E;IAC5E,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuC;gBAG1E,yBAAyB,EAAE,yBAAyB,EACpC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,QAAQ;IAChC,oCAAoC;IACpC,gBAAgB,EAAE,sBAAsB,EAAE;IAkB5C,KAAK;IAEL;;;;;OAKG;IACG,eAAe,CAAC,CAAC,EACrB,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,UAAU,GAAG,SAAS,EAC/B,GAAG,EAAE,iBAAiB,EACtB,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,GACzB,OAAO,CAAC,CAAC,CAAC;IAsBP,oBAAoB,CAAC,CAAC,EAC1B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,iBAAiB,EACtB,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,GACzB,OAAO,CAAC,CAAC,CAAC;YA+BC,kBAAkB;CAwBjC;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM;;;EASxC;AAED,wBAAgB,WAAW,CACzB,SAAS,EAAE,MAAM,EACjB,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1C,YAAY,EAAE,MAAM,UAQrB;AAOD,mDAAmD;AACnD,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,IAAI,SAAuB;CAC5B;AAED,+DAA+D;AAC/D,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,IAAI,SAAyB;CAC9B;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,sBAAsB,EAAE,uBAW7E"}

package/dist/clients/download.js

@@ -1,4 +1,4 @@
-import { stringifyWithResourceId, addRTypeToMetadata } from '@milaboratories/pl-client';
+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';
@@ -7,25 +7,37 @@ 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/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol.client.js';
+import { DownloadClient } from '../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol.client.js';
 
 /** Gets URLs for downloading from pl-core, parses them and reads or downloads
  * files locally and from the web. */
 class ClientDownload {
     httpClient;
     logger;
-    grpcClient;
+    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(grpcClientProviderFactory, httpClient, logger, 
+    constructor(wireClientProviderFactory, httpClient, logger, 
     /** Pl storages available locally */
     localProjections) {
         this.httpClient = httpClient;
         this.logger = logger;
-        this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new DownloadClient(transport));
+        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);
     }
@@ -81,7 +93,19 @@ class ClientDownload {
     async grpcGetDownloadUrl({ id, type }, options, signal) {
         const withAbort = options ?? {};
         withAbort.abort = signal;
-        return await this.grpcClient.get().getDownloadURL({ resourceId: id, isInternalUse: false }, addRTypeToMetadata(type, withAbort)).response;
+        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) {

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 { GrpcClientProvider, GrpcClientProviderFactory } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata, stringifyWithResourceId } 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/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol';\nimport { DownloadClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/downloadapi/protocol.client';\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 grpcClient: GrpcClientProvider<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    grpcClientProviderFactory: GrpcClientProviderFactory,\n    public readonly httpClient: Dispatcher,\n    public readonly logger: MiLogger,\n    /** Pl storages available locally */\n    localProjections: LocalStorageProjection[],\n  ) {\n    this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new DownloadClient(transport));\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, `\n      + `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    return await this.grpcClient.get().getDownloadURL(\n      { resourceId: id, isInternalUse: false },\n      addRTypeToMetadata(type, withAbort),\n    ).response;\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","sources":["../../src/clients/download.ts"],"sourcesContent":["/* eslint-disable n/no-unsupported-features/node-builtins */\nimport type { WireClientProvider, WireClientProviderFactory } from '@milaboratories/pl-client';\nimport { addRTypeToMetadata, stringifyWithResourceId, RestAPI, createRTypeRoutingHeader } 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, `\n      + `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 (await client.POST('/v1/get-download-url', {\n        body: {\n          resourceId: id.toString(),\n          isInternalUse: false,\n        },\n        headers: { ...createRTypeRoutingHeader(type) },\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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"}

package/dist/clients/logs.cjs

@@ -1,17 +1,27 @@
 'use strict';
 
-var protocol_client = require('../proto/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.client.cjs');
 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;
-    grpcClient;
-    constructor(grpcClientProviderFactory, httpClient, logger) {
+    wire;
+    constructor(wireClientProviderFactory, httpClient, logger) {
         this.httpClient = httpClient;
         this.logger = logger;
-        this.grpcClient = grpcClientProviderFactory.createGrpcClientProvider((transport) => new protocol_client.StreamingClient(transport));
+        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,
@@ -19,24 +29,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,
-        }, plClient.addRTypeToMetadata(rType, options))).response;
+        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: 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: tsHelpers.notEmpty(rId),
-            readLimit: BigInt(lineCount),
-            offset: offsetBytes,
-            search: searchStr,
-        }, plClient.addRTypeToMetadata(rType, options))).response;
+        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: new Uint8Array(Buffer.from(resp.data)),
+            size: BigInt(resp.size),
+            newOffset: BigInt(resp.newOffset),
+        };
     }
 }
 

package/dist/clients/logs.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"logs.cjs","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":["StreamingClient","addRTypeToMetadata","notEmpty"],"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,IAAIA,+BAAe,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,EACDC,2BAAkB,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,EAAEC,kBAAQ,CAAC,GAAG,CAAC;AACzB,YAAA,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC;AAC5B,YAAA,MAAM,EAAE,WAAW;AACnB,YAAA,MAAM,EAAE,SAAS;SAClB,EACDD,2BAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CACnC,EACD,QAAQ;IACZ;AACD;;;;"}
+{"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(\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":["StreamingClient","RestAPI","addRTypeToMetadata","createRTypeRoutingHeader","notEmpty"],"mappings":"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"}

package/dist/clients/logs.d.ts

@@ -1,15 +1,16 @@
-import { StreamingClient } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.client';
 import type { RpcOptions } from '@protobuf-ts/runtime-rpc';
 import type { MiLogger } from '@milaboratories/ts-helpers';
 import type { Dispatcher } from 'undici';
-import type { GrpcClientProvider, GrpcClientProviderFactory } from '@milaboratories/pl-client';
-import type { StreamingAPI_Response } from '../proto/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol';
+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 grpcClient: GrpcClientProvider<StreamingClient>;
-    constructor(grpcClientProviderFactory: GrpcClientProviderFactory, httpClient: Dispatcher, 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

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

@@ -1 +1 @@
-{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../src/clients/logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,0FAA0F,CAAC;AAC3H,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,KAAK,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAE/F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mFAAmF,CAAC;AAC/H,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,qBAAa,UAAU;aAKH,UAAU,EAAE,UAAU;aACtB,MAAM,EAAE,QAAQ;IALlC,SAAgB,UAAU,EAAE,kBAAkB,CAAC,eAAe,CAAC,CAAC;gBAG9D,yBAAyB,EAAE,yBAAyB,EACpC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,QAAQ;IAKlC,KAAK;IAEL;;8DAE0D;IAC7C,SAAS,CACpB,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,YAAY,EACtC,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,MAAW,EAAE,kCAAkC;IAC5D,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAcjC;;8DAE0D;IAC7C,QAAQ,CACnB,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,YAAY,EACtC,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,MAAW,EAAE,wCAAwC;IAClE,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,qBAAqB,CAAC;CAalC"}
+{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../src/clients/logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,KAAK,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAE/F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wFAAwF,CAAC;AACpI,OAAO,EAAE,eAAe,EAAE,MAAM,+FAA+F,CAAC;AAChI,OAAO,KAAK,EAAqB,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,qBAAa,UAAU;aAKH,UAAU,EAAE,UAAU;aACtB,MAAM,EAAE,QAAQ;IALlC,SAAgB,IAAI,EAAE,kBAAkB,CAAC,uBAAuB,GAAG,eAAe,CAAC,CAAC;gBAGlF,yBAAyB,EAAE,yBAAyB,EACpC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,QAAQ;IAiBlC,KAAK;IAEL;;8DAE0D;IAC7C,SAAS,CACpB,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,YAAY,EACtC,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,MAAW,EAAE,kCAAkC;IAC5D,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,qBAAqB,CAAC;IA6BjC;;8DAE0D;IAC7C,QAAQ,CACnB,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,YAAY,EACtC,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,MAAW,EAAE,wCAAwC;IAClE,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,qBAAqB,CAAC;CAiClC"}