@xyo-network/image-thumbnail-plugin 2.72.8 → 2.73.0

package/dist/types/Diviner/Diviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../src/Diviner/Diviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAAuB,MAAM,8BAA8B,CAAA;AAErF,OAAO,EAA0C,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAEpG,OAAO,EAAE,cAAc,EAAwB,MAAM,6CAA6C,CAAA;AAClG,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAI5D,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEtD,qBAAa,qBAAqB,CAAC,OAAO,SAAS,2BAA2B,GAAG,2BAA2B,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAC5I,OAAgB,aAAa,kFAA2D;IAExF,OAAO,CAAC,kBAAkB,CAAwC;IAClE,OAAO,CAAC,6CAA6C,CAA2B;IAChF,OAAO,CAAC,IAAI,CAAoC;IAChD,OAAO,CAAC,uBAAuB,CAAsC;IACrE,OAAO,CAAC,OAAO,CAAC,CAAkC;IAElD,IAAI,SAAS,kKAEZ;IAED,IAAI,cAAc,uBAEjB;IAED,IAAI,mBAAmB,WAEtB;IAED,IAAI,aAAa,uBAEhB;IAGK,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAelD,yBAAyB,IAAI,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;cAkB9C,aAAa,CAAC,QAAQ,GAAE,UAAU,EAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAU9F,SAAS,CAAC,qCAAqC;cAc/B,OAAO;cAQP,cAAc;cAiBd,yBAAyB;cAgChB,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;YAQvE,qBAAqB;YAUrB,UAAU;YAcV,IAAI;CAcnB"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../src/Diviner/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAAuB,MAAM,8BAA8B,CAAA;AAErF,OAAO,EAA0C,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAEpG,OAAO,EAAE,cAAc,EAAwB,MAAM,6CAA6C,CAAA;AAClG,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAG5D,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEtD,qBAAa,qBAAqB,CAAC,OAAO,SAAS,2BAA2B,GAAG,2BAA2B,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAC5I,OAAgB,aAAa,kFAA2D;IAExF,OAAO,CAAC,kBAAkB,CAAwC;IAClE,OAAO,CAAC,6CAA6C,CAA2B;IAChF,OAAO,CAAC,IAAI,CAAoC;IAChD,OAAO,CAAC,uBAAuB,CAAsC;IACrE,OAAO,CAAC,OAAO,CAAC,CAAkC;IAElD,IAAI,SAAS,kKAEZ;IAED,IAAI,cAAc,uBAEjB;IAED,IAAI,mBAAmB,WAEtB;IAED,IAAI,aAAa,uBAEhB;IAGK,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAelD,yBAAyB,IAAI,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;cAkB9C,aAAa,CAAC,QAAQ,GAAE,UAAU,EAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAU9F,SAAS,CAAC,qCAAqC;cAc/B,OAAO;cAQP,cAAc;cAiBd,yBAAyB;cAgChB,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;YAQvE,qBAAqB;YAUrB,UAAU;YAcV,IAAI;CAcnB"}

