#55 change tsconfig to strict, update code

stefanwerfling · Apr 8, 2024 · 7092103 · 7092103
1 parent f7ee7a6
commit 7092103
Show file tree

Hide file tree

Showing 35 changed files with 160 additions and 69 deletions.
diff --git a/frontend/src/inc/Api/GatewayIdentifier.ts b/frontend/src/inc/Api/GatewayIdentifier.ts
@@ -4,7 +4,9 @@ import {
     SchemaDefaultReturn,
     SchemaGatewayIdentifierListResponse
 } from 'flyingfish_schemas';
+import {Vts} from 'vts';
 import {NetFetch} from '../Net/NetFetch';
+import {UnknownResponse} from './Error/UnknownResponse';
 
 /**
  * GatewayIdentifier
@@ -16,6 +18,11 @@ export class GatewayIdentifier {
      */
     public static async getList(): Promise<GatewayIdentifierEntry[]> {
         const result = await NetFetch.getData('/json/gatewayidentifier/list', SchemaGatewayIdentifierListResponse);
+
+        if (Vts.isUndefined(result.data)) {
+            throw new UnknownResponse('Gateway identifier return empty list!');
+        }
+
         return result.data;
     }
 

diff --git a/frontend/src/inc/Api/IpAccess.ts b/frontend/src/inc/Api/IpAccess.ts
@@ -18,7 +18,9 @@ import {
     SchemaIpAccessWhiteListResponse,
     SchemaIpAccessWhiteSaveResponse
 } from 'flyingfish_schemas';
+import {Vts} from 'vts';
 import {NetFetch} from '../Net/NetFetch';
+import {UnknownResponse} from './Error/UnknownResponse';
 
 /**
  * BlacklistCategory
@@ -59,6 +61,11 @@ export class IpAccess {
      */
     public static async getMaintainerList(): Promise<IpAccessMaintainer[]> {
         const result = await NetFetch.getData('/json/ipaccess/maintainer/list', SchemaIpAccessMaintainerResponse);
+
+        if (Vts.isUndefined(result.list)) {
+            throw new UnknownResponse('IP Access maintainer return empty list!');
+        }
+
         return result.list;
     }
 

diff --git a/frontend/src/inc/Api/Response/Response.ts b/frontend/src/inc/Api/Response/Response.ts
@@ -1,5 +1,5 @@
 import {DefaultReturn, StatusCodes} from 'flyingfish_schemas';
-import {Schema, SchemaErrors} from 'vts';
+import {Schema, SchemaErrors, Vts} from 'vts';
 import {InternalError} from '../Error/InternalError';
 import {SchemaError} from '../Error/SchemaError';
 import {UnauthorizedError} from '../Error/UnauthorizedError';
@@ -47,6 +47,10 @@ export class Response {
                         throw new UnauthorizedError();
 
                     case StatusCodes.INTERNAL_ERROR:
+                        if (Vts.isUndefined(data.msg)) {
+                            throw new InternalError('');
+                        }
+
                         throw new InternalError(data.msg);
                 }
             }

diff --git a/frontend/src/inc/Api/Settings.ts b/frontend/src/inc/Api/Settings.ts
@@ -1,5 +1,7 @@
 import {SchemaDefaultReturn, SchemaSettingsResponse, SettingsList} from 'flyingfish_schemas';
+import {Vts} from 'vts';
 import {NetFetch} from '../Net/NetFetch';
+import {UnknownResponse} from './Error/UnknownResponse';
 
 /**
  * Settings
@@ -11,6 +13,11 @@ export class Settings {
      */
     public static async getSettings(): Promise<SettingsList> {
         const result = await NetFetch.getData('/json/settings/list', SchemaSettingsResponse);
+
+        if (Vts.isUndefined(result.list)) {
+            throw new UnknownResponse('Settings return empty list!');
+        }
+
         return result.list;
     }
 

diff --git a/frontend/src/inc/Api/Ssl.ts b/frontend/src/inc/Api/Ssl.ts
@@ -4,7 +4,9 @@ import {
     SslDetails,
     SslProvidersResponse
 } from 'flyingfish_schemas';
