@norskvideo/norsk-studio 1.0.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/README.md +58 -0
- package/bin/info.ts.template +23 -0
- package/bin/studio-bundle +23 -0
- package/bin/studio-editor +3 -0
- package/bin/studio-runner +3 -0
- package/bin/studio-wrap-infos +44 -0
- package/lib/client/comms.d.ts +26 -0
- package/lib/client/comms.js +114 -0
- package/lib/client/comms.js.map +1 -0
- package/lib/client/componentevents.d.ts +12 -0
- package/lib/client/componentevents.js +41 -0
- package/lib/client/componentevents.js.map +1 -0
- package/lib/client/console.d.ts +19 -0
- package/lib/client/console.js +42 -0
- package/lib/client/console.js.map +1 -0
- package/lib/client/controls.d.ts +23 -0
- package/lib/client/controls.js +80 -0
- package/lib/client/controls.js.map +1 -0
- package/lib/client/creator.d.ts +45 -0
- package/lib/client/creator.js +276 -0
- package/lib/client/creator.js.map +1 -0
- package/lib/client/jsx/connection-editor.d.ts +11 -0
- package/lib/client/jsx/connection-editor.js +198 -0
- package/lib/client/jsx/connection-editor.js.map +1 -0
- package/lib/client/jsx/connection.d.ts +7 -0
- package/lib/client/jsx/connection.js +33 -0
- package/lib/client/jsx/connection.js.map +1 -0
- package/lib/client/jsx/console-log.d.ts +11 -0
- package/lib/client/jsx/console-log.js +17 -0
- package/lib/client/jsx/console-log.js.map +1 -0
- package/lib/client/jsx/console.d.ts +20 -0
- package/lib/client/jsx/console.js +30 -0
- package/lib/client/jsx/console.js.map +1 -0
- package/lib/client/jsx/node-editor.d.ts +23 -0
- package/lib/client/jsx/node-editor.js +442 -0
- package/lib/client/jsx/node-editor.js.map +1 -0
- package/lib/client/jsx/node.d.ts +25 -0
- package/lib/client/jsx/node.js +244 -0
- package/lib/client/jsx/node.js.map +1 -0
- package/lib/client/jsx/selected-connection.d.ts +21 -0
- package/lib/client/jsx/selected-connection.js +110 -0
- package/lib/client/jsx/selected-connection.js.map +1 -0
- package/lib/client/jsx/selected-node.d.ts +24 -0
- package/lib/client/jsx/selected-node.js +75 -0
- package/lib/client/jsx/selected-node.js.map +1 -0
- package/lib/client/jsx/selected.d.ts +24 -0
- package/lib/client/jsx/selected.js +15 -0
- package/lib/client/jsx/selected.js.map +1 -0
- package/lib/client/jsx/selectfilename.d.ts +7 -0
- package/lib/client/jsx/selectfilename.js +17 -0
- package/lib/client/jsx/selectfilename.js.map +1 -0
- package/lib/client/jsx/toolbox.d.ts +14 -0
- package/lib/client/jsx/toolbox.js +45 -0
- package/lib/client/jsx/toolbox.js.map +1 -0
- package/lib/client/library.d.ts +12 -0
- package/lib/client/library.js +53 -0
- package/lib/client/library.js.map +1 -0
- package/lib/client/modal.d.ts +21 -0
- package/lib/client/modal.js +34 -0
- package/lib/client/modal.js.map +1 -0
- package/lib/client/rete/connection.d.ts +20 -0
- package/lib/client/rete/connection.js +27 -0
- package/lib/client/rete/connection.js.map +1 -0
- package/lib/client/rete/node.d.ts +28 -0
- package/lib/client/rete/node.js +78 -0
- package/lib/client/rete/node.js.map +1 -0
- package/lib/client/rete/selector.d.ts +10 -0
- package/lib/client/rete/selector.js +22 -0
- package/lib/client/rete/selector.js.map +1 -0
- package/lib/client/rete.d.ts +81 -0
- package/lib/client/rete.js +384 -0
- package/lib/client/rete.js.map +1 -0
- package/lib/client/session-view.d.ts +7 -0
- package/lib/client/session-view.js +132 -0
- package/lib/client/session-view.js.map +1 -0
- package/lib/client/session.d.ts +70 -0
- package/lib/client/session.js +185 -0
- package/lib/client/session.js.map +1 -0
- package/lib/client/tools.d.ts +22 -0
- package/lib/client/tools.js +311 -0
- package/lib/client/tools.js.map +1 -0
- package/lib/extension/base-nodes.d.ts +55 -0
- package/lib/extension/base-nodes.js +120 -0
- package/lib/extension/base-nodes.js.map +1 -0
- package/lib/extension/built-ins.d.ts +4 -0
- package/lib/extension/built-ins.js +52 -0
- package/lib/extension/built-ins.js.map +1 -0
- package/lib/extension/client-system.d.ts +5 -0
- package/lib/extension/client-system.js +3 -0
- package/lib/extension/client-system.js.map +1 -0
- package/lib/extension/client-types.d.ts +245 -0
- package/lib/extension/client-types.js +87 -0
- package/lib/extension/client-types.js.map +1 -0
- package/lib/extension/common.d.ts +34 -0
- package/lib/extension/common.js +45 -0
- package/lib/extension/common.js.map +1 -0
- package/lib/extension/registration.d.ts +7 -0
- package/lib/extension/registration.js +62 -0
- package/lib/extension/registration.js.map +1 -0
- package/lib/extension/runtime-system.d.ts +9 -0
- package/lib/extension/runtime-system.js +3 -0
- package/lib/extension/runtime-system.js.map +1 -0
- package/lib/extension/runtime-types.d.ts +91 -0
- package/lib/extension/runtime-types.js +318 -0
- package/lib/extension/runtime-types.js.map +1 -0
- package/lib/extension/validation.d.ts +16 -0
- package/lib/extension/validation.js +50 -0
- package/lib/extension/validation.js.map +1 -0
- package/lib/library/test.d.ts +2 -0
- package/lib/library/test.js +11 -0
- package/lib/library/test.js.map +1 -0
- package/lib/runtime/document.d.ts +62 -0
- package/lib/runtime/document.js +322 -0
- package/lib/runtime/document.js.map +1 -0
- package/lib/runtime/execution.d.ts +48 -0
- package/lib/runtime/execution.js +327 -0
- package/lib/runtime/execution.js.map +1 -0
- package/lib/runtime/norsk-comms.d.ts +24 -0
- package/lib/runtime/norsk-comms.js +71 -0
- package/lib/runtime/norsk-comms.js.map +1 -0
- package/lib/runtime/system.d.ts +30 -0
- package/lib/runtime/system.js +83 -0
- package/lib/runtime/system.js.map +1 -0
- package/lib/server/config.d.ts +19 -0
- package/lib/server/config.js +26 -0
- package/lib/server/config.js.map +1 -0
- package/lib/server/index.d.ts +1 -0
- package/lib/server/index.js +310 -0
- package/lib/server/index.js.map +1 -0
- package/lib/server/logging.d.ts +6 -0
- package/lib/server/logging.js +96 -0
- package/lib/server/logging.js.map +1 -0
- package/lib/server/medialive.d.ts +1 -0
- package/lib/server/medialive.js +34 -0
- package/lib/server/medialive.js.map +1 -0
- package/lib/server/runner.d.ts +1 -0
- package/lib/server/runner.js +137 -0
- package/lib/server/runner.js.map +1 -0
- package/lib/server/session-registration.d.ts +5 -0
- package/lib/server/session-registration.js +18 -0
- package/lib/server/session-registration.js.map +1 -0
- package/lib/server/session.d.ts +117 -0
- package/lib/server/session.js +364 -0
- package/lib/server/session.js.map +1 -0
- package/lib/shared/client-msg.d.ts +13 -0
- package/lib/shared/client-msg.js +3 -0
- package/lib/shared/client-msg.js.map +1 -0
- package/lib/shared/config.d.ts +7 -0
- package/lib/shared/config.js +60 -0
- package/lib/shared/config.js.map +1 -0
- package/lib/shared/document.d.ts +164 -0
- package/lib/shared/document.js +496 -0
- package/lib/shared/document.js.map +1 -0
- package/lib/shared/names.d.ts +3 -0
- package/lib/shared/names.js +8 -0
- package/lib/shared/names.js.map +1 -0
- package/lib/shared/norsk.d.ts +21 -0
- package/lib/shared/norsk.js +3 -0
- package/lib/shared/norsk.js.map +1 -0
- package/lib/shared/server-msg.d.ts +69 -0
- package/lib/shared/server-msg.js +3 -0
- package/lib/shared/server-msg.js.map +1 -0
- package/lib/shared/util.d.ts +7 -0
- package/lib/shared/util.js +63 -0
- package/lib/shared/util.js.map +1 -0
- package/lib/test/_util/builder.d.ts +46 -0
- package/lib/test/_util/builder.js +200 -0
- package/lib/test/_util/builder.js.map +1 -0
- package/lib/test/_util/callback_app.d.ts +13 -0
- package/lib/test/_util/callback_app.js +25 -0
- package/lib/test/_util/callback_app.js.map +1 -0
- package/lib/test/_util/driver.d.ts +16 -0
- package/lib/test/_util/driver.js +89 -0
- package/lib/test/_util/driver.js.map +1 -0
- package/lib/test/_util/fake-norsk.d.ts +14 -0
- package/lib/test/_util/fake-norsk.js +19 -0
- package/lib/test/_util/fake-norsk.js.map +1 -0
- package/lib/test/_util/ffmpeg.d.ts +80 -0
- package/lib/test/_util/ffmpeg.js +266 -0
- package/lib/test/_util/ffmpeg.js.map +1 -0
- package/lib/test/_util/manual-driver.d.ts +42 -0
- package/lib/test/_util/manual-driver.js +206 -0
- package/lib/test/_util/manual-driver.js.map +1 -0
- package/lib/test/_util/runtime.d.ts +81 -0
- package/lib/test/_util/runtime.js +194 -0
- package/lib/test/_util/runtime.js.map +1 -0
- package/lib/test/_util/server.d.ts +8 -0
- package/lib/test/_util/server.js +33 -0
- package/lib/test/_util/server.js.map +1 -0
- package/lib/test/_util/sinks.d.ts +35 -0
- package/lib/test/_util/sinks.js +200 -0
- package/lib/test/_util/sinks.js.map +1 -0
- package/lib/test/_util/sources.d.ts +18 -0
- package/lib/test/_util/sources.js +113 -0
- package/lib/test/_util/sources.js.map +1 -0
- package/lib/test/_util/test-infos-views.d.ts +9 -0
- package/lib/test/_util/test-infos-views.js +46 -0
- package/lib/test/_util/test-infos-views.js.map +1 -0
- package/lib/test/_util/test-infos.d.ts +44 -0
- package/lib/test/_util/test-infos.js +202 -0
- package/lib/test/_util/test-infos.js.map +1 -0
- package/lib/test/client-designview.d.ts +1 -0
- package/lib/test/client-designview.js +258 -0
- package/lib/test/client-designview.js.map +1 -0
- package/lib/test/client-liveview.d.ts +1 -0
- package/lib/test/client-liveview.js +413 -0
- package/lib/test/client-liveview.js.map +1 -0
- package/lib/test/client-session.d.ts +1 -0
- package/lib/test/client-session.js +205 -0
- package/lib/test/client-session.js.map +1 -0
- package/lib/test/client-ui.d.ts +1 -0
- package/lib/test/client-ui.js +74 -0
- package/lib/test/client-ui.js.map +1 -0
- package/lib/test/document-execution.d.ts +1 -0
- package/lib/test/document-execution.js +162 -0
- package/lib/test/document-execution.js.map +1 -0
- package/lib/test/document-loading.d.ts +1 -0
- package/lib/test/document-loading.js +420 -0
- package/lib/test/document-loading.js.map +1 -0
- package/lib/test/runtime-comms.d.ts +1 -0
- package/lib/test/runtime-comms.js +321 -0
- package/lib/test/runtime-comms.js.map +1 -0
- package/lib/test/subscriptions.d.ts +1 -0
- package/lib/test/subscriptions.js +334 -0
- package/lib/test/subscriptions.js.map +1 -0
- package/package.json +112 -0
- package/static/98_slides.html +61 -0
- package/static/Norsk-Favicon-150x150.png +0 -0
- package/static/Norsk-Favicon.png +0 -0
- package/static/Norsk-Logo-Dark-Background.png +0 -0
- package/static/Norsk.png +0 -0
- package/static/ShortStack.woff2 +0 -0
- package/static/bonnie-green.png +0 -0
- package/static/button.svg +67 -0
- package/static/doodle.css +174 -0
- package/static/flowbite.min.css +1 -0
- package/static/flowbite.min.js +2 -0
- package/static/font.css +20 -0
- package/static/jese-leos.png +0 -0
- package/static/joseph-mcfall.png +0 -0
- package/static/michael-gough.png +0 -0
- package/static/news-embedded.html +106 -0
- package/static/overlay-score.html +210 -0
- package/static/overlay-ui.html +918 -0
- package/static/react-dom.development.js +29869 -0
- package/static/react.development.js +3342 -0
- package/static/robert-brown.png +0 -0
- package/static/roberta-casas.png +0 -0
- package/static/style-dark.css +2467 -0
- package/static/style.css +7252 -0
- package/static/tailwind.css +31 -0
- package/static/team1.png +0 -0
- package/static/team2.png +0 -0
- package/static/videoFrame.html +73 -0
- package/static/webrtc.js +430 -0
- package/tailwind-theme.js +66 -0
- package/tailwind.config.js +11 -0
- package/ui/bypass-esbuild.js +24 -0
- package/ui/index.html +189 -0
- package/ui/index.js +229180 -0
- package/ui/studio.css +31 -0
- package/ui/test.html +95 -0
- package/ui/view.html +23 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-registration.js","sourceRoot":"","sources":["../../src/server/session-registration.ts"],"names":[],"mappings":";;;AAEA,MAAM,QAAQ,GAA+B,IAAI,GAAG,EAAE,CAAC;AAG1C,QAAA,WAAW,GAAG,QAAQ,CAAC;AAEpC,SAAgB,eAAe,CAAC,OAAsB;IACpD,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC;AAFD,0CAEC;AAED,SAAgB,iBAAiB,CAAC,OAAsB;IACtD,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAFD,8CAEC;AAED,SAAgB,aAAa,CAAC,UAAkB;IAC9C,OAAO,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAClC,CAAC;AAFD,sCAEC"}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import WebSocket from 'ws';
|
|
3
|
+
import { ChildProcess } from 'node:child_process';
|
|
4
|
+
import ServerMsg from '../shared/server-msg';
|
|
5
|
+
import { DocumentDescription, YamlDocument } from '../shared/document';
|
|
6
|
+
import { Summary } from '../shared/norsk';
|
|
7
|
+
import EventHandler from "eventhandler";
|
|
8
|
+
import { NorskComms } from '../runtime/norsk-comms';
|
|
9
|
+
import Library from '../client/library';
|
|
10
|
+
import { RuntimeSystem } from '../runtime/system';
|
|
11
|
+
export declare class SessionProxy {
|
|
12
|
+
session: ActiveSession;
|
|
13
|
+
ws: WebSocket;
|
|
14
|
+
constructor(ws: WebSocket, session: ActiveSession);
|
|
15
|
+
handshake(): void;
|
|
16
|
+
onSessionMsg(msg: ServerMsg): void;
|
|
17
|
+
sendMsg(msg: ServerMsg): void;
|
|
18
|
+
}
|
|
19
|
+
export declare class ActiveSession {
|
|
20
|
+
running?: RunAttempt;
|
|
21
|
+
system: RuntimeSystem;
|
|
22
|
+
library: Library;
|
|
23
|
+
norskState?: Summary;
|
|
24
|
+
studioState?: InitialNodeCollection;
|
|
25
|
+
runtimeState?: {
|
|
26
|
+
[id: string]: object;
|
|
27
|
+
};
|
|
28
|
+
sessionKey: string;
|
|
29
|
+
events: EventHandler;
|
|
30
|
+
latest?: {
|
|
31
|
+
document: DocumentDescription;
|
|
32
|
+
originalFilename?: string;
|
|
33
|
+
};
|
|
34
|
+
norsk: NorskComms;
|
|
35
|
+
outputs: {
|
|
36
|
+
id: string;
|
|
37
|
+
url: string;
|
|
38
|
+
}[];
|
|
39
|
+
constructor(sessionKey: string, system: RuntimeSystem);
|
|
40
|
+
listen(listener: (msg: ServerMsg) => void): void;
|
|
41
|
+
deafen(listener: (msg: ServerMsg) => void): void;
|
|
42
|
+
onMessage(e: WebSocket.MessageEvent): Promise<undefined>;
|
|
43
|
+
sendCommand(id: string, command: object): Promise<void>;
|
|
44
|
+
sendMsg(msg: ServerMsg): Promise<void>;
|
|
45
|
+
start(latest: YamlDocument, originalFilename?: string): Promise<void>;
|
|
46
|
+
writeTemp(latest: DocumentDescription): Promise<string>;
|
|
47
|
+
stop(): Promise<void>;
|
|
48
|
+
notifyOutputRegistered(id: string, url: string): void;
|
|
49
|
+
notifyStateUpdate(id: string, state: object): void;
|
|
50
|
+
notifyInitialState(state: {
|
|
51
|
+
[id: string]: object;
|
|
52
|
+
}): void;
|
|
53
|
+
notifyStateEvent(id: string, event: object): Promise<void>;
|
|
54
|
+
notifyStopped(err?: Error): Promise<void>;
|
|
55
|
+
setNorskState(latest: Summary): void;
|
|
56
|
+
notifyInitialNodes(nodes: InitialNodeCollection): void;
|
|
57
|
+
maybeSendRunningUpdate(): void;
|
|
58
|
+
}
|
|
59
|
+
declare class RunAttempt {
|
|
60
|
+
parent: ActiveSession;
|
|
61
|
+
filename: string;
|
|
62
|
+
controller?: AbortController;
|
|
63
|
+
child?: ChildProcess;
|
|
64
|
+
constructor(parent: ActiveSession, filename: string);
|
|
65
|
+
start(): Promise<void>;
|
|
66
|
+
onExit(): Promise<void>;
|
|
67
|
+
onError(e: Error): Promise<void>;
|
|
68
|
+
sendMsg(msg: ChildInstruction): Promise<void>;
|
|
69
|
+
onChildMessage(message: ChildMessage): Promise<void>;
|
|
70
|
+
stop(): Promise<void>;
|
|
71
|
+
}
|
|
72
|
+
export type ChildInstruction = {
|
|
73
|
+
type: 'node-command';
|
|
74
|
+
id: string;
|
|
75
|
+
command: object;
|
|
76
|
+
} | {
|
|
77
|
+
type: 'shutdown';
|
|
78
|
+
};
|
|
79
|
+
export type ChildMessage = OutputMessage | InitialStateMessage | StateUpdateMessage | StateEventMessage | Finished | InitialNodes;
|
|
80
|
+
export type Finished = {
|
|
81
|
+
type: 'finished';
|
|
82
|
+
};
|
|
83
|
+
export type OutputMessage = {
|
|
84
|
+
type: "output";
|
|
85
|
+
id: string;
|
|
86
|
+
url: string;
|
|
87
|
+
};
|
|
88
|
+
export type InitialStateMessage = {
|
|
89
|
+
type: "initial-state";
|
|
90
|
+
state: {
|
|
91
|
+
[id: string]: object;
|
|
92
|
+
};
|
|
93
|
+
};
|
|
94
|
+
export type InitialNodes = {
|
|
95
|
+
type: "initial-nodes";
|
|
96
|
+
nodes: InitialNodeCollection;
|
|
97
|
+
};
|
|
98
|
+
export type InitialNodeCollection = {
|
|
99
|
+
[id: string]: {
|
|
100
|
+
id: string;
|
|
101
|
+
relatedMediaNodes: {
|
|
102
|
+
input: string[];
|
|
103
|
+
output: string[];
|
|
104
|
+
};
|
|
105
|
+
};
|
|
106
|
+
};
|
|
107
|
+
export type StateUpdateMessage = {
|
|
108
|
+
type: "state-update";
|
|
109
|
+
id: string;
|
|
110
|
+
state: object;
|
|
111
|
+
};
|
|
112
|
+
export type StateEventMessage = {
|
|
113
|
+
type: "state-event";
|
|
114
|
+
id: string;
|
|
115
|
+
event: object;
|
|
116
|
+
};
|
|
117
|
+
export {};
|
|
@@ -0,0 +1,364 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
28
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.ActiveSession = exports.SessionProxy = void 0;
|
|
30
|
+
const node_child_process_1 = require("node:child_process");
|
|
31
|
+
const YAML = __importStar(require("yaml"));
|
|
32
|
+
const path = __importStar(require("path"));
|
|
33
|
+
const fs = __importStar(require("fs/promises"));
|
|
34
|
+
const util_1 = require("../shared/util");
|
|
35
|
+
const document_1 = require("../shared/document");
|
|
36
|
+
const tmp = __importStar(require("tmp"));
|
|
37
|
+
const eventhandler_1 = __importDefault(require("eventhandler"));
|
|
38
|
+
const session_registration_1 = require("./session-registration");
|
|
39
|
+
const norsk_comms_1 = require("../runtime/norsk-comms");
|
|
40
|
+
const config_1 = __importDefault(require("./config"));
|
|
41
|
+
const logging_1 = require("./logging");
|
|
42
|
+
const runtime_1 = require("../test/_util/runtime");
|
|
43
|
+
class SessionProxy {
|
|
44
|
+
session;
|
|
45
|
+
ws;
|
|
46
|
+
constructor(ws, session) {
|
|
47
|
+
this.ws = ws;
|
|
48
|
+
this.session = session;
|
|
49
|
+
this.session.listen(this.onSessionMsg.bind(this));
|
|
50
|
+
this.ws.onmessage = this.session.onMessage.bind(this.session);
|
|
51
|
+
}
|
|
52
|
+
handshake() {
|
|
53
|
+
this.ws.send('hello');
|
|
54
|
+
if (this.session.running && this.session.latest && this.session.runtimeState) {
|
|
55
|
+
this.sendMsg({
|
|
56
|
+
type: 'init',
|
|
57
|
+
sessionKey: this.session.sessionKey,
|
|
58
|
+
document: this.session.latest?.document.toYaml(),
|
|
59
|
+
filename: this.session.latest?.originalFilename
|
|
60
|
+
});
|
|
61
|
+
this.sendMsg({ type: 'runtime-state', state: this.session.runtimeState });
|
|
62
|
+
for (const o of this.session.outputs) {
|
|
63
|
+
this.sendMsg({
|
|
64
|
+
type: 'output',
|
|
65
|
+
id: o.id,
|
|
66
|
+
url: o.url
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
this.sendMsg({
|
|
72
|
+
type: 'init',
|
|
73
|
+
sessionKey: this.session.sessionKey
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
onSessionMsg(msg) {
|
|
78
|
+
this.sendMsg(msg);
|
|
79
|
+
}
|
|
80
|
+
sendMsg(msg) {
|
|
81
|
+
this.ws.send(JSON.stringify(msg));
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
exports.SessionProxy = SessionProxy;
|
|
85
|
+
class ActiveSession {
|
|
86
|
+
running;
|
|
87
|
+
system;
|
|
88
|
+
library;
|
|
89
|
+
norskState;
|
|
90
|
+
studioState;
|
|
91
|
+
runtimeState;
|
|
92
|
+
sessionKey;
|
|
93
|
+
events;
|
|
94
|
+
latest;
|
|
95
|
+
norsk;
|
|
96
|
+
outputs = [];
|
|
97
|
+
constructor(sessionKey, system) {
|
|
98
|
+
this.sessionKey = sessionKey;
|
|
99
|
+
this.system = system;
|
|
100
|
+
this.events = new eventhandler_1.default();
|
|
101
|
+
this.library = (0, runtime_1.extractLibraryFromRuntime)(this.system);
|
|
102
|
+
this.norsk = new norsk_comms_1.NorskComms({
|
|
103
|
+
host: config_1.default.norsk.host(), port: config_1.default.norsk.support_port(),
|
|
104
|
+
onUpdate: async () => {
|
|
105
|
+
this.setNorskState(this.norsk.current());
|
|
106
|
+
}
|
|
107
|
+
});
|
|
108
|
+
(0, session_registration_1.registerSession)(this);
|
|
109
|
+
}
|
|
110
|
+
listen(listener) {
|
|
111
|
+
this.events.on('ev', listener);
|
|
112
|
+
}
|
|
113
|
+
deafen(listener) {
|
|
114
|
+
this.events.removeEventListener('ev', listener);
|
|
115
|
+
}
|
|
116
|
+
async onMessage(e) {
|
|
117
|
+
const msg = JSON.parse(e.data.toString());
|
|
118
|
+
const msgType = msg.type;
|
|
119
|
+
switch (msgType) {
|
|
120
|
+
case 'start': {
|
|
121
|
+
if (msg.latest) {
|
|
122
|
+
await this.start(msg.latest, msg.originalFilename);
|
|
123
|
+
await this.sendMsg({ type: 'started' });
|
|
124
|
+
}
|
|
125
|
+
break;
|
|
126
|
+
}
|
|
127
|
+
case 'node-command':
|
|
128
|
+
await this.sendCommand(msg.id, msg.command);
|
|
129
|
+
break;
|
|
130
|
+
case 'stop':
|
|
131
|
+
await this.stop();
|
|
132
|
+
await this.sendMsg({ type: 'stopped' });
|
|
133
|
+
break;
|
|
134
|
+
default:
|
|
135
|
+
return (0, util_1.assertUnreachable)(msgType);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
async sendCommand(id, command) {
|
|
139
|
+
(0, logging_1.debuglog)("proxying command to runner", id, command);
|
|
140
|
+
await this.running?.sendMsg({ type: 'node-command', id, command });
|
|
141
|
+
}
|
|
142
|
+
async sendMsg(msg) {
|
|
143
|
+
this.events.emit('ev', msg);
|
|
144
|
+
}
|
|
145
|
+
async start(latest, originalFilename) {
|
|
146
|
+
const doc = new document_1.DocumentDescription(this.library, latest);
|
|
147
|
+
(0, logging_1.debuglog)('Start request heeded');
|
|
148
|
+
if (this.running) {
|
|
149
|
+
(0, logging_1.errorlog)("Attempt to start, but already running");
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
const filename = await this.writeTemp(doc);
|
|
153
|
+
this.latest = { document: doc, originalFilename };
|
|
154
|
+
this.running = new RunAttempt(this, filename);
|
|
155
|
+
await this.running.start();
|
|
156
|
+
}
|
|
157
|
+
async writeTemp(latest) {
|
|
158
|
+
const yaml = YAML.stringify(latest.toYaml());
|
|
159
|
+
const promise = new Promise((resolve, reject) => {
|
|
160
|
+
tmp.file(async (err, path) => {
|
|
161
|
+
if (err)
|
|
162
|
+
return reject(err);
|
|
163
|
+
await fs.writeFile(path, yaml);
|
|
164
|
+
resolve(path);
|
|
165
|
+
});
|
|
166
|
+
});
|
|
167
|
+
return promise;
|
|
168
|
+
}
|
|
169
|
+
async stop() {
|
|
170
|
+
if (this.running) {
|
|
171
|
+
await this.running.stop();
|
|
172
|
+
this.running = undefined;
|
|
173
|
+
}
|
|
174
|
+
this.norsk.close();
|
|
175
|
+
(0, session_registration_1.deregisterSession)(this);
|
|
176
|
+
}
|
|
177
|
+
notifyOutputRegistered(id, url) {
|
|
178
|
+
this.outputs.push({ id, url });
|
|
179
|
+
void this.sendMsg({ type: "output", id, url });
|
|
180
|
+
}
|
|
181
|
+
notifyStateUpdate(id, state) {
|
|
182
|
+
if (this.runtimeState)
|
|
183
|
+
this.runtimeState[id] = state;
|
|
184
|
+
void this.sendMsg({ type: 'runtime-node-state', id, state });
|
|
185
|
+
}
|
|
186
|
+
notifyInitialState(state) {
|
|
187
|
+
this.runtimeState = state;
|
|
188
|
+
void this.sendMsg({ type: 'runtime-state', state });
|
|
189
|
+
}
|
|
190
|
+
async notifyStateEvent(id, event) {
|
|
191
|
+
const node = this.latest?.document.findNode(id);
|
|
192
|
+
if (!node) {
|
|
193
|
+
console.error("Event sent from execution for non-existent node");
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
const info = this.system.findComponentDefinition(node.type);
|
|
197
|
+
const handleEvent = info?.info.runtime?.handleEvent;
|
|
198
|
+
const current = this.runtimeState?.[id];
|
|
199
|
+
if (!handleEvent) {
|
|
200
|
+
console.error("Event sent from execution for node without a handler");
|
|
201
|
+
return;
|
|
202
|
+
}
|
|
203
|
+
if (!current) {
|
|
204
|
+
console.error("Event sent from execution for node without a handler");
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
207
|
+
const updated = handleEvent(event, current);
|
|
208
|
+
if (this.runtimeState) {
|
|
209
|
+
this.runtimeState[id] = updated;
|
|
210
|
+
}
|
|
211
|
+
await this.sendMsg({ type: 'runtime-event', id, event });
|
|
212
|
+
}
|
|
213
|
+
async notifyStopped(err) {
|
|
214
|
+
(0, logging_1.debuglog)("Child stopped", err);
|
|
215
|
+
this.running = undefined;
|
|
216
|
+
await this.sendMsg({ type: 'stopped' });
|
|
217
|
+
}
|
|
218
|
+
setNorskState(latest) {
|
|
219
|
+
this.norskState = latest;
|
|
220
|
+
this.maybeSendRunningUpdate();
|
|
221
|
+
}
|
|
222
|
+
notifyInitialNodes(nodes) {
|
|
223
|
+
this.studioState = nodes;
|
|
224
|
+
this.maybeSendRunningUpdate();
|
|
225
|
+
}
|
|
226
|
+
maybeSendRunningUpdate() {
|
|
227
|
+
if (!this.norskState)
|
|
228
|
+
return;
|
|
229
|
+
if (!this.studioState)
|
|
230
|
+
return;
|
|
231
|
+
const status = {
|
|
232
|
+
nodes: {}
|
|
233
|
+
};
|
|
234
|
+
const intermediate = {};
|
|
235
|
+
const sourceToDest = new Map();
|
|
236
|
+
for (const [id, node] of Object.entries(this.studioState)) {
|
|
237
|
+
const input = (node.relatedMediaNodes?.input ?? [id]).map((n) => {
|
|
238
|
+
const node = this.norskState?.nodes[n];
|
|
239
|
+
if (node)
|
|
240
|
+
sourceToDest.set(node?.id, id);
|
|
241
|
+
return node;
|
|
242
|
+
}).filter((n) => !!n);
|
|
243
|
+
const output = node.relatedMediaNodes.output.map((o) => {
|
|
244
|
+
return this.norskState?.nodes[o];
|
|
245
|
+
}).filter((n) => !!n);
|
|
246
|
+
intermediate[id] = {
|
|
247
|
+
input,
|
|
248
|
+
output
|
|
249
|
+
};
|
|
250
|
+
}
|
|
251
|
+
for (const [id, node] of Object.entries(intermediate)) {
|
|
252
|
+
status.nodes[id] = {
|
|
253
|
+
displayName: id,
|
|
254
|
+
id,
|
|
255
|
+
mediaNodes: node.input.concat(node.output),
|
|
256
|
+
outputs: (node.output.flatMap((o) => o.outputs ?? []).map(({ conversions, destMediaNodeId, destInputPin }) => ({ conversions, destMediaNodeId, destInputPin, destNodeId: sourceToDest.get(destMediaNodeId) }))).filter((o) => !!o.destNodeId)
|
|
257
|
+
};
|
|
258
|
+
}
|
|
259
|
+
void this.sendMsg({
|
|
260
|
+
type: 'running',
|
|
261
|
+
summary: status
|
|
262
|
+
});
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
exports.ActiveSession = ActiveSession;
|
|
266
|
+
class RunAttempt {
|
|
267
|
+
parent;
|
|
268
|
+
filename;
|
|
269
|
+
controller;
|
|
270
|
+
child;
|
|
271
|
+
constructor(parent, filename) {
|
|
272
|
+
this.parent = parent;
|
|
273
|
+
this.filename = filename;
|
|
274
|
+
this.controller = undefined;
|
|
275
|
+
}
|
|
276
|
+
async start() {
|
|
277
|
+
const controller = new AbortController();
|
|
278
|
+
const { signal } = controller;
|
|
279
|
+
this.child = (0, node_child_process_1.fork)(path.join(__dirname, 'runner'), [this.filename, config_1.default.norsk.host(), config_1.default.norsk.api_port().toString(10)], {
|
|
280
|
+
signal,
|
|
281
|
+
detached: false,
|
|
282
|
+
...(process.env.DEBUG_TEST ? {} : {
|
|
283
|
+
silent: true,
|
|
284
|
+
stdio: 'ignore'
|
|
285
|
+
})
|
|
286
|
+
});
|
|
287
|
+
this.child.on('error', this.onError.bind(this));
|
|
288
|
+
this.child.on('exit', this.onExit.bind(this));
|
|
289
|
+
this.controller = controller;
|
|
290
|
+
this.child.on('message', this.onChildMessage.bind(this));
|
|
291
|
+
}
|
|
292
|
+
async onExit() {
|
|
293
|
+
if (!this.child)
|
|
294
|
+
return;
|
|
295
|
+
this.child = undefined;
|
|
296
|
+
await this.parent.notifyStopped(undefined);
|
|
297
|
+
}
|
|
298
|
+
async onError(e) {
|
|
299
|
+
if (!this.child)
|
|
300
|
+
return;
|
|
301
|
+
this.child?.kill('SIGKILL');
|
|
302
|
+
this.child = undefined;
|
|
303
|
+
if (e.name === 'AbortError') {
|
|
304
|
+
await this.parent.notifyStopped(undefined);
|
|
305
|
+
}
|
|
306
|
+
else {
|
|
307
|
+
await this.parent.notifyStopped(e);
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
async sendMsg(msg) {
|
|
311
|
+
this.child?.send(msg);
|
|
312
|
+
}
|
|
313
|
+
async onChildMessage(message) {
|
|
314
|
+
const messageType = message.type;
|
|
315
|
+
switch (messageType) {
|
|
316
|
+
case "output":
|
|
317
|
+
this.parent.notifyOutputRegistered(message.id, message.url);
|
|
318
|
+
break;
|
|
319
|
+
case "initial-state":
|
|
320
|
+
this.parent.notifyInitialState(message.state);
|
|
321
|
+
break;
|
|
322
|
+
case "state-update":
|
|
323
|
+
this.parent.notifyStateUpdate(message.id, message.state);
|
|
324
|
+
break;
|
|
325
|
+
case "state-event":
|
|
326
|
+
await this.parent.notifyStateEvent(message.id, message.event);
|
|
327
|
+
break;
|
|
328
|
+
case "initial-nodes":
|
|
329
|
+
this.parent.notifyInitialNodes(message.nodes);
|
|
330
|
+
break;
|
|
331
|
+
case "finished":
|
|
332
|
+
this.controller?.abort();
|
|
333
|
+
this.child = undefined;
|
|
334
|
+
this.controller = undefined;
|
|
335
|
+
break;
|
|
336
|
+
default:
|
|
337
|
+
(0, util_1.assertUnreachable)(messageType);
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
async stop() {
|
|
341
|
+
await this.sendMsg({ 'type': 'shutdown' });
|
|
342
|
+
setTimeout(() => {
|
|
343
|
+
if (this.child) {
|
|
344
|
+
this.child?.kill('SIGKILL');
|
|
345
|
+
this.controller?.abort();
|
|
346
|
+
this.child = undefined;
|
|
347
|
+
this.controller = undefined;
|
|
348
|
+
}
|
|
349
|
+
}, 5000.0);
|
|
350
|
+
const waitFn = (r) => {
|
|
351
|
+
if (this.child) {
|
|
352
|
+
setTimeout(() => waitFn(r), 10);
|
|
353
|
+
return;
|
|
354
|
+
}
|
|
355
|
+
else {
|
|
356
|
+
r();
|
|
357
|
+
}
|
|
358
|
+
};
|
|
359
|
+
return new Promise((r) => {
|
|
360
|
+
setTimeout(() => waitFn(r), 10.0);
|
|
361
|
+
});
|
|
362
|
+
}
|
|
363
|
+
}
|
|
364
|
+
//# sourceMappingURL=session.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client-msg.js","sourceRoot":"","sources":["../../src/shared/client-msg.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type Registration from "../extension/registration";
|
|
2
|
+
import type { GlobalFormEntry } from "../extension/client-types";
|
|
3
|
+
export declare function GlobalIceServers(f: Registration): GlobalFormEntry<string[]>;
|
|
4
|
+
export type HardwareAccelerationType = "quadra" | "logan" | "nvidia" | "ma35d";
|
|
5
|
+
export declare function contractHardwareAcceleration<Accepted extends HardwareAccelerationType>(value: HardwareAccelerationType | undefined, accepted: Accepted[]): Accepted | undefined;
|
|
6
|
+
export declare function HardwareSelection(): GlobalFormEntry<HardwareAccelerationType | undefined>;
|
|
7
|
+
export declare function RootDataDir(): GlobalFormEntry<string>;
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RootDataDir = exports.HardwareSelection = exports.contractHardwareAcceleration = exports.GlobalIceServers = void 0;
|
|
4
|
+
function GlobalIceServers(f) {
|
|
5
|
+
return {
|
|
6
|
+
id: 'ice-servers',
|
|
7
|
+
form: {
|
|
8
|
+
help: "ICE Servers to use in STUN negotiation (one per line)",
|
|
9
|
+
hint: {
|
|
10
|
+
type: 'list',
|
|
11
|
+
validation: f.validation.Z.array(f.validation.IceServer),
|
|
12
|
+
defaultValue: ["stun:stun.l.google.com:19302"]
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
exports.GlobalIceServers = GlobalIceServers;
|
|
18
|
+
function contractHardwareAcceleration(value, accepted) {
|
|
19
|
+
if (!value)
|
|
20
|
+
return undefined;
|
|
21
|
+
const expanded = accepted;
|
|
22
|
+
if (expanded.includes(value)) {
|
|
23
|
+
return value;
|
|
24
|
+
}
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
exports.contractHardwareAcceleration = contractHardwareAcceleration;
|
|
28
|
+
function HardwareSelection() {
|
|
29
|
+
return {
|
|
30
|
+
id: 'hardware-acceleration',
|
|
31
|
+
form: {
|
|
32
|
+
help: "Where available, use the specified hardware for encodes/compose operations",
|
|
33
|
+
hint: {
|
|
34
|
+
type: 'select',
|
|
35
|
+
optional: true,
|
|
36
|
+
options: [
|
|
37
|
+
{ value: "ma35d", display: "MA35D" },
|
|
38
|
+
{ value: "quadra", display: "Quadra" },
|
|
39
|
+
{ value: "nvidia", display: "Nvidia" },
|
|
40
|
+
{ value: "logan", display: "Logan" },
|
|
41
|
+
],
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
exports.HardwareSelection = HardwareSelection;
|
|
47
|
+
function RootDataDir() {
|
|
48
|
+
return {
|
|
49
|
+
id: 'root-data-dir',
|
|
50
|
+
form: {
|
|
51
|
+
help: "The root data dir to use against relative file paths in components/etc",
|
|
52
|
+
hint: {
|
|
53
|
+
type: 'text',
|
|
54
|
+
defaultValue: "/"
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
exports.RootDataDir = RootDataDir;
|
|
60
|
+
//# sourceMappingURL=config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/shared/config.ts"],"names":[],"mappings":";;;AAGA,SAAgB,gBAAgB,CAAC,CAAe;IAC9C,OAAO;QACL,EAAE,EAAE,aAAa;QACjB,IAAI,EAAE;YACJ,IAAI,EAAE,uDAAuD;YAC7D,IAAI,EAAE;gBACJ,IAAI,EAAE,MAAM;gBACZ,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC;gBACxD,YAAY,EAAE,CAAC,8BAA8B,CAAC;aAC/C;SACF;KACF,CAAA;AACH,CAAC;AAZD,4CAYC;AAMD,SAAgB,4BAA4B,CAA4C,KAA2C,EAAE,QAAoB;IACvJ,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,QAAQ,GAAG,QAAsC,CAAC;IACxD,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAiB,CAAC;IAC3B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAPD,oEAOC;AAED,SAAgB,iBAAiB;IAC/B,OAAO;QACL,EAAE,EAAE,uBAAuB;QAC3B,IAAI,EAAE;YACJ,IAAI,EAAE,4EAA4E;YAClF,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;gBACd,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE;oBACpC,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE;oBACtC,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE;oBACtC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE;iBACrC;aACF;SACF;KACF,CAAA;AACH,CAAC;AAjBD,8CAiBC;AAGD,SAAgB,WAAW;IACzB,OAAO;QACL,EAAE,EAAE,eAAe;QACnB,IAAI,EAAE;YACJ,IAAI,EAAE,wEAAwE;YAC9E,IAAI,EAAE;gBACJ,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG;aAClB;SACF;KACF,CAAA;AACH,CAAC;AAXD,kCAWC"}
|