@addev-be/ui 2.5.20 → 2.6.0
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.
- package/assets/icons/arrow-down-1-9.svg +1 -1
- package/assets/icons/arrow-down-a-z.svg +1 -1
- package/assets/icons/arrow-up-z-a.svg +1 -1
- package/assets/icons/check.svg +1 -1
- package/assets/icons/circle-check.svg +1 -1
- package/assets/icons/down.svg +1 -1
- package/assets/icons/filter-full.svg +1 -1
- package/assets/icons/filter.svg +1 -1
- package/assets/icons/hashtag.svg +1 -1
- package/assets/icons/image-slash.svg +1 -1
- package/assets/icons/left.svg +1 -1
- package/assets/icons/magnifier.svg +1 -1
- package/assets/icons/phone.svg +1 -1
- package/assets/icons/right.svg +1 -1
- package/assets/icons/sort-calendar-ascending.svg +5 -5
- package/assets/icons/spinner-third.svg +1 -1
- package/assets/icons/table-columns.svg +1 -1
- package/assets/icons/table-footer-slash.svg +4 -4
- package/assets/icons/table-footer.svg +3 -3
- package/assets/icons/up.svg +1 -1
- package/assets/icons/user-tie.svg +1 -1
- package/assets/icons/x-bar.svg +3 -3
- package/dist/components/data/AdvancedRequestDataGrid/helpers/advancedRequests.js +9 -8
- package/dist/components/data/AdvancedRequestDataGrid/helpers/columns.js +21 -72
- package/dist/components/data/AdvancedRequestDataGrid/index.js +2 -2
- package/dist/components/data/AdvancedRequestDataGrid/types.d.ts +1 -1
- package/dist/components/data/DataGrid/AdvancedRequestDataGrid.d.ts +10 -0
- package/dist/components/data/DataGrid/AdvancedRequestDataGrid.js +173 -0
- package/dist/components/data/DataGrid/FilterValuesScroller.d.ts +13 -0
- package/dist/components/data/DataGrid/FilterValuesScroller.js +73 -0
- package/dist/components/data/DataGrid/VirtualScroller.d.ts +11 -0
- package/dist/components/data/DataGrid/VirtualScroller.js +41 -0
- package/dist/components/data/DataGrid/helpers/advancedRequests.d.ts +12 -0
- package/dist/components/data/DataGrid/helpers/advancedRequests.js +53 -0
- package/dist/components/data/DataGrid/helpers.d.ts +28 -0
- package/dist/components/data/DataGrid/helpers.js +436 -0
- package/dist/components/data/SmartQueryDataGrid/helpers/columns.d.ts +20 -0
- package/dist/components/data/SmartQueryDataGrid/helpers/columns.js +160 -0
- package/dist/components/data/SmartQueryDataGrid/helpers/hooks.d.ts +5 -0
- package/dist/components/data/SmartQueryDataGrid/helpers/hooks.js +41 -0
- package/dist/components/data/SmartQueryDataGrid/helpers/index.d.ts +2 -0
- package/dist/components/data/SmartQueryDataGrid/helpers/index.js +18 -0
- package/dist/components/data/SmartQueryDataGrid/helpers/smartQueries.d.ts +3 -0
- package/dist/components/data/SmartQueryDataGrid/helpers/smartQueries.js +15 -0
- package/dist/components/data/SmartQueryDataGrid/hooks.d.ts +9 -0
- package/dist/components/data/SmartQueryDataGrid/hooks.js +63 -0
- package/dist/components/data/SmartQueryDataGrid/index.d.ts +12 -0
- package/dist/components/data/SmartQueryDataGrid/index.js +242 -0
- package/dist/components/data/SmartQueryDataGrid/types.d.ts +22 -0
- package/dist/components/data/SmartQueryDataGrid/types.js +2 -0
- package/dist/components/data/SqlRequestDataGrid/SqlRequestForeignListEditableCell.d.ts +2 -1
- package/dist/components/data/SqlRequestDataGrid/SqlRequestForeignListEditableCell.js +2 -3
- package/dist/components/forms/BillitIdentifier/index.d.ts +6 -0
- package/dist/components/forms/BillitIdentifier/index.js +71 -0
- package/dist/components/forms/BillitIdentifier/styles.d.ts +2 -0
- package/dist/components/forms/BillitIdentifier/styles.js +15 -0
- package/dist/components/forms/Form/FormGroup.d.ts +1 -0
- package/dist/components/forms/Form/FormGroup.js +2 -2
- package/dist/components/forms/Form/InputWithLabel.d.ts +2 -0
- package/dist/components/forms/Form/InputWithLabel.js +10 -0
- package/dist/components/forms/Form/Row.js +1 -1
- package/dist/components/forms/Form/Select.d.ts +3 -1
- package/dist/components/forms/Form/Select.js +19 -10
- package/dist/components/forms/Form/index.d.ts +4 -1
- package/dist/components/forms/Form/styles.d.ts +5 -3
- package/dist/components/forms/Form/styles.js +19 -14
- package/dist/components/forms/Form/types.d.ts +7 -0
- package/dist/components/forms/Form/types.js +2 -0
- package/dist/components/forms/styles.js +1 -1
- package/dist/components/ui/Card/index.d.ts +2 -1
- package/dist/components/ui/Card/styles.d.ts +2 -1
- package/dist/components/ui/Card/styles.js +2 -1
- package/dist/components/ui/TabsView/TabsList.d.ts +1 -0
- package/dist/components/ui/TabsView/TabsList.js +4 -2
- package/dist/components/ui/TabsView/TabsView.d.ts +3 -1
- package/dist/components/ui/TabsView/TabsView.js +2 -2
- package/dist/components/ui/TabsView/styles.js +4 -4
- package/dist/config/types.d.ts +11 -0
- package/dist/config/types.js +2 -0
- package/dist/helpers/react.d.ts +2 -0
- package/dist/helpers/react.js +8 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/providers/ThemeProvider/defaultTheme.js +1 -0
- package/dist/providers/ThemeProvider/helpers.d.ts +1 -1
- package/dist/providers/ThemeProvider/index.js +1 -1
- package/dist/providers/ThemeProvider/types.d.ts +1 -1
- package/dist/services/index.js +17 -7
- package/dist/services/requests/userPermissions.d.ts +4 -0
- package/dist/services/requests/userPermissions.js +20 -0
- package/dist/services/sqlRequests.d.ts +1 -1
- package/eslint.config.js +3 -3
- package/package.json +2 -2
- package/src/Icons.tsx +138 -138
- package/src/components/auth/LoginForm.tsx +86 -86
- package/src/components/auth/LoginPage.tsx +32 -32
- package/src/components/auth/PasswordRecoveryForm.tsx +53 -53
- package/src/components/auth/PasswordResetForm.tsx +112 -112
- package/src/components/auth/styles.ts +14 -14
- package/src/components/data/DataGrid/DataGridCell.tsx +81 -81
- package/src/components/data/DataGrid/DataGridColumnsModal/helpers.ts +9 -9
- package/src/components/data/DataGrid/DataGridColumnsModal/hooks.tsx +59 -59
- package/src/components/data/DataGrid/DataGridColumnsModal/index.tsx +182 -182
- package/src/components/data/DataGrid/DataGridColumnsModal/styles.ts +104 -104
- package/src/components/data/DataGrid/DataGridEditableCell/CheckboxEditableCell.tsx +37 -37
- package/src/components/data/DataGrid/DataGridEditableCell/DateEditableCell.tsx +38 -38
- package/src/components/data/DataGrid/DataGridEditableCell/NumberEditableCell.tsx +71 -71
- package/src/components/data/DataGrid/DataGridEditableCell/TextEditableCell.tsx +37 -37
- package/src/components/data/DataGrid/DataGridEditableCell/index.tsx +106 -106
- package/src/components/data/DataGrid/DataGridEditableCell/styles.ts +35 -35
- package/src/components/data/DataGrid/DataGridEditableCell/types.ts +18 -18
- package/src/components/data/DataGrid/DataGridFilterMenu/FilterValuesScroller.tsx +129 -129
- package/src/components/data/DataGrid/DataGridFilterMenu/hooks.tsx +81 -81
- package/src/components/data/DataGrid/DataGridFilterMenu/index.tsx +370 -370
- package/src/components/data/DataGrid/DataGridFilterMenu/styles.ts +97 -97
- package/src/components/data/DataGrid/DataGridFooter.tsx +47 -47
- package/src/components/data/DataGrid/DataGridHeader.tsx +74 -74
- package/src/components/data/DataGrid/DataGridHeaderCell.tsx +112 -112
- package/src/components/data/DataGrid/DataGridRowTemplate.tsx +83 -83
- package/src/components/data/DataGrid/DataGridToolbar.tsx +134 -134
- package/src/components/data/DataGrid/FilterModalContent/index.tsx +137 -137
- package/src/components/data/DataGrid/FilterModalContent/styles.ts +22 -22
- package/src/components/data/DataGrid/constants.ts +6 -6
- package/src/components/data/DataGrid/helpers/columns.tsx +449 -449
- package/src/components/data/DataGrid/helpers/filters.ts +287 -287
- package/src/components/data/DataGrid/helpers/index.ts +2 -2
- package/src/components/data/DataGrid/hooks/index.ts +29 -29
- package/src/components/data/DataGrid/hooks/useDataGrid.tsx +383 -383
- package/src/components/data/DataGrid/hooks/useDataGridChangedRows.ts +97 -97
- package/src/components/data/DataGrid/hooks/useDataGridCopy.ts +174 -174
- package/src/components/data/DataGrid/hooks/useDataGridSettings.ts +48 -48
- package/src/components/data/DataGrid/hooks/useRefreshModal.tsx +48 -48
- package/src/components/data/DataGrid/index.tsx +111 -111
- package/src/components/data/DataGrid/styles.ts +434 -434
- package/src/components/data/DataGrid/types.ts +380 -380
- package/src/components/data/SqlRequestDataGrid/helpers/columns.tsx +526 -526
- package/src/components/data/SqlRequestDataGrid/helpers/index.ts +2 -2
- package/src/components/data/SqlRequestDataGrid/helpers/rows.ts +24 -24
- package/src/components/data/SqlRequestDataGrid/helpers/sqlRequests.ts +17 -17
- package/src/components/data/SqlRequestDataGrid/index.tsx +417 -417
- package/src/components/data/SqlRequestDataGrid/styles.ts +15 -15
- package/src/components/data/SqlRequestDataGrid/types.ts +74 -74
- package/src/components/data/SqlRequestForeignList/index.tsx +254 -254
- package/src/components/data/SqlRequestForeignList/styles.ts +43 -43
- package/src/components/data/SqlRequestForeignList/types.ts +32 -32
- package/src/components/data/SqlRequestGrid/filters/FiltersSidebar.tsx +108 -108
- package/src/components/data/SqlRequestGrid/filters/styles.ts +88 -88
- package/src/components/data/SqlRequestGrid/helpers/index.ts +1 -1
- package/src/components/data/SqlRequestGrid/helpers/sqlRequests.ts +16 -16
- package/src/components/data/SqlRequestGrid/index.tsx +304 -304
- package/src/components/data/SqlRequestGrid/styles.ts +20 -20
- package/src/components/data/SqlRequestGrid/types.ts +73 -73
- package/src/components/data/VirtualScroller/hooks.ts +71 -71
- package/src/components/data/VirtualScroller/index.tsx +89 -89
- package/src/components/data/VirtualScroller/styles.ts +57 -57
- package/src/components/data/VirtualScroller/types.ts +10 -10
- package/src/components/forms/AutoTextArea.tsx +48 -48
- package/src/components/forms/BillitIdentifier/index.tsx +78 -0
- package/src/components/forms/BillitIdentifier/styles.tsx +43 -0
- package/src/components/forms/Button.tsx +132 -132
- package/src/components/forms/Form/Checkbox.tsx +12 -12
- package/src/components/forms/Form/CustomSelect.tsx +86 -86
- package/src/components/forms/Form/FormGroup.tsx +33 -31
- package/src/components/forms/Form/Input.tsx +16 -16
- package/src/components/forms/Form/Row.tsx +28 -32
- package/src/components/forms/Form/Select.tsx +99 -82
- package/src/components/forms/Form/TextArea.tsx +17 -17
- package/src/components/forms/Form/index.tsx +48 -48
- package/src/components/forms/Form/styles.ts +148 -184
- package/src/components/forms/IconButton.tsx +61 -61
- package/src/components/forms/IndeterminateCheckbox.tsx +46 -46
- package/src/components/forms/NumberInput.tsx +53 -53
- package/src/components/forms/Select.tsx +34 -34
- package/src/components/forms/VerticalLabel.tsx +20 -20
- package/src/components/forms/styles.ts +42 -42
- package/src/components/layout/Columns.ts +28 -28
- package/src/components/layout/Dropdown/index.tsx +113 -113
- package/src/components/layout/Dropdown/styles.ts +53 -53
- package/src/components/layout/Flexbox.ts +21 -21
- package/src/components/layout/Grid/index.tsx +8 -8
- package/src/components/layout/Grid/styles.ts +34 -34
- package/src/components/layout/Loading/index.tsx +29 -29
- package/src/components/layout/Loading/styles.ts +29 -29
- package/src/components/layout/Masonry/index.tsx +29 -29
- package/src/components/layout/Masonry/styles.ts +20 -20
- package/src/components/layout/Modal/index.tsx +51 -51
- package/src/components/layout/Modal/styles.ts +125 -125
- package/src/components/search/HighlightedText.tsx +41 -41
- package/src/components/search/QuickSearchBar.tsx +102 -102
- package/src/components/search/QuickSearchResults.tsx +86 -86
- package/src/components/search/styles.ts +96 -96
- package/src/components/search/types.ts +29 -29
- package/src/components/ui/Avatar/index.tsx +54 -54
- package/src/components/ui/Card/index.tsx +16 -14
- package/src/components/ui/Card/styles.ts +41 -37
- package/src/components/ui/ContextMenu/index.tsx +79 -79
- package/src/components/ui/ContextMenu/styles.ts +119 -119
- package/src/components/ui/Ellipsis.tsx +33 -33
- package/src/components/ui/Label.tsx +93 -93
- package/src/components/ui/Message/index.tsx +57 -57
- package/src/components/ui/Message/styles.ts +44 -44
- package/src/components/ui/TabsView/TabsList.tsx +49 -44
- package/src/components/ui/TabsView/TabsView.tsx +42 -38
- package/src/components/ui/TabsView/styles.ts +84 -76
- package/src/components/ui/TabsView/types.ts +15 -15
- package/src/config/index.ts +10 -10
- package/src/helpers/components.ts +9 -9
- package/src/helpers/dates.ts +17 -17
- package/src/helpers/getScrollbarSize.ts +14 -14
- package/src/helpers/numbers.ts +63 -63
- package/src/helpers/responsive.ts +83 -83
- package/src/helpers/styled/space.ts +114 -114
- package/src/helpers/styled/typography.ts +25 -25
- package/src/helpers/text.ts +13 -13
- package/src/helpers/types.ts +9 -9
- package/src/hooks/useContainerMediaQuery.ts +7 -7
- package/src/hooks/useElementSize.ts +24 -24
- package/src/hooks/useMediaQuery.ts +9 -9
- package/src/hooks/useMediaQueryForWidth.ts +35 -35
- package/src/hooks/useMutableState.test.ts +410 -410
- package/src/hooks/useMutableState.ts +39 -39
- package/src/hooks/useShowArchived.ts +28 -28
- package/src/hooks/useWindowSize.ts +20 -20
- package/src/index.ts +103 -102
- package/src/providers/AuthenticationProvider/helpers.ts +3 -3
- package/src/providers/AuthenticationProvider/index.tsx +303 -303
- package/src/providers/LoadingProvider/index.tsx +47 -47
- package/src/providers/PortalsProvider/index.tsx +54 -54
- package/src/providers/PortalsProvider/styles.ts +31 -31
- package/src/providers/SettingsProvider/index.tsx +70 -70
- package/src/providers/ThemeProvider/defaultTheme.ts +471 -470
- package/src/providers/ThemeProvider/helpers.ts +84 -84
- package/src/providers/ThemeProvider/index.ts +73 -66
- package/src/providers/ThemeProvider/types.ts +134 -134
- package/src/providers/ToastProvider/index.tsx +93 -93
- package/src/providers/TrackingProvider/index.tsx +71 -71
- package/src/providers/UiProviders/index.tsx +76 -76
- package/src/providers/UiProviders/styles.ts +10 -10
- package/src/providers/hooks.ts +14 -14
- package/src/services/HttpService.ts +92 -92
- package/src/services/WebSocketService.ts +155 -155
- package/src/services/advancedRequests.ts +102 -102
- package/src/services/base.ts +23 -23
- package/src/services/globalSearch.ts +32 -32
- package/src/services/hooks.ts +92 -92
- package/src/services/requests/auth.ts +44 -44
- package/src/services/requests/generic.ts +62 -62
- package/src/services/requests/printing.ts +12 -12
- package/src/services/requests/tracking.ts +12 -12
- package/src/services/requests/userProfiles.ts +35 -35
- package/src/services/requests/users.ts +28 -28
- package/src/services/smartQueries.ts +122 -122
- package/src/services/sqlRequests.ts +119 -113
- package/src/services/types/auth.ts +98 -98
- package/src/services/types/base.ts +10 -10
- package/src/services/types/generic.ts +82 -82
- package/src/services/types/printing.ts +10 -10
- package/src/services/types/tracking.ts +29 -29
- package/src/services/types/userProfiles.ts +79 -79
- package/src/services/types/users.ts +74 -74
- package/src/services/updateSqlRequests.ts +32 -32
- package/src/styles/animations.scss +30 -30
- package/src/styles/index.scss +42 -42
- package/src/types.ts +8 -8
- package/src/typings.d.ts +2 -2
- package/tsconfig.json +18 -18
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -1,92 +1,92 @@
|
|
|
1
|
-
import { Config } from '../config';
|
|
2
|
-
import { trimEnd } from 'lodash';
|
|
3
|
-
import { v4 } from 'uuid';
|
|
4
|
-
|
|
5
|
-
export class HttpService {
|
|
6
|
-
private static instance: HttpService;
|
|
7
|
-
private config: Config;
|
|
8
|
-
private promises: {
|
|
9
|
-
[id: string]: {
|
|
10
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
11
|
-
resolve: (value: any) => void;
|
|
12
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
13
|
-
reject: (reason?: any) => void;
|
|
14
|
-
};
|
|
15
|
-
} = {};
|
|
16
|
-
|
|
17
|
-
constructor(config: Config) {
|
|
18
|
-
HttpService.instance = this;
|
|
19
|
-
this.config = config;
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
public static getInstance() {
|
|
23
|
-
return HttpService.instance;
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
public sendRequest<TReq, TRes>(
|
|
27
|
-
name: string,
|
|
28
|
-
data: TReq,
|
|
29
|
-
files?: Record<string, File>
|
|
30
|
-
) {
|
|
31
|
-
const id = v4();
|
|
32
|
-
const promise = new Promise<TRes>((resolve, reject) => {
|
|
33
|
-
this.promises[id] = { resolve, reject };
|
|
34
|
-
|
|
35
|
-
const formData = new FormData();
|
|
36
|
-
formData.append('id', id);
|
|
37
|
-
formData.append('data', JSON.stringify(data));
|
|
38
|
-
if (files) {
|
|
39
|
-
Object.entries(files).forEach(([key, file]) => {
|
|
40
|
-
formData.append(key, file);
|
|
41
|
-
});
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
console.log('[HTTP] Sending request:', { id, name, data });
|
|
45
|
-
fetch(`${trimEnd(this.config.httpServerUrl, '/')}/${name}`, {
|
|
46
|
-
method: 'POST',
|
|
47
|
-
headers: {
|
|
48
|
-
'Content-Type': 'application/json',
|
|
49
|
-
},
|
|
50
|
-
body: formData,
|
|
51
|
-
})
|
|
52
|
-
.then(async (response) => {
|
|
53
|
-
if (!response.ok) {
|
|
54
|
-
throw new Error('HTTP request failed');
|
|
55
|
-
}
|
|
56
|
-
const body = await response.text();
|
|
57
|
-
this.parseMessage(body);
|
|
58
|
-
})
|
|
59
|
-
.catch((error) => {
|
|
60
|
-
reject(error);
|
|
61
|
-
});
|
|
62
|
-
});
|
|
63
|
-
return promise;
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
private parseMessage(message: string) {
|
|
67
|
-
try {
|
|
68
|
-
const response = JSON.parse(message);
|
|
69
|
-
if (!response.id) {
|
|
70
|
-
throw new Error('Received message is not valid');
|
|
71
|
-
}
|
|
72
|
-
if (this.promises[response.id]) {
|
|
73
|
-
console.log('[HTTP] Received response:', response);
|
|
74
|
-
if (
|
|
75
|
-
typeof response.data?.status === 'number' &&
|
|
76
|
-
response.data.status < 0
|
|
77
|
-
) {
|
|
78
|
-
this.promises[response.id].reject(new Error(response.data.message));
|
|
79
|
-
} else {
|
|
80
|
-
this.promises[response.id].resolve(response.data);
|
|
81
|
-
}
|
|
82
|
-
delete this.promises[response.id];
|
|
83
|
-
} else {
|
|
84
|
-
console.log('[HTTP] Received request:', response);
|
|
85
|
-
// TODO : Implement request handling
|
|
86
|
-
throw new Error('Not yet implemented');
|
|
87
|
-
}
|
|
88
|
-
} catch (error) {
|
|
89
|
-
console.error('[HTTP] Error parsing message:', error);
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
}
|
|
1
|
+
import { Config } from '../config';
|
|
2
|
+
import { trimEnd } from 'lodash';
|
|
3
|
+
import { v4 } from 'uuid';
|
|
4
|
+
|
|
5
|
+
export class HttpService {
|
|
6
|
+
private static instance: HttpService;
|
|
7
|
+
private config: Config;
|
|
8
|
+
private promises: {
|
|
9
|
+
[id: string]: {
|
|
10
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
11
|
+
resolve: (value: any) => void;
|
|
12
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
13
|
+
reject: (reason?: any) => void;
|
|
14
|
+
};
|
|
15
|
+
} = {};
|
|
16
|
+
|
|
17
|
+
constructor(config: Config) {
|
|
18
|
+
HttpService.instance = this;
|
|
19
|
+
this.config = config;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
public static getInstance() {
|
|
23
|
+
return HttpService.instance;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
public sendRequest<TReq, TRes>(
|
|
27
|
+
name: string,
|
|
28
|
+
data: TReq,
|
|
29
|
+
files?: Record<string, File>
|
|
30
|
+
) {
|
|
31
|
+
const id = v4();
|
|
32
|
+
const promise = new Promise<TRes>((resolve, reject) => {
|
|
33
|
+
this.promises[id] = { resolve, reject };
|
|
34
|
+
|
|
35
|
+
const formData = new FormData();
|
|
36
|
+
formData.append('id', id);
|
|
37
|
+
formData.append('data', JSON.stringify(data));
|
|
38
|
+
if (files) {
|
|
39
|
+
Object.entries(files).forEach(([key, file]) => {
|
|
40
|
+
formData.append(key, file);
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
console.log('[HTTP] Sending request:', { id, name, data });
|
|
45
|
+
fetch(`${trimEnd(this.config.httpServerUrl, '/')}/${name}`, {
|
|
46
|
+
method: 'POST',
|
|
47
|
+
headers: {
|
|
48
|
+
'Content-Type': 'application/json',
|
|
49
|
+
},
|
|
50
|
+
body: formData,
|
|
51
|
+
})
|
|
52
|
+
.then(async (response) => {
|
|
53
|
+
if (!response.ok) {
|
|
54
|
+
throw new Error('HTTP request failed');
|
|
55
|
+
}
|
|
56
|
+
const body = await response.text();
|
|
57
|
+
this.parseMessage(body);
|
|
58
|
+
})
|
|
59
|
+
.catch((error) => {
|
|
60
|
+
reject(error);
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
return promise;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
private parseMessage(message: string) {
|
|
67
|
+
try {
|
|
68
|
+
const response = JSON.parse(message);
|
|
69
|
+
if (!response.id) {
|
|
70
|
+
throw new Error('Received message is not valid');
|
|
71
|
+
}
|
|
72
|
+
if (this.promises[response.id]) {
|
|
73
|
+
console.log('[HTTP] Received response:', response);
|
|
74
|
+
if (
|
|
75
|
+
typeof response.data?.status === 'number' &&
|
|
76
|
+
response.data.status < 0
|
|
77
|
+
) {
|
|
78
|
+
this.promises[response.id].reject(new Error(response.data.message));
|
|
79
|
+
} else {
|
|
80
|
+
this.promises[response.id].resolve(response.data);
|
|
81
|
+
}
|
|
82
|
+
delete this.promises[response.id];
|
|
83
|
+
} else {
|
|
84
|
+
console.log('[HTTP] Received request:', response);
|
|
85
|
+
// TODO : Implement request handling
|
|
86
|
+
throw new Error('Not yet implemented');
|
|
87
|
+
}
|
|
88
|
+
} catch (error) {
|
|
89
|
+
console.error('[HTTP] Error parsing message:', error);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
@@ -1,155 +1,155 @@
|
|
|
1
|
-
import { Config } from '../config';
|
|
2
|
-
import { Request } from './base';
|
|
3
|
-
import { Subject } from 'rxjs';
|
|
4
|
-
import { v4 } from 'uuid';
|
|
5
|
-
|
|
6
|
-
export class WebSocketError extends Error {
|
|
7
|
-
public status: number;
|
|
8
|
-
|
|
9
|
-
constructor(status: number, message: string) {
|
|
10
|
-
super(message);
|
|
11
|
-
this.status = status;
|
|
12
|
-
this.name = 'WebSocketError';
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
export class WebSocketService {
|
|
17
|
-
private static instance: WebSocketService;
|
|
18
|
-
private config: Config;
|
|
19
|
-
private socket: WebSocket | null = null;
|
|
20
|
-
|
|
21
|
-
public status: boolean | undefined = undefined;
|
|
22
|
-
public status$ = new Subject<boolean | undefined>();
|
|
23
|
-
public error$ = new Subject<{ status: number; message: string }>();
|
|
24
|
-
|
|
25
|
-
private queue: Request[] = [];
|
|
26
|
-
private promises: {
|
|
27
|
-
[id: string]: {
|
|
28
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
29
|
-
resolve: (value: any) => void;
|
|
30
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
31
|
-
reject: (reason?: any) => void;
|
|
32
|
-
};
|
|
33
|
-
} = {};
|
|
34
|
-
|
|
35
|
-
public onOpen?: () => void = () => {};
|
|
36
|
-
public onClose?: () => void = () => {};
|
|
37
|
-
public onMessage?: (message: string) => void = () => {};
|
|
38
|
-
public onError?: (error: unknown) => void = () => {};
|
|
39
|
-
|
|
40
|
-
constructor(config: Config) {
|
|
41
|
-
WebSocketService.instance = this;
|
|
42
|
-
this.config = config;
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
public static getInstance() {
|
|
46
|
-
return WebSocketService.instance;
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
private resetConnection() {
|
|
50
|
-
this.setStatus(undefined);
|
|
51
|
-
this.socket = new WebSocket(this.config.webSocketUrl);
|
|
52
|
-
|
|
53
|
-
this.socket.onopen = () => {
|
|
54
|
-
console.log('[WS] Connected');
|
|
55
|
-
const interval = setInterval(() => {
|
|
56
|
-
if (this.socket && this.socket.readyState === 1) {
|
|
57
|
-
clearInterval(interval);
|
|
58
|
-
this.setStatus(true);
|
|
59
|
-
this.sendQueue();
|
|
60
|
-
this.onOpen?.();
|
|
61
|
-
}
|
|
62
|
-
}, 100);
|
|
63
|
-
};
|
|
64
|
-
|
|
65
|
-
this.socket.onclose = () => {
|
|
66
|
-
console.log('[WS] Disconnected');
|
|
67
|
-
setTimeout(() => this.connect(), this.status === true ? 500 : 5000);
|
|
68
|
-
this.onClose?.();
|
|
69
|
-
this.setStatus(false);
|
|
70
|
-
};
|
|
71
|
-
|
|
72
|
-
this.socket.onmessage = (event) => {
|
|
73
|
-
this.onMessage?.(event.data);
|
|
74
|
-
this.parseMessage(event.data);
|
|
75
|
-
};
|
|
76
|
-
|
|
77
|
-
this.socket.onerror = (error) => {
|
|
78
|
-
this.onError?.(error);
|
|
79
|
-
console.error('[WS] Error:', error);
|
|
80
|
-
};
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
public connect(force = false) {
|
|
84
|
-
if (this.status === false || force) {
|
|
85
|
-
this.resetConnection();
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
private setStatus(status: boolean | undefined) {
|
|
90
|
-
this.status = status;
|
|
91
|
-
this.status$.next(status);
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
private sendQueue() {
|
|
95
|
-
if (this.socket && this.status) {
|
|
96
|
-
let request: Request | undefined;
|
|
97
|
-
while ((request = this.queue.shift())) {
|
|
98
|
-
console.log('[WS] Sending queued request:', request);
|
|
99
|
-
this.socket?.send(JSON.stringify(request));
|
|
100
|
-
}
|
|
101
|
-
this.queue.forEach((request) =>
|
|
102
|
-
this.socket?.send(JSON.stringify(request))
|
|
103
|
-
);
|
|
104
|
-
}
|
|
105
|
-
}
|
|
106
|
-
|
|
107
|
-
public sendRequest<TReq, TRes>(name: string, data: TReq) {
|
|
108
|
-
const id = v4();
|
|
109
|
-
const promise = new Promise<TRes>((resolve, reject) => {
|
|
110
|
-
const request: Request = { id, name, data };
|
|
111
|
-
this.promises[id] = { resolve, reject };
|
|
112
|
-
if (!this.socket || !this.status) {
|
|
113
|
-
console.log('[WS] Queuing request:', request);
|
|
114
|
-
this.queue.push(request);
|
|
115
|
-
return;
|
|
116
|
-
}
|
|
117
|
-
console.log('[WS] Sending request:', request);
|
|
118
|
-
this.socket?.send(JSON.stringify(request));
|
|
119
|
-
});
|
|
120
|
-
return promise;
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
private parseMessage(message: string) {
|
|
124
|
-
try {
|
|
125
|
-
const response = JSON.parse(message);
|
|
126
|
-
if (!response.id) {
|
|
127
|
-
throw new Error('Received message is not valid');
|
|
128
|
-
}
|
|
129
|
-
if (this.promises[response.id]) {
|
|
130
|
-
console.log('[WS] Received response:', response);
|
|
131
|
-
if (
|
|
132
|
-
typeof response.data?.status === 'number' &&
|
|
133
|
-
response.data.status < 0
|
|
134
|
-
) {
|
|
135
|
-
this.promises[response.id].reject(
|
|
136
|
-
new WebSocketError(response.data.status, response.data.message)
|
|
137
|
-
);
|
|
138
|
-
this.error$.next({
|
|
139
|
-
status: response.data.status,
|
|
140
|
-
message: response.data.message || 'Unknown error',
|
|
141
|
-
});
|
|
142
|
-
} else {
|
|
143
|
-
this.promises[response.id].resolve(response.data);
|
|
144
|
-
}
|
|
145
|
-
delete this.promises[response.id];
|
|
146
|
-
} else {
|
|
147
|
-
console.log('[WS] Received request:', response);
|
|
148
|
-
// TODO : Implement request handling
|
|
149
|
-
throw new Error('Not yet implemented');
|
|
150
|
-
}
|
|
151
|
-
} catch (error) {
|
|
152
|
-
console.error('[WS] Error parsing message:', error);
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
}
|
|
1
|
+
import { Config } from '../config';
|
|
2
|
+
import { Request } from './base';
|
|
3
|
+
import { Subject } from 'rxjs';
|
|
4
|
+
import { v4 } from 'uuid';
|
|
5
|
+
|
|
6
|
+
export class WebSocketError extends Error {
|
|
7
|
+
public status: number;
|
|
8
|
+
|
|
9
|
+
constructor(status: number, message: string) {
|
|
10
|
+
super(message);
|
|
11
|
+
this.status = status;
|
|
12
|
+
this.name = 'WebSocketError';
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export class WebSocketService {
|
|
17
|
+
private static instance: WebSocketService;
|
|
18
|
+
private config: Config;
|
|
19
|
+
private socket: WebSocket | null = null;
|
|
20
|
+
|
|
21
|
+
public status: boolean | undefined = undefined;
|
|
22
|
+
public status$ = new Subject<boolean | undefined>();
|
|
23
|
+
public error$ = new Subject<{ status: number; message: string }>();
|
|
24
|
+
|
|
25
|
+
private queue: Request[] = [];
|
|
26
|
+
private promises: {
|
|
27
|
+
[id: string]: {
|
|
28
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
29
|
+
resolve: (value: any) => void;
|
|
30
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
31
|
+
reject: (reason?: any) => void;
|
|
32
|
+
};
|
|
33
|
+
} = {};
|
|
34
|
+
|
|
35
|
+
public onOpen?: () => void = () => {};
|
|
36
|
+
public onClose?: () => void = () => {};
|
|
37
|
+
public onMessage?: (message: string) => void = () => {};
|
|
38
|
+
public onError?: (error: unknown) => void = () => {};
|
|
39
|
+
|
|
40
|
+
constructor(config: Config) {
|
|
41
|
+
WebSocketService.instance = this;
|
|
42
|
+
this.config = config;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
public static getInstance() {
|
|
46
|
+
return WebSocketService.instance;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
private resetConnection() {
|
|
50
|
+
this.setStatus(undefined);
|
|
51
|
+
this.socket = new WebSocket(this.config.webSocketUrl);
|
|
52
|
+
|
|
53
|
+
this.socket.onopen = () => {
|
|
54
|
+
console.log('[WS] Connected');
|
|
55
|
+
const interval = setInterval(() => {
|
|
56
|
+
if (this.socket && this.socket.readyState === 1) {
|
|
57
|
+
clearInterval(interval);
|
|
58
|
+
this.setStatus(true);
|
|
59
|
+
this.sendQueue();
|
|
60
|
+
this.onOpen?.();
|
|
61
|
+
}
|
|
62
|
+
}, 100);
|
|
63
|
+
};
|
|
64
|
+
|
|
65
|
+
this.socket.onclose = () => {
|
|
66
|
+
console.log('[WS] Disconnected');
|
|
67
|
+
setTimeout(() => this.connect(), this.status === true ? 500 : 5000);
|
|
68
|
+
this.onClose?.();
|
|
69
|
+
this.setStatus(false);
|
|
70
|
+
};
|
|
71
|
+
|
|
72
|
+
this.socket.onmessage = (event) => {
|
|
73
|
+
this.onMessage?.(event.data);
|
|
74
|
+
this.parseMessage(event.data);
|
|
75
|
+
};
|
|
76
|
+
|
|
77
|
+
this.socket.onerror = (error) => {
|
|
78
|
+
this.onError?.(error);
|
|
79
|
+
console.error('[WS] Error:', error);
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
public connect(force = false) {
|
|
84
|
+
if (this.status === false || force) {
|
|
85
|
+
this.resetConnection();
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
private setStatus(status: boolean | undefined) {
|
|
90
|
+
this.status = status;
|
|
91
|
+
this.status$.next(status);
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
private sendQueue() {
|
|
95
|
+
if (this.socket && this.status) {
|
|
96
|
+
let request: Request | undefined;
|
|
97
|
+
while ((request = this.queue.shift())) {
|
|
98
|
+
console.log('[WS] Sending queued request:', request);
|
|
99
|
+
this.socket?.send(JSON.stringify(request));
|
|
100
|
+
}
|
|
101
|
+
this.queue.forEach((request) =>
|
|
102
|
+
this.socket?.send(JSON.stringify(request))
|
|
103
|
+
);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
public sendRequest<TReq, TRes>(name: string, data: TReq) {
|
|
108
|
+
const id = v4();
|
|
109
|
+
const promise = new Promise<TRes>((resolve, reject) => {
|
|
110
|
+
const request: Request = { id, name, data };
|
|
111
|
+
this.promises[id] = { resolve, reject };
|
|
112
|
+
if (!this.socket || !this.status) {
|
|
113
|
+
console.log('[WS] Queuing request:', request);
|
|
114
|
+
this.queue.push(request);
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
console.log('[WS] Sending request:', request);
|
|
118
|
+
this.socket?.send(JSON.stringify(request));
|
|
119
|
+
});
|
|
120
|
+
return promise;
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
private parseMessage(message: string) {
|
|
124
|
+
try {
|
|
125
|
+
const response = JSON.parse(message);
|
|
126
|
+
if (!response.id) {
|
|
127
|
+
throw new Error('Received message is not valid');
|
|
128
|
+
}
|
|
129
|
+
if (this.promises[response.id]) {
|
|
130
|
+
console.log('[WS] Received response:', response);
|
|
131
|
+
if (
|
|
132
|
+
typeof response.data?.status === 'number' &&
|
|
133
|
+
response.data.status < 0
|
|
134
|
+
) {
|
|
135
|
+
this.promises[response.id].reject(
|
|
136
|
+
new WebSocketError(response.data.status, response.data.message)
|
|
137
|
+
);
|
|
138
|
+
this.error$.next({
|
|
139
|
+
status: response.data.status,
|
|
140
|
+
message: response.data.message || 'Unknown error',
|
|
141
|
+
});
|
|
142
|
+
} else {
|
|
143
|
+
this.promises[response.id].resolve(response.data);
|
|
144
|
+
}
|
|
145
|
+
delete this.promises[response.id];
|
|
146
|
+
} else {
|
|
147
|
+
console.log('[WS] Received request:', response);
|
|
148
|
+
// TODO : Implement request handling
|
|
149
|
+
throw new Error('Not yet implemented');
|
|
150
|
+
}
|
|
151
|
+
} catch (error) {
|
|
152
|
+
console.error('[WS] Error parsing message:', error);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|