corebasic 1.0.216 → 1.0.218

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/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';

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/dist/libs/utils.js

@@ -1,24 +1,24 @@
-import * as ObjectId from './ObjectId.js';
 import * as Mobile from './mobilecodes.js';
+import crypto from "node:crypto";
 // Parse JSON file: fileToJson
 import { readFile, writeFile } from 'fs/promises';
-import 'jsonminify';
-// S3 Object Storage
-import { S3Client, ListBucketsCommand, ListObjectsV2Command, GetObjectCommand, PutObjectCommand, CreateBucketCommand, DeleteObjectCommand } from '@aws-sdk/client-s3';
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
-let bucketName = process.env.APP_DEPLOYMENT_NAME ?? ((global?.app?.name ?? "app") + '-dev');
-let _ = (async () => { try {
-    const data = await S3.send(new CreateBucketCommand({ Bucket: bucketName }));
-}
-catch { } })(); // Create Bucket
 export let pipeline = { execute: execute };
 export function log(...args) {
     let res = [];
     args.forEach(arg => res.push(typeof arg === "object" ? JSON.stringify(arg, null, '\t') : arg));
     console.log(...res);
 }
+let UID_COUNTER = crypto.randomBytes(3).readUIntBE(0, 3);
+const UID_PROCESS = crypto.randomBytes(5);
 export function uid() {
-    return ObjectId.ObjectId();
+    const buf = Buffer.allocUnsafe(12);
+    // 4-byte timestamp (big endian)
+    buf.writeUInt32BE((Date.now() / 1000) | 0, 0);
+    // 5-byte process unique
+    UID_PROCESS.copy(buf, 4);
+    // 3-byte counter
+    buf.writeUIntBE(UID_COUNTER++ & 0xffffff, 9, 3);
+    return buf.toString("hex");
 }
 export function isEmpty(str) {
     if (!str)
@@ -27,7 +27,7 @@ export function isEmpty(str) {
 }
 export let GLOBAL_META = { company: "GLOBAL", outlet: "GLOBAL" };
 export function isEmptyJson(json) {
-    for (var i in json)
+    for (let i in json)
         return false;
     return true;
 }
@@ -41,10 +41,12 @@ export function uniqueObjects(array, key) {
 // Parse Numbers
 // --------------
 export function parseFloatValue(val) {
-    return parseFloat(val) ? parseFloat(val) : 0;
+    const ret = parseFloat(String(val ?? "0"));
+    return ret ? ret : 0;
 }
 export function parseIntValue(val) {
-    return parseInt(val) ? parseInt(val) : 0;
+    const ret = parseInt(String(val ?? "0"));
+    return ret ? ret : 0;
 }
 // ----------------
 // Dates
@@ -55,38 +57,38 @@ export function now() {
 export function toAppDate(date) {
     if (Object.prototype.toString.call(date) === '[object String]')
         date = new Date(date);
-    var temp = date;
-    if (isNaN(temp) || date === '')
+    let temp = date;
+    if (isNaN(temp.getTime()))
         return '';
-    var day = temp.getDate().toString();
+    let day = temp.getDate().toString();
     if (day.length === 1)
         day = "0" + day;
-    var month = (temp.getMonth() + 1).toString();
+    let month = (temp.getMonth() + 1).toString();
     if (month.length == 1)
         month = "0" + month;
     return (day + "/" + month + "/" + temp.getFullYear().toString());
 }
 export function toDate(arg, currentTime) {
-    var st = arg.split('/');
-    var temp = new Date(st[2], parseInt(st[1]) - 1, st[0]);
+    let st = arg.split('/');
+    let temp = new Date(parseInt(st[2]), parseInt(st[1]) - 1, parseInt(st[0]));
     temp.setHours(0);
     temp.setMinutes(0);
     temp.setSeconds(0);
     temp.setMilliseconds(0);
     if (currentTime) {
-        var curdate = getCurrentDate();
+        let curdate = now();
         temp.setHours(curdate.getHours());
         temp.setMinutes(curdate.getMinutes());
         temp.setSeconds(curdate.getSeconds());
         temp.setMilliseconds(curdate.getMilliseconds());
     }
-    if (isNaN(temp))
+    if (isNaN(temp.getTime()))
         return undefined;
     return temp;
 }
 export function getDatesBetweenTwoDates(start, end) {
-    var arr = [];
-    var dt = new Date(start);
+    let arr = [];
+    let dt = new Date(start);
     dt.setHours(0);
     dt.setMinutes(0);
     dt.setSeconds(0);
@@ -99,7 +101,7 @@ export function getDatesBetweenTwoDates(start, end) {
 }
 export function deepCopy(obj) {
     if (Object.prototype.toString.call(obj) === '[object Array]') {
-        var out = [], i = 0, len = obj.length;
+        let out = [], i = 0, len = obj.length;
         for (; i < len; i++) {
             if (Object.prototype.toString.call(obj[i]) === '[object Date]')
                 out[i] = new Date(obj[i]);
@@ -109,7 +111,7 @@ export function deepCopy(obj) {
         return out;
     }
     if (typeof obj === 'object') {
-        var out = {}, i;
+        let out = {}, i;
         for (i in obj) {
             if (Object.prototype.toString.call(obj[i]) === '[object Date]')
                 out[i] = new Date(obj[i]);
@@ -121,18 +123,18 @@ export function deepCopy(obj) {
     return obj;
 }
 export function formatAMPM(date) {
-    var hours = date.getHours();
-    var minutes = date.getMinutes();
-    var ampm = hours >= 12 ? 'pm' : 'am';
+    let hours = date.getHours();
+    let minutes = date.getMinutes();
+    let ampm = hours >= 12 ? 'pm' : 'am';
     hours = hours % 12;
     hours = hours ? hours : 12; // the hour '0' should be '12'
     minutes = minutes < 10 ? '0' + minutes : minutes;
-    var strTime = hours + ':' + minutes + ' ' + ampm;
+    let strTime = hours + ':' + minutes + ' ' + ampm;
     return strTime;
 }
 export function sum(array) {
-    var res = 0;
-    for (var i in array)
+    let res = 0;
+    for (let i in array)
         res += parseFloat(array[i]) ? parseFloat(array[i]) : 0;
     return res;
 }
@@ -225,7 +227,60 @@ export function validityToUTCMillisecs(start, validity) {
 // ----------------
 export async function fileToJson(path, file) {
     let data = (await readFile(new URL(file, path).toString().replace('file://', ''), 'utf8'));
-    return JSON.parse(JSON.minify(data));
+    // return JSON.parse((JSON as Record<string, any>).minify(data))
+    const json_minify = function (json) {
+        var tokenizer = /"|(\/\*)|(\*\/)|(\/\/)|\n|\r|\[|]/g, in_string = false, in_multiline_comment = false, in_singleline_comment = false, tmp, tmp2, new_str = [], ns = 0, from = 0, lc, rc, prevFrom;
+        tokenizer.lastIndex = 0;
+        while (tmp = tokenizer.exec(json)) {
+            lc = RegExp.leftContext;
+            rc = RegExp.rightContext;
+            if (!in_multiline_comment && !in_singleline_comment) {
+                tmp2 = lc.substring(from);
+                if (!in_string) {
+                    tmp2 = tmp2.replace(/(\n|\r|\s)*/g, "");
+                }
+                new_str[ns++] = tmp2;
+            }
+            prevFrom = from;
+            from = tokenizer.lastIndex;
+            // found a " character, and we're not currently in
+            // a comment? check for previous `\` escaping immediately
+            // leftward adjacent to this match
+            if (tmp[0] === "\"" && !in_multiline_comment && !in_singleline_comment) {
+                // limit left-context matching to only go back
+                // to the position of the last token match
+                //
+                // see: https://github.com/getify/JSON.minify/issues/64
+                lc.lastIndex = prevFrom;
+                // perform leftward adjacent escaping match
+                tmp2 = lc.match(/(\\)*$/);
+                // start of string with ", or unescaped " character found to end string?
+                if (!in_string || !tmp2 || (tmp2[0].length % 2) === 0) {
+                    in_string = !in_string;
+                }
+                from--; // include " character in next catch
+                rc = json.substring(from);
+            }
+            else if (tmp[0] === "/*" && !in_string && !in_multiline_comment && !in_singleline_comment) {
+                in_multiline_comment = true;
+            }
+            else if (tmp[0] === "*/" && !in_string && in_multiline_comment && !in_singleline_comment) {
+                in_multiline_comment = false;
+            }
+            else if (tmp[0] === "//" && !in_string && !in_multiline_comment && !in_singleline_comment) {
+                in_singleline_comment = true;
+            }
+            else if ((tmp[0] === "\n" || tmp[0] === "\r") && !in_string && !in_multiline_comment && in_singleline_comment) {
+                in_singleline_comment = false;
+            }
+            else if (!in_multiline_comment && !in_singleline_comment && !(/\n|\r|\s/.test(tmp[0]))) {
+                new_str[ns++] = tmp[0];
+            }
+        }
+        new_str[ns++] = rc;
+        return new_str.join("");
+    };
+    return JSON.parse(json_minify(data));
 }
 // ----------------
 // File
@@ -249,15 +304,6 @@ function startPipeline(pipeline, index, data, errfn) {
     pipeline[index](data).then(data => startPipeline(pipeline, index + 1, data)).catch(err => { if (errfn)
         errfn(err); });
 }
-// -----------------
-// S3 Object Storage
-// -----------------
-export async function getUrl(path, expiry = 3600) {
-    return await getSignedUrl(S3, new GetObjectCommand({ Bucket: bucketName, Key: path }), { expiresIn: expiry });
-}
-export async function putUrl(path, expiry = 3600) {
-    return await getSignedUrl(S3, new PutObjectCommand({ Bucket: bucketName, Key: path }), { expiresIn: expiry });
-}
 // ---------------------------
 // Express Middleware Exclude
 // ---------------------------

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/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))

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,10 @@
 import {entries, reduceRanges, extractBounds, getNormalizedBounds} from './index.ts'
 import {formatDate, fillDates} from './date.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) {
 

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/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'
@@ -308,7 +309,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 +353,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 +405,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 +445,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/libs/utils.ts

@@ -1,20 +1,11 @@
-import * as ObjectId from './ObjectId.ts'
 import * as Mobile from './mobilecodes.ts'
+import crypto from "node:crypto";
 
 // Parse JSON file: fileToJson
 import {readFile,writeFile} from 'fs/promises';
-import 'jsonminify'
-
-// S3 Object Storage
-import { S3Client, ListBucketsCommand, ListObjectsV2Command, GetObjectCommand, PutObjectCommand, CreateBucketCommand, DeleteObjectCommand } from '@aws-sdk/client-s3'
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
-let bucketName = process.env.APP_DEPLOYMENT_NAME ?? ((global?.app?.name ??  "app") + '-dev')
-let _ = (async () => { try { const data = await S3.send(new CreateBucketCommand({ Bucket: bucketName })) } catch { } })() // Create Bucket
-
 
 export let pipeline = { execute: execute }
 
-
 export function log(...args) {
     let res = []
     args.forEach(arg => res.push(typeof arg  === "object" ? JSON.stringify(arg,null,'\t') : arg))
@@ -22,11 +13,26 @@ export function log(...args) {
 }
 
 
-export function uid() {
-    return ObjectId.ObjectId()
+let UID_COUNTER = crypto.randomBytes(3).readUIntBE(0, 3);
+const UID_PROCESS = crypto.randomBytes(5);
+
+export function uid(): string {
+
+    const buf = Buffer.allocUnsafe(12);
+
+    // 4-byte timestamp (big endian)
+    buf.writeUInt32BE((Date.now() / 1000) | 0, 0);
+
+    // 5-byte process unique
+    UID_PROCESS.copy(buf, 4);
+
+    // 3-byte counter
+    buf.writeUIntBE(UID_COUNTER++ & 0xffffff, 9, 3);
+
+    return buf.toString("hex");
 }
 
-export function isEmpty(str) { // returns true for undefined
+export function isEmpty(str): boolean { // returns true for undefined
     if(!str)
         return true
     return str.match(/\S/) ? false : true // matches a non space character
@@ -34,8 +40,8 @@ export function isEmpty(str) { // returns true for undefined
 
 export let GLOBAL_META = { company: "GLOBAL", outlet: "GLOBAL" }
 
-export function isEmptyJson(json) {
-    for (var i in json)
+export function isEmptyJson(json): boolean {
+    for (let i in json)
         return false
     return true
 }
@@ -53,12 +59,14 @@ export function uniqueObjects(array, key) {
 // Parse Numbers
 // --------------
 
-export function parseFloatValue(val) {
-    return parseFloat(val) ? parseFloat(val) : 0
+export function parseFloatValue(val: number | string | undefined): number {
+    const ret = parseFloat(String(val ?? "0"))
+    return ret ? ret : 0
 }
 
-export function parseIntValue(val) {
-    return parseInt(val) ? parseInt(val) : 0
+export function parseIntValue(val: number | string | undefined): number {
+    const ret = parseInt(String(val ?? "0"))
+    return ret ? ret : 0
 }
 
 
@@ -71,38 +79,38 @@ export function now() {
 }
 
 
-export function toAppDate(date) { // New
+export function toAppDate(date: Date): string { // New
     if (Object.prototype.toString.call(date) === '[object String]')
         date = new Date(date)
 
-    var temp = date
-    if (isNaN(temp) || date === '')
+    let temp = date
+    if (isNaN(temp.getTime()))
         return ''
 
-    var day = temp.getDate().toString()
+    let day = temp.getDate().toString()
     if(day.length === 1) day = "0"+day
-    var month = (temp.getMonth() + 1).toString()
+    let month = (temp.getMonth() + 1).toString()
     if(month.length == 1) month = "0"+month
     return (day + "/" + month + "/" +  temp.getFullYear().toString())
 }
 
 
-export function toDate(arg, currentTime) { // New
+export function toDate(arg: string, currentTime?: boolean): Date { // New
 
-    var st = arg.split('/')
+    let st = arg.split('/')
 
-    var temp = new Date(st[2],parseInt(st[1]) - 1, st[0]);
+    let temp = new Date(parseInt(st[2]), parseInt(st[1]) - 1, parseInt(st[0]));
     temp.setHours(0) ; temp.setMinutes(0); temp.setSeconds(0); temp.setMilliseconds(0)
 
     if (currentTime) {
-        var curdate = getCurrentDate()
+        let curdate = now()
         temp.setHours(curdate.getHours())
         temp.setMinutes(curdate.getMinutes())
         temp.setSeconds(curdate.getSeconds())
         temp.setMilliseconds(curdate.getMilliseconds())
     }
 
-    if (isNaN(temp))
+    if (isNaN(temp.getTime()))
         return undefined
     return temp
 }
@@ -110,8 +118,8 @@ export function toDate(arg, currentTime) { // New
 
 
 export function getDatesBetweenTwoDates(start, end) {
-    var arr = [];
-    var dt = new Date(start);
+    let arr = [];
+    let dt = new Date(start);
 
 	dt.setHours(0)
         dt.setMinutes(0)
@@ -127,7 +135,7 @@ export function getDatesBetweenTwoDates(start, end) {
 
 export function deepCopy(obj) {
     if (Object.prototype.toString.call(obj) === '[object Array]') {
-        var out = [], i = 0, len = obj.length;
+        let out = [], i = 0, len = obj.length;
         for ( ; i < len; i++ ) {
             if (Object.prototype.toString.call(obj[i]) === '[object Date]')
                 out[i] = new Date(obj[i])
@@ -137,7 +145,7 @@ export function deepCopy(obj) {
         return out;
     }
     if (typeof obj === 'object') {
-        var out = {}, i;
+        let out = {}, i;
         for ( i in obj ) {
             if (Object.prototype.toString.call(obj[i]) === '[object Date]')
                 out[i] = new Date(obj[i])
@@ -151,24 +159,24 @@ export function deepCopy(obj) {
 
 
 export function formatAMPM(date) {
-    var hours = date.getHours();
-    var minutes = date.getMinutes();
-    var ampm = hours >= 12 ? 'pm' : 'am';
+    let hours = date.getHours();
+    let minutes = date.getMinutes();
+    let ampm = hours >= 12 ? 'pm' : 'am';
     hours = hours % 12;
     hours = hours ? hours : 12; // the hour '0' should be '12'
     minutes = minutes < 10 ? '0'+minutes : minutes;
-    var strTime = hours + ':' + minutes + ' ' + ampm;
+    let strTime = hours + ':' + minutes + ' ' + ampm;
     return strTime;
 }
 export function sum(array) {   // Eg: sum([10,20,undefined, NaN, 40])
-    var res = 0
-    for (var i in array)
+    let res = 0
+    for (let i in array)
         res += parseFloat(array[i]) ? parseFloat(array[i]) : 0
     return res;
 }
 
 
-export function addMonths(date, monthsToAdd) { // simpler alternative to setNextMonth because rollover always changes the day number
+export function addMonths(date: Date, monthsToAdd: number): Date { // simpler alternative to setNextMonth because rollover always changes the day number
     const day = date.getDate();
     date.setMonth(date.getMonth() + monthsToAdd);
     // If the day rolled over, clamp to last day of target month
@@ -177,11 +185,11 @@ export function addMonths(date, monthsToAdd) { // simpler alternative to setNext
     }
     return date;
 }
-export function addYears(date, yearsToAdd) { // Reuse addMonths to cleanly clamp Feb 29 to Feb 28 instead of 1 March on non-leap years
+export function addYears(date: Date, yearsToAdd: number): Date { // Reuse addMonths to cleanly clamp Feb 29 to Feb 28 instead of 1 March on non-leap years
     return addMonths(date, yearsToAdd * 12)
 }
 
-export function addUTCMonths(date, monthsToAdd) { // simpler alternative to setUTCNextMonth because rollover always changes the day number
+export function addUTCMonths(date: Date, monthsToAdd: number): Date { // simpler alternative to setUTCNextMonth because rollover always changes the day number
     const day = date.getUTCDate();
     date.setUTCMonth(date.getUTCMonth() + monthsToAdd);
     // If the day rolled over, clamp to last day of target month
@@ -190,23 +198,23 @@ export function addUTCMonths(date, monthsToAdd) { // simpler alternative to setU
     }
     return date;
 }
-export function addUTCYears(date, yearsToAdd) { // Reuse addMonths to cleanly clamp Feb 29 to Feb 28 instead of 1 March on non-leap years
+export function addUTCYears(date: Date, yearsToAdd: number): Date { // Reuse addMonths to cleanly clamp Feb 29 to Feb 28 instead of 1 March on non-leap years
     return addUTCMonths(date, yearsToAdd * 12)
 }
 
-export function addDays(date, daysToAdd) {
+export function addDays(date: Date, daysToAdd: number): Date {
     date.setDate(date.getDate() + daysToAdd)
     return date
 }
-export function addHours(date, hoursToAdd) {
+export function addHours(date: Date, hoursToAdd: number): Date {
     date.setHours(date.getHours() + hoursToAdd)
     return date
 }
-export function addUTCDays(date, daysToAdd) {
+export function addUTCDays(date: Date, daysToAdd: number): Date {
     date.setUTCDate(date.getUTCDate() + daysToAdd)
     return date
 }
-export function addUTCHours(date, hoursToAdd) {
+export function addUTCHours(date: Date, hoursToAdd: number): Date {
     date.setUTCHours(date.getUTCHours() + hoursToAdd)
     return date
 }
@@ -270,7 +278,74 @@ export function validityToUTCMillisecs(start, validity) { // start is in ms
 // ----------------
 export async function fileToJson(path, file) {
     let data = (await readFile(new URL(file, path).toString().replace('file://',''), 'utf8'))
-    return JSON.parse(JSON.minify(data))
+    // return JSON.parse((JSON as Record<string, any>).minify(data))
+
+    const json_minify = function (json: string): string {
+
+        var tokenizer = /"|(\/\*)|(\*\/)|(\/\/)|\n|\r|\[|]/g,
+        in_string = false,
+        in_multiline_comment = false,
+        in_singleline_comment = false,
+        tmp, tmp2, new_str = [], ns = 0, from = 0, lc, rc,
+        prevFrom
+        ;
+
+        tokenizer.lastIndex = 0;
+
+        while ( tmp = tokenizer.exec(json) ) {
+            lc = RegExp.leftContext;
+            rc = RegExp.rightContext;
+            if (!in_multiline_comment && !in_singleline_comment) {
+                tmp2 = lc.substring(from);
+                if (!in_string) {
+                    tmp2 = tmp2.replace(/(\n|\r|\s)*/g,"");
+                }
+                new_str[ns++] = tmp2;
+            }
+            prevFrom = from;
+            from = tokenizer.lastIndex;
+
+            // found a " character, and we're not currently in
+            // a comment? check for previous `\` escaping immediately
+            // leftward adjacent to this match
+            if (tmp[0] === "\"" && !in_multiline_comment && !in_singleline_comment) {
+                // limit left-context matching to only go back
+                // to the position of the last token match
+                //
+                // see: https://github.com/getify/JSON.minify/issues/64
+                lc.lastIndex = prevFrom;
+
+                // perform leftward adjacent escaping match
+                tmp2 = lc.match(/(\\)*$/);
+                // start of string with ", or unescaped " character found to end string?
+                if (!in_string || !tmp2 || (tmp2[0].length % 2) === 0) {
+                    in_string = !in_string;
+                }
+                from--; // include " character in next catch
+                rc = json.substring(from);
+            }
+            else if (tmp[0] === "/*" && !in_string && !in_multiline_comment && !in_singleline_comment) {
+                in_multiline_comment = true;
+            }
+            else if (tmp[0] === "*/" && !in_string && in_multiline_comment && !in_singleline_comment) {
+                in_multiline_comment = false;
+            }
+            else if (tmp[0] === "//" && !in_string && !in_multiline_comment && !in_singleline_comment) {
+                in_singleline_comment = true;
+            }
+            else if ((tmp[0] === "\n" || tmp[0] === "\r") && !in_string && !in_multiline_comment && in_singleline_comment) {
+                in_singleline_comment = false;
+            }
+            else if (!in_multiline_comment && !in_singleline_comment && !(/\n|\r|\s/.test(tmp[0]))) {
+                new_str[ns++] = tmp[0];
+            }
+        }
+        new_str[ns++] = rc;
+        return new_str.join("");
+    }
+
+
+    return JSON.parse(json_minify(data))
 }
 
 // ----------------
@@ -289,27 +364,17 @@ export async function stringToFile(file, data) {
 // ----------------
 
 
-function execute(pipeline, errfn) {
+function execute(pipeline, errfn?: Function) {
     startPipeline(pipeline, 0, undefined, errfn)
 }
 
-function startPipeline(pipeline, index, data, errfn) {
+function startPipeline(pipeline, index, data, errfn?: Function) {
     index = index == undefined ? 0 : index
     if (index == pipeline.length)
         return
     pipeline[index](data).then(data => startPipeline(pipeline, index + 1, data)).catch(err => { if (errfn) errfn(err) } )
 }
 
-// -----------------
-// S3 Object Storage
-// -----------------
-
-export async function getUrl(path, expiry = 3600) { // expiry default: 1 Hour
-    return await getSignedUrl(S3, new GetObjectCommand({ Bucket: bucketName, Key: path }), { expiresIn: expiry })
-}
-export async function putUrl(path, expiry = 3600) { // expiry default: 1 Hour
-    return await getSignedUrl(S3, new PutObjectCommand({ Bucket: bucketName, Key: path }), { expiresIn: expiry })
-}
 
 // ---------------------------
 // Express Middleware Exclude
@@ -332,7 +397,7 @@ export const excludeMiddleware = function(middleware, ...paths) {
 // Parse Mobile Number
 // --------------------
 
-export function parseMob(mob, code) {
+export function parseMob(mob: string, code: string): string {
     code = code ?? "IN"
     if (isEmpty(mob))
         return mob

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.216",
+  "version": "1.0.218",
   "description": "",
   "main": "dist/index.js",
   "types": "./index.ts",
@@ -11,11 +11,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.398.0",
-    "@aws-sdk/s3-request-presigner": "^3.398.0",
     "axios": "^1.4.0",
     "compression": "^1.7.4",
-    "jsonminify": "^0.4.2",
     "jsonwebtoken": "^9.0.1",
     "otp-generator": "^4.0.1",
     "redis": "^4.6.8"

package/libs/ObjectId.ts

@@ -1,123 +0,0 @@
-/*
-*
-* Copyright (c) 2011-2014- Justin Dearing (zippy1981@gmail.com)
-* Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
-* and GPL (http://www.opensource.org/licenses/gpl-license.php) version 2 licenses.
-* This software is not distributed under version 3 or later of the GPL.
-*
-* Version 1.0.2
-*
-*/
-
-
-
-if (!document) var document = { cookie: '' }; // fix crashes on node
-
-/**
- * Javascript class that mimics how WCF serializes a object of type MongoDB.Bson.ObjectId
- * and converts between that format and the standard 24 character representation.
-*/
-export var ObjectId = (function () {
-    var increment = Math.floor(Math.random() * (16777216));
-    var pid = Math.floor(Math.random() * (65536));
-    var machine = Math.floor(Math.random() * (16777216));
-
-    var setMachineCookie = function() {
-        var cookieList = document.cookie.split('; ');
-        for (var i in cookieList) {
-            var cookie = cookieList[i].split('=');
-            var cookieMachineId = parseInt(cookie[1], 10);
-            if (cookie[0] == 'mongoMachineId' && cookieMachineId && cookieMachineId >= 0 && cookieMachineId <= 16777215) {
-                machine = cookieMachineId;
-                break;
-            }
-        }
-        document.cookie = 'mongoMachineId=' + machine + ';expires=Tue, 19 Jan 2038 05:00:00 GMT;path=/';
-    };
-    if (typeof (localStorage) != 'undefined') {
-        try {
-            var mongoMachineId = parseInt(localStorage['mongoMachineId']);
-            if (mongoMachineId >= 0 && mongoMachineId <= 16777215) {
-                machine = Math.floor(localStorage['mongoMachineId']);
-            }
-            // Just always stick the value in.
-            localStorage['mongoMachineId'] = machine;
-        } catch (e) {
-            setMachineCookie();
-        }
-    }
-    else {
-        setMachineCookie();
-    }
-
-    function ObjId() {
-        if (!(this instanceof ObjectId)) {
-            return new ObjectId(arguments[0], arguments[1], arguments[2], arguments[3]).toString();
-        }
-
-        if (typeof (arguments[0]) == 'object') {
-            this.timestamp = arguments[0].timestamp;
-            this.machine = arguments[0].machine;
-            this.pid = arguments[0].pid;
-            this.increment = arguments[0].increment;
-        }
-        else if (typeof (arguments[0]) == 'string' && arguments[0].length == 24) {
-            this.timestamp = Number('0x' + arguments[0].substr(0, 8)),
-            this.machine = Number('0x' + arguments[0].substr(8, 6)),
-            this.pid = Number('0x' + arguments[0].substr(14, 4)),
-            this.increment = Number('0x' + arguments[0].substr(18, 6))
-        }
-        else if (arguments.length == 4 && arguments[0] != null) {
-            this.timestamp = arguments[0];
-            this.machine = arguments[1];
-            this.pid = arguments[2];
-            this.increment = arguments[3];
-        }
-        else {
-            this.timestamp = Math.floor(new Date().valueOf() / 1000);
-            this.machine = machine;
-            this.pid = pid;
-            this.increment = increment++;
-            if (increment > 0xffffff) {
-                increment = 0;
-            }
-        }
-    };
-    return ObjId;
-})();
-
-ObjectId.prototype.getDate = function () {
-    return new Date(this.timestamp * 1000);
-};
-
-ObjectId.prototype.toArray = function () {
-    var strOid = this.toString();
-    var array = [];
-    var i;
-    for(i = 0; i < 12; i++) {
-        array[i] = parseInt(strOid.slice(i*2, i*2+2), 16);
-    }
-    return array;
-};
-
-/**
-* Turns a WCF representation of a BSON ObjectId into a 24 character string representation.
-*/
-ObjectId.prototype.toString = function () {
-    if (this.timestamp === undefined
-        || this.machine === undefined
-        || this.pid === undefined
-        || this.increment === undefined) {
-        return 'Invalid ObjectId';
-    }
-
-    var timestamp = this.timestamp.toString(16);
-    var machine = this.machine.toString(16);
-    var pid = this.pid.toString(16);
-    var increment = this.increment.toString(16);
-    return '00000000'.substr(0, 8 - timestamp.length) + timestamp +
-           '000000'.substr(0, 6 - machine.length) + machine +
-           '0000'.substr(0, 4 - pid.length) + pid +
-           '000000'.substr(0, 6 - increment.length) + increment;
-};
-