bare-media 1.1.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,7 +40,7 @@ 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'

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.1.0",
+  "version": "1.1.1",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -23,10 +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": {
@@ -38,9 +39,9 @@
     "test-tmp": "^1.4.0"
   },
   "files": [
-    "client",
     "shared",
     "worker",
+    "client.js",
     "index.js"
   ],
   "standard": {

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,51 +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',
-      '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)
-  }
-}