@scrypted/server 0.140.4 → 0.141.0
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.
- package/dist/level.js +0 -2
- package/dist/level.js.map +1 -1
- package/dist/plugin/runtime/node-fork-worker.js +3 -0
- package/dist/plugin/runtime/node-fork-worker.js.map +1 -1
- package/package.json +2 -2
- package/python/plugin_pip.py +4 -1
- package/src/level.ts +0 -4
- package/src/plugin/runtime/node-fork-worker.ts +3 -0
package/dist/level.js
CHANGED
package/dist/level.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"level.js","sourceRoot":"","sources":["../src/level.ts"],"names":[],"mappings":";;;AAAA,iCAAmE;AAWnE,SAAS,mBAAmB,CAAC,mBAAwB,EAAE,IAAS;IAC5D,MAAM,GAAG,GAAG,IAAI,mBAAmB,EAAE,CAAC;IACtC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACrC,OAAO,GAAG,CAAC;AACf,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"level.js","sourceRoot":"","sources":["../src/level.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
14
14
|
const cluster_setup_1 = require("../../cluster/cluster-setup");
|
|
15
15
|
const socket_serializer_1 = require("../socket-serializer");
|
|
16
16
|
const child_process_worker_1 = require("./child-process-worker");
|
|
17
|
+
const plugin_npm_dependencies_1 = require("../plugin-npm-dependencies");
|
|
17
18
|
exports.NODE_PLUGIN_CHILD_PROCESS = 'child';
|
|
18
19
|
exports.NODE_PLUGIN_FORK_PROCESS = 'fork';
|
|
19
20
|
exports.NODE_PLUGIN_THREAD_PROCESS = 'child-thread';
|
|
@@ -46,6 +47,8 @@ class NodeForkWorker extends child_process_worker_1.ChildProcessWorker {
|
|
|
46
47
|
this.pluginId
|
|
47
48
|
];
|
|
48
49
|
const nodePaths = [
|
|
50
|
+
// /server/volume/plugins/@scrypted/core/n-node-v127-linux-x64-20250101
|
|
51
|
+
path_1.default.join((0, plugin_npm_dependencies_1.getPluginNodePath)(this.pluginId), 'node_modules'),
|
|
49
52
|
// /server/node_modules/@scrypted/server/node_modules
|
|
50
53
|
path_1.default.resolve(__dirname, '..', '..', '..', 'node_modules'),
|
|
51
54
|
// /server/node_modules
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-fork-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/node-fork-worker.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"node-fork-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/node-fork-worker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@scrypted/server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.141.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@scrypted/ffmpeg-static": "^6.1.0-build3",
|
|
7
7
|
"@scrypted/node-pty": "^1.0.24",
|
|
8
|
-
"@scrypted/types": "^0.5.
|
|
8
|
+
"@scrypted/types": "^0.5.23",
|
|
9
9
|
"adm-zip": "^0.5.16",
|
|
10
10
|
"body-parser": "^2.2.0",
|
|
11
11
|
"cookie-parser": "^1.4.7",
|
package/python/plugin_pip.py
CHANGED
|
@@ -101,7 +101,10 @@ def install_with_pip(
|
|
|
101
101
|
line = p.stdout.readline()
|
|
102
102
|
if not line:
|
|
103
103
|
break
|
|
104
|
-
|
|
104
|
+
try:
|
|
105
|
+
line = line.decode("utf8").rstrip("\r\n")
|
|
106
|
+
except UnicodeDecodeError:
|
|
107
|
+
line = line.decode("latin-1").rstrip("\r\n") # Fallback to Latin
|
|
105
108
|
print(line)
|
|
106
109
|
result = p.wait()
|
|
107
110
|
print("pip install result %s" % result)
|
package/src/level.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { RpcMessage, RpcPeer } from "../../rpc";
|
|
|
6
6
|
import { SidebandSocketSerializer } from "../socket-serializer";
|
|
7
7
|
import { ChildProcessWorker } from "./child-process-worker";
|
|
8
8
|
import { RuntimeWorkerOptions } from "./runtime-worker";
|
|
9
|
+
import { getPluginNodePath } from '../plugin-npm-dependencies';
|
|
9
10
|
|
|
10
11
|
export const NODE_PLUGIN_CHILD_PROCESS = 'child';
|
|
11
12
|
export const NODE_PLUGIN_FORK_PROCESS = 'fork';
|
|
@@ -49,6 +50,8 @@ export class NodeForkWorker extends ChildProcessWorker {
|
|
|
49
50
|
];
|
|
50
51
|
|
|
51
52
|
const nodePaths: string[] = [
|
|
53
|
+
// /server/volume/plugins/@scrypted/core/n-node-v127-linux-x64-20250101
|
|
54
|
+
path.join(getPluginNodePath(this.pluginId), 'node_modules'),
|
|
52
55
|
// /server/node_modules/@scrypted/server/node_modules
|
|
53
56
|
path.resolve(__dirname, '..', '..', '..', 'node_modules'),
|
|
54
57
|
// /server/node_modules
|