@torrent-tv/proxy 2.87.20 → 2.88.0

package/test/orchestrator-wired.test.js

@@ -1,206 +1,206 @@
-/**
- * @file The plan is what decides the encoders, and it is asked of real sessions.
- *
- * Three rules written into the session manager become one here: where a run
- * belongs, when it has been overtaken, and how many the machine affords. The
- * point of wiring rather than duplicating is that the arithmetic has sixteen
- * checks of its own and no ffmpeg behind it.
- */
-
-import test from "node:test";
-import assert from "node:assert/strict";
-import { SourceFile } from "../services/media/SourceFile.js";
-import { Timeline } from "../services/encode/output/Timeline.js";
-import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
-import os from "node:os";
-import path from "node:path";
-import { wireOutputs } from "../services/server/wire-outputs.js";
-import { SegmentStore } from "../services/storage/segment-store/SegmentStore.js";
-import { fmp4Format } from "../services/encode/segment-formats/fmp4.js";
-import { qualityStateOf } from "../services/encode/quality/OutputQualityState.js";
-import { startRunOn } from "./helpers/encode-run.js";
-import { outputSpec } from "./helpers/output-spec.js";
-
-const KEY = "torrent:abc:fmt=fmp4:grid=kf@0:video-only:v=0/copy";
-
-function managerWithAnOutput() {
-  const root = mkdtempSync(path.join(os.tmpdir(), "orchestrator-wired-"));
-  const store = new SegmentStore({ root });
-  const manager = wireOutputs({
-    enabled: true,
-    ffmpegBin: "ffmpeg",
-    localBindHost: "127.0.0.1",
-    localPort: 9090,
-    segmentStore: store
-  });
-  const dirPath = store.directoryFor(KEY);
-  store.useFormat(KEY, fmp4Format);
-  return { manager, store, root, dirPath };
-}
-
-function sessionOn({ manager, id, dirPath, encodeStartIndex = 0, runEndIndex = -1, speed = 0, running = true }) {
-  const session = {
-    id,
-    spec: outputSpec({ transcodeVideo: false }),
-    outputKey: KEY,
-    dirPath,
-    // Where this file is cut, held by the file. A fixture that stated it
-    // on the session was describing what production no longer does.
-    timeline: new Timeline({
-      boundaries: Array.from({ length: 1001 }, (_, index) => index * 4),
-      cutGrid: "uniform"
-    }),
-    state: "ready",
-    file: new SourceFile({ sourceKey: "source-1", fileIndex: 0, name: "video.mkv" }).learn({ durationSeconds: 4000 }),
-    // An ordinary session reads its own file, and its sound is inside it. The
-    // three differ only for a soundtrack shipped as a file of its own.
-    get inputFile() { return this.file; },
-    get audioFile() { return this.file; },
-    segmentFormat: fmp4Format,
-    segmentCount: 1000,
-    runs: new Set(),
-    lastAccessedAt: Date.now()
-  };
-  if (running) {
-    const run = startRunOn(session, { from: encodeStartIndex, to: runEndIndex });
-    manager.encodeOrchestrator.adopt(KEY, run);
-    session.testRun = run;
-    // A speed is a reading taken FROM a run, so it names the run it came from.
-    qualityStateOf(session).recentSpeed = speed > 0 ? { speed, at: Date.now(), run } : null;
-    run.noteSpeed(speed);
-  }
-  return session;
-}
-
-test("a session is handed to the plan as the run it is", (t) => {
-  const { manager, root, dirPath } = managerWithAnOutput();
-  t.after(() => rmSync(root, { recursive: true, force: true }));
-
-  const session = sessionOn({ manager, id: "one", dirPath, encodeStartIndex: 10, runEndIndex: 40 });
-  manager.outputs.set(session.id, session);
-  manager.viewers.of(session, "watching").position = { segment: 12, seconds: 48, at: Date.now() };
-
-  manager.quality.runQualityBudgetOnce;
-  manager.encodeRuns.planEncodersNow();
-
-  const runs = manager.encodeOrchestrator.runsOn(KEY);
-  assert.equal(runs.length, 1, "the session the browser already has is a run like any other");
-  assert.equal(runs[0], session.testRun, "and it is the run registered for this output");
-  assert.equal(runs[0].from, 10);
-  assert.equal(runs[0].to, 40);
-});
-
-test("what a viewer waits for reaches the plan without their name", (t) => {
-  const { manager, root, dirPath } = managerWithAnOutput();
-  t.after(() => rmSync(root, { recursive: true, force: true }));
-
-  const session = sessionOn({ manager, id: "one", dirPath, encodeStartIndex: 0, runEndIndex: -1 });
-  manager.outputs.set(session.id, session);
-  manager.viewers.of(session, "someone").position = { segment: 5, seconds: 20, at: Date.now() };
-
-  manager.encodeRuns.planEncodersNow();
-
-  // THE MAP IS BANDS NOW, not one window per viewer: what a viewer is stopped
-  // on, then what is in front of them band by band, then the rest of the track.
-  // The check is the same question asked of that shape — where the most urgent
-  // band begins, and that there is film in front of it.
-  const wanted = manager.encodeOrchestrator.wantedSegmentsOn(KEY);
-  const first = [...wanted].sort((left, right) => right.priority - left.priority)[0];
-  assert.equal(first.from, 5, "where they are");
-  assert.ok(wanted.some((zone) => zone.to > 5), "and the cushion in front of them");
-});
-
-test("a viewer who has gone stops being waited for, and silence alone never counts", (t) => {
-  const { manager, root, dirPath } = managerWithAnOutput();
-  t.after(() => rmSync(root, { recursive: true, force: true }));
-
-  const session = sessionOn({ manager, id: "one", dirPath });
-  manager.outputs.set(session.id, session);
-  const person = manager.viewers.of(session, "gone");
-  person.moveTo(20, Date.now() - 10 * 60 * 1000);
-  person.playing = false;
-  person.seen(Date.now() - 10 * 60 * 1000);
-
-  // TEN MINUTES OF SILENCE IS NOT LEAVING. A paused viewer, a hidden tab whose
-  // timers the browser has throttled, and one holding a full cushion are all
-  // silent and all still watching, so what they want is still wanted.
-  manager.encodeRuns.planEncodersNow();
-  assert.ok(manager.encodeOrchestrator.wantedSegmentsOn(KEY).length > 0, "still watching");
-
-  // Something SAYS they are gone — the browser released the session, or their
-  // connection closed. That is the only way out.
-  manager.viewers.leaves(session, "gone");
-  manager.encodeRuns.planEncodersNow();
-  assert.equal(manager.encodeOrchestrator.wantedSegmentsOn(KEY).length, 0);
-});
-
-test("a viewer who has arrived and asked for nothing is waited for", (t) => {
-  const { manager, root, dirPath } = managerWithAnOutput();
-  t.after(() => rmSync(root, { recursive: true, force: true }));
-
-  const session = sessionOn({ manager, id: "one", dirPath });
-  manager.outputs.set(session.id, session);
-  // Nothing places them here on purpose: this is a viewer known to the output
-  // and nothing more, which is what a viewer IS between arriving and asking
-  // for their first file. Answered from the position alone, this viewer read
-  // as absent, and on 2026-09-05 that stopped a soundtrack's encoder 1.25 s
-  // after it started, with nothing produced.
-  const fresh = manager.viewers.of(session, "fresh");
-  assert.equal(fresh.position, null, "nobody has placed them");
-
-  manager.encodeRuns.planEncodersNow();
-
-  const wanted = manager.encodeOrchestrator.wantedSegmentsOn(KEY);
-  assert.ok(wanted.length > 0, "an output with a viewer on it is wanted");
-  const first = [...wanted].sort((left, right) => right.priority - left.priority)[0];
-  assert.equal(first.from, 0, "and the beginning is where an unplaced viewer is");
-});
-
-test("how many encoders the machine affords is measured, not chosen", (t) => {
-  const { manager, root, dirPath } = managerWithAnOutput();
-  t.after(() => rmSync(root, { recursive: true, force: true }));
-
-  // Nothing measured yet: one is what it has.
-  const cold = sessionOn({ manager, id: "cold", dirPath });
-  manager.outputs.set(cold.id, cold);
-  assert.equal(manager.encodeRuns.maxRunsForOutput(KEY), 1);
-
-  // Fast, but what a second job costs on THIS machine has not been measured,
-  // and an unmeasured penalty of 1 is not a statement that it is free.
-  qualityStateOf(cold).lastAloneSpeed = 7.12;
-  assert.equal(manager.encodeRuns.maxRunsForOutput(KEY), 1, "no measurement, no second encoder");
-
-  // Measured on the addon host 2026-09-03: at 854x480 one run made 7.12x and
-  // two made 4.20x and 4.16x, a penalty of 1.70x, and both stayed far above
-  // realtime.
-  manager.contentionPenalties = new Map([[1, 1.7]]);
-  assert.ok(manager.encodeRuns.maxRunsForOutput(KEY) > 1, "measured, and a second fits");
-
-  // The same host at 1920x1080: one made 1.96x, two made 0.99x and 0.98x.
-  manager.contentionPenalties = new Map([[1, 1.98]]);
-  qualityStateOf(cold).lastAloneSpeed = 1.96;
-  assert.equal(manager.encodeRuns.maxRunsForOutput(KEY), 1, "the machine is full at one");
-});
-
-test("segments already made are known to the plan, whoever made them", (t) => {
-  const { manager, store, root, dirPath } = managerWithAnOutput();
-  t.after(() => rmSync(root, { recursive: true, force: true }));
-
-  for (const index of [0, 1, 2, 3]) {
-    writeFileSync(path.join(dirPath, fmp4Format.segmentFileName(index)), Buffer.alloc(16, 1));
-  }
-  const session = sessionOn({ manager, id: "one", dirPath });
-  manager.outputs.set(session.id, session);
-
-  manager.encodeRuns.planEncodersNow();
-
-  const coverage = manager.encodeOrchestrator.coverageOf(KEY);
-  assert.equal(coverage.isReady(0), true);
-  assert.equal(coverage.isReady(2), true);
-  // Including the highest. It used to be excluded for having no successor to
-  // prove it closed, which left the last piece of every run unprovable for ever
-  // — and proved a half-written one whenever the number above it was written by
-  // another run of the same output. A served name is the proof now.
-  assert.equal(coverage.isReady(3), true, "its name says it is closed");
-  void store;
-});
+/**
+ * @file The plan is what decides the encoders, and it is asked of real sessions.
+ *
+ * Three rules written into the session manager become one here: where a run
+ * belongs, when it has been overtaken, and how many the machine affords. The
+ * point of wiring rather than duplicating is that the arithmetic has sixteen
+ * checks of its own and no ffmpeg behind it.
+ */
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { SourceFile } from "../services/media/SourceFile.js";
+import { Timeline } from "../services/encode/output/Timeline.js";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { wireOutputs } from "../services/server/wire-outputs.js";
+import { SegmentStore } from "../services/storage/segment-store/SegmentStore.js";
+import { fmp4Format } from "../services/encode/segment-formats/fmp4.js";
+import { qualityStateOf } from "../services/encode/quality/OutputQualityState.js";
+import { startRunOn } from "./helpers/encode-run.js";
+import { outputSpec } from "./helpers/output-spec.js";
+
+const KEY = "torrent:abc:fmt=fmp4:grid=kf@0:video-only:v=0/copy";
+
+function managerWithAnOutput() {
+  const root = mkdtempSync(path.join(os.tmpdir(), "orchestrator-wired-"));
+  const store = new SegmentStore({ root });
+  const manager = wireOutputs({
+    enabled: true,
+    ffmpegBin: "ffmpeg",
+    localBindHost: "127.0.0.1",
+    localPort: 9090,
+    segmentStore: store
+  });
+  const dirPath = store.directoryFor(KEY);
+  store.useFormat(KEY, fmp4Format);
+  return { manager, store, root, dirPath };
+}
+
+function sessionOn({ manager, id, dirPath, encodeStartIndex = 0, runEndIndex = -1, speed = 0, running = true }) {
+  const session = {
+    id,
+    spec: outputSpec({ transcodeVideo: false }),
+    outputKey: KEY,
+    dirPath,
+    // Where this file is cut, held by the file. A fixture that stated it
+    // on the session was describing what production no longer does.
+    timeline: new Timeline({
+      boundaries: Array.from({ length: 1001 }, (_, index) => index * 4),
+      cutGrid: "uniform"
+    }),
+    state: "ready",
+    file: new SourceFile({ sourceKey: "source-1", fileIndex: 0, name: "video.mkv" }).learn({ durationSeconds: 4000 }),
+    // An ordinary session reads its own file, and its sound is inside it. The
+    // three differ only for a soundtrack shipped as a file of its own.
+    get inputFile() { return this.file; },
+    get audioFile() { return this.file; },
+    segmentFormat: fmp4Format,
+    segmentCount: 1000,
+    runs: new Set(),
+    lastAccessedAt: Date.now()
+  };
+  if (running) {
+    const run = startRunOn(session, { from: encodeStartIndex, to: runEndIndex });
+    manager.encodeOrchestrator.adopt(KEY, run);
+    session.testRun = run;
+    // A speed is a reading taken FROM a run, so it names the run it came from.
+    qualityStateOf(session).recentSpeed = speed > 0 ? { speed, at: Date.now(), run } : null;
+    run.noteSpeed(speed);
+  }
+  return session;
+}
+
+test("a session is handed to the plan as the run it is", (t) => {
+  const { manager, root, dirPath } = managerWithAnOutput();
+  t.after(() => rmSync(root, { recursive: true, force: true }));
+
+  const session = sessionOn({ manager, id: "one", dirPath, encodeStartIndex: 10, runEndIndex: 40 });
+  manager.outputs.set(session.id, session);
+  manager.viewers.of(session, "watching").position = { segment: 12, seconds: 48, at: Date.now() };
+
+  manager.quality.runQualityBudgetOnce;
+  manager.encodeRuns.planEncodersNow();
+
+  const runs = manager.encodeOrchestrator.runsOn(KEY);
+  assert.equal(runs.length, 1, "the session the browser already has is a run like any other");
+  assert.equal(runs[0], session.testRun, "and it is the run registered for this output");
+  assert.equal(runs[0].from, 10);
+  assert.equal(runs[0].to, 40);
+});
+
+test("what a viewer waits for reaches the plan without their name", (t) => {
+  const { manager, root, dirPath } = managerWithAnOutput();
+  t.after(() => rmSync(root, { recursive: true, force: true }));
+
+  const session = sessionOn({ manager, id: "one", dirPath, encodeStartIndex: 0, runEndIndex: -1 });
+  manager.outputs.set(session.id, session);
+  manager.viewers.of(session, "someone").position = { segment: 5, seconds: 20, at: Date.now() };
+
+  manager.encodeRuns.planEncodersNow();
+
+  // THE MAP IS BANDS NOW, not one window per viewer: what a viewer is stopped
+  // on, then what is in front of them band by band, then the rest of the track.
+  // The check is the same question asked of that shape — where the most urgent
+  // band begins, and that there is film in front of it.
+  const wanted = manager.encodeOrchestrator.wantedSegmentsOn(KEY);
+  const first = [...wanted].sort((left, right) => right.priority - left.priority)[0];
+  assert.equal(first.from, 5, "where they are");
+  assert.ok(wanted.some((zone) => zone.to > 5), "and the cushion in front of them");
+});
+
+test("a viewer who has gone stops being waited for, and silence alone never counts", (t) => {
+  const { manager, root, dirPath } = managerWithAnOutput();
+  t.after(() => rmSync(root, { recursive: true, force: true }));
+
+  const session = sessionOn({ manager, id: "one", dirPath });
+  manager.outputs.set(session.id, session);
+  const person = manager.viewers.of(session, "gone");
+  person.moveTo(20, Date.now() - 10 * 60 * 1000);
+  person.playing = false;
+  person.seen(Date.now() - 10 * 60 * 1000);
+
+  // TEN MINUTES OF SILENCE IS NOT LEAVING. A paused viewer, a hidden tab whose
+  // timers the browser has throttled, and one holding a full cushion are all
+  // silent and all still watching, so what they want is still wanted.
+  manager.encodeRuns.planEncodersNow();
+  assert.ok(manager.encodeOrchestrator.wantedSegmentsOn(KEY).length > 0, "still watching");
+
+  // Something SAYS they are gone — the browser released the session, or their
+  // connection closed. That is the only way out.
+  manager.viewers.leaves(session, "gone");
+  manager.encodeRuns.planEncodersNow();
+  assert.equal(manager.encodeOrchestrator.wantedSegmentsOn(KEY).length, 0);
+});
+
+test("a viewer who has arrived and asked for nothing is waited for", (t) => {
+  const { manager, root, dirPath } = managerWithAnOutput();
+  t.after(() => rmSync(root, { recursive: true, force: true }));
+
+  const session = sessionOn({ manager, id: "one", dirPath });
+  manager.outputs.set(session.id, session);
+  // Nothing places them here on purpose: this is a viewer known to the output
+  // and nothing more, which is what a viewer IS between arriving and asking
+  // for their first file. Answered from the position alone, this viewer read
+  // as absent, and on 2026-09-05 that stopped a soundtrack's encoder 1.25 s
+  // after it started, with nothing produced.
+  const fresh = manager.viewers.of(session, "fresh");
+  assert.equal(fresh.position, null, "nobody has placed them");
+
+  manager.encodeRuns.planEncodersNow();
+
+  const wanted = manager.encodeOrchestrator.wantedSegmentsOn(KEY);
+  assert.ok(wanted.length > 0, "an output with a viewer on it is wanted");
+  const first = [...wanted].sort((left, right) => right.priority - left.priority)[0];
+  assert.equal(first.from, 0, "and the beginning is where an unplaced viewer is");
+});
+
+test("how many encoders the machine affords is measured, not chosen", (t) => {
+  const { manager, root, dirPath } = managerWithAnOutput();
+  t.after(() => rmSync(root, { recursive: true, force: true }));
+
+  // Nothing measured yet: one is what it has.
+  const cold = sessionOn({ manager, id: "cold", dirPath });
+  manager.outputs.set(cold.id, cold);
+  assert.equal(manager.encodeRuns.maxRunsForOutput(KEY), 1);
+
+  // Fast, but what a second job costs on THIS machine has not been measured,
+  // and an unmeasured penalty of 1 is not a statement that it is free.
+  qualityStateOf(cold).lastAloneSpeed = 7.12;
+  assert.equal(manager.encodeRuns.maxRunsForOutput(KEY), 1, "no measurement, no second encoder");
+
+  // Measured on the addon host 2026-09-03: at 854x480 one run made 7.12x and
+  // two made 4.20x and 4.16x, a penalty of 1.70x, and both stayed far above
+  // realtime.
+  manager.contentionPenalties = new Map([[1, 1.7]]);
+  assert.ok(manager.encodeRuns.maxRunsForOutput(KEY) > 1, "measured, and a second fits");
+
+  // The same host at 1920x1080: one made 1.96x, two made 0.99x and 0.98x.
+  manager.contentionPenalties = new Map([[1, 1.98]]);
+  qualityStateOf(cold).lastAloneSpeed = 1.96;
+  assert.equal(manager.encodeRuns.maxRunsForOutput(KEY), 1, "the machine is full at one");
+});
+
+test("segments already made are known to the plan, whoever made them", (t) => {
+  const { manager, store, root, dirPath } = managerWithAnOutput();
+  t.after(() => rmSync(root, { recursive: true, force: true }));
+
+  for (const index of [0, 1, 2, 3]) {
+    writeFileSync(path.join(dirPath, fmp4Format.segmentFileName(index)), Buffer.alloc(16, 1));
+  }
+  const session = sessionOn({ manager, id: "one", dirPath });
+  manager.outputs.set(session.id, session);
+
+  manager.encodeRuns.planEncodersNow();
+
+  const coverage = manager.encodeOrchestrator.coverageOf(KEY);
+  assert.equal(coverage.isReady(0), true);
+  assert.equal(coverage.isReady(2), true);
+  // Including the highest. It used to be excluded for having no successor to
+  // prove it closed, which left the last piece of every run unprovable for ever
+  // — and proved a half-written one whenever the number above it was written by
+  // another run of the same output. A served name is the proof now.
+  assert.equal(coverage.isReady(3), true, "its name says it is closed");
+  void store;
+});

