Merge pull request #206 from LordTocs/dev

Eventsub Subscription Workarounds
LordTocs · Jul 19, 2024 · d934b71 · d934b71
2 parents 19b2b2c + 1e9cb7f
commit d934b71
Show file tree

Hide file tree

Showing 45 changed files with 344 additions and 150 deletions.
diff --git a/libs/castmate-core/src/index.ts b/libs/castmate-core/src/index.ts
@@ -49,3 +49,5 @@ export * from "./util/generic-login"
 export * from "./analytics/analytics-manager"
 
 export * from "./info/info-manager"
+
+export * from "./util/time-utils"
diff --git a/libs/castmate-core/src/plugins/plugin.ts b/libs/castmate-core/src/plugins/plugin.ts
@@ -40,6 +40,7 @@ import {
 import { ResourceBase, ResourceConstructor } from "../resources/resource"
 import { PluginManager } from "./plugin-manager"
 import { Logger, globalLogger, usePluginLogger } from "../logging/logging"
+import { startPerfTime } from "../util/time-utils"
 
 interface PluginSpec {
 	id: string
@@ -97,8 +98,15 @@ export function onUnload(unloadFunc: PluginCallback) {
 }
 
 export function definePluginResource(resourceConstructor: ResourceConstructor) {
+	const logger = usePluginLogger()
+
 	onLoad(async () => {
-		await resourceConstructor.initialize()
+		const perf = startPerfTime(`Initing ${resourceConstructor.storage.name}`)
+		try {
+			await resourceConstructor.initialize()
+		} finally {
+			perf.stop(logger)
+		}
 	})
 
 	onUnload(async () => {

diff --git a/libs/castmate-core/src/util/time-utils.ts b/libs/castmate-core/src/util/time-utils.ts
@@ -0,0 +1,82 @@
+import { isPromise } from "util/types"
+import { Logger, usePluginLogger } from "../logging/logging"
+
+export interface PerfTimer {
+	name: string
+	startTime: number
+	stop(logger: Logger): void
+}
+
+export function startPerfTime(name: string): PerfTimer {
+	return {
+		name,
+		startTime: Date.now(),
+		stop(logger) {
+			logger.log("Completed ", name, (Date.now() - this.startTime) / 1000, "seconds")
+		},
+	}
+}
+
+export function measurePerf<This, T extends (this: This, ...args: any[]) => any>(
+	original: T,
+	context: ClassMethodDecoratorContext<T>
+) {
+	const logger = usePluginLogger("perf")
+
+	function replacement(this: This, ...args: Parameters<T>): ReturnType<T> {
+		const perf = startPerfTime(String(context.name))
+
+		let result: ReturnType<T>
+		try {
+			result = original.call(this, ...args)
+
+			if (isPromise(result)) {
+				//@ts-ignore Type system too stupid again.
+				return (async () => {
+					try {
+						return await result
+					} finally {
+						perf.stop(logger)
+					}
+				})()
+			} else {
+				perf.stop(logger)
+				return result
+			}
+		} catch (err) {
+			perf.stop(logger)
+			throw err
+		}
+	}
+
+	return replacement
+}
+
+export function measurePerfFunc<T extends (...args: any[]) => any>(func: T, name?: string) {
+	const logger = usePluginLogger("perf")
+	return (...args: Parameters<T>): ReturnType<T> => {
+		const perf = startPerfTime(name ?? func.name)
+
+		let result: ReturnType<T>
+		try {
+			result = func(...args)
+
+			if (isPromise(result)) {
+				//@ts-ignore Type system too stupid again.
+				return (async () => {
+					try {
+						return await result
+					} finally {
+						perf.stop(logger)
+					}
+				})()
+			} else {
+				perf.stop(logger)
+				return result
+			}
+		} catch (err) {
+			perf.stop(logger)
+			throw err
+		}
+	}
+}
diff --git a/libs/castmate-overlay-core/tsconfig.json b/libs/castmate-overlay-core/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/libs/castmate-overlay-macros/tsconfig.json b/libs/castmate-overlay-macros/tsconfig.json
@@ -6,7 +6,7 @@
 		"preserveConstEnums": true,
 		"outDir": "dist",
 		"sourceMap": true,
-		"target": "ES6",
+		"target": "ES2022",
 		"strictNullChecks": true,
 		"esModuleInterop": true
 	},

diff --git a/libs/castmate-overlay-widget-loader/tsconfig.json b/libs/castmate-overlay-widget-loader/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/libs/castmate-ui-core/tsconfig.json b/libs/castmate-ui-core/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/libs/castmate-vite/tsconfig.json b/libs/castmate-vite/tsconfig.json
@@ -2,7 +2,7 @@
 	"compilerOptions": {
 		"module": "ESNext",
 		"moduleResolution": "Node",
-		"target": "ES6",
+		"target": "ES2022",
 		"noImplicitAny": true,
 		"removeComments": true,
 		"preserveConstEnums": true,

diff --git a/libs/castmate-ws-rpc/tsconfig.json b/libs/castmate-ws-rpc/tsconfig.json
@@ -6,7 +6,7 @@
 		"preserveConstEnums": true,
 		"outDir": "dist",
 		"sourceMap": true,
-		"target": "ES6",
+		"target": "ES2022",
 		"strictNullChecks": true
 	},
 	"include": ["src/**/*"],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "castmate-monorepo",
-	"version": "0.5.1",
+	"version": "0.5.2-beta",
 	"description": "",
 	"private": true,
 	"type": "module",

diff --git a/packages/castmate-obs-overlay/tsconfig.json b/packages/castmate-obs-overlay/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/packages/castmate/package.json b/packages/castmate/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "castmate",
-	"version": "0.5.1",
+	"version": "0.5.2-beta",
 	"description": "CastMate",
 	"author": "LordTocs",
 	"scripts": {

diff --git a/packages/castmate/tsconfig.json b/packages/castmate/tsconfig.json
@@ -3,7 +3,7 @@
 		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugin-template/renderer/tsconfig.json b/plugin-template/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/discord/renderer/tsconfig.json b/plugins/discord/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/elgato/renderer/tsconfig.json b/plugins/elgato/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/govee/renderer/tsconfig.json b/plugins/govee/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/http/renderer/tsconfig.json b/plugins/http/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/input/renderer/tsconfig.json b/plugins/input/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/iot/renderer/tsconfig.json b/plugins/iot/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/lifx/renderer/tsconfig.json b/plugins/lifx/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/minecraft/renderer/tsconfig.json b/plugins/minecraft/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/obs/renderer/tsconfig.json b/plugins/obs/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/os/renderer/tsconfig.json b/plugins/os/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/overlays/overlay/tsconfig.json b/plugins/overlays/overlay/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/overlays/renderer/tsconfig.json b/plugins/overlays/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/philips-hue/renderer/tsconfig.json b/plugins/philips-hue/renderer/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */

diff --git a/plugins/random/overlay/tsconfig.json b/plugins/random/overlay/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"target": "ES2020",
+		"target": "ES2022",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,
 
 		/* Bundler mode */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,3 +49,5 @@ export * from "./util/generic-login"
		export * from "./analytics/analytics-manager"

		export * from "./info/info-manager"

		export * from "./util/time-utils"