feat: improve compatibility of URLs in Node (#72)

ascorbic · Jul 3, 2023 · b91f194 · b91f194
1 parent 94e19c3
commit b91f194
Show file tree

Hide file tree

Showing 20 changed files with 183 additions and 56 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,12 +2,12 @@
   "deno.enable": true,
   "deno.unstable": true,
   "deno.enablePaths": [
-    "src",
-    "scripts",
-    "mod.ts",
-    "deps.ts",
+    "./src",
+    "./scripts",
+    "./mod.ts",
+    "./deps.ts",
     "*/*.json",
-    "example"
+    "./example"
   ],
   "editor.formatOnSave": true,
   "[typescript]": {

diff --git a/deno.lock b/deno.lock
diff --git a/scripts/build_npm.ts b/scripts/build_npm.ts
@@ -1,4 +1,4 @@
-import { build, emptyDir } from "https://deno.land/x/dnt@0.22.0/mod.ts";
+import { build, emptyDir } from "https://deno.land/x/dnt@0.37.0/mod.ts";
 
 await emptyDir("./npm");
 
@@ -25,6 +25,12 @@ await build({
     bugs: {
       url: "https://github.com/ascorbic/unpic/issues",
     },
+    devDependencies: {
+      "@unpic/pixels": "latest",
+    },
+  },
+  mappings: {
+    "https://deno.land/x/get_pixels@1.0.0/mod.ts": "@unpic/pixels",
   },
 });
 

diff --git a/src/detect.ts b/src/detect.ts
@@ -2,6 +2,7 @@ import domains from "../data/domains.json" assert { type: "json" };
 import subdomains from "../data/subdomains.json" assert { type: "json" };
 import paths from "../data/paths.json" assert { type: "json" };
 import { ImageCdn } from "./types.ts";
+import { toUrl } from "./utils.ts";
 
 const cdnDomains = new Map(Object.entries(domains));
 const cdnSubdomains = Object.entries(subdomains);
@@ -18,7 +19,7 @@ export function getImageCdnForUrlByDomain(
   if (typeof url === "string" && !url.startsWith("https://")) {
     return false;
   }
-  const { hostname } = new URL(url);
+  const { hostname } = toUrl(url);
   if (cdnDomains.has(hostname)) {
     return cdnDomains.get(hostname) as ImageCdn;
   }
@@ -34,7 +35,7 @@ export function getImageCdnForUrlByPath(
   url: string | URL,
 ): ImageCdn | false {
   // Allow relative URLs
-  const { pathname } = new URL(url, "http://n");
+  const { pathname } = toUrl(url);
   for (const [prefix, cdn] of Object.entries(paths)) {
     if (pathname.startsWith(prefix)) {
       return cdn as ImageCdn;

diff --git a/src/transformers/builder.ts b/src/transformers/builder.ts
@@ -3,10 +3,11 @@ import {
   getNumericParam,
   setParamIfDefined,
   setParamIfUndefined,
+  toUrl,
 } from "../utils.ts";
 
 export const parse: UrlParser<{ fit?: string; quality?: number }> = (url) => {
-  const parsedUrl = new URL(url);
+  const parsedUrl = toUrl(url);
 
   const width = getNumericParam(parsedUrl, "width");
   const height = getNumericParam(parsedUrl, "height");
@@ -28,7 +29,7 @@ export const parse: UrlParser<{ fit?: string; quality?: number }> = (url) => {
 export const transform: UrlTransformer = (
   { url: originalUrl, width, height, format },
 ) => {
-  const url = new URL(originalUrl);
+  const url = toUrl(originalUrl);
   setParamIfDefined(url, "width", width, true, true);
   setParamIfDefined(url, "height", height, true, true);
   setParamIfDefined(url, "format", format);

diff --git a/src/transformers/bunny.ts b/src/transformers/bunny.ts
@@ -3,10 +3,11 @@ import {
   getNumericParam,
   setParamIfDefined,
   setParamIfUndefined,
+  toUrl,
 } from "../utils.ts";
 
 export const parse: UrlParser<{ fit?: string }> = (url) => {
-  const parsedUrl = new URL(url);
+  const parsedUrl = toUrl(url);
 
   const width = getNumericParam(parsedUrl, "width");
   const height = getNumericParam(parsedUrl, "height");
@@ -27,7 +28,7 @@ export const parse: UrlParser<{ fit?: string }> = (url) => {
 export const transform: UrlTransformer = (
   { url: originalUrl, width, height },
 ) => {
-  const url = new URL(originalUrl);
+  const url = toUrl(originalUrl);
   setParamIfDefined(url, "width", width, true, true);
   if (width && height) {
     setParamIfUndefined(url, "aspect_ratio", `${width}:${height}`);

diff --git a/src/transformers/cloudflare.ts b/src/transformers/cloudflare.ts
@@ -4,6 +4,7 @@ import {
   UrlParser,
   UrlTransformer,
 } from "../types.ts";
+import { toUrl } from "../utils.ts";
 
 const cloudflareRegex =
   /https?:\/\/(?<host>[^\/]+)\/cdn-cgi\/image\/(?<transformations>[^\/]+)\/(?<path>.*)$/g;
@@ -40,7 +41,7 @@ export interface CloudflareParams {
 export const parse: UrlParser<CloudflareParams> = (
   imageUrl,
 ) => {
-  const url = new URL(imageUrl);
+  const url = toUrl(imageUrl);
   const matches = [...url.toString().matchAll(cloudflareRegex)];
   if (!matches.length) {
     throw new Error("Invalid Cloudflare URL");