bare-media 1.0.0 → 1.1.1

package/README.md

@@ -27,7 +27,7 @@ const worker = new WorkerClient()
 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. If you need to spawn it earlier it's also possible by calling `worker.run()`. 
+> NOTE: A worker spawns when an operation is requested and it stays running until the parent process is killed.
 
 Handle close event:
 
@@ -40,12 +40,12 @@ worker.onClose = () => {
 
 ```
 
-You can also call the utilities directly without using a worker:
+Call the methods directly without a worker:
 
 ```js
 import { createPreview } from 'bare-media/worker/media.js'
 
-const data = await worker.createPreview({ path, maxWidth, maxHeight })
+const data = await createPreview({ path, maxWidth, maxHeight })
 ```
 
 ## API
@@ -53,7 +53,10 @@ const data = await worker.createPreview({ path, maxWidth, maxHeight })
 | Method              | Parameters                                              | Return Value        | Description
 |---------------------|---------------------------------------------------------|---------------------|----------------------------------------
 | `createPreview`     | `path, mimetype, maxWidth, maxHeight, format, encoding` | `metadata, preview` | Create a preview from a media file
-| `createPreviewAll`  | `path, mimetype, maxWidth, maxHeight, format`           | `metadata, preview` | Create all 3 previews from a media file
-| `decodeImage`       | `httpLink, mimetype`                                    | `metadata, data`    | Decode an image to RGBA
+| `decodeImage`       | `path`, `httpLink, mimetype`                            | `metadata, data`    | Decode an image to RGBA
 
 > See [schema.js](shared/spec/schema.js) for the complete reference of parameters
+
+## License
+
+Apache-2.0

package/client.js

@@ -0,0 +1,56 @@
+import { spawn } from 'cross-worker/client'
+import ReadyResource from 'ready-resource'
+
+import HRPC from './shared/spec/hrpc/index.js'
+import { isCodecSupported } from './shared/codecs.js'
+
+export class WorkerClient extends ReadyResource {
+  worker = null
+  rpc = null
+  opts = null
+
+  constructor (opts) {
+    super()
+    this.initialize(opts)
+    this.#attachMethods()
+  }
+
+  initialize ({ filename = 'node_modules/bare-media/worker/index.js', requireSource, args } = {}) {
+    this.opts = { filename, requireSource, args }
+  }
+
+  #attachMethods () {
+    const methods = [
+      'createPreview',
+      'decodeImage'
+    ]
+
+    for (const method of methods) {
+      this[method] = async (...args) => {
+        await this.ready()
+        return this.rpc[method](...args)
+      }
+    }
+  }
+
+  async _open () {
+    await this.#run()
+  }
+
+  async #run () {
+    const { filename, requireSource, args } = this.opts
+    const source = requireSource?.()
+    this.worker = await spawn(filename, source, args)
+
+    const ipc = this.worker.IPC
+
+    ipc.on('end', () => ipc.end())
+    ipc.on('close', () => this.onClose?.())
+
+    this.rpc = new HRPC(ipc)
+  }
+
+  isCodecSupported (mimetype) {
+    return isCodecSupported(mimetype)
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-media",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -23,9 +23,11 @@
     "bare-png": "^1.0.2",
     "bare-tiff": "^1.0.1",
     "bare-webp": "^1.0.3",
-    "cross-worker": "^1.0.0",
+    "cross-worker": "^1.1.0",
+    "get-mime-type": "^2.0.1",
     "hrpc": "^4.0.0",
     "hyperschema": "^1.12.3",
+    "ready-resource": "^1.2.0",
     "uncaughts": "^1.1.1"
   },
   "devDependencies": {
@@ -37,9 +39,9 @@
     "test-tmp": "^1.4.0"
   },
   "files": [
-    "client",
     "shared",
     "worker",
+    "client.js",
     "index.js"
   ],
   "standard": {

package/shared/spec/build.js

@@ -19,12 +19,6 @@ ns.register({
   response: { name: '@media/create-preview-response', stream: false }
 })
 
-ns.register({
-  name: 'create-preview-all',
-  request: { name: '@media/create-preview-all-request', stream: false },
-  response: { name: '@media/create-preview-all-response', stream: false }
-})
-
 ns.register({
   name: 'decode-image',
   request: { name: '@media/decode-image-request', stream: false },

package/shared/spec/hrpc/hrpc.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 1,
   "schema": [
     {
       "id": 0,
@@ -16,19 +16,6 @@
     },
     {
       "id": 1,
-      "name": "@media/create-preview-all",
-      "request": {
-        "name": "@media/create-preview-all-request",
-        "stream": false
-      },
-      "response": {
-        "name": "@media/create-preview-all-response",
-        "stream": false
-      },
-      "version": 1
-    },
-    {
-      "id": 2,
       "name": "@media/decode-image",
       "request": {
         "name": "@media/decode-image-request",
@@ -38,7 +25,7 @@
         "name": "@media/decode-image-response",
         "stream": false
       },
-      "version": 2
+      "version": 1
     }
   ]
 }

package/shared/spec/hrpc/index.js

@@ -7,10 +7,8 @@ import { getEncoding } from './messages.js'
 const methods = new Map([
   ['@media/create-preview', 0],
   [0, '@media/create-preview'],
-  ['@media/create-preview-all', 1],
-  [1, '@media/create-preview-all'],
-  ['@media/decode-image', 2],
-  [2, '@media/decode-image']
+  ['@media/decode-image', 1],
+  [1, '@media/decode-image']
 ])
 
 class HRPC {
@@ -19,12 +17,10 @@ class HRPC {
     this._handlers = []
     this._requestEncodings = new Map([
       ['@media/create-preview', getEncoding('@media/create-preview-request')],
-      ['@media/create-preview-all', getEncoding('@media/create-preview-all-request')],
       ['@media/decode-image', getEncoding('@media/decode-image-request')]
     ])
     this._responseEncodings = new Map([
       ['@media/create-preview', getEncoding('@media/create-preview-response')],
-      ['@media/create-preview-all', getEncoding('@media/create-preview-all-response')],
       ['@media/decode-image', getEncoding('@media/decode-image-response')]
     ])
     this._rpc = new RPC(stream, async (req) => {
@@ -93,10 +89,6 @@ class HRPC {
     return this._call('@media/create-preview', args)
   }
 
-  async createPreviewAll (args) {
-    return this._call('@media/create-preview-all', args)
-  }
-
   async decodeImage (args) {
     return this._call('@media/decode-image', args)
   }
@@ -105,10 +97,6 @@ class HRPC {
     this._handlers['@media/create-preview'] = responseFn
   }
 
-  onCreatePreviewAll (responseFn) {
-    this._handlers['@media/create-preview-all'] = responseFn
-  }
-
   onDecodeImage (responseFn) {
     this._handlers['@media/decode-image'] = responseFn
   }

package/shared/spec/hrpc/messages.js

@@ -1,11 +1,11 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 2
+// Schema Version: 1
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 
 import { c } from 'hyperschema/runtime'
 
-const VERSION = 2
+const VERSION = 1
 
 // eslint-disable-next-line no-unused-vars
 let version = VERSION
@@ -101,72 +101,8 @@ const encoding2 = {
   }
 }
 
-// @media/preview-by-size.small
-const encoding3_0 = c.frame(encoding2)
-// @media/preview-by-size.medium
-const encoding3_1 = encoding3_0
-// @media/preview-by-size.large
-const encoding3_2 = encoding3_0
-
-// @media/preview-by-size
-const encoding3 = {
-  preencode (state, m) {
-    state.end++ // max flag is 4 so always one byte
-
-    if (m.small) encoding3_0.preencode(state, m.small)
-    if (m.medium) encoding3_1.preencode(state, m.medium)
-    if (m.large) encoding3_2.preencode(state, m.large)
-  },
-  encode (state, m) {
-    const flags =
-      (m.small ? 1 : 0) |
-      (m.medium ? 2 : 0) |
-      (m.large ? 4 : 0)
-
-    c.uint.encode(state, flags)
-
-    if (m.small) encoding3_0.encode(state, m.small)
-    if (m.medium) encoding3_1.encode(state, m.medium)
-    if (m.large) encoding3_2.encode(state, m.large)
-  },
-  decode (state) {
-    const flags = c.uint.decode(state)
-
-    return {
-      small: (flags & 1) !== 0 ? encoding3_0.decode(state) : null,
-      medium: (flags & 2) !== 0 ? encoding3_1.decode(state) : null,
-      large: (flags & 4) !== 0 ? encoding3_2.decode(state) : null
-    }
-  }
-}
-
-// @media/sizePreview
-const encoding4 = {
-  preencode (state, m) {
-    c.uint.preencode(state, m.small)
-    c.uint.preencode(state, m.medium)
-    c.uint.preencode(state, m.large)
-  },
-  encode (state, m) {
-    c.uint.encode(state, m.small)
-    c.uint.encode(state, m.medium)
-    c.uint.encode(state, m.large)
-  },
-  decode (state) {
-    const r0 = c.uint.decode(state)
-    const r1 = c.uint.decode(state)
-    const r2 = c.uint.decode(state)
-
-    return {
-      small: r0,
-      medium: r1,
-      large: r2
-    }
-  }
-}
-
 // @media/create-preview-request
-const encoding5 = {
+const encoding3 = {
   preencode (state, m) {
     c.string.preencode(state, m.path)
     state.end++ // max flag is 16 so always one byte
@@ -210,23 +146,23 @@ const encoding5 = {
 }
 
 // @media/create-preview-response.metadata
-const encoding6_0 = encoding2_0
+const encoding4_0 = encoding2_0
 // @media/create-preview-response.preview
-const encoding6_1 = encoding3_0
+const encoding4_1 = c.frame(encoding2)
 
 // @media/create-preview-response
-const encoding6 = {
+const encoding4 = {
   preencode (state, m) {
-    encoding6_0.preencode(state, m.metadata)
-    encoding6_1.preencode(state, m.preview)
+    encoding4_0.preencode(state, m.metadata)
+    encoding4_1.preencode(state, m.preview)
   },
   encode (state, m) {
-    encoding6_0.encode(state, m.metadata)
-    encoding6_1.encode(state, m.preview)
+    encoding4_0.encode(state, m.metadata)
+    encoding4_1.encode(state, m.preview)
   },
   decode (state) {
-    const r0 = encoding6_0.decode(state)
-    const r1 = encoding6_1.decode(state)
+    const r0 = encoding4_0.decode(state)
+    const r1 = encoding4_1.decode(state)
 
     return {
       metadata: r0,
@@ -235,129 +171,65 @@ const encoding6 = {
   }
 }
 
-// @media/create-preview-all-request.maxWidth
-const encoding7_2 = c.frame(encoding4)
-// @media/create-preview-all-request.maxHeight
-const encoding7_3 = encoding7_2
-
-// @media/create-preview-all-request
-const encoding7 = {
+// @media/decode-image-request
+const encoding5 = {
   preencode (state, m) {
-    c.string.preencode(state, m.path)
-    state.end++ // max flag is 2 so always one byte
+    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)
-    encoding7_2.preencode(state, m.maxWidth)
-    encoding7_3.preencode(state, m.maxHeight)
-    if (m.format) c.string.preencode(state, m.format)
   },
   encode (state, m) {
     const flags =
-      (m.mimetype ? 1 : 0) |
-      (m.format ? 2 : 0)
+      (m.path ? 1 : 0) |
+      (m.httpLink ? 2 : 0) |
+      (m.mimetype ? 4 : 0)
 
-    c.string.encode(state, m.path)
     c.uint.encode(state, flags)
 
+    if (m.path) c.string.encode(state, m.path)
+    if (m.httpLink) c.string.encode(state, m.httpLink)
     if (m.mimetype) c.string.encode(state, m.mimetype)
-    encoding7_2.encode(state, m.maxWidth)
-    encoding7_3.encode(state, m.maxHeight)
-    if (m.format) c.string.encode(state, m.format)
   },
   decode (state) {
-    const r0 = c.string.decode(state)
     const flags = c.uint.decode(state)
 
     return {
-      path: r0,
-      mimetype: (flags & 1) !== 0 ? c.string.decode(state) : null,
-      maxWidth: encoding7_2.decode(state),
-      maxHeight: encoding7_3.decode(state),
-      format: (flags & 2) !== 0 ? c.string.decode(state) : null
-    }
-  }
-}
-
-// @media/create-preview-all-response.metadata
-const encoding8_0 = encoding2_0
-// @media/create-preview-all-response.preview
-const encoding8_1 = c.frame(encoding3)
-
-// @media/create-preview-all-response
-const encoding8 = {
-  preencode (state, m) {
-    encoding8_0.preencode(state, m.metadata)
-    encoding8_1.preencode(state, m.preview)
-  },
-  encode (state, m) {
-    encoding8_0.encode(state, m.metadata)
-    encoding8_1.encode(state, m.preview)
-  },
-  decode (state) {
-    const r0 = encoding8_0.decode(state)
-    const r1 = encoding8_1.decode(state)
-
-    return {
-      metadata: r0,
-      preview: r1
-    }
-  }
-}
-
-// @media/decode-image-request
-const encoding9 = {
-  preencode (state, m) {
-    c.string.preencode(state, m.httpLink)
-    state.end++ // max flag is 1 so always one byte
-
-    if (version >= 2 && m.mimetype) c.string.preencode(state, m.mimetype)
-  },
-  encode (state, m) {
-    const flags = (version >= 2 && m.mimetype) ? 1 : 0
-
-    c.string.encode(state, m.httpLink)
-    c.uint.encode(state, flags)
-
-    if (version >= 2 && m.mimetype) c.string.encode(state, m.mimetype)
-  },
-  decode (state) {
-    const r0 = c.string.decode(state)
-    const flags = c.uint.decode(state)
-
-    return {
-      httpLink: r0,
-      mimetype: (version >= 2 && (flags & 1) !== 0) ? c.string.decode(state) : null
+      path: (flags & 1) !== 0 ? c.string.decode(state) : null,
+      httpLink: (flags & 2) !== 0 ? c.string.decode(state) : null,
+      mimetype: (flags & 4) !== 0 ? c.string.decode(state) : null
     }
   }
 }
 
 // @media/decode-image-response.metadata
-const encoding10_0 = encoding2_0
+const encoding6_0 = encoding2_0
 
 // @media/decode-image-response
-const encoding10 = {
+const encoding6 = {
   preencode (state, m) {
     state.end++ // max flag is 2 so always one byte
 
-    if (version >= 2 && m.metadata) encoding10_0.preencode(state, m.metadata)
-    if (version >= 2 && m.data) c.buffer.preencode(state, m.data)
+    if (m.metadata) encoding6_0.preencode(state, m.metadata)
+    if (m.data) c.buffer.preencode(state, m.data)
   },
   encode (state, m) {
     const flags =
-      ((version >= 2 && m.metadata) ? 1 : 0) |
-      ((version >= 2 && m.data) ? 2 : 0)
+      (m.metadata ? 1 : 0) |
+      (m.data ? 2 : 0)
 
     c.uint.encode(state, flags)
 
-    if (version >= 2 && m.metadata) encoding10_0.encode(state, m.metadata)
-    if (version >= 2 && m.data) c.buffer.encode(state, m.data)
+    if (m.metadata) encoding6_0.encode(state, m.metadata)
+    if (m.data) c.buffer.encode(state, m.data)
   },
   decode (state) {
     const flags = c.uint.decode(state)
 
     return {
-      metadata: (version >= 2 && (flags & 1) !== 0) ? encoding10_0.decode(state) : null,
-      data: (version >= 2 && (flags & 2) !== 0) ? c.buffer.decode(state) : null
+      metadata: (flags & 1) !== 0 ? encoding6_0.decode(state) : null,
+      data: (flags & 2) !== 0 ? c.buffer.decode(state) : null
     }
   }
 }
@@ -387,14 +259,10 @@ function getEncoding (name) {
     case '@media/dimensions': return encoding0
     case '@media/metadata': return encoding1
     case '@media/file': return encoding2
-    case '@media/preview-by-size': return encoding3
-    case '@media/sizePreview': return encoding4
-    case '@media/create-preview-request': return encoding5
-    case '@media/create-preview-response': return encoding6
-    case '@media/create-preview-all-request': return encoding7
-    case '@media/create-preview-all-response': return encoding8
-    case '@media/decode-image-request': return encoding9
-    case '@media/decode-image-response': return encoding10
+    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)
   }
 }

package/shared/spec/schema/index.js

@@ -1,11 +1,11 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 2
+// Schema Version: 1
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 
 import { c } from 'hyperschema/runtime'
 
-const VERSION = 2
+const VERSION = 1
 
 // eslint-disable-next-line no-unused-vars
 let version = VERSION
@@ -101,72 +101,8 @@ const encoding2 = {
   }
 }
 
-// @media/preview-by-size.small
-const encoding3_0 = c.frame(encoding2)
-// @media/preview-by-size.medium
-const encoding3_1 = encoding3_0
-// @media/preview-by-size.large
-const encoding3_2 = encoding3_0
-
-// @media/preview-by-size
-const encoding3 = {
-  preencode (state, m) {
-    state.end++ // max flag is 4 so always one byte
-
-    if (m.small) encoding3_0.preencode(state, m.small)
-    if (m.medium) encoding3_1.preencode(state, m.medium)
-    if (m.large) encoding3_2.preencode(state, m.large)
-  },
-  encode (state, m) {
-    const flags =
-      (m.small ? 1 : 0) |
-      (m.medium ? 2 : 0) |
-      (m.large ? 4 : 0)
-
-    c.uint.encode(state, flags)
-
-    if (m.small) encoding3_0.encode(state, m.small)
-    if (m.medium) encoding3_1.encode(state, m.medium)
-    if (m.large) encoding3_2.encode(state, m.large)
-  },
-  decode (state) {
-    const flags = c.uint.decode(state)
-
-    return {
-      small: (flags & 1) !== 0 ? encoding3_0.decode(state) : null,
-      medium: (flags & 2) !== 0 ? encoding3_1.decode(state) : null,
-      large: (flags & 4) !== 0 ? encoding3_2.decode(state) : null
-    }
-  }
-}
-
-// @media/sizePreview
-const encoding4 = {
-  preencode (state, m) {
-    c.uint.preencode(state, m.small)
-    c.uint.preencode(state, m.medium)
-    c.uint.preencode(state, m.large)
-  },
-  encode (state, m) {
-    c.uint.encode(state, m.small)
-    c.uint.encode(state, m.medium)
-    c.uint.encode(state, m.large)
-  },
-  decode (state) {
-    const r0 = c.uint.decode(state)
-    const r1 = c.uint.decode(state)
-    const r2 = c.uint.decode(state)
-
-    return {
-      small: r0,
-      medium: r1,
-      large: r2
-    }
-  }
-}
-
 // @media/create-preview-request
-const encoding5 = {
+const encoding3 = {
   preencode (state, m) {
     c.string.preencode(state, m.path)
     state.end++ // max flag is 16 so always one byte
@@ -210,23 +146,23 @@ const encoding5 = {
 }
 
 // @media/create-preview-response.metadata
-const encoding6_0 = encoding2_0
+const encoding4_0 = encoding2_0
 // @media/create-preview-response.preview
-const encoding6_1 = encoding3_0
+const encoding4_1 = c.frame(encoding2)
 
 // @media/create-preview-response
-const encoding6 = {
+const encoding4 = {
   preencode (state, m) {
-    encoding6_0.preencode(state, m.metadata)
-    encoding6_1.preencode(state, m.preview)
+    encoding4_0.preencode(state, m.metadata)
+    encoding4_1.preencode(state, m.preview)
   },
   encode (state, m) {
-    encoding6_0.encode(state, m.metadata)
-    encoding6_1.encode(state, m.preview)
+    encoding4_0.encode(state, m.metadata)
+    encoding4_1.encode(state, m.preview)
   },
   decode (state) {
-    const r0 = encoding6_0.decode(state)
-    const r1 = encoding6_1.decode(state)
+    const r0 = encoding4_0.decode(state)
+    const r1 = encoding4_1.decode(state)
 
     return {
       metadata: r0,
@@ -235,129 +171,65 @@ const encoding6 = {
   }
 }
 
-// @media/create-preview-all-request.maxWidth
-const encoding7_2 = c.frame(encoding4)
-// @media/create-preview-all-request.maxHeight
-const encoding7_3 = encoding7_2
-
-// @media/create-preview-all-request
-const encoding7 = {
+// @media/decode-image-request
+const encoding5 = {
   preencode (state, m) {
-    c.string.preencode(state, m.path)
-    state.end++ // max flag is 2 so always one byte
+    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)
-    encoding7_2.preencode(state, m.maxWidth)
-    encoding7_3.preencode(state, m.maxHeight)
-    if (m.format) c.string.preencode(state, m.format)
   },
   encode (state, m) {
     const flags =
-      (m.mimetype ? 1 : 0) |
-      (m.format ? 2 : 0)
+      (m.path ? 1 : 0) |
+      (m.httpLink ? 2 : 0) |
+      (m.mimetype ? 4 : 0)
 
-    c.string.encode(state, m.path)
     c.uint.encode(state, flags)
 
+    if (m.path) c.string.encode(state, m.path)
+    if (m.httpLink) c.string.encode(state, m.httpLink)
     if (m.mimetype) c.string.encode(state, m.mimetype)
-    encoding7_2.encode(state, m.maxWidth)
-    encoding7_3.encode(state, m.maxHeight)
-    if (m.format) c.string.encode(state, m.format)
   },
   decode (state) {
-    const r0 = c.string.decode(state)
     const flags = c.uint.decode(state)
 
     return {
-      path: r0,
-      mimetype: (flags & 1) !== 0 ? c.string.decode(state) : null,
-      maxWidth: encoding7_2.decode(state),
-      maxHeight: encoding7_3.decode(state),
-      format: (flags & 2) !== 0 ? c.string.decode(state) : null
-    }
-  }
-}
-
-// @media/create-preview-all-response.metadata
-const encoding8_0 = encoding2_0
-// @media/create-preview-all-response.preview
-const encoding8_1 = c.frame(encoding3)
-
-// @media/create-preview-all-response
-const encoding8 = {
-  preencode (state, m) {
-    encoding8_0.preencode(state, m.metadata)
-    encoding8_1.preencode(state, m.preview)
-  },
-  encode (state, m) {
-    encoding8_0.encode(state, m.metadata)
-    encoding8_1.encode(state, m.preview)
-  },
-  decode (state) {
-    const r0 = encoding8_0.decode(state)
-    const r1 = encoding8_1.decode(state)
-
-    return {
-      metadata: r0,
-      preview: r1
-    }
-  }
-}
-
-// @media/decode-image-request
-const encoding9 = {
-  preencode (state, m) {
-    c.string.preencode(state, m.httpLink)
-    state.end++ // max flag is 1 so always one byte
-
-    if (version >= 2 && m.mimetype) c.string.preencode(state, m.mimetype)
-  },
-  encode (state, m) {
-    const flags = (version >= 2 && m.mimetype) ? 1 : 0
-
-    c.string.encode(state, m.httpLink)
-    c.uint.encode(state, flags)
-
-    if (version >= 2 && m.mimetype) c.string.encode(state, m.mimetype)
-  },
-  decode (state) {
-    const r0 = c.string.decode(state)
-    const flags = c.uint.decode(state)
-
-    return {
-      httpLink: r0,
-      mimetype: (version >= 2 && (flags & 1) !== 0) ? c.string.decode(state) : null
+      path: (flags & 1) !== 0 ? c.string.decode(state) : null,
+      httpLink: (flags & 2) !== 0 ? c.string.decode(state) : null,
+      mimetype: (flags & 4) !== 0 ? c.string.decode(state) : null
     }
   }
 }
 
 // @media/decode-image-response.metadata
-const encoding10_0 = encoding2_0
+const encoding6_0 = encoding2_0
 
 // @media/decode-image-response
-const encoding10 = {
+const encoding6 = {
   preencode (state, m) {
     state.end++ // max flag is 2 so always one byte
 
-    if (version >= 2 && m.metadata) encoding10_0.preencode(state, m.metadata)
-    if (version >= 2 && m.data) c.buffer.preencode(state, m.data)
+    if (m.metadata) encoding6_0.preencode(state, m.metadata)
+    if (m.data) c.buffer.preencode(state, m.data)
   },
   encode (state, m) {
     const flags =
-      ((version >= 2 && m.metadata) ? 1 : 0) |
-      ((version >= 2 && m.data) ? 2 : 0)
+      (m.metadata ? 1 : 0) |
+      (m.data ? 2 : 0)
 
     c.uint.encode(state, flags)
 
-    if (version >= 2 && m.metadata) encoding10_0.encode(state, m.metadata)
-    if (version >= 2 && m.data) c.buffer.encode(state, m.data)
+    if (m.metadata) encoding6_0.encode(state, m.metadata)
+    if (m.data) c.buffer.encode(state, m.data)
   },
   decode (state) {
     const flags = c.uint.decode(state)
 
     return {
-      metadata: (version >= 2 && (flags & 1) !== 0) ? encoding10_0.decode(state) : null,
-      data: (version >= 2 && (flags & 2) !== 0) ? c.buffer.decode(state) : null
+      metadata: (flags & 1) !== 0 ? encoding6_0.decode(state) : null,
+      data: (flags & 2) !== 0 ? c.buffer.decode(state) : null
     }
   }
 }
@@ -387,14 +259,10 @@ function getEncoding (name) {
     case '@media/dimensions': return encoding0
     case '@media/metadata': return encoding1
     case '@media/file': return encoding2
-    case '@media/preview-by-size': return encoding3
-    case '@media/sizePreview': return encoding4
-    case '@media/create-preview-request': return encoding5
-    case '@media/create-preview-response': return encoding6
-    case '@media/create-preview-all-request': return encoding7
-    case '@media/create-preview-all-response': return encoding8
-    case '@media/decode-image-request': return encoding9
-    case '@media/decode-image-response': return encoding10
+    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)
   }
 }

package/shared/spec/schema/schema.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 1,
   "schema": [
     {
       "name": "dimensions",
@@ -67,55 +67,6 @@
         }
       ]
     },
-    {
-      "name": "preview-by-size",
-      "namespace": "media",
-      "compact": false,
-      "flagsPosition": 0,
-      "fields": [
-        {
-          "name": "small",
-          "type": "@media/file",
-          "version": 1
-        },
-        {
-          "name": "medium",
-          "type": "@media/file",
-          "version": 1
-        },
-        {
-          "name": "large",
-          "type": "@media/file",
-          "version": 1
-        }
-      ]
-    },
-    {
-      "name": "sizePreview",
-      "namespace": "media",
-      "compact": false,
-      "flagsPosition": -1,
-      "fields": [
-        {
-          "name": "small",
-          "required": true,
-          "type": "uint",
-          "version": 1
-        },
-        {
-          "name": "medium",
-          "required": true,
-          "type": "uint",
-          "version": 1
-        },
-        {
-          "name": "large",
-          "required": true,
-          "type": "uint",
-          "version": 1
-        }
-      ]
-    },
     {
       "name": "create-preview-request",
       "namespace": "media",
@@ -176,77 +127,25 @@
       ]
     },
     {
-      "name": "create-preview-all-request",
+      "name": "decode-image-request",
       "namespace": "media",
       "compact": false,
-      "flagsPosition": 1,
+      "flagsPosition": 0,
       "fields": [
         {
           "name": "path",
-          "required": true,
-          "type": "string",
-          "version": 1
-        },
-        {
-          "name": "mimetype",
-          "type": "string",
-          "version": 1
-        },
-        {
-          "name": "maxWidth",
-          "required": true,
-          "type": "@media/sizePreview",
-          "version": 1
-        },
-        {
-          "name": "maxHeight",
-          "required": true,
-          "type": "@media/sizePreview",
-          "version": 1
-        },
-        {
-          "name": "format",
           "type": "string",
           "version": 1
-        }
-      ]
-    },
-    {
-      "name": "create-preview-all-response",
-      "namespace": "media",
-      "compact": false,
-      "flagsPosition": -1,
-      "fields": [
-        {
-          "name": "metadata",
-          "required": true,
-          "type": "@media/metadata",
-          "version": 1
         },
-        {
-          "name": "preview",
-          "required": true,
-          "type": "@media/preview-by-size",
-          "version": 1
-        }
-      ]
-    },
-    {
-      "name": "decode-image-request",
-      "namespace": "media",
-      "compact": false,
-      "flagsPosition": 1,
-      "fields": [
         {
           "name": "httpLink",
-          "required": true,
           "type": "string",
-          "version": 2
+          "version": 1
         },
         {
           "name": "mimetype",
           "type": "string",
-          "version": 2
+          "version": 1
         }
       ]
     },
@@ -259,12 +158,12 @@
         {
           "name": "metadata",
           "type": "@media/metadata",
-          "version": 2
+          "version": 1
         },
         {
           "name": "data",
           "type": "buffer",
-          "version": 2
+          "version": 1
         }
       ]
     }

package/shared/spec/schema.js

@@ -51,41 +51,6 @@ media.register({
   }]
 })
 
-media.register({
-  name: 'preview-by-size',
-  fields: [{
-    name: 'small',
-    type: '@media/file'
-  },
-  {
-    name: 'medium',
-    type: '@media/file'
-  },
-  {
-    name: 'large',
-    type: '@media/file'
-  }]
-})
-
-media.register({
-  name: 'sizePreview',
-  fields: [{
-    name: 'small',
-    type: 'uint',
-    required: true
-  },
-  {
-    name: 'medium',
-    type: 'uint',
-    required: true
-  },
-  {
-    name: 'large',
-    type: 'uint',
-    required: true
-  }]
-})
-
 media.register({
   name: 'create-preview-request',
   fields: [{
@@ -130,52 +95,14 @@ media.register({
 })
 
 media.register({
-  name: 'create-preview-all-request',
+  name: 'decode-image-request',
   fields: [{
     name: 'path',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'mimetype',
     type: 'string'
   },
   {
-    name: 'maxWidth',
-    type: '@media/sizePreview',
-    required: true
-  },
-  {
-    name: 'maxHeight',
-    type: '@media/sizePreview',
-    required: true
-  },
-  {
-    name: 'format',
-    type: 'string'
-  }]
-})
-
-media.register({
-  name: 'create-preview-all-response',
-  fields: [{
-    name: 'metadata',
-    type: '@media/metadata',
-    required: true
-  },
-  {
-    name: 'preview',
-    type: '@media/preview-by-size',
-    required: true
-  }]
-})
-
-media.register({
-  name: 'decode-image-request',
-  fields: [{
     name: 'httpLink',
-    type: 'string',
-    required: true
+    type: 'string'
   },
   {
     name: 'mimetype',

package/worker/index.js

@@ -17,7 +17,6 @@ stream.on('close', () => Bare.exit(0))
 const rpc = new HRPC(stream)
 
 rpc.onCreatePreview(media.createPreview)
-rpc.onCreatePreviewAll(media.createPreviewAll)
 rpc.onDecodeImage(media.decodeImage)
 
 uncaughts.on((err) => {

package/worker/media.js

@@ -1,6 +1,7 @@
 import b4a from 'b4a'
 import fs from 'bare-fs'
 import fetch from 'bare-fetch'
+import getMimeType from 'get-mime-type'
 
 import { importCodec } from '../shared/codecs.js'
 import { calculateFitDimensions } from './util'
@@ -10,44 +11,37 @@ const DEFAULT_PREVIEW_FORMAT = 'image/webp'
 const animatableMimetypes = ['image/webp']
 
 export async function createPreview ({ path, mimetype, maxWidth, maxHeight, format, encoding }) {
+  mimetype = mimetype || getMimeType(path)
   format = format || DEFAULT_PREVIEW_FORMAT
 
   const buffer = fs.readFileSync(path)
   const rgba = await decodeImageToRGBA(buffer, mimetype)
   const { width, height } = rgba
 
-  return {
-    metadata: {
-      dimensions: { width, height }
-    },
-    preview: await createPreviewFromRGBA(rgba, maxWidth, maxHeight, format, encoding)
-  }
-}
-
-export async function createPreviewAll ({ path, mimetype, maxWidth, maxHeight, format }) {
-  format = format || DEFAULT_PREVIEW_FORMAT
+  const { dimensions, rgba: maybeResizedRGBA } = await resizeRGBA(rgba, width, height, maxWidth, maxHeight)
 
-  const buffer = fs.readFileSync(path)
-  const rgba = await decodeImageToRGBA(buffer, mimetype)
-  const { width, height } = rgba
-
-  const [small, medium, large] = await Promise.all([
-    createPreviewFromRGBA(rgba, maxWidth.small, maxHeight.small, format, 'base64'),
-    createPreviewFromRGBA(rgba, maxWidth.medium, maxHeight.medium, format, 'base64'),
-    createPreviewFromRGBA(rgba, maxWidth.large, maxHeight.large, format)
-  ])
+  const encoded = await encodeImageFromRGBA(maybeResizedRGBA, format, encoding)
 
   return {
     metadata: {
       dimensions: { width, height }
     },
-    preview: { small, medium, large }
+    preview: {
+      metadata: { mimetype: format, dimensions },
+      ...encoded
+    }
   }
 }
 
-export async function decodeImage ({ httpLink, mimetype }) {
-  const response = await fetch(httpLink)
-  const buffer = await response.buffer()
+export async function decodeImage ({ path, httpLink, mimetype }) {
+  let buffer
+
+  if (path) {
+    buffer = fs.readFileSync(path)
+  } else if (httpLink) {
+    const response = await fetch(httpLink)
+    buffer = await response.buffer()
+  }
 
   const rgba = await decodeImageToRGBA(buffer, mimetype)
   const { width, height, data } = rgba
@@ -76,30 +70,26 @@ async function decodeImageToRGBA (buffer, mimetype) {
   return rgba
 }
 
-async function createPreviewFromRGBA (rgba, maxWidth, maxHeight, format, encoding) {
-  format = format || DEFAULT_PREVIEW_FORMAT
+async function encodeImageFromRGBA (rgba, format, encoding) {
+  const codec = await importCodec(format)
+  const encoded = codec.encode(rgba)
 
-  const { width, height } = rgba
-  let maybeResized, dimensions
+  return encoding === 'base64'
+    ? { inlined: b4a.toString(encoded, 'base64') }
+    : { buffer: encoded }
+}
+
+async function resizeRGBA (rgba, width, height, maxWidth, maxHeight) {
+  let maybeResizedRGBA, dimensions
 
   if (maxWidth && maxHeight && (width > maxWidth || height > maxHeight)) {
     const { resize } = await import('bare-image-resample')
     dimensions = calculateFitDimensions(width, height, maxWidth, maxHeight)
-    maybeResized = resize(rgba, dimensions.width, dimensions.height)
+    maybeResizedRGBA = resize(rgba, dimensions.width, dimensions.height)
   } else {
     dimensions = { width, height }
-    maybeResized = rgba
+    maybeResizedRGBA = rgba
   }
 
-  const codec = await importCodec(format)
-  const encoded = codec.encode(maybeResized)
-
-  const result = encoding === 'base64'
-    ? { inlined: b4a.toString(encoded, 'base64') }
-    : { buffer: encoded }
-
-  return {
-    ...result,
-    metadata: { mimetype: format, dimensions }
-  }
+  return { dimensions, rgba: maybeResizedRGBA }
 }

package/client/cross-spawn/bare-kit.js

@@ -1,16 +0,0 @@
-const { Worklet } = require('react-native-bare-kit')
-
-export const spawn = async ({ requireSource, storagePath, buildVariant, deviceId, devMode }) => {
-  const source = requireSource()
-
-  const worklet = new Worklet()
-
-  await worklet.start('keet:/main.bundle', source, [
-    storagePath,
-    buildVariant,
-    deviceId,
-    devMode
-  ])
-
-  return worklet
-}

package/client/cross-spawn/index.js

@@ -1,9 +0,0 @@
-const isPear = typeof Pear !== 'undefined'
-
-export async function spawn (opts) {
-  const lib = isPear
-    ? await import('./pear')
-    : await import('./bare-kit')
-
-  return lib.spawn(opts)
-}

package/client/cross-spawn/pear.js

@@ -1,11 +0,0 @@
-export async function spawn ({ sourcePath }) {
-  sourcePath = sourcePath.replace(/^[\\|/]/, '')
-
-  const link = Pear.key
-    ? `${Pear.config.applink}/${sourcePath}`
-    : `${Pear.config.dir}${sourcePath}`
-
-  return {
-    IPC: Pear.worker.run(link)
-  }
-}

package/client/index.js

@@ -1,52 +0,0 @@
-import HRPC from '../shared/spec/hrpc/index.js'
-import { isCodecSupported } from '../shared/codecs.js'
-import { spawn } from './cross-spawn/index.js'
-
-export class WorkerClient {
-  worker = null
-  rpc = null
-  opts = null
-
-  constructor (opts) {
-    this.initialize(opts)
-    this.#attachMethods()
-  }
-
-  initialize (opts) {
-    const sourcePath = 'node_modules/bare-media/worker/index.js'
-    this.opts = { sourcePath, ...opts }
-  }
-
-  #attachMethods () {
-    const methods = [
-      'createPreview',
-      'createPreviewAll',
-      'decodeImage'
-    ]
-
-    for (const method of methods) {
-      this[method] = async (...args) => {
-        await this.run()
-        return this.rpc[method](...args)
-      }
-    }
-  }
-
-  async run () {
-    if (this.worker !== null) {
-      return
-    }
-
-    this.worker = await spawn(this.opts)
-    const ipc = this.worker.IPC
-
-    ipc.on('end', () => ipc.end())
-    ipc.on('close', () => this.onClose?.())
-
-    this.rpc = new HRPC(ipc)
-  }
-
-  isCodecSupported (mimetype) {
-    return isCodecSupported(mimetype)
-  }
-}