ag-common 0.0.7 → 0.0.11

package/dist/api/helpers/dynamo.js

@@ -28,7 +28,7 @@ const putDynamo = (item, tableName) => __awaiter(void 0, void 0, void 0, functio
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         Item: item,
     };
-    (0, log_1.info)(`running dynamo put=${JSON.stringify(params)}`);
+    (0, log_1.info)(`running dynamo put=${JSON.stringify(params, null, 2)}`);
     // write the todo to the database
     const put = yield exports.dynamoDb.put(params).promise();
     if (put.$response.error &&
@@ -138,7 +138,7 @@ const getItemDynamo = ({ tableName, pkName, pkValue, }) => __awaiter(void 0, voi
     try {
         const res = yield exports.dynamoDb.get(params).promise();
         const ret = res.Item;
-        (0, log_1.debug)(`got dynamo getitem=${JSON.stringify(params)}`);
+        (0, log_1.debug)(`got dynamo getitem=${JSON.stringify(params, null, 2)}`);
         return ret;
     }
     catch (e) {
@@ -158,14 +158,19 @@ const getItemsDynamo = ({ tableName, items, }) => __awaiter(void 0, void 0, void
             },
         },
     };
+    const dbRaw = new aws_sdk_1.default.DynamoDB({ apiVersion: '2012-10-08' });
     try {
-        const res = yield exports.dynamoDb.batchGet(params).promise();
-        (0, log_1.debug)(`got dynamo getitems=${JSON.stringify(res)}`);
-        let ret = ((_f = (_e = res.Responses) === null || _e === void 0 ? void 0 : _e[tableName]) === null || _f === void 0 ? void 0 : _f.map((s) => s)) || [];
+        const res = yield dbRaw.batchGetItem(params).promise();
+        (0, log_1.debug)(`got dynamo getitems=${JSON.stringify(res, null, 2)}`);
+        let ret = ((_f = (_e = res.Responses) === null || _e === void 0 ? void 0 : _e[tableName]) === null || _f === void 0 ? void 0 : _f.map((s) => aws_sdk_1.default.DynamoDB.Converter.unmarshall(s))) || [];
         return ret;
     }
     catch (e) {
-        (0, log_1.error)(e);
+        let msg = `error with getitems query:` +
+            JSON.stringify(params, null, 2) +
+            '\n' +
+            e.toString();
+        (0, log_1.error)(msg);
         throw e;
     }
 });

package/dist/api/helpers/validations.js

@@ -68,12 +68,12 @@ const getAndValidateToken = ({ tokenRaw, COGNITO_USER_POOL_ID, }) => __awaiter(v
                 error: (0, api_1.returnCode)(403, 'auth failed'),
             };
         }
