@scrypted/server 0.7.24 → 0.7.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of @scrypted/server might be problematic. Click here for more details.
|
@@ -4,20 +4,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.installOptionalDependencies = exports.getPluginNodePath = void 0;
|
|
7
|
-
const plugin_volume_1 = require("./plugin-volume");
|
|
8
|
-
const fs_1 = __importDefault(require("fs"));
|
|
9
7
|
const child_process_1 = __importDefault(require("child_process"));
|
|
10
|
-
const path_1 = __importDefault(require("path"));
|
|
11
8
|
const events_1 = require("events");
|
|
12
|
-
const
|
|
9
|
+
const fs_1 = __importDefault(require("fs"));
|
|
13
10
|
const mkdirp_1 = __importDefault(require("mkdirp"));
|
|
14
|
-
const semver_1 = __importDefault(require("semver"));
|
|
15
11
|
const os_1 = __importDefault(require("os"));
|
|
12
|
+
const path_1 = __importDefault(require("path"));
|
|
13
|
+
const process_1 = __importDefault(require("process"));
|
|
16
14
|
const rimraf_1 = __importDefault(require("rimraf"));
|
|
15
|
+
const semver_1 = __importDefault(require("semver"));
|
|
16
|
+
const plugin_volume_1 = require("./plugin-volume");
|
|
17
17
|
function getPluginNodePath(name) {
|
|
18
18
|
const pluginVolume = (0, plugin_volume_1.ensurePluginVolume)(name);
|
|
19
19
|
const nodeMajorVersion = semver_1.default.parse(process_1.default.version).major;
|
|
20
|
-
|
|
20
|
+
let nodeVersionedDirectory = `node${nodeMajorVersion}-${process_1.default.platform}-${process_1.default.arch}`;
|
|
21
|
+
const scryptedBase = process_1.default.env.SCRYPTED_BASE_VERSION;
|
|
22
|
+
if (scryptedBase)
|
|
23
|
+
nodeVersionedDirectory += '-' + nodeVersionedDirectory;
|
|
24
|
+
const nodePrefix = path_1.default.join(pluginVolume, nodeVersionedDirectory);
|
|
21
25
|
return nodePrefix;
|
|
22
26
|
}
|
|
23
27
|
exports.getPluginNodePath = getPluginNodePath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-npm-dependencies.js","sourceRoot":"","sources":["../../src/plugin/plugin-npm-dependencies.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"plugin-npm-dependencies.js","sourceRoot":"","sources":["../../src/plugin/plugin-npm-dependencies.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/python/plugin_remote.py
CHANGED
|
@@ -373,8 +373,14 @@ class PluginRemote:
|
|
|
373
373
|
sys.version_info[0])+"."+str(sys.version_info[1])
|
|
374
374
|
print('python version:', python_version)
|
|
375
375
|
|
|
376
|
+
python_versioned_directory = '%s-%s-%s' % (python_version, platform.system(), platform.machine())
|
|
377
|
+
SCRYPTED_BASE_VERSION = os.environ.get('SCRYPTED_BASE_VERSION')
|
|
378
|
+
if SCRYPTED_BASE_VERSION:
|
|
379
|
+
python_versioned_directory += SCRYPTED_BASE_VERSION
|
|
380
|
+
|
|
376
381
|
python_prefix = os.path.join(
|
|
377
|
-
plugin_volume,
|
|
382
|
+
plugin_volume, python_versioned_directory)
|
|
383
|
+
|
|
378
384
|
if not os.path.exists(python_prefix):
|
|
379
385
|
os.makedirs(python_prefix)
|
|
380
386
|
|
|
@@ -1,18 +1,22 @@
|
|
|
1
|
-
import { ensurePluginVolume } from "./plugin-volume";
|
|
2
|
-
import fs from 'fs';
|
|
3
1
|
import child_process from 'child_process';
|
|
4
|
-
import path from 'path';
|
|
5
2
|
import { once } from 'events';
|
|
6
|
-
import
|
|
3
|
+
import fs from 'fs';
|
|
7
4
|
import mkdirp from "mkdirp";
|
|
8
|
-
import semver from 'semver';
|
|
9
5
|
import os from 'os';
|
|
6
|
+
import path from 'path';
|
|
7
|
+
import process from 'process';
|
|
10
8
|
import rimraf from "rimraf";
|
|
9
|
+
import semver from 'semver';
|
|
10
|
+
import { ensurePluginVolume } from "./plugin-volume";
|
|
11
11
|
|
|
12
12
|
export function getPluginNodePath(name: string) {
|
|
13
13
|
const pluginVolume = ensurePluginVolume(name);
|
|
14
14
|
const nodeMajorVersion = semver.parse(process.version).major;
|
|
15
|
-
|
|
15
|
+
let nodeVersionedDirectory = `node${nodeMajorVersion}-${process.platform}-${process.arch}`;
|
|
16
|
+
const scryptedBase = process.env.SCRYPTED_BASE_VERSION;
|
|
17
|
+
if (scryptedBase)
|
|
18
|
+
nodeVersionedDirectory += '-' + nodeVersionedDirectory;
|
|
19
|
+
const nodePrefix = path.join(pluginVolume, nodeVersionedDirectory);
|
|
16
20
|
return nodePrefix;
|
|
17
21
|
}
|
|
18
22
|
|