werift 0.18.3 → 0.18.4

package/lib/rtp/src/processor/ntpTime.js

@@ -11,6 +11,12 @@ class NtpTimeBase {
             writable: true,
             value: clockRate
         });
+        Object.defineProperty(this, "id", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (0, crypto_1.randomUUID)()
+        });
         Object.defineProperty(this, "baseNtpTimestamp", {
             enumerable: true,
             configurable: true,
@@ -53,30 +59,24 @@ class NtpTimeBase {
             writable: true,
             value: {}
         });
-        Object.defineProperty(this, "id", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: (0, crypto_1.randomUUID)()
-        });
-        Object.defineProperty(this, "payloadType", {
+        Object.defineProperty(this, "started", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: 0
+            value: false
         });
     }
     toJSON() {
         return {
+            ...this.internalStats,
+            id: this.id,
             baseRtpTimestamp: this.baseRtpTimestamp,
             latestRtpTimestamp: this.latestRtpTimestamp,
             baseNtpTimestamp: this.baseNtpTimestamp && (0, __1.ntpTime2Sec)(this.baseNtpTimestamp),
             latestNtpTimestamp: this.latestNtpTimestamp && (0, __1.ntpTime2Sec)(this.latestNtpTimestamp),
             bufferLength: this.buffer.length,
             currentElapsed: this.currentElapsed,
-            id: this.id,
             clockRate: this.clockRate,
-            ...this.internalStats,
         };
     }
     stop() {
@@ -96,22 +96,28 @@ class NtpTimeBase {
                 this.baseNtpTimestamp = ntpTimestamp;
                 this.baseRtpTimestamp = rtpTimestamp;
             }
+            this.internalStats["ntpReceived"] = new Date().toISOString();
+            this.started = true;
         }
         if (rtp) {
             this.buffer.push(rtp);
-            this.payloadType = rtp.header.payloadType;
+            this.internalStats["payloadType"] = rtp.header.payloadType;
             const res = [];
-            this.buffer = this.buffer
-                .map((rtp) => {
+            if (this.baseRtpTimestamp == undefined ||
+                this.baseNtpTimestamp == undefined ||
+                this.latestNtpTimestamp == undefined ||
+                this.latestRtpTimestamp == undefined) {
+                return [];
+            }
+            for (const rtp of this.buffer) {
                 const ntp = this.updateNtp(rtp.header.timestamp);
-                if (ntp != undefined) {
-                    const ms = ntp * 1000;
-                    res.push({ rtp, time: Math.round(ms) });
-                    return undefined;
-                }
-                return rtp;
-            })
-                .filter((r) => r != undefined);
+                const ms = ntp * 1000;
+                const time = Math.round(ms);
+                res.push({ rtp, time });
+                this.internalStats["timeSource"] =
+                    new Date().toISOString() + " time:" + time;
+            }
+            this.buffer = [];
             return res;
         }
         return [];
