@nu-art/thunderstorm-backend 0.401.3 → 0.401.5

package/index.d.ts

@@ -1,5 +1,3 @@
-export * from './modules/proxy/RemoteProxyCaller.js';
-export * from './modules/proxy/ModuleBE_RemoteProxy.js';
 export * from './modules/CleanupScheduler.js';
 export * from './modules/ModuleBE_APIs.js';
 export * from './modules/action-processor/ModuleBE_ActionProcessor.js';
@@ -13,7 +11,6 @@ export * from './modules/http/AxiosHttpModule.js';
 export * from './modules/http/types.js';
 export * from './modules/ModuleBE_ForceUpgrade.js';
 export * from './modules/ModuleBE_ServerInfo.js';
-export * from './utils/promisify-request.js';
 export * from './utils/types.js';
 export * from './utils/file.js';
 export * from './core/Storm.js';

package/index.js

@@ -18,8 +18,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './modules/proxy/RemoteProxyCaller.js';
-export * from './modules/proxy/ModuleBE_RemoteProxy.js';
 export * from './modules/CleanupScheduler.js';
 export * from './modules/ModuleBE_APIs.js';
 export * from './modules/action-processor/ModuleBE_ActionProcessor.js';
@@ -33,7 +31,6 @@ export * from './modules/http/AxiosHttpModule.js';
 export * from './modules/http/types.js';
 export * from './modules/ModuleBE_ForceUpgrade.js';
 export * from './modules/ModuleBE_ServerInfo.js';
-export * from './utils/promisify-request.js';
 export * from './utils/types.js';
 export * from './utils/file.js';
 export * from './core/Storm.js';

package/modules/_imports.d.ts

@@ -1,6 +1,3 @@
 export * from './server/server-api.js';
 export * from './server/HttpServer.js';
-export * from './proxy/RemoteProxyCaller.js';
-export * from './proxy/ModuleBE_RemoteProxy.js';
-export * from '../utils/promisify-request.js';
 export * from './CleanupScheduler.js';

package/modules/_imports.js

@@ -20,7 +20,4 @@
  */
 export * from './server/server-api.js';
 export * from './server/HttpServer.js';
-export * from './proxy/RemoteProxyCaller.js';
-export * from './proxy/ModuleBE_RemoteProxy.js';
-export * from '../utils/promisify-request.js';
 export * from './CleanupScheduler.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/thunderstorm-backend",
-  "version": "0.401.3",
+  "version": "0.401.5",
   "description": "Thunderstorm Backend",
   "keywords": [
     "TacB0sS",
@@ -37,12 +37,12 @@
     "linkDirectory": true
   },
   "dependencies": {
-    "@nu-art/testalot": "0.401.3",
-    "@nu-art/thunderstorm-shared": "0.401.3",
-    "@nu-art/firebase-backend": "0.401.3",
-    "@nu-art/firebase-shared": "0.401.3",
-    "@nu-art/google-services-backend": "0.401.3",
-    "@nu-art/ts-common": "0.401.3",
+    "@nu-art/testalot": "0.401.5",
+    "@nu-art/thunderstorm-shared": "0.401.5",
+    "@nu-art/firebase-backend": "0.401.5",
+    "@nu-art/firebase-shared": "0.401.5",
+    "@nu-art/google-services-backend": "0.401.5",
+    "@nu-art/ts-common": "0.401.5",
     "abort-controller": "^3.0.0",
     "axios": "^1.13.1",
     "body-parser": "^1.19.0",
@@ -66,7 +66,6 @@
     "react-router-dom": "^6.9.0",
     "react-virtualized-auto-sizer": "^1.0.12",
     "react-window": "^1.8.8",
-    "request": "^2.88.0",
     "stream-browserify": "^3.0.0",
     "util": "^0.12.4"
   },

package/utils/types.d.ts

@@ -1,11 +1,9 @@
 import * as express from 'express';
