server: fixup versioned prefix/node_modules path

koush · Mar 29, 2023 · c1c5a42 · c1c5a42
1 parent 12643cd
commit c1c5a42
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/server/python/plugin_remote.py b/server/python/plugin_remote.py
@@ -397,11 +397,13 @@ def onProxySerialization(value: Any, proxyId: str):
             python_versioned_directory = '%s-%s-%s' % (python_version, platform.system(), platform.machine())
             SCRYPTED_BASE_VERSION = os.environ.get('SCRYPTED_BASE_VERSION')
             if SCRYPTED_BASE_VERSION:
-                python_versioned_directory += SCRYPTED_BASE_VERSION
+                python_versioned_directory += '-' + SCRYPTED_BASE_VERSION
 
             python_prefix = os.path.join(
                 plugin_volume, python_versioned_directory)
 
+            print('python prefix: %s' % python_prefix)
+
             if not os.path.exists(python_prefix):
                 os.makedirs(python_prefix)
 

diff --git a/server/src/plugin/plugin-npm-dependencies.ts b/server/src/plugin/plugin-npm-dependencies.ts
@@ -15,7 +15,7 @@ export function getPluginNodePath(name: string) {
     let nodeVersionedDirectory = `node${nodeMajorVersion}-${process.platform}-${process.arch}`;
     const scryptedBase = process.env.SCRYPTED_BASE_VERSION;
     if (scryptedBase)
-        nodeVersionedDirectory += '-' + nodeVersionedDirectory;
+        nodeVersionedDirectory += '-' + scryptedBase;
     const nodePrefix = path.join(pluginVolume, nodeVersionedDirectory);
     return nodePrefix;
 }

diff --git a/server/src/plugin/plugin-remote-worker.ts b/server/src/plugin/plugin-remote-worker.ts
@@ -176,6 +176,7 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
             const pluginConsole = getPluginConsole?.();
             params.console = pluginConsole;
             const pnp = getPluginNodePath(pluginId);
+            pluginConsole?.log('node modules', pnp);
             params.require = (name: string) => {
                 if (name === 'fakefs' || (name === 'fs' && !packageJson.scrypted.realfs)) {
                     return volume;