@phosart/common 0.4.37 → 0.4.38

package/dist/server/artist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"artist.d.ts","sourceRoot":"","sources":["../../src/lib/server/artist.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAmB,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGxE,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC;AAEjE,wBAAsB,OAAO,yBAoB5B;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAetE"}
+{"version":3,"file":"artist.d.ts","sourceRoot":"","sources":["../../src/lib/server/artist.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAmB,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAKxE,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC;AAEjE,wBAAsB,OAAO,yBAoC5B;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAetE"}

package/dist/server/artist.js

@@ -3,9 +3,11 @@ import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import * as yaml from 'yaml';
 import { Artist } from "./models/Artist.js";
-import { cacheVersion, getCache } from "./util.js";
+import { cacheVersion, getCache, getLogLevel } from "./util.js";
 import { normalizeArtist } from "../util/art.js";
 import { galleries } from "./gallery.js";
+import { Logger } from 'tslog';
+const ArtistLog = new Logger({ minLevel: getLogLevel() });
 export async function artists() {
     const cached = getCache().artistCache;
     const nextVersion = await cacheVersion();
@@ -19,7 +21,21 @@ export async function artists() {
     catch {
         return {};
     }
-    await Promise.all(Object.values(artists).map((v) => Artist.parseAsync(v)));
+    (await Promise.all(Object.values(artists).map((v) => Artist.parseAsync(v)))).map((a) => ({
+        ...a,
+        links: Object.fromEntries(Object.entries(a.links).map(([k, v]) => {
+            if (!v.includes('://')) {
+                v = 'https://' + v;
+            }
+            try {
+                v = new URL(v).toString();
+            }
+            catch (e) {
+                ArtistLog.error(`Failed to process URL for artist @${k}:`, e);
+            }
+            return [k, v];
+        }))
+    }));
     getCache().artistCache.cache = artists;
     getCache().artistCache.version = nextVersion;
     return artists;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phosart/common",
-  "version": "0.4.37",
+  "version": "0.4.38",
   "files": [
     "dist",
     "!dist/**/*.test.*",

package/src/lib/server/artist.ts

@@ -4,9 +4,11 @@ import * as path from 'node:path';
 import * as yaml from 'yaml';
 import type { z } from 'zod';
 import { Artist } from './models/Artist.ts';
-import { cacheVersion, getCache } from './util.ts';
+import { cacheVersion, getCache, getLogLevel } from './util.ts';
 import { normalizeArtist, type NormalizedArtist } from '../util/art.ts';
 import { galleries } from './gallery.ts';
+import { Logger } from 'tslog';
+const ArtistLog = new Logger({ minLevel: getLogLevel() });
 
 export type ArtistCache = Record<string, z.infer<typeof Artist>>;
 
@@ -25,7 +27,23 @@ export async function artists() {
 		return {};
 	}
 
-	await Promise.all(Object.values(artists).map((v) => Artist.parseAsync(v)));
+	(await Promise.all(Object.values(artists).map((v) => Artist.parseAsync(v)))).map((a) => ({
+		...a,
+		links: Object.fromEntries(
+			Object.entries(a.links).map(([k, v]) => {
+				if (!v.includes('://')) {
+					v = 'https://' + v;
+				}
+
+				try {
+					v = new URL(v).toString();
+				} catch (e: unknown) {
+					ArtistLog.error(`Failed to process URL for artist @${k}:`, e);
+				}
+				return [k, v];
+			})
+		)
+	}));
 
 	getCache().artistCache.cache = artists;
 	getCache().artistCache.version = nextVersion;