corebasic 1.0.254 → 1.0.256

package/dist/libs/auth.js

@@ -34,15 +34,24 @@ export const start = (app, successCallback) => {
         }
     });
 };
+const Apps = {
+    SlypBusiness: "SlypBusiness",
+    Slyp: "Slyp",
+    DipDive: "DipDive",
+    Craft: "Craft",
+    Portal: "Portal"
+};
 async function attemptLogin(req) {
     let meta = { company: "GLOBAL", outlet: "GLOBAL" };
+    let errMessage = { success: false, message: "Login Server Error" };
+    if (!req.body?.app || !Apps[req.body.app])
+        throw { ...errMessage, mode: 'verify', info: "Invalid app" };
     let expiry = 300000;
     let userMob = req.body.mob ?? req.body.phone ?? '';
     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" };
+    const collection = `${req.body.app}.auth.login`;
     let otpValid = Utils.isEmpty(req.body.otp) ? false : true;
     let clientId = req.body.clientId;
     if (Utils.isEmpty(clientId))

package/dist/libs/elabase.js

@@ -301,6 +301,7 @@ export const insert = async (meta, collection, value, options, extras) => {
     });
 };
 // Ported
+// export const query = async (meta: DipMeta, collection: string | string[], query: any, options?: any, extras?: any) => {
 export const query = async (meta, collection, query, options, extras) => {
     if (!(meta instanceof DipMeta))
         console.warn('Warn: Provided meta is not an instance of DipMeta in Dip.query()'); // TODO: throw error once review completes
@@ -328,7 +329,7 @@ export const query = async (meta, collection, query, options, extras) => {
         if (!batches[meta.batch])
             throw new Error('Error: Invalid batch in Dip.query()');
         batches[meta.batch].push(arg);
-        return;
+        return [];
     }
     return new Promise((resolve, _reject) => resolve())
         .then(() => execute(arg));

package/dist/libs/features.js

@@ -347,7 +347,7 @@ export const start = async (app, url, file) => {
         try {
             let items = await Dip.query(globalMeta, "Features.txns", { _id: req.params.id });
             if (items.length)
-                res.json({ data: { ...items[0], txn: items._id } });
+                res.json({ data: { ...items[0], txn: items[0]._id } });
             else
                 throw false;
         }

package/libs/auth.ts

@@ -74,16 +74,46 @@ export const start = (app: AuthApp, successCallback?: SuccessCallback) => {
     })
 }
 
