@scrypted/server 0.94.16 → 0.94.18
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.
|
@@ -1,17 +1,22 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
|
|
3
3
|
const child_process = require('child_process');
|
|
4
|
-
const
|
|
4
|
+
const { PortablePython } = require('@bjia56/portable-python')
|
|
5
5
|
const { once } = require('events');
|
|
6
|
+
let python;
|
|
6
7
|
|
|
7
8
|
async function pipInstall(pkg) {
|
|
8
|
-
const cp = child_process.spawn(python, ['-m', 'pip', 'install', pkg], {stdio: 'inherit'});
|
|
9
|
+
const cp = child_process.spawn(python, ['-m', 'pip', 'install', pkg], { stdio: 'inherit' });
|
|
9
10
|
const [exitCode] = await once(cp, 'exit');
|
|
10
11
|
if (exitCode)
|
|
11
12
|
throw new Error('non-zero exit code: ' + exitCode);
|
|
12
13
|
}
|
|
13
14
|
|
|
14
15
|
async function installScryptedServerRequirements() {
|
|
16
|
+
const py = new PortablePython("3.9");
|
|
17
|
+
await py.install();
|
|
18
|
+
python = py.executablePath;
|
|
19
|
+
|
|
15
20
|
await pipInstall('wheel');
|
|
16
21
|
await pipInstall('debugpy');
|
|
17
22
|
await pipInstall('psutil');
|
|
@@ -13,8 +13,10 @@ const child_process_worker_1 = require("./child-process-worker");
|
|
|
13
13
|
class PythonRuntimeWorker extends child_process_worker_1.ChildProcessWorker {
|
|
14
14
|
static {
|
|
15
15
|
try {
|
|
16
|
-
const
|
|
17
|
-
|
|
16
|
+
const PortablePython = require('@bjia56/portable-python').PortablePython;
|
|
17
|
+
const py = new PortablePython("3.9");
|
|
18
|
+
const portablePython = py.executablePath;
|
|
19
|
+
if (fs_1.default.existsSync(portablePython))
|
|
18
20
|
process.env.SCRYPTED_PYTHON_PATH = portablePython;
|
|
19
21
|
}
|
|
20
22
|
catch (e) {
|
|
@@ -72,7 +74,7 @@ class PythonRuntimeWorker extends child_process_worker_1.ChildProcessWorker {
|
|
|
72
74
|
stdio: ['pipe', 'pipe', 'pipe', 'pipe', 'pipe'],
|
|
73
75
|
env: Object.assign({
|
|
74
76
|
// rev this if the base python version or server characterstics change.
|
|
75
|
-
SCRYPTED_PYTHON_VERSION: '20240308',
|
|
77
|
+
SCRYPTED_PYTHON_VERSION: '20240308.1',
|
|
76
78
|
PYTHONUNBUFFERED: '1',
|
|
77
79
|
PYTHONPATH,
|
|
78
80
|
}, gstEnv, process.env, env),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"python-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/python-worker.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA0C;AAC1C,4CAAoB;AACpB,4CAAoB;AACpB,gDAAwB;AAGxB,yDAAiE;AACjE,iEAA4D;AAI5D,MAAa,mBAAoB,SAAQ,yCAAkB;IACvD;QACI,IAAI,CAAC;YACD,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"python-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/python-worker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@scrypted/server",
|
|
3
|
-
"version": "0.94.
|
|
3
|
+
"version": "0.94.18",
|
|
4
4
|
"description": "",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@bjia56/portable-python
|
|
6
|
+
"@bjia56/portable-python": "^0.1.3",
|
|
7
7
|
"@mapbox/node-pre-gyp": "^1.0.11",
|
|
8
8
|
"@scrypted/types": "^0.3.13",
|
|
9
9
|
"adm-zip": "^0.5.10",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"main": "dist/scrypted-main-exports.js",
|
|
57
57
|
"types": "dist/scrypted-main-exports.d.ts",
|
|
58
58
|
"scripts": {
|
|
59
|
-
"
|
|
59
|
+
"postinstall": "node bin/postinstall",
|
|
60
60
|
"preserve": "npm run build",
|
|
61
61
|
"serve": "node --expose-gc dist/scrypted-main.js",
|
|
62
62
|
"serve-no-build": "node --expose-gc dist/scrypted-main.js",
|
|
@@ -7,13 +7,15 @@ import { RpcMessage, RpcPeer } from "../../rpc";
|
|
|
7
7
|
import { createRpcDuplexSerializer } from '../../rpc-serializer';
|
|
8
8
|
import { ChildProcessWorker } from "./child-process-worker";
|
|
9
9
|
import { RuntimeWorkerOptions } from "./runtime-worker";
|
|
10
|
-
import {
|
|
10
|
+
import type {PortablePython as PortablePythonType} from '@bjia56/portable-python'
|
|
11
11
|
|
|
12
12
|
export class PythonRuntimeWorker extends ChildProcessWorker {
|
|
13
13
|
static {
|
|
14
14
|
try {
|
|
15
|
-
const
|
|
16
|
-
|
|
15
|
+
const PortablePython = require('@bjia56/portable-python').PortablePython as typeof PortablePythonType;
|
|
16
|
+
const py = new PortablePython("3.9");
|
|
17
|
+
const portablePython = py.executablePath;
|
|
18
|
+
if (fs.existsSync(portablePython))
|
|
17
19
|
process.env.SCRYPTED_PYTHON_PATH = portablePython;
|
|
18
20
|
}
|
|
19
21
|
catch (e) {
|
|
@@ -87,7 +89,7 @@ export class PythonRuntimeWorker extends ChildProcessWorker {
|
|
|
87
89
|
stdio: ['pipe', 'pipe', 'pipe', 'pipe', 'pipe'],
|
|
88
90
|
env: Object.assign({
|
|
89
91
|
// rev this if the base python version or server characterstics change.
|
|
90
|
-
SCRYPTED_PYTHON_VERSION: '20240308',
|
|
92
|
+
SCRYPTED_PYTHON_VERSION: '20240308.1',
|
|
91
93
|
PYTHONUNBUFFERED: '1',
|
|
92
94
|
PYTHONPATH,
|
|
93
95
|
}, gstEnv, process.env, env),
|