package/dist/types/Witness/Witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAwB,MAAM,6CAA6C,CAAA;AAClG,OAAO,EAAE,UAAU,EAAa,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAOtD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAIpC,OAAO,EAAE,sBAAsB,EAAqC,MAAM,UAAU,CAAA;AAEpF,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAQtD,MAAM,WAAW,0BAA2B,SAAQ,KAAK;IACvD,IAAI,EAAE,4BAA4B,CAAA;IAClC,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,QAAS,SAAQ,KAAK;IACrC,IAAI,EAAE,MAAM,CAAA;CACb;AAED,qBAAa,qBAAqB,CAAC,OAAO,SAAS,2BAA2B,GAAG,2BAA2B,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAC5I,OAAgB,aAAa,iDAAsC;IAEnE,OAAO,CAAC,MAAM,CAAC,CAAkC;IACjD,OAAO,CAAC,UAAU,CAAwC;IAE1D,IAAI,KAAK;;;;;;;;;;;;;;;;;;;;gBAUR;IAED,IAAI,QAAQ,2BAEX;IAED,IAAI,MAAM,WAET;IAED,IAAI,UAAU,WAEb;IAED,IAAI,iBAAiB,WAEpB;IAED,IAAI,aAAa,WAEhB;IAED,IAAI,eAAe,WAElB;IAED,IAAI,OAAO,WAEV;IAED,IAAI,KAAK,WAER;mBAEoB,cAAc;IAanC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAkBhC;;;;;OAKG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM;cAiBN,cAAc,CAAC,QAAQ,GAAE,UAAU,EAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;YAsCjF,sBAAsB;IAiBpC;;;;OAIG;YACW,wBAAwB;YAKxB,QAAQ;CA4HvB"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAwB,MAAM,6CAA6C,CAAA;AAClG,OAAO,EAAE,UAAU,EAAa,MAAM,iCAAiC,CAAA;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAMtD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAIpC,OAAO,EAAE,sBAAsB,EAAqC,MAAM,UAAU,CAAA;AAEpF,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAQtD,MAAM,WAAW,0BAA2B,SAAQ,KAAK;IACvD,IAAI,EAAE,4BAA4B,CAAA;IAClC,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,QAAS,SAAQ,KAAK;IACrC,IAAI,EAAE,MAAM,CAAA;CACb;AAED,qBAAa,qBAAqB,CAAC,OAAO,SAAS,2BAA2B,GAAG,2BAA2B,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAC5I,OAAgB,aAAa,iDAAsC;IAEnE,OAAO,CAAC,MAAM,CAAC,CAAkC;IACjD,OAAO,CAAC,UAAU,CAAwC;IAE1D,IAAI,KAAK;;;;;;;;;;;;;;;;;;;;gBAUR;IAED,IAAI,QAAQ,2BAEX;IAED,IAAI,MAAM,WAET;IAED,IAAI,UAAU,WAEb;IAED,IAAI,iBAAiB,WAEpB;IAED,IAAI,aAAa,WAEhB;IAED,IAAI,eAAe,WAElB;IAED,IAAI,OAAO,WAEV;IAED,IAAI,KAAK,WAER;mBAEoB,cAAc;IAanC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAgBhC;;;;;OAKG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM;cAiBN,cAAc,CAAC,QAAQ,GAAE,UAAU,EAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;YAsCjF,sBAAsB;IAiBpC;;;;OAIG;YACW,wBAAwB;YAKxB,QAAQ;CA4HvB"}

package/dist/types/Witness/ffmpeg/fluent/getVideoFrameAsImageFluent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getVideoFrameAsImageFluent.d.ts","sourceRoot":"","sources":["../../../../../src/Witness/ffmpeg/fluent/getVideoFrameAsImageFluent.ts"],"names":[],"mappings":";AAGA;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,gBAAuB,MAAM,oBA4CnE,CAAA"}
+{"version":3,"file":"getVideoFrameAsImageFluent.d.ts","sourceRoot":"","sources":["../../../../../src/Witness/ffmpeg/fluent/getVideoFrameAsImageFluent.ts"],"names":[],"mappings":";AA6BA;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,gBAAuB,MAAM,oBAoCnE,CAAA"}

package/dist/types/Witness/ffmpeg/spawn/executeFfmpeg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executeFfmpeg.d.ts","sourceRoot":"","sources":["../../../../../src/Witness/ffmpeg/spawn/executeFfmpeg.ts"],"names":[],"mappings":";AAGA;;;;;GAKG;AACH,eAAO,MAAM,aAAa,gBAAiB,MAAM,cAAc,MAAM,EAAE,KAAG,QAAQ,MAAM,CAqBvF,CAAA"}
+{"version":3,"file":"executeFfmpeg.d.ts","sourceRoot":"","sources":["../../../../../src/Witness/ffmpeg/spawn/executeFfmpeg.ts"],"names":[],"mappings":";AAEA;;;;;GAKG;AACH,eAAO,MAAM,aAAa,gBAAiB,MAAM,cAAc,MAAM,EAAE,KAAG,QAAQ,MAAM,CAkBvF,CAAA"}

