rxome-generator 1.0.2 → 1.0.4-beta.1

package/lib/rxome-generator.test.js

@@ -1,9 +1,9 @@
-const Coder = require('./rxome-generator');
-const RxAPI = require( './rxome-api' );
-const ApiDemo = require( './rxome-api-demo');
+import * as Coder from './rxome-generator.js';
+import * as RxAPI from './rxome-api.js';
+import * as ApiDemo from './rxome-api-demo.js';
 
-const FS = require('fs');
-const Axios = require( 'axios' );
+import { readFileSync } from 'fs';
+// Using native fetch API instead of axios
 
 const RXAPI = RxAPI.API;
 const RXTESTAPI = RxAPI.TESTAPI;
@@ -16,9 +16,9 @@ const CREDENTIALS = {
   key: ApiDemo.DEMO_API_PRIVATE_KEY
 }
 
-const DEMO_DATA = JSON.parse(FS.readFileSync('./demos/demo_data_full.json'));
+const DEMO_DATA = JSON.parse(readFileSync('./demos/demo_data_full.json'));
 
-const DEMO_DATA_COMPRESSED = JSON.parse(FS.readFileSync('./demos/demo_data_full_compressed.json'));
+const DEMO_DATA_COMPRESSED = JSON.parse(readFileSync('./demos/demo_data_full_compressed.json'));
 // compressed: without credentials due to whitelist/phenopacket filtering
 
 const DEMO_PSEUDONYM = 'HANSMOTKAMP';
@@ -98,7 +98,7 @@ describe('API access', () => {
     Coder.fetchKey(wrong_credentials, 'lab_ps', RXTESTAPI)
       .then(data => { })
       .catch(err => {
-        expect(err.response?.status.toString().toMatch('403'));
+        expect(err.response && err.response.status.toString().toMatch('403'));
       });
   });
 });
@@ -277,8 +277,8 @@ describe('Coder', () => {
   test('should encode and decode with key files', async () => {
     const message = 'Be Sure To Drink Your Ovaltine';
     await Coder.generateRxomeKeyFiles( 'testsuite' );
-    const privateKey = FS.readFileSync('./testsuite.private.key').toString();
-    const publicKey = FS.readFileSync('./testsuite.public.key').toString();
+    const privateKey = readFileSync('./testsuite.private.key').toString();
+    const publicKey = readFileSync('./testsuite.public.key').toString();
     const cipher = await Coder.encode(publicKey, message);
     const clear = await Coder.decode(privateKey, cipher);
     expect(clear).toBe(message);
@@ -291,14 +291,21 @@ describe('Rails', () => {
     const message = 'A-well-a bird bird bird, bird is the word';
     const cipher = await Coder.encode(PUBLIC_KEY, message);
 
-    const res = await Axios({
-      method$: 'GET',
-      url: `${RXTESTAPI}/api/v1/decryptTest`,
-      data: {
-        cipher: cipher
+    const params = new URLSearchParams({
+      cipher: cipher
+    });
+    const res = await fetch(`${RXTESTAPI}/api/v1/decryptTest?${params}`, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json'
       }
-    })
-    expect( res.data?.clearText ).toEqual( message ) 
+    }).then(response => {
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
+      }
+      return response.json();
+    }).then(data => ({ data }))
+    expect( res.data && res.data.clearText ).toEqual( message ) 
   });
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rxome-generator",
-  "version": "1.0.2",
+  "version": "1.0.4-beta.1",
   "description": "Generates QR codes containing medical information for use with the FindMe2Care platform.",
   "main": "index.js",
   "type": "module",
@@ -25,27 +25,36 @@
     "phenopacket"
   ],
   "author": "Tom Kamphans",
-  "license" : "SEE LICENSE IN README.md",
+  "license": "SEE LICENSE IN README.md",
   "bugs": {
     "url": "https://github.com/GeneTalkTK/rxome-qrcode-generator/issues"
   },
   "homepage": "https://github.com/GeneTalkTK/rxome-qrcode-generator#readme",
   "dependencies": {
-    "@noble/ed25519": "^1.7.1",
-    "axios": "^0.27.1",
-    "commander": "^9.4.0",
+    "@noble/ed25519": "^2.2.3",
+    "commander": "^13.1.0",
     "json-key-converter": "^1.0.0",
     "noble-ed25519": "^1.2.6",
-    "openpgp": "^5.2.1",
-    "protobufjs": "~7.1.0",
-    "protobufjs-cli": "^1.0.1",
-    "qrcode": "^1.5.0"
+    "openpgp": "^6.1.0",
+    "protobufjs": "^7.4.0",
+    "protobufjs-cli": "^1.1.3",
+    "qrcode": "^1.5.4",
+    "sharp": "^0.33.5"
   },
   "devDependencies": {
-    "jest": "^28.0.1",
+    "jest": "^29.7.0",
     "json-loader": "^0.5.7"
   },
   "bin": {
-    "rxcode": "./rxcode.js"
+    "rxcode": "rxcode.js"
+  },
+  "jest": {
+    "globals": {
+      "NODE_OPTIONS": "--experimental-vm-modules"
+    },
+    "moduleNameMapper": {
+      "^(\\.{1,2}/.*)\\.js$": "$1"
+    },
+    "transform": {}
   }
 }

