Rename @dapr/js-sdk to dapr-client

XavierGeerinck · web-flow · commit 45e8d5b5b02d · 2021-09-15T18:49:10.000Z
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ spec:
 **example.ts**
 
 ```javascript
-import { DaprClient, DaprServer } from "@dapr/js-sdk";
+import { DaprClient, DaprServer } from "dapr-client";
 
 const daprHost = "127.0.0.1"; // Dapr Sidecar Host
 const daprPort = "50000"; // Dapr Sidecar Port
diff --git a/examples/grpc/hello-world-distributed/client/package-lock.json b/examples/grpc/hello-world-distributed/client/package-lock.json
diff --git a/examples/grpc/hello-world-distributed/client/package.json b/examples/grpc/hello-world-distributed/client/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@dapr/js-sdk-example-grpc-hello-world-distributed-client",
+  "name": "dapr-client-example-grpc-hello-world-distributed-client",
   "version": "1.0.0",
   "description": "An example utilizing the Dapr JS SDK",
   "main": "index.js",
@@ -20,7 +20,7 @@
     "typescript": "^4.2.4"
   },
   "dependencies": {
-    "@dapr/js-sdk": "file:../../../build",
+    "dapr-client": "file:../../../build",
     "@types/node": "^15.3.0"
   }
 }
diff --git a/examples/grpc/hello-world-distributed/client/src/index.ts b/examples/grpc/hello-world-distributed/client/src/index.ts
@@ -1,4 +1,4 @@
-import { DaprClient, HttpMethod } from "@dapr/js-sdk";
+import { DaprClient, HttpMethod } from "dapr-client";
 
 const daprHost = "127.0.0.1";
 const daprPort = "3500";
diff --git a/examples/grpc/hello-world-distributed/server/package-lock.json b/examples/grpc/hello-world-distributed/server/package-lock.json
diff --git a/examples/grpc/hello-world-distributed/server/package.json b/examples/grpc/hello-world-distributed/server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@dapr/js-sdk-example-grpc-hello-world-distributed-server",
+  "name": "dapr-client-example-grpc-hello-world-distributed-server",
   "version": "1.0.0",
   "description": "An example utilizing the Dapr JS SDK",
   "main": "index.js",
@@ -20,7 +20,7 @@
     "typescript": "^4.2.4"
   },
   "dependencies": {
-    "@dapr/js-sdk": "file:../../../build",
+    "dapr-client": "file:../../../build",
     "@types/node": "^15.3.0"
   }
 }
diff --git a/examples/grpc/hello-world-distributed/server/src/index.ts b/examples/grpc/hello-world-distributed/server/src/index.ts
@@ -1,4 +1,4 @@
-import { DaprServer, HttpMethod, CommunicationProtocolEnum } from "@dapr/js-sdk";
+import { DaprServer, HttpMethod, CommunicationProtocolEnum } from "dapr-client";
 
 const daprHost = "127.0.0.1";
 const daprPort = "50050"; // Dapr Sidecar Port of this Example Server
diff --git a/examples/grpc/hello-world/package-lock.json b/examples/grpc/hello-world/package-lock.json
diff --git a/examples/grpc/hello-world/package.json b/examples/grpc/hello-world/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@dapr/js-sdk-example-grpc-hello-world",
+  "name": "dapr-client-example-grpc-hello-world",
   "version": "1.0.0",
   "description": "An example utilizing the Dapr JS SDK",
   "main": "index.js",
@@ -19,7 +19,7 @@
     "typescript": "^4.2.4"
   },
   "dependencies": {
-    "@dapr/js-sdk": "file:../../../build",
+    "dapr-client": "file:../../../build",
     "@types/node": "^15.3.0",
     "google-protobuf": "^3.17.0"
   }
diff --git a/examples/grpc/hello-world/src/index.ts b/examples/grpc/hello-world/src/index.ts
@@ -1,4 +1,4 @@
-import { DaprServer, DaprClient, HttpMethod, CommunicationProtocolEnum } from "@dapr/js-sdk";
+import { DaprServer, DaprClient, HttpMethod, CommunicationProtocolEnum } from "dapr-client";
 
 const daprHost = "127.0.0.1";
 const daprPort = "50050"; // Dapr Sidecar Port of this Example Server
diff --git a/examples/http/actor/package-lock.json b/examples/http/actor/package-lock.json
diff --git a/examples/http/actor/package.json b/examples/http/actor/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@dapr/js-sdk-example-http-actor",
+  "name": "dapr-client-example-http-actor",
   "version": "1.0.0",
   "description": "An example utilizing the Dapr JS SDK",
   "main": "index.js",
@@ -19,7 +19,7 @@
     "typescript": "^4.2.4"
   },
   "dependencies": {
-    "@dapr/js-sdk": "file:../../../build",
+    "dapr-client": "file:../../../build",
     "@types/node": "^15.3.0",
     "google-protobuf": "^3.17.0"
   }
diff --git a/examples/http/actor/src/actor/DemoActorCounterImpl.ts b/examples/http/actor/src/actor/DemoActorCounterImpl.ts
@@ -1,4 +1,4 @@
-import { AbstractActor } from "@dapr/js-sdk";
+import { AbstractActor } from "dapr-client";
 import DemoActorCounterInterface from "./DemoActorCounterInterface";
 
 export default class DemoActorCounterImpl extends AbstractActor implements DemoActorCounterInterface {
diff --git a/examples/http/actor/src/actor/DemoActorReminderImpl.ts b/examples/http/actor/src/actor/DemoActorReminderImpl.ts
@@ -1,4 +1,4 @@
-import { AbstractActor } from "@dapr/js-sdk";
+import { AbstractActor } from "dapr-client";
 import DemoActorReminderInterface from "./DemoActorReminderInterface";
 
 export default class DemoActorReminderImpl extends AbstractActor implements DemoActorReminderInterface {
diff --git a/examples/http/actor/src/actor/DemoActorSayImpl.ts b/examples/http/actor/src/actor/DemoActorSayImpl.ts
@@ -1,4 +1,4 @@
-import { AbstractActor } from "@dapr/js-sdk";
+import { AbstractActor } from "dapr-client";
 import DemoActorSayInterface from "./DemoActorSayInterface";
 
 export default class DemoActorSayImpl extends AbstractActor implements DemoActorSayInterface {
diff --git a/examples/http/actor/src/actor/DemoActorTimerImpl.ts b/examples/http/actor/src/actor/DemoActorTimerImpl.ts
@@ -1,4 +1,4 @@
-import { AbstractActor } from "@dapr/js-sdk";
+import { AbstractActor } from "dapr-client";
 import DemoActorTimerInterface from "./DemoActorTimerInterface";
 
 export default class DemoActorTimerImpl extends AbstractActor implements DemoActorTimerInterface {
diff --git a/examples/http/actor/src/index.ts b/examples/http/actor/src/index.ts
@@ -1,4 +1,4 @@
-import { DaprServer, DaprClient, HttpMethod } from "@dapr/js-sdk";
+import { DaprServer, DaprClient, HttpMethod } from "dapr-client";
 import DemoActorCounterImpl from "./actor/DemoActorCounterImpl";
 import DemoActorReminderImpl from "./actor/DemoActorReminderImpl";
 import DemoActorSayImpl from "./actor/DemoActorSayImpl";
diff --git a/examples/http/pubsub/package-lock.json b/examples/http/pubsub/package-lock.json
diff --git a/examples/http/pubsub/package.json b/examples/http/pubsub/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@dapr/js-sdk-example-http-pubsub",
+  "name": "dapr-client-example-http-pubsub",
   "version": "1.0.0",
   "description": "An example utilizing the Dapr JS SDK",
   "main": "index.js",
@@ -19,7 +19,7 @@
     "typescript": "^4.2.4"
   },
   "dependencies": {
-    "@dapr/js-sdk": "file:../../../build",
+    "dapr-client": "file:../../../build",
     "@types/node": "^15.3.0",
     "google-protobuf": "^3.17.0"
   }
diff --git a/examples/http/pubsub/src/index.ts b/examples/http/pubsub/src/index.ts
@@ -1,4 +1,4 @@
-import { DaprServer, DaprClient } from "@dapr/js-sdk";
+import { DaprServer, DaprClient } from "dapr-client";
 
 const daprHost = "127.0.0.1";
 const daprPort = "50000"; // Dapr Sidecar Port of this Example Server
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,13 +1,14 @@
 {
-  "name": "@dapr/js-sdk",
+  "name": "dapr-client",
   "version": "0.3.1",
   "description": "The official Dapr (https://dapr.io) SDK for Node.js",
   "types": "http/index.d.ts",
   "scripts": {
     "test": "jest --runInBand --detectOpenHandles",
-    "test:e2e:http:main": "TEST_SECRET_1=secret_val_1 TEST_SECRET_2=secret_val_2 dapr run --app-id test-suite --app-protocol http --app-port 50001 --dapr-http-port 50000 --components-path ./test/components npm run test 'test/e2e/main.http.test.ts'",
     "test:e2e:grpc:main": "TEST_SECRET_1=secret_val_1 TEST_SECRET_2=secret_val_2 dapr run --app-id test-suite --app-protocol grpc --app-port 50001 --dapr-grpc-port 50000 --components-path ./test/components npm run test 'test/e2e/main.grpc.test.ts'",
+    "test:e2e:http:main": "TEST_SECRET_1=secret_val_1 TEST_SECRET_2=secret_val_2 dapr run --app-id test-suite --app-protocol http --app-port 50001 --dapr-http-port 50000 --components-path ./test/components npm run test 'test/e2e/main.http.test.ts'",
     "test:e2e:http:actors": "dapr run --app-id test-suite --app-protocol http --app-port 50001 --dapr-http-port 50000 --components-path ./test/components npm run test 'test/e2e/actors.http.test.ts'",
+    "test:unit": "NODE_ENV=test npm run test 'test/unit/.*\\.test\\.ts'",
     "test:unit:main": "NODE_ENV=test npm run test 'test/unit/main/.*\\.test\\.ts'",
     "test:unit:actors": "NODE_ENV=test npm run test 'test/unit/actor/.*\\.test\\.ts'",
     "lint": "tslint -p tsconfig.json",
diff --git a/test/e2e/main.grpc.test.ts b/test/e2e/main.grpc.test.ts
@@ -15,7 +15,7 @@ describe('grpc/main', () => {
     // We need to start listening on some endpoints already
     // this because Dapr is not dynamic and registers endpoints on boot
     beforeAll(async () => {
-        server = new DaprServer(serverHost, serverPort, CommunicationProtocolEnum.GRPC);
+        server = new DaprServer(serverHost, serverPort, daprHost, daprPort, CommunicationProtocolEnum.GRPC);
         client = new DaprClient(daprHost, daprPort, CommunicationProtocolEnum.GRPC);
 
         await server.binding.receive("binding-mqtt", mockBindingReceive);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "@dapr/js-sdk-example-grpc-hello-world-distributed-client",`
	`2`	`+ "name": "dapr-client-example-grpc-hello-world-distributed-client",`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"description": "An example utilizing the Dapr JS SDK",`
`5`	`5`	`"main": "index.js",`
`@@ -20,7 +20,7 @@`
`20`	`20`	`"typescript": "^4.2.4"`
`21`	`21`	`},`
`22`	`22`	`"dependencies": {`
`23`		`- "@dapr/js-sdk": "file:../../../build",`
	`23`	`+ "dapr-client": "file:../../../build",`
`24`	`24`	`"@types/node": "^15.3.0"`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { DaprClient, HttpMethod } from "@dapr/js-sdk";`
	`1`	`+import { DaprClient, HttpMethod } from "dapr-client";`
`2`	`2`
`3`	`3`	`const daprHost = "127.0.0.1";`
`4`	`4`	`const daprPort = "3500";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { DaprServer, HttpMethod, CommunicationProtocolEnum } from "@dapr/js-sdk";`
	`1`	`+import { DaprServer, HttpMethod, CommunicationProtocolEnum } from "dapr-client";`
`2`	`2`
`3`	`3`	`const daprHost = "127.0.0.1";`
`4`	`4`	`const daprPort = "50050"; // Dapr Sidecar Port of this Example Server`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { DaprServer, DaprClient, HttpMethod, CommunicationProtocolEnum } from "@dapr/js-sdk";`
	`1`	`+import { DaprServer, DaprClient, HttpMethod, CommunicationProtocolEnum } from "dapr-client";`
`2`	`2`
`3`	`3`	`const daprHost = "127.0.0.1";`
`4`	`4`	`const daprPort = "50050"; // Dapr Sidecar Port of this Example Server`