bare-media 1.2.0 → 1.3.0

package/README.md

@@ -29,15 +29,14 @@ const data = await worker.createPreview({ path, maxWidth, maxHeight })
 
 > NOTE: A worker spawns when an operation is requested and it stays running until the parent process is killed.
 
-Handle close event:
+Terminate the worker:
 
 ```js
-import worker from 'bare-media'
+worker.close()
 
 worker.onClose = () => {
-  // worker closed unexpectedly
+  // worker terminated
 }
-
 ```
 
 Call the methods directly without a worker:
@@ -50,10 +49,10 @@ const data = await createPreview({ path, maxWidth, maxHeight })
 
 ## API
 
-| Method              | Parameters                                              | Return Value        | Description
-|---------------------|---------------------------------------------------------|---------------------|----------------------------------------
-| `createPreview`     | `path, mimetype, maxWidth, maxHeight, format, encoding` | `metadata, preview` | Create a preview from a media file
-| `decodeImage`       | `path`, `httpLink, mimetype`                            | `metadata, data`    | Decode an image to RGBA
+| Method          | Parameters                                              | Return Value        | Description                        |
+| --------------- | ------------------------------------------------------- | ------------------- | ---------------------------------- |
+| `createPreview` | `path, mimetype, maxWidth, maxHeight, format, encoding` | `metadata, preview` | Create a preview from a media file |
+| `decodeImage`   | `path`, `httpLink, mimetype`                            | `metadata, data`    | Decode an image to RGBA            |
 
 > See [schema.js](shared/spec/schema.js) for the complete reference of parameters
 

package/client.js

