corebasic 1.0.217 → 1.0.219

package/dist/libs/auth.js

@@ -1,4 +1,6 @@
+// @ts-ignore
 import axios from 'axios';
+// @ts-ignore
 import otpGenerator from 'otp-generator';
 import * as Dip from './dip.js';
 import * as Utils from './utils.js';
@@ -35,7 +37,8 @@ async function attemptLogin(req, res) {
     let meta = { company: "GLOBAL", outlet: "GLOBAL" };
     let expiry = 300000;
     let userMob = req.body.mob ?? req.body.phone;
-    let mob = userMob.endsWith('123456789') ? '0123456789' : Utils.parseMob(userMob);
+    const code = req.body.code;
+    let mob = userMob.endsWith('123456789') ? '0123456789' : Utils.parseMob(userMob, code);
     let time = new Date().getTime();
     let collection = (req.body.app ? req.body.app + '.' : '') + "auth.login";
     let errMessage = { success: false, message: "Login Server Error" };
@@ -52,7 +55,7 @@ async function attemptLogin(req, res) {
             catch (err) {
                 throw { ...errMessage, mode: 'verify', info: 'Cleanup Failed' };
             }
-            return { ...res[0], mode: 'verify', success: true, userId: res[0].userId, phone: res[0]._id, mob: res[0]._id };
+            return { ...res[0], mode: 'verify', success: true, userId: res[0].userId, phone: res[0]._id, mob: res[0]._id, code };
         }
         throw { ...errMessage, mode: 'verify', info: "Invalid/Expired OTP" };
     }
@@ -64,7 +67,7 @@ async function attemptLogin(req, res) {
             let data = req.body.data ?? {};
             let info = { clientId, created: now, updated: now, ...data };
             await Dip.update(meta, collection, { _id: mob }, { $set: { otp, clientId, time, updated: now, attemptLogin: true }, $setOnInsert: { _id: mob, otp, time, userId, ...info } }, { upsert: true });
-            return { mode: 'login', success: true, userId, expiry, phone: mob, mob };
+            return { mode: 'login', success: true, userId, expiry, phone: mob, mob, code };
         }
         throw { ...errMessage, mode: 'login', info: 'Generating Info Failed' };
     }

package/dist/libs/compression.js

@@ -1,4 +1,5 @@
 import * as Utils from './utils.js';
+// @ts-ignore
 import compression from 'compression';
 // Compression Notes
 // -----------------

package/dist/libs/dip/suffix/suffix.js

@@ -1,5 +1,6 @@
 import { entries, reduceRanges, extractBounds, getNormalizedBounds } from './index.js';
 import { formatDate, fillDates } from './date.js';
