Re-work examples

Author: greenie-msft

daprdocs/README.md

@@ -4,7 +4,7 @@ This page covers how the documentation is structured for the Dapr JavaScript SDK
 
 ## Dapr Docs
 
-All Dapr documentation is hosted at [docs.dapr.io](https://docs.dapr.io), including the docs for the [JavaScript SDK](https://docs.dapr.io/developing-applications/sdks/java/). Head over there if you want to read the docs.
+All Dapr documentation is hosted at [docs.dapr.io](https://docs.dapr.io), including the docs for the [JavaScript SDK](https://docs.dapr.io/developing-applications/sdks/javascript/). Head over there if you want to read the docs.
 
 ### JavaScript SDK docs source 
 

daprdocs/content/en/js-sdk-docs/_index.md

@@ -10,22 +10,33 @@ description: JavaScript SDK packages for developing Dapr applications
 
 - [Dapr CLI]({{< ref install-dapr-cli.md >}}) installed
 - Initialized [Dapr environment]({{< ref install-dapr-selfhost.md >}})
-- [Node version 15 or greater](https://nodejs.org/en/) 
+- [Latest LTS version of Node or greater](https://nodejs.org/en/) 
 
 ## Installing and importing Dapr's JS SDK
 
-
 Install the SDK with npm:
 ```
-npm i @roadwork/dapr-js-sdk
+npm i @dapr/js-sdk
 ```
 
-Import the libraries for the the given protocol you're using:  
+Import the libraries for the the given protocol:  
 
 ```javascript
-import { DaprClient, DaprServer } from "@roadwork/dapr-js-sdk/http";
-// OR (depending on the protocol)
-import { DaprClient, DaprServer } from "@roadwork/dapr-js-sdk/grpc";
+const daprHost = "127.0.0.1"; // Dapr Sidecar Host
+const daprPort = "50050"; // Dapr Sidecar Port of this Example Server
+const daprPortActor = "10002"; // Dapr Sidecar Port of the Actor Server
+const serverHost = "127.0.0.1"; // App Host of this Example Server
+const serverPort = "50051"; // App Port of this Example Server 
+
+import { DaprClient, DaprServer, CommunicationProtocolEnum } from "@dapr/js-sdk";
+
+// HTTP
+const server = new DaprServer(serverHost, serverPort, daprHost, daprPort); 
+const client = new DaprClient(daprHost, daprPort);
+
+// GRPC 
+const server = new DaprServer(serverHost, serverPort, daprHost, daprPort, CommunicationProtocolEnum.GRPC); 
+const client = new DaprClient(daprHost, daprPort, CommunicationProtocolEnum.GRPC);
 ```
 
 ## Building blocks
@@ -35,60 +46,76 @@ The JavaScript SDK allows you to interface with all of the [Dapr building blocks
 ### Invoke a service
 
 ```javascript
-import { DaprClient, HttpMethod } from "@roadwork/dapr-js-sdk/http";
+import { DaprClient, DaprServer } from "@dapr/js-sdk"; 
 
-const daprHost = "127.0.0.1";
+const daprHost = "127.0.0.1"; 
 const daprPort = "50050"; 
+const serverHost = "127.0.0.1";
+const serverPort = "50051";
 
 async function start() {
-  const client = new DaprClient(daprHost, daprPort);
+  const server = new DaprServer(serverHost, serverPort); 
+
+  //POST listener
+  await server.invoker.listen("hello-world", async (data: any) => {
+    return { hello: "world received from POST" };
+  }, { method: HttpMethod.POST });
 
+  //GET listener
+  await server.invoker.listen("hello-world", async () => {
+    return { hello: "world received from GET" };
+  }, { method: HttpMethod.GET });
+
+  // Start server after instantiating listeners
+  await server.startServer();
+
+  const client = new DaprClient(daprHost, daprPort); 
+
+  const serviceAppId = "my-dapr-app-id";
+  const serviceMethod = "say-hello";
+  
   //POST Request
-  const response = await client.invoker.invoke(SERVICE_TO_INVOKE, METHOD_TO_INVOKE, HttpMethod.POST, {
-    name: "World!"
-  });
+  const response = await client.invoker.invoke(serviceAppId , serviceMethod , HttpMethod.POST, { hello: "world" });
 
   //GET Request
-  const response = await client.invoker.invoke(SERVICE_TO_INVOKE, METHOD_TO_INVOKE, HttpMethod.GET);
+  const response = await client.invoker.invoke(serviceAppId , serviceMethod , HttpMethod.GET);
 }
 ```
 - For a full guide on service invocation visit [How-To: Invoke a service]({{< ref howto-invoke-discover-services.md >}}).
 
 ### Save & get application state
 
 ```javascript
-import { DaprClient } from "@roadwork/dapr-js-sdk/http";
+import { DaprClient } from "@dapr/js-sdk"; 
 
-const daprHost = "127.0.0.1";
+const daprHost = "127.0.0.1"; 
 const daprPort = "50050"; 
 
 async function start() {
-  const client = new DaprClient(daprHost, daprPort);
+  const client = new DaprClient(daprHost, daprPort); 
+
+  const serviceStoreName = "my-dapr-state-store";
 
   //Save state
-  const response = await client.state.save(STATE_STORE_NAME, [
+  const response = await client.state.save(serviceStoreName, [
     {
-      key: FIRST_KEY_NAME 
-      value: FIRST_VALUE
+      key: "first-key-name",
+      value: "Hello"
     },
     {
-      key: SECOND_KEY_NAME,
-      value: SECOND_VALUE
-    },
-    {
-      key: THIRD_KEY_NAME
-      value: THIRD_VALUE
+      key: "second-key-name",
+      value: "World!"
     }
   ]);
 
   //Get State
-  const response = await client.state.get(STATE_STORE_NAME, FIRST_KEY_NAME);
+  const response = await client.state.get(serviceStoreName, "first-key-name");
 
   //Get Bulk State
-  const response = await client.state.getBulk(STATE_STORE_NAME, [ FIRST_KEY_NAME, SECOND_KEY_NAME ]);
+  const response = await client.state.getBulk(serviceStoreName, ["first-key-name", "second-key-name"]);
 
   //Delete State
-  const response = await client.state.delete(STATE_STORE_NAME, FIRST_KEY_NAME);
+  const response = await client.state.delete(serviceStoreName, "first-key-name");
 }
 ```
 - For a full list of state operations visit [How-To: Get & save state]({{< ref howto-get-save-state.md >}}).
@@ -98,30 +125,39 @@ async function start() {
 ##### Publish messages
 
 ```javascript
-import { DaprClient } from "@roadwork/dapr-js-sdk/http";
+import { DaprClient } from "@dapr/js-sdk"; 
 
-const daprHost = "127.0.0.1";
+const daprHost = "127.0.0.1"; 
 const daprPort = "50050"; 
 
 async function start() {
   const client = new DaprClient(daprHost, daprPort);
 
-  const response = await client.pubsub.publish(PUBSUB_NAME, TOPIC_NAME, { messsage });
+  const pubSubName = "my-dapr-pubsub";
+  const topic = "topic-a";
+  const message = { hello: "world" }
+
+  const response = await client.pubsub.publish(pubSubName-redis, topic, message);
 }
 ```
 
 ##### Subscribe to messages
 
 ```javascript
-import { DaprClient } from "@roadwork/dapr-js-sdk/http";
+import { DaprServer } from "@dapr/js-sdk";
 
-const daprHost = "127.0.0.1";
-const daprPort = "50050"; 
+const serverHost = "127.0.0.1";
+const serverPort = "50051"
 
 async function start() {
-  const client = new DaprClient(daprHost, daprPort);
+  const server = new DaprServer(serverHost, serverPort);
+
+  const pubSubName = "my-dapr-pubsub";
+  const topic = "topic-a";
+
+  await server.pubsub.subscribe(pubSubName, topic, async (data: any) => console.log(`Got Data: ${JSON.stringify(data)}`));
 
-  const response = await server.pubsub.subscribe(PUBSUB_NAME, TOPIC_NAME, async (data) => console.log(`Got Data: ${JSON.stringify(data)}`));
+  await server.startServer();
 }
 ```
 
@@ -131,30 +167,37 @@ async function start() {
 
 **Output Bindings**
 ```javascript
-import { DaprClient } from "@roadwork/dapr-js-sdk/http";
+import { DaprClient } from "@dapr/js-sdk"; 
 
-const daprHost = "127.0.0.1";
+const daprHost = "127.0.0.1"; 
 const daprPort = "50050"; 
 
 async function start() {
   const client = new DaprClient(daprHost, daprPort);
 
-  const response = await client.binding.send(BINDING_NAME, BINDING_OPERATION, { message });
+  const bindingName = "my-binding-name";
+  const bindingOperation = "create";
+  const message = { hello: "world" };
+
+  const response = await client.binding.send(bindingName, bindingOperation, message);
 }
 ```
 
 **Input Bindings**
 ```javascript
-import { DaprServer } from "@roadwork/dapr-js-sdk/http";
+import { DaprServer } from "@dapr/js-sdk";;
 
-const daprHost = "127.0.0.1";
-const daprPort = "50050"; 
-const daprInternalServerPort = "50051"; // App Port of this Example Server
+const serverHost = "127.0.0.1";
+const serverPort = "50051";
 
 async function start() {
-  const server = new DaprServer(daprHost, daprPort, daprInternalServerPort);
+  const server = new DaprServer(serverHost, serverPort);
+
+  const bindingName = "my-binding-name";
 
-  const response = await server.binding.receive(BINDING_NAME, async (data) => console.log(`Got Data: ${JSON.stringify(data)}`));
+  const response = await server.binding.receive(bindingName, async (data: any) => console.log(`Got Data: ${JSON.stringify(data)}`));
+
+  await server.startServer();
 }
 ```
 
@@ -163,19 +206,22 @@ async function start() {
 ### Retrieve secrets
 
 ```javascript
-import { DaprClient } from "@roadwork/dapr-js-sdk/http";
+import { DaprClient } from "@dapr/js-sdk"; 
 
-const daprHost = "127.0.0.1";
+const daprHost = "127.0.0.1"; 
 const daprPort = "50050"; 
 
 async function start() {
   const client = new DaprClient(daprHost, daprPort);
 
-  //Retrieve a single secret from secret store
-  const response = await client.secret.get(SECRET_STORE_NAME, secretKey);
+  const secretStoreName = "my-secret-store";
+  const secretKey = "secret-key";
+
+  // Retrieve a single secret from secret store
+  const response = await client.secret.get(secretStoreName, secretKey);
 
   // Retrieve all secrets from secret store
-  const response = await client.secret.getBulk(SECRET_STORE_NAME);
+  const response = await client.secret.getBulk(secretStoreName);
 }
 ```