@intuitionrobotics/thunderstorm 0.43.3 → 0.44.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/app-backend/core/BaseStorm.d.ts +1 -1
- package/app-backend/core/BaseStorm.js +2 -2
- package/app-backend/core/BaseStorm.js.map +1 -1
- package/app-backend/core/Storm.js +9 -7
- package/app-backend/core/Storm.js.map +1 -1
- package/app-backend/exceptions.d.ts +2 -2
- package/app-backend/exceptions.js +2 -2
- package/app-backend/exceptions.js.map +1 -1
- package/app-backend/modules/CleanupScheduler.js +5 -4
- package/app-backend/modules/CleanupScheduler.js.map +1 -1
- package/app-backend/modules/FirestoreBackupScheduler.d.ts +1 -1
- package/app-backend/modules/FirestoreBackupScheduler.js +23 -9
- package/app-backend/modules/FirestoreBackupScheduler.js.map +1 -1
- package/app-backend/modules/ForceUpgrade.d.ts +1 -1
- package/app-backend/modules/ForceUpgrade.js +8 -6
- package/app-backend/modules/ForceUpgrade.js.map +1 -1
- package/app-backend/modules/SlackModule.d.ts +2 -4
- package/app-backend/modules/SlackModule.js +9 -30
- package/app-backend/modules/SlackModule.js.map +1 -1
- package/app-backend/modules/http/AxiosHttpModule.js +3 -3
- package/app-backend/modules/http/AxiosHttpModule.js.map +1 -1
- package/app-backend/modules/proxy/RemoteProxy.d.ts +2 -1
- package/app-backend/modules/proxy/RemoteProxy.js +11 -10
- package/app-backend/modules/proxy/RemoteProxy.js.map +1 -1
- package/app-backend/modules/proxy/RemoteProxyCaller.d.ts +1 -1
- package/app-backend/modules/proxy/RemoteProxyCaller.js +11 -9
- package/app-backend/modules/proxy/RemoteProxyCaller.js.map +1 -1
- package/app-backend/modules/server/HttpServer.d.ts +2 -1
- package/app-backend/modules/server/HttpServer.js +9 -8
- package/app-backend/modules/server/HttpServer.js.map +1 -1
- package/app-backend/modules/server/server-api.d.ts +3 -4
- package/app-backend/modules/server/server-api.js +27 -45
- package/app-backend/modules/server/server-api.js.map +1 -1
- package/app-backend/modules/server/server-errors.d.ts +1 -1
- package/app-backend/modules/server/server-errors.js +7 -6
- package/app-backend/modules/server/server-errors.js.map +1 -1
- package/app-backend/utils/LogClient_File.d.ts +2 -2
- package/app-backend/utils/LogClient_File.js +12 -30
- package/app-backend/utils/LogClient_File.js.map +1 -1
- package/app-backend/utils/file.js +0 -20
- package/app-backend/utils/file.js.map +1 -1
- package/app-backend/utils/promisify-request.js +2 -22
- package/app-backend/utils/promisify-request.js.map +1 -1
- package/app-backend/utils/types.d.ts +1 -1
- package/app-backend/utils/types.js +2 -22
- package/app-backend/utils/types.js.map +1 -1
- package/app-frontend/components/ActionButton.js +0 -20
- package/app-frontend/components/ActionButton.js.map +1 -1
- package/app-frontend/components/DropDown.js +5 -24
- package/app-frontend/components/DropDown.js.map +1 -1
- package/app-frontend/components/FilterInput.js +4 -23
- package/app-frontend/components/FilterInput.js.map +1 -1
- package/app-frontend/components/GenericSelect.js +0 -20
- package/app-frontend/components/GenericSelect.js.map +1 -1
- package/app-frontend/components/Overlay.js +0 -20
- package/app-frontend/components/Overlay.js.map +1 -1
- package/app-frontend/components/TS_Input.js +3 -23
- package/app-frontend/components/TS_Input.js.map +1 -1
- package/app-frontend/components/TS_Table.d.ts +1 -1
- package/app-frontend/components/TS_Table.js +0 -20
- package/app-frontend/components/TS_Table.js.map +1 -1
- package/app-frontend/components/TS_TextArea.js +0 -20
- package/app-frontend/components/TS_TextArea.js.map +1 -1
- package/app-frontend/components/adapter/Adapter.js +6 -26
- package/app-frontend/components/adapter/Adapter.js.map +1 -1
- package/app-frontend/components/adapter/BaseRenderer.js +0 -20
- package/app-frontend/components/adapter/BaseRenderer.js.map +1 -1
- package/app-frontend/components/checkbox/TS_Checkbox.d.ts +2 -2
- package/app-frontend/components/checkbox/TS_Checkbox.js +2 -1
- package/app-frontend/components/checkbox/TS_Checkbox.js.map +1 -1
- package/app-frontend/components/checkbox/TS_CheckboxField.js +0 -18
- package/app-frontend/components/checkbox/TS_CheckboxField.js.map +1 -1
- package/app-frontend/components/form/Form.d.ts +2 -1
- package/app-frontend/components/form/Form.js +2 -22
- package/app-frontend/components/form/Form.js.map +1 -1
- package/app-frontend/components/form/types.d.ts +2 -1
- package/app-frontend/components/form/types.js +0 -20
- package/app-frontend/components/form/types.js.map +1 -1
- package/app-frontend/components/playground/Example_NewProps.js +0 -20
- package/app-frontend/components/playground/Example_NewProps.js.map +1 -1
- package/app-frontend/components/playground/Playground.js +1 -21
- package/app-frontend/components/playground/Playground.js.map +1 -1
- package/app-frontend/components/tree/MenuComponent.js +2 -22
- package/app-frontend/components/tree/MenuComponent.js.map +1 -1
- package/app-frontend/components/tree/MultiTypeAdaptor.js +2 -22
- package/app-frontend/components/tree/MultiTypeAdaptor.js.map +1 -1
- package/app-frontend/components/tree/SimpleTreeNodeRenderer.js +0 -20
- package/app-frontend/components/tree/SimpleTreeNodeRenderer.js.map +1 -1
- package/app-frontend/components/tree/Tree.js +3 -23
- package/app-frontend/components/tree/Tree.js.map +1 -1
- package/app-frontend/components/tree/types.js +0 -20
- package/app-frontend/components/tree/types.js.map +1 -1
- package/app-frontend/components/treeicons.js.map +1 -1
- package/app-frontend/components/types.js +0 -20
- package/app-frontend/components/types.js.map +1 -1
- package/app-frontend/core/AbstractThunder.js +0 -20
- package/app-frontend/core/AbstractThunder.js.map +1 -1
- package/app-frontend/core/AppPage.js +0 -20
- package/app-frontend/core/AppPage.js.map +1 -1
- package/app-frontend/core/AppWrapper.js +2 -23
- package/app-frontend/core/AppWrapper.js.map +1 -1
- package/app-frontend/core/BaseComponent.d.ts +2 -4
- package/app-frontend/core/BaseComponent.js +15 -36
- package/app-frontend/core/BaseComponent.js.map +1 -1
- package/app-frontend/core/SimpleScriptInjector.js +2 -22
- package/app-frontend/core/SimpleScriptInjector.js.map +1 -1
- package/app-frontend/core/Thunder.js +3 -22
- package/app-frontend/core/Thunder.js.map +1 -1
- package/app-frontend/core/thunder-dispatcher.js +0 -20
- package/app-frontend/core/thunder-dispatcher.js.map +1 -1
- package/app-frontend/modules/ConnectivityModule.d.ts +1 -1
- package/app-frontend/modules/ConnectivityModule.js +2 -2
- package/app-frontend/modules/ConnectivityModule.js.map +1 -1
- package/app-frontend/modules/ForceUpgrade.d.ts +1 -1
- package/app-frontend/modules/ForceUpgrade.js +4 -3
- package/app-frontend/modules/ForceUpgrade.js.map +1 -1
- package/app-frontend/modules/HistoryModule.d.ts +3 -5
- package/app-frontend/modules/HistoryModule.js +9 -28
- package/app-frontend/modules/HistoryModule.js.map +1 -1
- package/app-frontend/modules/ResourcesModule.d.ts +1 -4
- package/app-frontend/modules/ResourcesModule.js +2 -25
- package/app-frontend/modules/ResourcesModule.js.map +1 -1
- package/app-frontend/modules/StorageModule.d.ts +1 -4
- package/app-frontend/modules/StorageModule.js +4 -26
- package/app-frontend/modules/StorageModule.js.map +1 -1
- package/app-frontend/modules/ThunderstormModule.d.ts +1 -1
- package/app-frontend/modules/ThunderstormModule.js +2 -2
- package/app-frontend/modules/ThunderstormModule.js.map +1 -1
- package/app-frontend/modules/component-loader/ReactEntryComponentInjector.js +0 -20
- package/app-frontend/modules/component-loader/ReactEntryComponentInjector.js.map +1 -1
- package/app-frontend/modules/component-loader/entry-component-loading-module.d.ts +1 -1
- package/app-frontend/modules/component-loader/entry-component-loading-module.js +4 -25
- package/app-frontend/modules/component-loader/entry-component-loading-module.js.map +1 -1
- package/app-frontend/modules/dialog/Dialog.js +0 -22
- package/app-frontend/modules/dialog/Dialog.js.map +1 -1
- package/app-frontend/modules/dialog/DialogModule.d.ts +1 -1
- package/app-frontend/modules/dialog/DialogModule.js +2 -2
- package/app-frontend/modules/dialog/DialogModule.js.map +1 -1
- package/app-frontend/modules/http/XhrHttpModule.js +9 -10
- package/app-frontend/modules/http/XhrHttpModule.js.map +1 -1
- package/app-frontend/modules/locale/LocaleModule.d.ts +1 -4
- package/app-frontend/modules/locale/LocaleModule.js +5 -24
- package/app-frontend/modules/locale/LocaleModule.js.map +1 -1
- package/app-frontend/modules/locale/types.d.ts +0 -3
- package/app-frontend/modules/locale/types.js +0 -20
- package/app-frontend/modules/locale/types.js.map +1 -1
- package/app-frontend/modules/menu/MenuAndButton.js +2 -2
- package/app-frontend/modules/menu/MenuAndButton.js.map +1 -1
- package/app-frontend/modules/menu/MenuModule.d.ts +1 -1
- package/app-frontend/modules/menu/MenuModule.js +4 -3
- package/app-frontend/modules/menu/MenuModule.js.map +1 -1
- package/app-frontend/modules/menu/PopupMenu.js +2 -2
- package/app-frontend/modules/menu/PopupMenu.js.map +1 -1
- package/app-frontend/modules/routing/RoutingModule.d.ts +1 -1
- package/app-frontend/modules/routing/RoutingModule.js +6 -25
- package/app-frontend/modules/routing/RoutingModule.js.map +1 -1
- package/app-frontend/modules/routing/route.js +0 -20
- package/app-frontend/modules/routing/route.js.map +1 -1
- package/app-frontend/modules/toaster/BaseToaster.js +0 -2
- package/app-frontend/modules/toaster/BaseToaster.js.map +1 -1
- package/app-frontend/modules/toaster/Toaster.js +0 -20
- package/app-frontend/modules/toaster/Toaster.js.map +1 -1
- package/app-frontend/modules/toaster/ToasterModule.d.ts +1 -1
- package/app-frontend/modules/toaster/ToasterModule.js +5 -5
- package/app-frontend/modules/toaster/ToasterModule.js.map +1 -1
- package/app-frontend/modules/tooltip/Tooltip.js +2 -22
- package/app-frontend/modules/tooltip/Tooltip.js.map +1 -1
- package/app-frontend/modules/tooltip/TooltipModule.d.ts +1 -1
- package/app-frontend/modules/tooltip/TooltipModule.js +4 -3
- package/app-frontend/modules/tooltip/TooltipModule.js.map +1 -1
- package/app-frontend/tools/KeyboardListener.js +0 -17
- package/app-frontend/tools/KeyboardListener.js.map +1 -1
- package/app-frontend/tools/Stylable.js +0 -20
- package/app-frontend/tools/Stylable.js.map +1 -1
- package/app-frontend/utils/tools.js +3 -23
- package/app-frontend/utils/tools.js.map +1 -1
- package/index.d.ts +0 -6
- package/index.js +0 -37
- package/index.js.map +1 -1
- package/package.json +4 -4
- package/shared/BaseHttpModule.d.ts +1 -1
- package/shared/BaseHttpModule.js +5 -4
- package/shared/BaseHttpModule.js.map +1 -1
- package/shared/BaseHttpRequest.js +9 -27
- package/shared/BaseHttpRequest.js.map +1 -1
- package/shared/consts.js +0 -20
- package/shared/consts.js.map +1 -1
- package/shared/force-upgrade.js +0 -20
- package/shared/force-upgrade.js.map +1 -1
- package/shared/request-types.js +0 -20
- package/shared/request-types.js.map +1 -1
- package/shared/types.js +0 -20
- package/shared/types.js.map +1 -1
- package/test-backend/StormTester.js +6 -26
- package/test-backend/StormTester.js.map +1 -1
- package/app-backend/modules/_imports.d.ts +0 -10
- package/app-backend/modules/_imports.js +0 -43
- package/app-backend/modules/_imports.js.map +0 -1
- package/app-frontend/components/GenericTabs.d.ts +0 -4
- package/app-frontend/components/GenericTabs.js +0 -11
- package/app-frontend/components/GenericTabs.js.map +0 -1
- package/backend-test.d.ts +0 -1
- package/backend-test.js +0 -34
- package/backend-test.js.map +0 -1
- package/backend.d.ts +0 -17
- package/backend.js +0 -50
- package/backend.js.map +0 -1
- package/frontend.d.ts +0 -55
- package/frontend.js +0 -88
- package/frontend.js.map +0 -1
|
@@ -30,10 +30,12 @@ exports.RemoteProxyCaller = void 0;
|
|
|
30
30
|
* See the License for the specific language governing permissions and
|
|
31
31
|
* limitations under the License.
|
|
32
32
|
*/
|
|
33
|
-
const
|
|
33
|
+
const module_1 = require("@intuitionrobotics/ts-common/core/module");
|
|
34
|
+
const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
|
|
35
|
+
const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
|
|
34
36
|
const promisify_request_1 = require("../../utils/promisify-request");
|
|
35
|
-
const
|
|
36
|
-
class RemoteProxyCaller extends
|
|
37
|
+
const exceptions_2 = require("../../exceptions");
|
|
38
|
+
class RemoteProxyCaller extends module_1.Module {
|
|
37
39
|
// noinspection TypeScriptAbstractClassConstructorCanBeMadeProtected
|
|
38
40
|
constructor(name) {
|
|
39
41
|
super(name);
|
|
@@ -81,9 +83,9 @@ class RemoteProxyCaller extends ts_common_1.Module {
|
|
|
81
83
|
if (statusCode < 200 || statusCode >= 300) {
|
|
82
84
|
const errorResponse = response.data;
|
|
83
85
|
if (!errorResponse)
|
|
84
|
-
throw new
|
|
86
|
+
throw new exceptions_2.ApiException(500, `Extraneous error ${tools_1.__stringify(response)}, Proxy Request: ${tools_1.__stringify(proxyRequest, true)}`);
|
|
85
87
|
const debugMessage = typeof errorResponse === 'object' ? errorResponse['debugMessage'] : errorResponse;
|
|
86
|
-
const e = new
|
|
88
|
+
const e = new exceptions_2.ApiException(response.status, `Redirect proxy error: ${debugMessage} \n Proxy Request: ${tools_1.__stringify(proxyRequest, true)}`);
|
|
87
89
|
if (errorResponse.error)
|
|
88
90
|
e.setErrorBody(errorResponse.error);
|
|
89
91
|
throw e;
|
|
@@ -93,13 +95,13 @@ class RemoteProxyCaller extends ts_common_1.Module {
|
|
|
93
95
|
}
|
|
94
96
|
init() {
|
|
95
97
|
if (!this.config)
|
|
96
|
-
throw new
|
|
98
|
+
throw new exceptions_1.ImplementationMissingException("MUST specify config for this module!!");
|
|
97
99
|
if (!this.config.proxyId)
|
|
98
|
-
throw new
|
|
100
|
+
throw new exceptions_1.ImplementationMissingException("MUST specify the proxyId for the proxy caller!!");
|
|
99
101
|
if (!this.config.url)
|
|
100
|
-
throw new
|
|
102
|
+
throw new exceptions_1.ImplementationMissingException("MUST specify the url for the remote server!!");
|
|
101
103
|
if (!this.config.secret)
|
|
102
|
-
throw new
|
|
104
|
+
throw new exceptions_1.ImplementationMissingException("MUST specify the secret for the remote server!!");
|
|
103
105
|
if (!this.config.secretHeaderName)
|
|
104
106
|
this.config.secretHeaderName = 'x-secret';
|
|
105
107
|
if (!this.config.proxyHeaderName)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteProxyCaller.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/proxy/RemoteProxyCaller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,
|
|
1
|
+
{"version":3,"file":"RemoteProxyCaller.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/proxy/RemoteProxyCaller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,qEAAgE;AAChE,6EAA4F;AAC5F,oEAAqE;AAUrE,qEAA+D;AAC/D,iDAA8C;AAW9C,MAAsB,iBAClB,SAAQ,eAAc;IAEtB,oEAAoE;IACpE,YAAY,IAAY;QACpB,KAAK,CAAC,IAAI,CAAC,CAAC;QAuBN,sBAAiB,GAAG,CAAwK,GAAM,EAAE,OAAU,EAAE,QAEzN,EAAc,EAAE;YACb,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACtE,OAAO,IAAI,CAAC,IAAS,CAAC;QAC1B,CAAC,CAAA,CAAC;QAEQ,0BAAqB,GAAG,CAAwK,GAAM,EAAE,OAAU,EAAE,QAE7N,EAA6B,EAAE;YAC5B,MAAM,MAAM,GAAG,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACvD,OAAO,GAAG,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,CAAC,CAAC,CAAC;YAEH,IAAI,SAAS,GAAG,EAAE,CAAC;YACnB,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;gBAC3B,SAAS,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAEvC,MAAM,YAAY,GAAuB;gBACrC,OAAO,kCACA,QAAQ,KACX,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAClD,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,GACrD;gBACD,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG,SAAS,EAAE;gBAC3C,MAAM,EAAE,KAAK;gBACb,YAAY,EAAE,MAAM;aACvB,CAAC;YAEF,OAAO,IAAI,CAAC,cAAc,CAAI,YAAY,CAAC,CAAC;QAChD,CAAC,CAAA,CAAC;QAEQ,uBAAkB,GAAG,CAAkJ,GAAM,EAAE,IAAO,EAAE,QAEjM,EAAc,EAAE;YACb,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC,IAAS,CAAC;QAC1B,CAAC,CAAA,CAAC;QAEQ,2BAAsB,GAAG,CAAkJ,GAAM,EAAE,IAAO,EAAE,QAErM,EAA6B,EAAE;YAC5B,MAAM,YAAY,GAAuB;gBACrC,OAAO,kCACA,QAAQ,KACX,cAAc,EAAE,kBAAkB,EAClC,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAClD,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,GACrD;gBACD,YAAY,EAAE,MAAM;gBACpB,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,EAAE;gBAC/B,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,MAAM;aACjB,CAAC;YAEF,OAAO,IAAI,CAAC,cAAc,CAAI,YAAY,CAAC,CAAC;QAChD,CAAC,CAAA,CAAA;QAEO,mBAAc,GAAG,CAAqB,YAAgC,EAAwC,EAAE;YACpH,MAAM,QAAQ,GAAG,MAAM,oCAAgB,CAAC,YAAY,CAAC,CAAC;YACtD,IAAI,YAAY,CAAC,OAAO,EAAE;gBACtB,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;gBAC1D,OAAO,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;aAChD;YAED,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;YACnC,mCAAmC;YACnC,IAAI,UAAU,GAAG,GAAG,IAAI,UAAU,IAAI,GAAG,EAAE;gBACvC,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC;gBACpC,IAAI,CAAC,aAAa;oBACd,MAAM,IAAI,yBAAY,CAAC,GAAG,EAAE,oBAAoB,mBAAW,CAAC,QAAQ,CAAC,oBAAoB,mBAAW,CAAC,YAAY,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;gBAE/H,MAAM,YAAY,GAAG,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;gBACvG,MAAM,CAAC,GAAG,IAAI,yBAAY,CACtB,QAAQ,CAAC,MAAM,EACf,yBAAyB,YAAY,sBAAsB,mBAAW,CAAC,YAAY,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;gBAClG,IAAI,aAAa,CAAC,KAAK;oBACnB,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAExC,MAAM,CAAC,CAAC;aACX;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC,CAAA,CAAC;IAzGF,CAAC;IAES,IAAI;QACV,IAAI,CAAC,IAAI,CAAC,MAAM;YACZ,MAAM,IAAI,2CAA8B,CAAC,uCAAuC,CAAC,CAAC;QAEtF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO;YACpB,MAAM,IAAI,2CAA8B,CAAC,iDAAiD,CAAC,CAAC;QAEhG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG;YAChB,MAAM,IAAI,2CAA8B,CAAC,8CAA8C,CAAC,CAAC;QAE7F,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM;YACnB,MAAM,IAAI,2CAA8B,CAAC,iDAAiD,CAAC,CAAC;QAEhG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB;YAC7B,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,UAAU,CAAC;QAE9C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe;YAC5B,IAAI,CAAC,MAAM,CAAC,eAAe,GAAG,SAAS,CAAC;IAChD,CAAC;CAsFJ;AAhHD,8CAgHC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { Module, ObjectTS } from "@intuitionrobotics/ts-common";
|
|
3
2
|
import { ApiResponse, HttpRequestData, ServerApi } from "./server-api";
|
|
4
3
|
import { ApiException } from "../../exceptions";
|
|
5
4
|
import { Express, ExpressRequest, ExpressRequestHandler } from "../../utils/types";
|
|
5
|
+
import { ObjectTS } from '@intuitionrobotics/ts-common/utils/types';
|
|
6
|
+
import { Module } from '@intuitionrobotics/ts-common/core/module';
|
|
6
7
|
declare type ConfigType = {
|
|
7
8
|
port: number;
|
|
8
9
|
baseUrl: string;
|
|
@@ -35,12 +35,13 @@ exports.HeaderKey = exports.RouteResolver = exports.HttpServer_Class = void 0;
|
|
|
35
35
|
*/
|
|
36
36
|
const compression = require("compression");
|
|
37
37
|
const fs = require("fs");
|
|
38
|
-
const ts_common_1 = require("@intuitionrobotics/ts-common");
|
|
39
38
|
const server_api_1 = require("./server-api");
|
|
40
39
|
const exceptions_1 = require("../../exceptions");
|
|
41
40
|
const express = require("express");
|
|
42
41
|
const server_errors_1 = require("./server-errors");
|
|
43
|
-
const
|
|
42
|
+
const module_1 = require("@intuitionrobotics/ts-common/core/module");
|
|
43
|
+
const types_1 = require("@intuitionrobotics/ts-common/core/logger/types");
|
|
44
|
+
const consts_1 = require("../../../shared/consts");
|
|
44
45
|
const ALL_Methods = [
|
|
45
46
|
'GET',
|
|
46
47
|
'PUT',
|
|
@@ -56,10 +57,10 @@ const DefaultHeaders = [
|
|
|
56
57
|
'authorization'
|
|
57
58
|
];
|
|
58
59
|
const ExposedHeaders = [
|
|
59
|
-
|
|
60
|
-
|
|
60
|
+
consts_1.HeaderKey_FunctionExecutionId,
|
|
61
|
+
consts_1.HeaderKey_JWT
|
|
61
62
|
];
|
|
62
|
-
class HttpServer_Class extends
|
|
63
|
+
class HttpServer_Class extends module_1.Module {
|
|
63
64
|
constructor(_express) {
|
|
64
65
|
super("HttpServer");
|
|
65
66
|
this.errorMessageComposer = server_errors_1.DefaultApiErrorMessageComposer();
|
|
@@ -80,7 +81,7 @@ class HttpServer_Class extends ts_common_1.Module {
|
|
|
80
81
|
}
|
|
81
82
|
init() {
|
|
82
83
|
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
-
this.setMinLevel(server_api_1.ServerApi.isDebug ?
|
|
84
|
+
this.setMinLevel(server_api_1.ServerApi.isDebug ? types_1.LogLevel.Verbose : types_1.LogLevel.Info);
|
|
84
85
|
const baseUrl = this.config.baseUrl;
|
|
85
86
|
if (baseUrl) {
|
|
86
87
|
if (baseUrl.endsWith("/"))
|
|
@@ -104,7 +105,7 @@ class HttpServer_Class extends ts_common_1.Module {
|
|
|
104
105
|
cors.exposedHeaders = ExposedHeaders;
|
|
105
106
|
cors.headers = DefaultHeaders.reduce((toRet, item) => {
|
|
106
107
|
if (!toRet.includes(item))
|
|
107
|
-
|
|
108
|
+
toRet.push(item);
|
|
108
109
|
return toRet;
|
|
109
110
|
}, cors.headers || []);
|
|
110
111
|
const resolveCorsOrigin = (origin) => {
|
|
@@ -169,7 +170,7 @@ class HttpServer_Class extends ts_common_1.Module {
|
|
|
169
170
|
const routes = resolveRoutes(this.express._router.stack);
|
|
170
171
|
this.routes = routes.reduce((toRet, route) => {
|
|
171
172
|
const toAdd = Array.isArray(route) ? route : [route];
|
|
172
|
-
|
|
173
|
+
toRet.push(...toAdd);
|
|
173
174
|
return toRet;
|
|
174
175
|
}, []);
|
|
175
176
|
console.timeEnd('Resolving Apis');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/HttpServer.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAEH;;GAEG;AAEH,2CAA2C;AAC3C,yBAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/HttpServer.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAEH;;GAEG;AAEH,2CAA2C;AAC3C,yBAAyB;AACzB,6CAAqE;AACrE,iDAA8C;AAC9C,mCAAmC;AAGnC,mDAA+D;AAE/D,qEAAgE;AAChE,0EAAwE;AACxE,mDAAoF;AAEpF,MAAM,WAAW,GAAa;IAC1B,KAAK;IACL,KAAK;IACL,OAAO;IACP,MAAM;IACN,QAAQ;IACR,SAAS;CACZ,CAAC;AAEF,MAAM,cAAc,GAAa;IAC7B,cAAc;IACd,kBAAkB;IAClB,cAAc;IACd,eAAe;CAClB,CAAA;AAED,MAAM,cAAc,GAAa;IAC7B,sCAA6B;IAC7B,sBAAa;CAChB,CAAC;AAuBF,MAAa,gBACT,SAAQ,eAAkB;IAO1B,YAAY,QAAiB;QACzB,KAAK,CAAC,YAAY,CAAC,CAAC;QALxB,yBAAoB,GAAqB,8CAA8B,EAAE,CAAC;QAMtE,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;IAC5B,CAAC;IAED,uBAAuB,CAAC,oBAAsC;QAC1D,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACrD,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,UAAiC;QAClD,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,UAAU;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC/B,CAAC;IAEe,IAAI;;YAChB,IAAI,CAAC,WAAW,CAAC,sBAAS,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAQ,CAAC,IAAI,CAAC,CAAA;YACtE,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;YACpC,IAAI,OAAO,EAAE;gBACT,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;oBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAEnE,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;aACvD;YAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;gBAChC,IAAI,GAAG;oBACH,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAE5C,IAAI,EAAE,CAAC;YACX,CAAC,CAAC,CAAC;YAEH,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;YAChD,IAAI,WAAW;gBACX,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,CAAC,CAAC,CAAC;YACzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;YAChC,KAAK,MAAM,UAAU,IAAI,gBAAgB,CAAC,iBAAiB,EAAE;gBACzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;aAChC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,cAAc;gBACpB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;YAEzC,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAY,EAAE,EAAE;gBACzD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;oBACrB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAErB,OAAO,KAAK,CAAC;YACjB,CAAC,EAAE,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YAEvB,MAAM,iBAAiB,GAAG,CAAC,MAA0B,EAAsB,EAAE;gBACzE,IAAI,OAAe,CAAC;gBACpB,IAAI,CAAC,MAAM;oBACP,OAAO;gBAEX,IAAI,OAAO,MAAM,KAAK,QAAQ;oBAC1B,OAAO,GAAG,MAAM,CAAC;;oBAEjB,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAExB,IAAI,CAAC,IAAI,CAAC,OAAO;oBACb,OAAO,OAAO,CAAC;gBAEnB,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC;oBAChD,OAAO,OAAO,CAAC;YACvB,CAAC,CAAC;YAEF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAmB,EAAE,GAAoB,EAAE,IAA0B,EAAE,EAAE;;gBAC5F,IAAI,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;gBAChC,IAAI,MAAM,EAAE;oBACR,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;oBACnC,IAAI,CAAC,MAAM;wBACP,IAAI,CAAC,UAAU,CAAC,4BAA4B,GAAG,CAAC,OAAO,CAAC,MAAM,gCAAgC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;iBACrI;gBAED,GAAG,CAAC,MAAM,CAAC,6BAA6B,EAAE,MAAM,IAAI,KAAK,CAAC,CAAC;gBAC3D,GAAG,CAAC,MAAM,CAAC,8BAA8B,EAAE,CAAC,IAAI,CAAC,OAAO,IAAI,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBACpF,GAAG,CAAC,MAAM,CAAC,8BAA8B,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBACnE,GAAG,CAAC,MAAM,CAAC,+BAA+B,QAAE,IAAI,CAAC,cAAc,0CAAE,IAAI,CAAC,GAAG,EAAE,CAAC;gBAE5E,IAAI,EAAE,CAAC;YACX,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,GAAmB,EAAE,GAAoB,EAAE,EAAE;gBACpE,GAAG,CAAC,GAAG,EAAE,CAAC;YACd,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;IAEM,WAAW,CAAC,MAAc;QAC7B,IAAI,CAAC,sBAAS,CAAC,OAAO;YAClB,OAAO;QAEX,MAAM,KAAK,GAAG,YAAY,IAAI,CAAC,MAAM,CAAC,MAAM,SAAS,CAAC;QACtD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACnB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACtG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC1B,CAAC;IAEM,UAAU,CAAC,aAA4B,EAAE,SAAiB,EAAE,IAAsB;QACrF,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAE9B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,iCAAiC;QACjC,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAE/D,yCAAyC;QACzC,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAE3D,MAAM,aAAa,GAAG,CAAC,KAAY,EAAS,EAAE;YAC1C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE;gBAC5B,IAAI,KAAK,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;oBACrD,IAAI,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC/C,IAAI,OAAO,CAAC,MAAM,GAAG,EAAE;wBACnB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;oBAEtB,OAAO,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAC,CAAC;iBACrD;gBAED,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;oBACvB,OAAO,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAEjD,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,MAAM,MAAM,GAAgC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAkB,EAAE,KAAK,EAAE,EAAE;YACtD,MAAM,KAAK,GAAgB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAClE,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;YACrB,OAAO,KAAK,CAAC;QACjB,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;IACrC,CAAC;;AAlJL,4CAmJC;AAhJ2B,kCAAiB,GAA4B,EAAE,CAAC;AAkJ5E,MAAa,aAAa;IAMtB,YAAY,OAAoB,EAAE,OAAe,EAAE,SAAkB;QAF7D,gBAAW,GAA2B,EAAE,CAAC;QAG7C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,EAAE,CAAC;IACrC,CAAC;IAED,cAAc,CAAC,GAAG,WAAmC;QACjD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,UAAU,CAAC,SAAiB,EAAE,OAAe,EAAE,IAAa;QAC/D,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IACtF,CAAC;IAEO,cAAc,CAAC,SAAiB,EAAE,UAAkB,EAAE,OAAe,EAAE,IAAa;QACxF,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;YAChD,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE;gBACpD,IAAI,CAAC,cAAc,CAAC,GAAG,SAAS,IAAI,IAAI,EAAE,EAAE,GAAG,UAAU,IAAI,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;gBACpF,OAAO;aACV;YAED,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACtB,OAAO;YAEX,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;gBACrB,OAAO;YAEX,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBACpB,OAAO;YAEX,MAAM,kBAAkB,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;YAC9E,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACtB,IAAI,aAA4B,CAAC;gBACjC,IAAI;oBACA,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;iBACpD;gBAAC,OAAO,CAAC,EAAE;oBACR,OAAO,CAAC,GAAG,CAAC,0CAA0C,UAAU,IAAI,kBAAkB,EAAE,EAAE,CAAC,CAAC,CAAC;oBAC7F,MAAM,CAAC,CAAC;iBACX;gBAED,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;gBACnD,OAAO;aACV;YAED,IAAI,OAA8D,CAAC;YACnE,IAAI;gBACA,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;aAC9C;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,CAAC,GAAG,CAAC,sCAAsC,UAAU,IAAI,kBAAkB,EAAE,EAAE,CAAC,CAAC,CAAC;gBACzF,MAAM,CAAC,CAAC;aACX;YAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;gBACvB,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC;YAExB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QACrD,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,SAAS,CAAC,IAAsB,EAAE,SAAiB,EAAE,OAAe,EAAE,IAAa;QACtF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACf,GAAG,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;YACxC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAxED,sCAwEC;AAED,MAAa,SAAS;IAIlB,YAAY,GAAW,EAAE,eAAuB,GAAG;QAC/C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED,GAAG,CAAC,OAAuB;QACvB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK;YACN,MAAM,IAAI,yBAAY,CAAC,IAAI,CAAC,YAAY,EAAE,4BAA4B,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAEtF,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAhBD,8BAgBC"}
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
/**
|
|
3
|
-
* Created by tacb0ss on 11/07/2018.
|
|
4
|
-
*/
|
|
5
|
-
import { Logger, ObjectTS, ValidatorTypeResolver } from "@intuitionrobotics/ts-common";
|
|
6
2
|
import { Stream } from "stream";
|
|
7
3
|
import { ServerApi_Middleware } from "./HttpServer";
|
|
8
4
|
import { IncomingHttpHeaders } from "http";
|
|
9
5
|
import { ApiTypeBinder, ApiWithBody, ApiWithQuery, DeriveBodyType, DeriveQueryType, DeriveResponseType, DeriveUrlType, HttpMethod, QueryParams } from "../../../shared/types";
|
|
10
6
|
import { ApiException } from "../../exceptions";
|
|
11
7
|
import { ExpressRequest, ExpressResponse, ExpressRouter } from "../../utils/types";
|
|
8
|
+
import { Logger } from "@intuitionrobotics/ts-common/core/logger/Logger";
|
|
9
|
+
import { ValidatorTypeResolver } from "@intuitionrobotics/ts-common/validator/validator";
|
|
10
|
+
import { ObjectTS } from "@intuitionrobotics/ts-common/utils/types";
|
|
12
11
|
export declare type HttpRequestData = {
|
|
13
12
|
originalUrl: string;
|
|
14
13
|
headers: IncomingHttpHeaders;
|
|
@@ -1,24 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
/*
|
|
3
|
-
* Thunderstorm is a full web app framework!
|
|
4
|
-
*
|
|
5
|
-
* Typescript & Express backend infrastructure that natively runs on firebase function
|
|
6
|
-
* Typescript & React frontend infrastructure
|
|
7
|
-
*
|
|
8
|
-
* Copyright (C) 2020 Intuition Robotics
|
|
9
|
-
*
|
|
10
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
11
|
-
* you may not use this file except in compliance with the License.
|
|
12
|
-
* You may obtain a copy of the License at
|
|
13
|
-
*
|
|
14
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
|
15
|
-
*
|
|
16
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
17
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
18
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
19
|
-
* See the License for the specific language governing permissions and
|
|
20
|
-
* limitations under the License.
|
|
21
|
-
*/
|
|
22
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
23
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
24
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -30,18 +10,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
30
10
|
};
|
|
31
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
32
12
|
exports.ApiResponse = exports.ServerApi_Redirect = exports.ServerApi_Proxy = exports.ServerApi_Post = exports.ServerApi_Get = exports.ServerApi = void 0;
|
|
33
|
-
/**
|
|
34
|
-
* Created by tacb0ss on 11/07/2018.
|
|
35
|
-
*/
|
|
36
|
-
const ts_common_1 = require("@intuitionrobotics/ts-common");
|
|
37
13
|
const url_1 = require("url");
|
|
38
|
-
// noinspection TypeScriptPreferShortImport
|
|
39
14
|
const types_1 = require("../../../shared/types");
|
|
40
15
|
const to_be_removed_1 = require("../../utils/to-be-removed");
|
|
41
16
|
const exceptions_1 = require("../../exceptions");
|
|
42
17
|
const RemoteProxy_1 = require("../proxy/RemoteProxy");
|
|
43
18
|
const Storm_1 = require("../../core/Storm");
|
|
44
|
-
|
|
19
|
+
const Logger_1 = require("@intuitionrobotics/ts-common/core/logger/Logger");
|
|
20
|
+
const validator_1 = require("@intuitionrobotics/ts-common/validator/validator");
|
|
21
|
+
const types_2 = require("@intuitionrobotics/ts-common/core/logger/types");
|
|
22
|
+
const error_handling_1 = require("@intuitionrobotics/ts-common/core/error-handling");
|
|
23
|
+
const exceptions_2 = require("@intuitionrobotics/ts-common/core/exceptions");
|
|
24
|
+
const merge_tools_1 = require("@intuitionrobotics/ts-common/utils/merge-tools");
|
|
25
|
+
const object_tools_1 = require("@intuitionrobotics/ts-common/utils/object-tools");
|
|
26
|
+
class ServerApi extends Logger_1.Logger {
|
|
45
27
|
constructor(method, relativePath, tag) {
|
|
46
28
|
super(tag || relativePath);
|
|
47
29
|
this.printResponse = true;
|
|
@@ -95,8 +77,8 @@ class ServerApi extends ts_common_1.Logger {
|
|
|
95
77
|
body: body
|
|
96
78
|
};
|
|
97
79
|
try {
|
|
98
|
-
this.bodyValidator &&
|
|
99
|
-
this.queryValidator &&
|
|
80
|
+
this.bodyValidator && validator_1.validate(body, this.bodyValidator);
|
|
81
|
+
this.queryValidator && validator_1.validate(reqQuery, this.queryValidator);
|
|
100
82
|
const context = yield this.applyMiddlewares(req, requestData, response);
|
|
101
83
|
const toReturn = yield this.process(req, response, reqQuery, body, context);
|
|
102
84
|
if (response.isConsumed())
|
|
@@ -115,11 +97,11 @@ class ServerApi extends ts_common_1.Logger {
|
|
|
115
97
|
}
|
|
116
98
|
catch (err) {
|
|
117
99
|
let e = err;
|
|
118
|
-
let severity =
|
|
100
|
+
let severity = error_handling_1.ServerErrorSeverity.Warning;
|
|
119
101
|
if (typeof e === "string")
|
|
120
|
-
e = new
|
|
102
|
+
e = new exceptions_2.BadImplementationException(`String was thrown: ${e}`);
|
|
121
103
|
if (!(e instanceof Error) && typeof e === "object")
|
|
122
|
-
e = new
|
|
104
|
+
e = new exceptions_2.BadImplementationException(`Object instance was thrown: ${JSON.stringify(e)}`);
|
|
123
105
|
try {
|
|
124
106
|
this.logErrorBold(e);
|
|
125
107
|
}
|
|
@@ -128,36 +110,36 @@ class ServerApi extends ts_common_1.Logger {
|
|
|
128
110
|
this.logErrorBold(`Original error thrown: ${JSON.stringify(e)}`);
|
|
129
111
|
this.logErrorBold(`-- Someone was stupid... you MUST only throw an Error and not objects or strings!! --`);
|
|
130
112
|
}
|
|
131
|
-
if (
|
|
113
|
+
if (exceptions_2.isErrorOfType(e, validator_1.ValidationException))
|
|
132
114
|
e = new exceptions_1.ApiException(400, "Validator exception", e);
|
|
133
|
-
if (!
|
|
115
|
+
if (!exceptions_2.isErrorOfType(e, exceptions_1.ApiException))
|
|
134
116
|
e = new exceptions_1.ApiException(500, "Unexpected server error", e);
|
|
135
|
-
const apiException =
|
|
117
|
+
const apiException = exceptions_2.isErrorOfType(e, exceptions_1.ApiException);
|
|
136
118
|
if (!apiException)
|
|
137
|
-
throw new
|
|
119
|
+
throw new exceptions_2.MUSTNeverHappenException("MUST NEVER REACH HERE!!!");
|
|
138
120
|
if (apiException.responseCode >= 500)
|
|
139
|
-
severity =
|
|
121
|
+
severity = error_handling_1.ServerErrorSeverity.Error;
|
|
140
122
|
else if (apiException.responseCode >= 400)
|
|
141
|
-
severity =
|
|
123
|
+
severity = error_handling_1.ServerErrorSeverity.Warning;
|
|
142
124
|
switch (apiException.responseCode) {
|
|
143
125
|
case 401:
|
|
144
|
-
severity =
|
|
126
|
+
severity = error_handling_1.ServerErrorSeverity.Debug;
|
|
145
127
|
break;
|
|
146
128
|
case 404:
|
|
147
|
-
severity =
|
|
129
|
+
severity = error_handling_1.ServerErrorSeverity.Info;
|
|
148
130
|
break;
|
|
149
131
|
case 403:
|
|
150
|
-
severity =
|
|
132
|
+
severity = error_handling_1.ServerErrorSeverity.Warning;
|
|
151
133
|
break;
|
|
152
134
|
case 500:
|
|
153
|
-
severity =
|
|
135
|
+
severity = error_handling_1.ServerErrorSeverity.Critical;
|
|
154
136
|
break;
|
|
155
137
|
}
|
|
156
138
|
try {
|
|
157
139
|
const httpServer = (_a = Storm_1.Storm.getInstance()) === null || _a === void 0 ? void 0 : _a.getHttpServer();
|
|
158
140
|
if (httpServer) {
|
|
159
141
|
const message = yield httpServer.errorMessageComposer(requestData, apiException);
|
|
160
|
-
yield
|
|
142
|
+
yield error_handling_1.dispatch_onServerError.dispatchModuleAsync([
|
|
161
143
|
severity,
|
|
162
144
|
httpServer,
|
|
163
145
|
message
|
|
@@ -172,7 +154,7 @@ class ServerApi extends ts_common_1.Logger {
|
|
|
172
154
|
return response.exception(apiException);
|
|
173
155
|
}
|
|
174
156
|
});
|
|
175
|
-
this.setMinLevel(ServerApi.isDebug ?
|
|
157
|
+
this.setMinLevel(ServerApi.isDebug ? types_2.LogLevel.Verbose : types_2.LogLevel.Info);
|
|
176
158
|
this.method = method;
|
|
177
159
|
this.relativePath = `${relativePath}`;
|
|
178
160
|
}
|
|
@@ -225,7 +207,7 @@ class ServerApi extends ts_common_1.Logger {
|
|
|
225
207
|
if (!this.middlewares)
|
|
226
208
|
return {};
|
|
227
209
|
const contextList = yield Promise.all(this.middlewares.map((m) => __awaiter(this, void 0, void 0, function* () { return m(req, requestData, response); })));
|
|
228
|
-
return contextList.reduce((acc, c) =>
|
|
210
|
+
return contextList.reduce((acc, c) => merge_tools_1.merge(acc, c || {}), {});
|
|
229
211
|
});
|
|
230
212
|
}
|
|
231
213
|
}
|
|
@@ -264,7 +246,7 @@ class ServerApi_Redirect extends ServerApi {
|
|
|
264
246
|
}
|
|
265
247
|
process(request, response, queryParams, body) {
|
|
266
248
|
return __awaiter(this, void 0, void 0, function* () {
|
|
267
|
-
const query = queryParams ?
|
|
249
|
+
const query = queryParams ? object_tools_1._keys(queryParams).reduce((c, k) => c + '&' + k + '=' + queryParams[k], '?') : '';
|
|
268
250
|
response.redirect(this.responseCode, `${this.baseUrl}${this.redirectUrl}${query}`);
|
|
269
251
|
});
|
|
270
252
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-api.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/server-api.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server-api.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/server-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6BAA0B;AAG1B,iDAU+B;AAC/B,6DAAyD;AACzD,iDAA8C;AAE9C,sDAAiD;AACjD,4CAAuC;AACvC,4EAAuE;AACvE,gFAAsH;AACtH,0EAAwE;AACxE,qFAA6G;AAC7G,6EAIsD;AAEtD,gFAAqE;AACrE,kFAAsE;AAYtE,MAAsB,SAClB,SAAQ,eAAM;IAed,YAAsB,MAAkB,EAAE,YAAoB,EAAE,GAAY;QACxE,KAAK,CAAC,GAAG,IAAI,YAAY,CAAC,CAAC;QAbvB,kBAAa,GAAY,IAAI,CAAC;QAC7B,iBAAY,GAAa,EAAE,CAAC;QAQ7B,gBAAW,GAA2B,EAAE,CAAC;QAkEjD,mBAAc,GAAG,8BAAc,CAAC;QAEhC,gBAAW,GAAG,CAAO,GAAmB,EAAE,GAAoB,EAAE,EAAE;YAC9D,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YACzB,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACpC,CAAC,CAAA,CAAA;QAEO,uBAAkB,GAAG,GAAS,EAAE;YACpC,IAAI;gBACA,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;aACtE;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,CAAC,QAAQ,CAAC,wDAAwD,EAAE,CAAC,CAAC,CAAC;aAC9E;oBAAS;gBACN,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;aACzB;QACL,CAAC,CAAA,CAAC;QAEF,SAAI,GAAG,CAAO,GAAmB,EAAE,GAAoB,EAAE,EAAE;;YACvD,MAAM,QAAQ,GAAgB,IAAI,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAEzD,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YAE7C,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC9B,MAAM,OAAO,GAAwC,EAAE,CAAC;gBACxD,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,YAAY,EAAE;oBACxC,OAAO,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;iBAChD;gBACD,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;aAC1C;YAED,MAAM,QAAQ,GAAM,WAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,KAAU,CAAC;YACpD,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAuB,CAAC,CAAC,MAAM;gBACvF,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;;gBAE7C,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAEpC,MAAM,IAAI,GAA2B,GAAG,CAAC,IAAI,CAAC;YAC9C,IAAI,IAAI,IAAI,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC;gBACpC,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,IAAyB,CAAC,CAAC;iBAChE,IAAI,IAAI,IAAK,IAAe,CAAC,MAAM;gBACpC,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,IAAyB,CAAC,CAAC;;gBAEjE,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YAElC,MAAM,WAAW,GAAoB;gBACjC,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,WAAW,EAAE,GAAG,CAAC,IAAI;gBACrB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,KAAK,EAAE,QAAQ;gBACf,IAAI,EAAE,IAAS;aAClB,CAAC;YAEF,IAAI;gBACA,IAAI,CAAC,aAAa,IAAI,oBAAQ,CAAI,IAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBACjE,IAAI,CAAC,cAAc,IAAI,oBAAQ,CAAI,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;gBAElE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;gBAExE,MAAM,QAAQ,GAAY,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAS,EAAE,OAAO,CAAC,CAAC;gBAC1F,IAAI,QAAQ,CAAC,UAAU,EAAE;oBACrB,OAAO;gBAEX,IAAI,CAAC,QAAQ;oBACT,OAAO,MAAM,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAEnC,yCAAyC;gBACzC,iCAAiC;gBACjC,oDAAoD;gBAEpD,MAAM,YAAY,GAAG,OAAO,QAAQ,CAAC;gBACrC,IAAI,YAAY,KAAK,QAAQ;oBACzB,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,QAAkB,CAAC,CAAC;gBAExD,IAAI,YAAY,KAAK,QAAQ,IAAK,QAAmB,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;oBACnF,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,QAAkB,CAAC,CAAC;gBAExD,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,QAAkB,CAAC,CAAC;aACvD;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAQ,GAAG,CAAC;gBACjB,IAAI,QAAQ,GAAwB,oCAAmB,CAAC,OAAO,CAAC;gBAChE,IAAI,OAAO,CAAC,KAAK,QAAQ;oBACrB,CAAC,GAAG,IAAI,uCAA0B,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;gBAElE,IAAI,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;oBAC9C,CAAC,GAAG,IAAI,uCAA0B,CAAC,+BAA+B,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAE3F,IAAI;oBACA,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;iBACxB;gBAAC,OAAO,EAAE,EAAE;oBACT,IAAI,CAAC,YAAY,CAAC,0CAA0C,EAAE,EAAE,CAAC,CAAC;oBAClE,IAAI,CAAC,YAAY,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACjE,IAAI,CAAC,YAAY,CAAC,uFAAuF,CAAC,CAAC;iBAC9G;gBAED,IAAI,0BAAa,CAAC,CAAC,EAAE,+BAAmB,CAAC;oBACrC,CAAC,GAAG,IAAI,yBAAY,CAAC,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC,CAAC;gBAExD,IAAI,CAAC,0BAAa,CAAC,CAAC,EAAE,yBAAY,CAAC;oBAC/B,CAAC,GAAG,IAAI,yBAAY,CAAC,GAAG,EAAE,yBAAyB,EAAE,CAAC,CAAC,CAAC;gBAE5D,MAAM,YAAY,GAAG,0BAAa,CAAC,CAAC,EAAE,yBAAY,CAAC,CAAC;gBACpD,IAAI,CAAC,YAAY;oBACb,MAAM,IAAI,qCAAwB,CAAC,0BAA0B,CAAC,CAAC;gBAEnE,IAAI,YAAY,CAAC,YAAY,IAAI,GAAG;oBAChC,QAAQ,GAAG,oCAAmB,CAAC,KAAK,CAAC;qBACpC,IAAI,YAAY,CAAC,YAAY,IAAI,GAAG;oBACrC,QAAQ,GAAG,oCAAmB,CAAC,OAAO,CAAC;gBAE3C,QAAQ,YAAY,CAAC,YAAY,EAAE;oBAC/B,KAAK,GAAG;wBACJ,QAAQ,GAAG,oCAAmB,CAAC,KAAK,CAAC;wBACrC,MAAM;oBAEV,KAAK,GAAG;wBACJ,QAAQ,GAAG,oCAAmB,CAAC,IAAI,CAAC;wBACpC,MAAM;oBAEV,KAAK,GAAG;wBACJ,QAAQ,GAAG,oCAAmB,CAAC,OAAO,CAAC;wBACvC,MAAM;oBAEV,KAAK,GAAG;wBACJ,QAAQ,GAAG,oCAAmB,CAAC,QAAQ,CAAC;wBACxC,MAAM;iBACb;gBAED,IAAI;oBACA,MAAM,UAAU,SAAG,aAAK,CAAC,WAAW,EAAE,0CAAE,aAAa,EAAE,CAAC;oBACxD,IAAI,UAAU,EAAE;wBACZ,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;wBACjF,MAAM,uCAAsB,CAAC,mBAAmB,CAAC;4BAC7C,QAAQ;4BACR,UAAU;4BACV,OAAO;yBACV,CAAC,CAAC;qBACN;iBACJ;gBAAC,OAAO,CAAC,EAAE;oBACR,IAAI,CAAC,QAAQ,CAAC,kCAAkC,EAAE,CAAC,CAAC,CAAC;iBACxD;gBACD,IAAI,YAAY,CAAC,YAAY,KAAK,GAAG;oBACjC,OAAO,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBAE9C,OAAO,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;aAC3C;QACL,CAAC,CAAA,CAAC;QA/ME,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAQ,CAAC,IAAI,CAAC,CAAC;QAEvE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,GAAG,YAAY,EAAE,CAAC;IAC1C,CAAC;IAED,mBAAmB;QACf,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAAA,CAAC;IAEF,aAAa,CAAC,UAA8B;QACxC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc,CAAC,GAAG,WAAmC;QACjD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc,CAAC,GAAG,WAAmC;QACjD,IAAI,CAAC,WAAW,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,GAAG,WAAW,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc,CAAC,GAAG,YAAsB;QACpC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;IAC5C,CAAC;IAED,gBAAgB,CAAC,aAAuC;QACpD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAED,iBAAiB,CAAC,cAAwC;QACtD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACzC,CAAC;IAED,OAAO;QACH,OAAO,IAAI,eAAe,CAAS,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IAED,iBAAiB;QACb,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC/B,CAAC;IAED,uBAAuB,CAAC,yBAAiC;QACrD,IAAI,CAAC,aAAa,GAAG,yBAAyB,GAAG,CAAC,CAAC,CAAC;IACxD,CAAC;IAEM,KAAK,CAAC,MAAqB,EAAE,SAAiB,EAAE,OAAe;QAClE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,MAAM,QAAQ,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAChD,IAAI,CAAC,GAAG,GAAG,GAAG,OAAO,GAAG,QAAQ,EAAE,CAAC;IACvC,CAAC;IAsJa,gBAAgB,CAAC,GAAmB,EAAE,WAA4B,EAAE,QAAqB;;YACnG,IAAI,CAAC,IAAI,CAAC,WAAW;gBACjB,OAAO,EAAE,CAAC;YAEd,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,GAAG,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA,GAAA,CAAC,CAAC,CAAC;YAEtG,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,GAAa,EAAE,CAAC,EAAE,EAAE,CAAC,mBAAK,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;QAC5E,CAAC;KAAA;CAIJ;AA9OD,8BA8OC;AAED,MAAsB,aAClB,SAAQ,SAAiB;IAEzB,YAAsB,OAAe;QACjC,KAAK,CAAC,kBAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC;CACJ;AAND,sCAMC;AAED,MAAsB,cAClB,SAAQ,SAAiB;IAEzB,YAAsB,OAAe;QACjC,KAAK,CAAC,kBAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;CACJ;AAND,wCAMC;AAED,MAAa,eACT,SAAQ,SAAiB;IAGzB,YAAmB,GAAmB;QAClC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,YAAY,QAAQ,CAAC,CAAC;QAC/C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,cAAc,CAAC,yBAAW,CAAC,UAAU,CAAC,CAAC;IAChD,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAoC,EAAE,IAA4B,EAAE,OAAiB;;YACzJ,aAAa;YACb,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3E,CAAC;KAAA;CACJ;AAdD,0CAcC;AAED,MAAa,kBACT,SAAQ,SAAc;IAItB,YAAmB,OAAe,EAAE,YAAoB,EAAE,WAAmB;QACzE,KAAK,CAAC,kBAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAEe,OAAO,CAAC,OAAuB,EAAE,QAAqB,EAAE,WAAwB,EAAE,IAAS;;YACvG,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,oBAAK,CAAsB,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACnJ,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,GAAG,KAAK,EAAE,CAAC,CAAC;QACvF,CAAC;KAAA;CACJ;AAfD,gDAeC;AAED,MAAa,WAAW;IAKpB,YAAY,GAAmB,EAAE,GAAoB;QAF7C,aAAQ,GAAY,KAAK,CAAC;QAG9B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IAEM,UAAU;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEO,OAAO;QACX,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,kCAAkC,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;YACnE,OAAO;SACV;QAED,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,YAAoB,EAAE,MAAc,EAAE,OAAa;QACtD,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAC,GAAG,EAAE,KAAK,EAAC,CAAC,CAAC;QACpC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YAClB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,YAAY,CAAC,OAAa;QAC9B,IAAI,CAAC,OAAO;YACR,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;QAE1D,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;IAEO,aAAa,CAAC,QAA0B;QAC5C,IAAI,CAAC,QAAQ;YACT,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC;QAEvD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE;YAC/B,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,kCAAkC,CAAC,CAAC;QAEnE,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IACnD,CAAC;IAEM,IAAI,CAAC,YAAoB,EAAE,OAAa;QAC3C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,CAAC,YAAoB,EAAE,QAAiB,EAAE,QAAc;QACxD,MAAM,OAAO,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QACjC,OAAO,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC;QAEvC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,YAAoB,EAAE,QAAiB,EAAE,QAAc;QACxD,MAAM,OAAO,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QACjC,OAAO,CAAC,cAAc,CAAC,GAAG,WAAW,CAAC;QAEtC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,YAAoB,EAAE,QAA0B,EAAE,QAAc;QACjE,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IAGO,KAAK,CAAC,YAAoB,EAAE,QAA0B,EAAE,QAAc;QAC1E,MAAM,OAAO,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QACjC,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC;QAE7C,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,GAAG,CAAC,YAAoB,EAAE,QAA0B,EAAE,OAAa;QAC/D,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAE7B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC9F,CAAC;IAED,UAAU,CAAC,OAAY;QACnB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,SAAS,CAAC,SAAiB,EAAE,KAAwB;QACjD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;IAED,QAAQ,CAAC,YAAoB,EAAE,GAAW;QACtC,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,SAAS,CAAC,SAAuB,EAAE,OAAa;QAC5C,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;QAC5C,IAAI,CAAC,SAAS,CAAC,OAAO;YAClB,OAAO,YAAY,CAAC,YAAY,CAAC;QAErC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,WAAW,CAAC,KAAgC,EAAE,OAAa;QACvD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;QAC5D,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC1E,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1E,CAAC;CACJ;AAzHD,kCAyHC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { HttpRequestData } from "./server-api";
|
|
2
2
|
import { HttpErrorHandler } from "./HttpServer";
|
|
3
|
-
import { StringMap } from "@intuitionrobotics/ts-common";
|
|
3
|
+
import { StringMap } from "@intuitionrobotics/ts-common/utils/types";
|
|
4
4
|
export declare type AppPropsResolver = (requestData: HttpRequestData) => Promise<StringMap>;
|
|
5
5
|
export declare function DefaultApiErrorMessageComposer(headersToAttach?: string[], propsResolver?: AppPropsResolver): HttpErrorHandler;
|
|
@@ -30,7 +30,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
30
30
|
};
|
|
31
31
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
32
32
|
exports.DefaultApiErrorMessageComposer = void 0;
|
|
33
|
-
const
|
|
33
|
+
const object_tools_1 = require("@intuitionrobotics/ts-common/utils/object-tools");
|
|
34
|
+
const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
|
|
34
35
|
const _propsResolver = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
35
36
|
return {};
|
|
36
37
|
});
|
|
@@ -40,7 +41,7 @@ function DefaultApiErrorMessageComposer(headersToAttach = [], propsResolver = _p
|
|
|
40
41
|
const props = yield propsResolver(requestData);
|
|
41
42
|
let slackMessage = "";
|
|
42
43
|
slackMessage += `${error ? error.responseCode : "000"} - ${url} \n\n`;
|
|
43
|
-
const propsAsString =
|
|
44
|
+
const propsAsString = object_tools_1._keys(props).reduce((toRet, key) => {
|
|
44
45
|
return `${toRet} ${key}: ${props[key]}\n`;
|
|
45
46
|
}, "");
|
|
46
47
|
if (props && Object.keys(props).length > 0)
|
|
@@ -58,24 +59,24 @@ function DefaultApiErrorMessageComposer(headersToAttach = [], propsResolver = _p
|
|
|
58
59
|
slackMessage += "--------------------------------------------------------------------------------------\n";
|
|
59
60
|
}
|
|
60
61
|
}
|
|
61
|
-
const _headers =
|
|
62
|
+
const _headers = object_tools_1._keys(headers).reduce((toRet, key) => {
|
|
62
63
|
if (headersToAttach.includes(key))
|
|
63
64
|
toRet[key] = headers[key];
|
|
64
65
|
return toRet;
|
|
65
66
|
}, {});
|
|
66
67
|
if (_headers && Object.keys(_headers).length > 0)
|
|
67
|
-
slackMessage += `Headers: ${
|
|
68
|
+
slackMessage += `Headers: ${tools_1.__stringify(_headers)}\n`;
|
|
68
69
|
else
|
|
69
70
|
slackMessage += "Headers: -- No Included Headers --\n";
|
|
70
71
|
if (query) {
|
|
71
72
|
if (query && Object.keys(query).length > 0)
|
|
72
|
-
slackMessage += `Query: ${
|
|
73
|
+
slackMessage += `Query: ${tools_1.__stringify(query, true)}\n`;
|
|
73
74
|
else
|
|
74
75
|
slackMessage += "Query: -- No Query --\n";
|
|
75
76
|
}
|
|
76
77
|
if (body) {
|
|
77
78
|
if (body && Object.keys(body).length > 0)
|
|
78
|
-
slackMessage += `Body: ${
|
|
79
|
+
slackMessage += `Body: ${tools_1.__stringify(body)}\n`;
|
|
79
80
|
else
|
|
80
81
|
slackMessage += "Body: -- No Body --\n";
|
|
81
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-errors.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/server-errors.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"server-errors.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/server-errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { LogClient_BaseRotate } from "@intuitionrobotics/ts-common";
|
|
1
|
+
import { LogClient_BaseRotate } from "@intuitionrobotics/ts-common/core/logger/LogClient_BaseRotate";
|
|
2
2
|
export declare class LogClient_File extends LogClient_BaseRotate {
|
|
3
|
-
private pathToFolder;
|
|
3
|
+
private readonly pathToFolder;
|
|
4
4
|
private buffer;
|
|
5
5
|
constructor(name: string, pathToFolder: string, maxEntries?: number, maxSize?: number);
|
|
6
6
|
private getFileName;
|
|
@@ -1,35 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
/*
|
|
3
|
-
* Permissions management system, define access level for each of
|
|
4
|
-
* your server apis, and restrict users by giving them access levels
|
|
5
|
-
*
|
|
6
|
-
* Copyright (C) 2020 Intuition Robotics
|
|
7
|
-
*
|
|
8
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
9
|
-
* you may not use this file except in compliance with the License.
|
|
10
|
-
* You may obtain a copy of the License at
|
|
11
|
-
*
|
|
12
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
|
13
|
-
*
|
|
14
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
15
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
16
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
17
|
-
* See the License for the specific language governing permissions and
|
|
18
|
-
* limitations under the License.
|
|
19
|
-
*/
|
|
20
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
3
|
exports.LogClient_File = void 0;
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
class LogClient_File extends
|
|
4
|
+
const LogClient_BaseRotate_1 = require("@intuitionrobotics/ts-common/core/logger/LogClient_BaseRotate");
|
|
5
|
+
const fs_1 = require("fs");
|
|
6
|
+
class LogClient_File extends LogClient_BaseRotate_1.LogClient_BaseRotate {
|
|
25
7
|
constructor(name, pathToFolder, maxEntries = 10, maxSize = 1024 * 1024) {
|
|
26
8
|
super(name, maxEntries, maxSize);
|
|
27
9
|
this.pathToFolder = pathToFolder;
|
|
28
|
-
if (!
|
|
29
|
-
|
|
10
|
+
if (!fs_1.existsSync(pathToFolder))
|
|
11
|
+
fs_1.mkdirSync(pathToFolder, { recursive: true });
|
|
30
12
|
const defaultLogfile = this.getFileName();
|
|
31
|
-
if (
|
|
32
|
-
this.bufferSize =
|
|
13
|
+
if (fs_1.existsSync(defaultLogfile))
|
|
14
|
+
this.bufferSize = fs_1.statSync(`${defaultLogfile}`).size;
|
|
33
15
|
this.prepare();
|
|
34
16
|
}
|
|
35
17
|
getFileName(index = 0) {
|
|
@@ -39,19 +21,19 @@ class LogClient_File extends ts_common_1.LogClient_BaseRotate {
|
|
|
39
21
|
this.buffer.write(log);
|
|
40
22
|
}
|
|
41
23
|
rotateBuffer(fromIndex, toIndex) {
|
|
42
|
-
if (
|
|
24
|
+
if (fs_1.existsSync(this.getFileName(fromIndex))) {
|
|
43
25
|
console.log(`rotating ${fromIndex} => ${toIndex}`);
|
|
44
|
-
|
|
26
|
+
fs_1.renameSync(this.getFileName(fromIndex), this.getFileName(toIndex));
|
|
45
27
|
}
|
|
46
28
|
}
|
|
47
29
|
cleanup() {
|
|
48
30
|
const fileName = this.getFileName(this.maxEntries - 1);
|
|
49
|
-
if (
|
|
50
|
-
|
|
31
|
+
if (fs_1.existsSync(fileName))
|
|
32
|
+
fs_1.unlinkSync(fileName);
|
|
51
33
|
this.buffer.end();
|
|
52
34
|
}
|
|
53
35
|
prepare() {
|
|
54
|
-
this.buffer =
|
|
36
|
+
this.buffer = fs_1.createWriteStream(this.getFileName(), { flags: 'a' });
|
|
55
37
|
}
|
|
56
38
|
}
|
|
57
39
|
exports.LogClient_File = LogClient_File;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogClient_File.js","sourceRoot":"","sources":["../../../src/main/app-backend/utils/LogClient_File.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LogClient_File.js","sourceRoot":"","sources":["../../../src/main/app-backend/utils/LogClient_File.ts"],"names":[],"mappings":";;;AAAA,wGAAmG;AACnG,2BAA2G;AAE3G,MAAa,cACT,SAAQ,2CAAoB;IAK5B,YAAY,IAAY,EAAE,YAAoB,EAAE,UAAU,GAAG,EAAE,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI;QAClF,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,eAAU,CAAC,YAAY,CAAC;YACzB,cAAS,CAAC,YAAY,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;QAE/C,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,eAAU,CAAC,cAAc,CAAC;YAC1B,IAAI,CAAC,UAAU,GAAG,aAAQ,CAAC,GAAG,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC;QAEzD,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAGO,WAAW,CAAC,KAAK,GAAG,CAAC;QACzB,OAAO,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,IAAI,KAAK,MAAM,CAAC;IAC5D,CAAC;IAES,eAAe,CAAC,GAAW;QACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAES,YAAY,CAAC,SAAiB,EAAE,OAAe;QACrD,IAAI,eAAU,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE;YACzC,OAAO,CAAC,GAAG,CAAC,YAAY,SAAS,OAAO,OAAO,EAAE,CAAC,CAAC;YACnD,eAAU,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;SACtE;IACL,CAAC;IAES,OAAO;QACb,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;QACvD,IAAI,eAAU,CAAC,QAAQ,CAAC;YACpB,eAAU,CAAC,QAAQ,CAAC,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IACtB,CAAC;IAES,OAAO;QACb,IAAI,CAAC,MAAM,GAAG,sBAAiB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,EAAC,KAAK,EAAE,GAAG,EAAC,CAAC,CAAC;IACtE,CAAC;CACJ;AA7CD,wCA6CC"}
|
|
@@ -1,24 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
/*
|
|
3
|
-
* Thunderstorm is a full web app framework!
|
|
4
|
-
*
|
|
5
|
-
* Typescript & Express backend infrastructure that natively runs on firebase function
|
|
6
|
-
* Typescript & React frontend infrastructure
|
|
7
|
-
*
|
|
8
|
-
* Copyright (C) 2020 Intuition Robotics
|
|
9
|
-
*
|
|
10
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
11
|
-
* you may not use this file except in compliance with the License.
|
|
12
|
-
* You may obtain a copy of the License at
|
|
13
|
-
*
|
|
14
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
|
15
|
-
*
|
|
16
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
17
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
18
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
19
|
-
* See the License for the specific language governing permissions and
|
|
20
|
-
* limitations under the License.
|
|
21
|
-
*/
|
|
22
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
23
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
24
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../src/main/app-backend/utils/file.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../src/main/app-backend/utils/file.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yBAAyB;AAGzB,SAAsB,YAAY,CAAC,IAAY;;QAC9C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;CAAA;AAHD,oCAGC;AAED,SAAsB,YAAY,CAAC,eAAuB,EAAE,IAAY;;QACvE,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QACtD,MAAM,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;CAAA;AAHD,oCAGC"}
|