lambder 1.0.21 → 1.0.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/LambderCaller.d.ts +46 -20
  2. package/dist/LambderCaller.js +25 -4
  3. package/package.json +1 -1
  4. package/src/LambderCaller.ts +67 -21
package/dist/LambderCaller.d.ts CHANGED
@@ -1,26 +1,41 @@
1
1
  type VoidFunction = () => void | Promise<void>;
2
- type StartEndEventHandler = (activeFetchList: {
2
+ type FetchTracker = {
3
3
  apiName: string;
4
4
  done: boolean;
5
- }[]) => void | Promise<void>;
5
+ fetchEndCalled: boolean;
6
+ };
7
+ type EventHandlerFetchParams = {
8
+ api: string;
9
+ payload?: any;
10
+ headers?: {
11
+ [key: string]: any;
12
+ };
13
+ };
14
+ type FetchStartEventHandler = (params: {
15
+ fetchParams: EventHandlerFetchParams;
16
+ activeFetchList: FetchTracker[];
17
+ }) => void | Promise<void>;
18
+ type FetchEndEventHandler = (params: {
19
+ fetchParams: EventHandlerFetchParams;
20
+ fetchResult: any;
21
+ activeFetchList: FetchTracker[];
22
+ }) => void | Promise<void>;
6
23
  type ErrorHandler = (err: Error) => void | Promise<void>;
7
24
  type MessageHandler = (message: any) => void | Promise<void>;
