straight_to_video 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f9374ddbb488a573260822bdfc2b8a5a183f0c1f8c10e4e6428b7ae8c3e7f86
-  data.tar.gz: 3fb96670c80e91c46c0214d4153e2a28b96d3f5cddb368875568978bf2421912
+  metadata.gz: 7412c0ad6de37671f90aad3c474a2dfc2f846e656de524248791ec318ad598b7
+  data.tar.gz: 4032432057ff6b71831f3e509e4300f34a8f662c70b977923ec60edfce2d15ae
 SHA512:
-  metadata.gz: 54b446d8179dd83c5604902b741c15c07b388b0fbada671527faf07441d11d73af5c1ba6729128897b43cf2232b7f9dc8f8271e0037362a94155736a28309089
-  data.tar.gz: bbe19415c4fa54b522fefbcf8aaaa208d72674aacf6e29db2830c06190076b45955b04a4e51ad75baa161abfe1ce1feb1a075970c439a863158b88459cfe26e1
+  metadata.gz: 6c1d31ff446323e0304df7abfa4d02d7a52b883149a97f810753b55944447e5001a9ec810fa37525a8a0e5be7662c552df5c70d740d82b8ba367389c2d86d1ac
+  data.tar.gz: d8244161a7cd07734f24f7bf24037131db2c7ccaceb54e89330474edc575d00c32d82b24317ae24561e9bd42f1191b06d986c19ae770e829f81ef973598cc330

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.0.7
+
+- guard against a race condition for forms that subscribe to change events but don't disable submission while optimize is already underway
+
+## 0.0.6
+
+- fix iOS Safari Stimulus controller hang by making `seeked` waits robust
+
 ## 0.0.5
 
 - unscrew up the extension in the importmap 🤦‍♂️

data/app/assets/javascripts/straight-to-video.js

@@ -1,4 +1,4 @@
-// straight-to-video@0.0.5 vendored by the straight_to_video gem
+// straight-to-video@0.0.7 vendored by the straight_to_video gem
 // straight-to-video - https://github.com/searlsco/straight-to-video
 
 // ----- External imports -----
@@ -149,6 +149,20 @@ async function waitForFrameReady (video, budgetMs) {
   })
 }
 
