server: catch/print startup errors to console and not just events tab

koush · Mar 27, 2023 · 2c23021 · 2c23021
1 parent 84a4ef4
commit 2c23021
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/python/plugin_remote.py b/server/python/plugin_remote.py
@@ -264,6 +264,14 @@ def print(self, nativeId: str, *values: object, sep: Optional[str] = ' ',
             nativeId, *values, sep=sep, end=end, flush=flush), self.loop)
 
     async def loadZip(self, packageJson, zipData, options: dict=None):
+        try:
+            return await self.loadZipWrapped(packageJson, zipData, options)
+        except:
+            print('plugin start/fork failed')
+            traceback.print_exc()
+            raise
+
+    async def loadZipWrapped(self, packageJson, zipData, options: dict=None):
         sdk = ScryptedStatic()
 
         clusterId = options['clusterId']
@@ -531,20 +539,10 @@ async def forkReadLoop():
                      self.deviceManager, self.mediaManager)
 
         if not forkMain:
-            try:
-                from main import create_scrypted_plugin  # type: ignore
-            except:
-                print('plugin failed to start')
-                traceback.print_exc()
-                raise
+            from main import create_scrypted_plugin  # type: ignore
             return await rpc.maybe_await(create_scrypted_plugin())
 
-        try:
-            from main import fork  # type: ignore
-        except:
-            print('fork failed to start')
-            traceback.print_exc()
-            raise
+        from main import fork  # type: ignore
         forked = await rpc.maybe_await(fork())
         if type(forked) == dict:
             forked[rpc.RpcPeer.PROPERTY_JSON_COPY_SERIALIZE_CHILDREN] = True

diff --git a/server/src/plugin/plugin-remote.ts b/server/src/plugin/plugin-remote.ts
@@ -645,7 +645,13 @@ export function attachPluginRemote(peer: RpcPeer, options?: PluginRemoteAttachOp
 
                 params.pluginRuntimeAPI = ret;
 
-                return options.onLoadZip(ret, params, packageJson, zipData, zipOptions);
+                try {
+                    return await options.onLoadZip(ret, params, packageJson, zipData, zipOptions);
+                }
+                catch (e) {
+                    console.error('plugin start/fork failed', e)
+                    throw e;
+                }
             },
         }