@@ -127,19 +133,11 @@ class NtpTimeBase {
             ? rtpTimestamp + __1.Max32Uint - baseRtpTimestamp
             : rtpTimestamp - baseRtpTimestamp;
         const elapsedSec = elapsed / this.clockRate;
-        this.internalStats["totalElapsed"] =
-            (this.internalStats["totalElapsed"] ?? 0) + elapsedSec;
         // sec
         const ntp = (0, __1.ntpTime2Sec)(baseNtpTimestamp) + elapsedOffset + elapsedSec;
         return { ntp, elapsedSec };
     }
     updateNtp(rtpTimestamp) {
-        if (this.baseRtpTimestamp == undefined ||
-            this.baseNtpTimestamp == undefined ||
-            this.latestNtpTimestamp == undefined ||
-            this.latestRtpTimestamp == undefined) {
-            return;
-        }
         this.internalStats["inputRtp"] = rtpTimestamp;
         const base = this.calcNtp({
             rtpTimestamp,

package/lib/rtp/src/processor/ntpTime.js.map

@@ -1 +1 @@
-{"version":3,"file":"ntpTime.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/ntpTime.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomUUID } from \"crypto\";\n\nimport {\n  Max32Uint,\n  ntpTime2Sec,\n  Processor,\n  RtcpPacket,\n  RtcpSrPacket,\n  RtpPacket,\n} from \"..\";\n\nexport type NtpTimeInput = {\n  rtp?: RtpPacket;\n  eol?: boolean;\n  rtcp?: RtcpPacket;\n};\n\nexport interface NtpTimeOutput {\n  rtp?: RtpPacket;\n  /**ms */\n  time?: number;\n  eol?: boolean;\n}\n\nexport class NtpTimeBase implements Processor<NtpTimeInput, NtpTimeOutput> {\n  baseNtpTimestamp?: bigint;\n  baseRtpTimestamp?: number;\n  latestNtpTimestamp?: bigint;\n  latestRtpTimestamp?: number;\n  private currentElapsed = 0;\n  buffer: RtpPacket[] = [];\n  private internalStats = {};\n  id = randomUUID();\n  payloadType = 0;\n\n  constructor(public clockRate: number) {}\n\n  toJSON(): Record<string, any> {\n    return {\n      baseRtpTimestamp: this.baseRtpTimestamp,\n      latestRtpTimestamp: this.latestRtpTimestamp,\n      baseNtpTimestamp:\n        this.baseNtpTimestamp && ntpTime2Sec(this.baseNtpTimestamp),\n      latestNtpTimestamp:\n        this.latestNtpTimestamp && ntpTime2Sec(this.latestNtpTimestamp),\n      bufferLength: this.buffer.length,\n      currentElapsed: this.currentElapsed,\n      id: this.id,\n      clockRate: this.clockRate,\n      ...this.internalStats,\n    };\n  }\n\n  private stop() {\n    this.buffer = [];\n    this.internalStats = {};\n  }\n\n  processInput({ rtcp, rtp, eol }: NtpTimeInput): NtpTimeOutput[] {\n    if (eol) {\n      this.stop();\n      return [{ eol: true }];\n    }\n\n    if (rtcp && rtcp instanceof RtcpSrPacket) {\n      const { ntpTimestamp, rtpTimestamp } = rtcp.senderInfo;\n      this.latestNtpTimestamp = ntpTimestamp;\n      this.latestRtpTimestamp = rtpTimestamp;\n\n      if (this.baseNtpTimestamp == undefined) {\n        this.baseNtpTimestamp = ntpTimestamp;\n        this.baseRtpTimestamp = rtpTimestamp;\n      }\n    }\n\n    if (rtp) {\n      this.buffer.push(rtp);\n      this.payloadType = rtp.header.payloadType;\n\n      const res: NtpTimeOutput[] = [];\n\n      this.buffer = this.buffer\n        .map((rtp) => {\n          const ntp = this.updateNtp(rtp.header.timestamp);\n          if (ntp != undefined) {\n            const ms = ntp * 1000;\n            res.push({ rtp, time: Math.round(ms) });\n            return undefined;\n          }\n          return rtp;\n        })\n        .filter((r): r is NonNullable<typeof r> => r != undefined);\n      return res;\n    }\n\n    return [];\n  }\n\n  /**\n   *\n   * @param rtpTimestamp\n   * @returns sec\n   */\n  private calcNtp({\n    rtpTimestamp,\n    baseNtpTimestamp,\n    baseRtpTimestamp,\n    elapsedOffset,\n  }: {\n    rtpTimestamp: number;\n    baseRtpTimestamp: number;\n    baseNtpTimestamp: bigint;\n    elapsedOffset: number;\n  }) {\n    const rotate =\n      Math.abs(rtpTimestamp - baseRtpTimestamp) > (Max32Uint / 4) * 3;\n\n    const elapsed = rotate\n      ? rtpTimestamp + Max32Uint - baseRtpTimestamp\n      : rtpTimestamp - baseRtpTimestamp;\n    const elapsedSec = elapsed / this.clockRate;\n    this.internalStats[\"totalElapsed\"] =\n      (this.internalStats[\"totalElapsed\"] ?? 0) + elapsedSec;\n\n    // sec\n    const ntp = ntpTime2Sec(baseNtpTimestamp) + elapsedOffset + elapsedSec;\n    return { ntp, elapsedSec };\n  }\n\n  private updateNtp(rtpTimestamp: number) {\n    if (\n      this.baseRtpTimestamp == undefined ||\n      this.baseNtpTimestamp == undefined ||\n      this.latestNtpTimestamp == undefined ||\n      this.latestRtpTimestamp == undefined\n    ) {\n      return;\n    }\n\n    this.internalStats[\"inputRtp\"] = rtpTimestamp;\n\n    const base = this.calcNtp({\n      rtpTimestamp,\n      baseNtpTimestamp: this.baseNtpTimestamp,\n      baseRtpTimestamp: this.baseRtpTimestamp,\n      elapsedOffset: this.currentElapsed,\n    });\n    const latest = this.calcNtp({\n      rtpTimestamp,\n      baseNtpTimestamp: this.latestNtpTimestamp,\n      baseRtpTimestamp: this.latestRtpTimestamp,\n      elapsedOffset: 0,\n    });\n\n    this.internalStats[\"calcBaseNtp\"] = base.ntp;\n    this.internalStats[\"calcLatestNtp\"] = latest.ntp;\n\n    if (base.ntp < latest.ntp) {\n      // update baseNtp\n      this.baseNtpTimestamp = this.latestNtpTimestamp;\n      this.baseRtpTimestamp = this.latestRtpTimestamp;\n      this.currentElapsed = 0;\n      this.internalStats[\"calcNtp\"] = latest.ntp;\n      return latest.ntp;\n    } else {\n      this.currentElapsed += base.elapsedSec;\n      this.baseRtpTimestamp = rtpTimestamp;\n      this.internalStats[\"calcNtp\"] = base.ntp;\n      return base.ntp;\n    }\n  }\n}\n"]}
+{"version":3,"file":"ntpTime.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/ntpTime.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomUUID } from \"crypto\";\n\nimport {\n  Max32Uint,\n  ntpTime2Sec,\n  Processor,\n  RtcpPacket,\n  RtcpSrPacket,\n  RtpPacket,\n} from \"..\";\n\nexport type NtpTimeInput = {\n  rtp?: RtpPacket;\n  eol?: boolean;\n  rtcp?: RtcpPacket;\n};\n\nexport interface NtpTimeOutput {\n  rtp?: RtpPacket;\n  /**ms */\n  time?: number;\n  eol?: boolean;\n}\n\nexport class NtpTimeBase implements Processor<NtpTimeInput, NtpTimeOutput> {\n  readonly id = randomUUID();\n  private baseNtpTimestamp?: bigint;\n  private baseRtpTimestamp?: number;\n  private latestNtpTimestamp?: bigint;\n  private latestRtpTimestamp?: number;\n  private currentElapsed = 0;\n  private buffer: RtpPacket[] = [];\n  private internalStats = {};\n  started = false;\n\n  constructor(public clockRate: number) {}\n\n  toJSON(): Record<string, any> {\n    return {\n      ...this.internalStats,\n      id: this.id,\n      baseRtpTimestamp: this.baseRtpTimestamp,\n      latestRtpTimestamp: this.latestRtpTimestamp,\n      baseNtpTimestamp:\n        this.baseNtpTimestamp && ntpTime2Sec(this.baseNtpTimestamp),\n      latestNtpTimestamp:\n        this.latestNtpTimestamp && ntpTime2Sec(this.latestNtpTimestamp),\n      bufferLength: this.buffer.length,\n      currentElapsed: this.currentElapsed,\n      clockRate: this.clockRate,\n    };\n  }\n\n  private stop() {\n    this.buffer = [];\n    this.internalStats = {};\n  }\n\n  processInput({ rtcp, rtp, eol }: NtpTimeInput): NtpTimeOutput[] {\n    if (eol) {\n      this.stop();\n      return [{ eol: true }];\n    }\n\n    if (rtcp && rtcp instanceof RtcpSrPacket) {\n      const { ntpTimestamp, rtpTimestamp } = rtcp.senderInfo;\n      this.latestNtpTimestamp = ntpTimestamp;\n      this.latestRtpTimestamp = rtpTimestamp;\n\n      if (this.baseNtpTimestamp == undefined) {\n        this.baseNtpTimestamp = ntpTimestamp;\n        this.baseRtpTimestamp = rtpTimestamp;\n      }\n\n      this.internalStats[\"ntpReceived\"] = new Date().toISOString();\n      this.started = true;\n    }\n\n    if (rtp) {\n      this.buffer.push(rtp);\n      this.internalStats[\"payloadType\"] = rtp.header.payloadType;\n\n      const res: NtpTimeOutput[] = [];\n\n      if (\n        this.baseRtpTimestamp == undefined ||\n        this.baseNtpTimestamp == undefined ||\n        this.latestNtpTimestamp == undefined ||\n        this.latestRtpTimestamp == undefined\n      ) {\n        return [];\n      }\n\n      for (const rtp of this.buffer) {\n        const ntp = this.updateNtp(rtp.header.timestamp);\n        const ms = ntp * 1000;\n        const time = Math.round(ms);\n        res.push({ rtp, time });\n\n        this.internalStats[\"timeSource\"] =\n          new Date().toISOString() + \" time:\" + time;\n      }\n      this.buffer = [];\n      return res;\n    }\n\n    return [];\n  }\n\n  /**\n   *\n   * @param rtpTimestamp\n   * @returns sec\n   */\n  private calcNtp({\n    rtpTimestamp,\n    baseNtpTimestamp,\n    baseRtpTimestamp,\n    elapsedOffset,\n  }: {\n    rtpTimestamp: number;\n    baseRtpTimestamp: number;\n    baseNtpTimestamp: bigint;\n    elapsedOffset: number;\n  }) {\n    const rotate =\n      Math.abs(rtpTimestamp - baseRtpTimestamp) > (Max32Uint / 4) * 3;\n\n    const elapsed = rotate\n      ? rtpTimestamp + Max32Uint - baseRtpTimestamp\n      : rtpTimestamp - baseRtpTimestamp;\n    const elapsedSec = elapsed / this.clockRate;\n\n    // sec\n    const ntp = ntpTime2Sec(baseNtpTimestamp) + elapsedOffset + elapsedSec;\n    return { ntp, elapsedSec };\n  }\n\n  private updateNtp(rtpTimestamp: number) {\n    this.internalStats[\"inputRtp\"] = rtpTimestamp;\n\n    const base = this.calcNtp({\n      rtpTimestamp,\n      baseNtpTimestamp: this.baseNtpTimestamp!,\n      baseRtpTimestamp: this.baseRtpTimestamp!,\n      elapsedOffset: this.currentElapsed,\n    });\n    const latest = this.calcNtp({\n      rtpTimestamp,\n      baseNtpTimestamp: this.latestNtpTimestamp!,\n      baseRtpTimestamp: this.latestRtpTimestamp!,\n      elapsedOffset: 0,\n    });\n\n    this.internalStats[\"calcBaseNtp\"] = base.ntp;\n    this.internalStats[\"calcLatestNtp\"] = latest.ntp;\n\n    if (base.ntp < latest.ntp) {\n      // update baseNtp\n      this.baseNtpTimestamp = this.latestNtpTimestamp;\n      this.baseRtpTimestamp = this.latestRtpTimestamp;\n      this.currentElapsed = 0;\n      this.internalStats[\"calcNtp\"] = latest.ntp;\n      return latest.ntp;\n    } else {\n      this.currentElapsed += base.elapsedSec;\n      this.baseRtpTimestamp = rtpTimestamp;\n      this.internalStats[\"calcNtp\"] = base.ntp;\n      return base.ntp;\n    }\n  }\n}\n"]}

package/lib/rtp/src/processor/ntpTimeCallback.d.ts

@@ -1,6 +1,15 @@
 import { NtpTimeBase, NtpTimeInput, NtpTimeOutput } from "./ntpTime";
-export declare class NtpTimeCallback extends NtpTimeBase {
-    private cb;
-    pipe: (cb: (input: NtpTimeOutput) => void) => this;
-    input: (input: NtpTimeInput) => void;
+declare const NtpTimeCallback_base: {
+    new (...args: any[]): {
+        cb?: ((o: NtpTimeOutput) => void) | undefined;
+        destructor?: (() => void) | undefined;
+        pipe: (cb: (o: NtpTimeOutput) => void, destructor?: (() => void) | undefined) => any;
+        input: (input: NtpTimeInput) => void;
+        destroy: () => void;
+        processInput: (input: NtpTimeInput) => NtpTimeOutput[];
+        toJSON(): Record<string, any>;
+    };
+} & typeof NtpTimeBase;
+export declare class NtpTimeCallback extends NtpTimeCallback_base {
 }
+export {};

package/lib/rtp/src/processor/ntpTimeCallback.js

@@ -1,36 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NtpTimeCallback = void 0;
+const interface_1 = require("./interface");
 const ntpTime_1 = require("./ntpTime");
-class NtpTimeCallback extends ntpTime_1.NtpTimeBase {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "cb", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "pipe", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: (cb) => {
-                this.cb = cb;
-                return this;
-            }
-        });
-        Object.defineProperty(this, "input", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: (input) => {
-                for (const output of this.processInput(input)) {
-                    this.cb(output);
-                }
-            }
-        });
-    }
+class NtpTimeCallback extends (0, interface_1.SimpleProcessorCallbackBase)(ntpTime_1.NtpTimeBase) {
 }
 exports.NtpTimeCallback = NtpTimeCallback;
 //# sourceMappingURL=ntpTimeCallback.js.map

