taon 21.0.53 → 21.0.54

package/lib-prod/base-classes/base-controller.js

@@ -1,162 +1,154 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp(target, key, result);
-  return result;
-};
-var __decorateParam = (index, decorator) => (target, key) => decorator(target, key, index);
-import * as FormData from "form-data";
-import {
-  HttpResponseError
-} from "ng2-rest/lib-prod";
-import { crossPlatformPath, fse, path, CoreModels__NS__TaonHttpErrorCustomProp, UtilsTerminal__NS__waitMilliseconds } from "tnp-core/lib-prod";
-import { TaonController } from "../decorators/classes/controller-decorator";
-import { POST } from "../decorators/http/http-methods-decorators";
-import { Body, Query } from "../decorators/http/http-params-decorators";
-import { TaonBaseFileUploadMiddleware } from "./base-file-upload.middleware";
-import { TaonBaseInjector } from "./base-injector";
-let TaonBaseController = class extends TaonBaseInjector {
-  /**
-   * Hook that is called when taon app is inited
-   * (all contexts are created and inited)
-   */
-  async afterAllCtxInited(options) {
-  }
-  uploadFormDataToServer(formData, queryParams) {
-    return async (req, res) => {
-      const files = req.files;
-      if (!files) {
-        throw "No file(s) received";
-      }
-      const responseArr = files.map((f) => {
-        const savedAbs = crossPlatformPath(path.resolve(f.path));
-        return {
-          ok: true,
-          originalName: f.originalname,
-          savedAs: path.basename(savedAbs),
-          // savedPath: void 0, // not needed
-          size: f.size,
-          mimetype: f.mimetype
+import * as FormData from 'form-data'; // @backend
+import { HttpResponseError, } from 'ng2-rest/lib-prod';
+import { crossPlatformPath, fse, path, CoreModels__NS__TaonHttpErrorCustomProp, UtilsTerminal__NS__waitMilliseconds } from 'tnp-core/lib-prod';
+import { TaonController } from '../decorators/classes/controller-decorator';
+import { POST } from '../decorators/http/http-methods-decorators';
+import { Body, Query } from '../decorators/http/http-params-decorators';
+import { TaonBaseFileUploadMiddleware } from './base-file-upload.middleware';
+import { TaonBaseInjector } from './base-injector';
+let TaonBaseController = class TaonBaseController extends TaonBaseInjector {
+    /**
+     * Hook that is called when taon app is inited
+     * (all contexts are created and inited)
+     */
+    async afterAllCtxInited(options) { }
+    //#region upload form data to server
+    uploadFormDataToServer(formData, queryParams) {
+        //#region @backendFunc
+        return async (req, res) => {
+            const files = req.files;
+            if (!files) {
+                throw 'No file(s) received';
+            }
+            const responseArr = files.map(f => {
+                const savedAbs = crossPlatformPath(path.resolve(f.path));
+                // const savedRel = crossPlatformPath(
+                //   path.relative(this.ctx.cwd, savedAbs),
+                // );
+                return {
+                    ok: true,
+                    originalName: f.originalname,
+                    savedAs: path.basename(savedAbs),
+                    // savedPath: void 0, // not needed
+                    size: f.size,
+                    mimetype: f.mimetype,
+                };
+            });
+            // console.log(responseArr);
+            for (const res of responseArr) {
+                await this.afterFileUploadAction(res, queryParams || {});
+            }
+            return responseArr;
         };
-      });
-      for (const res2 of responseArr) {
-        await this.afterFileUploadAction(res2, queryParams || {});
-      }
-      return responseArr;
-    };
-  }
-  //#endregion
-  //#region after file upload hook
-  /**
-   * Hook after file is uploaded
-   * through `uploadFormDataToServer` or `uploadLocalFileToServer`
-   */
-  afterFileUploadAction(file, queryParams) {
-  }
-  //#region upload local file to server
-  async uploadLocalFileToServer(absFilePath, options, queryParams) {
-    const stat = fse.statSync(absFilePath);
-    const stream = fse.createReadStream(absFilePath);
-    const form = new FormData();
-    form.append("file", stream, {
-      filename: path.basename(absFilePath),
-      knownLength: stat.size
-    });
-    const data = await this.uploadFormDataToServer(form, queryParams).request(
-      options || {}
-    );
-    return data.body.json;
-  }
-  //#endregion
-  // async check() {
-  //   await this._waitForProperStatusChange({
-  //     request: () => this.uploadFormDataToServer(void 0, void 0).request(),
-  //     statusCheck: resp => resp.body.json[0].ok,
-  //   });
-  // }
-  /**
-   * Easy way to wait for status change with http (1s default) pooling.
-   *
-   * example (in sub class):
-   * ```ts
-      async check() {
-          await this.waitForProperStatusChange({
-            request: () => this.uploadFormDataToServer(void 0, void 0).request(),
-            statusCheck: resp => resp.body.json[0].ok,
-          });
-        }
-   * ```
-   */
-  async _waitForProperStatusChange(options) {
-    const poolingInterval = options.poolingInterval || 1e3;
-    const taonRequest = options.request;
-    let maxTries = options.maxTries || Number.POSITIVE_INFINITY;
-    let i = 0;
-    let httpErrorsCount = 0;
-    while (true) {
-      await UtilsTerminal__NS__waitMilliseconds(poolingInterval);
-      try {
-        const resp = await taonRequest({
-          reqIndexNum: i,
-          httpErrorsCount
+        //#endregion
+    }
+    //#endregion
+    //#region after file upload hook
+    /**
+     * Hook after file is uploaded
+     * through `uploadFormDataToServer` or `uploadLocalFileToServer`
+     */
+    afterFileUploadAction(file, queryParams) {
+        // empty
+    }
+    //#region upload local file to server
+    async uploadLocalFileToServer(absFilePath, options, queryParams) {
+        //#region @backendFunc
+        const stat = fse.statSync(absFilePath);
+        const stream = fse.createReadStream(absFilePath);
+        const form = new FormData();
+        form.append('file', stream, {
+            filename: path.basename(absFilePath),
+            knownLength: stat.size,
         });
-        if (options.statusCheck && options.statusCheck(resp)) {
-          return;
-        }
-      } catch (error) {
-        httpErrorsCount++;
-        if (options.loopRequestsOnBackendError) {
-          const isProperTaonError = error instanceof HttpResponseError && error.body.json[CoreModels__NS__TaonHttpErrorCustomProp];
-          const isHttpError = error instanceof HttpResponseError && !isProperTaonError;
-          const isUnknownError = !(error instanceof HttpResponseError);
-          const resBool = await options.loopRequestsOnBackendError({
-            taonError: isProperTaonError ? error : void 0,
-            unknownHttpError: isHttpError ? error : void 0,
-            unknownError: isUnknownError ? error : void 0,
-            reqIndexNum: i,
-            httpErrorsCount
-          });
-          if (resBool) {
-            i++;
-            continue;
-          } else {
-            return;
+        const data = await this.uploadFormDataToServer(form, queryParams).request(options || {});
+        return data.body.json;
+        //#endregion
+    }
+    //#endregion
+    // async check() {
+    //   await this._waitForProperStatusChange({
+    //     request: () => this.uploadFormDataToServer(void 0, void 0).request(),
+    //     statusCheck: resp => resp.body.json[0].ok,
+    //   });
+    // }
+    /**
+     * Easy way to wait for status change with http (1s default) pooling.
+     *
+     * example (in sub class):
+     * ```ts
+        async check() {
+            await this.waitForProperStatusChange({
+              request: () => this.uploadFormDataToServer(void 0, void 0).request(),
+              statusCheck: resp => resp.body.json[0].ok,
+            });
           }
+     * ```
+     */
+    async _waitForProperStatusChange(options) {
+        const poolingInterval = options.poolingInterval || 1000;
+        const taonRequest = options.request;
+        let maxTries = options.maxTries || Number.POSITIVE_INFINITY;
+        let i = 0;
+        let httpErrorsCount = 0;
+        while (true) {
+            await UtilsTerminal__NS__waitMilliseconds(poolingInterval);
+            try {
+                const resp = await taonRequest({
+                    reqIndexNum: i,
+                    httpErrorsCount,
+                });
+                if (options.statusCheck && options.statusCheck(resp)) {
+                    return;
+                }
+            }
+            catch (error) {
+                httpErrorsCount++;
+                if (options.loopRequestsOnBackendError) {
+                    const isProperTaonError = error instanceof HttpResponseError &&
+                        error.body.json[CoreModels__NS__TaonHttpErrorCustomProp];
+                    const isHttpError = error instanceof HttpResponseError && !isProperTaonError;
+                    const isUnknownError = !(error instanceof HttpResponseError);
+                    const resBool = await options.loopRequestsOnBackendError({
+                        taonError: isProperTaonError ? error : void 0,
+                        unknownHttpError: isHttpError ? error : void 0,
+                        unknownError: isUnknownError ? error : void 0,
+                        reqIndexNum: i,
+                        httpErrorsCount,
+                    });
+                    if (resBool) {
+                        i++;
+                        continue;
+                    }
+                    else {
+                        return;
+                    }
+                }
+                if (httpErrorsCount >
+                    (options.allowedHttpErrors || Number.POSITIVE_INFINITY)) {
+                    throw new Error(`Too many http errors (${httpErrorsCount}) for "${options.actionName}".`);
+                }
+            }
+            if (i++ > maxTries) {
+                throw new Error(`Timeout waiting for "${options.actionName}" to be finished. Waited for ${maxTries} seconds`);
+            }
         }
-        if (httpErrorsCount > (options.allowedHttpErrors || Number.POSITIVE_INFINITY)) {
-          throw new Error(
-            `Too many http errors (${httpErrorsCount}) for "${options.actionName}".`
-          );
-        }
-      }
-      if (i++ > maxTries) {
-        throw new Error(
-          `Timeout waiting for "${options.actionName}" to be finished. Waited for ${maxTries} seconds`
-        );
-      }
     }
-  }
 };
-__decorateClass([
-  POST({
-    overrideContentType: "multipart/form-data",
-    middlewares: ({ parentMiddlewares }) => ({
-      ...parentMiddlewares,
-      TaonBaseFileUploadMiddleware
+__decorate([
+    POST({
+        overrideContentType: 'multipart/form-data',
+        middlewares: ({ parentMiddlewares }) => ({
+            ...parentMiddlewares,
+            TaonBaseFileUploadMiddleware,
+        }),
+    }),
+    __param(0, Body()),
+    __param(1, Query())
+], TaonBaseController.prototype, "uploadFormDataToServer", null);
+TaonBaseController = __decorate([
+    TaonController({
+        className: 'TaonBaseController',
     })
-  }),
-  __decorateParam(0, Body()),
-  __decorateParam(1, Query())
-], TaonBaseController.prototype, "uploadFormDataToServer", 1);
-TaonBaseController = __decorateClass([
-  TaonController({
-    className: "TaonBaseController"
-  })
 ], TaonBaseController);
-export {
-  TaonBaseController
-};
+export { TaonBaseController };