diff options
Diffstat (limited to 'backend/decky_loader/plugin')
| -rw-r--r-- | backend/decky_loader/plugin/plugin.py | 6 | ||||
| -rw-r--r-- | backend/decky_loader/plugin/sandboxed_plugin.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/backend/decky_loader/plugin/plugin.py b/backend/decky_loader/plugin/plugin.py index 47d3d7b0..cad323f4 100644 --- a/backend/decky_loader/plugin/plugin.py +++ b/backend/decky_loader/plugin/plugin.py @@ -4,9 +4,9 @@ from logging import getLogger from os import path from multiprocessing import Process - from .sandboxed_plugin import SandboxedPlugin from .messages import MethodCallRequest, SocketMessageType +from ..enums import PluginLoadType from ..localplatform.localsocket import LocalSocket from typing import Any, Callable, Coroutine, Dict, List @@ -21,10 +21,14 @@ class PluginWrapper: self.version = None + self.load_type = PluginLoadType.LEGACY_EVAL_IIFE.value + json = load(open(path.join(plugin_path, plugin_directory, "plugin.json"), "r", encoding="utf-8")) if path.isfile(path.join(plugin_path, plugin_directory, "package.json")): package_json = load(open(path.join(plugin_path, plugin_directory, "package.json"), "r", encoding="utf-8")) self.version = package_json["version"] + if ("type" in package_json and package_json["type"] == "module"): + self.load_type = PluginLoadType.ESMODULE_V1.value self.name = json["name"] self.author = json["author"] diff --git a/backend/decky_loader/plugin/sandboxed_plugin.py b/backend/decky_loader/plugin/sandboxed_plugin.py index 3fd38e4f..b49dcf41 100644 --- a/backend/decky_loader/plugin/sandboxed_plugin.py +++ b/backend/decky_loader/plugin/sandboxed_plugin.py @@ -11,7 +11,7 @@ from asyncio import (get_event_loop, new_event_loop, from .messages import SocketResponseDict, SocketMessageType from ..localplatform.localsocket import LocalSocket from ..localplatform.localplatform import setgid, setuid, get_username, get_home_path -from ..customtypes import UserType +from ..enums import UserType from .. import helpers from typing import List, TypeVar, Type |