package/lib/rtp/src/processor/ntpTimeCallback.js.map

@@ -1 +1 @@
-{"version":3,"file":"ntpTimeCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/ntpTimeCallback.ts"],"names":[],"mappings":";;;AAAA,uCAAqE;AAErE,MAAa,eAAgB,SAAQ,qBAAW;IAAhD;;QACE;;;;;WAA4C;QAE5C;;;;mBAAO,CAAC,EAAkC,EAAE,EAAE;gBAC5C,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;WAAC;QAEF;;;;mBAAQ,CAAC,KAAmB,EAAE,EAAE;gBAC9B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;oBAC7C,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;iBACjB;YACH,CAAC;WAAC;IACJ,CAAC;CAAA;AAbD,0CAaC","sourcesContent":["import { NtpTimeBase, NtpTimeInput, NtpTimeOutput } from \"./ntpTime\";\n\nexport class NtpTimeCallback extends NtpTimeBase {\n  private cb!: (input: NtpTimeOutput) => void;\n\n  pipe = (cb: (input: NtpTimeOutput) => void) => {\n    this.cb = cb;\n    return this;\n  };\n\n  input = (input: NtpTimeInput) => {\n    for (const output of this.processInput(input)) {\n      this.cb(output);\n    }\n  };\n}\n"]}
+{"version":3,"file":"ntpTimeCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/ntpTimeCallback.ts"],"names":[],"mappings":";;;AAAA,2CAA0D;AAC1D,uCAAqE;AAErE,MAAa,eAAgB,SAAQ,IAAA,uCAA2B,EAI9D,qBAAW,CAAC;CAAG;AAJjB,0CAIiB","sourcesContent":["import { SimpleProcessorCallbackBase } from \"./interface\";\nimport { NtpTimeBase, NtpTimeInput, NtpTimeOutput } from \"./ntpTime\";\n\nexport class NtpTimeCallback extends SimpleProcessorCallbackBase<\n  NtpTimeInput,\n  NtpTimeOutput,\n  typeof NtpTimeBase\n>(NtpTimeBase) {}\n"]}