+async function seekOnce (video, time) {
+  if (!video) return
+  const t = Number.isFinite(time) ? time : 0
+  if (Math.abs(video.currentTime - t) < 1e-6) return
+  await new Promise((resolve) => {
+    const onSeeked = () => {
+      video.removeEventListener('seeked', onSeeked)
+      resolve()
+    }
+    video.addEventListener('seeked', onSeeked, { once: true })
+    video.currentTime = t
+  })
+}
+
 async function encodeVideo ({ file, srcMeta, onProgress }) {
   const w = srcMeta.w
   const h = srcMeta.h
@@ -205,8 +219,26 @@ async function encodeVideo ({ file, srcMeta, onProgress }) {
   const url = URL.createObjectURL(file)
   const v = document.createElement('video')
   v.muted = true; v.preload = 'auto'; v.playsInline = true
-  v.src = url
-  await new Promise((resolve, reject) => { v.onloadedmetadata = resolve; v.onerror = () => reject(new Error('video load failed')) })
+  await new Promise((resolve, reject) => {
+    const onLoaded = () => {
+      v.removeEventListener('loadedmetadata', onLoaded)
+      v.removeEventListener('error', onError)
+      resolve()
+    }
+    const onError = () => {
+      v.removeEventListener('loadedmetadata', onLoaded)
+      v.removeEventListener('error', onError)
+      reject(new Error('video load failed'))
+    }
+    v.addEventListener('loadedmetadata', onLoaded)
+    v.addEventListener('error', onError)
+    v.src = url
+    try {
+      v.load()
+    } catch (err) {
+      console.warn('straight-to-video: video.load() threw; continuing without explicit load()', err)
+    }
+  })
   const canvas = document.createElement('canvas'); canvas.width = targetWidth; canvas.height = targetHeight
   const ctx = canvas.getContext('2d', { alpha: false })
 
@@ -216,13 +248,13 @@ async function encodeVideo ({ file, srcMeta, onProgress }) {
     const drawTime = i === 0
       ? Math.min(Math.max(0, t + (step * 0.5)), Math.max(0.000001, durationCfr - 0.000001))
       : targetTime
-
-    await new Promise((resolve) => { v.currentTime = drawTime; v.onseeked = () => resolve() })
+    await seekOnce(v, drawTime)
     const budgetMs = Math.min(34, Math.max(17, Math.round(step * 1000)))
     const presented = await waitForFrameReady(v, budgetMs)
     if (!presented && i === 0) {
       const nudge = Math.min(step * 0.25, 0.004)
-      await new Promise((resolve) => { v.currentTime = Math.min(drawTime + nudge, Math.max(0.000001, durationCfr - 0.000001)); v.onseeked = () => resolve() })
+      const target = Math.min(drawTime + nudge, Math.max(0.000001, durationCfr - 0.000001))
+      await seekOnce(v, target)
     }
 
     ctx.drawImage(v, 0, 0, canvas.width, canvas.height)
@@ -231,7 +263,11 @@ async function encodeVideo ({ file, srcMeta, onProgress }) {
     vf.close()
 
     if (typeof onProgress === 'function') {
-      try { onProgress(Math.min(1, (i + 1) / frames)) } catch (_) {}
+      try {
+        onProgress(Math.min(1, (i + 1) / frames))
+      } catch (err) {
+        console.warn('straight-to-video: onProgress callback threw; ignoring error', err)
+      }
     }
   }
   await ve.flush()
@@ -255,7 +291,6 @@ async function encodeVideo ({ file, srcMeta, onProgress }) {
   const sample = new AudioSample({ format: 'f32', sampleRate: TARGET_AUDIO_SR, numberOfChannels: TARGET_AUDIO_CHANNELS, timestamp: 0, data: interleaved })
   await audioSource.add(sample)
   audioSource.close()
-
   await output.finalize()
   const { buffer } = output.target
   const payload = new Uint8Array(buffer)
@@ -323,6 +358,11 @@ function registerStraightToVideoController (app, opts = {}) {
     }
 
     async _processFileInput (fileInput) {
+      if (!this._pendingProcesses) this._pendingProcesses = new WeakMap()
+      const existing = this._pendingProcesses.get(fileInput)
+      if (existing) return existing
+
+      const job = (async () => {
       this._markFlag(fileInput, 'processing')
       fileInput.disabled = true
       try {
@@ -341,6 +381,13 @@ function registerStraightToVideoController (app, opts = {}) {
         fileInput.disabled = false
         this._unmarkFlag(fileInput, 'processing')
       }
+      })()
+
+      this._pendingProcesses.set(fileInput, job)
+      job.finally(() => {
+        if (this._pendingProcesses?.get(fileInput) === job) this._pendingProcesses.delete(fileInput)
+      })
+      return job
     }
 
     _fire (el, name, detail = {}) {

data/index.html

@@ -169,8 +169,8 @@
 
       <section id="install">
         <h2>Install</h2>
-<pre class="language-bash"><code>npm install straight-to-video</code></pre>
-<pre class="language-bash"><code>bundle add straight_to_video</code></pre>
+          <pre class="language-bash"><code>npm install straight-to-video</code></pre>
+          <pre class="language-bash"><code>bundle add straight_to_video</code></pre>
         <p>
           <a class="btn ghost readme" href="https://github.com/searlsco/straight-to-video" target="_blank" rel="noopener">View README</a>
       </p>
@@ -179,7 +179,12 @@
 
     <script type="module">
       import { Application, Controller } from '@hotwired/stimulus'
-      import { registerStraightToVideoController } from 'straight-to-video'
+      import { canOptimizeVideo, optimizeVideo, registerStraightToVideoController } from 'straight-to-video'
+
+      // Declare as global so that people can play with them
+      window.canOptimizeVideo = canOptimizeVideo
+      window.optimizeVideo = optimizeVideo
+      window.registerStraightToVideoController = registerStraightToVideoController
 
       const app = Application.start()
       registerStraightToVideoController(app, { Controller })
@@ -193,11 +198,16 @@
       const dl = document.getElementById('download')
       const sizes = document.getElementById('sizes')
 
-      // Removed environment badge
-
       // Single‑button flow: open picker then auto‑submit
       tryBtn.addEventListener('click', () => {
-        if (fileEl.showPicker) { try { fileEl.showPicker(); return } catch (_) {} }
+        if (fileEl.showPicker) {
+          try {
+            fileEl.showPicker()
+            return
+          } catch (err) {
+            console.warn('straight-to-video demo: file input showPicker() failed; falling back to click()', err)
+          }
+        }
         fileEl.click()
       })
 
@@ -208,7 +218,11 @@
         sizes.classList.remove('hidden')
         p.classList.remove('hidden')
         pct && (pct.textContent = '0%')
-        try { form.requestSubmit() } catch (_) {}
+        try {
+          form.requestSubmit()
+        } catch (err) {
+          console.warn('straight-to-video demo: form.requestSubmit() failed; user may need to submit manually', err)
+        }
       })
 
       // Mirror controller events into the UI

data/index.js

@@ -148,6 +148,20 @@ async function waitForFrameReady (video, budgetMs) {
   })
 }
 
+async function seekOnce (video, time) {
+  if (!video) return
+  const t = Number.isFinite(time) ? time : 0
+  if (Math.abs(video.currentTime - t) < 1e-6) return
+  await new Promise((resolve) => {
+    const onSeeked = () => {
+      video.removeEventListener('seeked', onSeeked)
+      resolve()
+    }
+    video.addEventListener('seeked', onSeeked, { once: true })
+    video.currentTime = t
+  })
+}
+
 async function encodeVideo ({ file, srcMeta, onProgress }) {
   const w = srcMeta.w
   const h = srcMeta.h
@@ -204,8 +218,26 @@ async function encodeVideo ({ file, srcMeta, onProgress }) {
   const url = URL.createObjectURL(file)
   const v = document.createElement('video')
   v.muted = true; v.preload = 'auto'; v.playsInline = true
-  v.src = url
-  await new Promise((resolve, reject) => { v.onloadedmetadata = resolve; v.onerror = () => reject(new Error('video load failed')) })
+  await new Promise((resolve, reject) => {
+    const onLoaded = () => {
+      v.removeEventListener('loadedmetadata', onLoaded)
+      v.removeEventListener('error', onError)
+      resolve()
+    }
+    const onError = () => {
+      v.removeEventListener('loadedmetadata', onLoaded)
+      v.removeEventListener('error', onError)
+      reject(new Error('video load failed'))
+    }
+    v.addEventListener('loadedmetadata', onLoaded)
+    v.addEventListener('error', onError)
+    v.src = url
+    try {
+      v.load()
+    } catch (err) {
+      console.warn('straight-to-video: video.load() threw; continuing without explicit load()', err)
+    }
+  })
   const canvas = document.createElement('canvas'); canvas.width = targetWidth; canvas.height = targetHeight
   const ctx = canvas.getContext('2d', { alpha: false })
 
@@ -215,13 +247,13 @@ async function encodeVideo ({ file, srcMeta, onProgress }) {
     const drawTime = i === 0
       ? Math.min(Math.max(0, t + (step * 0.5)), Math.max(0.000001, durationCfr - 0.000001))
       : targetTime
-
-    await new Promise((resolve) => { v.currentTime = drawTime; v.onseeked = () => resolve() })
+    await seekOnce(v, drawTime)
     const budgetMs = Math.min(34, Math.max(17, Math.round(step * 1000)))
     const presented = await waitForFrameReady(v, budgetMs)
     if (!presented && i === 0) {
       const nudge = Math.min(step * 0.25, 0.004)
-      await new Promise((resolve) => { v.currentTime = Math.min(drawTime + nudge, Math.max(0.000001, durationCfr - 0.000001)); v.onseeked = () => resolve() })
+      const target = Math.min(drawTime + nudge, Math.max(0.000001, durationCfr - 0.000001))
+      await seekOnce(v, target)
     }
 
     ctx.drawImage(v, 0, 0, canvas.width, canvas.height)
@@ -230,7 +262,11 @@ async function encodeVideo ({ file, srcMeta, onProgress }) {
     vf.close()
 
     if (typeof onProgress === 'function') {
-      try { onProgress(Math.min(1, (i + 1) / frames)) } catch (_) {}
+      try {
+        onProgress(Math.min(1, (i + 1) / frames))
+      } catch (err) {
+        console.warn('straight-to-video: onProgress callback threw; ignoring error', err)
+      }
     }
   }
   await ve.flush()
@@ -254,7 +290,6 @@ async function encodeVideo ({ file, srcMeta, onProgress }) {
   const sample = new AudioSample({ format: 'f32', sampleRate: TARGET_AUDIO_SR, numberOfChannels: TARGET_AUDIO_CHANNELS, timestamp: 0, data: interleaved })
   await audioSource.add(sample)
   audioSource.close()
-
   await output.finalize()
   const { buffer } = output.target
   const payload = new Uint8Array(buffer)
@@ -322,6 +357,11 @@ function registerStraightToVideoController (app, opts = {}) {
     }
 
     async _processFileInput (fileInput) {
+      if (!this._pendingProcesses) this._pendingProcesses = new WeakMap()
+      const existing = this._pendingProcesses.get(fileInput)
+      if (existing) return existing
+
+      const job = (async () => {
       this._markFlag(fileInput, 'processing')
       fileInput.disabled = true
       try {
@@ -340,6 +380,13 @@ function registerStraightToVideoController (app, opts = {}) {
         fileInput.disabled = false
         this._unmarkFlag(fileInput, 'processing')
       }
+      })()
+
+      this._pendingProcesses.set(fileInput, job)
+      job.finally(() => {
+        if (this._pendingProcesses?.get(fileInput) === job) this._pendingProcesses.delete(fileInput)
+      })
+      return job
     }
 
     _fire (el, name, detail = {}) {

data/lib/straight_to_video/version.rb

@@ -1,3 +1,3 @@
 module StraightToVideo
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "straight-to-video",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "straight-to-video",
-      "version": "0.0.5",
+      "version": "0.0.7",
       "license": "MIT",
       "dependencies": {
         "mediabunny": "^1.24.4"

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "straight-to-video",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Browser-based, hardware-accelerated video upload optimization",
   "type": "module",
   "exports": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: straight_to_video
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Justin Searls