Merge pull request #2768 from shamil-gadelshin/storage_node_v2_sync5

storage-node-v2: Change operator url format.

storage-node-v2/src/commands/dev/sync.ts

@@ -32,10 +32,10 @@ export default class DevSync extends Command {
       required: false,
       description: 'Query node host and port (e.g.: some.com:8081)',
     }),
-    dataSourceOperatorHost: flags.string({
+    dataSourceOperatorUrl: flags.string({
       char: 'o',
       required: false,
-      description: 'Storage node host and port (e.g.: some.com:8081) to get data from.',
+      description: 'Storage node url base (e.g.: http://some.com:8081) to get data from.',
     }),
     uploads: flags.string({
       char: 'd',
@@ -52,8 +52,8 @@ export default class DevSync extends Command {
     const queryNodeHost = flags.queryNodeHost ?? 'localhost:8081'
     const queryNodeUrl = `http://${queryNodeHost}/graphql`
     const syncWorkersNumber = flags.syncWorkersNumber ?? 20
-    const dataSourceOperatorHost = flags.dataSourceOperatorHost ?? 'localhost:3333'
-    const operatorUrl = `http://${dataSourceOperatorHost}/`
+    const dataSourceOperatorHost = flags.dataSourceOperatorUrl ?? 'http://localhost:3333'
+    const operatorUrl = `${dataSourceOperatorHost}`
 
     try {
       await performSync(flags.workerId, syncWorkersNumber, queryNodeUrl, flags.uploads, operatorUrl)

storage-node-v2/src/services/sync/remoteStorageData.ts

@@ -31,7 +31,7 @@ const badOperatorUrls = new NodeCache({
  * @param operatorUrl - remote storage node URL
  */
 export async function getRemoteDataObjects(operatorUrl: string): Promise<string[]> {
-  const url = urljoin('http://', operatorUrl, 'api/v1/state/data-objects')
+  const url = urljoin(operatorUrl, 'api/v1/state/data-objects')
 
   const faultyOperator = badOperatorUrls.has(operatorUrl)
   if (faultyOperator) {

storage-node-v2/src/services/sync/tasks.ts

@@ -59,7 +59,7 @@ export class DownloadFileTask implements SyncTask {
   constructor(baseUrl: string, id: string, uploadsDirectory: string) {
     this.id = id
     this.uploadsDirectory = uploadsDirectory
-    this.url = urljoin('http://', baseUrl, 'api/v1/files', id)
+    this.url = urljoin(baseUrl, 'api/v1/files', id)
   }
 
   description(): string {