package/lib/rtp/src/processor/rtcpCallback.d.ts

@@ -0,0 +1,18 @@
+import Event from "rx.mini";
+import { RtcpPacket } from "..";
+import { SimpleProcessorCallback } from "./interface";
+export type RtcpInput = RtcpPacket;
+export interface RtcpOutput {
+    rtcp?: RtcpPacket;
+    eol?: boolean;
+}
+export declare class RtcpSourceCallback implements SimpleProcessorCallback<RtcpInput, RtcpOutput> {
+    private cb?;
+    private destructor?;
+    onStopped: Event<any[]>;
+    toJSON(): {};
+    pipe(cb: (chunk: RtcpOutput) => void, destructor?: () => void): this;
+    input: (rtcp: RtcpInput) => void;
+    stop(): void;
+    destroy: () => void;
+}

package/lib/rtp/src/processor/{source/rtcpCallback.js → rtcpCallback.js}

@@ -13,6 +13,12 @@ class RtcpSourceCallback {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "destructor", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "onStopped", {
             enumerable: true,
             configurable: true,
@@ -29,17 +35,33 @@ class RtcpSourceCallback {
                 }
             }
         });
+        Object.defineProperty(this, "destroy", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                if (this.destructor) {
+                    this.destructor();
+                    this.destructor = undefined;
+                }
+                this.cb = undefined;
+                this.onStopped.allUnsubscribe();
+            }
+        });
+    }
+    toJSON() {
+        return {};
     }