-import { CoreOptions, UriOptions } from 'request';
 import { ApiException } from '@nu-art/ts-common';
 export type Express = express.Express;
 export type ExpressRouter = express.Router;
 export type ExpressRequest = express.Request<any>;
 export type ExpressResponse = express.Response;
 export type ExpressRequestHandler = express.RequestHandler;
-export type RequestOptions = CoreOptions & UriOptions;
 export type ServerApi_Middleware = () => Promise<any>;
 export type HttpErrorHandler = (error: ApiException) => Promise<string>;

package/modules/proxy/ModuleBE_RemoteProxy.d.ts

@@ -1,35 +0,0 @@
-import { Module, TS_Object } from '@nu-art/ts-common';
-import { ServerApi } from '../server/server-api.js';
-import { ServerApi_Middleware } from '../../utils/types.js';
-import { TypedApi } from '@nu-art/thunderstorm-shared';
-type ProxyConfig = {
-    extras?: TS_Object;
-    urls: string[];
-    secret: string;
-};
-export type RemoteProxyConfig = {
-    remotes: {
-        [proxyId: string]: ProxyConfig;
-    };
-    secretHeaderName?: string;
-    proxyHeaderName?: string;
-};
-export declare class ModuleBE_RemoteProxy_Class<Config extends RemoteProxyConfig> extends Module<Config> {
-    readonly Middleware: ServerApi_Middleware;
-    private secretHeader;
-    private proxyHeader;
-    protected init(): void;
-    assertSecret(): TS_Object | undefined;
-}
-export declare class ServerApi_Proxy<API extends TypedApi<any, any, any, any>> extends ServerApi<API> {
-    private readonly api;
-    constructor(api: ServerApi<API>);
-    protected process(): Promise<API['R']>;
-}
-export declare class ServerApi_Alternate<API extends TypedApi<any, any, any, any>> extends ServerApi<API> {
-    private readonly api;
-    constructor(api: ServerApi<API>, pathSuffix: string);
-    protected process(): Promise<API['R']>;
-}
-export declare const ModuleBE_RemoteProxy: ModuleBE_RemoteProxy_Class<RemoteProxyConfig>;
-export {};

package/modules/proxy/ModuleBE_RemoteProxy.js

