particle-api-js 10.0.0 → 10.2.0

package/test/Agent.integration.js

@@ -21,9 +21,8 @@
  * Tests for real the Agent class using an external service.
  */
 
-import { expect } from './test-setup';
-import Agent from '../src/Agent';
-
+const { expect } = require('./test-setup');
+const Agent = require('../src/Agent');
 
 describe('Agent', () => {
 	if (!process.env.SKIP_AGENT_TEST){

package/test/Agent.spec.js

@@ -1,5 +1,5 @@
-import { sinon, expect } from './test-setup';
-import Agent from '../src/Agent.js';
+const { sinon, expect } = require('./test-setup');
+const Agent = require('../src/Agent.js');
 
 describe('Agent', () => {
 	beforeEach(() => {

package/test/Client.spec.js

@@ -1,7 +1,7 @@
-import { expect, sinon } from './test-setup';
-import Client from '../src/Client';
-import * as fixtures from './fixtures';
-import Library from '../src/Library';
+const { expect, sinon } = require('./test-setup');
+const Client = require('../src/Client');
+const fixtures = require('./fixtures');
+const Library = require('../src/Library');
 
 let api;
 const token = 'tok';
@@ -25,7 +25,7 @@ describe('Client', () => {
 
 	describe('libraries', () => {
 		it('resolves to a list of Library objects', () => {
-			api.listLibraries = () => Promise.resolve({ body: fixtures.readJSON('libraries.json') });
+			api.listLibraries = () => Promise.resolve({ body: fixtures.read('libraries.json') });
 			return client.libraries().then(libraries => {
 				expect(libraries.length).to.equal(1);
 				expect(libraries[0].name).to.equal('neopixel');
@@ -35,7 +35,7 @@ describe('Client', () => {
 
 	describe('library', () => {
 		it('resolves to a Library objects', () => {
-			api.getLibrary = () => Promise.resolve({ body: fixtures.readJSON('library.json') });
+			api.getLibrary = () => Promise.resolve({ body: fixtures.read('library.json') });
 			return client.library('neopixel').then(library => {
 				expect(library.name).to.equal('neopixel');
 			});
@@ -44,7 +44,7 @@ describe('Client', () => {
 
 	describe('libraryVersions', () => {
 		it('resolves to a Library objects', () => {
-			api.getLibraryVersions = () => Promise.resolve({ body: fixtures.readJSON('libraryVersions.json') });
+			api.getLibraryVersions = () => Promise.resolve({ body: fixtures.read('libraryVersions.json') });
 			return client.libraryVersions().then(libraries => {
 				expect(libraries.length).to.equal(9);
 				expect(libraries[0].name).to.equal('neopixel');

package/test/Defaults.spec.js

@@ -1,5 +1,5 @@
-import { expect } from './test-setup';
-import Defaults from '../src/Defaults';
+const { expect } = require('./test-setup');
+const Defaults = require('../src/Defaults');
 
 describe('Default Particle constructor options', () => {
 	it('includes baseUrl', () => {

package/test/EventStream.spec.js

@@ -1,8 +1,8 @@
-import { sinon, expect } from './test-setup';
-import http from 'http';
-import { EventEmitter } from 'events';
+const { sinon, expect } = require('./test-setup');
+const http = require('http');
+const { EventEmitter } = require('events');
 
-import EventStream from '../src/EventStream';
+const EventStream = require('../src/EventStream');
 
 describe('EventStream', () => {
 	afterEach(() => {
@@ -32,6 +32,7 @@ describe('EventStream', () => {
 
 	describe('connect', () => {
 		it('successfully connects to http', () => {
+			sinon.useFakeTimers({ shouldAdvanceTime: true });
 			const fakeRequest = makeRequest();
 			sinon.stub(http, 'request').callsFake(() => {
 				setImmediate(() => {
@@ -57,6 +58,7 @@ describe('EventStream', () => {
 		});
 
 		it('returns http errors on connect', () => {
+			sinon.useFakeTimers({ shouldAdvanceTime: true });
 			const fakeRequest = makeRequest();
 			sinon.stub(http, 'request').callsFake(() => {
 				setImmediate(() => {

package/test/FakeAgent.js

@@ -1,4 +1,4 @@
-export default class FakeAgent {
+class FakeAgent {
 	get({ uri, auth, headers, query, context }){
 		return this.request({ uri, method: 'get', auth, headers, query, context });
 	}
@@ -23,4 +23,4 @@ export default class FakeAgent {
 		return new Promise((resolve) => resolve(opts));
 	}
 }
-
+module.exports = FakeAgent;

package/test/Library.spec.js

@@ -1,5 +1,5 @@
-import { expect } from './test-setup';
-import Library from '../src/Library';
+const { expect } = require('./test-setup');
+const Library = require('../src/Library');
 
 let client = {};
 

package/test/Particle.integration.js

@@ -1,6 +1,5 @@
-import { expect, sinon } from './test-setup';
-import Particle from '../src/Particle';
-
+const { expect, sinon } = require('./test-setup');
+const Particle = require('../src/Particle');
 
 describe('Particle', () => {
 	let api;

package/test/Particle.spec.js

@@ -1,10 +1,10 @@
-import should from 'should'; // monkeypatch the world~!1
-import Particle from '../src/Particle';
-import Defaults from '../src/Defaults';
-import Client from '../src/Client';
-import EventStream from '../src/EventStream';
-import FakeAgent from './FakeAgent';
-import { sinon, expect } from './test-setup';
+const should = require('should'); // monkeypatch the world~!1
+const Particle = require('../src/Particle');
+const Defaults = require('../src/Defaults');
+const Client = require('../src/Client');
+const EventStream = require('../src/EventStream');
+const FakeAgent = require('./FakeAgent');
+const { sinon, expect } = require('./test-setup');
 
 let api;
 
@@ -96,25 +96,25 @@ const props = {
 	dateRange: '2020-05-15T18:29:45.000Z,2020-05-19T18:29:45.000Z',
 	rectBl: '56.185412,-4.049868',
 	rectTr: '56.571537,-5.385920',
-	blockId: 1,
-	runId: 1,
-	block: {
+	logicFunctionId: 1,
+	logicRunId: 1,
+	logicFunction: {
 		enabled: true,
-		name: 'block-1',
+		name: 'function-1',
 		description: 'hello world',
-		logic: {
+		source: {
 			type: 'JavaScript',
-			code: 'console.log("hello from block-1");'
+			code: 'console.log("hello from function-1");'
 		},
-		matchers: [
+		logic_triggers: [
 			{
-				type: 'PubSub',
+				type: 'Event',
 				enabled: true,
 				product_id: 9001,
 				event_name: 'main',
 			},
 			{
-				type: 'Chron',
+				type: 'Scheduled',
 				enabled: true,
 				cron: '0 0 1 * *',
 				start_at: '2021-05-15T18:29:45.000Z',
@@ -2574,31 +2574,31 @@ describe('ParticleAPI', () => {
 			});
 		});
 
-		describe('.createLogicBlock', () => {
+		describe('.createLogicFunction', () => {
 			it('generates request', () => {
-				return api.createLogicBlock(propsWithOrg).then((results) => {
+				return api.createLogicFunction(propsWithOrg).then((results) => {
 					results.should.match({
 						method: 'post',
-						uri: `/v1/orgs/${org}/blocks`,
+						uri: `/v1/orgs/${org}/logic/functions`,
 						auth: props.auth,
 						data: {
-							block: {
+							logic_function: {
 								enabled: true,
-								name: 'block-1',
+								name: 'function-1',
 								description: 'hello world',
-								logic: {
+								source: {
 									type: 'JavaScript',
-									code: 'console.log("hello from block-1");'
+									code: 'console.log("hello from function-1");'
 								},
-								matchers: [
+								logic_triggers: [
 									{
-										type: 'PubSub',
+										type: 'Event',
 										enabled: true,
 										product_id: parseInt(props.productId),
 										event_name: props.event,
 									},
 									{
-										type: 'Chron',
+										type: 'Scheduled',
 										enabled: true,
 										cron: '0 0 1 * *',
 										start_at: '2021-05-15T18:29:45.000Z',
@@ -2612,43 +2612,43 @@ describe('ParticleAPI', () => {
 			});
 		});
 
-		describe('.getLogicBlock', () => {
+		describe('.getLogicFunction', () => {
 			it('generates request', () => {
-				return api.getLogicBlock(propsWithOrg).then((results) => {
+				return api.getLogicFunction(propsWithOrg).then((results) => {
 					results.should.match({
 						method: 'get',
-						uri: `/v1/orgs/${org}/blocks/${props.blockId}`,
+						uri: `/v1/orgs/${org}/logic/functions/${props.logicFunctionId}`,
 						auth: props.auth
 					});
 				});
 			});
 		});
 
-		describe('.updateLogicBlock', () => {
+		describe('.updateLogicFunction', () => {
 			it('generates request', () => {
-				return api.updateLogicBlock(propsWithOrg).then((results) => {
+				return api.updateLogicFunction(propsWithOrg).then((results) => {
 					results.should.match({
 						method: 'put',
-						uri: `/v1/orgs/${org}/blocks/${props.blockId}`,
+						uri: `/v1/orgs/${org}/logic/functions/${props.logicFunctionId}`,
 						auth: props.auth,
 						data: {
-							block: {
+							logic_function: {
 								enabled: true,
-								name: 'block-1',
+								name: 'function-1',
 								description: 'hello world',
-								logic: {
+								source: {
 									type: 'JavaScript',
-									code: 'console.log("hello from block-1");'
+									code: 'console.log("hello from function-1");'
 								},
-								matchers: [
+								logic_triggers: [
 									{
-										type: 'PubSub',
+										type: 'Event',
 										enabled: true,
 										product_id: parseInt(props.productId),
 										event_name: props.event,
 									},
 									{
-										type: 'Chron',
+										type: 'Scheduled',
 										enabled: true,
 										cron: '0 0 1 * *',
 										start_at: '2021-05-15T18:29:45.000Z',
@@ -2662,60 +2662,60 @@ describe('ParticleAPI', () => {
 			});
 		});
 
-		describe('.deleteLogicBlock', () => {
+		describe('.deleteLogicFunction', () => {
 			it('generates request', () => {
-				return api.deleteLogicBlock(propsWithOrg).then((results) => {
+				return api.deleteLogicFunction(propsWithOrg).then((results) => {
 					results.should.match({
 						method: 'delete',
-						uri: `/v1/orgs/${org}/blocks/${props.blockId}`,
+						uri: `/v1/orgs/${org}/logic/functions/${props.logicFunctionId}`,
 						auth: props.auth
 					});
 				});
 			});
 		});
 
-		describe('.listLogicBlocks', () => {
+		describe('.listLogicFunctions', () => {
 			it('generates request', () => {
-				return api.listLogicBlocks(propsWithOrg).then((results) => {
+				return api.listLogicFunctions(propsWithOrg).then((results) => {
 					results.should.match({
 						method: 'get',
-						uri: `/v1/orgs/${org}/blocks`,
+						uri: `/v1/orgs/${org}/logic/functions`,
 						auth: props.auth
 					});
 				});
 			});
 		});
 
-		describe('.listBlockRuns', () => {
+		describe('.listLogicRuns', () => {
 			it('generates request', () => {
-				return api.listBlockRuns(propsWithOrg).then((results) => {
+				return api.listLogicRuns(propsWithOrg).then((results) => {
 					results.should.match({
 						method: 'get',
-						uri: `/v1/orgs/${org}/blocks/${props.blockId}/runs`,
+						uri: `/v1/orgs/${org}/logic/functions/${props.logicFunctionId}/runs`,
 						auth: props.auth,
 					});
 				});
 			});
 		});
 
-		describe('.getBlockRun', () => {
+		describe('.getLogicRun', () => {
 			it('generates request', () => {
-				return api.getBlockRun(propsWithOrg).then((results) => {
+				return api.getLogicRun(propsWithOrg).then((results) => {
 					results.should.match({
 						method: 'get',
-						uri: `/v1/orgs/${org}/blocks/${props.blockId}/runs/${props.runId}`,
+						uri: `/v1/orgs/${org}/logic/functions/${props.logicFunctionId}/runs/${props.logicRunId}`,
 						auth: props.auth,
 					});
 				});
 			});
 		});
 
-		describe('.getBlockRunLog', () => {
+		describe('.getLogicRunLogs', () => {
 			it('generates request', () => {
-				return api.getBlockRunLog(propsWithOrg).then((results) => {
+				return api.getLogicRunLogs(propsWithOrg).then((results) => {
 					results.should.match({
 						method: 'get',
-						uri: `/v1/orgs/${org}/blocks/${props.blockId}/runs/${props.runId}/logs`,
+						uri: `/v1/orgs/${org}/logic/functions/${props.logicFunctionId}/runs/${props.logicRunId}/logs`,
 						auth: props.auth,
 					});
 				});

package/test/fixtures/index.js

@@ -1,16 +1,8 @@
-/* In order for the tests to run in the browser the fixture files must
- * be loaded statically into an object. The 'brfs' module will replace
- * the fs.readFileSync('static_path') call by the contents of the file.
- */
-const fs = require('fs'); // import syntax doesn't work inside karma
-
 
 const fixtures = {
-	'libraries.json': fs.readFileSync(__dirname + '/libraries.json'),
-	'library.json': fs.readFileSync(__dirname + '/library.json'),
-	'libraryVersions.json': fs.readFileSync(__dirname + '/libraryVersions.json'),
-	'test-library-publish-0.0.1.tar.gz': fs.readFileSync(__dirname + '/test-library-publish-0.0.1.tar.gz'),
-	'test-library-publish-0.0.2.tar.gz': fs.readFileSync(__dirname + '/test-library-publish-0.0.2.tar.gz'),
+	'libraries.json': require('./libraries.json'),
+	'library.json': require('./library.json'),
+	'libraryVersions.json': require('./libraryVersions.json')
 };
 
 function read(filename) {
@@ -20,10 +12,4 @@ function read(filename) {
 	return fixtures[filename];
 }
 
-function readJSON(filename) {
-	return JSON.parse(read(filename));
-}
-
-export {
-	read, readJSON
-};
+module.exports = { read };

package/test/support/FixtureHttpServer.js

@@ -1,9 +1,9 @@
 // Serve files from the fixture folder
-import express from 'express';
-import * as fixtures from '../fixtures';
+const express = require('express');
+const fixtures = require('../fixtures');
 
 
-export default class FixtureHttpServer {
+class FixtureHttpServer {
 	constructor(){
 		this.app = express();
 		this.app.get('/:filename', (req, res) => {
@@ -23,3 +23,5 @@ export default class FixtureHttpServer {
 		return `http://localhost:${this.server.address().port}`;
 	}
 }
+
+module.exports = FixtureHttpServer;

package/test/test-setup.js

@@ -1,16 +1,16 @@
 // Set up the Mocha test framework with the Chai assertion library and
 // the Sinon mock library
 
-import chai from 'chai';
-import sinon from 'sinon';
-import sinonChai from 'sinon-chai';
-import chaiAsPromised from 'chai-as-promised';
+const chai = require('chai');
+const sinon = require('sinon');
+const sinonChai = require('sinon-chai');
+const chaiAsPromised = require('chai-as-promised');
 
 chai.use(sinonChai);
 chai.use(chaiAsPromised);
 const expect = chai.expect;
 
-export {
+module.exports = {
 	chai,
 	sinon,
 	expect

package/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es6",
+    "allowJs": true,
+    "checkJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true
+  },
+  "types": ["node"],
+  "include": [ "src" ],
+  "exclude": ["node_modules"]
+}

package/webpack.config.js

@@ -0,0 +1,45 @@
+const path = require('path');
+const webpack = require('webpack');
+const TerserPlugin = require('terser-webpack-plugin');
+
+module.exports = (env) => {
+	return {
+		mode: env.mode,
+		target: 'web',
+		entry: './src/Particle.js',
+		devtool: 'source-map',
+		output: {
+			filename: `particle${env.mode === 'production' ? '.min' : ''}.js`,
+			path: path.resolve(__dirname, 'dist'),
+			clean: true,
+			library: {
+				name: 'Particle',
+				type: 'var'
+			}
+		},
+		optimization: {
+			minimize: env.mode === 'production',
+			minimizer: [new TerserPlugin({
+				extractComments: false,
+				terserOptions: {
+					format: {
+						comments: false
+					}
+				}
+			})]
+		},
+		resolve: {
+			fallback: {
+				buffer: require.resolve('buffer'),
+				events: require.resolve('events'),
+				url: require.resolve('url')
+			}
+		},
+		plugins: [
+			new webpack.ProvidePlugin({
+				Buffer: ['buffer', 'Buffer'],
+				process: 'process/browser',
+			})
+		]
+	};
+};

package/.babelrc

@@ -1,4 +0,0 @@
-{
-	"presets": ["es2015"],
-	"plugins": ["add-module-exports", "transform-runtime"]
-}