geonix 1.9.0 → 1.10.3

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/package.json

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

package/src/Service.js

@@ -70,6 +70,12 @@ export class Service {
             a: webserver.getAddresses().map(address => `${address}:${webserver.getPort()}`)
         }
 
+        // check if method takes context as first argument
+        for (let methodName of this.#me.m) {
+            const method = this[methodName]
+            method.takesContext = method.toString()?.match(/\((?<args>.*)\)/)?.groups?.args.startsWith('$')
+        }
+
         this.#beacon()
         this.#queueListener()
         this.#directListener()
@@ -193,8 +199,11 @@ export class Service {
             return respond({ e: `unknown method (${this.#me.n}.${methodName})` })
 
         try {
-            const methodContext = { context, caller, me: this.#me }
-            respond({ r: await method.apply(OverlayObject(this, methodContext), _args) })
+            // inject context as first argument
+            if (method.takesContext)
+                _args = [OverlayObject(context, { caller, me: this.#me }), ..._args]
+
+            respond({ r: await method.apply(this, _args) })
         } catch (e) {
             respond({ e: `${EOL}${ERROR_BEGIN_DELIMITER} ${this.#me.n}${EOL}${e.stack}${EOL}${ERROR_END_DELIMITER}` })
         }

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]--
+                })
             }
     }
 

package/test/.env

@@ -1 +0,0 @@
-TRANSPORT=nats://phobos.tria.hr:4222

package/test/inheritance.js

@@ -1,60 +0,0 @@
-import { Service, Remote } from 'geonix'
-
-const calc = Remote('Calculator')
-const tp = Remote('TimeProvider')
-
-class Logger {
-
-    constructor(prefix) {
-        this.prefix = prefix
-    }
-
-    log(...args) {
-        console.log(`${new Date().toISOString()}|${this.prefix}|`, ...args)
-    }
-}
-
-class BaseService extends Service {
-
-    logger = new Logger(this.constructor.name)
-
-}
-
-
-class CalculatorRepository {
-
-    constructor(service) {
-        this.logger = service.logger
-    }
-
-    async getCurrentTime() {
-        this.logger.log('getCurrentTime')
-        return await Remote('TimeProvider').now()
-    }
-
-}
-
-class Calculator extends BaseService {
-
-    repo = new CalculatorRepository(this)
-
-    async onStart() {
-        this.logger.log('current time =', await this.repo.getCurrentTime())
-    }
-
-    thisHere() {
-
-    }
-
-}
-
-class TimeProvider extends BaseService {
-
-    now() {
-        return new Date().toISOString()
-    }
-
-}
-
-Calculator.start()
-TimeProvider.start()

package/test/package.json

@@ -1,18 +0,0 @@
-{
-    "name": "test",
-    "version": "1.0.0",
-    "description": "",
-    "type": "module",
-    "main": "stream.js",
-    "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1"
-    },
-    "keywords": [],
-    "author": "",
-    "license": "ISC",
-    "dependencies": {
-        "dotenv": "^16.3.1",
-        "geonix": "file:..",
-        "nats": "^2.16.0"
-    }
-}

package/test/private.js