-    pipe(cb) {
+    pipe(cb, destructor) {
         this.cb = cb;
+        this.destructor = destructor;
+        return this;
     }
     stop() {
         if (this.cb) {
             this.cb({ eol: true });
         }
         this.onStopped.execute();
-        this.cb = undefined;
-        this.onStopped.allUnsubscribe();
     }
 }
 exports.RtcpSourceCallback = RtcpSourceCallback;

package/lib/rtp/src/processor/rtcpCallback.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rtcpCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/rtcpCallback.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA4B;AAY5B,MAAa,kBAAkB;IAA/B;QAGE;;;;;WAAyC;QACzC;;;;;WAAgC;QAChC;;;;mBAAY,IAAI,iBAAK,EAAE;WAAC;QAYxB;;;;mBAAQ,CAAC,IAAe,EAAE,EAAE;gBAC1B,IAAI,IAAI,CAAC,EAAE,EAAE;oBACX,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;iBACnB;YACH,CAAC;WAAC;QASF;;;;mBAAU,GAAG,EAAE;gBACb,IAAI,IAAI,CAAC,UAAU,EAAE;oBACnB,IAAI,CAAC,UAAU,EAAE,CAAC;oBAClB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;iBAC7B;gBACD,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC;gBACpB,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;YAClC,CAAC;WAAC;IACJ,CAAC;IA/BC,MAAM;QACJ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,CAAC,EAA+B,EAAE,UAAuB;QAC3D,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAQD,IAAI;QACF,IAAI,IAAI,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;SACxB;QACD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CAUF;AAtCD,gDAsCC","sourcesContent":["import Event from \"rx.mini\";\n\nimport { RtcpPacket } from \"..\";\nimport { SimpleProcessorCallback } from \"./interface\";\n\nexport type RtcpInput = RtcpPacket;\n\nexport interface RtcpOutput {\n  rtcp?: RtcpPacket;\n  eol?: boolean;\n}\n\nexport class RtcpSourceCallback\n  implements SimpleProcessorCallback<RtcpInput, RtcpOutput>\n{\n  private cb?: (chunk: RtcpOutput) => void;\n  private destructor?: () => void;\n  onStopped = new Event();\n\n  toJSON() {\n    return {};\n  }\n\n  pipe(cb: (chunk: RtcpOutput) => void, destructor?: () => void) {\n    this.cb = cb;\n    this.destructor = destructor;\n    return this;\n  }\n\n  input = (rtcp: RtcpInput) => {\n    if (this.cb) {\n      this.cb({ rtcp });\n    }\n  };\n\n  stop() {\n    if (this.cb) {\n      this.cb({ eol: true });\n    }\n    this.onStopped.execute();\n  }\n\n  destroy = () => {\n    if (this.destructor) {\n      this.destructor();\n      this.destructor = undefined;\n    }\n    this.cb = undefined;\n    this.onStopped.allUnsubscribe();\n  };\n}\n"]}

package/lib/rtp/src/processor/rtpCallback.d.ts

@@ -0,0 +1,28 @@
+/// <reference types="node" />
+import Event from "rx.mini";
+import { RtpPacket } from "..";
+import { SimpleProcessorCallback } from "./interface";
+export type RtpInput = Buffer | RtpPacket;
+export interface RtpOutput {
+    rtp?: RtpPacket;
+    eol?: boolean;
+}
+export declare class RtpSourceCallback implements SimpleProcessorCallback<RtpInput, RtpOutput> {
+    private options;
+    private cb?;
+    private destructor?;
+    onStopped: Event<any[]>;
+    stats: {};
+    buffer: RtpPacket[];
+    bufferFulfilled: boolean;
+    constructor(options?: {
+        payloadType?: number;
+        clearInvalidPTPacket?: boolean;
+        initialBufferLength?: number;
+    });
+    toJSON(): {};
+    pipe(cb: (chunk: RtpOutput) => void, destructor?: () => void): this;
+    input: (packet: Buffer | RtpPacket) => void;
+    stop(): void;
+    destroy: () => void;
+}

