From d0791d4557fc6163b4e1ceb33dafce9c4d9fe600 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 7 Dec 2021 18:51:54 -0800
Subject: [PATCH] server: add PYTHONPATH for sdk

---
 server/package-lock.json         | 4 ++--
 server/package.json              | 2 +-
 server/python/plugin-remote.py   | 3 ---
 server/src/plugin/plugin-host.ts | 4 +++-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/server/package-lock.json b/server/package-lock.json
index d143d9cfc..0d362f039 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/server",
-  "version": "0.0.93",
+  "version": "0.0.94",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrypted/server",
-      "version": "0.0.93",
+      "version": "0.0.94",
       "license": "ISC",
       "dependencies": {
         "@scrypted/sdk": "^0.0.128",
diff --git a/server/package.json b/server/package.json
index 908e54665..1d77c5dee 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/server",
-  "version": "0.0.93",
+  "version": "0.0.94",
   "description": "",
   "dependencies": {
     "@scrypted/sdk": "^0.0.128",
diff --git a/server/python/plugin-remote.py b/server/python/plugin-remote.py
index 1b36eb2ea..ebf73c3b7 100644
--- a/server/python/plugin-remote.py
+++ b/server/python/plugin-remote.py
@@ -22,9 +22,6 @@ from asyncio.streams import StreamReader, StreamWriter
 import os
 from os import sys
 from sys import stderr, stdout
-more = os.path.join(os.getcwd(), 'node_modules/@scrypted/sdk')
-sys.path.insert(0, more)
-
 
 class SystemDeviceState(TypedDict):
     lastEventTime: int
diff --git a/server/src/plugin/plugin-host.ts b/server/src/plugin/plugin-host.ts
index 441e1c3c1..dab1526c6 100644
--- a/server/src/plugin/plugin-host.ts
+++ b/server/src/plugin/plugin-host.ts
@@ -239,7 +239,9 @@ export class PluginHost {
             this.worker = child_process.spawn('python3', args, {
                 // stdin, stdout, stderr, peer in, peer out
                 stdio: ['pipe', 'pipe', 'pipe', 'pipe', 'pipe'],
-                env: Object.assign({}, process.env, env),
+                env: Object.assign({
+                    PYTHONPATH: path.join(process.cwd(), 'node_modules/@scrypted/sdk'),
+                }, process.env, env),
             });
 
             const peerin = this.worker.stdio[3] as Writable;