fix: file path not resolving in windows fix: inRequest not parsing connection header when multiple values exists (#28)

Author: eveffer

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@inspatial/cloud",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "license": "Apache-2.0",
   "exports": {
     ".": "./mod.ts",

src/orm/entry/entry-type.ts

@@ -15,6 +15,7 @@ import { raiseORMException } from "~/orm/orm-exception.ts";
 import convertString from "~/utils/convert-string.ts";
 import type { EntryPermission } from "~/orm/roles/entry-permissions.ts";
 import type { InField } from "@inspatial/cloud/types";
+import { getCallerPath } from "../../utils/path-utils.ts";
 
 /**
  * This class is used to define an Entry Type in the ORM.
@@ -54,20 +55,7 @@ export class EntryType<
     super(name, config);
 
     if (!rm) {
-      try {
-        const matchPattern = /^\s+at\s(.+)\/[\w-_\s\d]+.ts:\d+:\d+/;
-        const callingFunction = new Error().stack?.split("\n")[2];
-        const match = callingFunction?.match(matchPattern);
-        if (match) {
-          const dir = new URL(match[1]);
-          if (dir.protocol === "file:") {
-            this.dir = dir.pathname;
-          }
-        }
-      } catch (_e) {
-        console.log("Error while setting dir for EntryType:", _e);
-        // silently ignore
-      }
+      this.dir = getCallerPath();
     }
     this.sourceConfig = {
       ...config,

src/orm/settings/settings-type.ts

@@ -12,6 +12,7 @@ import type {
   SettingsPermission,
   SettingsRole,
 } from "../roles/settings-permissions.ts";
+import { getCallerPath, normalizePath } from "../../utils/path-utils.ts";
 
 /**
  * Defines a settings type for the ORM.
@@ -44,19 +45,7 @@ export class SettingsType<
   ) {
     super(name, config);
     if (!rm) {
-      try {
-        const matchPattern = /^\s+at\s(.+)\/[\w-_\s\d]+.ts:\d+:\d+/;
-        const callingFunction = new Error().stack?.split("\n")[2];
-        const match = callingFunction?.match(matchPattern);
-        if (match) {
-          const dir = new URL(match[1]);
-          if (dir.protocol === "file:") {
-            this.dir = dir.pathname;
-          }
-        }
-      } catch (_e) {
-        // silently ignore
-      }
+      this.dir = getCallerPath();
     }
     this.sourceConfig = {
       ...config,

src/serve/in-request.ts

@@ -163,7 +163,9 @@ export class InRequest<CTX extends Record<string, any> = Record<string, any>> {
     let upgrade = "";
     this.request.headers.forEach((value, key) => {
       if (key.toLowerCase() === "connection") {
-        connection = value.toLowerCase();
+        const connMatch = value.toLowerCase().match(/(upgrade)/);
+
+        connection = connMatch ? connMatch[1] : value.toLowerCase();
       }
       if (key.toLowerCase() === "upgrade") {
         upgrade = value.toLowerCase();

src/utils/path-utils.ts

@@ -22,11 +22,29 @@ export function normalizePath(path: string, options?: {
    */
   toDirname?: boolean;
 }): string {
-  path = path.replace("file:///", IS_UNIX ? "/" : "");
+  path = path.replace("/^file:\/\//", "");
   path = decodeURIComponent(path);
-  path = IS_WINDOWS ? path.replace(/\\/g, "/") : path;
+  path = IS_WINDOWS
+    ? path.replace(/\\/g, "/").replace(/^\/([A-Z]:)/, "$1")
+    : path;
   if (options?.toDirname) {
     path = path.replace(/\/[\w\s]*\.\w*$/, "");
   }
   return path;
 }
+
+/** Returns the folder path of the calling function where this `getCallerPath()` function is called.
+ * ONLY if the module is a local file url (`file:///...`)
+ */
+export function getCallerPath(): string | undefined {
+  const matchPattern = /(file:\/\/.+)\/[\w-_\s\d]+.ts:\d+:\d+/;
+  const callingFunction = new Error().stack?.split("\n")[3];
+  const match = callingFunction?.match(matchPattern);
+  if (match) {
+    const dir = new URL(match[1]);
+    if (dir.protocol === "file:") {
+      return normalizePath(dir.pathname);
+    }
+  }
+  return undefined;
+}