package/lib/rtp/src/processor/rtpCallback.js

@@ -0,0 +1,125 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RtpSourceCallback = void 0;
+const rx_mini_1 = __importDefault(require("rx.mini"));
+const __1 = require("..");
+class RtpSourceCallback {
+    constructor(options = {}) {
+        Object.defineProperty(this, "options", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: options
+        });
+        Object.defineProperty(this, "cb", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "destructor", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "onStopped", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new rx_mini_1.default()
+        });
+        Object.defineProperty(this, "stats", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
+        Object.defineProperty(this, "buffer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "bufferFulfilled", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "input", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (packet) => {
+                const rtp = packet instanceof __1.RtpPacket ? packet : __1.RtpPacket.deSerialize(packet);
+                if (this.options.payloadType != undefined &&
+                    this.options.payloadType !== rtp.header.payloadType) {
+                    if (this.options.clearInvalidPTPacket) {
+                        rtp.clear();
+                    }
+                    return;
+                }
+                this.stats["rtpSource"] =
+                    new Date().toISOString() +
+                        " timestamp:" +
+                        rtp?.header.timestamp +
+                        " seq:" +
+                        rtp?.header.sequenceNumber;
+                const cb = this.cb;
+                if (cb) {
+                    if (this.options.initialBufferLength) {
+                        if (this.bufferFulfilled) {
+                            cb({ rtp });
+                            return;
+                        }
+                        this.buffer.push(rtp);
+                        if (this.buffer.length > this.options.initialBufferLength) {
+                            this.buffer.forEach((rtp) => {
+                                cb({ rtp });
+                            });
+                            this.buffer = [];
+                            this.bufferFulfilled = true;
+                        }
+                    }
+                    else {
+                        cb({ rtp });
+                    }
+                }
+            }
+        });
+        Object.defineProperty(this, "destroy", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                if (this.destructor) {
+                    this.destructor();
+                    this.destructor = undefined;
+                }
+                this.cb = undefined;
+                this.onStopped.allUnsubscribe();
+            }
+        });
+        options.clearInvalidPTPacket = options.clearInvalidPTPacket ?? true;
+    }
+    toJSON() {
+        return { ...this.stats };
+    }
+    pipe(cb, destructor) {
+        this.cb = cb;
+        this.destructor = destructor;
+        return this;
+    }
+    stop() {
+        if (this.cb) {
+            this.cb({ eol: true });
+        }
+        this.onStopped.execute();
+    }
+}
+exports.RtpSourceCallback = RtpSourceCallback;
+//# sourceMappingURL=rtpCallback.js.map

package/lib/rtp/src/processor/rtpCallback.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rtpCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/rtpCallback.ts"],"names":[],"mappings":"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","sourcesContent":["import Event from \"rx.mini\";\n\nimport { RtpPacket } from \"..\";\nimport { SimpleProcessorCallback } from \"./interface\";\n\nexport type RtpInput = Buffer | RtpPacket;\n\nexport interface RtpOutput {\n  rtp?: RtpPacket;\n  eol?: boolean;\n}\n\nexport class RtpSourceCallback\n  implements SimpleProcessorCallback<RtpInput, RtpOutput>\n{\n  private cb?: (chunk: RtpOutput) => void;\n  private destructor?: () => void;\n  onStopped = new Event();\n  stats = {};\n  buffer: RtpPacket[] = [];\n  bufferFulfilled = false;\n\n  constructor(\n    private options: {\n      payloadType?: number;\n      clearInvalidPTPacket?: boolean;\n      initialBufferLength?: number;\n    } = {}\n  ) {\n    options.clearInvalidPTPacket = options.clearInvalidPTPacket ?? true;\n  }\n\n  toJSON() {\n    return { ...this.stats };\n  }\n\n  pipe(cb: (chunk: RtpOutput) => void, destructor?: () => void) {\n    this.cb = cb;\n    this.destructor = destructor;\n    return this;\n  }\n\n  input = (packet: Buffer | RtpPacket) => {\n    const rtp =\n      packet instanceof RtpPacket ? packet : RtpPacket.deSerialize(packet);\n\n    if (\n      this.options.payloadType != undefined &&\n      this.options.payloadType !== rtp.header.payloadType\n    ) {\n      if (this.options.clearInvalidPTPacket) {\n        rtp.clear();\n      }\n      return;\n    }\n\n    this.stats[\"rtpSource\"] =\n      new Date().toISOString() +\n      \" timestamp:\" +\n      rtp?.header.timestamp +\n      \" seq:\" +\n      rtp?.header.sequenceNumber;\n\n    const cb = this.cb;\n    if (cb) {\n      if (this.options.initialBufferLength) {\n        if (this.bufferFulfilled) {\n          cb({ rtp });\n          return;\n        }\n        this.buffer.push(rtp);\n        if (this.buffer.length > this.options.initialBufferLength) {\n          this.buffer.forEach((rtp) => {\n            cb({ rtp });\n          });\n          this.buffer = [];\n          this.bufferFulfilled = true;\n        }\n      } else {\n        cb({ rtp });\n      }\n    }\n  };\n\n  stop() {\n    if (this.cb) {\n      this.cb({ eol: true });\n    }\n    this.onStopped.execute();\n  }\n\n  destroy = () => {\n    if (this.destructor) {\n      this.destructor();\n      this.destructor = undefined;\n    }\n    this.cb = undefined;\n    this.onStopped.allUnsubscribe();\n  };\n}\n"]}