package/test/output-catalog.test.js

@@ -1,39 +1,39 @@
-import test from "node:test";
-import assert from "node:assert/strict";
-import { OutputCatalog } from "../services/encode/output/OutputCatalog.js";
-
-test("the catalog owns creation and access times", () => {
-  let now = 100;
-  const registry = new OutputCatalog({ now: () => now });
-  const output = { id: "picture" };
-  registry.set(output.id, output);
-
-  now = 250;
-  registry.touch(output);
-
-  assert.equal(registry.startedAt(output), 100);
-  assert.equal(registry.lastAccessedAt(output), 250);
-  assert.equal("startedAt" in output, false);
-  assert.equal("lastAccessedAt" in output, false);
-});
-
-test("expiry is decided from the catalog's access time", () => {
-  let now = 100;
-  const registry = new OutputCatalog({ now: () => now });
-  registry.set("old", { id: "old" });
-  now = 200;
-  registry.set("fresh", { id: "fresh" });
-
-  assert.deepEqual(registry.expiredBefore(150), ["old"]);
-});
-
-test("removal deletes both the output and its lifetime", () => {
-  const registry = new OutputCatalog({ now: () => 100 });
-  const output = { id: "picture" };
-  registry.set(output.id, output);
-  registry.delete(output.id);
-
-  assert.equal(registry.get(output.id), undefined);
-  assert.equal(registry.startedAt(output), null);
-  assert.equal(registry.touch(output, 200), false);
-});
+import test from "node:test";
+import assert from "node:assert/strict";
+import { OutputCatalog } from "../services/encode/output/OutputCatalog.js";
+
+test("the catalog owns creation and access times", () => {
+  let now = 100;
+  const registry = new OutputCatalog({ now: () => now });
+  const output = { id: "picture" };
+  registry.set(output.id, output);
+
+  now = 250;
+  registry.touch(output);
+
+  assert.equal(registry.startedAt(output), 100);
+  assert.equal(registry.lastAccessedAt(output), 250);
+  assert.equal("startedAt" in output, false);
+  assert.equal("lastAccessedAt" in output, false);
+});
+
+test("expiry is decided from the catalog's access time", () => {
+  let now = 100;
+  const registry = new OutputCatalog({ now: () => now });
+  registry.set("old", { id: "old" });
+  now = 200;
+  registry.set("fresh", { id: "fresh" });
+
+  assert.deepEqual(registry.expiredBefore(150), ["old"]);
+});
+
+test("removal deletes both the output and its lifetime", () => {
+  const registry = new OutputCatalog({ now: () => 100 });
+  const output = { id: "picture" };
+  registry.set(output.id, output);
+  registry.delete(output.id);
+
+  assert.equal(registry.get(output.id), undefined);
+  assert.equal(registry.startedAt(output), null);
+  assert.equal(registry.touch(output, 200), false);
+});