+import * as Dip from '../../elabase.js';
 const EXPLICIT_SUFFIX_POLICY_TYPES = new Set(["string", "date", "number"]);
 export async function suffix(doc, policies, insertMode, arg) {
     let suffixes = [""];
@@ -26,17 +27,17 @@ export async function suffix(doc, policies, insertMode, arg) {
         if (policy_type === "date") {
             keys = keys.map(key => formatDate(key, format));
             if (ranges.length) {
-                ranges = extractBounds(reduceRanges(ranges));
-                const from = ranges.from ?? policy.min; // policy.min is always inclusive i.e $gte
-                const to = ranges.to ?? policy.max; // policy.max is always inclusive i.e $lte
-                const fromOp = ranges.from ? ranges.fromOp : "$gte"; // policy.min is $gte
-                const toOp = ranges.to ? ranges.toOp : "$lte"; // policy.max is $lte
+                const bounds = extractBounds(reduceRanges(ranges));
+                const from = bounds.from ?? policy.min; // policy.min is always inclusive i.e $gte
+                const to = bounds.to ?? policy.max; // policy.max is always inclusive i.e $lte
+                const fromOp = bounds.from ? bounds.fromOp : "$gte"; // policy.min is $gte
+                const toOp = bounds.to ? bounds.toOp : "$lte"; // policy.max is $lte
                 if (from === undefined || to === undefined) {
                     keys = []; // Fall back to Dip.operation("ls").
                     console.warn(`Warn: Missing suffix policy min/max bound for ${policy_type} range specified for key ${policy.key} in Dip`);
                 }
                 else {
-                    ranges = fillDates({ from, to, fromOp, toOp }, format);
+                    let ranges = fillDates({ from, to, fromOp, toOp }, format);
                     if (!ranges.length && policy.inferRange)
                         ranges = [...new Set([from === undefined ? undefined : formatDate(from, format), to === undefined ? undefined : formatDate(to, format)].filter(item => item))];
                     // console.log(ranges)
@@ -51,9 +52,9 @@ export async function suffix(doc, policies, insertMode, arg) {
             keys = [...new Set(keys)];
         }
         else if (policy_type === "number" && ranges.length) {
-            ranges = getNormalizedBounds(extractBounds(reduceRanges(ranges)), "number");
-            const from = ranges.from ?? policy.min; // policy.min is always inclusive i.e $gte
-            const to = ranges.to ?? policy.max; // policy.max is always inclusive i.e $lte
+            const bounds = getNormalizedBounds(extractBounds(reduceRanges(ranges)), "number");
+            const from = bounds.from ?? policy.min; // policy.min is always inclusive i.e $gte
+            const to = bounds.to ?? policy.max; // policy.max is always inclusive i.e $lte
             if (from === undefined || to === undefined) {
                 keys = []; // Fall back to Dip.operation("ls").
                 console.warn(`Warn: Missing suffix policy min/max bound for ${policy_type} range specified for key ${policy.key} in Dip`);

package/dist/libs/dipper.js

@@ -1,3 +1,4 @@
+// @ts-ignore
 import axios from 'axios';
 // import {curly} from 'node-libcurl'
 function hashStr(str) {
@@ -68,6 +69,6 @@ export default async function dipper(arg) {
 export const shard_stats = () => {
     let total = Object.values(shard_hits).reduce((partial, value) => partial + value, 0);
     let result = {};
-    Object.entries(shard_hits).forEach(([key, value]) => result[key] = parseFloat(value * 100 / total).toFixed(2));
+    Object.entries(shard_hits).forEach(([key, value]) => result[key] = (value * 100 / total).toFixed(2));
     return result;
 };

package/dist/libs/elabase.js

@@ -1,3 +1,4 @@
+// @ts-ignore
 import axios from 'axios';
 import { default as dipper, shard_stats as ShardStats } from './dipper.js';
 import * as Utils from './utils.js';
@@ -5,7 +6,7 @@ import * as Cpp from './cpp.js';
 import { applySuffixPolicy } from './dip/suffix/policy.js';
 export const shard_stats = ShardStats;
 let Events = {
-    send: function () { }
+    send: function (topic, data) { }
 };
 const url = process.env.DIP_URL || "http://127.0.0.1"; // Set DIP_URL to "http://dip" (Prod) or http://dip-dev (Dev) in CI/CD
 let port = process.env.DIP_PORT || 9401;
@@ -49,7 +50,7 @@ class DipMeta {
     }
 }
 export const isDipMeta = meta => meta instanceof DipMeta;
-export const globalMeta = args => {
+export const globalMeta = (args) => {
     return new DipMeta({ ...args, company: "GLOBAL", outlet: "GLOBAL" });
 };
 export const companyMeta = (company, args) => {

package/dist/libs/features.js

@@ -11,7 +11,9 @@ import * as Kafka from './kafka.js';
 import * as Utils from './utils.js';
 import * as Session from './session.js';
 import * as Messaging from './messaging.js';
+// @ts-ignore
 import axios from 'axios';
+// @ts-ignore
 import jwt from 'jsonwebtoken';
 let features = {};
 let apis = {};

package/dist/libs/kafka.js

@@ -1,3 +1,4 @@
+// @ts-ignore
 import { Kafka, logLevel as KafkaLogLevel, CompressionTypes as KafkaCompressionTypes } from 'kafkajs';
 export const logLevel = KafkaLogLevel;
 export const CompressionTypes = KafkaCompressionTypes;

package/dist/libs/messaging.js

@@ -1,6 +1,8 @@
+import * as Utils from './utils.js';
+// @ts-ignore
 import axios from 'axios';
+// @ts-ignore
 import { createClient } from 'redis';
-import * as Utils from './utils.js';
 const url = process.env.REDIS_URL || "redis://localhost:6380";
 // url: 'redis://alice:foobared@localhost:6380'
 let consumer, publisher;

package/dist/libs/session.js

@@ -1,6 +1,7 @@
-import jwt from 'jsonwebtoken';
 import * as Utils from './utils.js';
 import * as Features from './features.js';
+// @ts-ignore
+import jwt from 'jsonwebtoken';
 let app;
 const ACCESS_TOKEN_SECRET = process.env.JWT_ACCESS_TOKEN_SECRET || "MY_SECRET_ACCESS_TOKEN";
 const REFRESH_TOKEN_SECRET = process.env.JWT_REFRESH_TOKEN_SECRET || "MY_SECRET_REFRESH_TOKEN";
@@ -27,13 +28,13 @@ export const start = (expressApp, allowedUrls) => {
         try {
             const token = req.header('JWT'); //  'Authorization' for Spring Boot, 'x-access-token' for Node.js Express back-end
             const service = req.header('SERVICE'); // Case insensitive search
-            const additionalValidation = async (_) => (process.env.GRANT_FULL_ACCESS || allowedDefaults || await checkPrivilege(req));
+            const additionalValidation = async () => (process.env.GRANT_FULL_ACCESS || allowedDefaults || await checkPrivilege(req));
             async function verifyDeveloperAccess() {
                 const NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN = req.header('NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN');
                 const isDeveloper = NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN && NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN_SECRET;
                 if (!isDeveloper)
                     return false;
-                const verify = _ => jwt.verify(NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN, NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN_SECRET, { algorithms: ['RS512'] });
+                const verify = () => jwt.verify(NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN, NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN_SECRET, { algorithms: ['RS512'] });
                 try {
                     if (service && verify())
                         return true;
@@ -62,12 +63,12 @@ export const start = (expressApp, allowedUrls) => {
             const decoded = jwt.verify(refreshToken, REFRESH_TOKEN_SECRET);
             if (decoded.userId === userId && decoded.clientId === clientId) {
                 let now = Utils.now();
-                let accessTokenExpiry = new Date(now);
-                accessTokenExpiry.setDate(accessTokenExpiry.getDate() + 1);
-                accessTokenExpiry = accessTokenExpiry.getTime();
-                let refreshTokenExpiry = new Date(now);
-                refreshTokenExpiry.setDate(refreshTokenExpiry.getDate() + 30);
-                refreshTokenExpiry = refreshTokenExpiry.getTime();
+                let _accessTokenExpiry = new Date(now);
+                _accessTokenExpiry.setDate(_accessTokenExpiry.getDate() + 1);
+                let _refreshTokenExpiry = new Date(now);
+                _refreshTokenExpiry.setDate(_refreshTokenExpiry.getDate() + 30);
+                const accessTokenExpiry = _accessTokenExpiry.getTime();
+                const refreshTokenExpiry = _refreshTokenExpiry.getTime();
                 const accessToken = jwt.sign({ userId, clientId }, ACCESS_TOKEN_SECRET, { expiresIn: '1d' });
                 const refreshToken = jwt.sign({ userId, clientId }, REFRESH_TOKEN_SECRET, { expiresIn: '30d' });
                 return res.json({ tokens: { accessToken, refreshToken, accessTokenExpiry, refreshTokenExpiry } });
@@ -84,12 +85,12 @@ export const start = (expressApp, allowedUrls) => {
 export const generateAccessToken = (userId, clientId) => {
     let data = { userId, clientId };
     let now = Utils.now();
-    let accessTokenExpiry = new Date(now);
-    accessTokenExpiry.setDate(accessTokenExpiry.getDate() + 1);
-    accessTokenExpiry = accessTokenExpiry.getTime();
-    let refreshTokenExpiry = new Date(now);
-    refreshTokenExpiry.setDate(refreshTokenExpiry.getDate() + 30);
-    refreshTokenExpiry = refreshTokenExpiry.getTime();
+    let _accessTokenExpiry = new Date(now);
+    _accessTokenExpiry.setDate(_accessTokenExpiry.getDate() + 1);
+    let _refreshTokenExpiry = new Date(now);
+    _refreshTokenExpiry.setDate(_refreshTokenExpiry.getDate() + 30);
+    const accessTokenExpiry = _accessTokenExpiry.getTime();
+    const refreshTokenExpiry = _refreshTokenExpiry.getTime();
     const accessToken = jwt.sign(data, ACCESS_TOKEN_SECRET, { expiresIn: '1d' });
     const refreshToken = jwt.sign(data, REFRESH_TOKEN_SECRET, { expiresIn: '365d' });
     return { accessToken, refreshToken, accessTokenExpiry, refreshTokenExpiry };

package/libs/auth.ts

@@ -1,4 +1,6 @@
+// @ts-ignore
 import axios from 'axios'
+// @ts-ignore
 import otpGenerator from 'otp-generator'
 
 import * as Dip from './dip.ts'
@@ -38,7 +40,8 @@ async function attemptLogin(req, res) {
 
     let expiry = 300000
     let userMob = req.body.mob ?? req.body.phone
-    let mob = userMob.endsWith('123456789') ? '0123456789' : Utils.parseMob(userMob)
+    const code = req.body.code
+    let mob = userMob.endsWith('123456789') ? '0123456789' : Utils.parseMob(userMob, code)
     let time = new Date().getTime()
     let collection = (req.body.app ? req.body.app + '.' : '') + "auth.login"
     let errMessage = {success: false, message: "Login Server Error"}
@@ -51,7 +54,7 @@ async function attemptLogin(req, res) {
         let res = await Dip.query(meta, collection, { _id: mob, otp: req.body.otp, clientId, time: { $gt: time - expiry } })
         if (res.length) {
             try {await Dip.update(meta, collection, { _id: mob }, { $set: { otp: '', clientId: '', loggedIn: true } }) } catch (err) { throw {...errMessage, mode: 'verify', info: 'Cleanup Failed'} }
-            return {...res[0], mode: 'verify', success: true, userId: res[0].userId, phone: res[0]._id, mob: res[0]._id}
+            return {...res[0], mode: 'verify', success: true, userId: res[0].userId, phone: res[0]._id, mob: res[0]._id, code}
         }
         throw {...errMessage, mode: 'verify', info: "Invalid/Expired OTP"}
     } else {            // generate login
@@ -63,7 +66,7 @@ async function attemptLogin(req, res) {
             let info = { clientId, created: now, updated: now, ...data}
             await Dip.update(meta, collection, { _id: mob }, { $set: { otp, clientId, time, updated: now, attemptLogin: true }, $setOnInsert: { _id: mob, otp, time, userId, ...info } }, { upsert: true })
 
-            return {mode: 'login', success: true, userId, expiry, phone: mob, mob}
+            return {mode: 'login', success: true, userId, expiry, phone: mob, mob, code}
         }
         throw {...errMessage, mode: 'login', info: 'Generating Info Failed'}
     }

package/libs/compression.ts

@@ -1,4 +1,5 @@
 import * as Utils from './utils.ts'
+// @ts-ignore
 import compression from 'compression'
 
 // Compression Notes

package/libs/dip/suffix/date.ts

@@ -1,4 +1,4 @@
-import {getNormalizedBounds} from './index.ts'
+import {getNormalizedBounds, type Bounds} from './index.ts'
 import {addUTCYears, addUTCMonths, addUTCDays} from '../../utils.ts'
 
 
@@ -94,7 +94,7 @@ export function fillDates(bounds_t, format) {
     else
         step = "year";
 
-    let bounds = { ...bounds_t, from: new Date(bounds_t.from), to: new Date(bounds_t.to) }
+    let bounds: Bounds = { ...bounds_t, from: new Date(bounds_t.from), to: new Date(bounds_t.to) }
 
     bounds = getNormalizedBounds(bounds, "date")
 
@@ -103,13 +103,13 @@ export function fillDates(bounds_t, format) {
 
         switch (step) {
             case "day":
-                addUTCDays(bounds.from, 1)
+                addUTCDays(bounds.from as Date, 1)
                 break;
             case "month":
-                addUTCMonths(bounds.from, 1)
+                addUTCMonths(bounds.from as Date, 1)
                 break;
             case "year":
-                addUTCYears(bounds.from, 1)
+                addUTCYears(bounds.from as Date, 1)
                 break;
         }
     }

package/libs/dip/suffix/index.ts

@@ -72,7 +72,7 @@ function flatten_value(target_key, value, flattened, ancestor_has_id) {
 }
 
 
-export function entries(target_key, query, binary_slice) {
+export function entries(target_key: string, query, binary_slice?: Buffer) {
     let result  = flatten_id_values(target_key, query); // extract all valid _id
 
     // let cows = result.map(v => extract_direct_id(v, binary_slice))
@@ -160,11 +160,19 @@ export function reduceRanges(values) {
     return other;
 }
 
+export type Bounds = {
+    values: any[],
+    from: number | string | Date;
+    to: number | string | Date;
+    fromOp: "$gt" | "$gte";
+    toOp: "$lt" | "$lte";
+}
+
 // reduceRanges() resolves conflicting bounds before extractBounds() runs.
 // extractBounds() receives at most one lower bound and atmost one upper bound. reduceRanges() ensures this
 // The for loop in extractBounds() may look slightly misleading because it looks like it is designed to resolve conflicts: but reduceRanges() has already done the conflict resolution.
 // NOTE CRITICAL: extractBounds() MUST ONLY BE RUN ON THE OUTPUT OF reduceRanges()
-export function extractBounds(values) {
+export function extractBounds(values): Bounds {
     let lower = null;
     let upper = null;
     let lowerOp = null
@@ -204,20 +212,20 @@ export function extractBounds(values) {
 }
 
 // Converts exclusive bounds ($gt/$lt) into inclusive bounds
-export function getNormalizedBounds(bounds_t, type) {
+export function getNormalizedBounds(bounds_t: Bounds, type): Bounds {
     let bounds = {...bounds_t}
 
     if (type === "number") {
         if (bounds.fromOp === "$gt")
-            bounds.from++;
+            (bounds.from as number)++;
         if (bounds.toOp === "$lt")
-            bounds.to--;
+            (bounds.to as number)--;
     } else if (type === "date") {
         if (bounds.fromOp === "$gt")
-            bounds.from = new Date(bounds.from.getTime() + 1);
+            bounds.from = new Date((bounds.from as Date).getTime() + 1);
 
         if (bounds.toOp === "$lt")
-            bounds.to = new Date(bounds.to.getTime() - 1);
+            bounds.to = new Date((bounds.to as Date).getTime() - 1);
     }
 
     return bounds

package/libs/dip/suffix/policy.ts

@@ -88,7 +88,7 @@ export function intersects(w_values, w_bounds, q_values, q_bounds) {
 
 
 // NOTE: Matching is based on intersection, not equality. A policy matches if, for every key in `when`, there exists at least one value that satisfies both the `when` constraint and the query constraint.
-export function matchPolicy(query, when, g_obj) {
+export function matchPolicy(query, when, g_obj?: Record<string, any>) {
     let obj = g_obj ?? {}
     for (let key in when) {
         if (key === "$and" || key === "$or") {
@@ -135,8 +135,9 @@ export function matchPolicy(query, when, g_obj) {
 
 
 
+type Arg = { db?: string; collection?: string; [key: string]: any }
 
-export async function applySuffixPolicy(COLLECTIONS_JSON, collections, query, insertMode, arg) {
+export async function applySuffixPolicy(COLLECTIONS_JSON, collections, query, insertMode?: boolean, arg?: Arg) {
     collections = Array.isArray(collections) ? collections : [collections]
     let suffixes = []
 

package/libs/dip/suffix/suffix.ts

@@ -1,10 +1,11 @@
-import {entries, reduceRanges, extractBounds, getNormalizedBounds} from './index.ts'
+import {entries, reduceRanges, extractBounds, getNormalizedBounds, type Bounds} from './index.ts'
 import {formatDate, fillDates} from './date.ts'
+import * as Dip from '../../elabase.ts'
 
-
+type Arg = { db?: string; collection?: string; [key: string]: any }
 
 const EXPLICIT_SUFFIX_POLICY_TYPES = new Set([  "string", "date", "number" ]);
-export async function suffix(doc, policies, insertMode, arg) {
+export async function suffix(doc, policies, insertMode?: boolean, arg?: Arg) {
     let suffixes = [""]
     for (const policy of policies) {
 
@@ -37,16 +38,16 @@ export async function suffix(doc, policies, insertMode, arg) {
         if (policy_type === "date") {
             keys = keys.map(key => formatDate(key, format))
             if (ranges.length) {
-                ranges = extractBounds(reduceRanges(ranges))
-                const from = ranges.from ?? policy.min // policy.min is always inclusive i.e $gte
-                const to = ranges.to ?? policy.max  // policy.max is always inclusive i.e $lte
-                const fromOp = ranges.from ? ranges.fromOp : "$gte" // policy.min is $gte
-                const toOp = ranges.to ? ranges.toOp : "$lte"  // policy.max is $lte
+                const bounds = extractBounds(reduceRanges(ranges))
+                const from = bounds.from ?? policy.min // policy.min is always inclusive i.e $gte
+                const to = bounds.to ?? policy.max  // policy.max is always inclusive i.e $lte
+                const fromOp = bounds.from ? bounds.fromOp : "$gte" // policy.min is $gte
+                const toOp = bounds.to ? bounds.toOp : "$lte"  // policy.max is $lte
                 if (from === undefined || to === undefined) {
                     keys = [] // Fall back to Dip.operation("ls").
                     console.warn(`Warn: Missing suffix policy min/max bound for ${policy_type} range specified for key ${policy.key} in Dip`)
                 } else {
-                    ranges = fillDates({from, to, fromOp, toOp}, format)
+                    let ranges = fillDates({from, to, fromOp, toOp}, format)
                     if (!ranges.length && policy.inferRange)
                         ranges = [...new Set([from === undefined ? undefined : formatDate(from, format), to === undefined ? undefined : formatDate(to, format)].filter(item => item))]
                     // console.log(ranges)
@@ -59,9 +60,9 @@ export async function suffix(doc, policies, insertMode, arg) {
             }
             keys = [...new Set(keys)];
         } else if (policy_type === "number" && ranges.length) {
-            ranges = getNormalizedBounds(extractBounds(reduceRanges(ranges)), "number")
-            const from = ranges.from ?? policy.min // policy.min is always inclusive i.e $gte
-            const to = ranges.to ?? policy.max // policy.max is always inclusive i.e $lte
+            const bounds = getNormalizedBounds(extractBounds(reduceRanges(ranges)), "number")
+            const from = bounds.from ?? policy.min // policy.min is always inclusive i.e $gte
+            const to = bounds.to ?? policy.max // policy.max is always inclusive i.e $lte
             if (from === undefined || to === undefined) {
                 keys = [] // Fall back to Dip.operation("ls").
                 console.warn(`Warn: Missing suffix policy min/max bound for ${policy_type} range specified for key ${policy.key} in Dip`)

package/libs/dip.ts

@@ -37,7 +37,7 @@ export const IdempotentDip = () => {
     return {
         txn: '',
         meta: undefined,
-        new: (async function (meta, txn, blank) {
+        new: (async function (meta, txn, blank?: {blank: boolean}) {
             this.txn = txn
             this.meta = meta
             return blank ? this : ((await Elabase.query(this.meta, "txns",{_id: this.txn})).length ? false : this)

package/libs/dipper.ts

@@ -1,3 +1,4 @@
+// @ts-ignore
 import axios from 'axios'
 // import {curly} from 'node-libcurl'
 
@@ -84,8 +85,8 @@ export default async function dipper(arg) {
 
 
 export const shard_stats = () => {
-    let total = Object.values(shard_hits).reduce( (partial, value) => partial + value, 0)
+    let total: number = (Object.values(shard_hits) as number[]).reduce( (partial: number, value: number) => partial + value, 0)
     let result = {}
-    Object.entries(shard_hits).forEach( ([key,value]) => result[key] = parseFloat(value * 100 / total).toFixed(2) )
+    Object.entries(shard_hits).forEach( ([key, value]) => result[key] = ((value as number) * 100 / total).toFixed(2) )
     return result
 }

package/libs/elabase.ts

@@ -1,3 +1,4 @@
+// @ts-ignore
 import axios from 'axios'
 import {default as dipper, shard_stats as ShardStats} from './dipper.ts'
 import * as Utils from './utils.ts'
@@ -12,7 +13,7 @@ export const shard_stats = ShardStats
 
 
 let Events = {
-    send: function() { }
+    send: function(topic?: string, data?: any) { }
 }
 
 
@@ -62,6 +63,9 @@ function deepFreeze(obj) {
     return obj;
 }
 class DipMeta {
+    declare company?: string;
+    declare outlet?: string;
+
     constructor(obj) {
         Object.assign(this, deepFreeze(obj));
         Object.freeze(this);
@@ -69,10 +73,10 @@ class DipMeta {
 }
 export const isDipMeta = meta => meta instanceof DipMeta
 
-export const globalMeta = args => {
+export const globalMeta = (args?: any) => {
     return new DipMeta({ ...args, company: "GLOBAL", outlet: "GLOBAL" })
 }
-export const companyMeta = (company, args) => {
+export const companyMeta = (company, args?: any) => {
     if (typeof company !== "string" && !Array.isArray(company))
         throw new Error("Error: Invalid company provided in Dip.companyMeta()")
     if (!company || (typeof company === "string" && company.trim() === "") ||  company === "GLOBAL" || (Array.isArray(company) && (!company.length || company.some(item => typeof item !== "string" || item.trim() === "" || item === "GLOBAL")) ))
@@ -80,7 +84,7 @@ export const companyMeta = (company, args) => {
 
     return new DipMeta({...args, outlet: "GLOBAL", company})
 }
-export const outletMeta = (outlet, args) => {
+export const outletMeta = (outlet, args?: any) => {
     if (typeof outlet !== "string" && !Array.isArray(outlet))
         throw new Error("Error: Invalid outlet provided in Dip.outletMeta()")
     if (!outlet || (typeof outlet === "string" && outlet.trim() === "") ||  outlet === "GLOBAL" || (Array.isArray(outlet) && (!outlet.length || outlet.some(item => typeof item !== "string" || item.trim() === "" || item === "GLOBAL")) ))
@@ -89,7 +93,7 @@ export const outletMeta = (outlet, args) => {
     return new DipMeta({...args, company: "GLOBAL", outlet})
 }
 
-export const customMeta = (company, outlet, args) => {
+export const customMeta = (company, outlet, args?: any) => {
 
     if (typeof company !== "string" && !Array.isArray(company))
         throw new Error("Error: Invalid company provided in Dip.customMeta()")
@@ -308,7 +312,7 @@ export const operation = async (name, extras) => {
 
 
 // Ported
-export const insert = async (meta, collection, value, options, extras) => {
+export const insert = async (meta, collection, value, options?: any, extras?: any) => {
 
     if (!(meta instanceof DipMeta)) console.warn('Warn: Provided meta is not an instance of DipMeta in Dip.insert()') // TODO: throw error once review completes
 
@@ -352,7 +356,7 @@ export const insert = async (meta, collection, value, options, extras) => {
 }
 
 // Ported
-export const query = async (meta, collection, query, options, extras) => {
+export const query = async (meta, collection, query, options?: any, extras?: any) => {
 
     if (!(meta instanceof DipMeta)) console.warn('Warn: Provided meta is not an instance of DipMeta in Dip.query()') // TODO: throw error once review completes
 
@@ -404,7 +408,7 @@ function collectionArray(col) {
 }
 
 // Ported
-export const update = async (meta, collection, query, update, options, extras) => {
+export const update = async (meta, collection, query, update, options?: any, extras?: any) => {
 
     if (!(meta instanceof DipMeta)) console.warn('Warn: Provided meta is not an instance of DipMeta in Dip.update()') // TODO: throw error once review completes
 
@@ -444,7 +448,7 @@ export const update = async (meta, collection, query, update, options, extras) =
 }
 
 // Ported
-export const remove = async (meta, collection, query, options, extras) => {
+export const remove = async (meta, collection, query, options?: any, extras?: any) => {
 
     if (!(meta instanceof DipMeta)) console.warn('Warn: Provided meta is not an instance of DipMeta in Dip.remove()') // TODO: throw error once review completes
 

package/libs/features.ts

@@ -3,7 +3,9 @@ import * as Kafka from './kafka.ts'
 import * as Utils from './utils.ts'
 import * as Session from './session.ts'
 import * as Messaging from './messaging.ts'
+// @ts-ignore
 import axios from 'axios'
+// @ts-ignore
 import jwt from 'jsonwebtoken'
 
 let  features = {}

package/libs/kafka.ts

@@ -1,3 +1,4 @@
+// @ts-ignore
 import { Kafka, logLevel as KafkaLogLevel, CompressionTypes as KafkaCompressionTypes } from 'kafkajs'
 
 export const logLevel = KafkaLogLevel
@@ -38,7 +39,7 @@ export const createTopic = async (topic, partition, replicas) => {
 
 let consumers = []
 
-const start_consumer = async function (topic, groupId, callback) {
+const start_consumer = async function (topic, groupId, callback?: Function) {
     callback = typeof groupId === "string" ? callback : groupId
     groupId = typeof groupId === "string" ? `${appName}.${groupId}` : `${appName}.${topic}`
 
@@ -96,7 +97,7 @@ const start_producer = async function (topic, message, key, options) {
 // start_consumer('quickstart-events')
 // start_producer('quickstart-events', 'Hello KafkaJS user! Little')
 
-export const receive = async function(topic, groupId, callback) {
+export const receive = async function(topic, groupId, callback?: Function) {
     topic = topicPrefix + topic
     return (await start_consumer(topic, groupId, callback))
 }

package/libs/messaging.ts

@@ -1,7 +1,10 @@
 
+import * as Utils from './utils.ts'
+
+// @ts-ignore
 import axios from 'axios'
+// @ts-ignore
 import { createClient } from 'redis';
-import * as Utils from './utils.ts'
 
 const url = process.env.REDIS_URL || "redis://localhost:6380"
 

package/libs/session.ts

@@ -1,6 +1,8 @@
-import jwt from 'jsonwebtoken'
 import * as Utils from './utils.ts'
 import * as Features from './features.ts'
+// @ts-ignore
+import jwt from 'jsonwebtoken'
+
 let app
 
 
@@ -42,14 +44,14 @@ export const start = (expressApp, allowedUrls) => {
         try {
             const token = req.header('JWT');    //  'Authorization' for Spring Boot, 'x-access-token' for Node.js Express back-end
             const service = req.header('SERVICE');  // Case insensitive search
-            const additionalValidation = async _ => (process.env.GRANT_FULL_ACCESS || allowedDefaults || await checkPrivilege(req))
+            const additionalValidation = async () => (process.env.GRANT_FULL_ACCESS || allowedDefaults || await checkPrivilege(req))
 
             async function verifyDeveloperAccess() {
                 const NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN = req.header('NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN')
                 const isDeveloper = NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN && NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN_SECRET
                 if (!isDeveloper)
                     return false
-                const verify =  _ => jwt.verify(NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN, NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN_SECRET, { algorithms: ['RS512'] })
+                const verify =  () => jwt.verify(NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN, NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN_SECRET, { algorithms: ['RS512'] })
                 try {
                     if (service && verify())
                         return true
@@ -79,8 +81,10 @@ export const start = (expressApp, allowedUrls) => {
             const decoded = jwt.verify(refreshToken, REFRESH_TOKEN_SECRET)
             if (decoded.userId === userId && decoded.clientId === clientId) {
                 let now = Utils.now()
-                let accessTokenExpiry = new Date(now); accessTokenExpiry.setDate(accessTokenExpiry.getDate() + 1); accessTokenExpiry = accessTokenExpiry.getTime()
-                let refreshTokenExpiry = new Date(now); refreshTokenExpiry.setDate(refreshTokenExpiry.getDate() + 30); refreshTokenExpiry = refreshTokenExpiry.getTime()
+                let _accessTokenExpiry = new Date(now); _accessTokenExpiry.setDate(_accessTokenExpiry.getDate() + 1);
+                let _refreshTokenExpiry = new Date(now); _refreshTokenExpiry.setDate(_refreshTokenExpiry.getDate() + 30);
+                const accessTokenExpiry = _accessTokenExpiry.getTime()
+                const refreshTokenExpiry = _refreshTokenExpiry.getTime()
                 const accessToken = jwt.sign({ userId, clientId }, ACCESS_TOKEN_SECRET, { expiresIn: '1d' });
                 const refreshToken = jwt.sign({ userId, clientId }, REFRESH_TOKEN_SECRET, { expiresIn: '30d' });
                 return res.json({ tokens: { accessToken, refreshToken, accessTokenExpiry, refreshTokenExpiry} });
@@ -100,8 +104,10 @@ export const generateAccessToken = (userId, clientId) => {
     let data = { userId, clientId }
 
     let now = Utils.now()
-    let accessTokenExpiry = new Date(now); accessTokenExpiry.setDate(accessTokenExpiry.getDate() + 1); accessTokenExpiry = accessTokenExpiry.getTime()
-    let refreshTokenExpiry = new Date(now); refreshTokenExpiry.setDate(refreshTokenExpiry.getDate() + 30); refreshTokenExpiry = refreshTokenExpiry.getTime()
+    let _accessTokenExpiry = new Date(now); _accessTokenExpiry.setDate(_accessTokenExpiry.getDate() + 1);
+    let _refreshTokenExpiry = new Date(now); _refreshTokenExpiry.setDate(_refreshTokenExpiry.getDate() + 30);
+    const accessTokenExpiry = _accessTokenExpiry.getTime()
+    const refreshTokenExpiry = _refreshTokenExpiry.getTime()
 
     const accessToken = jwt.sign(data, ACCESS_TOKEN_SECRET, { expiresIn: '1d' });
     const refreshToken = jwt.sign(data, REFRESH_TOKEN_SECRET, { expiresIn: '365d' });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.217",
+  "version": "1.0.219",
   "description": "",
   "main": "dist/index.js",
   "types": "./index.ts",