8
25
  export default class LambderCaller {
9
- isCorsEnabled: boolean;
10
- apiPath: string;
11
- apiVersion?: string;
12
- fetchTrackerList: {
13
- apiName: string;
14
- done: boolean;
15
- }[];
16
- versionExpiredHandler?: VoidFunction;
17
- sessionExpiredHandler?: VoidFunction;
18
- messageHandler?: MessageHandler;
19
- errorMessageHandler?: MessageHandler;
20
- notAuthorizedHandler?: VoidFunction;
21
- errorHandler?: ErrorHandler;
22
- fetchStartedHandler?: StartEndEventHandler;
23
- fetchEndedHandler?: StartEndEventHandler;
26
+ private isCorsEnabled;
27
+ private apiPath;
28
+ private apiVersion?;
29
+ fetchTrackerList: FetchTracker[];
30
+ isLoading: boolean;
31
+ private versionExpiredHandler?;
32
+ private sessionExpiredHandler?;
33
+ private messageHandler?;
34
+ private errorMessageHandler?;
35
+ private notAuthorizedHandler?;
36
+ private errorHandler?;
37
+ private fetchStartedHandler?;
38
+ private fetchEndedHandler?;
24
39
  constructor({ isCorsEnabled, apiPath, apiVersion, versionExpiredHandler, sessionExpiredHandler, messageHandler, errorMessageHandler, notAuthorizedHandler, errorHandler, fetchStartedHandler, fetchEndedHandler, }: {
25
40
  isCorsEnabled: boolean;
26
41
  apiPath: string;
@@ -31,9 +46,20 @@ export default class LambderCaller {
31
46
  errorMessageHandler?: MessageHandler;
32
47
  notAuthorizedHandler?: VoidFunction;
33
48
  errorHandler?: ErrorHandler;
34
- fetchStartedHandler?: StartEndEventHandler;
35
- fetchEndedHandler?: StartEndEventHandler;
49
+ fetchStartedHandler?: FetchStartEventHandler;
50
+ fetchEndedHandler?: FetchEndEventHandler;
36
51
  });
37
- private api;
52
+ api(apiName: string, payload?: any, headers?: {
53
+ [key: string]: any;
54
+ }, options?: {
55
+ versionExpiredHandler?: VoidFunction;
56
+ sessionExpiredHandler?: VoidFunction;
57
+ messageHandler?: MessageHandler;
58
+ errorMessageHandler?: MessageHandler;
59
+ notAuthorizedHandler?: VoidFunction;
60
+ errorHandler?: ErrorHandler;
61
+ fetchStartedHandler?: FetchStartEventHandler;
62
+ fetchEndedHandler?: FetchEndEventHandler;
63
+ }): Promise<any>;
38
64
  }
39
65
  export {};
package/dist/LambderCaller.js CHANGED
@@ -4,6 +4,7 @@ export default class LambderCaller {
4
4
  apiPath;
5
5
  apiVersion;
6
6
  fetchTrackerList = [];
7
+ isLoading = false;
7
8
  versionExpiredHandler;
8
9
  sessionExpiredHandler;
9
10
  messageHandler;
@@ -26,12 +27,15 @@ export default class LambderCaller {
26
27
  this.fetchEndedHandler = fetchEndedHandler;
27
28
  }
28
29
  ;
29
- async api(apiName, payload, headers) {
30
- const fetchTracker = { apiName, done: false };
30
+ async api(apiName, payload, headers, options) {
31
+ const fetchTracker = { apiName, done: false, fetchEndCalled: false };
31
32
  try {
32
33
  this.fetchTrackerList.push(fetchTracker);
33
34
  if (this.fetchStartedHandler)
34
- await this.fetchStartedHandler(this.fetchTrackerList.filter(v => !v.done));
35
+ await this.fetchStartedHandler({
36
+ fetchParams: { api: apiName, payload, headers, },
37
+ activeFetchList: this.fetchTrackerList.filter(v => !v.done)
38
+ });
35
39
  const version = this.apiVersion;
36
40
  const token = Cookies.get("LMBRTOKEN") || "";
37
41
  const siteHost = window.location.hostname;
@@ -45,6 +49,15 @@ export default class LambderCaller {
45
49
  throw new Error("Request failed: " + res.status + " - " + res.statusText);
46
50
  return res.json();
47
51
  });
52
+ fetchTracker.done = true;
53
+ if (this.fetchEndedHandler) {
54
+ fetchTracker.fetchEndCalled = true;
55
+ await this.fetchEndedHandler({
56
+ fetchParams: { api: apiName, payload, headers, },
57
+ fetchResult: data,
58
+ activeFetchList: this.fetchTrackerList.filter(v => !v.done),
59
+ });
60
+ }
48
61
  if (data && data.versionExpired) {
49
62
  if (this.versionExpiredHandler) {
50
63
  await this.versionExpiredHandler();
@@ -83,9 +96,17 @@ export default class LambderCaller {
83
96
  return data.payload ?? null;
84
97
  }
85
98
  catch (err) {
99
+ const wrappedError = err instanceof Error ? err : new Error("Error: " + String(err));
86
100
  fetchTracker.done = true;
101
+ if (!fetchTracker.fetchEndCalled && this.fetchEndedHandler) {
102
+ await this.fetchEndedHandler({
103
+ fetchParams: { api: apiName, payload, headers, },
104
+ fetchResult: wrappedError,
105
+ activeFetchList: this.fetchTrackerList.filter(v => !v.done)
106
+ });
107
+ }
87
108
  if (this.errorHandler) {
88
- this.errorHandler(err instanceof Error ? err : new Error("Error: " + String(err)));
109
+ this.errorHandler(wrappedError);
89
110
  }
90
111
  }
91
112
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "lambder",
3
- "version": "1.0.21",
3
+ "version": "1.0.23",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/LambderCaller.ts CHANGED
@@ -1,26 +1,45 @@
1
1
  import Cookies from 'js-cookie';
2
2
 
3
3
  type VoidFunction = ()=>void|Promise<void>;
4
- type StartEndEventHandler = (activeFetchList:{ apiName: string, done: boolean}[])=>void|Promise<void>;
4
+ type FetchTracker = { apiName: string, done: boolean, fetchEndCalled: boolean };
5
+ type EventHandlerFetchParams = {
6
+ api: string,
7
+ payload?: any,
8
+ headers?: { [key:string]: any }
9
+ };
10
+
11
+ type FetchStartEventHandler = (params: {
12
+ fetchParams: EventHandlerFetchParams,
13
+ activeFetchList: FetchTracker[],
14
+ })=>void|Promise<void>;
15
+
16
+ type FetchEndEventHandler = (params: {
17
+ fetchParams: EventHandlerFetchParams,
18
+ fetchResult: any,
19
+ activeFetchList: FetchTracker[],
20
+ })=>void|Promise<void>;
21
+
5
22
  type ErrorHandler = (err: Error) => void|Promise<void>;
6
23
  type MessageHandler = (message:any) => void|Promise<void>;
7
24
 
8
25
  export default class LambderCaller {
9
- isCorsEnabled: boolean;
10
- apiPath: string;
11
- apiVersion?: string;
26
+ private isCorsEnabled: boolean;
27
+ private apiPath: string;
28
+ private apiVersion?: string;
12
29
 
13
- fetchTrackerList: { apiName: string, done: boolean}[] = [];
14
- versionExpiredHandler?: VoidFunction;
15
- sessionExpiredHandler?: VoidFunction;
30
+ fetchTrackerList: FetchTracker[] = [];
31
+ isLoading: boolean = false;
16
32
 
17
- messageHandler?: MessageHandler;
18
- errorMessageHandler?: MessageHandler;
19
- notAuthorizedHandler?: VoidFunction;
20
- errorHandler?: ErrorHandler;
33
+ private versionExpiredHandler?: VoidFunction;
34
+ private sessionExpiredHandler?: VoidFunction;
35
+
36
+ private messageHandler?: MessageHandler;
37
+ private errorMessageHandler?: MessageHandler;
38
+ private notAuthorizedHandler?: VoidFunction;
39
+ private errorHandler?: ErrorHandler;
21
40
 
22
- fetchStartedHandler?: StartEndEventHandler;
23
- fetchEndedHandler?: StartEndEventHandler;
41
+ private fetchStartedHandler?: FetchStartEventHandler;
42
+ private fetchEndedHandler?: FetchEndEventHandler;
24
43
 
25
44
  constructor(
26
45
  {
@@ -40,8 +59,8 @@ export default class LambderCaller {
40
59
  errorMessageHandler?: MessageHandler,
41
60
  notAuthorizedHandler?: VoidFunction,
42
61
  errorHandler?: ErrorHandler,
43
- fetchStartedHandler?: StartEndEventHandler,
44
- fetchEndedHandler?: StartEndEventHandler,
62
+ fetchStartedHandler?: FetchStartEventHandler,
63
+ fetchEndedHandler?: FetchEndEventHandler,
45
64
  }
46
65
  ){
47
66
  this.isCorsEnabled = isCorsEnabled;
@@ -61,11 +80,23 @@ export default class LambderCaller {
61
80
 
62
81
  };
63
82
 
64
- private async api(apiName: string, payload: any, headers?: { [key:string]: any }){
65
- const fetchTracker = { apiName, done: false };
83
+ async api(apiName: string, payload?: any, headers?: { [key:string]: any }, options?: {
84
+ versionExpiredHandler?: VoidFunction,
85
+ sessionExpiredHandler?: VoidFunction,
86
+ messageHandler?: MessageHandler,
87
+ errorMessageHandler?: MessageHandler,
88
+ notAuthorizedHandler?: VoidFunction,
89
+ errorHandler?: ErrorHandler,
90
+ fetchStartedHandler?: FetchStartEventHandler,
91
+ fetchEndedHandler?: FetchEndEventHandler,
92
+ }){
93
+ const fetchTracker: FetchTracker = { apiName, done: false, fetchEndCalled: false };
66
94
  try {
67
95
  this.fetchTrackerList.push(fetchTracker);
68
- if(this.fetchStartedHandler) await this.fetchStartedHandler(this.fetchTrackerList.filter(v=>!v.done));
96
+ if(this.fetchStartedHandler) await this.fetchStartedHandler({
97
+ fetchParams: { api: apiName, payload, headers, },
98
+ activeFetchList: this.fetchTrackerList.filter(v=>!v.done)
99
+ });
69
100
  const version = this.apiVersion;
70
101
  const token = Cookies.get("LMBRTOKEN") || "";
71
102
  const siteHost = window.location.hostname;
@@ -78,6 +109,15 @@ export default class LambderCaller {
78
109
  if(res.status >= 500) throw new Error("Request failed: " + res.status + " - " + res.statusText);
79
110
  return res.json();
80
111
  });
112
+ fetchTracker.done = true;
113
+ if(this.fetchEndedHandler){
114
+ fetchTracker.fetchEndCalled = true;
115
+ await this.fetchEndedHandler({
116
+ fetchParams: { api: apiName, payload, headers, },
117
+ fetchResult: data,
118
+ activeFetchList: this.fetchTrackerList.filter(v=>!v.done),
119
+ });
120
+ }
81
121
  if(data && data.versionExpired){
82
122
  if(this.versionExpiredHandler){
83
123
  await this.versionExpiredHandler();
@@ -112,10 +152,16 @@ export default class LambderCaller {
112
152
  }
113
153
  return data.payload ?? null;
114
154
  }catch(err){
115
- fetchTracker.done = true
116
- if(this.errorHandler){
117
- this.errorHandler(err instanceof Error ? err : new Error("Error: " + String(err)));
155
+ const wrappedError = err instanceof Error ? err : new Error("Error: " + String(err));
156
+ fetchTracker.done = true;
157
+ if(!fetchTracker.fetchEndCalled && this.fetchEndedHandler){
158
+ await this.fetchEndedHandler({
159
+ fetchParams: { api: apiName, payload, headers, },
160
+ fetchResult: wrappedError,
161
+ activeFetchList: this.fetchTrackerList.filter(v=>!v.done)
162
+ });
118
163
  }
164
+ if(this.errorHandler){ this.errorHandler(wrappedError); }
119
165
  }
120
166
  };
121
167
  }