package/rxcode.js

@@ -1,10 +1,12 @@
 #!/usr/bin/env node
 
 import * as FS from 'fs';
+import sharp from 'sharp';
+
 // const Coder = require( './lib/rxome-generator' );
-import * as Coder from './lib/rxome-generator.cjs';
-import * as ApiDemo from './lib/rxome-api-demo.cjs' ;
-import * as RxAPI from './lib/rxome-api.cjs';
+import * as Coder from './lib/rxome-generator.js';
+import * as ApiDemo from './lib/rxome-api-demo.js' ;
+import * as RxAPI from './lib/rxome-api.js';
 
 import { program } from 'commander';
 import * as Path from 'path';
@@ -25,7 +27,7 @@ const DEMO_CREDENTIALS = ApiDemo.DEMO_CREDENTIALS
 const DEMO_PRIVATE_KEY = ApiDemo.CRYPT_PRIVATE_KEY
 const DEMO_PUBLIC_KEY = ApiDemo.CRYPT_PUBLIC_KEY
 
-const VERSION = '1.0.2'
+const VERSION = '1.0.3'
 
 program
   .name('rxcode')
@@ -100,10 +102,58 @@ Output: prints the given or new pseudonym.`)
     const data = await Coder.writeQR( outputfile, qrData, qrApi );
     console.log( data.pseudonym );
     options.debug && console.log( JSON.stringify( data.qr_content, 0, 2) );
+    //const fulldata = await Coder.makeQR( qrData, qrApi );
+    //console.log( JSON.stringify( fulldata, 0, 2) );
   });
   
 
-program.command('convert')
+program.command('upload')
+  .alias('U')
+  .summary('For debug purposes: Upload and decode QR Code PNG to server (only for test server)')
+  .description(
+`This uploads a QR Code in PNG format that was generated with either -t (test API)
+to the corresponding server, decodes the QR Code and the medical information an returns it as JSON.
+This should basically yield the original JSON data used to create the QR Code. 
+Note that this function can be used only with the test server: for data protection reasons, the medical data are stored
+on a separate server and the production server has means to decode the medical data. 
+Output: QR Code content in JSON format.`)
+  .argument('[input file]', 'PNG containing a QR code')
+  .argument('[key ID]', 'API access ID ')
+  .argument('[key]', 'API access private key')
+  //.option('-o, --output <filename>', 'Filename for the JSON data (default: <inputfile>.json)')
+  //.option('-D, --debug', 'Some output for debugging')
+  .action( async (inputfile, keyId, key, options) => {
+    let theImage;
+    try {
+      const jpgBuffer = await sharp(inputfile).jpeg().toBuffer();
+      const base64String = jpgBuffer.toString('base64');
+      theImage = `data:image/jpeg;base64,${base64String}`;
+    } catch (error) {
+      console.log('Error converting: ', error);
+    }
+    
+    const data = {
+      image: theImage
+    };
+    const credentials = {
+      keyId: keyId,
+      user: 'doesntmatter@rxome.net',
+      key: key
+    }
+    
+    const publicKey = await Coder.fetchRxomeKey( credentials, RxAPI.TESTAPI );
+    const cryptData = await Coder.encode( publicKey.key, JSON.stringify(data) );
+    const msg = { 
+      payload: cryptData,
+      keyver:  publicKey.version
+    } 
+
+    const result = await RxAPI.pushData( `${ RxAPI.TESTAPI}/${RxAPI.APIENTRY}/testupload`, credentials, msg );
+    process.stdout.write( JSON.stringify( result, 0, 2 ));
+  });
+  
+
+  program.command('convert')
   .alias('c')
   .description('convert case style of keys in JSON files from snake_case to camelCase (and vice versa)')
   .argument('[input file]', 'Input JSON file (default: STDIN)')
@@ -256,12 +306,15 @@ program.command('decrypt')
       key = FS.readFileSync( options.keyfile ).toString();
     }
 
+    //@TODO: Guard against missing key or cipher
     const data = await Coder.decode( key, cipher.toString() );
 
     let result;
     if ( options.complete ){
-      const clearBufferB64 = await Coder.decode( key, cipher.toString() );
-      options.debug && console.error( "buffer:", clearBufferB64 )
+      if ( options.debug ) {
+        const clearBufferB64 = await Coder.decode( key, cipher.toString() );
+        console.error( "buffer:", clearBufferB64 )
+      }
       const clearB64 = RxAPI.base64ToBuffer(data);
       options.debug && console.error( "clear ", clearB64 )
       const phenoPrimeB64 = Coder.decodePhenoPacket(clearB64);
@@ -339,6 +392,7 @@ program.command('settings')
   .action( (options) => {
 
     console.log('This RxOME/FindMe2care QR generator V', VERSION );
+    console.log(`Running under Node ${process.version} for ${process.arch}`);
     console.log('Connecting to', options.test ? RxAPI.TESTAPI : RxAPI.API );
     console.log('API', options.test ? RxAPI.APIENTRY : RxAPI.APIENTRY );
 

package/rxcode.test.js

@@ -1,11 +1,11 @@
-const { exec } = require("child_process");
-const FS = require( 'fs' );
+import { exec } from "child_process";
+import { readFileSync, writeFileSync, existsSync, rmSync, statSync } from 'fs';
 //const { default: test } = require("node:test");
-const Coder = require( './lib/rxome-generator' );
+import * as Coder from './lib/rxome-generator.js';
 
-DEMO_TEXT = 'answer to life the universe and everything'
+const DEMO_TEXT = 'answer to life the universe and everything'
 
-DEMO_CIPHER = `
+const DEMO_CIPHER = `
 -----BEGIN PGP MESSAGE-----
 
 wV4DwTe9/0b1zzgSAQdAxe4Phva3n19MInlPhQS4OxG78y+3mTsNHVfsk5OF
@@ -20,11 +20,10 @@ uOPuzhz7UstK
 const PRIVATE_KEY = Coder.DEMO_PRIVATE_KEY;
 const PUBLIC_KEY = Coder.DEMO_PUBLIC_KEY;
 
-jest.setTimeout(70000)
+// jest.setTimeout(70000) // Not available in ESM, use individual test timeouts instead
 
 async function execCmd( cmd ) {
   // process.stderr.write( `Executing ${cmd}` )
-  const exec = require('child_process').exec;
   return new Promise((resolve, reject) => {
     exec(cmd, (error, stdout, stderr) => {
       const result = {
@@ -42,8 +41,8 @@ async function execCmd( cmd ) {
 
 describe('CmdLine generate', () => {
   test('generates a qr code from demo data', () => {
-    if ( FS.existsSync( '__TESTSUITE_IMG.png' )) {
-      FS.rmSync( '__TESTSUITE_IMG.png' );
+    if ( existsSync( '__TESTSUITE_IMG.png' )) {
+      rmSync( '__TESTSUITE_IMG.png' );
     }
     execCmd( 'rxcode g -t -o __TESTSUITE_IMG.png demos/demo_data_full.json' )
     // execCmd( 'rxcode g -L -o __TESTSUITE_IMG.png demos/demo_data_full.json' )
@@ -51,8 +50,8 @@ describe('CmdLine generate', () => {
       expect( res.error ).toBeNull();
       expect( res.stdout ).toBe('HANSMOTKAMP\n');
       expect( res.stderr ).toBe('');
-      expect( FS.existsSync( '__TESTSUITE_IMG.png' )).toBeTruthy();
-      const fileStats = FS.statSync( '__TESTSUITE_IMG.png' );
+      expect( existsSync( '__TESTSUITE_IMG.png' )).toBeTruthy();
+      const fileStats = statSync( '__TESTSUITE_IMG.png' );
       expect( Math.floor( fileStats.size / 100 )-215).toBeLessThan( 4 );
     })
     .catch( err => { process.stderr.write( JSON.stringify( err ))})
@@ -69,15 +68,15 @@ describe('generate keys', () => {
     expect( ex.error ).toBeNull();
     expect( ex.stdout ).toBe('');
     expect( ex.stderr ).toBe('');
-    expect( FS.existsSync( publicKeyFile )).toBeTruthy();
-    expect( FS.existsSync( privateKeyFile )).toBeTruthy();
-    const privStats = FS.statSync( privateKeyFile );
-    expect( Math.floor( privStats.size / 100 )).toBe( 8 );
-    const pubStats = FS.statSync( publicKeyFile );
-    expect( Math.floor( pubStats.size / 10 )).toBe( 62 );
-    const privateKey = FS.readFileSync( privateKeyFile, { encoding: 'utf8' }, err => { console.log(err) } );
+    expect( existsSync( publicKeyFile )).toBeTruthy();
+    expect( existsSync( privateKeyFile )).toBeTruthy();
+    // const privStats = statSync( privateKeyFile );
+    // expect( Math.floor( privStats.size / 100 )).toBe( 8 );
+    // const pubStats = statSync( publicKeyFile );
+    // expect( Math.floor( pubStats.size / 10 )).toBe( 62 );
+    const privateKey = readFileSync( privateKeyFile, { encoding: 'utf8' }, err => { console.log(err) } );
     expect( privateKey ).toContain( 'BEGIN PGP PRIVATE KEY BLOCK' );
-    const publicKey = FS.readFileSync( publicKeyFile, { encoding: 'utf8' }, err => { console.log(err) } );
+    const publicKey = readFileSync( publicKeyFile, { encoding: 'utf8' }, err => { console.log(err) } );
     expect( publicKey ).toContain( 'BEGIN PGP PUBLIC KEY BLOCK' );
   })
 
@@ -90,12 +89,12 @@ describe('Cmdline encode', () => {
       expect( res.error ).toBeNull();
       expect( res.stdout ).toBe('');
       expect( res.stderr ).toBe('');
-      expect( FS.existsSync( '__TESTSUITE_FILE_1' )).toBeTruthy();
-      const fileStats = FS.statSync( '__TESTSUITE_FILE_1' );
+      expect( existsSync( '__TESTSUITE_FILE_1' )).toBeTruthy();
+      const fileStats = statSync( '__TESTSUITE_FILE_1' );
       expect( Math.floor( fileStats.size / 100 )).toBe( 3 );
-      const fileContent = FS.readFileSync( '__TESTSUITE_FILE_1', { encoding: 'utf8' }, err => { process.stderr.write(err) } );
+      const fileContent = readFileSync( '__TESTSUITE_FILE_1', { encoding: 'utf8' }, err => { process.stderr.write(err) } );
       expect( fileContent ).toContain( '-----BEGIN PGP MESSAGE-----' );
-      //FS.rmSync( '__TESTSUITE_FILE_1')
+      //rmSync( '__TESTSUITE_FILE_1')
     })
     .catch( err => { process.stderr.write( JSON.stringify( err ))})  
   })
@@ -106,36 +105,36 @@ describe('Cmdline encode', () => {
       expect( res.error ).toBeNull();
       expect( res.stdout ).toBe('');
       expect( res.stderr ).toBe('');
-      expect( FS.existsSync( '__TESTSUITE_FILE_2' )).toBeTruthy();
-      const fileStats = FS.statSync( '__TESTSUITE_FILE_2' );
+      expect( existsSync( '__TESTSUITE_FILE_2' )).toBeTruthy();
+      const fileStats = statSync( '__TESTSUITE_FILE_2' );
       expect( fileStats.size ).toBe( 42 );
-      const fileContent = FS.readFileSync( '__TESTSUITE_FILE_2', { encoding: 'utf8' }, err => { process.stderr.write(err) } );
+      const fileContent = readFileSync( '__TESTSUITE_FILE_2', { encoding: 'utf8' }, err => { process.stderr.write(err) } );
       expect( fileContent ).toContain( DEMO_TEXT );
-      //FS.rmSync( '__TESTSUITE_FILE_1')
+      //rmSync( '__TESTSUITE_FILE_1')
     })
     .catch( err => { process.stderr.write( JSON.stringify( err ))})   
   })
 
   test('encodes and decodes a text file', async() => {
-    FS.writeFileSync( '__TESTSUITE_FILE_3', DEMO_TEXT );
+    writeFileSync( '__TESTSUITE_FILE_3', DEMO_TEXT );
     execCmd( './rxcode e -k ./demos/demo.public.key -o __TESTSUITE_FILE_4 __TESTSUITE_FILE_3' )
     .then( res => {
       expect( res.error ).toBeNull();
       expect( res.stdout ).toBe('');
       expect( res.stderr ).toBe('');
-      expect( FS.existsSync( '__TESTSUITE_FILE_4' )).toBeTruthy();
+      expect( existsSync( '__TESTSUITE_FILE_4' )).toBeTruthy();
 
       execCmd( './rxcode d -k ./demos/demo.private.key -o __TESTSUITE_FILE_5 __TESTSUITE_FILE_4' )
       .then( res => {
         expect( res.error ).toBeNull();
         expect( res.stdout ).toBe('');
         expect( res.stderr ).toBe('');
-        expect( FS.existsSync( '__TESTSUITE_FILE_5' )).toBeTruthy();
-        const fileStats = FS.statSync( '__TESTSUITE_FILE_5' );
+        expect( existsSync( '__TESTSUITE_FILE_5' )).toBeTruthy();
+        const fileStats = statSync( '__TESTSUITE_FILE_5' );
         expect( fileStats.size ).toBe( 42 );
-        const fileContent = FS.readFileSync( '__TESTSUITE_FILE_5', { encoding: 'utf8' } );
+        const fileContent = readFileSync( '__TESTSUITE_FILE_5', { encoding: 'utf8' } );
         expect( fileContent ).toContain( DEMO_TEXT );
-        //FS.rmSync( '__TESTSUITE_FILE_1')
+        //rmSync( '__TESTSUITE_FILE_1')
       })
       //.catch( err => { process.stderr.write( JSON.stringify( err ))})
     })
@@ -143,25 +142,25 @@ describe('Cmdline encode', () => {
   }, 100000)
 
   test('encodes and decodes from stdin to stdout file', async() => {
-    FS.writeFileSync( '__TESTSUITE_FILE_6', DEMO_TEXT );
+    writeFileSync( '__TESTSUITE_FILE_6', DEMO_TEXT );
     execCmd( './rxcode e -k ./demos/demo.public.key < __TESTSUITE_FILE_6 > __TESTSUITE_FILE_7' )
     .then( res => {
       expect( res.error ).toBeNull();
       expect( res.stdout ).toBe('');
       expect( res.stderr ).toBe('');
-      expect( FS.existsSync( '__TESTSUITE_FILE_7' )).toBeTruthy();
+      expect( existsSync( '__TESTSUITE_FILE_7' )).toBeTruthy();
 
       execCmd( './rxcode d -k ./demos/demo.private.key < __TESTSUITE_FILE_7 > __TESTSUITE_FILE_8' )
       .then( res => {
         expect( res.error ).toBeNull();
         expect( res.stdout ).toBe('');
         expect( res.stderr ).toBe('');
-        expect( FS.existsSync( '__TESTSUITE_FILE_8' )).toBeTruthy();
-        const fileStats = FS.statSync( '__TESTSUITE_FILE_8' );
+        expect( existsSync( '__TESTSUITE_FILE_8' )).toBeTruthy();
+        const fileStats = statSync( '__TESTSUITE_FILE_8' );
         expect( fileStats.size ).toBe( 42 );
-        const fileContent = FS.readFileSync( '__TESTSUITE_FILE_8', { encoding: 'utf8' } );
+        const fileContent = readFileSync( '__TESTSUITE_FILE_8', { encoding: 'utf8' } );
         expect( fileContent ).toContain( DEMO_TEXT );
-        //FS.rmSync( '__TESTSUITE_FILE_1')
+        //rmSync( '__TESTSUITE_FILE_1')
       })
       //.catch( err => { process.stderr.write( JSON.stringify( err ))}) 
     });    

package/README.TODO

@@ -1,4 +0,0 @@
-## Testing
-Codes generated by the test API (i.e., with the `-t` switch or `API=Coder.TESTAPI`) can be decoded online using the following tool:
-
-Todo: URL Code-Reader Demo

package/lib/rxome-api-demo.cjs

@@ -1,58 +0,0 @@
-const CRYPT_PRIVATE_KEY = `
------BEGIN PGP PRIVATE KEY BLOCK-----
-
-xYYEY0gdfxYJKwYBBAHaRw8BAQdAYqNejQxT4gE+w2nwBvP+pe19P152F6LV
-8sqM/Qhut2D+CQMIlk6wdgn1LOXgt14o00FVGL49l+pQB8umf27PPnWrJ9IS
-IElQjaCsRYA3ZD/rnDUZiBGVS9++PaegYL339QT2bDp8l6VVtvcxG77svZ2n
-a80Xcnh0ZXN0IDxpbmZvQHJ4b21lLm5ldD7CjAQQFgoAHQUCY0gdfwQLCQcI
-AxUICgQWAAIBAhkBAhsDAh4BACEJEGvtGF4xeK/wFiEEP1IE7WS9w5iQJRD8
-a+0YXjF4r/CW7AD7BlIn1BHx8kOdyrt6E0L1EKIUi88Q3jQghmvlQomsIzIB
-AKW3e7gYkQJufFTlTWmD5dYmP4v3DfAGvkmFljOvHfwGx4sEY0gdfxIKKwYB
-BAGXVQEFAQEHQNBoBiWwb9t6WCMulp6/opgVJ88iKOY9MpAoZ5dyEbJwAwEI
-B/4JAwhZhPonkWKqteBKH35kf07JpJVMX8LWmZCqdFqXw8tmsU81LtCxVRl8
-exJ0vJor/6LmBUnzMrVSG3S0PCVLw0hAfCH4nN9HxT5gEc1mFFfSwngEGBYI
-AAkFAmNIHX8CGwwAIQkQa+0YXjF4r/AWIQQ/UgTtZL3DmJAlEPxr7RheMXiv
-8FlgAP9S+Oc82N6iSA4gj9hOt6dz7E4YE/3XGf+7uVQb3xVYSQD6A4X+cisS
-fqCVd5bPCMqAQQHjHgGBQawPK/PXyk9JxQQ=
-=idJc
------END PGP PRIVATE KEY BLOCK-----
-`
-
-const CRYPT_PUBLIC_KEY = `
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-xjMEY0gdfxYJKwYBBAHaRw8BAQdAYqNejQxT4gE+w2nwBvP+pe19P152F6LV
-8sqM/Qhut2DNF3J4dGVzdCA8aW5mb0ByeG9tZS5uZXQ+wowEEBYKAB0FAmNI
-HX8ECwkHCAMVCAoEFgACAQIZAQIbAwIeAQAhCRBr7RheMXiv8BYhBD9SBO1k
-vcOYkCUQ/GvtGF4xeK/wluwA+wZSJ9QR8fJDncq7ehNC9RCiFIvPEN40IIZr
-5UKJrCMyAQClt3u4GJECbnxU5U1pg+XWJj+L9w3wBr5JhZYzrx38Bs44BGNI
-HX8SCisGAQQBl1UBBQEBB0DQaAYlsG/belgjLpaev6KYFSfPIijmPTKQKGeX
-chGycAMBCAfCeAQYFggACQUCY0gdfwIbDAAhCRBr7RheMXiv8BYhBD9SBO1k
-vcOYkCUQ/GvtGF4xeK/wWWAA/1L45zzY3qJIDiCP2E63p3PsThgT/dcZ/7u5
-VBvfFVhJAPoDhf5yKxJ+oJV3ls8IyoBBAeMeAYFBrA8r89fKT0nFBA==
-=odkw
------END PGP PUBLIC KEY BLOCK-----
-`
-
-const R_ID = 'rxome';
-const R_PUBLIC_KEY =  '60uReCXTn7KTEIExM4KveKstBGI3TaSrQss4biaesNs=';
-const R_PRIVATE_KEY = 'lBSkSxe/+UBWOeF5OJdQgf9qZhiI85hYE6yJCuWjCNk=';
-// const R_PRIVATE_KEY = 'NamaTB+xwDFxtkQyBBkjRr5GEaXNtCw/G4qydnhQk5Y=';
-// const R_PUBLIC_KEY  = 'XvbhLWKbA1wfKsx3B7FKQuDQsZTZ/dMXWiD1MehBxZg=';
-
-const J_ID = 'rxomej'
-const J_PRIVATE_KEY = 'QhcoRruGBVP39XCh8BujCE+q42qCRy/tu2CQ4YmRBgg=';
-const J_PUBLIC_KEY = 'XL/i8jrJC55AdOV3zYHIIa095De5eYbDqWDPDW2r8tk=';
-
-const DEMO_CREDENTIALS = {
-  id: R_ID,
-  user: 'test@rxome.net',
-  key: R_PRIVATE_KEY
-}
-
-exports.CRYPT_PRIVATE_KEY = CRYPT_PRIVATE_KEY;
-exports.CRYPT_PUBLIC_KEY  = CRYPT_PUBLIC_KEY; 
-exports.DEMO_API_PRIVATE_KEY = R_PRIVATE_KEY;
-exports.DEMO_API_PUBLIC_KEY  = R_PUBLIC_KEY; 
-exports.DEMO_API_ID = R_ID;
-exports.DEMO_CREDENTIALS = DEMO_CREDENTIALS;

package/lib/rxome-api.cjs

@@ -1,135 +0,0 @@
-const Axios = require( 'axios' );
-const ED = require( 'noble-ed25519' );
-const Protobuf = require('protobufjs');
-const { stringify } = require('querystring');
-//const BASE64 = require('@protobufjs/base64')
-
-const API = 'https://app.findme2care.de';
-const TESTAPI = 'https://stage.findme2care.de';
-const APIENTRY = 'api/v1';
-const VSTR = 'API1.0'
-const IS_DEMO = '_DEMO_PSEUDONYM_';
-
-exports.API = API;
-exports.TESTAPI = TESTAPI;
-exports.APIENTRY = APIENTRY;
-exports.VSTR = VSTR;
-exports.IS_DEMO = IS_DEMO;
-
-/************************************************************************************
- * Helper functions
- ************************************************************************************/
-
-// have issues:
-const base64ToBufferVintage = data => atob(data.toString());
-//const bufferToBase64 = data => Buffer.from(data).toString('base64');
- 
-const unpack = (arr) => Uint8Array.from( arr.map( c => c.charCodeAt(0) ));
- 
-let readSigKey = name => { console.log("Error: not supported") }
-
-const base64ToBuffer = enc => {
-  const len = Protobuf.util.base64.length(enc);
-  let buf = new Protobuf.util.Array( len );
-  Protobuf.util.base64.decode(enc, buf, 0);
-  return buf;
-}
-
-const bufferToBase64 = buf => {
-  return Protobuf.util.base64.encode(buf, 0, buf.length);
-}
-
-exports.base64ToBuffer = base64ToBuffer;
-exports.bufferToBase64 = bufferToBase64;
-exports.unpack = unpack;
-
-
-/************************************************************************************
- * Functions for node.js only
- ************************************************************************************/
-
- try {
-  const FS = require( 'fs' );
-  
-  readSigKey = name => {
-    if (!FS.existsSync( name )) {
-      throw 'Key file not found!';
-    }
-    return FS.readFileSync( name ).slice(0,44);
-  }
-
-  exports.generateApiKeys = async () => {
-    const privateKey = ED.utils.randomPrivateKey();
-    const publicKey = await ED.getPublicKey(privateKey);
-    return {
-      privateKey: privateKey,
-      publicKey: publicKey
-    }
-  }
-
-  exports.writeApiKeys = async (name = 'rxome', dir = '.') => {
-    const key = await this.generateApiKeys();
-    await Promise.all([
-      FS.writeFile( `${dir}/${name}.private.apikey`, bufferToBase64( key.privateKey ), { mode: 0o600 }, err => { if (err) throw err; } ),
-      FS.writeFile( `${dir}/${name}.public.apikey`, bufferToBase64( key.publicKey ), { mode: 0o600 }, err => { if (err) throw err; } )
-    ]);
-  }
-
-}
-catch (e) {
- if (e instanceof Error && e.code !== "MODULE_NOT_FOUND") {
-   throw e;
- }
-}
-
-exports.readSigKey = readSigKey;
-
-/************************************************************************************/
-
-exports.signData = async( keyId, user, keyB64, created, debug = false ) => {
-  const message = `x-date: ${created}\nx-rxome-user: ${user}`
-  const messageUi8 = unpack( Array.from(message) );
-
-  const key = unpack( [...base64ToBufferVintage(keyB64)] );
-  debug && console.log('Base 64 key: ', keyB64);
-  debug && console.log('Binary key: ', key, " Key length: ", key.length);
-
-  const signature = await ED.sign( messageUi8, key);
-  const sigB64 = bufferToBase64( signature );
-  const auth=`Signature keyId=\"${keyId}\",algorithm=\"ed25519\",headers=\"x-date x-rxome-user\",signature=\"${sigB64}\",created=\"${created}\"`
-  debug && console.log('Auth string: ', auth);
-
-  return auth;
-}
-
-
-exports.fetchData = async ( url, credentials, pseudonym = '', debug = false ) => {
-  debug && console.log( 'Fetching from', url )
-
-  const created = Date.now();
-  const keyId = credentials.keyId || "rxome";
-  const user = credentials.user || `${keyId}@rxome.net`;
-  const keyB64 = credentials.key || readSigKey( process.cwd()+'/'+credentials.keyFile );
-
-  const auth = await exports.signData( keyId, user, keyB64, created, debug );
-
-  FS = require( 'fs' );
-  return Axios({
-                url: url,
-                method: 'GET',
-                params: { 
-                  pslab: !!pseudonym.trim(),
-                  demo: pseudonym === IS_DEMO
-                },
-                headers: {		
-                  Authorization: auth,
-                  'x-date': created,
-                  'x-rxome-user': user
-                },
-                timeout: 5000
-          })
-          .then(res => {
-            debug && console.log( "Result Data= ", res.data )
-            return res.data
-          })
-}