Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
973a884b3e | |||
6f60f8bd94 | |||
07606cd996 | |||
3ca956e531 | |||
9350c837e5 | |||
86196c3feb | |||
0985ff145e |
4
package-lock.json
generated
4
package-lock.json
generated
@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@ztimson/utils",
|
||||
"version": "0.4.0",
|
||||
"version": "0.10.4",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@ztimson/utils",
|
||||
"version": "0.4.0",
|
||||
"version": "0.10.4",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@types/jest": "^29.5.12",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@ztimson/utils",
|
||||
"version": "0.8.1",
|
||||
"version": "0.11.0",
|
||||
"description": "Utility library",
|
||||
"author": "Zak Timson",
|
||||
"license": "MIT",
|
||||
|
@ -1,11 +1,3 @@
|
||||
import {TypedEmitter, TypedEvents} from './emitter';
|
||||
|
||||
export type DownloadEvents = TypedEvents & {
|
||||
complete: (blob: Blob) => any;
|
||||
failed: (error: Error) => any;
|
||||
progress: (progress: number) => any;
|
||||
}
|
||||
|
||||
export function download(href: any, name: string) {
|
||||
const a = document.createElement('a');
|
||||
a.href = href;
|
||||
@ -14,40 +6,3 @@ export function download(href: any, name: string) {
|
||||
a.click();
|
||||
document.body.removeChild(a);
|
||||
}
|
||||
|
||||
/**
|
||||
* Download a URL using fetch so progress can be tracked. Uses Typed Emitter to emit a "progress" &
|
||||
* "complete" event.
|
||||
*
|
||||
* @param {string} url
|
||||
* @param {string} downloadName
|
||||
* @return {TypedEmitter<DownloadEvents>}
|
||||
*/
|
||||
export function downloadProgress(url: string, downloadName?: string) {
|
||||
const progress = new TypedEmitter<DownloadEvents>();
|
||||
fetch(url).then(response => {
|
||||
if(!response.ok) return progress.emit('failed', new Error(response.statusText));
|
||||
const contentLength = response.headers.get('Content-Length') || '0';
|
||||
const total = parseInt(contentLength, 10);
|
||||
let chunks: any[] = [], loaded = 0;
|
||||
const reader = response.body?.getReader();
|
||||
reader?.read().then(function processResult(result) {
|
||||
if(result.done) {
|
||||
const blob = new Blob(chunks);
|
||||
if(downloadName) {
|
||||
const url = URL.createObjectURL(blob);
|
||||
download(url, downloadName);
|
||||
URL.revokeObjectURL(url);
|
||||
}
|
||||
progress.emit('complete', blob);
|
||||
} else {
|
||||
const chunk = result.value;
|
||||
chunks.push(chunk);
|
||||
loaded += chunk.length;
|
||||
progress.emit('progress', loaded / total);
|
||||
reader.read().then(processResult);
|
||||
}
|
||||
});
|
||||
}).catch(err => progress.emit('failed', err));
|
||||
return progress;
|
||||
}
|
||||
|
@ -1,15 +1,3 @@
|
||||
import {XHR} from './xhr';
|
||||
|
||||
XHR.addInterceptor((resp: Response, next: () => void) => {
|
||||
if(resp.status == 200) return next();
|
||||
if(resp.status == 400) throw new BadRequestError(resp.statusText);
|
||||
if(resp.status == 401) throw new UnauthorizedError(resp.statusText);
|
||||
if(resp.status == 403) throw new ForbiddenError(resp.statusText);
|
||||
if(resp.status == 404) throw new NotFoundError(resp.statusText);
|
||||
if(resp.status == 500) throw new InternalServerError(resp.statusText);
|
||||
throw new CustomError(resp.statusText, resp.status);
|
||||
});
|
||||
|
||||
export class CustomError extends Error {
|
||||
static code = 500;
|
||||
|
||||
|
@ -4,9 +4,10 @@ export * from './download';
|
||||
export * from './emitter';
|
||||
export * from './errors';
|
||||
export * from './logger';
|
||||
export * from './math';
|
||||
export * from './misc';
|
||||
export * from './objects';
|
||||
export * from './promise-progress';
|
||||
export * from './string';
|
||||
export * from './time';
|
||||
export * from './upload';
|
||||
export * from './xhr';
|
||||
|
45
src/math.ts
Normal file
45
src/math.ts
Normal file
@ -0,0 +1,45 @@
|
||||
/**
|
||||
* Convert decimal number to fraction
|
||||
*
|
||||
* @example
|
||||
* ```js
|
||||
* dec2Frac(1.25) // Outputs: "1 1/4"
|
||||
* ```
|
||||
*
|
||||
* @param {number} num Number to convert
|
||||
* @return {string} Fraction with remainder
|
||||
*/
|
||||
export function dec2Frac(num: number) {
|
||||
const gcd = (a: number, b: number): number => {
|
||||
if (b < 0.0000001) return a;
|
||||
return gcd(b, ~~(a % b));
|
||||
};
|
||||
|
||||
const len = num.toString().length - 2;
|
||||
let denominator = Math.pow(10, len);
|
||||
let numerator = num * denominator;
|
||||
const divisor = gcd(numerator, denominator);
|
||||
numerator = ~~(numerator / divisor);
|
||||
denominator = ~~(denominator / divisor)
|
||||
const remainder = ~~(numerator / denominator);
|
||||
numerator -= remainder * denominator;
|
||||
return `${remainder ? remainder + ' ' : ''}${~~(numerator)}/${~~(denominator)}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert fraction to decimal number
|
||||
*
|
||||
* @example
|
||||
* ```js
|
||||
* fracToDec('1 1/4') // Outputs: 1.25
|
||||
* ```
|
||||
*
|
||||
* @param {string} frac Fraction to convert
|
||||
* @return {number} Faction as a decimal
|
||||
*/
|
||||
export function fracToDec(frac: string) {
|
||||
let split = frac.split(' ');
|
||||
const whole = split.length == 2 ? Number(split[0]) : 0;
|
||||
split = (<string>split.pop()).split('/');
|
||||
return whole + (Number(split[0]) / Number(split[1]));
|
||||
}
|
26
src/promise-progress.ts
Normal file
26
src/promise-progress.ts
Normal file
@ -0,0 +1,26 @@
|
||||
export type ProgressCallback = (progress: number) => any;
|
||||
|
||||
export class PromiseProgress<T> extends Promise<T> {
|
||||
private listeners: ProgressCallback[] = [];
|
||||
|
||||
private _progress = 0;
|
||||
get progress() { return this._progress; }
|
||||
set progress(p: number) {
|
||||
if(p == this._progress) return;
|
||||
this._progress = p;
|
||||
this.listeners.forEach(l => l(p));
|
||||
}
|
||||
|
||||
constructor(executor: (resolve: (value: T) => any, reject: (reason: any) => void, progress: (progress: number) => any) => void) {
|
||||
super((resolve, reject) => executor(
|
||||
(value: T) => resolve(value),
|
||||
(reason: any) => reject(reason),
|
||||
(progress: number) => this.progress = progress
|
||||
));
|
||||
}
|
||||
|
||||
onProgress(callback: ProgressCallback) {
|
||||
this.listeners.push(callback);
|
||||
return this;
|
||||
}
|
||||
}
|
@ -1,30 +0,0 @@
|
||||
import {TypedEmitter, TypedEvents} from './emitter';
|
||||
|
||||
export type UploadEvents = TypedEvents & {
|
||||
complete: () => any;
|
||||
failed: (err: Error) => any;
|
||||
progress: (progress: number) => any;
|
||||
}
|
||||
|
||||
export function uploadProgress(files : File | FileList, url: string) {
|
||||
const xhr = new XMLHttpRequest();
|
||||
const progress = new TypedEmitter<UploadEvents>();
|
||||
const formData = new FormData();
|
||||
(Array.isArray(files) ? files : [files])
|
||||
.forEach(f => formData.append('file', f));
|
||||
|
||||
xhr.upload.addEventListener("progress", (event) => {
|
||||
if(event.lengthComputable) progress.emit('progress', event.loaded / event.total);
|
||||
});
|
||||
|
||||
xhr.onreadystatechange = () => {
|
||||
if (xhr.readyState === 4) {
|
||||
if(xhr.status >= 200 && xhr.status < 300) progress.emit('complete');
|
||||
else progress.emit('failed', new Error(xhr.responseText));
|
||||
}
|
||||
};
|
||||
|
||||
xhr.open("POST", url, true);
|
||||
xhr.send(formData);
|
||||
return progress;
|
||||
}
|
19
src/xhr.ts
19
src/xhr.ts
@ -1,10 +1,11 @@
|
||||
import {TypedEmitter, TypedEvents} from './emitter.ts';
|
||||
import {clean} from './objects';
|
||||
|
||||
export type Interceptor = (request: Response, next: () => void) => void;
|
||||
|
||||
export type RequestOptions = {
|
||||
url?: string;
|
||||
fragment?: string;
|
||||
query?: {key: string, value: string}[] | {[key: string]: string};
|
||||
method?: 'GET' | 'POST' | 'PATCH' | 'DELETE';
|
||||
body?: any;
|
||||
headers?: {[key: string | symbol]: string | null | undefined};
|
||||
@ -48,7 +49,13 @@ export class XHR {
|
||||
|
||||
async request<T>(opts: RequestOptions = {}): Promise<T> {
|
||||
if(!this.opts.url && !opts.url) throw new Error('URL needs to be set');
|
||||
const url = (opts.url?.startsWith('http') ? opts.url : (this.opts.url || '') + (opts.url || '')).replace(/([^:]\/)\/+/g, '$1');
|
||||
let url = (opts.url?.startsWith('http') ? opts.url : (this.opts.url || '') + (opts.url || '')).replace(/([^:]\/)\/+/g, '$1');
|
||||
if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : url += '#' + opts.fragment;
|
||||
if(opts.query) {
|
||||
const q = Array.isArray(opts.query) ? opts.query :
|
||||
Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
|
||||
url += (url.includes('?') ? '&' : '?') + q.map(q => `${q.key}=${q.value}`).join('&');
|
||||
}
|
||||
|
||||
// Prep headers
|
||||
const headers = <any>clean({
|
||||
@ -68,10 +75,16 @@ export class XHR {
|
||||
await new Promise<void>(res => fn(resp, () => res()));
|
||||
}
|
||||
|
||||
if(!resp.ok) throw new Error(resp.statusText);
|
||||
const decode = async () => {
|
||||
if(!opts.skipConverting && resp.headers.get('Content-Type')?.startsWith('application/json')) return await resp.json();
|
||||
if(!opts.skipConverting && resp.headers.get('Content-Type')?.startsWith('text/plain')) return await <any>resp.text();
|
||||
return resp;
|
||||
}
|
||||
|
||||
const payload = await decode();
|
||||
if(resp.ok) return payload;
|
||||
const text = resp.statusText || (typeof payload == 'string' ? payload : null);
|
||||
throw (text ? new Error(text) : payload);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user