@cardsjd/device 0.1.13 → 0.1.15

package/lib/device.js

@@ -29,21 +29,39 @@ export default class Device {
 			window.close();
 		}
 	}
-    getDeviceID() {
-        var deviceId = null;
-        if (this.StorageAvailable('localStorage')) {
-            deviceId = localStorage.getItem('deviceId');
-            if (!deviceId) {
-                deviceId = Math.floor(Math.random() * Math.floor(1000000000000));
-                if (this.StorageAvailable('localStorage')) localStorage.deviceId = deviceId;
-            }
-        }
-        return deviceId;
-    }
+	getDeviceID() {
+		var deviceId = null;
+		if (this.storageAvailable('localStorage')) {
+			deviceId = localStorage.getItem('deviceId');
+			if (!deviceId) {
+				deviceId = Math.floor(Math.random() * Math.floor(1000000000000));
+				if (this.storageAvailable('localStorage')) localStorage.deviceId = deviceId;
+			}
+		}
+		return deviceId;
+	}
+	storageAvailable(type) {
+		try {
+			const storage = globalThis[type], x = '__storage_test__';
+			storage.setItem(x, x);
+			storage.removeItem(x);
+			return true;
+		} catch (e) {
+			return false;
+		}
+	}
 	/**
 	 * @returns {OSType}
 	 */
 	getOS() {
+		this.#staticWarn('getOS');
+		return Device.getOS();
+	}
+
+	/**
+	 * @returns {OSType}
+	 */
+	static getOS() {
 		const ua = navigator.userAgent;
 
 		if (/(MSAppHost\/3.0)/i.test(navigator.appVersion)) {
@@ -77,16 +95,29 @@ export default class Device {
 		return navigator.userAgent;
 	}
 
+	/** @typedef {'facebook' | 'windowsPhone' | 'windows' | 'amazon' | 'android' | 'ios' | 'steam' | 'windowsPWA' | 'web' | 'CrazyGames' | 'GameDistribution' | 'poki'} PlatformType */
+
 	/**
 	 * @returns {PlatformType}
 	 */
 	getPlatform() {
+		this.#staticWarn('getPlatform');
+		return Device.getPlatform();
+	}
 
+	/**
+	 * @returns {PlatformType}
+	 */
+	static getPlatform() {
 		//Get override information
 		const searchParams = new URLSearchParams(window.location.search);
 
 		//discord has a platform in its url and messes up detection //detect first
-		if (window.location.host.includes('discord') || (window.location.href.includes("localhost") && window.location.href.includes("frame_id"))) {
+		if (
+			window.location.host.includes('discord') ||
+			(window.location.href.includes('localhost') && window.location.href.includes('frame_id')) ||
+			globalThis.location?.ancestorOrigins?.[0]?.includes('discord')
+		) {
 			return 'discord';
 		}
 
@@ -100,14 +131,12 @@ export default class Device {
 			return 'facebook';
 		}
 
-		if (typeof globalThis.CrazyGames !== 'undefined') {
+		if (typeof globalThis.CrazyGames !== 'undefined' || globalThis.location?.ancestorOrigins?.[0]?.includes('crazygames')) {
 			return 'crazygames';
 		}
-		if (globalThis.location?.ancestorOrigins?.[0]?.includes("crazygames")) {
-			return 'crazygames';
-		}
-		if (globalThis.location?.ancestorOrigins?.[0]?.includes("discord")) {
-			return 'discord';
+
+		if (typeof globalThis.PokiSDK !== 'undefined' || globalThis.location?.ancestorOrigins?.[0]?.includes('poki')) {
+			return 'poki';
 		}
 
 		//native Cordova
@@ -153,6 +182,8 @@ export default class Device {
 		return 'web';
 	}
 
-	/** @typedef {'facebook' | 'windowsPhone' | 'windows' | 'amazon' | 'android' | 'ios' | 'steam' | 'windowsPWA' | 'web' | 'crazygames'} PlatformType */
+	#staticWarn(methodName) {
+		console.warn(`Please call the static method Device.${methodName}() instead`);
+	}
 
 }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@cardsjd/device",
 	"private": false,
-	"version": "0.1.13",
+	"version": "0.1.15",
 	"type": "module",
 	"main": "lib/index.js",
 	"files": [
@@ -11,10 +11,8 @@
 		"lint": "eslint lib --report-unused-disable-directives --max-warnings 0",
 		"lint:fix": "npm run lint -- --fix"
 	},
-	"dependencies": {
-		"@capacitor/core": "^6.0.0"
-	},
 	"peerDependencies": {
+		"@capacitor/core": ">=7 <9",
 		"@sagi.io/globalthis": "^0.0.2"
 	}
 }