@scrypted/server 0.77.0 → 0.79.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.
|
@@ -121,12 +121,15 @@ function prepareConsoles(getConsoleName, systemManager, deviceManager, getPlugin
|
|
|
121
121
|
};
|
|
122
122
|
const connect = async () => {
|
|
123
123
|
const ds = deviceManager().getDeviceState(nativeId);
|
|
124
|
-
|
|
125
|
-
|
|
124
|
+
// device deleted
|
|
125
|
+
if (!ds)
|
|
126
126
|
return;
|
|
127
|
-
}
|
|
128
127
|
const plugins = await getPlugins();
|
|
129
|
-
const
|
|
128
|
+
const mixin = systemManager().getDeviceById(mixinId);
|
|
129
|
+
// mixin deleted
|
|
130
|
+
if (!mixin)
|
|
131
|
+
return;
|
|
132
|
+
const { pluginId, nativeId: mixinNativeId } = mixin;
|
|
130
133
|
const port = await plugins.getRemoteServicePort(pluginId, 'console-writer');
|
|
131
134
|
const socket = net_1.default.connect(port);
|
|
132
135
|
socket.write(mixinNativeId + '\n');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-console.js","sourceRoot":"","sources":["../../src/plugin/plugin-console.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qCAAkC;AAClC,mCAA8B;AAC9B,2CAAkC;AAClC,mCAA+C;AAC/C,gDAA4C;AAgB5C,SAAgB,UAAU,CAAC,IAAiE,EACxF,IAAc,EAAE,UAAmB;IAEnC,MAAM,MAAM,GAAG,IAAI,oBAAW,EAAE,CAAC;IACjC,MAAM,MAAM,GAAG,IAAI,oBAAW,EAAE,CAAC;IAEjC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAErB,MAAM,GAAG,GAAG,IAAI,iBAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAExC,MAAM,OAAO,GAAG;QACZ,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,OAAO;QAChB,YAAY,EAAE,OAAO;QACrB,UAAU,EAAE,OAAO;QACnB,OAAO,EAAE,MAAM;QACf,QAAQ,EAAE,OAAO;QACjB,gBAAgB;KACnB,CAAC;IAEF,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACpE,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACtB,MAAM,GAAG,GAAI,GAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,GAAW,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;YACjC,0DAA0D;YAC1D,IAAI,IAAI,IAAI,UAAU,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5C,IAAY,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;YAC1C,CAAC;iBACI,CAAC;gBACD,OAAe,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YACjC,CAAC;YACD,uDAAuD;YACvD,iBAAiB;YACjB,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;QACjB,CAAC,CAAA;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAxCD,gCAwCC;AAED,SAAgB,eAAe,CAAC,cAA4B,EAAE,aAAkC,EAAE,aAAkC,EAAE,UAA8B;IAChK,MAAM,cAAc,GAAG,IAAI,GAAG,EAAmB,CAAC;IAClD,SAAS,gBAAgB,
|
|
1
|
+
{"version":3,"file":"plugin-console.js","sourceRoot":"","sources":["../../src/plugin/plugin-console.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qCAAkC;AAClC,mCAA8B;AAC9B,2CAAkC;AAClC,mCAA+C;AAC/C,gDAA4C;AAgB5C,SAAgB,UAAU,CAAC,IAAiE,EACxF,IAAc,EAAE,UAAmB;IAEnC,MAAM,MAAM,GAAG,IAAI,oBAAW,EAAE,CAAC;IACjC,MAAM,MAAM,GAAG,IAAI,oBAAW,EAAE,CAAC;IAEjC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAErB,MAAM,GAAG,GAAG,IAAI,iBAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAExC,MAAM,OAAO,GAAG;QACZ,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,OAAO;QAChB,YAAY,EAAE,OAAO;QACrB,UAAU,EAAE,OAAO;QACnB,OAAO,EAAE,MAAM;QACf,QAAQ,EAAE,OAAO;QACjB,gBAAgB;KACnB,CAAC;IAEF,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACpE,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACtB,MAAM,GAAG,GAAI,GAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,GAAW,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;YACjC,0DAA0D;YAC1D,IAAI,IAAI,IAAI,UAAU,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5C,IAAY,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;YAC1C,CAAC;iBACI,CAAC;gBACD,OAAe,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YACjC,CAAC;YACD,uDAAuD;YACvD,iBAAiB;YACjB,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;QACjB,CAAC,CAAA;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAxCD,gCAwCC;AAED,SAAgB,eAAe,CAAC,cAA4B,EAAE,aAAkC,EAAE,aAAkC,EAAE,UAA8B;IAChK,MAAM,cAAc,GAAG,IAAI,GAAG,EAAmB,CAAC;IAClD,SAAS,gBAAgB,CAAC,QAA2B;QACjD,uDAAuD;QACvD,oCAAoC;QACpC,IAAI,CAAC,QAAQ;YACT,OAAO,OAAO,CAAC;QAEnB,IAAI,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvC,IAAI,GAAG;YACH,OAAO,GAAG,CAAC;QAEf,GAAG,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACtC,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;gBACvB,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAC;gBACnC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,cAAc,EAAE,EAAE,gBAAgB,CAAC,CAAC;gBACpF,MAAM,MAAM,GAAG,aAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACjC,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;gBAC9B,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE;oBAC5B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACvB,CAAC,CAAC;gBACF,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC1B,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC1B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;oBACpB,MAAM,CAAC,kBAAkB,EAAE,CAAC;oBAC5B,MAAM,CAAC,kBAAkB,EAAE,CAAC;oBAC5B,MAAM,CAAC,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,KAAK,EAAE,CAAC;oBACf,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAC/B,CAAC,CAAC,CAAC;YACP,CAAC,CAAC;YACF,OAAO,EAAE,CAAC;QACd,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QAEzB,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClC,OAAO,GAAG,CAAC;IACf,CAAC;IAED,MAAM,aAAa,GAAG,IAAI,GAAG,EAAgC,CAAC;IAE9D,SAAS,eAAe,CAAC,OAAe,EAAE,QAA0B;QAChE,IAAI,gBAAgB,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpB,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;YAC7B,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,GAAG,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,GAAG;YACH,OAAO,GAAG,CAAC;QAEf,GAAG,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACtC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,OAAO;YACX,CAAC;YACD,MAAM,SAAS,GAAG,GAAG,EAAE;gBACnB,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAClC,CAAC,CAAC;YAEF,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;gBACvB,MAAM,EAAE,GAAG,aAAa,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;gBACpD,iBAAiB;gBACjB,IAAI,CAAC,EAAE;oBACH,OAAO;gBAEX,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAC;gBACnC,MAAM,KAAK,GAAG,aAAa,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBACrD,gBAAgB;gBAChB,IAAI,CAAC,KAAK;oBACN,OAAO;gBACX,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;gBACpD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBAC5E,MAAM,MAAM,GAAG,aAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACjC,MAAM,CAAC,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;gBACnC,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE;oBAC5B,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;oBACjC,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC;oBAC/C,GAAG,GAAG,IAAI,EAAE,CAAC,IAAI,KAAK,GAAG,GAAG,GAAG,IAAI,CAAC;oBACpC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACtB,CAAC,CAAC;gBACF,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC1B,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC1B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAClC,CAAC,CAAC;YAEF,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;gBAC1B,IAAI,CAAC;oBACD,MAAM,OAAO,EAAE,CAAC;gBACpB,CAAC;gBACD,OAAO,CAAC,EAAE,CAAC;oBACP,SAAS,EAAE,CAAC;gBAChB,CAAC;YACL,CAAC,CAAA;YACD,UAAU,EAAE,CAAC;QACjB,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAAE,IAAI,aAAa,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC;QAEpF,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACnC,OAAO,GAAG,CAAC;IACf,CAAC;IAED,OAAO;QACH,gBAAgB;QAChB,eAAe;KAClB,CAAA;AACL,CAAC;AA5GD,0CA4GC;AAEM,KAAK,UAAU,mBAAmB,CAAC,YAAsB,EAAE,YAAsB,EAAE,MAAc;IACpG,MAAM,OAAO,GAAG,IAAI,GAAG,EAA2B,CAAC;IAEnD,MAAM,SAAS,GAAG,CAAC,GAAoB,EAAE,EAAE;QACvC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAA;IAED,MAAM,eAAe,GAAG,CAAC,QAA2B,EAAE,EAAE;QACpD,IAAI,CAAC,QAAQ;YACT,QAAQ,GAAG,SAAS,CAAC;QACzB,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC/B,IAAI,CAAC,GAAG,EAAE,CAAC;YACP,MAAM,MAAM,GAAG,IAAI,oBAAW,EAAE,CAAC;YACjC,MAAM,MAAM,GAAG,IAAI,oBAAW,EAAE,CAAC;YAEjC,GAAG,GAAG;gBACF,MAAM;gBACN,MAAM;gBACN,OAAO,EAAE,EAAE;aACd,CAAA;YACD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YAE3B,IAAI,cAAc,GAAG,IAAI,CAAC;YAC1B,IAAI,cAA8B,CAAC;YACnC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC;YACvD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC;YAEvD,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,EAAE;gBAClC,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;gBAExB,IAAI,cAAc,EAAE,CAAC;oBACjB,cAAc,GAAG,KAAK,CAAC;oBACvB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC;oBACxD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC;oBAC9D,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC;oBACxD,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,cAAc,GAAG,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;gBAC5E,CAAC;gBAED,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnB,2DAA2D;gBAC3D,yBAAyB;gBACzB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI;oBACrB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;YAC3D,CAAC,CAAC;YAEF,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAChC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAEhC,SAAS,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC,CAAA;IAED,IAAI,aAAsB,CAAC;IAC3B,CAAC;QACG,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,eAAe,EAAE,CAAC;QAC7C,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1B,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1B,aAAa,GAAG,IAAI,iBAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAc,CAAC;IAEtC,MAAM,UAAU,GAAG,IAAI,YAAM,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEpB,IAAI,CAAC,MAAM,CAAC,GAAG,MAAM,IAAA,aAAI,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAClC,IAAI,MAAM,KAAK,WAAW;YACtB,MAAM,GAAG,SAAS,CAAC;QAEvB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,OAAO,GAAG,GAAG,EAAE,OAAO,CAAC;QAC7B,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtC,GAAG,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC;YACvB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC;QAED,MAAM,EAAE,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACtB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAEtB,MAAM,OAAO,GAAG,GAAG,EAAE;YACjB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAClC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAClC,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAC5B,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC,CAAC;QAEF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5B,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAI,YAAM,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC5C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAA,aAAI,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM,GAAW,IAAI,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,OAAO,KAAK,CAAC,CAAC,EAAE,CAAC;YACjB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAEtC,IAAI,MAAM,KAAK,WAAW;YACtB,MAAM,GAAG,SAAS,CAAC;QAEvB,MAAM,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;QAEpC,MAAM,OAAO,GAAG,GAAG,EAAE;YACjB,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAC5B,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAU,EAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAU,EAAC,WAAW,CAAC,CAAC;IAEhD,OAAO;QACH,KAAK,CAAC,QAA0B;YAC5B,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACjC,IAAI,EAAE;gBACF,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC;YACpB,SAAS,CAAC,EAAE,CAAC,CAAC;QAClB,CAAC;QACD,OAAO;YACH,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC3B,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,CAAC;YACD,OAAO,CAAC,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,EAAE,CAAC;YAEhB,IAAI,CAAC;gBACD,UAAU,CAAC,KAAK,EAAE,CAAC;gBACnB,WAAW,CAAC,KAAK,EAAE,CAAC;YACxB,CAAC;YACD,OAAO,CAAC,EAAE,CAAC;YACX,CAAC;QACL,CAAC;QACD,aAAa;QACb,QAAQ;QACR,SAAS;KACZ,CAAC;AACN,CAAC;AAxJD,kDAwJC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@scrypted/server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.79.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@mapbox/node-pre-gyp": "^1.0.11",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"linkfs": "^2.1.0",
|
|
20
20
|
"lodash": "^4.17.21",
|
|
21
21
|
"memfs": "^4.6.0",
|
|
22
|
-
"mime": "^
|
|
22
|
+
"mime": "^3.0.0",
|
|
23
23
|
"nan": "^2.18.0",
|
|
24
24
|
"node-dijkstra": "^2.5.0",
|
|
25
25
|
"node-forge": "^1.3.1",
|
|
@@ -20,7 +20,7 @@ export interface StdPassThroughs {
|
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
export function getConsole(hook: (stdout: PassThrough, stderr: PassThrough) => Promise<void>,
|
|
23
|
-
also?: Console, alsoPrefix?: string)
|
|
23
|
+
also?: Console, alsoPrefix?: string) {
|
|
24
24
|
|
|
25
25
|
const stdout = new PassThrough();
|
|
26
26
|
const stderr = new PassThrough();
|
|
@@ -63,7 +63,7 @@ export function getConsole(hook: (stdout: PassThrough, stderr: PassThrough) => P
|
|
|
63
63
|
|
|
64
64
|
export function prepareConsoles(getConsoleName: () => string, systemManager: () => SystemManager, deviceManager: () => DeviceManager, getPlugins: () => Promise<any>) {
|
|
65
65
|
const deviceConsoles = new Map<string, Console>();
|
|
66
|
-
function getDeviceConsole
|
|
66
|
+
function getDeviceConsole(nativeId?: ScryptedNativeId) {
|
|
67
67
|
// the the plugin console is simply the default console
|
|
68
68
|
// and gets read from stderr/stdout.
|
|
69
69
|
if (!nativeId)
|
|
@@ -126,13 +126,16 @@ export function prepareConsoles(getConsoleName: () => string, systemManager: ()
|
|
|
126
126
|
|
|
127
127
|
const connect = async () => {
|
|
128
128
|
const ds = deviceManager().getDeviceState(nativeId);
|
|
129
|
-
|
|
130
|
-
|
|
129
|
+
// device deleted
|
|
130
|
+
if (!ds)
|
|
131
131
|
return;
|
|
132
|
-
}
|
|
133
132
|
|
|
134
133
|
const plugins = await getPlugins();
|
|
135
|
-
const
|
|
134
|
+
const mixin = systemManager().getDeviceById(mixinId);
|
|
135
|
+
// mixin deleted
|
|
136
|
+
if (!mixin)
|
|
137
|
+
return;
|
|
138
|
+
const { pluginId, nativeId: mixinNativeId } = mixin;
|
|
136
139
|
const port = await plugins.getRemoteServicePort(pluginId, 'console-writer');
|
|
137
140
|
const socket = net.connect(port);
|
|
138
141
|
socket.write(mixinNativeId + '\n');
|
|
@@ -161,7 +164,7 @@ export function prepareConsoles(getConsoleName: () => string, systemManager: ()
|
|
|
161
164
|
nativeIdConsoles.set(mixinId, ret);
|
|
162
165
|
return ret;
|
|
163
166
|
}
|
|
164
|
-
|
|
167
|
+
|
|
165
168
|
return {
|
|
166
169
|
getDeviceConsole,
|
|
167
170
|
getMixinConsole,
|