+
+const Apps = {
+    SlypBusiness: "SlypBusiness",
+    Slyp: "Slyp",
+    DipDive: "DipDive",
+    Craft: "Craft",
+    Portal: "Portal"
+} as const;
+type Auth = {
+    app: string
+    // mob: string
+    // phone: string
+    // code: string
+    // otp: string
+    // clientId: string
+    _id: string
+    otp: string
+    clientId: string
+    time: number
+    userId?: string
+    loggedIn?: boolean
+}
+declare global {
+    interface Schema extends Record<`${keyof typeof Apps}.auth.login`, Auth> {}
+}
+
 async function attemptLogin(req: AuthRequest) {
     let meta = {company: "GLOBAL", outlet: "GLOBAL"}
+    let errMessage = {success: false, message: "Login Server Error"}
+
+    if (!req.body?.app || !Apps[req.body.app as keyof typeof Apps])
+        throw {...errMessage, mode: 'verify', info: "Invalid app"}
+
 
     let expiry = 300000
     let userMob = req.body.mob ?? req.body.phone ?? ''
     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"}
+    const collection = `${req.body.app}.auth.login` as `${keyof typeof Apps}.auth.login`;
     let otpValid = Utils.isEmpty(req.body.otp) ? false : true
     let clientId = req.body.clientId
     if (Utils.isEmpty(clientId))
@@ -93,7 +123,7 @@ async function attemptLogin(req: AuthRequest) {
         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, code}
+            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

package/libs/dip.ts

@@ -40,6 +40,11 @@ type IdempotentDip = {
     finish: () => Promise<unknown>
 }
 
+declare global {
+    interface Schema {
+        "txns": {_id: string}
+    }
+}
 
 export async function insertSync(meta: Elabase.DipMeta, feature: string, date: number, uid: string, ref: unknown, type: "REMOVE" | "UPSERT") {
     let stamp = new Date(date).toISOString()
@@ -71,7 +76,7 @@ export const IdempotentDip = (): IdempotentDip => {
         let token = { [state.txn]: true }
         let idempotent = { [state.txn]: { $exists: rollback ?? false } }
         let result = await Elabase.update(state.meta!, collection, {...query, ...idempotent}, {...data, $setOnInsert: undefined, $set: {...(data.$set ?? {}), ...token} })
-        return result.count ? true : (await Elabase.query(state.meta!, collection, {...query, ...idempotent})).length
+        return result.count ? true : (await Elabase.query(state.meta!, collection as keyof Schema, {...query, ...idempotent})).length
     }
 
     idip.upsert = async function (collection, query, data, rollback) {

package/libs/elabase.ts

@@ -437,7 +437,8 @@ export const insert = async (meta: DipMeta, collection: string | string[], value
 }
 
 // Ported
-export const query = async (meta: DipMeta, collection: string | string[], query: any, options?: any, extras?: any) => {
+// export const query = async (meta: DipMeta, collection: string | string[], query: any, options?: any, extras?: any) => {
+export const query = async<K extends keyof Schema> (meta: DipMeta, collection: K | K[], query: any, options?: any, extras?: any): Promise<Schema[K][]> => {
 
     if (!(meta instanceof DipMeta)) console.warn('Warn: Provided meta is not an instance of DipMeta in Dip.query()') // TODO: throw error once review completes
 
@@ -468,7 +469,7 @@ export const query = async (meta: DipMeta, collection: string | string[], query:
         if (!batches[meta.batch])
             throw new Error('Error: Invalid batch in Dip.query()')
         batches[meta.batch]!.push(arg)
-        return
+        return []
     }
     return new Promise<void>((resolve, _reject) => resolve())
     .then(() => execute(arg))

package/libs/features.ts

@@ -55,12 +55,12 @@ type FeatureMeta = {
     version: string,
     txn: string,
     // invoiceTxn?: string // TODO: Must also include invoiceTxn
-    topic: string,
+    topic: keyof Schema,
     date: number,
 }
 export type FeatureParams = Record<string, string>
-type FeatureMessage<I = unknown> = {
-    meta: FeatureMeta
+type FeatureMessage<I = unknown, T extends keyof Schema = keyof Schema> = {
+    meta: FeatureMeta & { topic: T }
     data: I
     params: FeatureParams
 
@@ -120,13 +120,17 @@ type ExpressApplication = { [Method in HttpMethod]: (path: string, handler: Expr
 // type Handler = Query | Command
 
 declare global {
-    type Handler<I, O> = (input: FeatureMessage<I>, req?: Req, res?: Res) => Promise<O>
+    type Handler<I, O, T extends keyof Schema> = (input: FeatureMessage<I, T>, req?: Req, res?: Res) => Promise<O>
 
     interface FeatureTypes {
         //     "privileges.query.check": Handler<{feature: string}, {data: {granted: boolean} }>
         //     "products.query.get": typeof import("./src/products/query.ts").get;
         //     "products.brands.query.get": typeof import("./src/products/brands/query.ts").get;
     }
+
+    interface Schema {
+        "Features.txns": {_id: string, status: "Queued" | "Processed"}
+    }
 }
 
 
@@ -138,7 +142,7 @@ type RemoteFeatureEntry = {
     headers?: {JWT?: string, service?: boolean, NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN?: string}
 }
 
-type FeatureEntry = { api: string, topic: string, bypass: boolean, featureless: boolean, subscribe: string, handler: Handler<unknown, unknown> }
+type FeatureEntry = { api: string, topic: string, bypass: boolean, featureless: boolean, subscribe: string, handler: Handler<unknown, unknown, keyof Schema> }
 
 
 let features: Record<string, FeatureEntry> = {}
@@ -187,7 +191,7 @@ export const get = (feature: string) => {
 }
 
 
-type HandlerInput<T> = T extends Handler<infer I, any> ? I : never
+type HandlerInput<T> = T extends Handler<infer I, any, keyof Schema> ? I : never
 
 export const send = async <K extends keyof FeatureTypes> (meta: Partial<FeatureMeta>, feature: K, data?: HandlerInput<FeatureTypes[K]>, params?: FeatureParams): Promise<Awaited<ReturnType<FeatureTypes[K]>>> => {
     const throwError = () => {throw new Error(`Feature ${feature} not found in internal or external list during inter feature call`)}
@@ -478,7 +482,7 @@ export const start = async (app: ExpressApplication, url: URL, file: string) =>
         try {
             let items = await Dip.query(globalMeta, "Features.txns", {_id: req.params!.id})
             if (items.length)
-                res.json({ data: { ...items[0], txn: items._id } })
+                res.json({ data: { ...items[0], txn: items[0]!._id } })
             else
                 throw false
         } catch {

package/package.json

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