michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-09-17 17:20:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "server: add hook for getting runtime"

Browse Source 
This reverts commit e169d154e7.
This commit is contained in:
Koushik Dutta
2023-04-29 11:30:20 -07:00
parent e169d154e7
commit 02d5b429b7
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/server",
"version": "0.7.99",
"version": "0.7.97",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@scrypted/server",
"version": "0.7.99",
"version": "0.7.97",
"license": "ISC",
"dependencies": {
"@mapbox/node-pre-gyp": "^1.0.10",

8
server/src/plugin/plugin-remote-worker.ts
View File

@@ -63,7 +63,7 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
let postInstallSourceMapSupport: (scrypted: ScryptedStatic) => void;
const scrypted = attachPluginRemote(peer, {
attachPluginRemote(peer, {
createMediaManager: async (sm, dm) => {
systemManager = sm;
deviceManager = dm
@@ -394,11 +394,7 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
}).then(scrypted => {
systemManager = scrypted.systemManager;
deviceManager = scrypted.deviceManager as DeviceManagerImpl;
return scrypted;
});
return {
peer,
scryptedPromise: scrypted,
};
return peer;
}

8
server/src/scrypted-plugin-main.ts
View File

@@ -7,7 +7,7 @@ import { SidebandSocketSerializer } from "./plugin/socket-serializer";
function start(mainFilename: string) {
if (process.argv[2] === 'child-thread') {
const ret = startPluginRemote(mainFilename, process.argv[3], (message, reject) => {
const peer = startPluginRemote(mainFilename, process.argv[3], (message, reject) => {
try {
worker_threads.parentPort.postMessage(v8.serialize(message));
}
@@ -15,20 +15,17 @@ function start(mainFilename: string) {
reject?.(e);
}
});
const { peer } = ret;
peer.transportSafeArgumentTypes.add(Buffer.name);
peer.transportSafeArgumentTypes.add(Uint8Array.name);
worker_threads.parentPort.on('message', message => peer.handleMessage(v8.deserialize(message)));
return ret;
}
else {
const ret = startPluginRemote(mainFilename, process.argv[3], (message, reject, serializationContext) => process.send(message, serializationContext?.sendHandle, {
const peer = startPluginRemote(mainFilename, process.argv[3], (message, reject, serializationContext) => process.send(message, serializationContext?.sendHandle, {
swallowErrors: !reject,
}, e => {
if (e)
reject?.(e);
}));
const { peer } = ret;
peer.transportSafeArgumentTypes.add(Buffer.name);
peer.transportSafeArgumentTypes.add(Uint8Array.name);
@@ -38,7 +35,6 @@ function start(mainFilename: string) {
console.error('peer host disconnected, exiting.');
process.exit(1);
});
return ret;
}
}