@nu-art/thunderstorm-backend 0.401.0 → 0.401.2

package/_entity/backup-doc/ModuleBE_BackupDocDB.d.ts

@@ -2,7 +2,7 @@ import { Module, PreDB, TypedMap, UniqueId } from '@nu-art/ts-common';
 import { DBApiConfigV3, ModuleBE_BaseDB } from '../../modules/db-api-gen/ModuleBE_BaseDB.js';
 import { FirestoreQuery } from '@nu-art/firebase-shared';
 import { Readable } from 'stream';
-import { FirestoreCollectionV3 } from '@nu-art/firebase-backend/firestore-v3/FirestoreCollectionV3';
+import { FirestoreCollectionV3 } from '@nu-art/firebase-backend';
 import { DB_BackupDoc, DBProto_BackupDoc, FetchBackupDoc } from '@nu-art/thunderstorm-shared';
 import { Request_BackupId, Response_BackupDocs } from '@nu-art/thunderstorm-shared/_entity/backup-doc/api-def';
 export interface OnModuleCleanupV2 {

package/core/Storm.js

@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 import { BeLogged, LogClient_Function, LogClient_Terminal, LogLevel } from '@nu-art/ts-common';
-import { Firebase_ExpressFunction } from '@nu-art/firebase-backend';
+import { Firebase_ExpressFunction } from '@nu-art/firebase-backend/v1';
 import { BaseStorm } from './BaseStorm.js';
 import { HttpServer } from '../modules/server/HttpServer.js';
 import { ModuleBE_BaseFunction, ModuleBE_Firebase } from '@nu-art/firebase-backend';

package/modules/ModuleBE_APIs.d.ts

@@ -1,9 +1,8 @@
 import { Module } from '@nu-art/ts-common/core/module';
 import { ServerApi } from './server/server-api.js';
-import { TestResetListener } from '@nu-art/ts-common/testing/types';
-export declare class ModuleBE_APIs_Class extends Module implements TestResetListener {
+export declare class ModuleBE_APIs_Class extends Module {
     private readonly routes;
-    __resetForTests(): Promise<void>;
+    destroy(): Promise<void>;
     addRoutes: (apis: ServerApi<any>[]) => void;
     useRoutes: () => ServerApi<any>[];
 }

package/modules/ModuleBE_APIs.js

@@ -2,8 +2,8 @@ import { Module } from '@nu-art/ts-common/core/module';
 import { MUSTNeverHappenException } from '@nu-art/ts-common';
 export class ModuleBE_APIs_Class extends Module {
     routes = [];
-    async __resetForTests() {
-        this.logWarning('__resetForTests');
+    async destroy() {
+        this.logWarning('destroy');
         this.routes.length = 0;
     }
     addRoutes = (apis) => {

package/modules/server/HttpServer.d.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nu-art/ts-common';
 import { Express, ExpressRequestHandler, HttpErrorHandler } from '../../utils/types.js';
-import { Firebase_ExpressFunction, TBR_ExpressFunctionInterface } from '@nu-art/firebase-backend';
+import { Firebase_ExpressFunction, TBR_ExpressFunctionInterface } from '@nu-art/firebase-backend/v1';
 type ConfigType = {
     port: number;
     baseUrl: string;

package/modules/server/HttpServer.js

@@ -27,7 +27,7 @@ import * as fs from 'fs';
 import { addItemToArray, LogLevel, Module } from '@nu-art/ts-common';
 import express from 'express';
 import { DefaultApiErrorMessageComposer } from './server-errors.js';
-import { Firebase_ExpressFunction } from '@nu-art/firebase-backend';
+import { Firebase_ExpressFunction } from '@nu-art/firebase-backend/v1';
 import { ServerApi } from './server-api.js';
 import compression from 'compression';
 import cors from 'cors';
@@ -92,8 +92,17 @@ export class HttpServer_Class extends Module {
             next();
         });
         const parserLimit = this.config.bodyParserLimit;
-        if (parserLimit)
-            this.getExpress().use(express.json({ limit: parserLimit }));
+        if (parserLimit) {
+            const jsonParser = express.json({ limit: parserLimit, type: 'application/json' });
+            this.getExpress().use((req, res, next) => {
+                // If upstream already set a body OR the stream is already consumed, skip parsing.
+                const alreadyHasBody = req.body !== undefined;
+                const notReadable = !req.readable;
+                if (alreadyHasBody || notReadable)
+                    return next();
+                return jsonParser(req, res, next);
+            });
+        }
         this.getExpress().use(compression());
         for (const middleware of HttpServer_Class.expressMiddleware) {
             this.getExpress().use(middleware);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/thunderstorm-backend",
-  "version": "0.401.0",
+  "version": "0.401.2",
   "description": "Thunderstorm Backend",
   "keywords": [
     "TacB0sS",
@@ -37,11 +37,12 @@
     "linkDirectory": true
   },
   "dependencies": {
-    "@nu-art/thunderstorm-shared": "0.401.0",
-    "@nu-art/firebase-backend": "0.401.0",
-    "@nu-art/firebase-shared": "0.401.0",
-    "@nu-art/google-services-backend": "0.401.0",
-    "@nu-art/ts-common": "0.401.0",
+    "@nu-art/testalot": "0.401.2",
+    "@nu-art/thunderstorm-shared": "0.401.2",
+    "@nu-art/firebase-backend": "0.401.2",
+    "@nu-art/firebase-shared": "0.401.2",
+    "@nu-art/google-services-backend": "0.401.2",
+    "@nu-art/ts-common": "0.401.2",
     "abort-controller": "^3.0.0",
     "axios": "^1.13.1",
     "body-parser": "^1.19.0",

package/test/StormTest.d.ts

@@ -1,5 +1,5 @@
 import { AsyncVoidFunction, Module, RecursiveObjectOfPrimitives } from '@nu-art/ts-common';
-import { TestModel } from '@nu-art/ts-common/testing/types';
+import { TestModel } from '@nu-art/testalot';
 type StormTestConfig = {
     databaseName?: string;
     modules: Module[];
@@ -17,7 +17,7 @@ export declare class StormTest {
     private testConfig;
     constructor(config: StormTestConfig);
     init(): Promise<this>;
-    cleanup(): Promise<void>;
+    destroy(): Promise<void>;
 }
 export declare const stormTester: <TestCase extends TestModel<any, any>>(stormTestInput: StormTestInput, testCaseRunner: () => Promise<void>) => Promise<void>;
 export {};

package/test/StormTest.js

@@ -3,7 +3,6 @@ import { FIREBASE_DEFAULT_PROJECT_ID } from '@nu-art/firebase-backend';
 import { RouteResolver_Dummy } from '../modules/server/route-resolvers/RouteResolver_Dummy.js';
 import { Storm } from '../core/Storm.js';
 import { ModuleBE_Auth } from '@nu-art/google-services-backend';
-import { dispatcher_resetTests } from '@nu-art/ts-common/testing/consts';
 export class StormTest {
     firebaseConfig;
     testConfig;
@@ -27,10 +26,8 @@ export class StormTest {
             .init();
         return this;
     }
-    async cleanup() {
-        await dispatcher_resetTests.dispatchModuleAsync();
-        // @ts-ignore
-        ModuleManager.__resetForTests();
+    async destroy() {
+        await ModuleManager.destroy();
     }
 }
 export const stormTester = async (stormTestInput, testCaseRunner) => {
@@ -44,6 +41,6 @@ export const stormTester = async (stormTestInput, testCaseRunner) => {
         // first we do all the applicative test cleanups, for example, delete firestore collections
         await stormTestInput.after?.();
         // only then we clean infra stuff, like firebase apps
-        await stormTest.cleanup();
+        await stormTest.destroy();
     }
 };