@scrypted/server 0.0.132 → 0.0.133

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.

Potentially problematic release.

This version of @scrypted/server might be problematic. Click here for more details.

Files changed (4) hide show
  1. package/dist/media-helpers.js +22 -1
  2. package/dist/media-helpers.js.map +1 -1
  3. package/package.json +3 -2
  4. package/src/media-helpers.ts +22 -0
package/dist/media-helpers.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.probeVideoCamera = exports.ffmpegLogInitialOutput = void 0;
3
+ exports.safePrintFFmpegArguments = exports.probeVideoCamera = exports.ffmpegLogInitialOutput = void 0;
4
4
  const filtered = [
5
5
  'decode_slice_header error',
6
6
  'no frame!',
@@ -38,6 +38,7 @@ async function probeVideoCamera(device) {
38
38
  }
39
39
  catch (e) {
40
40
  }
41
+ // todo: uses the first stream to determine audio availability. buggy! fix this!
41
42
  const noAudio = options && options.length && options[0].audio === null;
42
43
  return {
43
44
  options,
@@ -45,4 +46,24 @@ async function probeVideoCamera(device) {
45
46
  };
46
47
  }
47
48
  exports.probeVideoCamera = probeVideoCamera;
49
+ function safePrintFFmpegArguments(console, args) {
50
+ const ret = [];
51
+ for (const arg of args) {
52
+ try {
53
+ const url = new URL(arg);
54
+ if (url.password) {
55
+ url.password = 'REDACTED';
56
+ ret.push(url.toString());
57
+ }
58
+ else {
59
+ ret.push(arg);
60
+ }
61
+ }
62
+ catch (e) {
63
+ ret.push(arg);
64
+ }
65
+ }
66
+ console.log(ret.join(' '));
67
+ }
68
+ exports.safePrintFFmpegArguments = safePrintFFmpegArguments;
48
69
  //# sourceMappingURL=media-helpers.js.map
package/dist/media-helpers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"media-helpers.js","sourceRoot":"","sources":["../src/media-helpers.ts"],"names":[],"mappings":";;;AAIA,MAAM,QAAQ,GAAG;IACb,2BAA2B;IAC3B,WAAW;IACX,kBAAkB;CACrB,CAAC;AAEF,SAAgB,sBAAsB,CAAC,OAAgB,EAAE,EAAgB,EAAE,OAAiB;IACxF,SAAS,MAAM,CAAC,GAA0B;QACtC,MAAM,GAAG,GAAG,CAAC,MAAc,EAAE,EAAE;YAC3B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;YAE9B,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;gBAC3B,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAC1B,OAAO;aACd;YAED,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;gBAC3E,GAAG,CAAC,GAAG,CAAC,CAAC;gBACT,GAAG,CAAC,gDAAgD,CAAC,CAAC;gBACtD,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBACtC,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBACtC,OAAO;aACV;YAED,GAAG,CAAC,GAAG,CAAC,CAAC;QACb,CAAC,CAAA;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAAA,CAAC;IACF,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7C,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC;AACtD,CAAC;AA1BD,wDA0BC;AAEM,KAAK,UAAU,gBAAgB,CAAC,MAAmB;IACtD,IAAI,OAA6B,CAAC;IAClC,IAAI;QACF,OAAO,GAAG,MAAM,MAAM,CAAC,qBAAqB,EAAE,IAAI,EAAE,CAAC;KACtD;IACD,OAAO,CAAC,EAAE;KACT;IAED,MAAM,OAAO,GAAG,OAAO,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC;IACvE,OAAO;QACH,OAAO;QACP,OAAO;KACV,CAAC;AACN,CAAC;AAbD,4CAaC"}
1
+ {"version":3,"file":"media-helpers.js","sourceRoot":"","sources":["../src/media-helpers.ts"],"names":[],"mappings":";;;AAIA,MAAM,QAAQ,GAAG;IACb,2BAA2B;IAC3B,WAAW;IACX,kBAAkB;CACrB,CAAC;AAEF,SAAgB,sBAAsB,CAAC,OAAgB,EAAE,EAAgB,EAAE,OAAiB;IACxF,SAAS,MAAM,CAAC,GAA0B;QACtC,MAAM,GAAG,GAAG,CAAC,MAAc,EAAE,EAAE;YAC3B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;YAE9B,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;gBAC3B,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAC1B,OAAO;aACd;YAED,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;gBAC3E,GAAG,CAAC,GAAG,CAAC,CAAC;gBACT,GAAG,CAAC,gDAAgD,CAAC,CAAC;gBACtD,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBACtC,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBACtC,OAAO;aACV;YAED,GAAG,CAAC,GAAG,CAAC,CAAC;QACb,CAAC,CAAA;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAAA,CAAC;IACF,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7C,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC;AACtD,CAAC;AA1BD,wDA0BC;AAEM,KAAK,UAAU,gBAAgB,CAAC,MAAmB;IACtD,IAAI,OAA6B,CAAC;IAClC,IAAI;QACF,OAAO,GAAG,MAAM,MAAM,CAAC,qBAAqB,EAAE,IAAI,EAAE,CAAC;KACtD;IACD,OAAO,CAAC,EAAE;KACT;IAED,gFAAgF;IAChF,MAAM,OAAO,GAAG,OAAO,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC;IACvE,OAAO;QACH,OAAO;QACP,OAAO;KACV,CAAC;AACN,CAAC;AAdD,4CAcC;AAED,SAAgB,wBAAwB,CAAC,OAAgB,EAAE,IAAc;IACrE,MAAM,GAAG,GAAG,EAAE,CAAC;IACf,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACpB,IAAI;YACA,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YACzB,IAAI,GAAG,CAAC,QAAQ,EAAE;gBACd,GAAG,CAAC,QAAQ,GAAG,UAAU,CAAC;gBAC1B,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;aAC5B;iBACI;gBACD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACjB;SACJ;QACD,OAAO,CAAC,EAAE;YACN,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACjB;KACJ;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/B,CAAC;AAnBD,4DAmBC"}
package/package.json CHANGED
@@ -1,11 +1,11 @@
1
1
  {
2
2
  "name": "@scrypted/server",
3
- "version": "0.0.132",
3
+ "version": "0.0.133",
4
4
  "description": "",
5
5
  "dependencies": {
6
6
  "@mapbox/node-pre-gyp": "^1.0.5",
7
7
  "@scrypted/ffmpeg": "^1.0.9",
8
- "@scrypted/sdk": "^0.0.142",
8
+ "@scrypted/sdk": "^0.0.145",
9
9
  "adm-zip": "^0.5.3",
10
10
  "axios": "^0.21.1",
11
11
  "body-parser": "^1.19.0",
@@ -30,6 +30,7 @@
30
30
  "tmp": "^0.2.1",
31
31
  "tslib": "^2.3.1",
32
32
  "typescript": "^4.4.4",
33
+ "werift": "^0.14.5",
33
34
  "whatwg-mimetype": "^2.3.0",
34
35
  "ws": "^8.2.3"
35
36
  },
package/src/media-helpers.ts CHANGED
@@ -44,9 +44,31 @@ export async function probeVideoCamera(device: VideoCamera) {
44
44
  catch (e) {
45
45
  }
46
46
 
47
+ // todo: uses the first stream to determine audio availability. buggy! fix this!
47
48
  const noAudio = options && options.length && options[0].audio === null;
48
49
  return {
49
50
  options,
50
51
  noAudio,
51
52
  };
52
53
  }
54
+
55
+ export function safePrintFFmpegArguments(console: Console, args: string[]) {
56
+ const ret = [];
57
+ for (const arg of args) {
58
+ try {
59
+ const url = new URL(arg);
60
+ if (url.password) {
61
+ url.password = 'REDACTED';
62
+ ret.push(url.toString());
63
+ }
64
+ else {
65
+ ret.push(arg);
66
+ }
67
+ }
68
+ catch (e) {
69
+ ret.push(arg);
70
+ }
71
+ }
72
+
73
+ console.log(ret.join(' '));
74
+ }