werift 0.18.3 → 0.18.4

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MuteHandlerBase = void 0;
 const crypto_1 = require("crypto");
+const __1 = require("..");
 class MuteHandlerBase {
     constructor(output, props) {
         Object.defineProperty(this, "output", {
@@ -26,13 +27,13 @@ class MuteHandlerBase {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: []
+            value: void 0
         });
-        Object.defineProperty(this, "started", {
+        Object.defineProperty(this, "index", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: false
+            value: 0
         });
         Object.defineProperty(this, "ended", {
             enumerable: true,
@@ -40,7 +41,7 @@ class MuteHandlerBase {
             writable: true,
             value: false
         });
-        Object.defineProperty(this, "intervalId", {
+        Object.defineProperty(this, "baseTime", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -52,60 +53,140 @@ class MuteHandlerBase {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "internalStats", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
+        /**ms */
+        Object.defineProperty(this, "lastCommittedTime", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "lastExecutionTime", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        /**ms */
+        Object.defineProperty(this, "interval", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: this.props.interval
+        });
+        Object.defineProperty(this, "bufferDuration", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: this.interval / 2
+        });
+        Object.defineProperty(this, "bufferLength", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: this.props.bufferLength * 2
+        });
+        /**ms */
+        Object.defineProperty(this, "lastFrameReceivedAt", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
         Object.defineProperty(this, "processInput", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: ({ frame, eol }) => {
-                if (eol) {
+                if (!frame) {
                     this.stop();
-                    return [{ eol: true }];
+                    return [{ eol }];
+                }
+                if (this.ended) {
+                    return [];
                 }
-                if (frame) {
-                    this.startIfNeed(frame.time);
-                    if (frame.time >= this.currentTimestamp) {
-                        this.buffer.push(frame);
+                if (this.baseTime == undefined) {
+                    this.baseTime = frame.time;
+                    this.currentTimestamp = this.baseTime;
+                    this.lastExecutionTime = this.baseTime;
+                    this.lastCommittedTime = this.baseTime;
+                    this.lastFrameReceivedAt = Date.now();
+                }
+                // 過去のフレームを捨てる
+                if (frame.time < this.lastCommittedTime) {
+                    return [];
+                }
+                // NTPの同期ずれが疑われるので捨てる
+                const now = Date.now();
+                const gap = 5000; // RTCP SR interval;
+                const lastCommittedElapsed = frame.time - this.lastCommittedTime;
+                const lastFrameReceivedElapsed = now - this.lastFrameReceivedAt;
+                if (gap < lastFrameReceivedElapsed && lastCommittedElapsed < gap) {
+                    this.internalStats["invalidFrameTime"] = {
+                        count: (this.internalStats["invalidFrameTime"]?.count ?? 0) + 1,
+                        at: new Date().toISOString(),
+                        lastCommittedElapsed,
+                        lastFrameReceivedElapsed,
+                    };
+                    return [];
+                }
+                this.lastFrameReceivedAt = now;
+                const elapsed = frame.time - this.baseTime;
+                const index = (0, __1.int)(elapsed / this.bufferDuration) % this.bufferLength;
+                this.buffer[index].push(frame);
+                const lastExecution = frame.time - this.lastExecutionTime;
+                if (lastExecution >= this.interval) {
+                    const times = (0, __1.int)(lastExecution / this.bufferDuration) - 1;
+                    this.lastExecutionTime = this.currentTimestamp;
+                    for (let i = 0; i < times; i++) {
+                        this.executeTask();
+                        this.lastExecutionTime += this.bufferDuration;
                     }
                 }
                 return [];
             }
         });
+        this.buffer = [...new Array(this.bufferLength)].map(() => []);
     }
     toJSON() {
-        return { id: this.id };
+        return { ...this.internalStats, id: this.id };
     }
-    startIfNeed(baseTimestamp) {
-        if (this.started) {
-            return;
-        }
-        this.started = true;
-        const { sort, interval, ptime, dummyPacket } = this.props;
-        this.currentTimestamp = baseTimestamp;
-        this.intervalId = setInterval(() => {
-            if (this.ended) {
-                return;
-            }
-            if (sort ?? true) {
-                this.buffer = this.buffer.sort((a, b) => a.time - b.time);
+    executeTask() {
+        const { ptime, dummyPacket } = this.props;
+        const buffer = this.buffer[this.index].sort((a, b) => a.time - b.time);
+        const last = buffer.at(-1);
+        const expect = last
+            ? last.time +
+                // offset
+                ptime
+            : this.currentTimestamp;
+        if (expect < this.currentTimestamp + this.bufferDuration) {
+            for (let time = expect; time < this.currentTimestamp + this.bufferDuration; time += ptime) {
+                buffer.push({
+                    time,
+                    data: dummyPacket,
+                    isKeyframe: true,
+                });
             }
-            const last = this.buffer.at(-1);
-            const expect = last ? last.time + ptime : this.currentTimestamp;
-            if (expect < this.currentTimestamp + interval) {
-                for (let time = expect; time < this.currentTimestamp + interval; time += ptime) {
-                    this.buffer.push({
-                        time,
-                        data: dummyPacket,
-                        isKeyframe: true,
-                    });
-                }
-            }
-            this.buffer.forEach((frame) => this.output({ frame }));
-            this.buffer = [];
-            this.currentTimestamp += interval;
-        }, interval);
+        }
+        this.currentTimestamp += this.bufferDuration;
+        this.internalStats["mute"] = new Date().toISOString();
+        this.buffer[this.index] = [];
+        buffer.forEach((frame) => {
+            this.output({ frame });
+            this.lastCommittedTime = frame.time;
+        });
+        this.index++;
+        if (this.index === this.bufferLength) {
+            this.index = 0;
+        }
     }
     stop() {
-        clearInterval(this.intervalId);
         this.ended = true;
         this.buffer = [];
         this.output = undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"mute.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/mute.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomUUID } from \"crypto\";\n\nimport { CodecFrame, DepacketizerOutput } from \"./depacketizer\";\nimport { Processor } from \"./interface\";\n\nexport type MuteInput = DepacketizerOutput;\n\nexport type MuteOutput = MuteInput;\n\nexport class MuteHandlerBase implements Processor<MuteInput, MuteOutput> {\n  readonly id = randomUUID();\n  private buffer: CodecFrame[] = [];\n  private started = false;\n  private ended = false;\n  private intervalId: any;\n  private currentTimestamp!: number;\n\n  constructor(\n    private output: (o: MuteOutput) => void,\n    private props: {\n      ptime: number;\n      dummyPacket: Buffer;\n      interval: number;\n      sort?: boolean;\n    }\n  ) {}\n\n  toJSON(): Record<string, any> {\n    return { id: this.id };\n  }\n\n  private startIfNeed(baseTimestamp: number) {\n    if (this.started) {\n      return;\n    }\n    this.started = true;\n\n    const { sort, interval, ptime, dummyPacket } = this.props;\n    this.currentTimestamp = baseTimestamp;\n    this.intervalId = setInterval(() => {\n      if (this.ended) {\n        return;\n      }\n\n      if (sort ?? true) {\n        this.buffer = this.buffer.sort((a, b) => a.time - b.time);\n      }\n      const last = this.buffer.at(-1);\n      const expect = last ? last.time + ptime : this.currentTimestamp;\n      if (expect < this.currentTimestamp + interval) {\n        for (\n          let time = expect;\n          time < this.currentTimestamp + interval;\n          time += ptime\n        ) {\n          this.buffer.push({\n            time,\n            data: dummyPacket,\n            isKeyframe: true,\n          });\n        }\n      }\n      this.buffer.forEach((frame) => this.output({ frame }));\n      this.buffer = [];\n\n      this.currentTimestamp += interval;\n    }, interval);\n  }\n\n  private stop() {\n    clearInterval(this.intervalId);\n    this.ended = true;\n    this.buffer = [];\n    this.output = undefined as any;\n  }\n\n  processInput = ({ frame, eol }: MuteInput): MuteOutput[] => {\n    if (eol) {\n      this.stop();\n      return [{ eol: true }];\n    }\n\n    if (frame) {\n      this.startIfNeed(frame.time);\n      if (frame.time >= this.currentTimestamp) {\n        this.buffer.push(frame);\n      }\n    }\n\n    return [];\n  };\n}\n"]}
+{"version":3,"file":"mute.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/mute.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomUUID } from \"crypto\";\n\nimport { int } from \"..\";\nimport { CodecFrame, DepacketizerOutput } from \"./depacketizer\";\nimport { Processor } from \"./interface\";\n\nexport type MuteInput = DepacketizerOutput;\n\nexport type MuteOutput = MuteInput;\n\nexport class MuteHandlerBase implements Processor<MuteInput, MuteOutput> {\n  readonly id = randomUUID();\n  private buffer: CodecFrame[][];\n  private index = 0;\n  private ended = false;\n  private baseTime?: number;\n  private currentTimestamp!: number;\n  private internalStats = {};\n  /**ms */\n  private lastCommittedTime = 0;\n  private lastExecutionTime = 0;\n  /**ms */\n  private interval = this.props.interval;\n  private bufferDuration: number = this.interval / 2;\n  private bufferLength = this.props.bufferLength * 2;\n  /**ms */\n  private lastFrameReceivedAt = 0;\n\n  constructor(\n    private output: (o: MuteOutput) => void,\n    private props: {\n      ptime: number;\n      dummyPacket: Buffer;\n      /**ms\n       * @description intervalごとに無音区間に空パケットを挿入する\n       */\n      interval: number;\n      bufferLength: number;\n    }\n  ) {\n    this.buffer = [...new Array(this.bufferLength)].map(() => []);\n  }\n\n  toJSON(): Record<string, any> {\n    return { ...this.internalStats, id: this.id };\n  }\n\n  private executeTask() {\n    const { ptime, dummyPacket } = this.props;\n\n    const buffer = this.buffer[this.index].sort((a, b) => a.time - b.time);\n    const last = buffer.at(-1);\n    const expect = last\n      ? last.time +\n        // offset\n        ptime\n      : this.currentTimestamp;\n\n    if (expect < this.currentTimestamp + this.bufferDuration) {\n      for (\n        let time = expect;\n        time < this.currentTimestamp + this.bufferDuration;\n        time += ptime\n      ) {\n        buffer.push({\n          time,\n          data: dummyPacket,\n          isKeyframe: true,\n        });\n      }\n    }\n    this.currentTimestamp += this.bufferDuration;\n    this.internalStats[\"mute\"] = new Date().toISOString();\n\n    this.buffer[this.index] = [];\n    buffer.forEach((frame) => {\n      this.output({ frame });\n      this.lastCommittedTime = frame.time;\n    });\n\n    this.index++;\n    if (this.index === this.bufferLength) {\n      this.index = 0;\n    }\n  }\n\n  private stop() {\n    this.ended = true;\n    this.buffer = [];\n    this.output = undefined as any;\n  }\n\n  processInput = ({ frame, eol }: MuteInput): MuteOutput[] => {\n    if (!frame) {\n      this.stop();\n      return [{ eol }];\n    }\n\n    if (this.ended) {\n      return [];\n    }\n\n    if (this.baseTime == undefined) {\n      this.baseTime = frame.time;\n      this.currentTimestamp = this.baseTime;\n      this.lastExecutionTime = this.baseTime;\n      this.lastCommittedTime = this.baseTime;\n      this.lastFrameReceivedAt = Date.now();\n    }\n\n    // 過去のフレームを捨てる\n    if (frame.time < this.lastCommittedTime) {\n      return [];\n    }\n\n    // NTPの同期ずれが疑われるので捨てる\n    const now = Date.now();\n    const gap = 5000; // RTCP SR interval;\n    const lastCommittedElapsed = frame.time - this.lastCommittedTime;\n    const lastFrameReceivedElapsed = now - this.lastFrameReceivedAt;\n    if (gap < lastFrameReceivedElapsed && lastCommittedElapsed < gap) {\n      this.internalStats[\"invalidFrameTime\"] = {\n        count: (this.internalStats[\"invalidFrameTime\"]?.count ?? 0) + 1,\n        at: new Date().toISOString(),\n        lastCommittedElapsed,\n        lastFrameReceivedElapsed,\n      };\n      return [];\n    }\n    this.lastFrameReceivedAt = now;\n\n    const elapsed = frame.time - this.baseTime;\n    const index = int(elapsed / this.bufferDuration) % this.bufferLength;\n    this.buffer[index].push(frame);\n\n    const lastExecution = frame.time - this.lastExecutionTime;\n    if (lastExecution >= this.interval) {\n      const times = int(lastExecution / this.bufferDuration) - 1;\n      this.lastExecutionTime = this.currentTimestamp;\n      for (let i = 0; i < times; i++) {\n        this.executeTask();\n        this.lastExecutionTime += this.bufferDuration;\n      }\n    }\n\n    return [];\n  };\n}\n"]}

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

@@ -1,7 +1,10 @@
+import { SimpleProcessorCallback } from "./interface";
 import { MuteHandlerBase, MuteInput, MuteOutput } from "./mute";
-export declare class MuteCallback extends MuteHandlerBase {
+export declare class MuteCallback extends MuteHandlerBase implements SimpleProcessorCallback<MuteInput, MuteOutput> {
     private cb?;
+    destructor?: () => void;
     constructor(props: ConstructorParameters<typeof MuteHandlerBase>[1]);
-    pipe: (cb: (input: MuteOutput) => void) => void;
+    pipe: (cb: (input: MuteOutput) => void, destructor?: () => void) => this;
     input: (input: MuteInput) => void;
+    destroy: () => void;
 }

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

@@ -15,12 +15,20 @@ class MuteCallback extends mute_1.MuteHandlerBase {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "destructor", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "pipe", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: (cb) => {
+            value: (cb, destructor) => {
                 this.cb = cb;
+                this.destructor = destructor;
+                return this;
             }
         });
         Object.defineProperty(this, "input", {
@@ -28,15 +36,23 @@ class MuteCallback extends mute_1.MuteHandlerBase {
             configurable: true,
             writable: true,
             value: (input) => {
-                if (!this.cb) {
-                    return;
-                }
                 for (const output of this.processInput(input)) {
-                    this.cb(output);
+                    if (this.cb) {
+                        this.cb(output);
+                    }
                 }
-                if (input.eol) {
-                    this.cb = undefined;
+            }
+        });
+        Object.defineProperty(this, "destroy", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                if (this.destructor) {
+                    this.destructor();
+                    this.destructor = undefined;
                 }
+                this.cb = undefined;
             }
         });
     }

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

@@ -1 +1 @@
-{"version":3,"file":"muteCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/muteCallback.ts"],"names":[],"mappings":";;;AAAA,iCAAgE;AAEhE,MAAa,YAAa,SAAQ,sBAAe;IAG/C,YAAY,KAAuD;QACjE,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACV,IAAI,IAAI,CAAC,EAAE,EAAE;gBACX,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aACZ;QACH,CAAC,EAAE,KAAK,CAAC,CAAC;QAPZ;;;;;WAAyC;QAUzC;;;;mBAAO,CAAC,EAA+B,EAAE,EAAE;gBACzC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;YACf,CAAC;WAAC;QAEF;;;;mBAAQ,CAAC,KAAgB,EAAE,EAAE;gBAC3B,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;oBACZ,OAAO;iBACR;gBACD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;oBAC7C,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;iBACjB;gBACD,IAAI,KAAK,CAAC,GAAG,EAAE;oBACb,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC;iBACrB;YACH,CAAC;WAAC;IAhBF,CAAC;CAiBF;AA1BD,oCA0BC","sourcesContent":["import { MuteHandlerBase, MuteInput, MuteOutput } from \"./mute\";\n\nexport class MuteCallback extends MuteHandlerBase {\n  private cb?: (input: MuteOutput) => void;\n\n  constructor(props: ConstructorParameters<typeof MuteHandlerBase>[1]) {\n    super((o) => {\n      if (this.cb) {\n        this.cb(o);\n      }\n    }, props);\n  }\n\n  pipe = (cb: (input: MuteOutput) => void) => {\n    this.cb = cb;\n  };\n\n  input = (input: MuteInput) => {\n    if (!this.cb) {\n      return;\n    }\n    for (const output of this.processInput(input)) {\n      this.cb(output);\n    }\n    if (input.eol) {\n      this.cb = undefined;\n    }\n  };\n}\n"]}
+{"version":3,"file":"muteCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/muteCallback.ts"],"names":[],"mappings":";;;AACA,iCAAgE;AAEhE,MAAa,YACX,SAAQ,sBAAe;IAMvB,YAAY,KAAuD;QACjE,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACV,IAAI,IAAI,CAAC,EAAE,EAAE;gBACX,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aACZ;QACH,CAAC,EAAE,KAAK,CAAC,CAAC;QARZ;;;;;WAAyC;QACzC;;;;;WAAwB;QAUxB;;;;mBAAO,CAAC,EAA+B,EAAE,UAAuB,EAAE,EAAE;gBAClE,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;gBAC7B,OAAO,IAAI,CAAC;YACd,CAAC;WAAC;QAEF;;;;mBAAQ,CAAC,KAAgB,EAAE,EAAE;gBAC3B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;oBAC7C,IAAI,IAAI,CAAC,EAAE,EAAE;wBACX,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;qBACjB;iBACF;YACH,CAAC;WAAC;QAEF;;;;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;YACtB,CAAC;WAAC;IAtBF,CAAC;CAuBF;AApCD,oCAoCC","sourcesContent":["import { SimpleProcessorCallback } from \"./interface\";\nimport { MuteHandlerBase, MuteInput, MuteOutput } from \"./mute\";\n\nexport class MuteCallback\n  extends MuteHandlerBase\n  implements SimpleProcessorCallback<MuteInput, MuteOutput>\n{\n  private cb?: (input: MuteOutput) => void;\n  destructor?: () => void;\n\n  constructor(props: ConstructorParameters<typeof MuteHandlerBase>[1]) {\n    super((o) => {\n      if (this.cb) {\n        this.cb(o);\n      }\n    }, props);\n  }\n\n  pipe = (cb: (input: MuteOutput) => void, destructor?: () => void) => {\n    this.cb = cb;\n    this.destructor = destructor;\n    return this;\n  };\n\n  input = (input: MuteInput) => {\n    for (const output of this.processInput(input)) {\n      if (this.cb) {\n        this.cb(output);\n      }\n    }\n  };\n\n  destroy = () => {\n    if (this.destructor) {\n      this.destructor();\n      this.destructor = undefined;\n    }\n    this.cb = undefined;\n  };\n}\n"]}

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

@@ -1,8 +1,7 @@
 import Event from "rx.mini";
-import { RtcpTransportLayerFeedback } from "../rtcp/rtpfb";
-import { GenericNack } from "../rtcp/rtpfb/nack";
+import { GenericNack, RtcpTransportLayerFeedback } from "..";
 import { Processor } from "./interface";
-import { RtpOutput } from "./source";
+import { RtpOutput } from "./rtpCallback";
 export type NackHandlerInput = RtpOutput;
 export type NackHandlerOutput = RtpOutput;
 export declare class NackHandlerBase implements Processor<NackHandlerInput, NackHandlerOutput> {
@@ -10,11 +9,12 @@ export declare class NackHandlerBase implements Processor<NackHandlerInput, Nack
     private onNack;
     private newEstSeqNum;
     private _lost;
-    private nackLoop;
+    private clearNackInterval?;
     private internalStats;
-    readonly onPacketLost: Event<[GenericNack]>;
+    readonly onNackSent: Event<[GenericNack]>;
+    readonly onPacketLost: Event<[number]>;
     mediaSourceSsrc?: number;
-    retryCount: number;
+    readonly retryCount = 10;
     stopped: boolean;
     constructor(senderSsrc: number, onNack: (rtcp: RtcpTransportLayerFeedback) => Promise<void>);
     toJSON(): Record<string, any>;

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

@@ -7,9 +7,7 @@ exports.NackHandlerBase = void 0;
 const debug_1 = __importDefault(require("debug"));
 const range_1 = __importDefault(require("lodash/range"));
 const rx_mini_1 = __importDefault(require("rx.mini"));
-const src_1 = require("../../../common/src");
-const rtpfb_1 = require("../rtcp/rtpfb");
-const nack_1 = require("../rtcp/rtpfb/nack");
+const __1 = require("..");
 const log = (0, debug_1.default)("werift-rtp : packages/rtp/src/processor/nack.ts");
 const LOST_SIZE = 30 * 5;
 class NackHandlerBase {
@@ -38,7 +36,7 @@ class NackHandlerBase {
             writable: true,
             value: {}
         });
-        Object.defineProperty(this, "nackLoop", {
+        Object.defineProperty(this, "clearNackInterval", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -50,6 +48,12 @@ class NackHandlerBase {
             writable: true,
             value: {}
         });
+        Object.defineProperty(this, "onNackSent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new rx_mini_1.default()
+        });
         Object.defineProperty(this, "onPacketLost", {
             enumerable: true,
             configurable: true,
@@ -81,6 +85,7 @@ class NackHandlerBase {
             value: (input) => {
                 if (input.rtp) {
                     this.addPacket(input.rtp);
+                    this.internalStats["nackHandler"] = new Date().toISOString();
                     return [input];
                 }
                 this.stop();
@@ -94,28 +99,28 @@ class NackHandlerBase {
             value: () => new Promise((r, f) => {
                 if (this.lostSeqNumbers.length > 0 && this.mediaSourceSsrc) {
                     this.internalStats["count"] = (this.internalStats["count"] ?? 0) + 1;
-                    const nack = new nack_1.GenericNack({
+                    const nack = new __1.GenericNack({
                         senderSsrc: this.senderSsrc,
                         mediaSourceSsrc: this.mediaSourceSsrc,
                         lost: this.lostSeqNumbers,
                     });
-                    const rtcp = new rtpfb_1.RtcpTransportLayerFeedback({
+                    const rtcp = new __1.RtcpTransportLayerFeedback({
                         feedback: nack,
                     });
                     this.onNack(rtcp).then(r).catch(f);
                     this.updateRetryCount();
-                    this.onPacketLost.execute(nack);
+                    this.onNackSent.execute(nack);
                 }
             })
         });
     }
     toJSON() {
         return {
+            ...this.internalStats,
             newEstSeqNum: this.newEstSeqNum,
             lostLength: Object.values(this._lost).length,
             senderSsrc: this.senderSsrc,
             mediaSourceSsrc: this.mediaSourceSsrc,
-            ...this.internalStats,
         };
     }
     get lostSeqNumbers() {
@@ -126,15 +131,15 @@ class NackHandlerBase {
     }
     setLost(seq, count) {
         this._lost[seq] = count;
-        if (this.nackLoop || this.stopped) {
+        if (this.clearNackInterval || this.stopped) {
             return;
         }
-        this.nackLoop = setInterval(async () => {
+        this.clearNackInterval = __1.timer.setInterval(async () => {
             try {
                 await this.sendNack();
                 if (!Object.keys(this._lost).length) {
-                    clearInterval(this.nackLoop);
-                    this.nackLoop = undefined;
+                    this.clearNackInterval?.();
+                    this.clearNackInterval = undefined;
                 }
             }
             catch (error) {
@@ -157,12 +162,12 @@ class NackHandlerBase {
             this.removeLost(sequenceNumber);
             return;
         }
-        if (sequenceNumber === (0, src_1.uint16Add)(this.newEstSeqNum, 1)) {
+        if (sequenceNumber === (0, __1.uint16Add)(this.newEstSeqNum, 1)) {
             this.newEstSeqNum = sequenceNumber;
         }
-        else if (sequenceNumber > (0, src_1.uint16Add)(this.newEstSeqNum, 1)) {
+        else if (sequenceNumber > (0, __1.uint16Add)(this.newEstSeqNum, 1)) {
             // packet lost detected
-            (0, range_1.default)((0, src_1.uint16Add)(this.newEstSeqNum, 1), sequenceNumber).forEach((seq) => {
+            (0, range_1.default)((0, __1.uint16Add)(this.newEstSeqNum, 1), sequenceNumber).forEach((seq) => {
                 this.setLost(seq, 1);
             });
             // this.receiver.sendRtcpPLI(this.mediaSourceSsrc);
@@ -183,7 +188,8 @@ class NackHandlerBase {
     stop() {
         this.stopped = true;
         this._lost = {};
-        clearInterval(this.nackLoop);
+        this.clearNackInterval?.();
+        this.onNackSent.allUnsubscribe();
         this.onPacketLost.allUnsubscribe();
         this.onNack = undefined;
     }
@@ -192,7 +198,7 @@ class NackHandlerBase {
             const count = this._lost[seq]++;
             if (count > this.retryCount) {
                 this.removeLost(seq);
-                return seq;
+                this.onPacketLost.execute(seq);
             }
         });
     }

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

@@ -1 +1 @@
-{"version":3,"file":"nack.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/nack.ts"],"names":[],"mappings":"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","sourcesContent":["import debug from \"debug\";\nimport range from \"lodash/range\";\nimport Event from \"rx.mini\";\n\nimport { uint16Add } from \"../../../common/src\";\nimport { RtcpTransportLayerFeedback } from \"../rtcp/rtpfb\";\nimport { GenericNack } from \"../rtcp/rtpfb/nack\";\nimport { RtpPacket } from \"../rtp/rtp\";\nimport { Processor } from \"./interface\";\nimport { RtpOutput } from \"./source\";\n\nconst log = debug(\"werift-rtp : packages/rtp/src/processor/nack.ts\");\n\nconst LOST_SIZE = 30 * 5;\n\nexport type NackHandlerInput = RtpOutput;\n\nexport type NackHandlerOutput = RtpOutput;\n\nexport class NackHandlerBase\n  implements Processor<NackHandlerInput, NackHandlerOutput>\n{\n  private newEstSeqNum = 0;\n  private _lost: { [seqNum: number]: number } = {};\n  private nackLoop: any;\n  private internalStats = {};\n\n  readonly onPacketLost = new Event<[GenericNack]>();\n  mediaSourceSsrc?: number;\n  retryCount = 10;\n  stopped = false;\n\n  constructor(\n    private senderSsrc: number,\n    private onNack: (rtcp: RtcpTransportLayerFeedback) => Promise<void>\n  ) {}\n\n  toJSON(): Record<string, any> {\n    return {\n      newEstSeqNum: this.newEstSeqNum,\n      lostLength: Object.values(this._lost).length,\n      senderSsrc: this.senderSsrc,\n      mediaSourceSsrc: this.mediaSourceSsrc,\n      ...this.internalStats,\n    };\n  }\n\n  private get lostSeqNumbers() {\n    return Object.keys(this._lost).map(Number).sort();\n  }\n\n  private getLost(seq: number) {\n    return this._lost[seq];\n  }\n\n  private setLost(seq: number, count: number) {\n    this._lost[seq] = count;\n\n    if (this.nackLoop || this.stopped) {\n      return;\n    }\n    this.nackLoop = setInterval(async () => {\n      try {\n        await this.sendNack();\n        if (!Object.keys(this._lost).length) {\n          clearInterval(this.nackLoop);\n          this.nackLoop = undefined;\n        }\n      } catch (error) {\n        log(\"failed to send nack\", error);\n      }\n    }, 5);\n  }\n\n  private removeLost(sequenceNumber: number) {\n    delete this._lost[sequenceNumber];\n  }\n\n  processInput = (input: RtpOutput) => {\n    if (input.rtp) {\n      this.addPacket(input.rtp);\n      return [input];\n    }\n\n    this.stop();\n    return [input];\n  };\n\n  private addPacket(packet: RtpPacket) {\n    const { sequenceNumber, ssrc } = packet.header;\n    this.mediaSourceSsrc = ssrc;\n\n    if (this.newEstSeqNum === 0) {\n      this.newEstSeqNum = sequenceNumber;\n      return;\n    }\n\n    if (this.getLost(sequenceNumber)) {\n      // log(\"packetLoss resolved\", { sequenceNumber });\n      this.removeLost(sequenceNumber);\n      return;\n    }\n\n    if (sequenceNumber === uint16Add(this.newEstSeqNum, 1)) {\n      this.newEstSeqNum = sequenceNumber;\n    } else if (sequenceNumber > uint16Add(this.newEstSeqNum, 1)) {\n      // packet lost detected\n      range(uint16Add(this.newEstSeqNum, 1), sequenceNumber).forEach((seq) => {\n        this.setLost(seq, 1);\n      });\n      // this.receiver.sendRtcpPLI(this.mediaSourceSsrc);\n\n      this.newEstSeqNum = sequenceNumber;\n      this.pruneLost();\n    }\n  }\n\n  private pruneLost() {\n    if (this.lostSeqNumbers.length > LOST_SIZE) {\n      this._lost = Object.entries(this._lost)\n        .slice(-LOST_SIZE)\n        .reduce((acc, [key, v]) => {\n          acc[key] = v;\n          return acc;\n        }, {} as { [seqNum: number]: number });\n    }\n  }\n\n  private stop() {\n    this.stopped = true;\n    this._lost = {};\n    clearInterval(this.nackLoop);\n    this.onPacketLost.allUnsubscribe();\n    this.onNack = undefined as any;\n  }\n\n  private updateRetryCount() {\n    this.lostSeqNumbers.forEach((seq) => {\n      const count = this._lost[seq]++;\n      if (count > this.retryCount) {\n        this.removeLost(seq);\n        return seq;\n      }\n    });\n  }\n\n  private sendNack = () =>\n    new Promise((r, f) => {\n      if (this.lostSeqNumbers.length > 0 && this.mediaSourceSsrc) {\n        this.internalStats[\"count\"] = (this.internalStats[\"count\"] ?? 0) + 1;\n\n        const nack = new GenericNack({\n          senderSsrc: this.senderSsrc,\n          mediaSourceSsrc: this.mediaSourceSsrc,\n          lost: this.lostSeqNumbers,\n        });\n\n        const rtcp = new RtcpTransportLayerFeedback({\n          feedback: nack,\n        });\n        this.onNack(rtcp).then(r).catch(f);\n\n        this.updateRetryCount();\n        this.onPacketLost.execute(nack);\n      }\n    });\n}\n"]}
+{"version":3,"file":"nack.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/nack.ts"],"names":[],"mappings":"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","sourcesContent":["import debug from \"debug\";\nimport range from \"lodash/range\";\nimport Event from \"rx.mini\";\n\nimport {\n  GenericNack,\n  RtcpTransportLayerFeedback,\n  RtpPacket,\n  timer,\n  uint16Add,\n} from \"..\";\nimport { Processor } from \"./interface\";\nimport { RtpOutput } from \"./rtpCallback\";\n\nconst log = debug(\"werift-rtp : packages/rtp/src/processor/nack.ts\");\n\nconst LOST_SIZE = 30 * 5;\n\nexport type NackHandlerInput = RtpOutput;\n\nexport type NackHandlerOutput = RtpOutput;\n\nexport class NackHandlerBase\n  implements Processor<NackHandlerInput, NackHandlerOutput>\n{\n  private newEstSeqNum = 0;\n  private _lost: { [seqNum: number]: number } = {};\n  private clearNackInterval?: () => void;\n  private internalStats = {};\n\n  readonly onNackSent = new Event<[GenericNack]>();\n  readonly onPacketLost = new Event<[number]>();\n  mediaSourceSsrc?: number;\n  readonly retryCount = 10;\n  stopped = false;\n\n  constructor(\n    private senderSsrc: number,\n    private onNack: (rtcp: RtcpTransportLayerFeedback) => Promise<void>\n  ) {}\n\n  toJSON(): Record<string, any> {\n    return {\n      ...this.internalStats,\n      newEstSeqNum: this.newEstSeqNum,\n      lostLength: Object.values(this._lost).length,\n      senderSsrc: this.senderSsrc,\n      mediaSourceSsrc: this.mediaSourceSsrc,\n    };\n  }\n\n  private get lostSeqNumbers() {\n    return Object.keys(this._lost).map(Number).sort();\n  }\n\n  private getLost(seq: number) {\n    return this._lost[seq];\n  }\n\n  private setLost(seq: number, count: number) {\n    this._lost[seq] = count;\n\n    if (this.clearNackInterval || this.stopped) {\n      return;\n    }\n    this.clearNackInterval = timer.setInterval(async () => {\n      try {\n        await this.sendNack();\n        if (!Object.keys(this._lost).length) {\n          this.clearNackInterval?.();\n          this.clearNackInterval = undefined;\n        }\n      } catch (error) {\n        log(\"failed to send nack\", error);\n      }\n    }, 5);\n  }\n\n  private removeLost(sequenceNumber: number) {\n    delete this._lost[sequenceNumber];\n  }\n\n  processInput = (input: RtpOutput) => {\n    if (input.rtp) {\n      this.addPacket(input.rtp);\n      this.internalStats[\"nackHandler\"] = new Date().toISOString();\n      return [input];\n    }\n\n    this.stop();\n    return [input];\n  };\n\n  private addPacket(packet: RtpPacket) {\n    const { sequenceNumber, ssrc } = packet.header;\n    this.mediaSourceSsrc = ssrc;\n\n    if (this.newEstSeqNum === 0) {\n      this.newEstSeqNum = sequenceNumber;\n      return;\n    }\n\n    if (this.getLost(sequenceNumber)) {\n      // log(\"packetLoss resolved\", { sequenceNumber });\n      this.removeLost(sequenceNumber);\n      return;\n    }\n\n    if (sequenceNumber === uint16Add(this.newEstSeqNum, 1)) {\n      this.newEstSeqNum = sequenceNumber;\n    } else if (sequenceNumber > uint16Add(this.newEstSeqNum, 1)) {\n      // packet lost detected\n      range(uint16Add(this.newEstSeqNum, 1), sequenceNumber).forEach((seq) => {\n        this.setLost(seq, 1);\n      });\n      // this.receiver.sendRtcpPLI(this.mediaSourceSsrc);\n\n      this.newEstSeqNum = sequenceNumber;\n      this.pruneLost();\n    }\n  }\n\n  private pruneLost() {\n    if (this.lostSeqNumbers.length > LOST_SIZE) {\n      this._lost = Object.entries(this._lost)\n        .slice(-LOST_SIZE)\n        .reduce((acc, [key, v]) => {\n          acc[key] = v;\n          return acc;\n        }, {} as { [seqNum: number]: number });\n    }\n  }\n\n  private stop() {\n    this.stopped = true;\n    this._lost = {};\n    this.clearNackInterval?.();\n    this.onNackSent.allUnsubscribe();\n    this.onPacketLost.allUnsubscribe();\n    this.onNack = undefined as any;\n  }\n\n  private updateRetryCount() {\n    this.lostSeqNumbers.forEach((seq) => {\n      const count = this._lost[seq]++;\n      if (count > this.retryCount) {\n        this.removeLost(seq);\n        this.onPacketLost.execute(seq);\n      }\n    });\n  }\n\n  private sendNack = () =>\n    new Promise((r, f) => {\n      if (this.lostSeqNumbers.length > 0 && this.mediaSourceSsrc) {\n        this.internalStats[\"count\"] = (this.internalStats[\"count\"] ?? 0) + 1;\n\n        const nack = new GenericNack({\n          senderSsrc: this.senderSsrc,\n          mediaSourceSsrc: this.mediaSourceSsrc,\n          lost: this.lostSeqNumbers,\n        });\n\n        const rtcp = new RtcpTransportLayerFeedback({\n          feedback: nack,\n        });\n        this.onNack(rtcp).then(r).catch(f);\n\n        this.updateRetryCount();\n        this.onNackSent.execute(nack);\n      }\n    });\n}\n"]}

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

@@ -1,8 +1,15 @@
-import { RtcpTransportLayerFeedback } from "../rtcp/rtpfb";
-import { NackHandlerBase, NackHandlerInput, NackHandlerOutput } from "./nack";
-export declare class NackHandlerCallback extends NackHandlerBase {
-    private cb;
-    constructor(senderSsrc: number, onNack: (rtcp: RtcpTransportLayerFeedback) => Promise<void>);
-    pipe: (cb: (input: NackHandlerOutput) => void) => this;
-    input: (input: NackHandlerInput) => void;
+import { NackHandlerBase } from "./nack";
+declare const NackHandlerCallback_base: {
+    new (...args: any[]): {
+        cb?: ((o: import("./rtpCallback").RtpOutput) => void) | undefined;
+        destructor?: (() => void) | undefined;
+        pipe: (cb: (o: import("./rtpCallback").RtpOutput) => void, destructor?: (() => void) | undefined) => any;
+        input: (input: import("./rtpCallback").RtpOutput) => void;
+        destroy: () => void;
+        processInput: (input: import("./rtpCallback").RtpOutput) => import("./rtpCallback").RtpOutput[];
+        toJSON(): Record<string, any>;
+    };
+} & typeof NackHandlerBase;
+export declare class NackHandlerCallback extends NackHandlerCallback_base {
 }
+export {};

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

@@ -1,36 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NackHandlerCallback = void 0;
+const interface_1 = require("./interface");
 const nack_1 = require("./nack");
-class NackHandlerCallback extends nack_1.NackHandlerBase {
-    constructor(senderSsrc, onNack) {
-        super(senderSsrc, onNack);
-        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 NackHandlerCallback extends (0, interface_1.SimpleProcessorCallbackBase)(nack_1.NackHandlerBase) {
 }
 exports.NackHandlerCallback = NackHandlerCallback;
 //# sourceMappingURL=nackHandlerCallback.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"nackHandlerCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/nackHandlerCallback.ts"],"names":[],"mappings":";;;AACA,iCAA8E;AAE9E,MAAa,mBAAoB,SAAQ,sBAAe;IAEtD,YACE,UAAkB,EAClB,MAA2D;QAE3D,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAL5B;;;;;WAAgD;QAQhD;;;;mBAAO,CAAC,EAAsC,EAAE,EAAE;gBAChD,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;WAAC;QAEF;;;;mBAAQ,CAAC,KAAuB,EAAE,EAAE;gBAClC,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;AAnBD,kDAmBC","sourcesContent":["import { RtcpTransportLayerFeedback } from \"../rtcp/rtpfb\";\nimport { NackHandlerBase, NackHandlerInput, NackHandlerOutput } from \"./nack\";\n\nexport class NackHandlerCallback extends NackHandlerBase {\n  private cb!: (input: NackHandlerOutput) => void;\n  constructor(\n    senderSsrc: number,\n    onNack: (rtcp: RtcpTransportLayerFeedback) => Promise<void>\n  ) {\n    super(senderSsrc, onNack);\n  }\n\n  pipe = (cb: (input: NackHandlerOutput) => void) => {\n    this.cb = cb;\n    return this;\n  };\n\n  input = (input: NackHandlerInput) => {\n    for (const output of this.processInput(input)) {\n      this.cb(output);\n    }\n  };\n}\n"]}
+{"version":3,"file":"nackHandlerCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/nackHandlerCallback.ts"],"names":[],"mappings":";;;AAAA,2CAA0D;AAC1D,iCAA8E;AAE9E,MAAa,mBAAoB,SAAQ,IAAA,uCAA2B,EAIlE,sBAAe,CAAC;CAAG;AAJrB,kDAIqB","sourcesContent":["import { SimpleProcessorCallbackBase } from \"./interface\";\nimport { NackHandlerBase, NackHandlerInput, NackHandlerOutput } from \"./nack\";\n\nexport class NackHandlerCallback extends SimpleProcessorCallbackBase<\n  NackHandlerInput,\n  NackHandlerOutput,\n  typeof NackHandlerBase\n>(NackHandlerBase) {}\n"]}

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

@@ -12,15 +12,15 @@ export interface NtpTimeOutput {
 }
 export declare class NtpTimeBase implements Processor<NtpTimeInput, NtpTimeOutput> {
     clockRate: number;
-    baseNtpTimestamp?: bigint;
-    baseRtpTimestamp?: number;
-    latestNtpTimestamp?: bigint;
-    latestRtpTimestamp?: number;
+    readonly id: string;
+    private baseNtpTimestamp?;
+    private baseRtpTimestamp?;
+    private latestNtpTimestamp?;
+    private latestRtpTimestamp?;
     private currentElapsed;
-    buffer: RtpPacket[];
+    private buffer;
     private internalStats;
-    id: string;
-    payloadType: number;
+    started: boolean;
     constructor(clockRate: number);
     toJSON(): Record<string, any>;
     private stop;