fix(ci): remove ci dependencies

This commit is contained in:
Philipp Kunz 2018-08-14 01:47:54 +02:00
parent 4e51ed315e
commit e8133247f7
6 changed files with 39 additions and 46 deletions

View File

@ -3,9 +3,7 @@
"coverageTreshold": 50 "coverageTreshold": 50
}, },
"npmci": { "npmci": {
"npmGlobalTools": [ "npmGlobalTools": [],
"npmts"
],
"npmAccessLevel": "public" "npmAccessLevel": "public"
} }
} }

View File

@ -23,17 +23,18 @@ tap.test('should post a JSON document over http', async () => {
}); });
tap.skip.test('should deal with unix socks', async () => { tap.skip.test('should deal with unix socks', async () => {
const socketResponse = await smartrequest.request('http://unix:/var/run/docker.sock:/containers/json', { const socketResponse = await smartrequest.request(
'http://unix:/var/run/docker.sock:/containers/json',
{
headers: { headers: {
"Content-Type": "application/json", 'Content-Type': 'application/json',
"Host": "docker.sock" Host: 'docker.sock'
} }
}); }
);
console.log(socketResponse.body); console.log(socketResponse.body);
}); });
tap.skip.test('should correctly upload a file using formData', async () => { tap.skip.test('should correctly upload a file using formData', async () => {});
})
tap.start(); tap.start();

View File

@ -1,25 +1,20 @@
import * as plugins from "./smartrequest.plugins"; import * as plugins from './smartrequest.plugins';
import * as interfaces from "./smartrequest.interfaces"; import * as interfaces from './smartrequest.interfaces';
import { request } from "./smartrequest.request"; import { request } from './smartrequest.request';
/** /**
* the interfae for FormFieldData * the interfae for FormFieldData
*/ */
export interface IFormField { export interface IFormField {
name: string; name: string;
type: "string" | "filePath" | "Buffer"; type: 'string' | 'filePath' | 'Buffer';
payload: string; payload: string;
} }
const appendFormField = async ( const appendFormField = async (formDataArg: plugins.formData, formDataField: IFormField) => {
formDataArg: plugins.formData, if (formDataField.type === 'filePath') {
formDataField: IFormField let fileData = plugins.fs.readFileSync(plugins.path.join(process.cwd(), formDataField.payload));
) => { formDataArg.append('file', fileData, {
if (formDataField.type === "filePath") {
let fileData = plugins.fs.readFileSync(
plugins.path.join(process.cwd(), formDataField.payload)
);
formDataArg.append("file", fileData, {
filename: 'upload.pdf', filename: 'upload.pdf',
contentType: 'application/pdf' contentType: 'application/pdf'
}); });
@ -38,7 +33,7 @@ export const postFormData = async (
const requestOptions = Object.assign({}, optionsArg, { const requestOptions = Object.assign({}, optionsArg, {
method: 'POST', method: 'POST',
headers: { headers: {
...(optionsArg.headers), ...optionsArg.headers,
...form.getHeaders() ...form.getHeaders()
}, },
requestBody: form requestBody: form

View File

@ -1,8 +1,8 @@
import * as https from "https"; import * as https from 'https';
import * as plugins from "./smartrequest.plugins"; import * as plugins from './smartrequest.plugins';
import * as interfaces from "./smartrequest.interfaces"; import * as interfaces from './smartrequest.interfaces';
import { IncomingMessage } from "http"; import { IncomingMessage } from 'http';
export interface IExtendedIncomingMessage extends IncomingMessage { export interface IExtendedIncomingMessage extends IncomingMessage {
body: any; body: any;
@ -13,12 +13,12 @@ const buildUtf8Response = (
): Promise<IExtendedIncomingMessage> => { ): Promise<IExtendedIncomingMessage> => {
let done = plugins.smartpromise.defer<IExtendedIncomingMessage>(); let done = plugins.smartpromise.defer<IExtendedIncomingMessage>();
// Continuously update stream with data // Continuously update stream with data
let body = ""; let body = '';
incomingMessageArg.on("data", function(chunkArg) { incomingMessageArg.on('data', function(chunkArg) {
body += chunkArg; body += chunkArg;
}); });
incomingMessageArg.on("end", function() { incomingMessageArg.on('end', function() {
try { try {
(incomingMessageArg as IExtendedIncomingMessage).body = JSON.parse(body); (incomingMessageArg as IExtendedIncomingMessage).body = JSON.parse(body);
} catch (err) { } catch (err) {
@ -47,8 +47,8 @@ const parseSocketPathAndRoute = (stringToParseArg: string) => {
return { return {
socketPath: result[1], socketPath: result[1],
path: result[2] path: result[2]
} };
} };
export let request = async ( export let request = async (
domainArg: string, domainArg: string,
@ -68,30 +68,29 @@ export let request = async (
// determine if unixsock // determine if unixsock
if (testForUnixSock(domainArg)) { if (testForUnixSock(domainArg)) {
const detailedUnixPath = parseSocketPathAndRoute(optionsArg.path) const detailedUnixPath = parseSocketPathAndRoute(optionsArg.path);
optionsArg.socketPath = detailedUnixPath.socketPath; optionsArg.socketPath = detailedUnixPath.socketPath;
optionsArg.path = detailedUnixPath.path; optionsArg.path = detailedUnixPath.path;
} }
// lets determine the request module to use // lets determine the request module to use
const requestModule = (() => { const requestModule = (() => {
if (parsedUrl.protocol === "https:") { if (parsedUrl.protocol === 'https:') {
return plugins.https; return plugins.https;
} else if (parsedUrl.protocol === "http:") { } else if (parsedUrl.protocol === 'http:') {
return plugins.http; return plugins.http;
} else { } else {
throw new Error(`unsupported protocol: ${parsedUrl.protocol}`); throw new Error(`unsupported protocol: ${parsedUrl.protocol}`);
} }
})() as typeof plugins.https; })() as typeof plugins.https;
// lets perform the actual request // lets perform the actual request
let request = requestModule.request(optionsArg); let request = requestModule.request(optionsArg);
// lets write the requestBody // lets write the requestBody
if (optionsArg.requestBody) { if (optionsArg.requestBody) {
if (!(optionsArg.requestBody instanceof plugins.formData)) { if (!(optionsArg.requestBody instanceof plugins.formData)) {
if(typeof optionsArg.requestBody !== "string") { if (typeof optionsArg.requestBody !== 'string') {
optionsArg.requestBody = JSON.stringify(optionsArg.requestBody); optionsArg.requestBody = JSON.stringify(optionsArg.requestBody);
} }
request.write(optionsArg.requestBody); request.write(optionsArg.requestBody);
@ -106,16 +105,16 @@ export let request = async (
} }
// lets handle an error // lets handle an error
request.on("error", e => { request.on('error', e => {
console.error(e); console.error(e);
}); });
// lets handle the response // lets handle the response
request.on("response", async response => { request.on('response', async response => {
if (streamArg) { if (streamArg) {
done.resolve(response); done.resolve(response);
} else { } else {
const builtResponse = await buildUtf8Response(response) const builtResponse = await buildUtf8Response(response);
done.resolve(builtResponse); done.resolve(builtResponse);
} }
}); });