+import {Vts} from 'vts';
 import {NetFetch} from '../Net/NetFetch';
+import {UnknownResponse} from './Error/UnknownResponse';
 
 /**
  * Ssl
@@ -26,6 +28,10 @@ export class Ssl {
     public static async getCertDetails(httpid: number): Promise<SslDetails> {
         const resultContent = await NetFetch.postData('/json/ssl/cert/details', {httpid}, SchemaSslDetailsResponse);
 
+        if (Vts.isUndefined(resultContent.details)) {
+            throw new UnknownResponse('Ssl cert return empty details!');
+        }
+
         return resultContent.details;
     }
 

diff --git a/frontend/src/inc/Api/UpnpNat.ts b/frontend/src/inc/Api/UpnpNat.ts
@@ -4,7 +4,9 @@ import {
     UpnpNatDeleteRequest,
     UpnpNatGatwayInfo, UpnpNatPort, UpnpNatSaveRequest
 } from 'flyingfish_schemas';
+import {Vts} from 'vts';
 import {NetFetch} from '../Net/NetFetch';
+import {UnknownResponse} from './Error/UnknownResponse';
 
 /**
  * NatStatuts
@@ -33,6 +35,11 @@ export class UpnpNat {
      */
     public static async getCurrentGatewayInfo(): Promise<UpnpNatGatwayInfo> {
         const result = await NetFetch.getData('/json/upnpnat/current_gateway_info', SchemaUpnpNatCurrentGatwayInfoResponse);
+
+        if (Vts.isUndefined(result.data)) {
+            throw new UnknownResponse('UpnpNat current gateway return empty info!');
+        }
+
         return result.data;
     }
 

diff --git a/frontend/src/inc/Api/User.ts b/frontend/src/inc/Api/User.ts
@@ -6,7 +6,9 @@ import {
     UserEntry,
     UserInfo
 } from 'flyingfish_schemas';
+import {Vts} from 'vts';
 import {NetFetch} from '../Net/NetFetch';
+import {UnknownResponse} from './Error/UnknownResponse';
 
 /**
  * User
@@ -18,6 +20,11 @@ export class User {
      */
     public static async getUserInfo(): Promise<UserInfo> {
         const result = await NetFetch.getData('/json/user/info', SchemaUserInfoResponse);
+
+        if (Vts.isUndefined(result.data)) {
+            throw new UnknownResponse('User return empty info!');
+        }
+
         return result.data;
     }
 

diff --git a/frontend/src/inc/Pages/Dashboard.ts b/frontend/src/inc/Pages/Dashboard.ts
@@ -17,6 +17,7 @@ import {
     SwitchTimer, Tooltip, TooltipInfo
 } from 'bambooo';
 import moment from 'moment/moment';
+import {Vts} from 'vts';
 import {Dashboard as DashboardApi} from '../Api/Dashboard';
 import {UnauthorizedError} from '../Api/Error/UnauthorizedError';
 import {Lang} from '../Lang';
