corebasic 1.0.265 → 1.0.267

package/dist/libs/features.js

@@ -48,6 +48,21 @@ const getFeatureMethod = (api) => api.split(' ')[0].toLowerCase();
 const getFeatureUrl = (api) => { const url = api.split(' ')[1]; if (!url)
     throw new Error(`Invalid Feature url in api: ${api}`); return url; };
 const getFeature = (name) => features[name];
+function getLeaf(feature, req) {
+    if (feature)
+        return feature.split(/\.(query|command)\./)[0];
+    if (req) {
+        for (let key in features) {
+            const feature = features[key];
+            if (feature.featureless && feature.api === req.method.toUpperCase() + ' ' + req.path)
+                return key.split(/\.(query|command)\./)[0];
+        }
+        return "NOLEAF"; // This code will never be reached as apiHandler()'s prior code ensures req is valid and there exists a feature. Included to silence ./tsc
+    }
+    else {
+        return "NOLEAF"; // This code will never be reached as apiHandler()'s prior code ensures req is valid and there exists a feature. Included to silence ./tsc
+    }
+}
 const DEPLOY_TOKEN_SECRET = process.env.DEPLOY_TOKEN_SECRET || "MY_SECRET_DEPLOY_TOKEN";
 const SERVICE_ACCESS_TOKEN = jwt.sign({ app: process.env.APP_DEPLOYMENT_NAME }, DEPLOY_TOKEN_SECRET, { expiresIn: '365d' });
 const NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN = await (async () => { if (process.env.NDCURVE_DEVELOPER_SERVICE)
@@ -81,8 +96,8 @@ let SERVICE_ADDRESS = process.env.APP_ENDPOINT || 'http://127.0.0.1:3000';
 export const get = (feature) => {
     const throwError = () => { throw new Error(`Feature ${feature} not found in internal or external list during Features.subscribe call`); };
     const baseFeature = getFeature(feature);
-    let { api, service = SERVICE_ADDRESS, topic } = baseFeature ? baseFeature : (SLYP_FEATURES_LIST[feature] ?? throwError());
-    return { api, service, topic };
+    let { api, service = SERVICE_ADDRESS } = baseFeature ? baseFeature : (SLYP_FEATURES_LIST[feature] ?? throwError());
+    return { api, service };
 };
 export const send = async (meta, feature, data, params) => {
     const throwError = () => { throw new Error(`Feature ${feature} not found in internal or external list during inter feature call`); };
@@ -134,7 +149,7 @@ let appids = {};
 async function announce() {
     let exp_features = {};
     for (let [key, { api, subscribe }] of Object.entries(features))
-        exp_features[key] = { api, service: SERVICE_ADDRESS, subscribe, topic: "" };
+        exp_features[key] = { api, service: SERVICE_ADDRESS, subscribe };
     await Messaging.subscribe(`${process.env.REDIS_CHANNEL_PREFIX}_SLYP_FEATURES_LIST`, async (message, _channel) => {
         let { uid, ...msg } = JSON.parse(message);
         if (uid !== appId && !appids[uid]) {
@@ -172,11 +187,12 @@ const apiHandler = async (req, res) => {
             throw { status: 404, message: `Resource not found. Feature ${req.body.feature} not available.` };
         }
         feature = feature; // typescript validation with !
+        const leaf = getLeaf(req.body.feature, req);
         let params = getFeatureUrl(feature.api).split("/").filter((item) => item.startsWith(":")).map((item) => item.replace(":", ""));
         for (let param of params)
             if (!req.params[param])
                 throw { status: 404, message: "Resource not found. One or more url parameter not specified." };
-        let meta = { ...req.body, data: undefined, topic: feature.topic, date: new Date().getTime() }; // TODO: Must also include invoiceTxn
+        let meta = { ...req.body, data: undefined, topic: leaf, date: new Date().getTime() }; // TODO: Must also include invoiceTxn
         if (process.env.USE_DEFAULT_COMPANY) {
             meta.company = 'DEFAULT_COMPANY';
             meta.outlet = 'DEFAULT_OUTLET';
@@ -318,7 +334,7 @@ export const start = async (app, url, file) => {
     app.get('/features', async (_req, res) => {
         let exp_features = {};
         for (let [key, { api }] of Object.entries(features))
-            exp_features[key] = { api, service: `${SERVICE_ADDRESS}`, subscribe: '', topic: '' };
+            exp_features[key] = { api, service: `${SERVICE_ADDRESS}`, subscribe: '' };
         if (process.env.LOAD_LOCAL_FEATURES) {
             for (let key in SLYP_FEATURES_LIST)
                 SLYP_FEATURES_LIST[key].headers = { JWT: SERVICE_ACCESS_TOKEN, service: true, NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN }; // TODO: CRITICAL: Security issue
@@ -328,12 +344,13 @@ export const start = async (app, url, file) => {
     // Registering features
     await registerFeatures(features);
     // Get unique kafka topics list from features
-    let kafkaTopics = [];
+    let kafkaTopics = new Set();
     for (const name in features) {
         let feature = features[name];
         if (feature.api.split(' ')[0]?.toLowerCase() === "get")
             continue;
-        kafkaTopics = [...new Set(kafkaTopics.concat([feature.topic]))];
+        const leaf = getLeaf(name);
+        kafkaTopics.add(leaf);
     }
     // Subscribe to each topic
     for (let topic of kafkaTopics) {
@@ -442,7 +459,7 @@ async function subscribe() {
         const publisherFeature = getFeature(publisher);
         if (subscribed_consumers[consumer] || !publisherFeature)
             continue;
-        let { topic } = publisherFeature;
+        let topic = getLeaf(publisher);
         let kafka_consumer_promise = Kafka.receive(`Features.${topic}`, consumer, async (topic, message) => {
             topic = topic.replace(/^.*Features./, '');
             const timer = (ms) => new Promise(res => setTimeout(res, ms)); // A promise that resolves after "ms" Milliseconds

package/libs/features.ts

@@ -141,11 +141,10 @@ type RemoteFeatureEntry = {
     api: string
     service: string
     subscribe: string
-    topic: string
     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, keyof Schema>, opt?: string[], mut?: string[] }
+type FeatureEntry = { api: string, bypass: boolean, featureless: boolean, subscribe: string, handler: Handler<unknown, unknown, keyof Schema>, opt?: string[], mut?: string[] }
 
 
 let features: Record<string, FeatureEntry> = {}
@@ -157,6 +156,23 @@ const getFeatureMethod = (api: string): HttpMethod => api.split(' ')[0]!.toLower
 const getFeatureUrl = (api: string): string => { const url = api.split(' ')[1]; if (!url) throw new Error(`Invalid Feature url in api: ${api}`); return url}
 const getFeature = (name: string): FeatureEntry | undefined => features[name]
 
+function getLeaf(feature: string, req?: ExpressRequest): string {
+    if (feature)
+        return feature.split(/\.(query|command)\./)[0]!
+
+    if (req) {
+        for(let key in features) {
+            const feature = features[key]!
+            if (feature.featureless && feature.api === req.method.toUpperCase() + ' ' + req.path)
+                return key.split(/\.(query|command)\./)[0]!
+        }
+        return "NOLEAF" // This code will never be reached as apiHandler()'s prior code ensures req is valid and there exists a feature. Included to silence ./tsc
+    } else {
+        return "NOLEAF" // This code will never be reached as apiHandler()'s prior code ensures req is valid and there exists a feature. Included to silence ./tsc
+    }
+}
+
+
 const DEPLOY_TOKEN_SECRET = process.env.DEPLOY_TOKEN_SECRET || "MY_SECRET_DEPLOY_TOKEN"
 const SERVICE_ACCESS_TOKEN = jwt.sign({app: process.env.APP_DEPLOYMENT_NAME}, DEPLOY_TOKEN_SECRET, { expiresIn: '365d' });
 
@@ -189,8 +205,8 @@ let SERVICE_ADDRESS = process.env.APP_ENDPOINT || 'http://127.0.0.1:3000'
 export const get = (feature: string) => {
     const throwError = () => {throw new Error(`Feature ${feature} not found in internal or external list during Features.subscribe call`)}
     const baseFeature: FeatureEntry | undefined = getFeature(feature)
-    let {api, service = SERVICE_ADDRESS, topic} = baseFeature ? baseFeature as FeatureEntry & {service: string} : (SLYP_FEATURES_LIST[feature] ?? throwError())
-    return {api, service, topic}
+    let {api, service = SERVICE_ADDRESS} = baseFeature ? baseFeature as FeatureEntry & {service: string} : (SLYP_FEATURES_LIST[feature] ?? throwError())
+    return {api, service}
 }
 
 
@@ -251,7 +267,7 @@ let appids: Record<string, boolean> = {}
 async function announce() {
     let exp_features: Record<string, RemoteFeatureEntry> = {}
     for (let [key, {api,subscribe}] of Object.entries(features))
-        exp_features[key] = {api, service: SERVICE_ADDRESS, subscribe, topic: ""}
+        exp_features[key] = {api, service: SERVICE_ADDRESS, subscribe}
 
     await Messaging.subscribe(`${process.env.REDIS_CHANNEL_PREFIX}_SLYP_FEATURES_LIST`, async (message, _channel) => {
         let {uid, ...msg} = JSON.parse(message) as Record<string, RemoteFeatureEntry> & {uid: string}
@@ -297,12 +313,14 @@ const apiHandler = async (req: ExpressRequest, res: ExpressResponse) => {
 
         feature = feature! // typescript validation with !
 
+        const leaf = getLeaf(req.body.feature, req)
+
         let params = getFeatureUrl(feature.api).split("/").filter((item: string) => item.startsWith(":")).map((item: string) => item.replace(":", ""))
         for (let param of params)
             if (!req.params[param])
                 throw { status: 404, message: "Resource not found. One or more url parameter not specified." }
 
-        let meta = {...req.body, data: undefined, topic: feature.topic, date: new Date().getTime()} as FeatureMeta // TODO: Must also include invoiceTxn
+        let meta = {...req.body, data: undefined, topic: leaf, date: new Date().getTime()} as FeatureMeta // TODO: Must also include invoiceTxn
 
         if (process.env.USE_DEFAULT_COMPANY) {
             meta.company = 'DEFAULT_COMPANY'
@@ -457,7 +475,7 @@ export const start = async (app: ExpressApplication, url: URL, file: string) =>
     app.get('/features', async (_req: ExpressRequest, res: ExpressResponse) => {
         let exp_features: Record<string, RemoteFeatureEntry> = {}
         for (let [key, {api}] of Object.entries(features))
-            exp_features[key] = {api, service: `${SERVICE_ADDRESS}`, subscribe: '', topic: ''}
+            exp_features[key] = {api, service: `${SERVICE_ADDRESS}`, subscribe: ''}
         if (process.env.LOAD_LOCAL_FEATURES) {
             for (let key in SLYP_FEATURES_LIST)
                 SLYP_FEATURES_LIST[key]!.headers = {JWT: SERVICE_ACCESS_TOKEN, service: true, NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN}  // TODO: CRITICAL: Security issue
@@ -469,12 +487,13 @@ export const start = async (app: ExpressApplication, url: URL, file: string) =>
     await registerFeatures(features)
 
     // Get unique kafka topics list from features
-    let kafkaTopics: string[] = []
+    let kafkaTopics = new Set<string>()
     for (const name in features) {
         let feature = features[name]!
         if (feature.api.split(' ')[0]?.toLowerCase() === "get" )
             continue
-        kafkaTopics = [... new Set(kafkaTopics.concat([feature.topic]))]
+        const leaf = getLeaf(name)
+        kafkaTopics.add(leaf)
     }
 
     // Subscribe to each topic
@@ -587,7 +606,7 @@ async function subscribe() {
         if (subscribed_consumers[consumer] || !publisherFeature)
             continue
 
-        let {topic} = publisherFeature
+        let topic = getLeaf(publisher)
 
         let kafka_consumer_promise = Kafka.receive<FeatureMessage>(`Features.${topic}`, consumer, async (topic: string, message: FeatureMessage) => {
             topic = topic.replace(/^.*Features./,'')

package/package.json

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