larapi 0.1.0 → 0.1.2

package/README.md

@@ -6,7 +6,7 @@ npm i larapi
 ```
 
 ### First step
-#### you can create instanse or use static methods for first configuration and for further use
+#### you can create instance or use static methods for first configuration and for further use
 ```js
 const api = new API({
 	host: 'https://my-host'

package/lib/Core.d.ts

@@ -5,7 +5,6 @@ declare abstract class Core {
     initData: TGroupsData;
     protected events: Events;
     host: string;
-    token: string;
     constructor(context?: Core);
     addListener(event: TListenerEvents, callback: (data: any) => void): Event;
     protected getCache(key: string): TData | undefined;

package/lib/Core.js

@@ -30,15 +30,8 @@ class Core {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "token", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.events = new easy_event_emitter_1.default();
         this.host = 'http://127.0.0.1/';
-        this.token = '';
         this.cache = {};
         this.initData = {};
         this.setHost = this.setHost.bind(this);

package/lib/Http.d.ts

@@ -1,10 +1,15 @@
 import Core from "./Core";
-import { TMethod, TParams, TData } from "./types";
+import { TMethod, TParams, TData, TRequestParams } from "./types";
 declare class Http extends Core {
     private cacheIndex;
+    currentCache?: TData;
+    requestParams: TRequestParams;
     method: TMethod;
     params: TParams;
+    path: string;
     constructor(method: TMethod, params: TParams, context?: Core);
+    private initRequest;
+    private initCache;
     private success;
     private fail;
     private error;
@@ -12,6 +17,8 @@ declare class Http extends Core {
     private encodeUrlParams;
     private cuteUndifinedParams;
     request(): this;
+    addHeader(key: string, value: string): this;
+    deleteHeader(key: string): this;
     updateCache(data: TData, fieldKey?: string | null): void;
     clearCache(data?: TData, fieldKey?: string | null): void;
 }

package/lib/Http.js

@@ -15,6 +15,18 @@ class Http extends Core_1.default {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "currentCache", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "requestParams", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "method", {
             enumerable: true,
             configurable: true,
@@ -27,14 +39,63 @@ class Http extends Core_1.default {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "path", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.cacheIndex = '';
         this.method = method;
         this.params = params;
+        this.path = this.params.path;
+        this.requestParams = {
+            method: this.method
+        };
         this.success = this.success.bind(this);
         this.fail = this.fail.bind(this);
         this.error = this.error.bind(this);
         this.complete = this.complete.bind(this);
         this.request = this.request.bind(this);
+        this.addListener = this.addListener.bind(this);
+        this.addHeader = this.addHeader.bind(this);
+        this.deleteHeader = this.deleteHeader.bind(this);
+        this.initRequest();
+        this.initCache();
+    }
+    initRequest() {
+        this.requestParams.headers = {
+            'Accept': 'application/json',
+            'Content-Type': 'application/json'
+        };
+        this.params.data = this.params.data ? this.cuteUndifinedParams(this.params.data) : this.params.data;
+        if (this.method === 'GET') {
+            if (this.params.data)
+                this.path = this.params.path + '?' + this.encodeUrlParams(this.params.data);
+        }
+        if (this.method === 'POST') {
+            this.requestParams.body = JSON.stringify(this.params.data);
+        }
+    }
+    initCache() {
+        var _a;
+        this.cacheIndex = (0, md5_1.default)(this.path + JSON.stringify(this.params.data));
+        if (this.params.globalName) {
+            if (this.initData[this.params.globalName]) {
+                this.setCache(this.cacheIndex, this.initData[this.params.globalName], (typeof this.params.cache === 'boolean' ? undefined : this.params.cache));
+                this.params.cache = (_a = this.params.cache) !== null && _a !== void 0 ? _a : true;
+                delete this.initData[this.params.globalName];
+            }
+        }
+        if (this.params.cache) {
+            if (this.currentCache = this.getCache(this.cacheIndex)) {
+                this.success(this.currentCache);
+                this.complete(this.currentCache);
+            }
+        }
+        else {
+            this.deleteCache(this.cacheIndex);
+        }
     }
     //Заголовки от 200 до 299
     success(...args) {
@@ -84,76 +145,49 @@ class Http extends Core_1.default {
         return data;
     }
     request() {
-        var _a;
-        if (typeof XMLHttpRequest === 'undefined')
+        if (typeof XMLHttpRequest === 'undefined' || this.currentCache)
             return this;
-        var path = this.params.path;
-        const fetchParams = {
-            method: this.method
-        };
-        fetchParams.headers = {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-            'Authorization': 'Bearer ' + this.token
-        };
-        this.params.data = this.params.data ? this.cuteUndifinedParams(this.params.data) : this.params.data;
-        if (this.method === 'POST') {
-            fetchParams.body = JSON.stringify(this.params.data);
-        }
-        if (this.method === 'GET') {
-            if (this.params.data)
-                path = this.params.path + '?' + this.encodeUrlParams(this.params.data);
-        }
-        this.cacheIndex = (0, md5_1.default)(path + JSON.stringify(this.params.data));
-        var dataCache;
-        if (this.params.globalName) {
-            if (this.initData[this.params.globalName]) {
-                this.setCache(this.cacheIndex, this.initData[this.params.globalName], (typeof this.params.cache === 'boolean' ? undefined : this.params.cache));
-                this.params.cache = (_a = this.params.cache) !== null && _a !== void 0 ? _a : true;
-                delete this.initData[this.params.globalName];
+        try {
+            const xhr = new XMLHttpRequest();
+            xhr.open(this.method, this.host + this.path, true);
+            for (const header in this.requestParams.headers) {
+                xhr.setRequestHeader(header, this.requestParams.headers[header]);
             }
-        }
-        if (this.params.cache) {
-            if (dataCache = this.getCache(this.cacheIndex)) {
-                this.success(dataCache);
-                this.complete(dataCache);
-            }
-        }
-        else {
-            this.deleteCache(this.cacheIndex);
-        }
-        if (!dataCache) {
-            try {
-                const xhr = new XMLHttpRequest();
-                xhr.open(this.method, this.host + path, true);
-                for (const header in fetchParams.headers) {
-                    xhr.setRequestHeader(header, fetchParams.headers[header]);
+            xhr.onreadystatechange = () => {
+                if (xhr.readyState !== 4) {
+                    return;
                 }
-                xhr.onreadystatechange = () => {
-                    if (xhr.readyState !== 4) {
-                        return;
+                const result = this.isJsonString(xhr.responseText) ? JSON.parse(xhr.responseText) : {};
+                if (xhr.status >= 200 && xhr.status <= 299) {
+                    if (this.params.cache) {
+                        this.setCache(this.cacheIndex, result, (typeof this.params.cache === 'boolean' ? undefined : this.params.cache));
                     }
-                    const result = this.isJsonString(xhr.responseText) ? JSON.parse(xhr.responseText) : {};
-                    if (xhr.status >= 200 && xhr.status <= 299) {
-                        if (this.params.cache) {
-                            this.setCache(this.cacheIndex, result, (typeof this.params.cache === 'boolean' ? undefined : this.params.cache));
-                        }
-                        this.success(result);
-                    }
-                    else {
-                        if (xhr.status >= 400 && xhr.status <= 499) {
-                            fail(result);
-                        }
-                        this.error(result);
-                        console.warn(result);
+                    this.success(result);
+                }
+                else {
+                    if (xhr.status >= 400 && xhr.status <= 499) {
+                        this.fail(result);
                     }
-                    this.complete(result);
-                };
-                xhr.send(fetchParams.body);
-            }
-            catch (e) {
-                console.warn(e);
-            }
+                    this.error(result);
+                    console.warn(result);
+                }
+                this.complete(result);
+            };
+            xhr.send(this.requestParams.body);
+        }
+        catch (e) {
+            console.warn(e);
+            throw e;
+        }
+        return this;
+    }
+    addHeader(key, value) {
+        this.requestParams.headers = Object.assign(Object.assign({}, this.requestParams.headers), { [key]: value });
+        return this;
+    }
+    deleteHeader(key) {
+        if (this.requestParams.headers && (key in this.requestParams.headers)) {
+            delete this.requestParams.headers[key];
         }
         return this;
     }

package/lib/index.d.ts

@@ -10,13 +10,14 @@ type TConfig = {
 declare class API extends Core {
     private static instance;
     private _user;
+    token?: string;
     constructor(config: TConfig);
     http(method: TMethod, params: TParams): Http;
     get(params: TParams): Http;
     post(params: TParams): Http;
     private init;
     setToken(token: string): void;
-    getToken(): string;
+    getToken(): string | undefined;
     getUid(): number;
     getUser(): TUser;
     get uid(): number;
@@ -35,7 +36,7 @@ declare class API extends Core {
     static addListener: (event: import("./types").TListenerEvents, callback: (data: any) => void) => import("easy-event-emitter").Event;
     static setInitData: (data: import("./types").TGroupsData) => void;
     static clearCacheGroup: (group: string, data?: import("./types").TData | undefined, fieldKey?: string | null) => void;
-    static getToken: () => string;
+    static getToken: () => string | undefined;
     static getUid: () => number;
     static getUser: () => TUser;
     static user: TUser;

package/lib/index.js

@@ -15,6 +15,12 @@ class API extends Core_1.default {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "token", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.setHost(config.host);
         this._user = {};
         this.init();
@@ -30,7 +36,11 @@ class API extends Core_1.default {
         this.getUser = this.getUser.bind(this);
     }
     http(method, params) {
-        return new Http_1.default(method, params, this);
+        const http = new Http_1.default(method, params, this);
+        if (this.token) {
+            http.addHeader('Authorization', 'Bearer ' + this.token);
+        }
+        return http;
     }
     get(params) {
         return this.http('GET', params).request();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "larapi",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "API client for laravel",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/Core.ts

@@ -15,12 +15,11 @@ abstract class Core {
 		initData: TGroupsData;
 	protected events: Events;
 		host: string;
-		token: string;
+		
 
 	constructor(context?: Core) {
 		this.events = new EventEmitter();
 		this.host = 'http://127.0.0.1/';
-		this.token = '';
 		this.cache = {};
 		this.initData = {};
 

package/src/Http.ts

@@ -10,20 +10,71 @@ import {
 
 class Http extends Core {
 	private cacheIndex: string;
+		currentCache?: TData;
+		requestParams: TRequestParams;
 		method: TMethod;
 		params: TParams;
+		path: string;
 
 	constructor(method: TMethod, params: TParams, context?: Core) {
 		super(context);
 		this.cacheIndex = '';
 		this.method = method;
 		this.params = params;
-		
+		this.path = this.params.path;
+		this.requestParams = {
+			method: this.method
+		};
+
 		this.success = this.success.bind(this);
 		this.fail = this.fail.bind(this);
 		this.error = this.error.bind(this);
 		this.complete = this.complete.bind(this);
 		this.request = this.request.bind(this);
+		this.addListener = this.addListener.bind(this);
+		this.addHeader = this.addHeader.bind(this);
+		this.deleteHeader = this.deleteHeader.bind(this);
+
+		this.initRequest();
+		this.initCache();
+	}
+
+	private initRequest(): void {
+		this.requestParams.headers = {
+			'Accept': 'application/json',
+			'Content-Type': 'application/json'
+		};
+
+		this.params.data = this.params.data ? this.cuteUndifinedParams(this.params.data) : this.params.data;
+
+		if (this.method === 'GET') {
+			if (this.params.data)
+				this.path = this.params.path + '?' + this.encodeUrlParams(this.params.data);
+		}
+
+		if (this.method === 'POST') {
+			this.requestParams.body = JSON.stringify(this.params.data);
+		}
+	}
+
+	private initCache(): void {
+		this.cacheIndex = md5(this.path + JSON.stringify(this.params.data));
+		if (this.params.globalName) {
+			if (this.initData[this.params.globalName]) {
+				this.setCache(this.cacheIndex, this.initData[this.params.globalName], (typeof this.params.cache === 'boolean' ? undefined : this.params.cache));
+				this.params.cache = this.params.cache ?? true;
+				delete this.initData[this.params.globalName];
+			}
+		}
+		
+		if (this.params.cache) {
+			if (this.currentCache = this.getCache(this.cacheIndex)) {
+				this.success(this.currentCache);
+				this.complete(this.currentCache);
+			}	
+		}else{
+			this.deleteCache(this.cacheIndex);
+		}
 	}
 
 	//Заголовки от 200 до 299
@@ -36,6 +87,7 @@ class Http extends Core {
 				this.params.data,
 				typeof this.params.cacheUpdate === 'string' ? undefined : this.params.cacheUpdate.fieldKey);
 		}
+		
 		if (this.params.cacheClear && this.params.data) {
 			this.clearCacheGroup(
 				typeof this.params.cacheClear === 'string' ? this.params.cacheClear : this.params.cacheClear.group,
@@ -89,89 +141,58 @@ class Http extends Core {
 	}
 
 	public request(): this {
-		if (typeof XMLHttpRequest === 'undefined') return this;
-
-		var path = this.params.path;
-		const fetchParams: TRequestParams = {
-			method: this.method
-		};
-
-		fetchParams.headers = {
-			'Accept': 'application/json',
-			'Content-Type': 'application/json',
-			'Authorization': 'Bearer ' + this.token
-		};
-
-		this.params.data = this.params.data ? this.cuteUndifinedParams(this.params.data) : this.params.data;
-
-		if (this.method === 'POST') {
-			fetchParams.body = JSON.stringify(this.params.data);
-		}
-
-		if (this.method === 'GET') {
-			if (this.params.data)
-				path = this.params.path + '?' + this.encodeUrlParams(this.params.data);
-		}
-
-		this.cacheIndex = md5(path + JSON.stringify(this.params.data));
-
-		var dataCache;
+		if (typeof XMLHttpRequest === 'undefined' || this.currentCache) return this;
+		
+		try {
+			const xhr = new XMLHttpRequest();
 
-		if (this.params.globalName) {
-			if (this.initData[this.params.globalName]) {
-				this.setCache(this.cacheIndex, this.initData[this.params.globalName], (typeof this.params.cache === 'boolean' ? undefined : this.params.cache));
-				this.params.cache = this.params.cache ?? true;
-				delete this.initData[this.params.globalName];
+			xhr.open(this.method, this.host + this.path, true);
+			for(const header in this.requestParams.headers) {
+				xhr.setRequestHeader(header, this.requestParams.headers[header]);
 			}
-		}
-		
-		if (this.params.cache) {
-			if (dataCache = this.getCache(this.cacheIndex)) {
-				this.success(dataCache);
-				this.complete(dataCache);
-			}	
-		}else{
-			this.deleteCache(this.cacheIndex);
-		}
-		if (!dataCache) {
-			try {
-				const xhr = new XMLHttpRequest();
 
-				xhr.open(this.method, this.host + path, true);
-				for(const header in fetchParams.headers) {
-					xhr.setRequestHeader(header, fetchParams.headers[header]);
+			xhr.onreadystatechange = () => {
+				if (xhr.readyState !== 4) {
+					return;
 				}
-	
-				xhr.onreadystatechange = () => {
-					if (xhr.readyState !== 4) {
-						return;
+				
+				const result = this.isJsonString(xhr.responseText) ? JSON.parse(xhr.responseText) : {};
+
+				if (xhr.status >= 200 && xhr.status <= 299) {
+					if (this.params.cache) {
+						this.setCache(this.cacheIndex, result, (typeof this.params.cache === 'boolean' ? undefined : this.params.cache));
 					}
-					
-					const result = this.isJsonString(xhr.responseText) ? JSON.parse(xhr.responseText) : {};
-	
-					if (xhr.status >= 200 && xhr.status <= 299) {
-						if (this.params.cache) {
-							this.setCache(this.cacheIndex, result, (typeof this.params.cache === 'boolean' ? undefined : this.params.cache));
-						}
-						this.success(result);
-					}else{
-						if (xhr.status >= 400 && xhr.status <= 499) {
-							fail(result);
-						}
-						
-						this.error(result);
-						console.warn(result);
+					this.success(result);
+				}else{
+					if (xhr.status >= 400 && xhr.status <= 499) {
+						this.fail(result);
 					}
-					this.complete(result);
+					
+					this.error(result);
+					console.warn(result);
 				}
-				xhr.send(fetchParams.body);
-			}catch(e) {
-				console.warn(e);
+				this.complete(result);
 			}
+			xhr.send(this.requestParams.body);
+		}catch(e) {
+			console.warn(e);
+			throw e;
 		}
 		return this
 	}
 
+	public addHeader(key: string, value: string): this {
+		this.requestParams.headers = {...this.requestParams.headers, [key]: value};
+		return this;
+	}
+
+	public deleteHeader(key: string): this {
+		if (this.requestParams.headers && (key in this.requestParams.headers)) {
+			delete this.requestParams.headers[key];
+		}
+		return this;
+	}
+
 	public updateCache(data: TData, fieldKey: string | null = 'id'): void {
 		const cache = this.getCacheByIndex(this.cacheIndex);
 		if (cache && cache.group) {

package/src/index.ts

@@ -15,6 +15,7 @@ class API extends Core {
 		host: ''
 	});
 	private _user: TUser;
+		token?: string;
 
 	constructor(config: TConfig) {
 		super();
@@ -35,7 +36,11 @@ class API extends Core {
 	}
 
 	public http(method: TMethod, params: TParams): Http {
-		return new Http(method, params, this);
+		const http = new Http(method, params, this);
+		if (this.token) {
+			http.addHeader('Authorization', 'Bearer ' + this.token);
+		}
+		return http;
 	}
 
 	public get(params: TParams): Http {