@editframe/elements 0.9.0-beta.1 → 0.10.0-beta.2

package/dist/elements/EFMedia.d.ts

@@ -15,7 +15,7 @@ export declare class EFMedia extends EFMedia_base {
     get assetId(): string | null;
     fragmentIndexPath(): string;
     fragmentTrackPath(trackId: string): string;
-    trackFragmentIndexLoader: Task<readonly [string, typeof fetch], Record<number, TrackFragmentIndex> | undefined>;
+    trackFragmentIndexLoader: Task<readonly [string, typeof fetch], Record<number, TrackFragmentIndex>>;
     protected initSegmentsLoader: Task<readonly [Record<number, TrackFragmentIndex> | undefined, string, typeof fetch], {
         trackId: string;
         buffer: MP4Box.MP4ArrayBuffer;

package/dist/elements/EFTemporal.d.ts

@@ -16,6 +16,8 @@ export declare class TemporalMixinInterface {
     get trimAdjustedOwnCurrentTimeMs(): number;
     set duration(value: string);
     get duration(): string;
+    set trimstart(value: string);
+    set trimend(value: string);
     parentTimegroup?: EFTimegroup;
     rootTimegroup?: EFTimegroup;
     frameTask: Task<readonly unknown[], unknown>;

package/dist/elements/EFTimegroup.d.ts

@@ -17,7 +17,7 @@ export declare class EFTimegroup extends EFTimegroup_base {
     connectedCallback(): void;
     get storageKey(): string;
     get durationMs(): number;
-    waitForMediaDurations(): Promise<(Record<number, import('packages/assets/src/Probe.ts').TrackFragmentIndex> | undefined)[]>;
+    waitForMediaDurations(): Promise<Record<number, import('packages/assets/src/Probe.ts').TrackFragmentIndex>[]>;
     get childTemporals(): import('./EFTemporal.ts').TemporalMixinInterface[];
     protected updated(changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void;
     shouldWrapWithWorkbench(): boolean;

package/dist/elements/src/elements/EFCaptions.js

@@ -95,9 +95,9 @@ let EFCaptions = class extends EFSourceMixin(
   captionsPath() {
     if (this.targetElement.assetId) {
       if (EF_RENDERING()) {
-        return `editframe://api/video2/caption_files/${this.targetElement.assetId}`;
+        return `editframe://api/v1/caption_files/${this.targetElement.assetId}`;
       }
-      return `https://editframe.dev/api/video2/caption_files/${this.targetElement.assetId}`;
+      return `https://editframe.dev/api/v1/caption_files/${this.targetElement.assetId}`;
     }
     const targetSrc = this.targetElement.src;
     return `/@ef-captions/${targetSrc}`;

package/dist/elements/src/elements/EFImage.js

@@ -76,9 +76,9 @@ let EFImage = class extends EFSourceMixin(FetchMixin(LitElement), {
   assetPath() {
     if (this.assetId) {
       if (EF_RENDERING()) {
-        return `editframe://api/video2/image_files/${this.assetId}`;
+        return `editframe://api/v1/image_files/${this.assetId}`;
       }
-      return `https://editframe.dev/api/video2/image_files/${this.assetId}`;
+      return `https://editframe.dev/api/v1/image_files/${this.assetId}`;
     }
     return `/@ef-image/${this.src}`;
   }

package/dist/elements/src/elements/EFMedia.js

@@ -44,9 +44,6 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
     this.trackFragmentIndexLoader = new Task(this, {
       args: () => [this.fragmentIndexPath(), this.fetch],
       task: async ([fragmentIndexPath, fetch], { signal }) => {
-        if (this.src === "") {
-          return;
-        }
         const response = await fetch(fragmentIndexPath, { signal });
         return await response.json();
       },
@@ -246,18 +243,18 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
   fragmentIndexPath() {
     if (this.assetId) {
       if (EF_RENDERING()) {
-        return `editframe://api/video2/isobmff_files/${this.assetId}/index`;
+        return `editframe://api/v1/isobmff_files/${this.assetId}/index`;
       }
-      return `https://editframe.dev/api/video2/isobmff_files/${this.assetId}/index`;
+      return `https://editframe.dev/api/v1/isobmff_files/${this.assetId}/index`;
     }
     return `/@ef-track-fragment-index/${this.src ?? ""}`;
   }
   fragmentTrackPath(trackId) {
     if (this.assetId) {
       if (EF_RENDERING()) {
-        return `editframe://api/video2/isobmff_tracks/${this.assetId}/${trackId}`;
+        return `editframe://api/v1/isobmff_tracks/${this.assetId}/${trackId}`;
       }
-      return `https://editframe.dev/api/video2/isobmff_tracks/${this.assetId}?trackId=${trackId}`;
+      return `https://editframe.dev/api/v1/isobmff_tracks/${this.assetId}/${trackId}`;
     }
     return `/@ef-track/${this.src ?? ""}?trackId=${trackId}`;
   }

package/dist/elements/src/elements/EFSourceMixin.js

@@ -38,7 +38,7 @@ function EFSourceMixin(superClass, options) {
           `efHost not available for ${this}. Cannot generate production URL`
         );
       }
-      return `${this.efHost}/api/video2/${options.assetType}/${this.md5SumLoader.value}`;
+      return `${this.efHost}/api/v1/${options.assetType}/${this.md5SumLoader.value}`;
     }
   }
   __decorateClass([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@editframe/elements",
-  "version": "0.9.0-beta.1",
+  "version": "0.10.0-beta.2",
   "description": "",
   "exports": {
     ".": {
@@ -20,7 +20,7 @@
   "author": "",
   "license": "UNLICENSED",
   "dependencies": {
-    "@editframe/assets": "0.9.0-beta.1",
+    "@editframe/assets": "0.10.0-beta.2",
     "@lit/context": "^1.1.2",
     "@lit/task": "^1.0.1",
     "d3": "^7.9.0",

package/src/elements/EFCaptions.browsertest.ts

@@ -27,7 +27,7 @@ describe("EFCaptions", () => {
       document.body.appendChild(captions);
       workbench.appendChild(captions);
       expect(captions.captionsPath()).toBe(
-        "editframe://api/video2/caption_files/550e8400-e29b-41d4-a716-446655440000:example.mp4",
+        "editframe://api/v1/caption_files/550e8400-e29b-41d4-a716-446655440000:example.mp4",
       );
     });
   });
@@ -43,7 +43,7 @@ describe("EFCaptions", () => {
       captions.setAttribute("target", id);
       document.body.appendChild(captions);
       expect(captions.captionsPath()).toBe(
-        `https://editframe.dev/api/video2/caption_files/${id}:example.mp4`,
+        `https://editframe.dev/api/v1/caption_files/${id}:example.mp4`,
       );
     });
   });

package/src/elements/EFCaptions.ts

@@ -91,9 +91,9 @@ export class EFCaptions extends EFSourceMixin(
   captionsPath() {
     if (this.targetElement.assetId) {
       if (EF_RENDERING()) {
-        return `editframe://api/video2/caption_files/${this.targetElement.assetId}`;
+        return `editframe://api/v1/caption_files/${this.targetElement.assetId}`;
       }
-      return `https://editframe.dev/api/video2/caption_files/${this.targetElement.assetId}`;
+      return `https://editframe.dev/api/v1/caption_files/${this.targetElement.assetId}`;
     }
     const targetSrc = this.targetElement.src;
     return `/@ef-captions/${targetSrc}`;

package/src/elements/EFImage.browsertest.ts

@@ -19,7 +19,7 @@ describe("EFImage", () => {
       workbench.appendChild(element);
       element.assetId = "550e8400-e29b-41d4-a716-446655440000:example.jpg";
       expect(element.assetPath()).toBe(
-        "editframe://api/video2/image_files/550e8400-e29b-41d4-a716-446655440000:example.jpg",
+        "editframe://api/v1/image_files/550e8400-e29b-41d4-a716-446655440000:example.jpg",
       );
     });
   });
@@ -41,7 +41,7 @@ describe("EFImage", () => {
       const image = document.createElement("ef-image");
       image.setAttribute("asset-id", `${id}:example.jpg`);
       expect(image.assetPath()).toBe(
-        `https://editframe.dev/api/video2/image_files/${id}:example.jpg`,
+        `https://editframe.dev/api/v1/image_files/${id}:example.jpg`,
       );
     });
   });

package/src/elements/EFImage.ts

@@ -52,9 +52,9 @@ export class EFImage extends EFSourceMixin(FetchMixin(LitElement), {
   assetPath() {
     if (this.assetId) {
       if (EF_RENDERING()) {
-        return `editframe://api/video2/image_files/${this.assetId}`;
+        return `editframe://api/v1/image_files/${this.assetId}`;
       }
-      return `https://editframe.dev/api/video2/image_files/${this.assetId}`;
+      return `https://editframe.dev/api/v1/image_files/${this.assetId}`;
     }
     return `/@ef-image/${this.src}`;
   }

package/src/elements/EFMedia.browsertest.ts

@@ -35,7 +35,7 @@ describe("EFMedia", () => {
       workbench.appendChild(element);
       element.assetId = "550e8400-e29b-41d4-a716-446655440000:example.mp4";
       expect(element.fragmentIndexPath()).toBe(
-        "editframe://api/video2/isobmff_files/550e8400-e29b-41d4-a716-446655440000:example.mp4/index",
+        "editframe://api/v1/isobmff_files/550e8400-e29b-41d4-a716-446655440000:example.mp4/index",
       );
     });
 
@@ -45,7 +45,7 @@ describe("EFMedia", () => {
       workbench.appendChild(element);
       element.assetId = "550e8400-e29b-41d4-a716-446655440000:example.mp4";
       expect(element.fragmentTrackPath("1")).toBe(
-        "editframe://api/video2/isobmff_tracks/550e8400-e29b-41d4-a716-446655440000:example.mp4/1",
+        "editframe://api/v1/isobmff_tracks/550e8400-e29b-41d4-a716-446655440000:example.mp4/1",
       );
     });
   });
@@ -67,7 +67,7 @@ describe("EFMedia", () => {
       const element = document.createElement("test-media");
       element.setAttribute("asset-id", `${id}:example.mp4`);
       expect(element.fragmentIndexPath()).toBe(
-        `https://editframe.dev/api/video2/isobmff_files/${id}:example.mp4/index`,
+        `https://editframe.dev/api/v1/isobmff_files/${id}:example.mp4/index`,
       );
     });
 
@@ -76,7 +76,7 @@ describe("EFMedia", () => {
       const element = document.createElement("test-media");
       element.setAttribute("asset-id", `${id}:example.mp4`);
       expect(element.fragmentTrackPath("1")).toBe(
-        `https://editframe.dev/api/video2/isobmff_tracks/${id}:example.mp4?trackId=1`,
+        `https://editframe.dev/api/v1/isobmff_tracks/${id}:example.mp4/1`,
       );
     });
   });

package/src/elements/EFMedia.ts

@@ -72,9 +72,9 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
   fragmentIndexPath() {
     if (this.assetId) {
       if (EF_RENDERING()) {
-        return `editframe://api/video2/isobmff_files/${this.assetId}/index`;
+        return `editframe://api/v1/isobmff_files/${this.assetId}/index`;
       }
-      return `https://editframe.dev/api/video2/isobmff_files/${this.assetId}/index`;
+      return `https://editframe.dev/api/v1/isobmff_files/${this.assetId}/index`;
     }
     return `/@ef-track-fragment-index/${this.src ?? ""}`;
   }
@@ -82,21 +82,19 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
   fragmentTrackPath(trackId: string) {
     if (this.assetId) {
       if (EF_RENDERING()) {
-        // It is significant that the editframe:// protocol lists the trackId in the path rather than
-        // as a query parameter. This is a shortcut to loading track data from storage.
-        return `editframe://api/video2/isobmff_tracks/${this.assetId}/${trackId}`;
+        return `editframe://api/v1/isobmff_tracks/${this.assetId}/${trackId}`;
       }
-      return `https://editframe.dev/api/video2/isobmff_tracks/${this.assetId}?trackId=${trackId}`;
+      return `https://editframe.dev/api/v1/isobmff_tracks/${this.assetId}/${trackId}`;
     }
+    // trackId is only specified as a query  in the @ef-track url shape
+    // this is because that system doesn't have a full url matching system.
+    // This is an annoying incosistency that should be fixed.
     return `/@ef-track/${this.src ?? ""}?trackId=${trackId}`;
   }
 
   public trackFragmentIndexLoader = new Task(this, {
     args: () => [this.fragmentIndexPath(), this.fetch] as const,
     task: async ([fragmentIndexPath, fetch], { signal }) => {
-      if (this.src === "") {
-        return;
-      }
       const response = await fetch(fragmentIndexPath, { signal });
       return (await response.json()) as Record<number, TrackFragmentIndex>;
     },

package/src/elements/EFSourceMixin.ts

@@ -39,7 +39,7 @@ export function EFSourceMixin<T extends Constructor<LitElement>>(
         );
       }
 
-      return `${this.efHost}/api/video2/${options.assetType}/${this.md5SumLoader.value}`;
+      return `${this.efHost}/api/v1/${options.assetType}/${this.md5SumLoader.value}`;
     }
 
     md5SumLoader = new Task(this, {

package/src/elements/EFTemporal.ts

@@ -24,6 +24,8 @@ export declare class TemporalMixinInterface {
 
   set duration(value: string);
   get duration(): string;
+  set trimstart(value: string);
+  set trimend(value: string);
 
   parentTimegroup?: EFTimegroup;
   rootTimegroup?: EFTimegroup;