@@ -1,86 +0,0 @@
-/*
- * Thunderstorm is a full web app framework!
- *
- * Typescript & Express backend infrastructure that natively runs on firebase function
- * Typescript & React frontend infrastructure
- *
- * Copyright (C) 2020 Adam van der Kruk aka TacB0sS
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { ApiException, ImplementationMissingException, Module } from '@nu-art/ts-common';
-import { ServerApi } from '../server/server-api.js';
-import { HeaderKey } from '../server/HeaderKey.js';
-import { MemKey_HttpRequestPath } from '../server/consts.js';
-export class ModuleBE_RemoteProxy_Class extends Module {
-    Middleware = async () => {
-        ModuleBE_RemoteProxy.assertSecret();
-    };
-    secretHeader;
-    proxyHeader;
-    init() {
-        if (!this.config)
-            throw new ImplementationMissingException('MUST specify config for this module!!');
-        if (!this.config.secretHeaderName)
-            this.config.secretHeaderName = 'x-secret';
-        if (!this.config.proxyHeaderName)
-            this.config.proxyHeaderName = 'x-proxy';
-        this.secretHeader = new HeaderKey(this.config.secretHeaderName);
-        this.proxyHeader = new HeaderKey(this.config.proxyHeaderName);
-    }
-    assertSecret() {
-        if (!this.secretHeader || !this.proxyHeader)
-            throw new ImplementationMissingException('MUST add RemoteProxy to your module list!!!');
-        const secret = this.secretHeader.get();
-        const proxyId = this.proxyHeader.get();
-        const expectedSecret = this.config.remotes[proxyId];
-        if (!proxyId)
-            throw new ApiException(403, `Missing proxy declaration in config for ${proxyId} !!`);
-        if (!secret)
-            throw new ApiException(403, `Missing secret !!`);
-        if (!expectedSecret)
-            throw new ApiException(403, `ProxyId '${proxyId}' is not registered for remote access !!`);
-        if (expectedSecret.secret !== secret)
-            throw new ApiException(403, `Secret does not match for proxyId: ${proxyId}`);
-        const requestUrl = MemKey_HttpRequestPath.get();
-        if (!expectedSecret.urls?.find(urlPattern => requestUrl.match(urlPattern)))
-            throw new ApiException(403, `Requested url '${requestUrl}' is not allowed from proxyId: ${proxyId}`);
-        return expectedSecret.extras;
-    }
-}
-export class ServerApi_Proxy extends ServerApi {
-    api;
-    constructor(api) {
-        // super(api.method, `${api.relativePath}/proxy`);
-        super({ ...api.apiDef, path: `${api.apiDef.path}/proxy` });
-        this.api = api;
-        this.setMiddlewares(ModuleBE_RemoteProxy.Middleware);
-    }
-    async process() {
-        // @ts-ignore
-        return this.api.process();
-    }
-}
-export class ServerApi_Alternate extends ServerApi {
-    api;
-    constructor(api, pathSuffix) {
-        // super(api.method, `${api.relativePath}/proxy`);
-        super({ ...api.apiDef, path: `${api.apiDef.path}/${pathSuffix}` });
-        this.api = api;
-    }
-    async process() {
-        // @ts-ignore
-        return this.api.process();
-    }
-}
-export const ModuleBE_RemoteProxy = new ModuleBE_RemoteProxy_Class();

package/modules/proxy/RemoteProxyCaller.d.ts

@@ -1,19 +0,0 @@
-import { Module } from '@nu-art/ts-common';
-import { BodyApi, QueryApi } from '@nu-art/thunderstorm-shared';
-export type RemoteServerConfig = {
-    secretHeaderName: string;
-    proxyHeaderName: string;
-    proxyId: string;
-    secret: string;
-    url: string;
-};
-export declare class RemoteProxyCaller<Config extends RemoteServerConfig> extends Module<Config> {
-    protected init(): void;
-    protected executeGetRequest: <API extends QueryApi<any, any, any>>(url: string, _params: API["P"], _headers?: {
-        [key: string]: string;
-    }) => Promise<API["R"]>;
-    protected executePostRequest: <API extends BodyApi<any, any, any>>(url: string, body: API["B"], _headers?: {
-        [key: string]: string;
-    }) => Promise<API["R"]>;
-    private executeRequest;
-}

package/modules/proxy/RemoteProxyCaller.js

@@ -1,82 +0,0 @@
-/*
- * Thunderstorm is a full web app framework!
- *
- * Typescript & Express backend infrastructure that natively runs on firebase function
- * Typescript & React frontend infrastructure
- *
- * Copyright (C) 2020 Adam van der Kruk aka TacB0sS
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { __stringify, ApiException, composeUrl, ImplementationMissingException, MimeType_json, Module, } from '@nu-art/ts-common';
-import { promisifyRequest } from '../../utils/promisify-request.js';
-import { HeaderKey_ContentType } from '../../shared.js';
-export class RemoteProxyCaller extends Module {
-    init() {
-        if (!this.config)
-            throw new ImplementationMissingException('MUST specify config for this module!!');
-        if (!this.config.proxyId)
-            throw new ImplementationMissingException('MUST specify the proxyId for the proxy caller!!');
-        if (!this.config.url)
-            throw new ImplementationMissingException('MUST specify the url for the remote server!!');
-        if (!this.config.secret)
-            throw new ImplementationMissingException('MUST specify the secret for the remote server!!');
-        if (!this.config.secretHeaderName)
-            this.config.secretHeaderName = 'x-secret';
-        if (!this.config.proxyHeaderName)
-            this.config.proxyHeaderName = 'x-proxy';
-    }
-    executeGetRequest = async (url, _params, _headers) => {
-        const proxyRequest = {
-            headers: {
-                ..._headers,
-                [this.config.secretHeaderName]: this.config.secret,
-                [this.config.proxyHeaderName]: this.config.proxyId,
-            },
-            uri: `${composeUrl(`${this.config.url}${url}`, _params)}`,
-            method: 'GET',
-            json: true
-        };
-        return await this.executeRequest(proxyRequest);
-    };
-    executePostRequest = async (url, body, _headers) => {
-        const proxyRequest = {
-            headers: {
-                ..._headers,
-                [HeaderKey_ContentType]: MimeType_json,
-                [this.config.secretHeaderName]: this.config.secret,
-                [this.config.proxyHeaderName]: this.config.proxyId,
-            },
-            json: true,
-            uri: `${composeUrl(`${this.config.url}${url}`)}`,
-            body: body,
-            method: 'POST'
-        };
-        return this.executeRequest(proxyRequest);
-    };
-    executeRequest = async (proxyRequest) => {
-        const response = await promisifyRequest(proxyRequest, false);
-        if (proxyRequest.headers)
-            delete proxyRequest.headers[this.config.secretHeaderName];
-        if (response.statusCode !== 200) {
-            const errorResponse = response.body;
-            if (!errorResponse)
-                throw new ApiException(500, `Extraneous error ${__stringify(response)}, Proxy Request: ${__stringify(proxyRequest, true)}`);
-            const e = new ApiException(response.statusCode, `Redirect proxy error: ${errorResponse.debugMessage} \n Proxy Request: ${__stringify(proxyRequest, true)}`);
-            if (errorResponse.error)
-                e.setErrorBody(errorResponse.error);
-            throw e;
-        }
-        return response.toJSON().body;
-    };
-}

package/modules/proxy/assert-secret-middleware.d.ts

@@ -1,2 +0,0 @@
-import { ServerApi_Middleware } from '../../utils/types.js';
-export declare const AssertSecretMiddleware: ServerApi_Middleware;

package/modules/proxy/assert-secret-middleware.js

@@ -1,24 +0,0 @@
-/*
- * Thunderstorm is a full web app framework!
- *
- * Typescript & Express backend infrastructure that natively runs on firebase function
- * Typescript & React frontend infrastructure
- *
- * Copyright (C) 2020 Adam van der Kruk aka TacB0sS
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { ModuleBE_RemoteProxy } from './ModuleBE_RemoteProxy.js';
-export const AssertSecretMiddleware = async () => {
-    ModuleBE_RemoteProxy.assertSecret();
-};

package/utils/promisify-request.d.ts

@@ -1,3 +0,0 @@
-import { Response } from 'request';
-import { RequestOptions } from '../index.js';
-export declare function promisifyRequest(_request: RequestOptions, throwException?: boolean): Promise<Response>;

package/utils/promisify-request.js

@@ -1,33 +0,0 @@
-/*
- * Thunderstorm is a full web app framework!
- *
- * Typescript & Express backend infrastructure that natively runs on firebase function
- * Typescript & React frontend infrastructure
- *
- * Copyright (C) 2020 Adam van der Kruk aka TacB0sS
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import request from 'request';
-import { __stringify, ApiException } from '@nu-art/ts-common';
-export async function promisifyRequest(_request, throwException = true) {
-    return new Promise((resolve, rejected) => {
-        request(_request, (error, response) => {
-            if (error)
-                return rejected(new ApiException(503, `Error: ${error}\n Request: ${__stringify(_request, true)}`));
-            if (throwException && response.statusCode !== 200)
-                return rejected(new ApiException(response.statusCode, `Redirect proxy message, ${__stringify(response.body)} \n${__stringify(request, true)}`));
-            resolve(response);
-        });
-    });
-}