package/lib/rtp/src/processor/{source/rtpStream.d.ts → rtpStream.d.ts}

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { ReadableStream, ReadableStreamController } from "stream/web";
-import { RtpPacket } from "../../rtp/rtp";
+import { RtpPacket } from "../rtp/rtp";
 import { RtpOutput } from "./rtpCallback";
 export declare class RtpSourceStream {
     private options;

package/lib/rtp/src/processor/{source/rtpStream.js → rtpStream.js}

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RtpSourceStream = void 0;
 const web_1 = require("stream/web");
-const rtp_1 = require("../../rtp/rtp");
+const rtp_1 = require("../rtp/rtp");
 class RtpSourceStream {
     constructor(options = {}) {
         Object.defineProperty(this, "options", {

package/lib/rtp/src/processor/rtpStream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rtpStream.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/rtpStream.ts"],"names":[],"mappings":";;;AAAA,oCAAsE;AAEtE,oCAAuC;AAGvC,MAAa,eAAe;IAK1B,YACU,UAGJ,EAAE;;;;;mBAHE;;QALV;;;;;WAAoC;QACpC;;;;;WAAmC;QACnC;;;;;WAA2D;QAkB3D;;;;mBAAO,CAAC,MAA0B,EAAE,EAAE;gBACpC,MAAM,GAAG,GACP,MAAM,YAAY,eAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,eAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBAEvE,IACE,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,SAAS;oBACrC,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,GAAG,CAAC,MAAM,CAAC,WAAW,EACnD;oBACA,IAAI,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE;wBACrC,GAAG,CAAC,KAAK,EAAE,CAAC;qBACb;oBACD,OAAO;iBACR;gBAED,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;YACtB,CAAC;WAAC;QAzBA,OAAO,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,IAAI,IAAI,CAAC;QAEpE,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAc,CAAC;YACjC,KAAK,EAAE,CAAC,UAAU,EAAE,EAAE;gBACpB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;gBAC7B,IAAI,CAAC,KAAK,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACpD,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAmBD,IAAI;QACF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;IACzC,CAAC;CACF;AAzCD,0CAyCC","sourcesContent":["import { ReadableStream, ReadableStreamController } from \"stream/web\";\n\nimport { RtpPacket } from \"../rtp/rtp\";\nimport { RtpOutput } from \"./rtpCallback\";\n\nexport class RtpSourceStream {\n  readable: ReadableStream<RtpOutput>;\n  write!: (chunk: RtpOutput) => void;\n  protected controller!: ReadableStreamController<RtpOutput>;\n\n  constructor(\n    private options: {\n      payloadType?: number;\n      clearInvalidPTPacket?: boolean;\n    } = {}\n  ) {\n    options.clearInvalidPTPacket = options.clearInvalidPTPacket ?? true;\n\n    this.readable = new ReadableStream({\n      start: (controller) => {\n        this.controller = controller;\n        this.write = (chunk) => controller.enqueue(chunk);\n      },\n    });\n  }\n\n  push = (packet: Buffer | RtpPacket) => {\n    const rtp =\n      packet instanceof RtpPacket ? packet : RtpPacket.deSerialize(packet);\n\n    if (\n      this.options.payloadType != undefined &&\n      this.options.payloadType !== rtp.header.payloadType\n    ) {\n      if (this.options.clearInvalidPTPacket) {\n        rtp.clear();\n      }\n      return;\n    }\n\n    this.write({ rtp });\n  };\n\n  stop() {\n    this.controller.enqueue({ eol: true });\n  }\n}\n"]}

package/lib/rtp/src/processor/rtpTimeCallback.d.ts

@@ -1,7 +1,15 @@
 import { RtpTimeBase, RtpTimeInput, RtpTimeOutput } from "./rtpTime";
-export declare class RtpTimeCallback extends RtpTimeBase {
-    private cb;
-    constructor(clockRate: number);
-    pipe: (cb: (input: RtpTimeOutput) => void) => this;
-    input: (input: RtpTimeInput) => void;
+declare const RtpTimeCallback_base: {
+    new (...args: any[]): {
+        cb?: ((o: RtpTimeOutput) => void) | undefined;
+        destructor?: (() => void) | undefined;
+        pipe: (cb: (o: RtpTimeOutput) => void, destructor?: (() => void) | undefined) => any;
+        input: (input: RtpTimeInput) => void;
+        destroy: () => void;
+        processInput: (input: RtpTimeInput) => RtpTimeOutput[];
+        toJSON(): Record<string, any>;
+    };
+} & typeof RtpTimeBase;
+export declare class RtpTimeCallback extends RtpTimeCallback_base {
 }
+export {};

package/lib/rtp/src/processor/rtpTimeCallback.js

@@ -1,36 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RtpTimeCallback = void 0;
+const interface_1 = require("./interface");
 const rtpTime_1 = require("./rtpTime");
-class RtpTimeCallback extends rtpTime_1.RtpTimeBase {
-    constructor(clockRate) {
-        super(clockRate);
-        Object.defineProperty(this, "cb", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "pipe", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: (cb) => {
-                this.cb = cb;
-                return this;
-            }
-        });
-        Object.defineProperty(this, "input", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: (input) => {
-                for (const output of this.processInput(input)) {
-                    this.cb(output);
-                }
-            }
-        });
-    }
+class RtpTimeCallback extends (0, interface_1.SimpleProcessorCallbackBase)(rtpTime_1.RtpTimeBase) {
 }
 exports.RtpTimeCallback = RtpTimeCallback;
 //# sourceMappingURL=rtpTimeCallback.js.map

package/lib/rtp/src/processor/rtpTimeCallback.js.map

@@ -1 +1 @@
-{"version":3,"file":"rtpTimeCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/rtpTimeCallback.ts"],"names":[],"mappings":";;;AAAA,uCAAqE;AAErE,MAAa,eAAgB,SAAQ,qBAAW;IAG9C,YAAY,SAAiB;QAC3B,KAAK,CAAC,SAAS,CAAC,CAAC;QAHnB;;;;;WAA4C;QAM5C;;;;mBAAO,CAAC,EAAkC,EAAE,EAAE;gBAC5C,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;WAAC;QAEF;;;;mBAAQ,CAAC,KAAmB,EAAE,EAAE;gBAC9B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;oBAC7C,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;iBACjB;YACH,CAAC;WAAC;IAXF,CAAC;CAYF;AAjBD,0CAiBC","sourcesContent":["import { RtpTimeBase, RtpTimeInput, RtpTimeOutput } from \"./rtpTime\";\n\nexport class RtpTimeCallback extends RtpTimeBase {\n  private cb!: (input: RtpTimeOutput) => void;\n\n  constructor(clockRate: number) {\n    super(clockRate);\n  }\n\n  pipe = (cb: (input: RtpTimeOutput) => void) => {\n    this.cb = cb;\n    return this;\n  };\n\n  input = (input: RtpTimeInput) => {\n    for (const output of this.processInput(input)) {\n      this.cb(output);\n    }\n  };\n}\n"]}
+{"version":3,"file":"rtpTimeCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/rtpTimeCallback.ts"],"names":[],"mappings":";;;AAAA,2CAA0D;AAC1D,uCAAqE;AAErE,MAAa,eAAgB,SAAQ,IAAA,uCAA2B,EAI9D,qBAAW,CAAC;CAAG;AAJjB,0CAIiB","sourcesContent":["import { SimpleProcessorCallbackBase } from \"./interface\";\nimport { RtpTimeBase, RtpTimeInput, RtpTimeOutput } from \"./rtpTime\";\n\nexport class RtpTimeCallback extends SimpleProcessorCallbackBase<\n  RtpTimeInput,\n  RtpTimeOutput,\n  typeof RtpTimeBase\n>(RtpTimeBase) {}\n"]}

package/lib/rtp/src/processor/webm.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
-import { SupportedCodec } from "../container/webm";
+import Event from "rx.mini";
+import { SupportedCodec } from "..";
 import { AVProcessor } from "./interface";
 export type WebmInput = {
     frame?: {
@@ -32,7 +33,7 @@ export declare class WebmBase implements AVProcessor<WebmInput> {
     tracks: {
         width?: number;
         height?: number;
-        kind: "audio" | "video";
+        kind: MediaKind;
         codec: SupportedCodec;
         clockRate: number;
         trackNumber: number;
@@ -45,16 +46,18 @@ export declare class WebmBase implements AVProcessor<WebmInput> {
     private cuePoints;
     private position;
     private clusterCounts;
+    /**ms */
     elapsed?: number;
     audioStopped: boolean;
     videoStopped: boolean;
     stopped: boolean;
     videoKeyframeReceived: boolean;
     internalStats: {};
+    onStopped: Event<any[]>;
     constructor(tracks: {
         width?: number;
         height?: number;
-        kind: "audio" | "video";
+        kind: MediaKind;
         codec: SupportedCodec;
         clockRate: number;
         trackNumber: number;
@@ -67,7 +70,7 @@ export declare class WebmBase implements AVProcessor<WebmInput> {
     private onFrameReceived;
     private createCluster;
     private createSimpleBlock;
-    private stop;
+    stop(): void;
 }
 /**4294967295 */
 export declare const Max32Uint: number;
@@ -76,3 +79,4 @@ export declare const MaxSinged16Int: number;
 export declare const DurationPosition = 83;
 export declare const SegmentSizePosition = 40;
 export declare function replaceSegmentSize(totalFileSize: number): Buffer;
+export type MediaKind = "video" | "audio";