-        token = tokenRaw.substr(tokenRaw.indexOf(' ') + 1);
+        token = tokenRaw.substring(tokenRaw.indexOf(' ') + 1);
         let subject;
         try {
             yield jwtVerify({ token, COGNITO_USER_POOL_ID });
             const decoded = (0, jsonwebtoken_1.decode)(token);
-            (0, log_1.debug)(`decoded=${JSON.stringify(decoded)}`);
+            (0, log_1.debug)(`decoded=${JSON.stringify(decoded, null, 2)}`);
             subject = decoded === null || decoded === void 0 ? void 0 : decoded.sub;
             if (!subject) {
                 const mess = 'user should have responded with subject (sub) field';

package/dist/common/helpers/array.js

@@ -27,10 +27,8 @@ const chunk = (array, max) => {
     let row = [];
     for (const k in array) {
         const item = array[k];
-        if (row.length < max) {
-            row = [...row, item];
-        }
-        else {
+        row.push(item);
+        if (row.length >= max) {
             rows.push(row);
             row = [];
         }

package/dist/common/helpers/log.d.ts

@@ -1,5 +1,8 @@
+export declare type TLogType = 'TRACE' | 'DEBUG' | 'INFO' | 'WARN' | 'ERROR' | 'FATAL';
+export declare const GetLogLevel: (l: TLogType) => number;
+export declare const trace: (...args: any[]) => void;
+export declare const debug: (...args: any[]) => void;
 export declare const info: (...args: any[]) => void;
 export declare const warn: (...args: any[]) => void;
 export declare const error: (...args: any[]) => void;
-export declare const debug: (...args: any[]) => void;
-export declare const trace: (...args: any[]) => void;
+export declare const fatal: (...args: any[]) => void;

package/dist/common/helpers/log.js

@@ -1,25 +1,153 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.trace = exports.debug = exports.error = exports.warn = exports.info = void 0;
+exports.fatal = exports.error = exports.warn = exports.info = exports.debug = exports.trace = exports.GetLogLevel = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
+const _1 = require(".");
+const GetLogLevel = (l) => ['TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'].findIndex((s) => s === l);
+exports.GetLogLevel = GetLogLevel;
 /* eslint-disable no-console */
-const info = (...args) => {
-    console.log(...args);
+function dateF() {
+    const d = new Date();
+    const str = `${d.getHours()}:${d.getMinutes()}:${d.getSeconds()}`;
+    return str;
+}
+function nicify(...args) {
+    const ret = [];
+    args.forEach((a) => {
+        a.forEach((v) => {
+            if (v !== null &&
+                typeof v !== 'undefined' &&
+                v.toString().indexOf('Error:') !== -1 &&
+                v.stack) {
+                ret.push(`${v.stack}`);
+            }
+            else if (typeof v === 'string') {
+                if (v.trim() !== 'undefined') {
+                    ret.push(`${v.trim()}`);
+                }
+            }
+            else if (typeof v === 'object') {
+                ret.push(JSON.parse(JSON.stringify(v)));
+            }
+            else {
+                ret.push(v);
+            }
+        });
+    });
+    return ret;
+}
+function logprocess(type, date, args) {
+    var _a;
+    const ds = date ? `[${date}]` : '';
+    const retm = [ds, type, ...args].filter(_1.notEmpty).join('\t');
+    const min = (0, exports.GetLogLevel)((_a = process.env.LOG_LEVEL) === null || _a === void 0 ? void 0 : _a.toUpperCase()) || 'WARN';
+    const typesLogLevel = (0, exports.GetLogLevel)(type);
+    // env ignores it
+    if (typesLogLevel < min) {
+        return;
+    }
+    switch (type) {
+        case 'TRACE': {
+            console.trace(retm);
+            break;
+        }
+        case 'DEBUG': {
+            console.debug(retm);
+            break;
+        }
+        case 'INFO': {
+            console.log(retm);
+            break;
+        }
+        case 'WARN': {
+            console.warn(retm);
+            break;
+        }
+        case 'ERROR': {
+            console.error(retm);
+            break;
+        }
+        case 'FATAL': {
+            console.error(retm);
+            break;
+        }
+        default: {
+            console.log(retm);
+            break;
+        }
+    }
+}
+function printStackTrace(...args) {
+    const callstack = [];
+    let isCallstackPopulated = false;
+    try {
+        throw new Error('Test');
+    }
+    catch (e) {
+        const er = e;
+        if (er.stack) {
+            // Firefox / chrome
+            const lines = er.stack.split('\n');
+            for (let i = 0, len = lines.length; i < len; i += 1) {
+                callstack.push(` ${lines[i]} `);
+            }
+            // Remove call to logStackTrace()
+            callstack.shift();
+            isCallstackPopulated = true;
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+        }
+        else if (window.opera && er.message) {
+            // Opera
+            const lines = er.message.split('\n');
+            for (let i = 0, len = lines.length; i < len; i += 1) {
+                if (lines[i].match(/^\s*[A-Za-z0-9\-_$]+\(/)) {
+                    let entry = lines[i];
+                    // Append next line also since it has the file info
+                    if (lines[i + 1]) {
+                        entry += ` at ${lines[i + 1]}`;
+                        i += 1;
+                    }
+                    callstack.push(entry);
+                }
+            }
+            // Remove call to logStackTrace()
+            callstack.shift();
+            isCallstackPopulated = true;
+        }
+    }
+    if (!isCallstackPopulated) {
+        // IE and Safari
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        let currentFunction = args.callee.caller;
+        while (currentFunction) {
+            const fn = currentFunction.toString();
+            const fname = fn.substring(fn.indexOf('function') + 8, fn.indexOf('(')) ||
+                'anonymous';
+            callstack.push(fname);
+            currentFunction = currentFunction.caller;
+        }
+    }
+    return callstack.join('\n');
+}
+const trace = (...args) => {
+    const argsNice = nicify(args);
+    args.push(printStackTrace());
+    logprocess('TRACE', dateF(), argsNice);
 };
+exports.trace = trace;
+const debug = (...args) => logprocess('DEBUG', dateF(), nicify(args));
+exports.debug = debug;
+const info = (...args) => logprocess('INFO', dateF(), nicify(args));
 exports.info = info;
-const warn = (...args) => {
-    console.warn(...args);
-};
+const warn = (...args) => logprocess('WARN', dateF(), nicify(args));
 exports.warn = warn;
-const error = (...args) => {
-    console.error(...args);
-};
+const error = (...args) => logprocess('ERROR', dateF(), nicify(args));
 exports.error = error;
-const debug = (...args) => {
-    console.debug(...args);
+const fatal = (...args) => {
+    const argsNice = nicify(args);
+    args.push(printStackTrace());
+    logprocess('FATAL', dateF(), argsNice);
 };
-exports.debug = debug;
-const trace = (...args) => {
-    console.trace(...args);
-};
-exports.trace = trace;
+exports.fatal = fatal;

package/dist/common/helpers/string.d.ts

@@ -6,4 +6,13 @@ export interface ISite {
     siteUrl: string;
     niceSiteUrl: string;
 }
+/**
+ * removes protocol, and trailing slashes
+ */
 export declare const niceUrl: (siteUrl: string) => string | ISite;
+/**
+ * string -> String
+ * @param str
+ * @returns
+ */
+export declare function toTitleCase(str: string): string;

package/dist/common/helpers/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.niceUrl = exports.truncate = exports.trim = exports.trimSide = exports.csvJSON = void 0;
+exports.toTitleCase = exports.niceUrl = exports.truncate = exports.trim = exports.trimSide = exports.csvJSON = void 0;
 const csvJSON = (csv) => {
     const lines = csv.split('\n');
     const result = [];
@@ -47,12 +47,15 @@ function truncate(str, n, ellip) {
     return str.length > n ? str.substr(0, n - 1) + ellip : str;
 }
 exports.truncate = truncate;
+/**
+ * removes protocol, and trailing slashes
+ */
 const niceUrl = (siteUrl) => {
     if (!siteUrl) {
         return siteUrl;
     }
     let niceSiteUrl = siteUrl
-        .substr(siteUrl.indexOf(':') + 1)
+        .substring(siteUrl.indexOf(':') + 1)
         .replace('sc-domain:', '')
         .replace('https://', '')
         .replace('http://', '');
@@ -60,3 +63,15 @@ const niceUrl = (siteUrl) => {
     return { siteUrl, niceSiteUrl };
 };
 exports.niceUrl = niceUrl;
+/**
+ * string -> String
+ * @param str
+ * @returns
+ */
+function toTitleCase(str) {
+    if (!str) {
+        return str;
+    }
+    return str.replace(/\w\S*/g, (txt) => txt && txt.charAt(0).toUpperCase() + txt.substring(1).toLowerCase());
+}
+exports.toTitleCase = toTitleCase;

package/dist/ui/components/LoginButton/index.js

@@ -21,7 +21,7 @@ const LoginButton = ({ className, text = text_1.getstarted, invert, title, saveP
     const lp = loginPath(!savePath || typeof window === 'undefined'
         ? undefined
         : {
-            redirect: window.location.href.substr(window.location.origin.length),
+            redirect: window.location.href.substring(window.location.origin.length),
         });
     return (react_1.default.createElement(Button_1.Button, { lang: lang, title: title, invert: invert, className: className, onKeyPress: () => __awaiter(void 0, void 0, void 0, function* () {
             yield pushPath(lp);

package/dist/ui/helpers/axiosHelper.d.ts

@@ -0,0 +1,11 @@
+import { AxiosResponse } from 'axios';
+export declare const axiosHelper: <TOut>({ verb, url, data, headers, timeout, retryMax, }: {
+    headers?: {
+        [a: string]: string;
+    } | undefined;
+    verb: 'put' | 'post' | 'get' | 'patch' | 'delete';
+    url: string;
+    data?: unknown;
+    timeout?: number | undefined;
+    retryMax?: number | undefined;
+}) => Promise<AxiosResponse<TOut, any>>;

package/dist/ui/helpers/axiosHelper.js

@@ -0,0 +1,82 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.axiosHelper = void 0;
+const axios_1 = __importDefault(require("axios"));
+const object_1 = require("../../common/helpers/object");
+const axiosHelper = ({ verb, url, data, headers, timeout = 30000, retryMax = 0, }) => __awaiter(void 0, void 0, void 0, function* () {
+    let retry = 0;
+    do {
+        try {
+            const setHeaders = Object.assign({ accept: 'application/json' }, headers);
+            if (verb === 'get') {
+                const ret = yield axios_1.default.get(url, {
+                    headers: setHeaders,
+                    timeout,
+                    timeoutErrorMessage: `${url} timeout`,
+                });
+                return ret;
+            }
+            let noBody = false;
+            let func = axios_1.default.post;
+            if (verb === 'put') {
+                func = axios_1.default.put;
+            }
+            else if (verb === 'post') {
+                func = axios_1.default.post;
+            }
+            else if (verb === 'patch') {
+                func = axios_1.default.patch;
+            }
+            else if (verb === 'delete') {
+                func = axios_1.default.delete;
+                noBody = true;
+            }
+            let ret;
+            if (noBody) {
+                ret = yield func(url, {
+                    headers: setHeaders,
+                    timeout,
+                    timeoutErrorMessage: `${url} timeout`,
+                });
+            }
+            else {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                if (data && (0, object_1.isJson)(data)) {
+                    setHeaders['Content-Type'] = 'application/json';
+                }
+                ret = yield func(url, data, { headers: setHeaders });
+            }
+            return ret;
+        }
+        catch (e) {
+            const em = e;
+            // jwt expired or bad response
+            // 403 returned for old token - will be refreshed
+            if (em.code === '401' || em.code === '403') {
+                // eslint-disable-next-line no-console
+                console.log('auth expired, reset');
+                // retry current page
+                window.location.reload();
+                retry = retryMax;
+            }
+            if (retry >= retryMax) {
+                throw em;
+            }
+        }
+        retry += 1;
+    } while (retry <= retryMax);
+    throw new Error('unexpected');
+});
+exports.axiosHelper = axiosHelper;

package/dist/ui/helpers/cookie.js

@@ -26,7 +26,7 @@ function getCookie({ cname, cookieDocument, }) {
     const ca = ca1.split(';').map((t) => t.trim());
     for (const c of ca) {
         if (c.indexOf(name) === 0) {
-            return c.substring(name.length, c.length);
+            return c.substr(name.length, c.length);
         }
     }
     return undefined;

package/dist/ui/helpers/index.d.ts

@@ -1,3 +1,4 @@
+export * from './axiosHelper';
 export * from './browserHelpers';
 export * from './callOpenApi';
 export * from './cookie';

package/dist/ui/helpers/index.js

@@ -10,6 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./axiosHelper"), exports);
 __exportStar(require("./browserHelpers"), exports);
 __exportStar(require("./callOpenApi"), exports);
 __exportStar(require("./cookie"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.7",
+  "version": "0.0.11",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",