package/package.json

@@ -10,28 +10,28 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^2.9.3",
-    "@xylabs/delay": "^2.9.3",
-    "@xylabs/url": "^2.9.3",
-    "@xyo-network/abstract-diviner": "~2.72.8",
-    "@xyo-network/archivist-model": "~2.72.8",
-    "@xyo-network/axios": "~2.72.8",
-    "@xyo-network/core": "~2.72.8",
-    "@xyo-network/diviner-model": "~2.72.8",
-    "@xyo-network/diviner-payload-model": "~2.72.8",
-    "@xyo-network/image-thumbnail-payload-plugin": "~2.72.8",
-    "@xyo-network/module": "~2.72.8",
-    "@xyo-network/payload-model": "~2.72.8",
-    "@xyo-network/payloadset-plugin": "~2.72.8",
-    "@xyo-network/url-payload-plugin": "~2.72.8",
-    "@xyo-network/witness": "~2.72.8",
+    "@xylabs/assert": "^2.10.7",
+    "@xylabs/delay": "^2.10.7",
+    "@xylabs/lodash": "^2.10.7",
+    "@xylabs/url": "^2.10.7",
+    "@xyo-network/abstract-diviner": "~2.73.0",
+    "@xyo-network/archivist-model": "~2.73.0",
+    "@xyo-network/axios": "~2.73.0",
+    "@xyo-network/core": "~2.73.0",
+    "@xyo-network/diviner-model": "~2.73.0",
+    "@xyo-network/diviner-payload-model": "~2.73.0",
+    "@xyo-network/image-thumbnail-payload-plugin": "~2.73.0",
+    "@xyo-network/module": "~2.73.0",
+    "@xyo-network/payload-model": "~2.73.0",
+    "@xyo-network/payloadset-plugin": "~2.73.0",
+    "@xyo-network/url-payload-plugin": "~2.73.0",
+    "@xyo-network/witness": "~2.73.0",
     "async-mutex": "^0.4.0",
     "file-type": "^16.5.4",
     "fluent-ffmpeg": "^2.1.2",
     "gm": "^1.25.0",
     "hasbin": "^1.2.3",
     "hash-wasm": "^4.9.0",
-    "lodash": "^4.17.21",
     "lru-cache": "^10.0.1",
     "sha.js": "^2.4.11",
     "url-parse": "^1.5.10"
@@ -41,8 +41,8 @@
     "@types/gm": "^1.25.1",
     "@types/hasbin": "^1.2.0",
     "@types/lodash": "^4.14.198",
-    "@xylabs/ts-scripts-yarn3": "^2.19.3",
-    "@xylabs/tsconfig": "^2.19.3",
+    "@xylabs/ts-scripts-yarn3": "^2.19.5",
+    "@xylabs/tsconfig": "^2.19.5",
     "typescript": "^5.2.2"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -78,5 +78,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.72.8"
+  "version": "2.73.0"
 }

package/src/Diviner/Diviner.ts

@@ -1,5 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { delay } from '@xylabs/delay'
+import { compact } from '@xylabs/lodash'
 import { AbstractDiviner } from '@xyo-network/abstract-diviner'
 import { ArchivistInstance, asArchivistInstance } from '@xyo-network/archivist-model'
 import { PayloadHasher } from '@xyo-network/core'
@@ -7,7 +8,6 @@ import { asDivinerInstance, DivinerConfigSchema, DivinerInstance } from '@xyo-ne
 import { PayloadDivinerQueryPayload, PayloadDivinerQuerySchema } from '@xyo-network/diviner-payload-model'
 import { ImageThumbnail, ImageThumbnailSchema } from '@xyo-network/image-thumbnail-payload-plugin'
 import { UrlPayload } from '@xyo-network/url-payload-plugin'
