scimgateway 5.1.1 → 5.1.2

package/.github/workflows/test-master.yml

@@ -11,15 +11,20 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
+    env:
+      FORCE_COLOR: "1"
+      TERM: "xterm-256color"
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Install Bun
-        run: |
-          curl -fsSL https://bun.sh/install | bash
-          echo "$HOME/.bun/bin" >> $GITHUB_PATH
+      # - name: Install Bun
+      #   run: |
+      #     curl -fsSL https://bun.sh/install | bash
+      #     echo "$HOME/.bun/bin" >> $GITHUB_PATH
+
+      - name: Set up Bun
+        uses: oven-sh/setup-bun@v2
 
       - name: Install dependencies
         run: bun install

package/.github/workflows/test-release.yml

@@ -8,15 +8,20 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
-
+    env:
+      FORCE_COLOR: "1"
+      TERM: "xterm-256color"
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Install Bun
-        run: |
-          curl -fsSL https://bun.sh/install | bash
-          echo "$HOME/.bun/bin" >> $GITHUB_PATH
+      # - name: Install Bun
+      #   run: |
+      #     curl -fsSL https://bun.sh/install | bash
+      #     echo "$HOME/.bun/bin" >> $GITHUB_PATH
+
+      - name: Set up Bun
+        uses: oven-sh/setup-bun@v2
 
       - name: Install dependencies
         run: bun install

package/README.md

@@ -1182,6 +1182,12 @@ MIT © [Jarle Elshaug](https://www.elshaug.xyz)
 
 ## Change log  
 
+### v5.1.2
+
+[Improved]
+
+- Simplified some initialization logic
+
 ### v5.1.1
 
 [Fixed]

package/lib/scimgateway.ts

@@ -13,7 +13,7 @@ import { createServer as httpsCreateServer } from 'node:https'
 import { type IncomingMessage, type ServerResponse } from 'node:http'
 import { createChecker } from 'is-in-subnet'
 import { BearerStrategy, type IBearerStrategyOptionWithRequest } from 'passport-azure-ad'
-import { fileURLToPath } from 'url'
+import { fileURLToPath } from 'node:url'
 import { Log } from './logger.ts'
 import passport from 'passport'
 import dot from 'dot-object'
@@ -307,43 +307,21 @@ export class ScimGateway {
   constructor() {
     const funcHandler: any = {}
     const startTime = utils.timestamp()
-
-    // need requester/plugin full path for setting pluginName and configDir
-    const originalStackTrace = new Error().stack
-    const stackLines = originalStackTrace ? originalStackTrace.split('\n') : ''
     let requester: string = ''
-    let callerLine = ''
-    for (let i = 0; i < stackLines.length; i++) {
-      if (stackLines[i].includes('new ScimGateway') && i < stackLines.length - 1) {
-        callerLine = stackLines[i + 1]
-        break
-      }
-    }
-    /*
-    const testCases = [ // Bun >= 1.1.43 and node.js
-      '    at C:\\xxx\\yyy\\scimgateway\\lib\\plugin-loki.ts:41:21',
-      '    at /xxx/yyy/scimgateway/lib/plugin-loki.ts:41:21',
-      '    at file:///C:/xxx/yyy/scimgateway/lib/plugin-loki.ts:41:21',
-    ];
-
-    const testCases = [ // Bun < v1.1.43;
-      '    at module code (C:\\xxx\\yyy\\scimgateway\\lib\\plugin-loki.ts:41:21)',
-      '    at module code (/xxx/yyy/scimgateway/lib/plugin-loki.ts:41:21)',
-    ];
-    */
-    if (callerLine) {
-      let match = callerLine.match(/at\s+(?:file:\/\/\/)?((?:[A-Za-z]:[\\/]|\/)[^:]+)/) // Bun >= v1.1.43 and node.js
-      if (match && match[1]) {
-        requester = match[1]
-      }
-      if (!requester) {
-        match = callerLine.match(/\((.+?):\d+:\d+\)/) // Bun < v1.1.43
-        if (match && match[1]) {
-          requester = match[1]
-        }
+    {
+      let _prepareStackTrace = Error.prepareStackTrace
+      Error.prepareStackTrace = (_, stack) => {
+        return stack.map((callSite) => {
+          return callSite.getFileName()
+        })
       }
+      const e = new Error()
+      requester = e.stack?.[1] || ''
+      try { // node.js using url-path win: file:///path - linux: file://path
+        requester = fileURLToPath(requester)
+      } catch (err) { void 0 }
+      Error.prepareStackTrace = _prepareStackTrace
     }
-
     let pluginName = path.basename(requester)
     pluginName = pluginName.substring(0, pluginName.lastIndexOf('.')) || pluginName
     let pluginDir = path.dirname(requester)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scimgateway",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "type": "module",
   "description": "Using SCIM protocol as a gateway for user provisioning to other endpoints",
   "author": "Jarle Elshaug <jarle.elshaug@gmail.com> (https://elshaug.xyz)",