pryv 2.1.8 → 2.1.9

package/README.md

@@ -343,7 +343,7 @@ or from a Buffer
 
 ```javascript
 const filePath = './test/my_image.png';
-const buggerData = fs.readFileSync(filePath);
+const bufferData = fs.readFileSync(filePath);
 
 const result = await connection.createEventWithFileFromBuffer(
   {
@@ -402,6 +402,21 @@ connect.createEventWithFormData(
     // handle result here
   }
 );
+
+// -- alternative with a filename
+
+connect.createEventWithFileFromBuffer(
+  {
+    type: 'file/attached',
+    streamId: 'data'
+  },
+  blob, 'filename.txt')  // here we can directly use the blob
+  .then(function (res, err) {
+    // handle result here
+  }
+);
+
+
 ```
 
 ### High Frequency Events 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pryv",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "homepage": "https://github.com/pryv/lib-js",
   "description": "Pryv Javascript Library",
   "keywords": [
@@ -21,7 +21,7 @@
   "scripts": {
     "setup": "./scripts/setup-environment-dev.sh",
     "build": "webpack --config webpack.config.js",
-    "doc": "node node_modules/jsdoc/jsdoc.js -c .jsdoc-conf.json",
+    "doc": "npx jsdoc -c .jsdoc-conf.json",
     "test": "mocha --reporter spec  test/**/*.test.js --timeout 3000",
     "test-debug": "mocha --inpect-brk=40000 --reporter spec  test/**/*.test.js ",
     "test:browser": "npm run build; ",
@@ -38,19 +38,19 @@
     }
   ],
   "dependencies": {
-    "superagent": "^5.2.2"
+    "superagent": "^6.1.0"
   },
   "devDependencies": {
-    "@pryv/lib-js-common": "git+https://github.com/pryv/lib-js-common.git#1.0.4",
+    "@pryv/lib-js-common": "github:pryv/lib-js-common#1.0.6",
     "@pryv/monitor": "^1.0.5",
     "@pryv/socket.io": "^1.0.5",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cuid": "^2.1.8",
-    "mocha": "^6.2.3",
+    "mocha": "^9.1.3",
     "node-fetch": "^2.6.0",
-    "nyc": "^14.1.1",
-    "rec-la": "latest",
+    "nyc": "^15.1.0",
+    "rec.la": "latest",
     "universal-url": "^2.0.0",
     "zombie": "^6.1.4"
   }

package/test/Connection.test.js

@@ -4,7 +4,13 @@ const testData = require('./test-data.js');
 let conn = null;
 const { URL, URLSearchParams } = require('universal-url');
 const cuid = require('cuid');
