Merge pull request #67 from OpenFunction/feature/dapr-180

Author: webup

.github/workflows/unit.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         node-version: [16]
-        dapr-version: [1.6.3, 1.7.4]
+        dapr-version: [1.6.3, 1.7.4, 1.8.0]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:

docs/generated/api.json

@@ -1,8 +1,8 @@
 {
   "metadata": {
     "toolPackage": "@microsoft/api-extractor",
-    "toolVersion": "7.27.0",
-    "schemaVersion": 1008,
+    "toolVersion": "7.28.4",
+    "schemaVersion": 1009,
     "oldestForwardsCompatibleVersion": 1001,
     "tsdocConfig": {
       "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
@@ -1602,6 +1602,7 @@
                   "text": ";"
                 }
               ],
+              "isReadonly": false,
               "returnTypeTokenRange": {
                 "startIndex": 3,
                 "endIndex": 4

package-lock.json

@@ -20,10 +20,10 @@
     "express": "^4.18.1",
     "express-interceptor": "^1.2.0",
     "lodash": "^4.17.21",
-    "minimist": "^1.2.5",
-    "on-finished": "^2.3.0",
+    "minimist": "^1.2.6",
+    "on-finished": "^2.4.1",
     "read-pkg-up": "^7.0.1",
-    "semver": "^7.3.5"
+    "semver": "^7.3.7"
   },
   "scripts": {
     "test": "cross-env DEBUG=common:*,ofn:* mocha build/test -t 60000 --recursive --exit",
@@ -52,7 +52,7 @@
   "author": "OpenFunction",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.27.0",
+    "@microsoft/api-extractor": "^7.28.4",
     "@types/body-parser": "1.19.2",
     "@types/debug": "^4.1.7",
     "@types/express": "4.17.13",
@@ -65,16 +65,16 @@
     "@types/on-finished": "2.3.1",
     "@types/semver": "^7.3.10",
     "@types/shelljs": "^0.8.11",
-    "@types/sinon": "^10.0.11",
+    "@types/sinon": "10.0.11",
     "@types/supertest": "2.0.12",
     "aedes": "^0.47.0",
-    "concurrently": "^7.2.2",
+    "concurrently": "^7.3.0",
     "cross-env": "^7.0.3",
     "env-cmd": "^10.1.0",
     "gts": "^3.1.0",
     "mocha": "10.0.0",
     "pack-n-play": "^1.0.0-2",
-    "pre-push": "^0.1.2",
+    "pre-push": "^0.1.3",
     "shelljs": "^0.8.5",
     "sinon": "^14.0.0",
     "supertest": "6.2.3",

package.json

@@ -2,7 +2,7 @@
 import {deepStrictEqual, ifError, ok} from 'assert';
 import {createServer} from 'net';
 
-import {get} from 'lodash';
+import {get, isEmpty} from 'lodash';
 import * as shell from 'shelljs';
 import * as MQTT from 'aedes';
 
@@ -54,7 +54,16 @@ const TEST_CONTEXT: OpenFunctionContext = {
     },
   },
 };
+
 const TEST_PAYLOAD = {data: 'hello world'};
+const TEST_CLOUD_EVENT = {
+  specversion: '1.0',
+  id: 'test-1234-1234',
+  type: 'ce.openfunction',
+  source: 'https://github.com/OpenFunction/functions-framework-nodejs',
+  traceparent: '00-65088630f09e0a5359677a7429456db7-97f23477fb2bf5ec-01',
+  data: TEST_PAYLOAD,
+};
 
 describe('OpenFunction - Async - Binding', () => {
   const APPID = 'async.dapr';
@@ -139,15 +148,12 @@ describe('OpenFunction - Async - Binding', () => {
 
   it('mqtt sub w/ pub output', done => {
     const app = getAysncServer((ctx, data) => {
+      if (isEmpty(data)) return;
+
       // Assert that user function receives correct data from input binding
-      try {
-        const recieved = JSON.parse(data as string);
-        deepStrictEqual(recieved, TEST_PAYLOAD);
-      } catch (err) {
-        ifError(err);
-      }
+      deepStrictEqual(data, TEST_PAYLOAD);
 
-      // Then write recived data to a local file
+      // Then forward received data to output channel
       const output = 'mqtt_pub';
       broker.subscribe(
         get(TEST_CONTEXT, `outputs.${output}.uri`),
@@ -165,15 +171,17 @@ describe('OpenFunction - Async - Binding', () => {
 
     // First, we start the async server
     app.start().then(() => {
-      // Then, we publish a message via Dapr CLI
-      const formatted = JSON.stringify(TEST_PAYLOAD).replace(/"/g, '\\"');
-      shell.exec(
-        `dapr publish -i ${APPID} -p ${
-          TEST_CONTEXT.inputs!.mqtt_sub!.componentName
-        } -t ${TEST_CONTEXT.inputs!.mqtt_sub.uri} -d '"${formatted}"'`,
+      // Then, we send a cloudevent format message to server
+      broker.publish(
         {
-          silent: true,
-        }
+          cmd: 'publish',
+          topic: TEST_CONTEXT.inputs!.mqtt_sub.uri!,
+          payload: JSON.stringify(TEST_CLOUD_EVENT),
+          qos: 0,
+          retain: false,
+          dup: false,
+        },
+        err => ifError(err)
       );
     });
   });

test/integration/async_server.ts

@@ -25,7 +25,7 @@ import {FUNCTION_STATUS_HEADER_FIELD} from '../../src/types';
 const TEST_CLOUD_EVENT = {
   specversion: '1.0',
   type: 'com.google.cloud.storage',
-  source: 'https://github.com/GoogleCloudPlatform/functions-framework-nodejs',
+  source: 'https://github.com/OpenFunction/functions-framework-nodejs',
   subject: 'test-subject',
   id: 'test-1234-1234',
   time: '2020-05-13T01:23:45Z',