@norskvideo/norsk-studio-built-ins 1.7.0 → 1.8.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/client/info.js +1 -1
- package/lib/input.rtmp/info.js +1 -1
- package/lib/input.srt-caller/runtime.d.ts +2 -2
- package/lib/input.srt-caller/runtime.js +26 -2
- package/lib/input.srt-caller/runtime.js.map +1 -1
- package/lib/output.rtmp/runtime.js +6 -2
- package/lib/output.rtmp/runtime.js.map +1 -1
- package/package.json +2 -2
package/client/info.js
CHANGED
@@ -15446,7 +15446,7 @@ var init_inline_view9 = __esm({
|
|
15446
15446
|
var import_react = __toESM(require_react());
|
15447
15447
|
var InlineView2 = import_react.default.lazy(async () => Promise.resolve().then(() => (init_inline_view(), inline_view_exports)));
|
15448
15448
|
var SummaryView2 = import_react.default.lazy(async () => Promise.resolve().then(() => (init_summary_view(), summary_view_exports)));
|
15449
|
-
var defaultPort =
|
15449
|
+
var defaultPort = 1935;
|
15450
15450
|
function info_default({ defineComponent, Av, validation: { Z, Port, SourceName, unique } }) {
|
15451
15451
|
return defineComponent({
|
15452
15452
|
identifier: "input.rtmp",
|
package/lib/input.rtmp/info.js
CHANGED
@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
const react_1 = __importDefault(require("react"));
|
30
30
|
const InlineView = react_1.default.lazy(async () => Promise.resolve().then(() => __importStar(require('./inline-view'))));
|
31
31
|
const SummaryView = react_1.default.lazy(async () => Promise.resolve().then(() => __importStar(require('./summary-view'))));
|
32
|
-
const defaultPort =
|
32
|
+
const defaultPort = 1935;
|
33
33
|
function default_1({ defineComponent, Av, validation: { Z, Port, SourceName, unique } }) {
|
34
34
|
return defineComponent({
|
35
35
|
identifier: 'input.rtmp',
|
@@ -1,12 +1,12 @@
|
|
1
1
|
import { Norsk, SrtInputSettings as SdkSettings } from '@norskvideo/norsk-sdk';
|
2
2
|
import { SocketOptions } from '../shared/srt-types';
|
3
3
|
import { SimpleInputWrapper } from '@norskvideo/norsk-studio/lib/extension/base-nodes';
|
4
|
-
import { OnCreated, ServerComponentDefinition } from '@norskvideo/norsk-studio/lib/extension/runtime-types';
|
4
|
+
import { OnCreated, ServerComponentDefinition, StudioRuntime } from '@norskvideo/norsk-studio/lib/extension/runtime-types';
|
5
5
|
export type SrtInputSettings = Pick<SdkSettings, 'port' | 'ip' | 'sourceName' | 'passphrase' | 'streamId'> & {
|
6
6
|
id: string;
|
7
7
|
displayName: string;
|
8
8
|
socketOptions: SocketOptions;
|
9
9
|
};
|
10
10
|
export default class SrtInputDefinition implements ServerComponentDefinition<SrtInputSettings, SimpleInputWrapper> {
|
11
|
-
create(norsk: Norsk, cfg: SrtInputSettings, cb: OnCreated<SimpleInputWrapper
|
11
|
+
create(norsk: Norsk, cfg: SrtInputSettings, cb: OnCreated<SimpleInputWrapper>, runtime: StudioRuntime): Promise<void>;
|
12
12
|
}
|
@@ -1,10 +1,34 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
const base_nodes_1 = require("@norskvideo/norsk-studio/lib/extension/base-nodes");
|
4
|
+
const util_1 = require("@norskvideo/norsk-studio/lib/shared/util");
|
4
5
|
class SrtInputDefinition {
|
5
|
-
async create(norsk, cfg, cb) {
|
6
|
+
async create(norsk, cfg, cb, runtime) {
|
7
|
+
runtime.updates.setAlert('disconnected', {
|
8
|
+
message: 'SRT Caller is not connected',
|
9
|
+
level: 'error'
|
10
|
+
});
|
6
11
|
const wrapper = new base_nodes_1.SimpleInputWrapper(cfg.id, async () => {
|
7
|
-
return await norsk.input.srt({
|
12
|
+
return await norsk.input.srt({
|
13
|
+
mode: 'caller',
|
14
|
+
onConnection: () => {
|
15
|
+
runtime.updates.clearAlert('disconnected');
|
16
|
+
return { accept: true, sourceName: cfg.id };
|
17
|
+
},
|
18
|
+
onConnectionStatusChange(status, _sourceName) {
|
19
|
+
switch (status) {
|
20
|
+
case 'disconnected':
|
21
|
+
runtime.updates.setAlert('disconnected', {
|
22
|
+
message: 'SRT Caller got disconnected',
|
23
|
+
level: 'error'
|
24
|
+
});
|
25
|
+
break;
|
26
|
+
default:
|
27
|
+
(0, util_1.assertUnreachable)(status);
|
28
|
+
}
|
29
|
+
},
|
30
|
+
...cfg
|
31
|
+
});
|
8
32
|
});
|
9
33
|
await wrapper.initialised;
|
10
34
|
cb(wrapper);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/input.srt-caller/runtime.ts"],"names":[],"mappings":";;AAEA,kFAAuF;
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/input.srt-caller/runtime.ts"],"names":[],"mappings":";;AAEA,kFAAuF;AAEvF,mEAA6E;AAQ7E,MAAqB,kBAAkB;IACrC,KAAK,CAAC,MAAM,CAAC,KAAY,EAAE,GAAqB,EAAE,EAAiC,EAAE,OAAsB;QACzG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE;YACvC,OAAO,EAAE,6BAA6B;YACtC,KAAK,EAAE,OAAO;SACf,CAAC,CAAA;QACF,MAAM,OAAO,GAAG,IAAI,+BAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,IAAI,EAAE;YACxD,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;gBAC3B,IAAI,EAAE,QAAQ;gBACd,YAAY,EAAE,GAAG,EAAE;oBACjB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;oBAC3C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,EAAE,CAAA;gBAC7C,CAAC;gBACD,wBAAwB,CAAC,MAAM,EAAE,WAAW;oBAC1C,QAAQ,MAAM,EAAE,CAAC;wBACf,KAAK,cAAc;4BACjB,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE;gCACvC,OAAO,EAAE,6BAA6B;gCACtC,KAAK,EAAE,OAAO;6BACf,CAAC,CAAA;4BACF,MAAM;wBACR;4BACE,IAAA,wBAAiB,EAAC,MAAM,CAAC,CAAC;oBAE9B,CAAC;gBACH,CAAC;gBACD,GAAG,GAAG;aACP,CAAC,CAAC;QACL,CAAC,CAAC,CAAA;QACF,MAAM,OAAO,CAAC,WAAW,CAAC;QAC1B,EAAE,CAAC,OAAO,CAAC,CAAC;IACd,CAAC;CACF;AAhCD,qCAgCC"}
|
@@ -30,8 +30,12 @@ class RtmpOutput extends base_nodes_1.CustomSinkNode {
|
|
30
30
|
bufferDelayMs: this.cfg.bufferDelayMs,
|
31
31
|
avDelayMs: this.cfg.avDelayMs,
|
32
32
|
retryConnectionTimeout: this.cfg.retryConnectionTimeout,
|
33
|
-
onPublishStart: () => {
|
33
|
+
onPublishStart: () => {
|
34
|
+
this.updates.clearAlert('connection-error');
|
35
|
+
this.updates.raiseEvent({ type: "rtmp-server-connected-and-publishing" });
|
36
|
+
},
|
34
37
|
onConnectionFailure: (reason) => {
|
38
|
+
this.updates.setAlert('connection-error', { level: 'error', message: "Failed to connect" });
|
35
39
|
switch (reason) {
|
36
40
|
case norsk_sdk_1.RtmpConnectionFailureReason.RtmpConnectionFailedRetry:
|
37
41
|
this.updates.raiseEvent({ type: "rtmp-server-connection-failed-retry" });
|
@@ -42,7 +46,7 @@ class RtmpOutput extends base_nodes_1.CustomSinkNode {
|
|
42
46
|
}
|
43
47
|
};
|
44
48
|
this.rtmp = await this.norsk.output.rtmp(rtmpCfg);
|
45
|
-
this.setup({ sink: this.rtmp }, { requireOneOfEverything: true });
|
49
|
+
this.setup({ sink: this.rtmp, updates: this.updates }, { requireOneOfEverything: true });
|
46
50
|
}
|
47
51
|
}
|
48
52
|
function assertUnreachable(_) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/output.rtmp/runtime.ts"],"names":[],"mappings":";;AAAA,qDAA8H;AAG9H,kFAAsG;AAsBtG,MAAqB,oBAAoB;IACvC,KAAK,CAAC,MAAM,CAAC,KAAY,EAAE,GAAuB,EAAE,EAAgC,EAAE,EAAE,OAAO,EAAmD;QAChJ,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;QAChD,MAAM,IAAI,CAAC,WAAW,CAAC;QACvB,EAAE,CAAC,IAAI,CAAC,CAAC;IACX,CAAC;CACF;AAND,uCAMC;AAED,MAAM,UAAW,SAAQ,2BAAc;IACrC,WAAW,CAAgB;IAC3B,KAAK,CAAQ;IACb,OAAO,CAAmD;IAE1D,GAAG,CAAqB;IACxB,IAAI,CAAkB;IAEtB,YAAY,KAAY,EAAE,OAAyD,EAAE,GAAuB;QAC1G,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACd,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,OAAO,GAAgB;YAC3B,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE;YACf,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG;YACjB,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa;YACrC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS;YAC7B,sBAAsB,EAAE,IAAI,CAAC,GAAG,CAAC,sBAAsB;YACvD,cAAc,EAAE,GAAG,EAAE,
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/output.rtmp/runtime.ts"],"names":[],"mappings":";;AAAA,qDAA8H;AAG9H,kFAAsG;AAsBtG,MAAqB,oBAAoB;IACvC,KAAK,CAAC,MAAM,CAAC,KAAY,EAAE,GAAuB,EAAE,EAAgC,EAAE,EAAE,OAAO,EAAmD;QAChJ,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;QAChD,MAAM,IAAI,CAAC,WAAW,CAAC;QACvB,EAAE,CAAC,IAAI,CAAC,CAAC;IACX,CAAC;CACF;AAND,uCAMC;AAED,MAAM,UAAW,SAAQ,2BAAc;IACrC,WAAW,CAAgB;IAC3B,KAAK,CAAQ;IACb,OAAO,CAAmD;IAE1D,GAAG,CAAqB;IACxB,IAAI,CAAkB;IAEtB,YAAY,KAAY,EAAE,OAAyD,EAAE,GAAuB;QAC1G,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACd,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,OAAO,GAAgB;YAC3B,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE;YACf,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG;YACjB,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa;YACrC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS;YAC7B,sBAAsB,EAAE,IAAI,CAAC,GAAG,CAAC,sBAAsB;YACvD,cAAc,EAAE,GAAG,EAAE;gBACnB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;gBAC5C,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,sCAAsC,EAAE,CAAC,CAAA;YAC3E,CAAC;YACD,mBAAmB,EAAE,CAAC,MAAmC,EAAE,EAAE;gBAC3D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;gBAC5F,QAAQ,MAAM,EAAE,CAAC;oBACf,KAAK,uCAA2B,CAAC,yBAAyB;wBACxD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,qCAAqC,EAAE,CAAC,CAAA;wBACxE,MAAM;oBACR;wBACE,iBAAiB,CAAC,MAAM,CAAC,CAAA;gBAC7B,CAAC;YACH,CAAC;SACF,CAAA;QACD,IAAI,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACjD,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3F,CAAC;CACF;AAED,SAAS,iBAAiB,CAAC,CAAQ;IACjC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAC/C,CAAC"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@norskvideo/norsk-studio-built-ins",
|
3
|
-
"version": "1.
|
3
|
+
"version": "1.8.0",
|
4
4
|
"description": "",
|
5
5
|
"scripts": {
|
6
6
|
"clean": "rm -rf lib",
|
@@ -20,7 +20,7 @@
|
|
20
20
|
"license": "MIT",
|
21
21
|
"dependencies": {
|
22
22
|
"@norskvideo/norsk-sdk": "^1.0.360",
|
23
|
-
"@norskvideo/norsk-studio": "^1.
|
23
|
+
"@norskvideo/norsk-studio": "^1.14.0",
|
24
24
|
"@norskvideo/webrtc-client": "^0.1.2",
|
25
25
|
"body-parser": "^1.20.2",
|
26
26
|
"cors": "^2.8.5",
|