Fixing docker container

.github/workflows/build.yaml

@@ -48,3 +48,13 @@ jobs:
           uses: ztimson/actions/tag@develop
           with:
             tag: ${{env.VERSION}}
+
+
+  docs:
+    name: Publish Documentation
+    needs: build
+    uses: ztimson/actions/.github/workflows/docker.yaml@develop
+    with:
+        name: ztimson/utils
+        repository: ${{github.server_url}}/${{github.repository}}.git
+        pass: ${{secrets.DEPLOY_TOKEN}}

Dockerfile

@@ -0,0 +1,13 @@
+# Build application
+FROM node:alpine as build
+
+RUN mkdir /app
+WORKDIR /app
+COPY . .
+RUN if [ ! -d "node_modules" ]; then npm i; fi && \
+    if [ ! -d "dist" ]; then npm run docs; fi
+
+# Use Nginx to serve
+FROM nginx:1.23-alpine
+
+COPY --from=build /app/docs /usr/share/nginx/html

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.16.5",
+	"version": "0.17.0",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
@@ -21,7 +21,7 @@
 	},
 	"scripts": {
 		"build": "npx tsc && npx vite build",
-		"docs": "typedoc --plugin typedoc-plugin-markdown --cleanOutputDir false --outputFileStrategy modules --hidePageHeader --out ./docs --entryPoints src/**/*.ts --readme none --entryFileName Home",
+		"docs": "typedoc --cleanOutputDir false --out ./docs --entryPoints src/**/*.ts --readme none",
 		"test": "npx jest",
 		"test:coverage": "npx jest --coverage",
 		"watch": "npx vite build --watch"
@@ -32,12 +32,14 @@
 		"jest-junit": "^16.0.0",
 		"ts-jest": "^29.1.2",
 		"typedoc": "^0.26.7",
-		"typedoc-plugin-markdown": "^4.2.7",
 		"typescript": "^5.3.3",
 		"vite": "^5.0.12",
 		"vite-plugin-dts": "^3.7.2"
 	},
 	"files": [
 		"dist"
-	]
+	],
+	"dependencies": {
+		"var-persist": "^1.0.1"
+	}
 }

src/cache.ts

@@ -1,9 +1,11 @@
 /**
  * Map of data which tracks whether it is a complete collection & offers optional expiry of cached values
  */
-export class Cache<K, T> {
-	private store: any = {};
+export class Cache<K extends string | number | symbol, T> {
+	private store = <Record<K, T>>{};
 
+	/** Support index lookups */
+	[key: string | number | symbol]: T | any;
 	/** Whether cache is complete */
 	complete = false;
 
@@ -13,21 +15,22 @@ export class Cache<K, T> {
 	 * @param {keyof T} key Default property to use as primary key
 	 * @param {number} ttl Default expiry in milliseconds
 	 */
-	constructor(public readonly key: keyof T, public ttl?: number) {
+	constructor(public readonly key?: keyof T, public ttl?: number) {
 		return new Proxy(this, {
 			get: (target: this, prop: string | symbol) => {
-				if(prop in target) return (<any>target)[prop];
-				return target.store[prop];
+				if (prop in target) return (target as any)[prop];
+				return target.store[prop as K];
 			},
-			set: (target: any, prop: string | symbol, value: T) => {
-				if(prop in target) target[prop] = value;
-				else target.store[prop] = value;
+			set: (target: this, prop: string | symbol, value: any) => {
+				if (prop in target) (target as any)[prop] = value;
+				else target.store[prop as K] = value;
 				return true;
 			}
 		});
 	}
 
 	private getKey(value: T): K {
+		if(!this.key) throw new Error('No key defined');
 		return <K>value[this.key];
 	}
 
@@ -83,6 +86,15 @@ export class Cache<K, T> {
 		return <[K, T][]>Object.entries(this.store);
 	}
 
+	/**
+	 * Get item from the cache
+	 * @param {K} key Key to lookup
+	 * @return {T} Cached item
+	 */
+	get(key: K): T {
+		return this.store[key];
+	}
+
 	/**
 	 * Get a list of cached keys
 	 *
@@ -92,6 +104,15 @@ export class Cache<K, T> {
 		return <K[]>Object.keys(this.store);
 	}
 
+	/**
+	 * Get map of cached items
+	 *
+	 * @return {Record<K, T>}
+	 */
+	map(): Record<K, T> {
+		return structuredClone(this.store);
+	}
+
 	/**
 	 * Add an item to the cache manually specifying the key
 	 *

src/emitter.ts

@@ -1,6 +1,10 @@
 export type Listener = (...args: any[]) => any;
 export type TypedEvents = {[k in string | symbol]: Listener} & {'*': (event: string, ...args: any[]) => any};
 
+export type NamespaceEvents<Namespace extends string, Events extends TypedEvents> = {
+	[K in keyof Events as `${Namespace}:${Extract<K, string>}`]: Events[K];
+};
+
 export class TypedEmitter<T extends TypedEvents = TypedEvents> {
 	private static listeners: {[key: string]: Listener[]} = {};
 

src/index.ts

@@ -6,6 +6,7 @@ export * from './files';
 export * from './emitter';
 export * from './errors';
 export * from './http';
+export * from './jwt';
 export * from './logger';
 export * from './math';
 export * from './misc';
@@ -14,3 +15,4 @@ export * from './promise-progress';
 export * from './string';
 export * from './time';
 export * from './types';
+export * from 'var-persist';

src/jwt.ts

@@ -0,0 +1,15 @@
+import {JSONAttemptParse} from './objects.ts';
+
+/**
+ * Decode a JWT payload, this will not check for tampering so be careful
+ *
+ * @param {string} token JWT to decode
+ * @return {unknown} JWT payload
+ */
+export function jwtDecode<T>(token: string): T {
+	const base64 = token.split('.')[1]
+		.replace(/-/g, '+').replace(/_/g, '/');
+	return <T>JSONAttemptParse(decodeURIComponent(atob(base64).split('').map(function(c) {
+		return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+	}).join('')));
+}