review notes fix

tradingview · Mar 15, 2024 · 0f0c7b4 · 0f0c7b4
1 parent 4a80c1d
commit 0f0c7b4
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 25 deletions.
diff --git a/src/artifact-provider.mts b/src/artifact-provider.mts
@@ -14,5 +14,4 @@ export interface ArtifactProvider {
 	artifactsByBuildNumber(buildNumber: string): Promise<Artifact[]>;
 	artifactUrl(artifact: Artifact): Promise<URL>;
 	getArtifactContent(artifact: Artifact, range?: ByteRange): Promise<IncomingMessage>;
-	createMetapointerFile(artifact: Artifact, fileName: string): void;
 }
diff --git a/src/deb/deb-builder.mts b/src/deb/deb-builder.mts
@@ -8,6 +8,7 @@ import * as tar from 'tar';
 import type { Artifact, ArtifactProvider } from '../artifact-provider.mjs';
 import { createDir, execToolToFile, removeDir } from '../fs.mjs';
 import type { Config } from '../config.mjs';
+import { createMetapointerFile } from '../s3-metapointer.mjs';
 import type { Deployer } from '../deployer.mjs';
 import type { Packages } from '../repo.mjs';
 
@@ -195,7 +196,7 @@ export class DebBuilder implements Deployer {
 						distribution,
 						this.debName(deb.version, arch));
 					const relativeDebPath = path.relative(this.root, debPath);
-					this.artifactProvider.createMetapointerFile(deb.artifact, debPath);
+					createMetapointerFile(deb.artifact.md5, debPath);
 					const debSize = controlTar.headers['content-range']?.split('/')[1];
 					const sha1 = controlTar.headers['x-checksum-sha1'];
 					const sha256 = controlTar.headers['x-checksum-sha256'];

diff --git a/src/fs.mts b/src/fs.mts
@@ -22,10 +22,6 @@ export function removeDir(dirName: string): void {
 	}
 }
 
