larapi 0.1.2 → 0.1.4

package/lib/Core.d.ts

@@ -1,12 +1,11 @@
-import { Events, Event } from 'easy-event-emitter';
-import { TCacheBody, TData, TGroupsData, TListenerEvents } from './types';
+import { Events } from 'easy-event-emitter';
+import type { TCacheBody, TData, TGroupsData } from './types';
 declare abstract class Core {
     private cache;
     initData: TGroupsData;
     protected events: Events;
     host: string;
     constructor(context?: Core);
-    addListener(event: TListenerEvents, callback: (data: any) => void): Event;
     protected getCache(key: string): TData | undefined;
     protected isJsonString(str: string): boolean;
     setHost(host: string): void;

package/lib/Core.js

@@ -35,14 +35,10 @@ class Core {
         this.cache = {};
         this.initData = {};
         this.setHost = this.setHost.bind(this);
-        this.addListener = this.addListener.bind(this);
         this.setInitData = this.setInitData.bind(this);
         this.clearCacheGroup = this.clearCacheGroup.bind(this);
         Object.assign(this, context);
     }
-    addListener(event, callback) {
-        return this.events.addListener(event, callback);
-    }
     getCache(key) {
         if (this.cache[key]) {
             if ((new Date()).getTime() <= (this.cache[key].time + 3600000000)) {

package/lib/Http.d.ts

@@ -1,8 +1,10 @@
 import Core from "./Core";
-import { TMethod, TParams, TData, TRequestParams } from "./types";
+import { Event, Events } from "easy-event-emitter";
+import type { TMethod, TParams, TData, TRequestParams, TListenerEvents } from "./types";
 declare class Http extends Core {
     private cacheIndex;
     currentCache?: TData;
+    currentEvents: Events;
     requestParams: TRequestParams;
     method: TMethod;
     params: TParams;
@@ -10,14 +12,16 @@ declare class Http extends Core {
     constructor(method: TMethod, params: TParams, context?: Core);
     private initRequest;
     private initCache;
-    private success;
-    private fail;
-    private error;
-    private complete;
+    private setEmit;
+    success(...args: any): void;
+    fail(...args: any): void;
+    error(...args: any): void;
+    complete(...args: any): void;
     private encodeUrlParams;
     private cuteUndifinedParams;
     request(): this;
     addHeader(key: string, value: string): this;
+    addListener(event: TListenerEvents, callback: (data: any) => void): Event;
     deleteHeader(key: string): this;
     updateCache(data: TData, fieldKey?: string | null): void;
     clearCache(data?: TData, fieldKey?: string | null): void;

package/lib/Http.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 //@ts-ignore
 const md5_1 = __importDefault(require("md5"));
 const Core_1 = __importDefault(require("./Core"));
+const Queue_1 = __importDefault(require("./Queue"));
+const easy_event_emitter_1 = __importDefault(require("easy-event-emitter"));
 class Http extends Core_1.default {
     constructor(method, params, context) {
         super(context);
@@ -21,6 +23,12 @@ class Http extends Core_1.default {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "currentEvents", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "requestParams", {
             enumerable: true,
             configurable: true,
@@ -45,6 +53,7 @@ class Http extends Core_1.default {
             writable: true,
             value: void 0
         });
+        this.currentEvents = new easy_event_emitter_1.default();
         this.cacheIndex = '';
         this.method = method;
         this.params = params;
@@ -56,8 +65,8 @@ class Http extends Core_1.default {
         this.fail = this.fail.bind(this);
         this.error = this.error.bind(this);
         this.complete = this.complete.bind(this);
+        this.setEmit = this.setEmit.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();
@@ -69,11 +78,11 @@ class Http extends Core_1.default {
             'Content-Type': 'application/json'
         };
         this.params.data = this.params.data ? this.cuteUndifinedParams(this.params.data) : this.params.data;
-        if (this.method === 'GET') {
+        if (this.method === 'GET' || this.method === 'HEAD') {
             if (this.params.data)
                 this.path = this.params.path + '?' + this.encodeUrlParams(this.params.data);
         }
-        if (this.method === 'POST') {
+        if (this.method === 'POST' || this.method === 'PUT') {
             this.requestParams.body = JSON.stringify(this.params.data);
         }
     }
@@ -97,6 +106,13 @@ class Http extends Core_1.default {
             this.deleteCache(this.cacheIndex);
         }
     }
+    setEmit(event, args) {
+        this.currentEvents.emit(event, args[0]);
+        this.events.emit(event, {
+            cacheIndex: this.cacheIndex,
+            args: args[0]
+        });
+    }
     //Заголовки от 200 до 299
     success(...args) {
         if (typeof this.params.success === 'function')
@@ -107,26 +123,27 @@ class Http extends Core_1.default {
         if (this.params.cacheClear && this.params.data) {
             this.clearCacheGroup(typeof this.params.cacheClear === 'string' ? this.params.cacheClear : this.params.cacheClear.group, this.params.data, typeof this.params.cacheClear === 'string' ? undefined : this.params.cacheClear.fieldKey);
         }
+        this.setEmit('api-request-success', args);
     }
     //Заголовки от 400 до 499
     fail(...args) {
         if (typeof this.params.fail === 'function') {
             this.params.fail(...args);
         }
-        this.events.emit('api-request-fail', args);
+        this.setEmit('api-request-fail', args);
     }
     //Все остальные
     error(...args) {
         if (typeof this.params.error === 'function') {
             this.params.error(...args);
         }
-        this.events.emit('api-request-error', args);
+        this.setEmit('api-request-error', args);
     }
     complete(...args) {
         if (typeof this.params.complete === 'function') {
             this.params.complete(...args);
         }
-        this.events.emit('api-request-complete', args);
+        this.setEmit('api-request-complete', args);
     }
     encodeUrlParams(data) {
         return Object.keys(data).map(function (k) {
@@ -145,7 +162,7 @@ class Http extends Core_1.default {
         return data;
     }
     request() {
-        if (typeof XMLHttpRequest === 'undefined' || this.currentCache)
+        if (typeof XMLHttpRequest === 'undefined' || this.currentCache || Queue_1.default.push(this.cacheIndex, this))
             return this;
         try {
             const xhr = new XMLHttpRequest();
@@ -185,6 +202,9 @@ class Http extends Core_1.default {
         this.requestParams.headers = Object.assign(Object.assign({}, this.requestParams.headers), { [key]: value });
         return this;
     }
+    addListener(event, callback) {
+        return this.currentEvents.addListener(event, callback);
+    }
     deleteHeader(key) {
         if (this.requestParams.headers && (key in this.requestParams.headers)) {
             delete this.requestParams.headers[key];

package/lib/Queue.d.ts

@@ -0,0 +1,13 @@
+import Http from "./Http";
+declare class Queue {
+    private static instance;
+    private queue;
+    constructor();
+    has(request: string): boolean;
+    get(request: string): Http | undefined;
+    push(request: string, instance: Http): boolean;
+    static has: (request: string) => boolean;
+    static get: (request: string) => Http | undefined;
+    static push: (request: string, instance: Http) => boolean;
+}
+export default Queue;

package/lib/Queue.js

@@ -0,0 +1,65 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Http_1 = __importDefault(require("./Http"));
+class Queue {
+    constructor() {
+        Object.defineProperty(this, "queue", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
+        this.has = this.has.bind(this);
+        this.get = this.get.bind(this);
+        this.push = this.push.bind(this);
+    }
+    has(request) {
+        return request in this.queue;
+    }
+    get(request) {
+        return this.has(request) ? this.queue[request] : undefined;
+    }
+    push(request, instance) {
+        const refInstance = this.get(request);
+        if (!refInstance) {
+            this.queue[request] = instance;
+        }
+        else {
+            refInstance === null || refInstance === void 0 ? void 0 : refInstance.addListener('api-request-success', instance.success);
+            refInstance === null || refInstance === void 0 ? void 0 : refInstance.addListener('api-request-error', instance.error);
+            refInstance === null || refInstance === void 0 ? void 0 : refInstance.addListener('api-request-fail', instance.fail);
+            refInstance === null || refInstance === void 0 ? void 0 : refInstance.addListener('api-request-complete', instance.complete);
+        }
+        return refInstance instanceof Http_1.default;
+    }
+}
+_a = Queue;
+Object.defineProperty(Queue, "instance", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: new Queue
+});
+Object.defineProperty(Queue, "has", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: _a.instance.has
+});
+Object.defineProperty(Queue, "get", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: _a.instance.get
+});
+Object.defineProperty(Queue, "push", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: _a.instance.push
+});
+exports.default = Queue;

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 import Core from "./Core";
-import { TMethod, TParams } from "./types";
+import type { TMethod, TParams, TListenerEvents } from "./types";
+import type { Event } from "easy-event-emitter";
 import Http from "./Http";
 type TUser = {
     [index: string]: any;
@@ -15,7 +16,12 @@ declare class API extends Core {
     http(method: TMethod, params: TParams): Http;
     get(params: TParams): Http;
     post(params: TParams): Http;
+    put(params: TParams): Http;
+    patch(params: TParams): Http;
+    delete(params: TParams): Http;
+    options(params: TParams): Http;
     private init;
+    addListener(event: TListenerEvents, callback: (data: any) => void): Event;
     setToken(token: string): void;
     getToken(): string | undefined;
     getUid(): number;
@@ -33,7 +39,7 @@ declare class API extends Core {
     static updateUser: (user: TUser) => void;
     static logout: () => void;
     static setToken: (token: string) => void;
-    static addListener: (event: import("./types").TListenerEvents, callback: (data: any) => void) => import("easy-event-emitter").Event;
+    static addListener: (event: TListenerEvents, callback: (data: any) => void) => Event;
     static setInitData: (data: import("./types").TGroupsData) => void;
     static clearCacheGroup: (group: string, data?: import("./types").TData | undefined, fieldKey?: string | null) => void;
     static getToken: () => string | undefined;
@@ -41,5 +47,9 @@ declare class API extends Core {
     static getUser: () => TUser;
     static user: TUser;
     static uid: number;
+    /**
+     * @deprecated The method should not be used
+     */
+    static deleteCacheGroup: (group: string, data?: import("./types").TData | undefined, fieldKey?: string | null) => void;
 }
 export default API;

package/lib/index.js

@@ -32,6 +32,10 @@ class API extends Core_1.default {
         this.http = this.http.bind(this);
         this.get = this.get.bind(this);
         this.post = this.post.bind(this);
+        this.put = this.put.bind(this);
+        this.patch = this.patch.bind(this);
+        this.delete = this.delete.bind(this);
+        this.options = this.options.bind(this);
         this.getUid = this.getUid.bind(this);
         this.getUser = this.getUser.bind(this);
     }
@@ -48,6 +52,18 @@ class API extends Core_1.default {
     post(params) {
         return this.http('POST', params).request();
     }
+    put(params) {
+        return this.http('PUT', params).request();
+    }
+    patch(params) {
+        return this.http('PATCH', params).request();
+    }
+    delete(params) {
+        return this.http('DELETE', params).request();
+    }
+    options(params) {
+        return this.http('OPTIONS', params).request();
+    }
     init() {
         if (typeof window === 'undefined')
             return;
@@ -61,6 +77,9 @@ class API extends Core_1.default {
             this.setToken(token);
         }
     }
+    addListener(event, callback) {
+        return this.events.addListener(event, callback);
+    }
     setToken(token) {
         if (typeof window === 'undefined')
             return;
@@ -208,5 +227,14 @@ Object.defineProperty(API, "uid", {
     writable: true,
     value: _a.instance.uid
 });
+/**
+ * @deprecated The method should not be used
+ */
+Object.defineProperty(API, "deleteCacheGroup", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: _a.instance.clearCacheGroup
+});
 globalThis.apiSetInitData = API.setInitData;
 exports.default = API;

package/lib/types.d.ts

@@ -12,7 +12,7 @@ export type TData = {
 export type TGroupsData = {
     [index: string]: TData;
 };
-export type TMethod = 'GET' | 'POST';
+export type TMethod = 'GET' | 'HEAD' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS';
 export type TCacheControll = string | {
     group: string;
     fieldKey: string;
@@ -36,4 +36,4 @@ export type TRequestParams = {
     };
     body?: string;
 };
-export type TListenerEvents = 'api-request-fail' | 'api-request-error' | 'api-request-complete' | 'login' | 'logout' | 'user-update';
+export type TListenerEvents = 'api-request-success' | 'api-request-fail' | 'api-request-error' | 'api-request-complete' | 'login' | 'logout' | 'user-update';

package/package.json

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

package/src/Core.ts

@@ -1,13 +1,11 @@
 import EventEmitter,{
-	Events,
-	Event
+	Events
 } from 'easy-event-emitter';
-import {
+import type {
 	TCache,
 	TCacheBody,
 	TData,
-	TGroupsData,
-	TListenerEvents
+	TGroupsData
 } from './types';
 
 abstract class Core {
@@ -24,16 +22,11 @@ abstract class Core {
 		this.initData = {};
 
 		this.setHost = this.setHost.bind(this);
-		this.addListener = this.addListener.bind(this);
 		this.setInitData = this.setInitData.bind(this);
 		this.clearCacheGroup = this.clearCacheGroup.bind(this);
 		Object.assign(this, context);
 	}
 
-	public addListener(event: TListenerEvents, callback: (data: any) => void): Event {
-		return this.events.addListener(event, callback);
-	}
-
 	protected getCache(key: string): TData | undefined {
 		if (this.cache[key]) {
 			if ((new Date()).getTime() <= (this.cache[key].time + 3600000000)) {

package/src/Http.ts

@@ -1,16 +1,23 @@
 //@ts-ignore
 import md5 from 'md5';
 import Core from "./Core";
-import {
+import Queue from './Queue';
+import EventEmitter,{
+	Event,
+	Events
+} from "easy-event-emitter";
+import type {
 	TMethod,
 	TParams,
 	TData,
-	TRequestParams
+	TRequestParams,
+	TListenerEvents
 } from "./types";
 
 class Http extends Core {
 	private cacheIndex: string;
 		currentCache?: TData;
+		currentEvents: Events
 		requestParams: TRequestParams;
 		method: TMethod;
 		params: TParams;
@@ -18,6 +25,7 @@ class Http extends Core {
 
 	constructor(method: TMethod, params: TParams, context?: Core) {
 		super(context);
+		this.currentEvents = new EventEmitter();
 		this.cacheIndex = '';
 		this.method = method;
 		this.params = params;
@@ -30,8 +38,8 @@ class Http extends Core {
 		this.fail = this.fail.bind(this);
 		this.error = this.error.bind(this);
 		this.complete = this.complete.bind(this);
+		this.setEmit = this.setEmit.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);
 
@@ -47,12 +55,12 @@ class Http extends Core {
 
 		this.params.data = this.params.data ? this.cuteUndifinedParams(this.params.data) : this.params.data;
 
-		if (this.method === 'GET') {
+		if (this.method === 'GET' || this.method === 'HEAD') {
 			if (this.params.data)
 				this.path = this.params.path + '?' + this.encodeUrlParams(this.params.data);
 		}
 
-		if (this.method === 'POST') {
+		if (this.method === 'POST' || this.method === 'PUT') {
 			this.requestParams.body = JSON.stringify(this.params.data);
 		}
 	}
@@ -77,8 +85,16 @@ class Http extends Core {
 		}
 	}
 
+	private setEmit(event: TListenerEvents, args: any) {
+		this.currentEvents.emit(event, args[0]);
+		this.events.emit(event, {
+			cacheIndex: this.cacheIndex,
+			args: args[0]
+		});
+	}
+
 	//Заголовки от 200 до 299
-	private success(...args: any) {
+	public success(...args: any) {
 		if (typeof this.params.success === 'function')
 			this.params.success(...args);
 		if (this.params.cacheUpdate && this.params.data) {
@@ -94,32 +110,33 @@ class Http extends Core {
 				this.params.data,
 				typeof this.params.cacheClear === 'string' ? undefined : this.params.cacheClear.fieldKey);
 		}
+		this.setEmit('api-request-success', args);
 	}
 
 	//Заголовки от 400 до 499
-	private fail(...args: any) {
+	public fail(...args: any) {
 		if (typeof this.params.fail === 'function') {
 			this.params.fail(...args);
 		}
 		
-		this.events.emit('api-request-fail', args);
+		this.setEmit('api-request-fail', args);
 	}
 
 	//Все остальные
-	private error(...args: any) {
+	public error(...args: any) {
 		if (typeof this.params.error === 'function') {
 			this.params.error(...args);
 		}
 		
-		this.events.emit('api-request-error', args);
+		this.setEmit('api-request-error', args);
 	}
 
-	private complete(...args: any) {
+	public complete(...args: any) {
 		if (typeof this.params.complete === 'function') {
 			this.params.complete(...args);
 		}	
 
-		this.events.emit('api-request-complete', args);
+		this.setEmit('api-request-complete', args);
 	}
 
 	private encodeUrlParams(data: TData) {
@@ -141,7 +158,7 @@ class Http extends Core {
 	}
 
 	public request(): this {
-		if (typeof XMLHttpRequest === 'undefined' || this.currentCache) return this;
+		if (typeof XMLHttpRequest === 'undefined' || this.currentCache || Queue.push(this.cacheIndex, this)) return this;
 		
 		try {
 			const xhr = new XMLHttpRequest();
@@ -186,6 +203,10 @@ class Http extends Core {
 		return this;
 	}
 
+	public addListener(event: TListenerEvents, callback: (data: any) => void): Event {
+		return this.currentEvents.addListener(event, callback);
+	}
+
 	public deleteHeader(key: string): this {
 		if (this.requestParams.headers && (key in this.requestParams.headers)) {
 			delete this.requestParams.headers[key];

package/src/Queue.ts

@@ -0,0 +1,43 @@
+import Http from "./Http";
+
+type TQueue = {
+	[index: string]: Http;
+};
+
+class Queue {
+	private static instance = new Queue;
+	private queue: TQueue = {};
+
+	constructor() {
+		this.has = this.has.bind(this);
+		this.get = this.get.bind(this);
+		this.push = this.push.bind(this);
+	}
+
+	public has(request: string) {
+		return request in this.queue;
+	}
+
+	public get(request: string) {
+		return this.has(request) ? this.queue[request] : undefined;
+	}
+
+	public push(request: string, instance: Http): boolean {
+		const refInstance = this.get(request);
+		if (!refInstance) {
+			this.queue[request] = instance;
+		}else{
+			refInstance?.addListener('api-request-success', instance.success);
+			refInstance?.addListener('api-request-error', instance.error);
+			refInstance?.addListener('api-request-fail', instance.fail);
+			refInstance?.addListener('api-request-complete', instance.complete);
+		}
+		return refInstance instanceof Http;
+	}
+
+	public static has = this.instance.has;
+	public static get = this.instance.get;
+	public static push = this.instance.push;
+}
+
+export default Queue;

package/src/index.ts

@@ -1,5 +1,12 @@
 import Core from "./Core";
-import { TMethod, TParams } from "./types";
+import type {
+	TMethod,
+	TParams,
+	TListenerEvents
+} from "./types";
+import type {
+	Event
+} from "easy-event-emitter";
 import Http from "./Http";
 
 type TUser = {
@@ -31,6 +38,10 @@ class API extends Core {
 		this.http = this.http.bind(this);
 		this.get = this.get.bind(this);
 		this.post = this.post.bind(this);
+		this.put = this.put.bind(this);
+		this.patch = this.patch.bind(this);
+		this.delete = this.delete.bind(this);
+		this.options = this.options.bind(this);
 		this.getUid = this.getUid.bind(this);
 		this.getUser = this.getUser.bind(this);
 	}
@@ -51,6 +62,22 @@ class API extends Core {
 		return this.http('POST', params).request();
 	}
 
+	public put(params: TParams): Http {
+		return this.http('PUT', params).request();
+	}
+
+	public patch(params: TParams): Http {
+		return this.http('PATCH', params).request();
+	}
+
+	public delete(params: TParams): Http {
+		return this.http('DELETE', params).request();
+	}
+
+	public options(params: TParams): Http {
+		return this.http('OPTIONS', params).request();
+	}
+
 	private init(): void {
 		if (typeof window === 'undefined') return;
 		const token = localStorage.getItem('token');
@@ -64,6 +91,10 @@ class API extends Core {
 		}
 	}
 
+	public addListener(event: TListenerEvents, callback: (data: any) => void): Event {
+		return this.events.addListener(event, callback);
+	}
+
 	public setToken(token: string) {
 		if (typeof window === 'undefined') return;
 		localStorage.setItem('token', token);
@@ -127,6 +158,11 @@ class API extends Core {
 	public static getUser = this.instance.getUser;
 	public static user = this.instance.user;
 	public static uid = this.instance.uid;
+
+	/**
+	 * @deprecated The method should not be used
+	 */
+	public static deleteCacheGroup = this.instance.clearCacheGroup;
 }
 
 (globalThis as any).apiSetInitData = API.setInitData;

package/src/types.ts

@@ -16,7 +16,7 @@ export type TGroupsData = {
 	[index: string]: TData;
 }
 
-export type TMethod = 'GET' | 'POST';
+export type TMethod = 'GET' | 'HEAD' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS';
 
 export type TCacheControll = string | {
 	group: string;
@@ -44,4 +44,4 @@ export type TRequestParams = {
 	body?: string;
 }
 
-export type TListenerEvents = 'api-request-fail' | 'api-request-error' | 'api-request-complete' | 'login' | 'logout' | 'user-update';
+export type TListenerEvents = 'api-request-success' | 'api-request-fail' | 'api-request-error' | 'api-request-complete' | 'login' | 'logout' | 'user-update';