samanbayaka 0.0.3 → 0.0.8

package/bash/sbk.sh

@@ -7,5 +7,5 @@
 ##Configurations files path
 $export SBK_CONFIG_PATH="/usr/local/etc/your_folder"
 
-##web service port 8760-8769
+##web server port 8760-8769
 $export SBK_PORT=8765

package/commit-hash.mjs

@@ -0,0 +1 @@
+export const COMMIT_HASH = 'cbe6bca';

package/config/broker.mjs

@@ -4,7 +4,7 @@ export default Object.freeze({
   /**
    * Namespace of nodes to segment your nodes on the same network
    */
-  namespace: "prod",
+  namespace: "sbk",
 
   /**
    * Timeouts

package/gateway.mjs

@@ -1,14 +1,11 @@
 /*index.mjs*/
-import path from "path"
-import url from "url"
-
 import ApiGateway from "moleculer-web"
 import OpenApi from "moleculer-auto-openapi"
 import cookieParser from "cookie-parser"
 import helmet from "helmet"
 import compression from "compression"
 
-import {sbk} from "./index.mjs"
+import sbk from "./index.mjs"
 import {
   getConfig, 
   assetPath
@@ -18,7 +15,7 @@ import {formatApiGwErrors} from '#hUti/format-errors.mjs'
 const CONFIG = await getConfig('server')
 
 
-await sbk ('nats', {
+await sbk.msgBus({
   name: "gateway",
   mixins: [
     ApiGateway,

package/helper/utility/node-argv.mjs

@@ -22,7 +22,7 @@ export const serviceName = argv.find(el => /^[a-z0-9]+(-[a-z0-9]+)*$/i.test(el))
  */
 if (serviceName === undefined) {
   console.error("Error: Service name is missing.")
-  console.log("Please run one of the following commands:\n $node your_file.mjs <service_name> -h (for hot reloading)\n $node your_file.mjs <service_name> --hot (for hot reloading)\n or \n $node your_file.mjs <service_name>")
+  console.log("Please run the command:\n $NODE_ENV=<prod/test/dev> node index.mjs <service name>")
   process.exit(1)
 }
 

package/index.mjs

@@ -1,11 +1,7 @@
 /*index.mjs*/
-import path from "path"
-import url from "url"
-import fs from "fs"
-
 import { ServiceBroker } from "moleculer"
-import { execSync } from "child_process"
 
+import {COMMIT_HASH} from "./commit-hash.mjs"
 import {
   isReplEnabled, 
   isHotReloadEnabled, 
@@ -19,17 +15,11 @@ import {
 } from '#hFil/esm-loading.mjs'
 import AjvValidator from "#hVal/AjvValidator.mjs"
 
+
 const BROKER_CONFIG = await getConfig('broker')
 const NATS_CONFIG = await getConfig('nats')
 const LOGGER_CONFIG = await getConfig('logger')
 
-/**
- * Last git commit hash in short form
- */
-const gitCommitHs = execSync("git rev-parse --short HEAD")
-  .toString()
-  .trim()
-
 
 /**
  * Moleculer srvice broker configurations
@@ -38,9 +28,7 @@ const gitCommitHs = execSync("git rev-parse --short HEAD")
 const broker = new ServiceBroker({
   ...{
     ...BROKER_CONFIG,
-    ...{
-      namespace: `${BROKER_CONFIG.namespace}-${gitCommitHs}`
-    }
+    namespace: `sbk-${process.env.NODE_ENV}-${COMMIT_HASH}`
   },
   ...{
     nodeID: nodeUid,
@@ -52,35 +40,33 @@ const broker = new ServiceBroker({
 })
 
 
-// /**
-//  * Loads modules asynchronously
-//  */
-// await loadServices(broker)
+export default {
+  msgBus: async (schema) => {
 
+    if (serviceName != schema.name) {
+      await broker.stop()
+      broker.logger.error('❖ SBK', "Service name and configuration do not match.")
+      process.exit(0)
+      return
+    }
 
-// /**
-//  * Start broker with repl mode
-//  */
-// if(isReplEnabled){
-//   broker.start().then(() => broker.repl())
-// }
-// else{
-//   broker.start()
-// }
+    broker.createService(schema)
 
-export const sbk = async (sBus, schema)=>{
-  broker.createService(schema)
+    /**
+     * Start broker with repl mode
+     */
+    if(isReplEnabled){
+      broker.start().then(() => broker.repl())
+    }
+    else{
+      broker.start()
+    }
+
+  },
+  eventBus: {
 
-  /**
-   * Start broker with repl mode
-   */
-  if(isReplEnabled){
-    broker.start().then(() => broker.repl())
-  }
-  else{
-    broker.start()
   }
-} 
+}
 
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "samanbayaka",
-  "version": "0.0.3",
+  "version": "0.0.8",
   "description": "Moleculer Gateway service with kafka transporter",
   "homepage": "https://gitlab.com/dalal.suvendu/samanbayaka#readme",
   "bugs": {
@@ -22,7 +22,8 @@
   "main": "index.mjs",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node index.mjs service_name"
+    "start": "NODE_ENV=dev node index.mjs service_name",
+    "prepare": "[ -d .git ] && husky install || true"
   },
   "dependencies": {
     "ajv": "^8.18.0",
@@ -31,13 +32,16 @@
     "cookie-parser": "^1.4.7",
     "helmet": "^8.1.0",
     "kafkajs": "^2.2.4",
-    "moleculer": "^0.14.35",
+    "moleculer": "0.15.0",
     "moleculer-auto-openapi": "^1.1.7",
-    "moleculer-repl": "^0.7.4",
-    "moleculer-web": "^0.10.8",
+    "moleculer-repl": "^0.8.0",
+    "moleculer-web": "^0.11.0",
     "msgpack5": "^6.0.2",
     "nats": "^2.29.3",
     "pnpm": "^10.32.1",
     "swagger-stats": "^0.99.7"
+  },
+  "devDependencies": {
+    "husky": "^9.1.7"
   }
 }

package/.gitlab-ci.yml

@@ -1,33 +0,0 @@
-image: node:22
-
-stages:
-  - install
-  - publish
-
-cache:
-  paths:
-    - .pnpm-store
-
-before_script:
-  - npm install -g pnpm
-
-install:
-  stage: install
-  script:
-    # Install dependencies
-    - pnpm install --frozen-lockfile
-
-publish:
-  stage: publish
-  script:
-    # Authenticate to npm
-    - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
-
-    # Increase version in package.json
-    # - npm version patch --no-git-tag-version
-    
-    # Publish package
-    - npm publish --access public
-
-  only:
-    - main

package/pnpm-workspace.yaml

@@ -1,2 +0,0 @@
-onlyBuiltDependencies:
-  - es5-ext