-export function createMetapointerContent(fileMd5Hash: string): string {
-	return `#metapointer jfrogart\noid md5:${fileMd5Hash}`;
-}
-
 // eslint-disable-next-line max-params
 export async function execToolToFile(tool: string, args: string[], outputPath?: string, append?: boolean): Promise<void> {
 	if (!append && outputPath && existsSync(outputPath)) {

diff --git a/src/http.mts b/src/http.mts
@@ -12,7 +12,7 @@ export interface RequestData {
 	redirectHandler?: (url: string) => string | undefined;
 }
 
-export function requestStream(url: string, method: string, requestData?: RequestData): Promise<IncomingMessage> {
+export function requestStream(url: URL, method: string, requestData?: RequestData): Promise<IncomingMessage> {
 	return new Promise((resolve, reject) => {
 		try {
 			const req = httpRequest(url, { method });
@@ -22,7 +22,7 @@ export function requestStream(url: string, method: string, requestData?: Request
 					if (incomingMessage.statusCode !== 200) {
 						const stCode = incomingMessage.statusCode ?? 'NO_CODE';
 						const stMessage = incomingMessage.statusMessage ?? 'NO_MESSAGE';
-						const message = `[${method} ${url}]:${stCode}/${stMessage}`;
+						const message = `[${method} ${url.toString()}]:${stCode}/${stMessage}`;
 						reject(new Error(message));
 					}
 
@@ -31,7 +31,7 @@ export function requestStream(url: string, method: string, requestData?: Request
 				.on('error', (err: Error) => {
 					const errno = (err as {errno?: string}).errno ?? '';
 					if (errno === 'ETIMEDOUT') {
-						reject(new Error(`Request (${url}) timeout.`));
+						reject(new Error(`Request (${url.toString()}) timeout.`));
 					} else {
 						reject(err);
 					}
@@ -61,7 +61,7 @@ export function requestStream(url: string, method: string, requestData?: Request
 	});
 }
 
-export async function request(url: string, method: string, requestData?: RequestData): Promise<Buffer> {
+export async function request(url: URL, method: string, requestData?: RequestData): Promise<Buffer> {
 	const responseStream = await requestStream(url, method, requestData);
 
 	let buffer: Buffer | undefined = undefined;
@@ -74,7 +74,7 @@ export async function request(url: string, method: string, requestData?: Request
 	return buffer ? buffer : Buffer.from('');
 }
 
-export function requestRange(url: string, range: string): Promise<IncomingMessage> {
+export function requestRange(url: URL, range: string): Promise<IncomingMessage> {
 	return new Promise<IncomingMessage>((resolve, reject) => {
 		try {
 			const req = httpRequest(url, { method: 'GET' });
@@ -88,7 +88,7 @@ export function requestRange(url: string, range: string): Promise<IncomingMessag
 				if (incomingMessage.statusCode !== 200) {
 					const stCode = incomingMessage.statusCode ?? 'NO_CODE';
 					const stMessage = incomingMessage.statusMessage ?? 'NO_MESSAGE';
-					const message = `[GET ${url}]:${stCode}/${stMessage}`;
+					const message = `[GET ${url.toString()}]:${stCode}/${stMessage}`;
 					reject(new Error(message));
 					return;
 				}
@@ -98,7 +98,7 @@ export function requestRange(url: string, range: string): Promise<IncomingMessag
 				.on('error', (err: Error) => {
 					const errno = (err as {errno?: string}).errno ?? '';
 					if (errno === 'ETIMEDOUT') {
-						reject(new Error(`Request (${url}) timeout.`));
+						reject(new Error(`Request (${url.toString()}) timeout.`));
 					} else {
 						reject(err);
 					}
@@ -114,10 +114,10 @@ export function requestRange(url: string, range: string): Promise<IncomingMessag
 	});
 }
 
-export function get(url: string): Promise<Buffer> {
+export function get(url: URL): Promise<Buffer> {
 	return request(url, 'GET', undefined);
 }
 
-export function post(url: string, requestData?: RequestData): Promise<Buffer> {
+export function post(url: URL, requestData?: RequestData): Promise<Buffer> {
 	return request(url, 'POST', requestData);
 }
diff --git a/src/jfrog/artifact-provider.mts b/src/jfrog/artifact-provider.mts
@@ -1,12 +1,10 @@
 import { type ArtifactoryClient, type ArtifactoryItemMeta, type ByteRange, createArtifactoryClient } from 's3-groundskeeper';
 
-import { createFile } from '../fs.mjs';
 import { get } from '../http.mjs';
 
 import type { Artifact, ArtifactProvider } from '../artifact-provider.mjs';
 import type { ArtifactProviderConfig } from '../artifact-provider-config.mjs';
 import type { IncomingMessage } from 'http';
-import metapointerContent from '../s3-metapointer.mjs';
 
 interface BuildsList {
 	buildsNumbers: {
@@ -65,11 +63,6 @@ export default class JfrogArtifactProvider implements ArtifactProvider {
 		});
 	}
 
-	// eslint-disable-next-line class-methods-use-this
-	public createMetapointerFile(artifact: Artifact, fileName: string): void {
-		createFile(fileName, metapointerContent(artifact.md5));
-	}
-
 	private async getArtifactoryItemMeta(artifact: Artifact): Promise<ArtifactoryItemMeta> {
 		const aqlItemField = 'actual_md5';
 
@@ -99,7 +92,7 @@ export default class JfrogArtifactProvider implements ArtifactProvider {
 		const buildsEndpoint = this.artifactoryClient.resolveUrl(`api/build/${this.config.project}`);
 
 		if (!this.buildsList) {
-			const allBuilds = await get(buildsEndpoint.toString());
+			const allBuilds = await get(buildsEndpoint);
 			this.buildsList = JSON.parse(allBuilds.toString()) as BuildsList;
 		}
 
@@ -122,7 +115,7 @@ export default class JfrogArtifactProvider implements ArtifactProvider {
 		for (const value of buildTimes(buildNumber)) {
 			const buildInfoEndpointUrl = new URL(buildNumber, buildsEndpoint);
 			buildInfoEndpointUrl.searchParams.set('started', value.toISOString());
-			infoPromises.push(get(buildInfoEndpointUrl.toString()));
+			infoPromises.push(get(buildInfoEndpointUrl));
 		}
 
 		const infos = await Promise.all(infoPromises);

diff --git a/src/s3-metapointer.mts b/src/s3-metapointer.mts
@@ -1,3 +1,10 @@
-export default function metapointerContent(fileMd5Hash: string): string {
+import { createFile } from './fs.mjs';
+
+export function content(fileMd5Hash: string): string {
 	return `#metapointer jfrogart\noid md5:${fileMd5Hash}`;
 }
+
+// eslint-disable-next-line class-methods-use-this
+export function createMetapointerFile(md5: string, fileName: string): void {
+	createFile(fileName, content(md5));
+}