-const { readFileSync } = require('fs');
+
+const isNode = (typeof window === 'undefined');
+
+let readFileSync;
+if (isNode) { // node
+  readFileSync = require('fs').readFileSync;
+}
 
 describe('Connection', () => {
 
@@ -184,27 +190,12 @@ describe('Connection', () => {
   });
 
   describe('Attachements', () => {
-    it('Create event with attachment from file', async () => {
-      let res = null;
-
-      if (typeof window === 'undefined') { // node
-
-        res = await conn.createEventWithFile({
-          type: 'picture/attached',
-          streamId: 'data'
-        }, './test/Y.png');
-
-      } else { // browser
-        const formData = new FormData();
-        var blob = new Blob(['Hello'], { type: "text/txt" });
-        formData.append("webmasterfile", blob);
-
-        res = await conn.createEventWithFormData({
-          type: 'file/attached',
-          streamId: 'data'
-        }, formData);
-
-      }
+    it('Node Only: Create event with attachment from file', async function () {
+      if (!isNode) { this.skip(); }
+      const res = await conn.createEventWithFile({
+        type: 'picture/attached',
+        streamId: 'data'
+      }, './test/Y.png');
 
 
       should.exist(res);
@@ -216,38 +207,65 @@ describe('Connection', () => {
       res.event.attachments[0].fileName.should.equal('Y.png');
     });
 
-    it('Create event with attachment from Buffer', async () => {
-      const fileData = readFileSync('./test/Y.png');
-
-      let res = null;
-
-      if (typeof window === 'undefined') { // node
-
-        res = await conn.createEventWithFileFromBuffer({
+    it('Node Only: Create event with attachment from Buffer', async function () {
+      if (!isNode) { this.skip(); }
+    
+        const fileData = readFileSync('./test/Y.png');
+        const res = await conn.createEventWithFileFromBuffer({
           type: 'picture/attached',
           streamId: 'data'
         }, fileData, 'Y.png');
 
-      } else { // browser
-        const formData = new FormData();
-        var blob = new Blob(['Hello'], { type: "text/txt" });
-        formData.append("webmasterfile", blob);
+        should.exist(res);
+        should.exist(res.event);
+        should.exist(res.event.attachments);
+        res.event.attachments.length.should.equal(1);
+        res.event.attachments[0].size.should.equal(14798);
+        res.event.attachments[0].type.should.equal('image/png');
+        res.event.attachments[0].fileName.should.equal('Y.png');
+
+    });
 
-        res = await conn.createEventWithFormData({
-          type: 'file/attached',
+    it('Browser Only: Create event with attachment from Buffer', async function () {
+      if (isNode) { this.skip(); }
+      
+        const blob = new Blob(['Hello'], { type: "text/txt" });
+        const res = await conn.createEventWithFileFromBuffer({
+          type: 'picture/attached',
           streamId: 'data'
-        }, formData);
+        }, blob, 'Hello.txt');
+
+        should.exist(res);
+        should.exist(res.event);
+        console.log(res.event);
+        should.exist(res.event.attachments);
+        res.event.attachments.length.should.equal(1);
+        res.event.attachments[0].size.should.equal(5);
+        res.event.attachments[0].type.should.equal('text/txt');
+        res.event.attachments[0].fileName.should.equal('Hello.txt');
+        
+    });
+    
+    it('Browser Only: Create event with attachment formData', async function () {
+      if (isNode) { this.skip(); }
 
-      }
+      const formData = new FormData();
+      const blob = new Blob(['Hello'], { type: "text/txt" });
+      formData.append("webmasterfile", blob);
+
+      const res = await conn.createEventWithFormData({
+        type: 'file/attached',
+        streamId: 'data'
+      }, formData);
 
 
       should.exist(res);
       should.exist(res.event);
       should.exist(res.event.attachments);
       res.event.attachments.length.should.equal(1);
-      res.event.attachments[0].size.should.equal(14798);
-      res.event.attachments[0].type.should.equal('image/png');
-      res.event.attachments[0].fileName.should.equal('Y.png');
+      res.event.attachments[0].size.should.equal(5);
+      res.event.attachments[0].type.should.equal('text/txt');
+      res.event.attachments[0].fileName.should.equal('blob');
     });
 
 
@@ -340,14 +358,14 @@ describe('Connection', () => {
       });
 
       it('no-events ', async () => {
-        const queryParams = { fromTime: 0, toTime: now, tags: ['RANDOM-123'] };
+        const queryParams = { fromTime: 0, toTime: now, types: ['type/unexistent'] };
         function forEachEvent(event) { }
         const res = await conn.getEventsStreamed(queryParams, forEachEvent);
         expect(0).to.equal(res.eventsCount);
       });
 
       it('no-events includeDeletions', async () => {
-        const queryParams = { fromTime: 0, toTime: now, tags: ['RANDOM-123'], includeDeletions: true, modifiedSince: 0 };
+        const queryParams = { fromTime: 0, toTime: now, types: ['type/unexistent'], includeDeletions: true, modifiedSince: 0 };
         function forEachEvent(event) { }
         const res = await conn.getEventsStreamed(queryParams, forEachEvent);
         expect(0).to.equal(res.eventsCount);

package/test/test-data.js

@@ -61,9 +61,12 @@ async function prepare() {
       });
   }
   const apiEndpoint = serviceInfo.api.replace('{username}', username);
+  
   // login user
+  const headers = {};
+  if (typeof window === 'undefined') { headers.Origin = 'https://l.rec.la'; }; // node only
   const loginRes = await superagent.post(apiEndpoint + 'auth/login')
-    .set('Origin', 'https://l.rec.la')
+    .set(headers)
     .send({ username: username, password: username, appId: 'js-lib-test' });
 
   // create data stream

package/webpack.config.js

@@ -24,7 +24,7 @@ module.exports = [
 	{ // es5 version
 		mode: 'production',
 		entry: {
-			'pryv': ['core-js/stable', './src/index.js'],
+			'pryv': ['./src/index.js'],
 		},
 		output: {
 			filename: '[name].js',
@@ -38,7 +38,7 @@ module.exports = [
 	{ // es5 version including socket.io and monitors
 		mode: 'production',
 		entry: {
-			'pryv-socket.io-monitor': ['core-js/stable', './src/index-socket.io-monitor.js'],
+			'pryv-socket.io-monitor': ['./src/index-socket.io-monitor.js'],
 		},
 		output: {
 			filename: '[name].js',
@@ -47,7 +47,13 @@ module.exports = [
 			library: 'Pryv'
 		},
 		devtool: 'source-map',
-		module: webpackBabelConfig
+		module: webpackBabelConfig,
+    resolve: {
+      fallback: {
+          'fs': false,
+          'path': false,
+      },
+    }
 	},
 	{ // browser test suite (es6)
 		mode: 'development',
@@ -61,11 +67,17 @@ module.exports = [
 			library: 'browserTest'
 		},
 		plugins: [
-			new webpack.IgnorePlugin(/zombie/),
+			new webpack.IgnorePlugin({resourceRegExp: /zombie/}),
 			new CopyPlugin({ patterns: [
 				{ from: 'test/browser-tests.html' },
 			]})
 		],
 		devtool: 'source-map',
+    resolve: {
+      fallback: {
+          'fs': false,
+          'path': false,
+      },
+    }
 	}
 ];