@simitgroup/simpleapp-generator 1.6.6-q-alpha → 1.6.6-s-alpha

package/templates/nest/src/simpleapp/generate/commons/middlewares/tenant.middleware.ts.eta

@@ -13,6 +13,7 @@ import { Model } from 'mongoose';
 import { Permission } from '../../types/perm.type';
 import { User } from '../../types/user.type';
 import { Appintegration } from '../../types/appintegration.type';
+import { Webhook } from '../../types/Webhook.type';
 import { UserContext } from '../user.context';
 
 @Injectable()
@@ -27,6 +28,7 @@ export class TenantMiddleware implements NestMiddleware {
     @InjectModel('User') private readonly userModel: Model<User>,
     @InjectModel('Permission') private readonly permModel: Model<Permission>,
     @InjectModel('Appintegration') private readonly appModel: Model<Appintegration>,
+    @InjectModel('Webhook') private readonly webhookModel: Model<Webhook>,
   ) {}
 
   requireXOrg(baseurl: string): boolean {
@@ -53,7 +55,7 @@ export class TenantMiddleware implements NestMiddleware {
 
     if (req.baseUrl == '/graphql') {
       if (tokenStr) {
-        await user.setCurrentUserInfo(tokenStr, xOrg);
+        await user.setCurrentUserInfo(tokenStr, xOrg,this.webhookModel);
       }
       req['sessionuser'] = user;
       next();
@@ -88,7 +90,7 @@ export class TenantMiddleware implements NestMiddleware {
     }
 
     try {
-      await user.setCurrentUserInfo(tokenStr, xOrg);
+      await user.setCurrentUserInfo(tokenStr, xOrg,this.webhookModel);
       if (user.getId() == '' && this.requireXOrg(req.baseUrl)) {
         this.logger.log('Access deny for user:', req.baseUrl);
         return res.status(401).send('Access deny for user');

package/templates/nest/src/simpleapp/generate/commons/runwebhook.service.ts.eta

@@ -4,192 +4,167 @@
  * last change 2024-03-17
  * Author: Ks Tan
  */
-import {
-  BadRequestException,
-  Injectable,
-  InternalServerErrorException,
-  Logger,
-  NotFoundException,
-} from '@nestjs/common';
+import { BadRequestException, Injectable,Inject, InternalServerErrorException, Logger, NotFoundException } from '@nestjs/common';
 import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
 import { UserContext } from './user.context';
-import {
-  Webhook,
-  WebhookService,
-} from 'src/simpleapp/services/webhook.service';
+import { Webhook,Webhooklog } from '../types';
 import { alldocuments } from 'src/simpleapp/generate/commons/dicts/documents';
 
 @Injectable()
 export class RunWebhookService {
-  private webhookApiKey = process.env.WEBHOOK_SERVER_APIKEY;
-  private webhookAppId = process.env.WEBHOOK_SERVER_APP_ID;
-  private webhookurl = process.env.WEBHOOK_SERVER_URL;
-  private webhookprefix = process.env.PROJECT_CODE + '.';
-  private webhookeventurl = `${process.env.WEBHOOK_SERVER_URL}/event/`;
-  private webhookeventtypeurl = `${process.env.WEBHOOK_SERVER_URL}/event_types/`;
-  private webhooksync: boolean = process.env.WEBHOOKER_SYNC_EVENTTYPE == 'true';
-
-  public constructor(private webhookService: WebhookService) {
-    if (this.webhooksync) this.syncEventTypes();
+  @Inject(EventEmitter2)
+  protected eventEmitter: EventEmitter2;
+
+  protected logger = new Logger();
+  protected maxRetries = 5
+  public constructor() {}
+
+
+
+  /**
+   * trigger
+   */
+  async run(appuser: UserContext, documentName: string, actionName: string, data: any) {
+    return await this.runRealtimeWebHook(appuser,documentName,actionName,data)
   }
+  /**
+   * get/delete
+   * http://myendpoint.com/{orgid}/invoice/{documentid}/delete
+   * http://myendpoint.com/{orgid}/invoice/{documentid}?action=delete
+   * 
+   * post/put/patch
+   * http://myendpoint.com/{orgid}/invoice/{documentid}
+   * {json body}
+   */
+  async runRealtimeWebHook(appuser: UserContext, documentName: string, actionName: string, data: any) {
+    this.logger.debug(`Run webhook ${documentName}, ${actionName}`);
+    // console.log(`Run webhook ${documentName}, ${actionName}`);
+
+
+    const webhooks = appuser.getWebHooks().filter(wh=>
+      wh.resourceName==documentName && wh.eventType==actionName 
+      )
+    // console.log(webhooks);
+    
+    //same resource,actionName may have multiple webhook, run 1 by 1
+    for(let whNo=0;whNo<webhooks.length;whNo++){    
+
+      const webhook = webhooks[whNo]
+      const reqMethod = webhook.requestMethod
+      this.logger.verbose(webhook)
+      const headers = {};
+      
+      if (Array.isArray(webhook.headers)) {
+        webhook.headers.forEach((h) => {
+          h.value = h.value.replace('{{access_token}}',appuser.getUserToken())          
+          headers[h.name] = h.value;
+        });
+      }
+      headers['accept'] = 'application/json';
+      headers['content-type'] = 'application/json';
+      headers['x-org']=appuser.getXOrg()
+      headers['x-resource-name']=documentName
+      headers['x-action-name']=actionName
+
+      if(webhook.authentication=='basic')
+      headers['Authorization']= 'Basic ' + Buffer.from(webhook.basicAuth.user + ":" + webhook.basicAuth.password).toString('base64');
 
-  @OnEvent('webhook')
-  async loadWebhook(
-    appuser: UserContext,
-    documentName: string,
-    actionName: string,
-    data?: any,
-  ) {
-    //no webhook server implemented
-    if (!this.webhookApiKey) return true;
-
-    const filter = {
-      eventTypes: documentName + '.' + actionName,
-      active: true,
-    };
-    // console.log('Load webhook', documentName, actionName, filter);
-    const webhooks = await this.webhookService.search(appuser, filter);
-    // console.log('Loaded webhook', webhooks);
-    if (webhooks.length == 0) return;
-
-    for (let i = 0; i < webhooks.length; i++) {
-      const webhook = webhooks[i];
+      let tries = webhook.retryAttemps ?? 0
+      //first try need + 1
+      tries = tries+1
+      //hardcode max retries
+      if(tries > this.maxRetries) tries = this.maxRetries
+      const options:RequestInit = {
+        method: reqMethod.toUpperCase(),
+        headers: headers,
+
+      };
       try {
-        const res = await this.runWebHook(
-          appuser,
-          webhook,
-          documentName,
-          actionName,
-          data,
-        );
+        if(['POST','PUT','PATCH'].includes(options.method)){
+          options.body= this.prepareBody(webhook,data)
+        }
+
+
+
+        
+        while(tries>0){
+          tries--
+          console.log("Excute webhook id",webhook._id)
+          const req = await fetch(webhook.url, options);
+          const statusCode = req.status;        
+           
+
+          
+          if (statusCode >= 200 && statusCode <= 300) {
+            //success, continue next webhook
+            const msg = `webhook triggered successfully for ${documentName}:${actionName}. ${reqMethod} ${webhook.url}, try:${tries}, ${statusCode},${req.statusText}`
+            this.addLog(appuser,documentName,webhook,actionName,data,options,"success",statusCode,msg)          
+            break;
+          }else if(tries<=0 && webhook.jobType=='roll-back-when-failed'){          
+            //failed, trigger server error for roll back
+            const msg = `webhook faied, data roll back ${documentName}:${actionName}. ${reqMethod} ${webhook.url}, try:${tries}, ${statusCode},${req.statusText}`
+            this.addLog(appuser,documentName,webhook,actionName,data,options,'failed',statusCode,msg)          
+            throw new InternalServerErrorException(msg);
+          }else if(tries<=0 && webhook.jobType=='realtime'){
+            //failed, but no need to trigger server error/rollback
+            const msg = `webhook failed, ${documentName}:${actionName}. ${reqMethod} ${webhook.url}, try:${tries},  ${statusCode},${req.statusText}`
+            this.addLog(appuser,documentName,webhook,actionName,data,options,'failed',statusCode,msg)            
+          }else{
+            //failed, but still continue retry
+            const msg = `webhook ${documentName}:${actionName}. ${reqMethod} ${webhook.url}, try:${tries},  ${statusCode},${req.statusText}`
+            this.addLog(appuser,documentName,webhook,actionName,data,options,'warn',statusCode,msg)
+          }
+          
+        }
+
+        // const body = req.body;
       } catch (e) {
-        return e;
+        throw new InternalServerErrorException(e);
       }
+
     }
+
+    return true
   }
 
-  async runWebHook(
-    appuser: UserContext,
-    webhook: Webhook,
-    documentName: string,
-    actionName: string,
-    data: any,
-  ) {
-    const headers = {};
-
-    // console.log('Run webhook ', documentName, actionName);
-    if (Array.isArray(webhook.headers)) {
-      webhook.headers.forEach((h) => {
-        headers[h.name] = h.value;
-      });
-    }
-    headers['accept'] = 'application/json';
-    headers['content-type'] = 'application/json';
-    headers['Authorization'] = this.webhookApiKey;
-    const eventname = `${this.webhookprefix}${documentName}.${actionName}`;
-    const options = {
-      method: webhook.requestMethod.toUpperCase(),
-      headers: headers,
-      body: JSON.stringify({
-        labels: {
-          tenantId: appuser.getTenantId().toString(),
-        },
-        metadata: {
-          src: process.env.PROJECT_NAME,
-          user: appuser.getFullname(),
-        },
-        application_id: this.webhookAppId,
-        event_type: eventname,
-        event_id: crypto.randomUUID(),
-        occurred_at: new Date().toISOString(),
-        payload: JSON.stringify(data),
-        payload_content_type: 'application/json',
-      }),
-    };
-    try {
-      // console.log('webhook request ', this.webhookeventurl, options);
-      const req = await fetch(this.webhookeventurl, options);
-      const statusCode = req.status;
-      if (statusCode >= 300) {
-        throw new InternalServerErrorException(
-          `create event ${eventname} failed to webhook server`,
-        );
-      }
 
-      // const body = req.body;
-    } catch (e) {
-      return e;
+  addLog(appuser: UserContext, documentName: string, webhook:Webhook, actionName: string, data: any,options,status:string,statusCode:number,msg:string){
+
+
+    if(status=='warn'){
+      status="failed"
+      this.logger.warn(msg)
     }
-  }
+    else if(status=='success')
+      this.logger.debug(msg)
+    else 
+      this.logger.error (msg)
 
-  async syncEventTypes() {
-    const options = {
-      method: 'GET',
-      headers: {
-        accept: 'application/json',
-        Authorization: this.webhookApiKey,
-      },
-    };
-    //  {
-    //   "service_name": "billing",
-    //   "resource_type_name": "invoice",
-    //   "verb_name": "documentno",
-    //   "event_type_name": "billing.invoice.documentno"
-    // },
-    try {
-      const res = await fetch(
-        `${this.webhookeventtypeurl}?application_id=${this.webhookAppId}`,
-        options,
-      );
-
-      const locallist = this.getSchemaEventTypes();
-      const eventlist = (await res.json()).map((item) => item.event_type_name);
-
-      for (let i = 0; i < locallist.length; i++) {
-        const item = locallist[i];
-        if (!eventlist.includes(item)) {
-          //create remote event type
-          await this.createEventType(item);
-        }
-      }
-    } catch (e) {
-      throw new InternalServerErrorException(e);
+    let body = JSON.stringify(options,null,4)
+    
+    const whlog: Webhooklog = {
+      title: `${webhook.requestMethod} ${webhook.url}`,
+      resource: documentName,
+      actionName: actionName,
+      status: status,
+      statusCode: statusCode,
+      body:  body,
+      msg:msg
     }
-  }
 
-  async createEventType(eventname: string) {
-    const para = eventname.split('.');
-    const options = {
-      method: 'POST',
-      headers: {
-        accept: 'application/json',
-        'content-type': 'application/json',
-        Authorization: this.webhookApiKey,
-      },
-      body: JSON.stringify({
-        application_id: this.webhookAppId,
-        resource_type: para[0],
-        service: para[1],
-        verb: para[2],
-      }),
-    };
-
-    await fetch(this.webhookeventtypeurl, options);
-    // .then(response => response.json())
-    // .then(response => console.log(response))
-    // .catch(err => console.error(err));
-  }
-  getSchemaEventTypes() {
-    const alleventtypes: string[] = [];
-    alldocuments
-      .filter((item) => Array.isArray(item.webhook))
-      .forEach((item) => {
-        item.webhook.forEach((h) => {
-          alleventtypes.push(
-            `${this.webhookprefix}${item.docName.toLowerCase()}.${h}`,
-          );
-        });
-      });
-    return alleventtypes;
+    this.eventEmitter.emit('webhooklog.add', appuser,whlog);
   }
+  prepareBody(webhook:Webhook,data:any){
+    const cleandata = JSON.parse(JSON.stringify(data))
+
+    if(webhook.body?.trim()=='*'){
+      return JSON.stringify(cleandata)
+    }
+    const parse = require('json-templates');    
+    const template = parse(webhook.body);    
+    const x:BodyInit =template(cleandata)
+    // this.logger.log(x)    
+    return JSON.parse(JSON.stringify(x))
+  }  
+  
 }

package/templates/nest/src/simpleapp/generate/commons/user.context.ts.eta

@@ -6,15 +6,18 @@
  * 2.
  */
 import Base64URL from '@darkwolf/base64url';
+import { InjectModel } from '@nestjs/mongoose';
 import { BadRequestException, ForbiddenException, Injectable, Logger, Scope } from '@nestjs/common';
 import * as jwt from 'jsonwebtoken';
 import { ClientSession, Model, PipelineStage } from 'mongoose';
-import { Branch, Organization, Permission, Tenant, TenantClientSetting, User, Appintegration } from 'src/simpleapp/generate/types';
+import { Branch, Organization, Permission, Tenant, TenantClientSetting, User, Appintegration, Webhook } from 'src/simpleapp/generate/types';
 import { ProfileUserBranch, ProfileUserInvites } from '../../profile/profile.types';
 import { ModifiedRecords } from '../types';
 import { Role } from './roles/roles.enum';
+import systemWebHooks from '../../webhooks';
 import * as rolegroups from './roles/roles.group';
 
+
 @Injectable({ scope: Scope.REQUEST })
 export class UserContext {
   protected sessionId: string = crypto.randomUUID();
@@ -89,6 +92,7 @@ export class UserContext {
 
   protected package: string = '';
 
+  protected webhooks: Webhook[] = systemWebHooks
   protected clientSetting: TenantClientSetting = {
     auditTrail: false,
     support: false,
@@ -97,7 +101,7 @@ export class UserContext {
   };
 
   private dbsession: ClientSession;
-
+  
   protected modifiedRecords: ModifiedRecords = {
     createds: {},
     updateds: {},
@@ -110,7 +114,7 @@ export class UserContext {
   } = { simbiz6: false, einvoice: false };
 
   constructor(
-    private readonly userModel: Model<User>,
+    private readonly userModel: Model<User>,    
     private readonly permModel: Model<Permission>,
     private readonly appModel: Model<Appintegration>,
   ) {}
@@ -202,9 +206,14 @@ export class UserContext {
     return data;
   };
 
-  setCurrentUserInfo = async (tokenstr: string, xOrg: string) => {
+  
+  setCurrentUserInfo = async (tokenstr: string, xOrg: string,webhookModel:Model<Webhook>) => {
     this.setXOrg(xOrg);
-    await this.setUserToken(tokenstr);
+    await this.setUserToken(tokenstr);   
+    const wh = await webhookModel.find({branchId:this.getBranchId(),active:true})
+
+    if(Array.isArray(wh) && wh.length>0)
+      this.webhooks = this.webhooks.concat(wh)
   };
 
   /**
@@ -258,6 +267,7 @@ export class UserContext {
               as: 'currentTenant',
             },
           },
+          
           {
             $unwind: '$currentTenant',
           },
@@ -391,7 +401,8 @@ export class UserContext {
       orgId: this.orgId,
     };
   };
-
+  getWebHooks = ()=> this.webhooks
+  
   getWorkflowTaskFilter() {
     return {
       'data.tenantId': this.tenantId,
@@ -720,7 +731,6 @@ export class UserContext {
     return results;
   }
 
-
   setAsStaticUser = (uid: string, uname: string, name: string, email: string, xorg: string) => {
     // Define token info
     this.token = '';
@@ -757,13 +767,12 @@ export class UserContext {
     const appintegration = await this.appModel.aggregate(extension);
     if (appintegration && appintegration.length > 0) {
       appintegration.forEach((item) => {
-      if (item.appId === 'simbiz6') this.appintegration.simbiz6 = true;
-      if (item.appId === 'einvoice') this.appintegration.einvoice = true;
-    });
+        if (item.appId === 'simbiz6') this.appintegration.simbiz6 = true;
+        if (item.appId === 'einvoice') this.appintegration.einvoice = true;
+      });
+    }
+    return this.appintegration;
   }
-  return this.appintegration;
-
-}
   /**
    * Define additional properties from user into moreProps
    */

package/templates/nest/src/simpleapp/generate/processors/simpleapp.processor.ts.eta

@@ -35,6 +35,7 @@ import { UserContext } from '../commons/user.context';
 import { CloudApiService } from 'src/cloudapi/cloudapi.service';
 import { PrintApiService } from 'src/printapi/printapi.service';
 import { DocNumberFormatGenerator } from '../commons/docnogenerator.service';
+import { RunWebhookService } from '../commons/runwebhook.service';
 import {
   IsolationType,
   DefaultHooks,
@@ -54,6 +55,8 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
   protected cloudapi: CloudApiService;
   @Inject(PrintApiService)
   protected printapi: PrintApiService;
+  @Inject(RunWebhookService)
+  protected runWebHook:RunWebhookService;
   protected hooks: DefaultHooks<T> = {};
   protected logger = new Logger();
   protected strictIsolation = true;
@@ -490,7 +493,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
         try {
           if (this.hooks.afterCreate)
             await this.hooks.afterCreate(appuser, result);
-          this.callWebhook(appuser, 'create', result);
+          await this.callWebhook(appuser, 'create', result);
 
           // return result as T;
         } catch (err) {
@@ -608,7 +611,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
 
     try {
       if (this.hooks.afterCreate) await this.hooks.afterCreate(appuser, result);
-      this.callWebhook(appuser, 'create', result);
+      await this.callWebhook(appuser, 'create', result);
       return result as T;
     } catch (err) {
       throw new InternalServerErrorException(
@@ -690,7 +693,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
 
     try {
       if (this.hooks.afterCreate) await this.hooks.afterCreate(appuser, result);
-      this.callWebhook(appuser, 'create', result);
+      await this.callWebhook(appuser, 'create', result);
       return result as T;
     } catch (err) {
       throw new InternalServerErrorException(
@@ -863,7 +866,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
         if (this.hooks.afterDelete)
           await this.hooks.afterDelete(appuser, deleteresult, id);
         //this.doc.findByIdAndDelete(id);
-        this.callWebhook(appuser, 'delete', deletedata);
+        await this.callWebhook(appuser, 'delete', deletedata);
         return deleteresult;
       } else {
         this.logger.debug('reject query', dependency);
@@ -956,7 +959,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
       appuser.addUpdatedRecordId(this.documentName, data._id);
       if (this.hooks.afterUpdate)
         await this.hooks.afterUpdate(appuser, id, existingdata, result);
-      this.callWebhook(appuser, 'update', result);
+      await this.callWebhook(appuser, 'update', result);
       return result; // await this.findById(appuser, id);
     } catch (err) {
       this.logger.error(err);
@@ -1033,7 +1036,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
       appuser.addUpdatedRecordId(this.documentName, data._id);
       if (this.hooks.afterUpdate)
         await this.hooks.afterUpdate(appuser, id, existingdata, result);
-      this.callWebhook(appuser, 'update', result);
+      await this.callWebhook(appuser, 'update', result);
       return result; // await this.findById(appuser, id);
     } catch (err) {
       this.logger.error(err);
@@ -1102,7 +1105,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
 
       if (this.hooks.afterUpdate)
         await this.hooks.afterUpdate(appuser, id, existingdata, result);
-      this.callWebhook(appuser, 'update', result);
+      await this.callWebhook(appuser, 'update', result);
       return result; //await this.findById(appuser, id);
     } catch (err) {
       throw new InternalServerErrorException(err.message);
@@ -1224,7 +1227,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
         data,
       );
 
-      this.callWebhook(appuser, docstatus, finaldata);
+      await this.callWebhook(appuser, docstatus, finaldata);
       return updateresult;
     }
   }
@@ -1482,13 +1485,16 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
     return pipelines;
   }
 
-  callWebhook(appuser: UserContext, actionName: string, data: any) {
-    this.eventEmitter.emit(
-      'webhook',
-      appuser,
-      this.documentName,
-      actionName,
-      data,
-    );
+
+  //only realtime webhook supported at this moment
+  async callWebhook(appuser: UserContext, actionName: string, data: any) {
+    try{
+      await this.runWebHook.run(appuser,this.documentName, actionName,data)
+    }
+    catch(e)
+    {
+      throw new InternalServerErrorException(e);
+    }
+    
   }
 }

package/templates/nest/src/simpleapp/webhooks/branch.ts._eta

@@ -0,0 +1,37 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * --remove-this-line-to-prevent-override--
+ * last change 2025-06-26
+ * Author: Ks Tan
+ */
+
+import { Webhook } from "../generate/types";
+const branch_hooks:Webhook[] = []
+
+ branch_hooks.push({
+  "_id": "branch.update",
+  "title": "branch_update",
+  "url": "https://localhost:8080",
+  "requestMethod": "post",
+  "authentication": "none",
+  "description": "aa",
+  "body": '{ "id":"{{_id}}", "code":"{{branchCode}}","name":"{{branchName}}" }',
+  "active": false,
+  "resourceName": "branch",
+  "eventType": "update",
+  "jobType": "realtime",
+  "retryAttemps": 2,
+  "basicAuth": {
+    "user": "",
+    "password": ""
+  },
+  "headers": [
+    {
+      "name": "token",
+      "value": "{{access_token}}"
+    }
+  ]
+}) 
+
+
+export default branch_hooks

package/templates/nest/src/simpleapp/webhooks/index.ts._eta

@@ -0,0 +1,21 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * --remove-this-line-to-prevent-override--
+ * last change 2025-06-26
+ * Author: Ks Tan
+ */
+
+import { Webhook } from "../generate/types";
+import branch_hooks from './branch'
+
+const systemWebHooks:Webhook[] = []
+function addMore(hooks:Webhook[]){
+    hooks.forEach(h=>{
+        if(h.active) systemWebHooks.push(h)    
+    })    
+}
+
+addMore(branch_hooks)
+
+
+export default systemWebHooks