geonix 1.10.0 → 1.10.4

package/.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     },
     "eslint.validate": [
         "javascript"

package/exports.js

@@ -38,4 +38,6 @@ export { connection, stopConnection } from './src/Connection.js'
 export { registry } from './src/Registry.js'
 export { Request, Subscribe, Publish } from './src/Request.js'
 export { RequestOptions } from './src/RequestOptions.js'
-export { picoid as randomID } from './src/Util.js'
+export { picoid as randomID } from './src/Util.js'
+
+export { stats as StreamStats } from './src/Stream.js'

package/index.d.ts

@@ -15,13 +15,39 @@ declare class Connection {
      */
     start(transport?: string): Promise<void>;
     monitorStatus(): Promise<void>;
+    /**
+     * Wait for the connection to be safely closed
+     */
     waitUntilClosed(): Promise<void>;
+    /**
+     * Wait for the connection to be fully established
+     */
     waitUntilReady(): Promise<void>;
-    publish(subject: any, json: any): Promise<void>;
-    publishRaw(subject: any, data: any): Promise<void>;
-    request(subject: any, json: any, options?: {
-        timeout: number;
-    }): Promise<unknown>;
+    /**
+     * Publish JSON
+     *
+     * @param {string} subject
+     * @param {object} json
+     * @returns void
+     */
+    publish(subject: string, json: object): Promise<void>;
+    /**
+     * Publish RAW
+     *
+     * @param {string} subject
+     * @param {string | Buffer} data
+     * @returns void
+     */
+    publishRaw(subject: string, data: string | Buffer): Promise<void>;
+    /**
+     * Request/Reply pattern on top of pub/sub
+     *
+     * @param {string} subject
+     * @param {object} json
+     * @param {object} options
+     * @returns any
+     */
+    request(subject: string, json: object, options?: object): Promise<unknown>;
     subscribe(subject: any, options: any): Promise<any>;
     unsubscribe(subscription: any): Promise<void>;
     /**
@@ -38,18 +64,15 @@ export class Gateway {
     static start(): Gateway;
     #private;
 }
-/// <reference types="node" />
 export const registry: Registry;
 /**
  * Registry maintains a local list of available services and their versions.
  */
-declare class Registry extends EventEmitter {
-    constructor();
+declare class Registry {
     getEntries(): {};
     getIdentifier(service: any, version: any, id: any): any;
     #private;
 }
-import EventEmitter from "events";
 export {};
 export function Remote(service: string, ...context: (string | Stream | Object)[]): string | Stream | Object;
 /**
@@ -89,14 +112,14 @@ export class Service {
     SYS_getEnv(): Promise<{
         geonix: string;
         node: {
-            version: string;
-            platform: NodeJS.Platform;
-            arch: NodeJS.Architecture;
+            version: any;
+            platform: any;
+            arch: any;
         };
-        env: NodeJS.ProcessEnv;
-        mem: NodeJS.MemoryUsage;
-        rss: number;
-        cpu: NodeJS.CpuUsage;
+        env: any;
+        mem: any;
+        rss: any;
+        cpu: any;
     }>;
     #private;
 }
@@ -107,15 +130,12 @@ export class Service {
  * @param {*} automated
  * @returns
  */
-export function Stream(data: any): {
-    $: string;
-    id: string;
-};
+export function Stream(data: any, tag?: string): any;
 export function isStream(object: any): any;
-export function getReadable(object: any): Promise<Readable | null>;
-export function streamToBuffer(object: any): Promise<Buffer>;
-export function streamToString(object: any): Promise<string>;
-import { Readable } from "stream";
+export function getReadable(object: any): Promise<any>;
+export function streamToBuffer(object: any): Promise<any>;
+export function streamToString(object: any): Promise<any>;
+export const stats: {};
 /**
  * Parse nats:// URL
  * @param {string} url
@@ -123,13 +143,13 @@ import { Readable } from "stream";
  */
 export function parseURL(url: string): {
     servers: string;
-    user: string;
-    pass: string;
-    token: string | undefined;
+    user: any;
+    pass: any;
+    token: any;
 };
 export function sleep(delay: number): Promise<any>;
-export function picoid(size?: number): string;
-export function hash(data: string | Buffer): string;
+export function picoid(size?: number): any;
+export function hash(data: string | Buffer): any;
 export function createServerAtPort(port: number, pkg: Object, handler: Function): Promise<any>;
 export function createServerAtFreePort(pkg: Object, handler: Function, start?: number, poolSize?: number): Promise<any>;
 export function createTCPServer(handler: Function, start?: number, poolSize?: number): Promise<any>;
@@ -139,14 +159,13 @@ export function getFunctionParams(fn: any): any;
 export function proxyHttp(target: any, req: any, res: any): Promise<any>;
 export function OverlayObject(object: any, overlay: any): any;
 export const GeonixVersion: string;
-export function StreamChunker(chunkSize?: number): Transform;
-import { Transform } from "stream";
+export function StreamChunker(chunkSize?: number): any;
 export const HEALTH_CHECK_ENDPOINT: "/pA4vY7fT9oG5aI8cA4yV3qW5fP9qR1vI";
 export function ServeStatic(root: any, options?: {}): any;
 export const webserver: WebServer;
 declare class WebServer {
     start(): Promise<void>;
-    getAddresses(): string[];
+    getAddresses(): any[];
     getPort(): any;
     router(): any;
     waitUntilReady(): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "geonix",
-    "version": "1.10.0",
+    "version": "1.10.4",
     "type": "module",
     "description": "",
     "bin": {

package/src/Stream.js

@@ -4,6 +4,8 @@ import { picoid, StreamChunker } from './Util.js'
 
 const CHUNK_SIZE = 1024 * 128
 
+export const stats = {}
+
 /**
  * Converts data to stream
  * 
@@ -11,7 +13,7 @@ const CHUNK_SIZE = 1024 * 128
  * @param {*} automated 
  * @returns 
  */
-export function Stream(data) {
+export function Stream(data, tag = '_') {
     if (isStream(data))
         return data
 
@@ -27,13 +29,18 @@ export function Stream(data) {
     readable.pipe(transform)
     readable = transform
 
+    stats[tag] = stats[tag] !== undefined ? stats[tag] + 1 : 1
+
     const controlHandler = async () => {
         const control = await connection.subscribe(`gx2.stream.${id}.a`, { max: 1 })
 
         for await (const event of control)
             if (event.data.length === 0) {
                 readable.on('data', chunk => connection.publishRaw(`gx2.stream.${id}.b`, chunk))
-                readable.on('close', () => connection.publishRaw(`gx2.stream.${id}.b`))
+                readable.on('close', () => {
+                    connection.publishRaw(`gx2.stream.${id}.b`)
+                    stats[tag]--
+                })
             }
     }
 
@@ -48,7 +55,7 @@ export function isStream(object) {
 
 export async function getReadable(object) {
     if (!isStream(object))
-        return null
+        return object
 
     const readable = new Readable({ read: () => null })
     const subscription = await connection.subscribe(`gx2.stream.${object.id}.b`)