@@ -35,7 +36,7 @@ export class Dashboard extends BasePage {
      * name
      * @protected
      */
-    protected _name: string = 'dashboard';
+    protected override _name: string = 'dashboard';
 
     /**
      * switch timer
@@ -53,13 +54,13 @@ export class Dashboard extends BasePage {
      * line chart requests
      * @protected
      */
-    protected _lineChartRequests: LineChartRequests;
+    protected _lineChartRequests: LineChartRequests | undefined;
 
     /**
      * ip blacklist map
      * @protected
      */
-    protected _ipBlacklistMap: DashboardMapIp;
+    protected _ipBlacklistMap: DashboardMapIp | undefined;
 
     /**
      * constructor
@@ -87,7 +88,7 @@ export class Dashboard extends BasePage {
     /**
      * loadContent
      */
-    public async loadContent(): Promise<void> {
+    public override async loadContent(): Promise<void> {
         const content = this._wrapper.getContentWrapper().getContent();
 
         const row = new ContentRow(content);
@@ -157,7 +158,9 @@ export class Dashboard extends BasePage {
                 streamRequestsPoints.push(streamRequestPoint.counts);
             }
 
-            this._lineChartRequests.updateData(streamRequestsPoints);
+            if (this._lineChartRequests) {
+                this._lineChartRequests.updateData(streamRequestsPoints);
+            }
 
             // public ip -----------------------------------------------------------------------------------------------
 
@@ -260,7 +263,9 @@ export class Dashboard extends BasePage {
                 }
             }
 
-            this._ipBlacklistMap.setMarks(blockMarkList);
+            if (this._ipBlacklistMap) {
+                this._ipBlacklistMap.setMarks(blockMarkList);
+            }
 
             // ip blocks -----------------------------------------------------------------------------------------------
 
@@ -294,7 +299,9 @@ export class Dashboard extends BasePage {
 
         this._updateSwitch.setTimeoutFn(async() => {
             try {
-                this._onLoadTable();
+                if (!Vts.isNull(this._onLoadTable)) {
+                    this._onLoadTable();
+                }
             } catch (e) {
                 if (e instanceof UnauthorizedError) {
                     UtilRedirect.toLogin();
@@ -306,9 +313,13 @@ export class Dashboard extends BasePage {
     /**
      * unloadContent
      */
-    public async unloadContent(): Promise<void> {
+    public override async unloadContent(): Promise<void> {
         super.unloadContent();
-        await this._ipBlacklistMap.unloadContent();
+
+        if (this._ipBlacklistMap) {
+            await this._ipBlacklistMap.unloadContent();
+        }
+
         this._updateSwitch.setEnable(false);
     }
 

diff --git a/frontend/src/inc/Pages/Dashboard/DashboardIpBlacklistModal.ts b/frontend/src/inc/Pages/Dashboard/DashboardIpBlacklistModal.ts
@@ -48,7 +48,7 @@ export class DashboardIpBlacklistModal extends ModalDialog {
     /**
      * show
      */
-    public show(): void {
+    public override show(): void {
         super.show();
 
         const bodyCard = jQuery('<div class="card-body"/>').appendTo(this._body.empty());

diff --git a/frontend/src/inc/Pages/Dashboard/DashboardMapIp.ts b/frontend/src/inc/Pages/Dashboard/DashboardMapIp.ts
@@ -10,6 +10,7 @@ import {getVectorContext} from 'ol/render.js';
 import {easeOut} from 'ol/easing.js';
 import {Element} from 'bambooo';
 import {Circle as CircleStyle, Fill, Stroke, Style} from 'ol/style';
+import {Vts} from 'vts';
 
 /**
  * DashboardMapIpMark
@@ -140,11 +141,26 @@ export class DashboardMapIp extends Element {
         const map = this._map;
 
         this._source.on('addfeature', (e) => {
+            if (Vts.isUndefined(e.feature)) {
+                return;
+            }
+
             const feature = e.feature;
             const start = Date.now();
-            const flashGeom = feature.getGeometry().clone();
+            const geometry = feature.getGeometry();
+
+            if (Vts.isUndefined(geometry)) {
+                return;
+            }
+
+            const flashGeom = geometry.clone();
             const listenerKey = tileLayer.on('postrender', (event) => {
                 const frameState = event.frameState;
+
+                if (Vts.isUndefined(frameState)) {
+                    return;
+                }
+
                 const elapsed = frameState.time - start;
                 if (elapsed >= duration) {
                     unByKey(listenerKey);

diff --git a/frontend/src/inc/Pages/DnsResolver.ts b/frontend/src/inc/Pages/DnsResolver.ts
@@ -9,7 +9,7 @@ export class DnsResolver extends BasePage {
      * name
      * @protected
      */
-    protected _name: string = 'dnsresolver';
+    protected override _name: string = 'dnsresolver';
 
     /**
      * constructor

diff --git a/frontend/src/inc/Pages/Domains.ts b/frontend/src/inc/Pages/Domains.ts
@@ -24,6 +24,7 @@ import {
 } from 'bambooo';
 import {DomainData} from 'flyingfish_schemas';
 import moment from 'moment';
+import {Vts} from 'vts';
 import {Domain as DomainAPI} from '../Api/Domain';
 import {Nginx as NginxAPI} from '../Api/Nginx';
 import {BasePage} from './BasePage';
@@ -39,7 +40,7 @@ export class Domains extends BasePage {
      * name
      * @protected
      */
-    protected _name: string = 'domains';
+    protected override _name: string = 'domains';
 
     /**
      * domain dialog
@@ -186,7 +187,7 @@ export class Domains extends BasePage {
     /**
      * loadContent
      */
-    public async loadContent(): Promise<void> {
+    public override async loadContent(): Promise<void> {
         const content = this._wrapper.getContentWrapper().getContent();
 
         /**
@@ -208,9 +209,12 @@ export class Domains extends BasePage {
                     }
 
                     const domainCollection = domainMap.get(domain.parent_id);
-                    domainCollection.push(domain);
 
-                    domainMap.set(domain.parent_id, domainCollection);
+                    if (!Vts.isUndefined(domainCollection)) {
+                        domainCollection.push(domain);
+
+                        domainMap.set(domain.parent_id, domainCollection);
+                    }
                 }
             }
 

diff --git a/frontend/src/inc/Pages/Domains/DomainEditModal.ts b/frontend/src/inc/Pages/Domains/DomainEditModal.ts
@@ -110,7 +110,7 @@ export class DomainEditModal extends ModalDialog {
     /**
      * resetValues
      */
-    public resetValues(): void {
+    public override resetValues(): void {
         this.setId(null);
         this.setName('');
         this.setDisable(false);

diff --git a/frontend/src/inc/Pages/Domains/DomainRecordEditModal.ts b/frontend/src/inc/Pages/Domains/DomainRecordEditModal.ts
@@ -263,7 +263,7 @@ export class DomainRecordEditModal extends ModalDialog {
     /**
      * resetValues
      */
-    public resetValues(): void {
+    public override resetValues(): void {
         this.setId(null);
         this.setDomainId(null);
         this.setDomainName('');

diff --git a/frontend/src/inc/Pages/DynDnsClient/DynDnsClientEditModal.ts b/frontend/src/inc/Pages/DynDnsClient/DynDnsClientEditModal.ts
@@ -263,7 +263,7 @@ export class DynDnsClientEditModal extends ModalDialog {
     /**
      * resetValues
      */
-    public resetValues(): void {
+    public override resetValues(): void {
         this.setProvider('none');
         this._multipleDomains.setValue([]);
         this._inputUsername.setValue('');

diff --git a/frontend/src/inc/Pages/DynDnsClients.ts b/frontend/src/inc/Pages/DynDnsClients.ts
@@ -18,7 +18,7 @@ export class DynDnsClients extends BasePage {
      * name
      * @protected
      */
-    protected _name: string = 'dyndnsclients';
+    protected override _name: string = 'dyndnsclients';
 
     /**
      * dyn dns client dialog
@@ -123,7 +123,7 @@ export class DynDnsClients extends BasePage {
     /**
      * loadContent
      */
-    public async loadContent(): Promise<void> {
+    public override async loadContent(): Promise<void> {
         const row1 = new ContentRow(this._wrapper.getContentWrapper().getContent());
 
         const card = new Card(new ContentCol(row1, ContentColSize.col12));

diff --git a/frontend/src/inc/Pages/DynDnsServer.ts b/frontend/src/inc/Pages/DynDnsServer.ts
@@ -29,7 +29,7 @@ export class DynDnsServer extends BasePage {
      * name
      * @member {string}
      */
-    protected _name: string = 'dyndnsserver';
+    protected override _name: string = 'dyndnsserver';
 
     /**
      * dyn dns client dialog
@@ -123,7 +123,7 @@ export class DynDnsServer extends BasePage {
     /**
      * loadContent
      */
-    public async loadContent(): Promise<void> {
+    public override async loadContent(): Promise<void> {
         const row1 = new ContentRow(this._wrapper.getContentWrapper().getContent());
 
         const card = new Card(new ContentCol(row1, ContentColSize.col12));