@@ -1,31 +0,0 @@
-export const OverlayObject = (object, overlay) => {
-    return new Proxy(object, {
-        get: (t, p) => overlay[p] !== undefined ? overlay[p] : t[p]
-    }
-    )
-}
-
-class Test {
-
-    #me = { works: true }
-
-    get me() { return this.#me }
-
-    external() {
-        return this.me
-    }
-
-    call(method) {
-        try {
-            const methodContext = { context: 'this is context value' }
-            const $context = OverlayObject(this, methodContext)
-            return instance[method].apply($context)
-        } catch (e) {
-        }
-    }
-
-}
-
-const instance = new Test()
-
-console.log(instance.call('external'))

package/test/registration.js

@@ -1,36 +0,0 @@
-import { Service, Remote, registry } from '../exports.js'
-import { sleep } from '../src/Util.js'
-
-class BaseService extends Service {
-
-    static start(options = {}) {
-        super.start({
-            ...options,
-            handlers: {
-                before: [
-                    (req, res, next) => {
-                        console.log('before')
-                        next()
-                    }
-                ],
-                after: [(error, req, res, next) => {
-                    if (error) {
-                        res.send({ status: 'rawr', error: error.message })
-                    }
-                }]
-            }
-        })
-    }
-
-}
-
-class First extends BaseService {
-
-    'GET /wow'(req, res) {
-        throw Error('wow')
-    }
-
-}
-
-
-First.start()

package/test/shitstorm.js

@@ -1,43 +0,0 @@
-import { readFile } from 'fs/promises';
-import { Service, Stream, getReadable } from '../exports.js';
-
-process.env.LOCAL_PORT = 1234
-
-class DownloadServiceDebuggingSession extends Service {
-
-    #transferCounter = 1
-
-    onStart() {
-        console.log("Starting service...");
-    }
-
-    'GET /api/download/local' = [
-        async (_, res) => {
-            const id = this.#transferCounter++
-
-            console.log(`transfer=${id} begin`)
-            const result = await this.getLocalFile()
-            console.log(`transfer=${id} stream=${JSON.stringify(result)}`)
-            const stream = await getReadable(result)
-            console.log(`transfer=${id}`)
-            stream.pipe(res)
-
-            let counter = 0;
-            stream.on('data', (chunk) => {
-                counter += chunk.length
-                // console.log(`transfer=${id} sent=${(counter / 1024 / 1024).toFixed(2).padStart()}`)
-            })
-
-            stream.on('end', () => {
-                console.log(`transfer=${id} end`)
-            })
-        }
-    ]
-
-    getLocalFile = async () => {
-        const buffer = await readFile("./test150.txt")
-        return Stream(buffer)
-    }
-}
-
-DownloadServiceDebuggingSession.start()

package/test/stream.js

@@ -1,38 +0,0 @@
-import { randomBytes } from 'node:crypto'
-import { Stream, getReadable, connection } from 'geonix'
-import { createWriteStream, readFileSync } from 'node:fs'
-import { createHash } from 'node:crypto'
-import { pipeline } from 'node:stream/promises'
-
-await connection.waitUntilReady()
-
-const hash = data => createHash('sha512').update(data).digest('base64')
-
-const PAYLOAD_SIZE = 1024 * 1024 * 10
-const TEMP_FILE = '/tmp/geonix.stream_test'
-
-console.time('test')
-try {
-    const payload = randomBytes(PAYLOAD_SIZE)
-    const sourceHash = hash(payload)
-
-    const source = await getReadable(Stream(payload))
-    const dest = createWriteStream(TEMP_FILE)
-
-    await pipeline(source, dest)
-
-    const check = readFileSync(TEMP_FILE)
-    const destHash = hash(check)
-
-    if (sourceHash == destHash) {
-        console.log('MATCH')
-    } else {
-        console.error('Destination does not match the source!')
-        console.log(payload)
-        console.log(check)
-    }
-} catch (e) {
-    console.error(e)
-} finally {
-    console.timeEnd('test')
-}

package/test/stream2.js

@@ -1,42 +0,0 @@
-import 'dotenv/config'
-import { randomBytes } from 'node:crypto'
-import { Stream, Remote, getReadable, connection, Service, streamToBuffer } from 'geonix'
-import { createWriteStream, readFileSync } from 'node:fs'
-import { createHash } from 'node:crypto'
-import { pipeline } from 'node:stream/promises'
-
-const hash = data => createHash('sha256').update(data).digest('base64')
-const self = Remote('StreamTest')
-
-class StreamTest extends Service {
-
-    async onStart() {
-        const perform = async (n) => {
-            const fileName = `${n}.random`
-            const { checksum, stream } = await self.readFile(fileName)
-            const data = await streamToBuffer(stream)
-            const verification = hash(data)
-
-            console.log(`${fileName} - ${data.length} bytes - ${checksum === verification}`)
-        }
-
-        const jobs = []
-        for (let n = 0; n < 1024; n++)
-            jobs.push(perform(n))
-
-        await Promise.all(jobs)
-
-        console.log('done')
-    }
-
-    async readFile(fileName, size = 1024 * Math.round(Math.random() * 1024)) {
-        const bytes = randomBytes(size)
-        const checksum = hash(bytes)
-
-        return { checksum, stream: Stream(bytes) }
-    }
-
-
-}
-
-StreamTest.start()