Remove detector

Author: bennetthardwick

examples/yolov3-tiny.js

@@ -6,6 +6,14 @@ const darknet = new Darknet({
     namefile: 'coco.names'
 });
 
-console.log("Dog:", darknet.detect('./dog.jpg'));
-console.log("Eagle:", darknet.detect('./eagle.jpg'));
-console.log("Giraffe:", darknet.detect('./giraffe.jpg'));
+darknet.detectAsync('./dog.jpg')
+    .then(console.log);
+
+
+setTimeout(() => {darknet.detectAsync('./dog.jpg')
+    .then(console.log)}, 5000);
+
+
+// console.log("Dog:", darknet.detect('./dog.jpg'));
+// console.log("Eagle:", darknet.detect('./eagle.jpg'));
+// console.log("Giraffe:", darknet.detect('./giraffe.jpg'));

lib/darknet.ts

@@ -1,7 +1,7 @@
 import * as ffi from 'ffi';
 import * as ref from 'ref';
 import * as Struct from 'ref-struct';
-import { readFileSync } from 'fs';
+import {readFileSync} from 'fs';
 
 
 const char_pointer = ref.refType('char');
@@ -68,15 +68,15 @@ export class DarknetBase {
         this.meta.names = this.names.join('\n');
 
         this.darknet = ffi.Library(library, {
-            'float_to_image': [ IMAGE, [ 'int', 'int', 'int', float_pointer ]],
-            'load_image_color': [ IMAGE, [ 'string', 'int', 'int' ]],
-            'network_predict_image': [ float_pointer, [ 'pointer', IMAGE ]],
-            'get_network_boxes': [ detection_pointer, [ 'pointer', 'int', 'int', 'float', 'float', int_pointer, 'int', int_pointer ]],
-            'do_nms_obj': [ 'void', [ detection_pointer, 'int', 'int', 'float' ]],
-            'free_image': [ 'void', [ IMAGE ]],
-            'free_detections': [ 'void', [ detection_pointer, 'int' ]],
-            'load_network': [ 'pointer', [ 'string', 'string', 'int' ]],
-            'get_metadata': [ METADATA, [ 'string' ]],
+            'float_to_image': [IMAGE, ['int', 'int', 'int', float_pointer]],
+            'load_image_color': [IMAGE, ['string', 'int', 'int']],
+            'network_predict_image': [float_pointer, ['pointer', IMAGE]],
+            'get_network_boxes': [detection_pointer, ['pointer', 'int', 'int', 'float', 'float', int_pointer, 'int', int_pointer]],
+            'do_nms_obj': ['void', [detection_pointer, 'int', 'int', 'float']],
+            'free_image': ['void', [IMAGE]],
+            'free_detections': ['void', [detection_pointer, 'int']],
+            'load_network': ['pointer', ['string', 'string', 'int']],
+            'get_metadata': [METADATA, ['string']],
         });
 
         this.net = this.darknet.load_network(config.config, config.weights, 0);
@@ -361,6 +361,7 @@ export interface IDarknetConfig {
     config: string;
     names?: string[];
     namefile?: string;
+    processes?: number;
 }
 
 export interface Detection {
@@ -374,5 +375,92 @@ export interface Detection {
     };
 }
 
-export { Darknet } from './detector';
-export { Darknet as DarknetExperimental } from './detector';
+import {zip, Subject} from 'rxjs';
+import {filter, take} from 'rxjs/operators';
+import {generate} from 'shortid';
+
+interface IDetectMe {
+    id: string;
+    image: string | IBufferImage
+    options?: IConfig
+}
+
+interface IDetection {
+    id: string;
+    detections: Detection[]
+}
+
+export class Darknet {
+
+    private images$ = new Subject<IDetectMe>();
+    private completion$ = new Subject();
+    private detection$ = new Subject<IDetection>();
+
+    private processes: DarknetBase[];
+
+    constructor(config: IDarknetConfig) {
+        const count = Math.min(config.processes || 1, 1);
+
+        this.processes = new Array(count).fill(() => (
+            new Darknet(config)
+        )).map(a => a());
+
+
+        this.subscribeToDetections();
+        this.completion$.next();
+    }
+
+    private async doAsyncDetection(darknet: DarknetBase, image: string | IBufferImage, config?: IConfig): Promise<Detection[]> {
+        if (!config) config = {};
+        let thresh = (config.thresh) ? config.thresh : 0.5;
+        let hier_thresh = (config.hier_thresh) ? config.hier_thresh : 0.5;
+        let nms = (config.nms) ? config.nms : 0.5;
+
+        const darkNetLoadedImage = typeof image === 'string';
+
+        const imageData = typeof image === 'string' ?
+            await darknet.getImageFromPathAsync(image) :
+            await darknet.RGBBufferToImageAsync(image.b, image.w, image.h, image.c);
+
+        const detection = await darknet['_detectAsync'](darknet.net, darknet.meta, imageData, thresh, hier_thresh, nms);
+
+        if (darkNetLoadedImage) {
+            // memory is owned by the darknet lib
+            await new Promise((res, rej) =>
+                darknet.darknet.free_image.async(imageData, (e: any) => e ? rej(e) : res())
+            );
+        } else {
+            // memory is owned by JS and will GC eventually
+        }
+        return detection;
+    }
+
+    private subscribeToDetections() {
+        zip(this.images$, this.completion$)
+            .subscribe(x => {
+                this.doAsyncDetection(x[0].image)
+                    .then(dets => {
+                        this.completion$.next();
+                        this.detection$.next({
+                            id: x[0].id,
+                            detections: dets
+                        });
+                    }).catch(er => console.log(er));
+            })
+    }
+
+    detectAsync(image: string | IBufferImage, options?: IConfig): Promise<Detection[]> {
+        const id = generate();
+        this.images$.next({id, image, options});
+        return new Promise(resolve => {
+            this.detection$
+                .pipe(
+                    filter(det => det.id === id),
+                    take(1),
+                ).subscribe(det => resolve(det.detections));
+        });
+    }
+
+}
+
+export const DarknetExperiment = Darknet;