@@ -9,21 +9,22 @@ export class WorkerClient extends ReadyResource {
   rpc = null
   opts = null
 
-  constructor (opts) {
+  constructor(opts) {
     super()
     this.initialize(opts)
     this.#attachMethods()
   }
 
-  initialize ({ filename = 'node_modules/bare-media/worker/index.js', requireSource, args } = {}) {
+  initialize({
+    filename = 'node_modules/bare-media/worker/index.js',
+    requireSource,
+    args
+  } = {}) {
     this.opts = { filename, requireSource, args }
   }
 
-  #attachMethods () {
-    const methods = [
-      'createPreview',
-      'decodeImage'
-    ]
+  #attachMethods() {
+    const methods = ['createPreview', 'decodeImage']
 
     for (const method of methods) {
       this[method] = async (...args) => {
@@ -33,11 +34,15 @@ export class WorkerClient extends ReadyResource {
     }
   }
 
-  async _open () {
+  async _open() {
     await this.#run()
   }
 
-  async #run () {
+  async _close() {
+    this.worker?.IPC.end()
+  }
+
+  async #run() {
     const { filename, requireSource, args } = this.opts
     const source = requireSource?.()
     this.worker = await spawn(filename, source, args)
@@ -50,7 +55,7 @@ export class WorkerClient extends ReadyResource {
     this.rpc = new HRPC(ipc)
   }
 
-  isCodecSupported (mimetype) {
+  isCodecSupported(mimetype) {
     return isCodecSupported(mimetype)
   }
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "bare-media",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "main": "index.js",
   "type": "module",
   "scripts": {
     "build:rpc": "cd shared/spec && bare ./build.js",
-    "lint": "standard",
-    "lint:fix": "standard --fix",
-    "test": "npm run lint && brittle-bare test/index.js"
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
+    "test": "npm run format:check && brittle-bare test/index.js"
   },
   "keywords": [],
   "author": "Holepunch Inc",
@@ -35,7 +35,8 @@
     "corestore": "^7.4.5",
     "hyperblobs": "^2.8.0",
     "hypercore-blob-server": "^1.11.0",
-    "standard": "^17.1.2",
+    "prettier": "^3.6.2",
+    "prettier-config-holepunch": "^1.0.0",
     "test-tmp": "^1.4.0"
   },
   "files": [
@@ -43,11 +44,5 @@
     "worker",
     "client.js",
     "index.js"
-  ],
-  "standard": {
-    "globals": [
-      "Bare",
-      "Pear"
-    ]
-  }
+  ]
 }

package/shared/codecs.js

@@ -10,11 +10,11 @@ export const codecs = {
   'image/tiff': () => import('bare-tiff')
 }
 
-export function isCodecSupported (mimetype) {
+export function isCodecSupported(mimetype) {
   return mimetype in codecs
 }
 
-export async function importCodec (mimetype) {
+export async function importCodec(mimetype) {
   const codecImport = codecs[mimetype]
   if (!codecImport) throw new Error(`No codec for ${mimetype}`)
   return await codecImport()

package/shared/spec/hrpc/hrpc.json

@@ -28,4 +28,4 @@
       "version": 1
     }
   ]
-}
+}

package/shared/spec/hrpc/index.js

@@ -12,7 +12,7 @@ const methods = new Map([
 ])
 
 class HRPC {
-  constructor (stream) {
+  constructor(stream) {
     this._stream = stream
     this._handlers = []
     this._requestEncodings = new Map([
@@ -39,23 +39,40 @@ class HRPC {
       }
       if (!this._requestIsStream(command) && this._responseIsStream(command)) {
         const request = req.data ? c.decode(requestEncoding, req.data) : null
-        const responseStream = new RPCStream(null, null, req.createResponseStream(), responseEncoding)
+        const responseStream = new RPCStream(
+          null,
+          null,
+          req.createResponseStream(),
+          responseEncoding
+        )
         responseStream.data = request
         await this._handlers[command](responseStream)
       }
       if (this._requestIsStream(command) && !this._responseIsStream(command)) {
-        const requestStream = new RPCRequestStream(req, responseEncoding, req.createRequestStream(), requestEncoding)
+        const requestStream = new RPCRequestStream(
+          req,
+          responseEncoding,
+          req.createRequestStream(),
+          requestEncoding
+        )
         const response = await this._handlers[command](requestStream)
         req.reply(c.encode(responseEncoding, response))
       }
       if (this._requestIsStream(command) && this._responseIsStream(command)) {
-        const requestStream = new RPCRequestStream(req, responseEncoding, req.createRequestStream(), requestEncoding, req.createResponseStream(), responseEncoding)
+        const requestStream = new RPCRequestStream(
+          req,
+          responseEncoding,
+          req.createRequestStream(),
+          requestEncoding,
+          req.createResponseStream(),
+          responseEncoding
+        )
         await this._handlers[command](requestStream)
       }
     })
   }
 
-  async _call (name, args) {
+  async _call(name, args) {
     const requestEncoding = this._requestEncodings.get(name)
     const responseEncoding = this._responseEncodings.get(name)
     const request = this._rpc.request(methods.get(name))
@@ -64,7 +81,7 @@ class HRPC {
     return c.decode(responseEncoding, await request.reply())
   }
 
-  _callSync (name, args) {
+  _callSync(name, args) {
     const requestEncoding = this._requestEncodings.get(name)
     const responseEncoding = this._responseEncodings.get(name)
     const request = this._rpc.request(methods.get(name))
@@ -78,42 +95,53 @@ class HRPC {
       return new RPCStream(request.createResponseStream(), responseEncoding)
     }
     if (this._requestIsStream(name) && !this._responseIsStream(name)) {
-      return new RPCRequestStream(request, responseEncoding, null, null, request.createRequestStream(), requestEncoding)
+      return new RPCRequestStream(
+        request,
+        responseEncoding,
+        null,
+        null,
+        request.createRequestStream(),
+        requestEncoding
+      )
     }
     if (this._requestIsStream(name) && this._responseIsStream(name)) {
-      return new RPCRequestStream(request, responseEncoding, request.createResponseStream(), responseEncoding, request.createRequestStream(), requestEncoding)
+      return new RPCRequestStream(
+        request,
+        responseEncoding,
+        request.createResponseStream(),
+        responseEncoding,
+        request.createRequestStream(),
+        requestEncoding
+      )
     }
   }
 
-  async createPreview (args) {
+  async createPreview(args) {
     return this._call('@media/create-preview', args)
   }
 
-  async decodeImage (args) {
+  async decodeImage(args) {
     return this._call('@media/decode-image', args)
   }
 
-  onCreatePreview (responseFn) {
+  onCreatePreview(responseFn) {
     this._handlers['@media/create-preview'] = responseFn
   }
 
-  onDecodeImage (responseFn) {
+  onDecodeImage(responseFn) {
     this._handlers['@media/decode-image'] = responseFn
   }
 
-  _requestIsStream (command) {
-    return [
-    ].includes(command)
+  _requestIsStream(command) {
+    return [].includes(command)
   }
 
-  _responseIsStream (command) {
-    return [
-    ].includes(command)
+  _responseIsStream(command) {
+    return [].includes(command)
   }
 
-  _requestIsSend (command) {
-    return [
-    ].includes(command)
+  _requestIsSend(command) {
+    return [].includes(command)
   }
 }
 

package/shared/spec/hrpc/messages.js

@@ -12,15 +12,15 @@ let version = VERSION
 
 // @media/dimensions
 const encoding0 = {
-  preencode (state, m) {
+  preencode(state, m) {
     c.uint.preencode(state, m.width)
     c.uint.preencode(state, m.height)
   },
-  encode (state, m) {
+  encode(state, m) {
     c.uint.encode(state, m.width)
     c.uint.encode(state, m.height)
   },
-  decode (state) {
+  decode(state) {
     const r0 = c.uint.decode(state)
     const r1 = c.uint.decode(state)
 
@@ -36,18 +36,16 @@ const encoding1_1 = c.frame(encoding0)
 
 // @media/metadata
 const encoding1 = {
-  preencode (state, m) {
+  preencode(state, m) {
     state.end++ // max flag is 4 so always one byte
 
     if (m.mimetype) c.string.preencode(state, m.mimetype)
     if (m.dimensions) encoding1_1.preencode(state, m.dimensions)
     if (m.duration) c.uint.preencode(state, m.duration)
   },
-  encode (state, m) {
+  encode(state, m) {
     const flags =
-      (m.mimetype ? 1 : 0) |
-      (m.dimensions ? 2 : 0) |
-      (m.duration ? 4 : 0)
+      (m.mimetype ? 1 : 0) | (m.dimensions ? 2 : 0) | (m.duration ? 4 : 0)
 
     c.uint.encode(state, flags)
 
@@ -55,7 +53,7 @@ const encoding1 = {
     if (m.dimensions) encoding1_1.encode(state, m.dimensions)
     if (m.duration) c.uint.encode(state, m.duration)
   },
-  decode (state) {
+  decode(state) {
     const flags = c.uint.decode(state)
 
     return {
@@ -71,18 +69,16 @@ const encoding2_0 = c.frame(encoding1)
 
 // @media/file
 const encoding2 = {
-  preencode (state, m) {
+  preencode(state, m) {
     state.end++ // max flag is 4 so always one byte
 
     if (m.metadata) encoding2_0.preencode(state, m.metadata)
     if (m.inlined) c.string.preencode(state, m.inlined)
     if (m.buffer) c.buffer.preencode(state, m.buffer)
   },
-  encode (state, m) {
+  encode(state, m) {
     const flags =
-      (m.metadata ? 1 : 0) |
-      (m.inlined ? 2 : 0) |
-      (m.buffer ? 4 : 0)
+      (m.metadata ? 1 : 0) | (m.inlined ? 2 : 0) | (m.buffer ? 4 : 0)
 
     c.uint.encode(state, flags)
 
@@ -90,7 +86,7 @@ const encoding2 = {
     if (m.inlined) c.string.encode(state, m.inlined)
     if (m.buffer) c.buffer.encode(state, m.buffer)
   },
-  decode (state) {
+  decode(state) {
     const flags = c.uint.decode(state)
 
     return {
@@ -103,7 +99,7 @@ const encoding2 = {
 
 // @media/create-preview-request
 const encoding3 = {
-  preencode (state, m) {
+  preencode(state, m) {
     c.string.preencode(state, m.path)
     state.end++ // max flag is 16 so always one byte
 
@@ -113,7 +109,7 @@ const encoding3 = {
     if (m.format) c.string.preencode(state, m.format)
     if (m.encoding) c.string.preencode(state, m.encoding)
   },
-  encode (state, m) {
+  encode(state, m) {
     const flags =
       (m.mimetype ? 1 : 0) |
       (m.maxWidth ? 2 : 0) |
@@ -130,7 +126,7 @@ const encoding3 = {
     if (m.format) c.string.encode(state, m.format)
     if (m.encoding) c.string.encode(state, m.encoding)
   },
-  decode (state) {
+  decode(state) {
     const r0 = c.string.decode(state)
     const flags = c.uint.decode(state)
 
@@ -152,15 +148,15 @@ const encoding4_1 = c.frame(encoding2)
 
 // @media/create-preview-response
 const encoding4 = {
-  preencode (state, m) {
+  preencode(state, m) {
     encoding4_0.preencode(state, m.metadata)
     encoding4_1.preencode(state, m.preview)
   },
-  encode (state, m) {
+  encode(state, m) {
     encoding4_0.encode(state, m.metadata)
     encoding4_1.encode(state, m.preview)
   },
-  decode (state) {
+  decode(state) {
     const r0 = encoding4_0.decode(state)
     const r1 = encoding4_1.decode(state)
 
@@ -173,18 +169,15 @@ const encoding4 = {
 
 // @media/decode-image-request
 const encoding5 = {
-  preencode (state, m) {
+  preencode(state, m) {
     state.end++ // max flag is 4 so always one byte
 
     if (m.path) c.string.preencode(state, m.path)
     if (m.httpLink) c.string.preencode(state, m.httpLink)
     if (m.mimetype) c.string.preencode(state, m.mimetype)
   },
-  encode (state, m) {
-    const flags =
-      (m.path ? 1 : 0) |
-      (m.httpLink ? 2 : 0) |
-      (m.mimetype ? 4 : 0)
+  encode(state, m) {
+    const flags = (m.path ? 1 : 0) | (m.httpLink ? 2 : 0) | (m.mimetype ? 4 : 0)
 
     c.uint.encode(state, flags)
 
@@ -192,7 +185,7 @@ const encoding5 = {
     if (m.httpLink) c.string.encode(state, m.httpLink)
     if (m.mimetype) c.string.encode(state, m.mimetype)
   },
-  decode (state) {
+  decode(state) {
     const flags = c.uint.decode(state)
 
     return {
@@ -208,23 +201,21 @@ const encoding6_0 = encoding2_0
 
 // @media/decode-image-response
 const encoding6 = {
-  preencode (state, m) {
+  preencode(state, m) {
     state.end++ // max flag is 2 so always one byte
 
     if (m.metadata) encoding6_0.preencode(state, m.metadata)
     if (m.data) c.buffer.preencode(state, m.data)
   },
-  encode (state, m) {
-    const flags =
-      (m.metadata ? 1 : 0) |
-      (m.data ? 2 : 0)
+  encode(state, m) {
+    const flags = (m.metadata ? 1 : 0) | (m.data ? 2 : 0)
 
     c.uint.encode(state, flags)
 
     if (m.metadata) encoding6_0.encode(state, m.metadata)
     if (m.data) c.buffer.encode(state, m.data)
   },
-  decode (state) {
+  decode(state) {
     const flags = c.uint.decode(state)
 
     return {
@@ -234,51 +225,60 @@ const encoding6 = {
   }
 }
 
-function setVersion (v) {
+function setVersion(v) {
   version = v
 }
 
-function encode (name, value, v = VERSION) {
+function encode(name, value, v = VERSION) {
   version = v
   return c.encode(getEncoding(name), value)
 }
 
-function decode (name, buffer, v = VERSION) {
+function decode(name, buffer, v = VERSION) {
   version = v
   return c.decode(getEncoding(name), buffer)
 }
 
-function getEnum (name) {
+function getEnum(name) {
   switch (name) {
-    default: throw new Error('Enum not found ' + name)
+    default:
+      throw new Error('Enum not found ' + name)
   }
 }
 
-function getEncoding (name) {
+function getEncoding(name) {
   switch (name) {
-    case '@media/dimensions': return encoding0
-    case '@media/metadata': return encoding1
-    case '@media/file': return encoding2
-    case '@media/create-preview-request': return encoding3
-    case '@media/create-preview-response': return encoding4
-    case '@media/decode-image-request': return encoding5
-    case '@media/decode-image-response': return encoding6
-    default: throw new Error('Encoder not found ' + name)
+    case '@media/dimensions':
+      return encoding0
+    case '@media/metadata':
+      return encoding1
+    case '@media/file':
+      return encoding2
+    case '@media/create-preview-request':
+      return encoding3
+    case '@media/create-preview-response':
+      return encoding4
+    case '@media/decode-image-request':
+      return encoding5
+    case '@media/decode-image-response':
+      return encoding6
+    default:
+      throw new Error('Encoder not found ' + name)
   }
 }
 
-function getStruct (name, v = VERSION) {
+function getStruct(name, v = VERSION) {
   const enc = getEncoding(name)
   return {
-    preencode (state, m) {
+    preencode(state, m) {
       version = v
       enc.preencode(state, m)
     },
-    encode (state, m) {
+    encode(state, m) {
       version = v
       enc.encode(state, m)
     },
-    decode (state) {
+    decode(state) {
       version = v
       return enc.decode(state)
     }
@@ -287,4 +287,13 @@ function getStruct (name, v = VERSION) {
 
 const resolveStruct = getStruct // compat
 
-export { resolveStruct, getStruct, getEnum, getEncoding, encode, decode, setVersion, version }
+export {
+  resolveStruct,
+  getStruct,
+  getEnum,
+  getEncoding,
+  encode,
+  decode,
+  setVersion,
+  version
+}

package/shared/spec/schema/index.js

@@ -12,15 +12,15 @@ let version = VERSION
 
 // @media/dimensions
 const encoding0 = {
-  preencode (state, m) {
+  preencode(state, m) {
     c.uint.preencode(state, m.width)
     c.uint.preencode(state, m.height)
   },
-  encode (state, m) {
+  encode(state, m) {
     c.uint.encode(state, m.width)
     c.uint.encode(state, m.height)
   },
-  decode (state) {
+  decode(state) {
     const r0 = c.uint.decode(state)
     const r1 = c.uint.decode(state)
 
@@ -36,18 +36,16 @@ const encoding1_1 = c.frame(encoding0)
 
 // @media/metadata
 const encoding1 = {
-  preencode (state, m) {
+  preencode(state, m) {
     state.end++ // max flag is 4 so always one byte
 
     if (m.mimetype) c.string.preencode(state, m.mimetype)
     if (m.dimensions) encoding1_1.preencode(state, m.dimensions)
     if (m.duration) c.uint.preencode(state, m.duration)
   },
-  encode (state, m) {
+  encode(state, m) {
     const flags =
-      (m.mimetype ? 1 : 0) |
-      (m.dimensions ? 2 : 0) |
-      (m.duration ? 4 : 0)
+      (m.mimetype ? 1 : 0) | (m.dimensions ? 2 : 0) | (m.duration ? 4 : 0)
 
     c.uint.encode(state, flags)
 
@@ -55,7 +53,7 @@ const encoding1 = {
     if (m.dimensions) encoding1_1.encode(state, m.dimensions)
     if (m.duration) c.uint.encode(state, m.duration)
   },
-  decode (state) {
+  decode(state) {
     const flags = c.uint.decode(state)
 
     return {
@@ -71,18 +69,16 @@ const encoding2_0 = c.frame(encoding1)
 
 // @media/file
 const encoding2 = {
-  preencode (state, m) {
+  preencode(state, m) {
     state.end++ // max flag is 4 so always one byte
 
     if (m.metadata) encoding2_0.preencode(state, m.metadata)
     if (m.inlined) c.string.preencode(state, m.inlined)
     if (m.buffer) c.buffer.preencode(state, m.buffer)
   },
-  encode (state, m) {
+  encode(state, m) {
     const flags =
-      (m.metadata ? 1 : 0) |
-      (m.inlined ? 2 : 0) |
-      (m.buffer ? 4 : 0)
+      (m.metadata ? 1 : 0) | (m.inlined ? 2 : 0) | (m.buffer ? 4 : 0)
 
     c.uint.encode(state, flags)
 
@@ -90,7 +86,7 @@ const encoding2 = {
     if (m.inlined) c.string.encode(state, m.inlined)
     if (m.buffer) c.buffer.encode(state, m.buffer)
   },
-  decode (state) {
+  decode(state) {
     const flags = c.uint.decode(state)
 
     return {
@@ -103,7 +99,7 @@ const encoding2 = {
 
 // @media/create-preview-request
 const encoding3 = {
-  preencode (state, m) {
+  preencode(state, m) {
     c.string.preencode(state, m.path)
     state.end++ // max flag is 16 so always one byte
 
@@ -113,7 +109,7 @@ const encoding3 = {
     if (m.format) c.string.preencode(state, m.format)
     if (m.encoding) c.string.preencode(state, m.encoding)
   },
-  encode (state, m) {
+  encode(state, m) {
     const flags =
       (m.mimetype ? 1 : 0) |
       (m.maxWidth ? 2 : 0) |
@@ -130,7 +126,7 @@ const encoding3 = {
     if (m.format) c.string.encode(state, m.format)
     if (m.encoding) c.string.encode(state, m.encoding)
   },
-  decode (state) {
+  decode(state) {
     const r0 = c.string.decode(state)
     const flags = c.uint.decode(state)
 
@@ -152,15 +148,15 @@ const encoding4_1 = c.frame(encoding2)
 
 // @media/create-preview-response
 const encoding4 = {
-  preencode (state, m) {
+  preencode(state, m) {
     encoding4_0.preencode(state, m.metadata)
     encoding4_1.preencode(state, m.preview)
   },
-  encode (state, m) {
+  encode(state, m) {
     encoding4_0.encode(state, m.metadata)
     encoding4_1.encode(state, m.preview)
   },
-  decode (state) {
+  decode(state) {
     const r0 = encoding4_0.decode(state)
     const r1 = encoding4_1.decode(state)
 
@@ -173,18 +169,15 @@ const encoding4 = {
 
 // @media/decode-image-request
 const encoding5 = {
-  preencode (state, m) {
+  preencode(state, m) {
     state.end++ // max flag is 4 so always one byte
 
     if (m.path) c.string.preencode(state, m.path)
     if (m.httpLink) c.string.preencode(state, m.httpLink)
     if (m.mimetype) c.string.preencode(state, m.mimetype)
   },
-  encode (state, m) {
-    const flags =
-      (m.path ? 1 : 0) |
-      (m.httpLink ? 2 : 0) |
-      (m.mimetype ? 4 : 0)
+  encode(state, m) {
+    const flags = (m.path ? 1 : 0) | (m.httpLink ? 2 : 0) | (m.mimetype ? 4 : 0)
 
     c.uint.encode(state, flags)
 
@@ -192,7 +185,7 @@ const encoding5 = {
     if (m.httpLink) c.string.encode(state, m.httpLink)
     if (m.mimetype) c.string.encode(state, m.mimetype)
   },
-  decode (state) {
+  decode(state) {
     const flags = c.uint.decode(state)
 
     return {
@@ -208,23 +201,21 @@ const encoding6_0 = encoding2_0
 
 // @media/decode-image-response
 const encoding6 = {
-  preencode (state, m) {
+  preencode(state, m) {
     state.end++ // max flag is 2 so always one byte
 
     if (m.metadata) encoding6_0.preencode(state, m.metadata)
     if (m.data) c.buffer.preencode(state, m.data)
   },
-  encode (state, m) {
-    const flags =
-      (m.metadata ? 1 : 0) |
-      (m.data ? 2 : 0)
+  encode(state, m) {
+    const flags = (m.metadata ? 1 : 0) | (m.data ? 2 : 0)
 
     c.uint.encode(state, flags)
 
     if (m.metadata) encoding6_0.encode(state, m.metadata)
     if (m.data) c.buffer.encode(state, m.data)
   },
-  decode (state) {
+  decode(state) {
     const flags = c.uint.decode(state)
 
     return {
@@ -234,51 +225,60 @@ const encoding6 = {
   }
 }
 
-function setVersion (v) {
+function setVersion(v) {
   version = v
 }
 
-function encode (name, value, v = VERSION) {
+function encode(name, value, v = VERSION) {
   version = v
   return c.encode(getEncoding(name), value)
 }
 
-function decode (name, buffer, v = VERSION) {
+function decode(name, buffer, v = VERSION) {
   version = v
   return c.decode(getEncoding(name), buffer)
 }
 
-function getEnum (name) {
+function getEnum(name) {
   switch (name) {
-    default: throw new Error('Enum not found ' + name)
+    default:
+      throw new Error('Enum not found ' + name)
   }
 }
 
-function getEncoding (name) {
+function getEncoding(name) {
   switch (name) {
-    case '@media/dimensions': return encoding0
-    case '@media/metadata': return encoding1
-    case '@media/file': return encoding2
-    case '@media/create-preview-request': return encoding3
-    case '@media/create-preview-response': return encoding4
-    case '@media/decode-image-request': return encoding5
-    case '@media/decode-image-response': return encoding6
-    default: throw new Error('Encoder not found ' + name)
+    case '@media/dimensions':
+      return encoding0
+    case '@media/metadata':
+      return encoding1
+    case '@media/file':
+      return encoding2
+    case '@media/create-preview-request':
+      return encoding3
+    case '@media/create-preview-response':
+      return encoding4
+    case '@media/decode-image-request':
+      return encoding5
+    case '@media/decode-image-response':
+      return encoding6
+    default:
+      throw new Error('Encoder not found ' + name)
   }
 }
 
-function getStruct (name, v = VERSION) {
+function getStruct(name, v = VERSION) {
   const enc = getEncoding(name)
   return {
-    preencode (state, m) {
+    preencode(state, m) {
       version = v
       enc.preencode(state, m)
     },
-    encode (state, m) {
+    encode(state, m) {
       version = v
       enc.encode(state, m)
     },
-    decode (state) {
+    decode(state) {
       version = v
       return enc.decode(state)
     }
@@ -287,4 +287,13 @@ function getStruct (name, v = VERSION) {
 
 const resolveStruct = getStruct // compat
 
-export { resolveStruct, getStruct, getEnum, getEncoding, encode, decode, setVersion, version }
+export {
+  resolveStruct,
+  getStruct,
+  getEnum,
+  getEncoding,
+  encode,
+  decode,
+  setVersion,
+  version
+}

package/shared/spec/schema/schema.json

@@ -168,4 +168,4 @@
       ]
     }
   ]
-}
+}

package/shared/spec/schema.js

@@ -7,117 +7,131 @@ const media = schema.namespace('media')
 
 media.register({
   name: 'dimensions',
-  fields: [{
-    name: 'width',
-    type: 'uint',
-    required: true
-  },
-  {
-    name: 'height',
-    type: 'uint',
-    required: true
-  }]
+  fields: [
+    {
+      name: 'width',
+      type: 'uint',
+      required: true
+    },
+    {
+      name: 'height',
+      type: 'uint',
+      required: true
+    }
+  ]
 })
 
 media.register({
   name: 'metadata',
-  fields: [{
-    name: 'mimetype',
-    type: 'string'
-  },
-  {
-    name: 'dimensions',
-    type: '@media/dimensions'
-  },
-  {
-    name: 'duration',
-    type: 'uint'
-  }]
+  fields: [
+    {
+      name: 'mimetype',
+      type: 'string'
+    },
+    {
+      name: 'dimensions',
+      type: '@media/dimensions'
+    },
+    {
+      name: 'duration',
+      type: 'uint'
+    }
+  ]
 })
 
 media.register({
   name: 'file',
-  fields: [{
-    name: 'metadata',
-    type: '@media/metadata'
-  },
-  {
-    name: 'inlined',
-    type: 'string'
-  },
-  {
-    name: 'buffer',
-    type: 'buffer'
-  }]
+  fields: [
+    {
+      name: 'metadata',
+      type: '@media/metadata'
+    },
+    {
+      name: 'inlined',
+      type: 'string'
+    },
+    {
+      name: 'buffer',
+      type: 'buffer'
+    }
+  ]
 })
 
 media.register({
   name: 'create-preview-request',
-  fields: [{
-    name: 'path',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'mimetype',
-    type: 'string'
-  },
-  {
-    name: 'maxWidth',
-    type: 'uint'
-  },
-  {
-    name: 'maxHeight',
-    type: 'uint'
-  },
-  {
-    name: 'format',
-    type: 'string'
-  },
-  {
-    name: 'encoding',
-    type: 'string'
-  }]
+  fields: [
+    {
+      name: 'path',
+      type: 'string',
+      required: true
+    },
+    {
+      name: 'mimetype',
+      type: 'string'
+    },
+    {
+      name: 'maxWidth',
+      type: 'uint'
+    },
+    {
+      name: 'maxHeight',
+      type: 'uint'
+    },
+    {
+      name: 'format',
+      type: 'string'
+    },
+    {
+      name: 'encoding',
+      type: 'string'
+    }
+  ]
 })
 
 media.register({
   name: 'create-preview-response',
-  fields: [{
-    name: 'metadata',
-    type: '@media/metadata',
-    required: true
-  },
-  {
-    name: 'preview',
-    type: '@media/file',
-    required: true
-  }]
+  fields: [
+    {
+      name: 'metadata',
+      type: '@media/metadata',
+      required: true
+    },
+    {
+      name: 'preview',
+      type: '@media/file',
+      required: true
+    }
+  ]
 })
 
 media.register({
   name: 'decode-image-request',
-  fields: [{
-    name: 'path',
-    type: 'string'
-  },
-  {
-    name: 'httpLink',
-    type: 'string'
-  },
-  {
-    name: 'mimetype',
-    type: 'string'
-  }]
+  fields: [
+    {
+      name: 'path',
+      type: 'string'
+    },
+    {
+      name: 'httpLink',
+      type: 'string'
+    },
+    {
+      name: 'mimetype',
+      type: 'string'
+    }
+  ]
 })
 
 media.register({
   name: 'decode-image-response',
-  fields: [{
-    name: 'metadata',
-    type: '@media/metadata'
-  },
-  {
-    name: 'data',
-    type: 'buffer'
-  }]
+  fields: [
+    {
+      name: 'metadata',
+      type: '@media/metadata'
+    },
+    {
+      name: 'data',
+      type: 'buffer'
+    }
+  ]
 })

package/worker/media.js

@@ -10,7 +10,14 @@ const DEFAULT_PREVIEW_FORMAT = 'image/webp'
 
 const animatableMimetypes = ['image/webp']
 
-export async function createPreview ({ path, mimetype, maxWidth, maxHeight, format, encoding }) {
+export async function createPreview({
+  path,
+  mimetype,
+  maxWidth,
+  maxHeight,
+  format,
+  encoding
+}) {
   mimetype = mimetype || getMimeType(path)
   format = format || DEFAULT_PREVIEW_FORMAT
 
@@ -18,7 +25,7 @@ export async function createPreview ({ path, mimetype, maxWidth, maxHeight, form
   const rgba = await decodeImageToRGBA(buffer, mimetype)
   const { width, height } = rgba
 
-  const { dimensions, rgba: maybeResizedRGBA } = await resizeRGBA(rgba, width, height, maxWidth, maxHeight)
+  const maybeResizedRGBA = await resizeRGBA(rgba, maxWidth, maxHeight)
 
   const encoded = await encodeImageFromRGBA(maybeResizedRGBA, format, encoding)
 
@@ -27,13 +34,19 @@ export async function createPreview ({ path, mimetype, maxWidth, maxHeight, form
       dimensions: { width, height }
     },
     preview: {
-      metadata: { mimetype: format, dimensions },
+      metadata: {
+        mimetype: format,
+        dimensions: {
+          width: maybeResizedRGBA.width,
+          height: maybeResizedRGBA.height
+        }
+      },
       ...encoded
     }
   }
 }
 
-export async function decodeImage ({ path, httpLink, mimetype }) {
+export async function decodeImage({ path, httpLink, mimetype }) {
   let buffer
 
   if (path) {
@@ -54,15 +67,18 @@ export async function decodeImage ({ path, httpLink, mimetype }) {
   }
 }
 
-async function decodeImageToRGBA (buffer, mimetype) {
+async function decodeImageToRGBA(buffer, mimetype) {
   let rgba
 
   const codec = await importCodec(mimetype)
 
   if (animatableMimetypes.includes(mimetype)) {
-    const { frames, width, height } = codec.decodeAnimated(buffer)
-    const { data } = frames.next().value
-    rgba = { width, height, data }
+    const { width, height, loops, frames } = codec.decodeAnimated(buffer)
+    const data = []
+    for (const frame of frames) {
+      data.push(frame)
+    }
+    rgba = { width, height, loops, frames: data }
   } else {
     rgba = codec.decode(buffer)
   }
@@ -70,26 +86,52 @@ async function decodeImageToRGBA (buffer, mimetype) {
   return rgba
 }
 
-async function encodeImageFromRGBA (rgba, format, encoding) {
+async function encodeImageFromRGBA(rgba, format, encoding) {
   const codec = await importCodec(format)
-  const encoded = codec.encode(rgba)
+
+  let encoded
+  if (Array.isArray(rgba.frames)) {
+    encoded = codec.encodeAnimated(rgba)
+  } else {
+    encoded = codec.encode(rgba)
+  }
 
   return encoding === 'base64'
     ? { inlined: b4a.toString(encoded, 'base64') }
     : { buffer: encoded }
 }
 
-async function resizeRGBA (rgba, width, height, maxWidth, maxHeight) {
-  let maybeResizedRGBA, dimensions
+async function resizeRGBA(rgba, maxWidth, maxHeight) {
+  const { width, height } = rgba
+
+  let maybeResizedRGBA
 
   if (maxWidth && maxHeight && (width > maxWidth || height > maxHeight)) {
     const { resize } = await import('bare-image-resample')
-    dimensions = calculateFitDimensions(width, height, maxWidth, maxHeight)
-    maybeResizedRGBA = resize(rgba, dimensions.width, dimensions.height)
+    const dimensions = calculateFitDimensions(
+      width,
+      height,
+      maxWidth,
+      maxHeight
+    )
+    if (Array.isArray(rgba.frames)) {
+      const frames = []
+      for (const frame of rgba.frames) {
+        const resized = resize(frame, dimensions.width, dimensions.height)
+        frames.push({ ...resized, timestamp: frame.timestamp })
+      }
+      maybeResizedRGBA = {
+        width: frames[0].width,
+        height: frames[0].height,
+        loops: rgba.loops,
+        frames
+      }
+    } else {
+      maybeResizedRGBA = resize(rgba, dimensions.width, dimensions.height)
+    }
   } else {
-    dimensions = { width, height }
     maybeResizedRGBA = rgba
   }
 
-  return { dimensions, rgba: maybeResizedRGBA }
+  return maybeResizedRGBA
 }

package/worker/util.js

@@ -1,6 +1,6 @@
 export const log = (...args) => console.log('[bare-media]', ...args)
 
-export function calculateFitDimensions (width, height, maxWidth, maxHeight) {
+export function calculateFitDimensions(width, height, maxWidth, maxHeight) {
   if (width <= maxWidth && height <= maxHeight) {
     return { width, height }
   }