package/test/output-shape.test.js

@@ -1,21 +1,21 @@
-/**
- * @file The shape an encoder is given for an output.
- *
- * The format itself is the output's identity (`OutputSpec`), decided before
- * the output is named; this is that format in the terms the encoder takes.
- */
-
-import test from "node:test";
-import assert from "node:assert/strict";
-import { Output } from "../services/encode/output/Output.js";
-
-test("a copied picture has no box of its own, and says so with zeroes", () => {
-  // Zero means the source's own size, which is what a copy is by definition:
-  // no box asked for can change one byte of it.
-  const copied = new Output({ encodeWidth: 0, encodeHeight: 0, outputFps: 24 });
-
-  assert.equal(copied.encodeWidth, 0);
-  assert.equal(copied.encodeHeight, 0);
-  assert.equal(copied.softwarePreset, null, "and no speed setting, having no encoder");
-});
-
+/**
+ * @file The shape an encoder is given for an output.
+ *
+ * The format itself is the output's identity (`OutputSpec`), decided before
+ * the output is named; this is that format in the terms the encoder takes.
+ */
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { Output } from "../services/encode/output/Output.js";
+
+test("a copied picture has no box of its own, and says so with zeroes", () => {
+  // Zero means the source's own size, which is what a copy is by definition:
+  // no box asked for can change one byte of it.
+  const copied = new Output({ encodeWidth: 0, encodeHeight: 0, outputFps: 24 });
+
+  assert.equal(copied.encodeWidth, 0);
+  assert.equal(copied.encodeHeight, 0);
+  assert.equal(copied.softwarePreset, null, "and no speed setting, having no encoder");
+});
+