corebasic 1.0.238 → 1.0.240

package/dist/libs/features.js

@@ -93,7 +93,7 @@ export const send = async (meta, feature, data, params) => {
             writableEnded: false,
         };
         await apiHandler(req, res);
-        return response;
+        return response; // tsc already checked that the feature returned proper types at the handler site. Cast here due to ts limitations. So no guarantees lost.
     }
     // Workaround: https://stackoverflow.com/questions/72343387/axios-not-sending-headers-request-failing-getting-401-error
     return (await axios({
@@ -102,7 +102,7 @@ export const send = async (meta, feature, data, params) => {
         headers: { jwt: SERVICE_ACCESS_TOKEN, service: true, NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN },
         data: payload,
         timeout: 30000 // 30 secs
-    })).data;
+    })).data; // tsc already checked that the feature returned proper types at the handler site. Cast here due to ts limitations. So no guarantees lost.;
 };
 let appids = {};
 async function announce() {

package/dist/libs/schemas.js

@@ -9,11 +9,29 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 import { readdir } from "node:fs/promises";
 import * as Utils from './utils.js';
 const SCHEMAS_DIR = `${Utils.PROJECT_ROOT_PATH}/schemas`;
+const TYPES_DIR = `${Utils.PROJECT_ROOT_PATH}/types`;
+const REMOTES_DIR = `${Utils.PROJECT_ROOT_PATH}/types/remotes`;
 const g_this = globalThis;
 g_this.Schemas ??= {};
-for (const file of await readdir(SCHEMAS_DIR)) {
-    if (file.endsWith(".ts") && file !== "index.ts") {
-        const schema = await import(__rewriteRelativeImportExtension(`${SCHEMAS_DIR}/${file}`));
-        Object.assign(g_this.Schemas, schema.Schemas);
+g_this.Types ??= { Remotes: {} };
+async function load(path) {
+    let files;
+    try {
+        files = await readdir(path);
+    }
+    catch {
+        files = [];
+    }
+    for (const file of files) {
+        if (file.endsWith(".ts")) {
+            const imported = await import(__rewriteRelativeImportExtension(`${path}/${file}`));
+            Object.assign(g_this.Schemas, imported?.Schemas ?? {});
+            const { Remotes: remotes, ...types } = imported?.Types ?? {};
+            Object.assign(g_this.Types, types ?? {});
+            Object.assign(g_this.Types.Remotes, remotes ?? {});
+        }
     }
 }
+await load(SCHEMAS_DIR);
+await load(TYPES_DIR);
+await load(REMOTES_DIR);

package/dist/libs/session.js

@@ -20,7 +20,8 @@ export const start = (expressApp, allowedUrls) => {
             return next();
         const checkPrivilege = async (req) => {
             const staff = Utils.isEmpty(req.body.staff) ? 'BLANK_STAFF' : req.body.staff;
-            const granted = (await Features.send({ company: req.body.company, outlet: req.body.outlet, app: req.body.app }, "privileges.query.check", { feature: req.body.feature }, { id: staff })).data.granted;
+            const response = (await Features.send({ company: req.body.company, outlet: req.body.outlet, app: req.body.app }, "privileges.query.check", { feature: req.body.feature }, { id: staff }));
+            const granted = response.data.granted;
             if (!granted)
                 throw { message: "Access Denied" };
             return granted;

package/libs/elabase.ts

@@ -619,9 +619,9 @@ function execute(arg: DipRequest) {
 
             result.getSliceAsText = (offset: number, length: number): string => Cpp.getSliceAsText(result.data, offset, length)
             result.getSliceAsArrayBuffer = (offset: number, length: number): Buffer => Cpp.getSliceAsArrayBuffer(result.data, offset, length)
-            result["Content-Type"] = result.headers["content-type"]
+            result["Content-Type"] = result.headers["content-type"] as string
             result.body = result.data
-            if (result.headers["content-type"].includes("application/json"))
+            if ((result.headers["content-type"] as string).includes("application/json"))
                 result.body = JSON.parse(result.data)
 
             let parsed = parseBinaryResponse(result)

package/libs/features.ts

@@ -26,7 +26,7 @@ type FeatureMeta = {
     txn: string,
     // invoiceTxn?: string // TODO: Must also include invoiceTxn
 }
-type FeatureParams = Record<string, string>
+export type FeatureParams = Record<string, string>
 type FeatureMessage = {
     meta: FeatureMeta
     data: unknown
@@ -151,7 +151,17 @@ export const get = (feature: string) => {
     return {api, service, topic}
 }
 
-export const send = async (meta: Partial<FeatureMeta>, feature: string, data?: unknown, params?: FeatureParams) => {
+declare global {
+    type Handler<I, O> = (input: I) => 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;
+    }
+}
+
+export const send = async <K extends keyof FeatureTypes> (meta: Partial<FeatureMeta>, feature: K, data?: Parameters<FeatureTypes[K]>[0], 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`)}
     const baseFeature: FeatureEntry | undefined = getFeature(feature)
     let {api, service = SERVICE_ADDRESS} = baseFeature ? baseFeature as FeatureEntry & {service: string} : (SLYP_FEATURES_LIST[feature] ?? throwError())
@@ -189,7 +199,7 @@ export const send = async (meta: Partial<FeatureMeta>, feature: string, data?: u
             writableEnded: false,
         }
         await apiHandler(req, res);
-        return response
+        return response as Awaited<ReturnType<FeatureTypes[K]>> // tsc already checked that the feature returned proper types at the handler site. Cast here due to ts limitations. So no guarantees lost.
     }
     // Workaround: https://stackoverflow.com/questions/72343387/axios-not-sending-headers-request-failing-getting-401-error
     return (await axios({
@@ -198,7 +208,7 @@ export const send = async (meta: Partial<FeatureMeta>, feature: string, data?: u
         headers: { jwt: SERVICE_ACCESS_TOKEN, service: true, NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN },
         data: payload,
         timeout: 30000 // 30 secs
-      })).data;
+      })).data as Awaited<ReturnType<FeatureTypes[K]>> // tsc already checked that the feature returned proper types at the handler site. Cast here due to ts limitations. So no guarantees lost.;
 }
 
 let appids: Record<string, boolean> = {}
@@ -524,7 +534,7 @@ async function subscribe() {
 
             while (true) {
                 try {
-                    await Features.send(message.meta, consumer, message.data, message.params)
+                    await Features.send(message.meta, consumer as keyof FeatureTypes, message.data as any, message.params as FeatureParams)
                     break
                 } catch {
                     console.warn(`Feature: ${consumer}, error in executing handler during Features.subscribe(topic: ${topic})`)

package/libs/schemas.ts

@@ -2,13 +2,35 @@ import { readdir } from "node:fs/promises"
 import * as Utils from './utils.ts'
 
 const SCHEMAS_DIR = `${Utils.PROJECT_ROOT_PATH}/schemas`
+const TYPES_DIR = `${Utils.PROJECT_ROOT_PATH}/types`
+const REMOTES_DIR = `${Utils.PROJECT_ROOT_PATH}/types/remotes`
 
 const g_this: any = globalThis as any
 g_this.Schemas ??= {};
+g_this.Types ??= {Remotes: {}};
 
-for (const file of await readdir(SCHEMAS_DIR)) {
-    if (file.endsWith(".ts") && file !== "index.ts") {
-        const schema = await import(`${SCHEMAS_DIR}/${file}`)
-        Object.assign(g_this.Schemas, schema.Schemas)
+async function load(path: string) {
+    let files: string[]
+    try {
+        files = await readdir(path)
+    } catch {
+        files = []
+    }
+
+    for (const file of files) {
+        if (file.endsWith(".ts")) {
+            const imported = await import(`${path}/${file}`)
+            Object.assign(g_this.Schemas, imported?.Schemas ?? {})
+
+            const { Remotes: remotes, ...types } = imported?.Types ?? {};
+            Object.assign(g_this.Types, types ?? {})
+            Object.assign(g_this.Types.Remotes, remotes ?? {})
+        }
     }
 }
+
+
+await load(SCHEMAS_DIR)
+await load(TYPES_DIR)
+await load(REMOTES_DIR)
+

package/libs/session.ts

@@ -44,7 +44,9 @@ export const start = (expressApp: ExpressApp, allowedUrls: string[]) => {
 
         const checkPrivilege = async (req: Req) => {
             const staff = Utils.isEmpty(req.body.staff) ? 'BLANK_STAFF' : req.body.staff
-            const granted = (await Features.send({company: req.body.company, outlet: req.body.outlet, app: req.body.app}, "privileges.query.check", {feature: req.body.feature }, {id: staff})).data.granted
+            type PrivilegeResponse = {data: {granted: boolean}}
+            const response = (await Features.send({company: req.body.company, outlet: req.body.outlet, app: req.body.app}, "privileges.query.check" as keyof FeatureTypes, {feature: req.body.feature } as any, {id: staff} as Features.FeatureParams)) as PrivilegeResponse
+            const granted = response.data.granted
             if (!granted)
                 throw {message: "Access Denied"}
             return granted

package/package.json

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