-import compact from 'lodash/compact'
 
 import { ImageThumbnailDivinerConfigSchema } from './Config'
 import { ImageThumbnailDivinerParams } from './Params'

package/src/Witness/Witness.ts

@@ -1,6 +1,7 @@
 /* eslint-disable max-statements */
 import { promises as dnsPromises } from 'node:dns'
 
+import { compact } from '@xylabs/lodash'
 import { URL } from '@xylabs/url'
 import { axios, AxiosError, AxiosResponse } from '@xyo-network/axios'
 import { PayloadHasher } from '@xyo-network/core'
@@ -12,7 +13,6 @@ import FileType from 'file-type'
 import { subClass } from 'gm'
 import { sync as hasbin } from 'hasbin'
 import { sha256 } from 'hash-wasm'
-import compact from 'lodash/compact'
 import { LRUCache } from 'lru-cache'
 import shajs from 'sha.js'
 import Url from 'url-parse'
@@ -103,9 +103,7 @@ export class ImageThumbnailWitness<TParams extends ImageThumbnailWitnessParams =
     if (url.startsWith('data:image')) {
       const data = url.split(',')[1]
       if (data) {
-        const buffer = Buffer.from(Uint8Array.from(atob(data), (c) => c.charCodeAt(0)))
-        console.log(`data buffer: ${buffer.length}`)
-        return buffer
+        return Buffer.from(Uint8Array.from(atob(data), (c) => c.charCodeAt(0)))
       } else {
         const error: ImageThumbnailWitnessError = {
           message: 'Invalid data Url',

package/src/Witness/ffmpeg/fluent/getVideoFrameAsImageFluent.ts

@@ -1,5 +1,31 @@
+import { uuid } from '@xyo-network/core'
 import ffmpeg from 'fluent-ffmpeg'
-import { Readable, Writable } from 'stream'
+import { unlink, writeFile } from 'fs/promises'
+import { tmpdir } from 'os'
+import { Writable, WritableOptions } from 'stream'
+
+/**
+ * A Writable stream that collects output from ffmpeg.
+ */
+class FfmpegOutputStream extends Writable {
+  private readonly chunks: Uint8Array[] = []
+
+  constructor(options?: WritableOptions) {
+    super(options)
+  }
+
+  override _write(chunk: never, _encoding: BufferEncoding, callback: (error?: Error | null) => void): void {
+    this.chunks.push(chunk)
+    callback()
+  }
+
+  /**
+   * Collects the output from ffmpeg into a buffer.
+   * @returns A buffer containing the concatenated
+   * output from ffmpeg.
+   */
+  toBuffer = () => Buffer.concat(this.chunks)
+}
 
 /**
  * Execute FFmpeg using fluent API with provided input buffer and video thumbnail image.
@@ -7,47 +33,39 @@ import { Readable, Writable } from 'stream'
  * @returns Output buffer containing the video thumbnail image.
  */
 export const getVideoFrameAsImageFluent = async (videoBuffer: Buffer) => {
-  const imageBuffer = await new Promise<Buffer>((resolve, reject) => {
-    // const videoStream = new PassThrough()
-    // videoStream.end(videoBuffer)
-
-    const videoStream = new Readable()
-    videoStream._read = () => {} // _read is required but you can noop it
-    videoStream.push(videoBuffer)
-    videoStream.push(null)
-
-    // Initialize empty array to collect PNG chunks
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const pngChunks: any[] = []
-
-    // Create a Writable stream to collect PNG output from ffmpeg
-    const writableStream = new Writable({
-      write(chunk, encoding, callback) {
-        pngChunks.push(chunk)
-        callback()
-      },
+  // Get a temp file name
+  const tmpFile = `/${tmpdir()}/${uuid()}`
+  try {
+    // Write videoBuffer to temp file for use as input to ffmpeg to
+    // avoid issues with ffmpeg inferring premature EOF from buffer
+    // passed via stdin (happens when ffmpeg is trying to infer
+    // input video format)
+    await writeFile(tmpFile, videoBuffer, { encoding: 'binary' })
+    const imageBuffer = await new Promise<Buffer>((resolve, reject) => {
+      // Create a Writable stream to collect PNG output from ffmpeg
+      const ffmpegOutput = new FfmpegOutputStream()
+      // Execute ffmpeg using fluent API
+      ffmpeg()
+        // NOTE: Uncomment to debug CLI args to ffmpeg
+        // .on('start', (commandLine) => console.log('Spawned Ffmpeg with command: ' + commandLine))
+        .on('error', (err) => reject(err.message))
+        // Listen for the 'end' event to combine the output into a buffer holding the PNG image
+        .on('end', () => resolve(ffmpegOutput.toBuffer()))
+        .input(tmpFile) // Use temp file as input
+        .takeFrames(1) // Only take 1st video frame
+        .withNoAudio() // Don't include audio
+        .outputOptions('-f image2pipe') // Write output to stdout
+        .videoCodec('png') // Force PNG output
+        // Start processing and direct ffmpeg stdout to writable stream
+        .pipe(ffmpegOutput)
     })
-
-    const command = ffmpeg()
-      // Uncomment to debug CLI args to ffmpeg
-      // .on('start', (commandLine) => console.log('Spawned Ffmpeg with command: ' + commandLine))
-      .input(videoStream)
-      .takeFrames(1)
-      .withNoAudio()
-      // Exactly as their docs but does not work
-      // .setStartTime('00:00:00')
-      // .seekInput(0)
-      .on('error', (err) => reject(err.message))
-      // Listen for the 'end' event to combine the chunks and create a PNG buffer
-      .on('end', () => resolve(Buffer.concat(pngChunks)))
-      .on('data', (chunk) => pngChunks.push(chunk))
-      // .toFormat('png')
-      .outputOptions('-f image2pipe')
-    // .outputOptions('-vcodec png')
-    // .output(writableStream, { end: true })
-
-    // Start processing
-    command.pipe(writableStream)
-  })
-  return imageBuffer
+    return imageBuffer
+  } finally {
+    // Cleanup temp file
+    try {
+      await unlink(tmpFile)
+    } catch {
+      // No error here since file doesn't exist
+    }
+  }
 }

package/src/Witness/ffmpeg/spawn/executeFfmpeg.ts

@@ -1,5 +1,4 @@
 import { spawn } from 'child_process'
-import { PassThrough } from 'stream'
 
 /**
  * Execute FFmpeg with the provided arguments.
@@ -9,23 +8,20 @@ import { PassThrough } from 'stream'
  */
 export const executeFFmpeg = (videoBuffer: Buffer, ffmpegArgs: string[]): Promise<Buffer> => {
   return new Promise((resolve, reject) => {
+    const imageData: Buffer[] = []
     const ffmpeg = spawn('ffmpeg', ffmpegArgs)
-
-    // Create a readable stream from the input buffer
-    const videoStream = new PassThrough().end(videoBuffer)
-
-    // Pipe the input stream to ffmpeg's stdin
-    videoStream.pipe(ffmpeg.stdin)
-    const chunks: Buffer[] = []
-    ffmpeg.stdout.on('data', (chunk: Buffer) => chunks.push(chunk))
+    ffmpeg.stdout.on('data', (data: Buffer) => imageData.push(data))
     // TODO: This is required as we're seeing errors thrown due to
     // how we're piping the data to ffmpeg. Works perfectly though.
     ffmpeg.stdin.on('error', () => {})
     ffmpeg.on('close', (code) => {
       if (code !== 0) {
-        return reject(new Error(`FFmpeg exited with code ${code}`))
+        reject(new Error(`FFmpeg exited with code ${code}`))
+      } else {
+        resolve(Buffer.concat(imageData))
       }
-      resolve(Buffer.concat(chunks))
     })
+    // Pipe the input stream to ffmpeg's stdin
+    ffmpeg.stdin.end(videoBuffer)
   })
 }