🔀 🐛 Fix any typeOf (#190)

ButterCam · Dec 28, 2022 · f3dab20 · f3dab20
1 parent e954eee
commit f3dab20
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 39 deletions.
diff --git a/examples/example-simple/package.json b/examples/example-simple/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sisyphus.js/example-simple",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Example project using sisyphus.js",
   "main": "dist/index.js",
   "scripts": {
@@ -26,14 +26,14 @@
   },
   "homepage": "https://github.com/ButterCam/sisyphus-js#readme",
   "devDependencies": {
-    "@sisyphus.js/cli": "^2.0.4",
-    "@sisyphus.js/google.proto": "^2.0.4",
-    "@sisyphus.js/runtime.proto": "^2.0.4"
+    "@sisyphus.js/cli": "^2.0.5",
+    "@sisyphus.js/google.proto": "^2.0.5",
+    "@sisyphus.js/runtime.proto": "^2.0.5"
   },
   "dependencies": {
-    "@sisyphus.js/google": "^2.0.4",
-    "@sisyphus.js/runtime": "^2.0.4",
-    "@sisyphus.js/transport-aip": "^2.0.4"
+    "@sisyphus.js/google": "^2.0.5",
+    "@sisyphus.js/runtime": "^2.0.5",
+    "@sisyphus.js/transport-aip": "^2.0.5"
   },
   "directories": {
     "proto": "proto"

diff --git a/lerna.json b/lerna.json
@@ -3,5 +3,5 @@
     "packages/*",
     "examples/*"
   ],
-  "version": "2.0.4"
+  "version": "2.0.5"
 }
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
     "build": "lerna bootstrap --hoist && lerna run clean && lerna run build",
     "publish": "lerna publish from-package --yes --no-verify-access",
     "watch": "lerna run --stream --no-sort --concurrency 9999 watch",
-    "test": "lerna run test"
+    "test": "lerna run test",
+    "version": "lerna version --no-git-tag-version"
   }
 }
diff --git a/packages/sisyphus-cli/package.json b/packages/sisyphus-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sisyphus.js/cli",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Protoc cli for sisyphus project on js platform",
   "bin": {
     "sisygen": "lib/index.js"
@@ -30,10 +30,10 @@
   },
   "homepage": "https://github.com/ButterCam/sisyphus-js#readme",
   "dependencies": {
-    "@sisyphus.js/compiler": "^2.0.4",
-    "@sisyphus.js/protoc": "^2.0.4",
-    "@sisyphus.js/runtime": "^2.0.4",
-    "@sisyphus.js/runtime.proto": "^2.0.4",
+    "@sisyphus.js/compiler": "^2.0.5",
+    "@sisyphus.js/protoc": "^2.0.5",
+    "@sisyphus.js/runtime": "^2.0.5",
+    "@sisyphus.js/runtime.proto": "^2.0.5",
     "commander": "^9.3.0",
     "npmlog": "^7.0.1"
   }

diff --git a/packages/sisyphus-compiler/package.json b/packages/sisyphus-compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sisyphus.js/compiler",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Precompiled google common protos by sisyphus protobuf compiler",
   "main": "lib/index.js",
   "sisyphus": {
@@ -35,6 +35,6 @@
   },
   "homepage": "https://github.com/ButterCam/sisyphus-js#readme",
   "dependencies": {
-    "@sisyphus.js/protoc": "^2.0.4"
+    "@sisyphus.js/protoc": "^2.0.5"
   }
 }
diff --git a/packages/sisyphus-google-aip/package.json b/packages/sisyphus-google-aip/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sisyphus.js/google.aip",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Precompiled google common aip clients by sisyphus protobuf compiler",
   "scripts": {
     "clean": "tsc --build --clean",
@@ -33,12 +33,12 @@
   },
   "homepage": "https://github.com/ButterCam/sisyphus-js#readme",
   "devDependencies": {
-    "@sisyphus.js/cli": "^2.0.4",
-    "@sisyphus.js/google.proto": "^2.0.4"
+    "@sisyphus.js/cli": "^2.0.5",
+    "@sisyphus.js/google.proto": "^2.0.5"
   },
   "dependencies": {
-    "@sisyphus.js/google": "^2.0.4",
-    "@sisyphus.js/transport-aip": "^2.0.4"
+    "@sisyphus.js/google": "^2.0.5",
+    "@sisyphus.js/transport-aip": "^2.0.5"
   },
   "directories": {
     "lib": "lib"

diff --git a/packages/sisyphus-google-proto/package.json b/packages/sisyphus-google-proto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sisyphus.js/google.proto",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Precompiled google common protos with full protobuf by sisyphus protobuf compiler",
   "main": "lib/index.js",
   "scripts": {
@@ -34,12 +34,12 @@
   },
   "homepage": "https://github.com/ButterCam/sisyphus-js#readme",
   "devDependencies": {
-    "@sisyphus.js/cli": "^2.0.4"
+    "@sisyphus.js/cli": "^2.0.5"
   },
   "dependencies": {
-    "@sisyphus.js/google": "^2.0.4",
-    "@sisyphus.js/runtime": "^2.0.4",
-    "@sisyphus.js/runtime.proto": "^2.0.4"
+    "@sisyphus.js/google": "^2.0.5",
+    "@sisyphus.js/runtime": "^2.0.5",
+    "@sisyphus.js/runtime.proto": "^2.0.5"
   },
   "directories": {
     "lib": "lib"

diff --git a/packages/sisyphus-google/package.json b/packages/sisyphus-google/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sisyphus.js/google",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Precompiled google common protos by sisyphus protobuf compiler",
   "scripts": {
     "clean": "tsc --build --clean",
@@ -34,10 +34,10 @@
   },
   "homepage": "https://github.com/ButterCam/sisyphus-js#readme",
   "devDependencies": {
-    "@sisyphus.js/cli": "^2.0.4"
+    "@sisyphus.js/cli": "^2.0.5"
   },
   "dependencies": {
-    "@sisyphus.js/runtime": "^2.0.4"
+    "@sisyphus.js/runtime": "^2.0.5"
   },
   "directories": {
     "lib": "lib",

diff --git a/packages/sisyphus-protoc/package.json b/packages/sisyphus-protoc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sisyphus.js/protoc",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Install protoc for current platform.",
   "main": "lib/index.js",
   "bin": {

diff --git a/packages/sisyphus-protoc/src/util.ts b/packages/sisyphus-protoc/src/util.ts
@@ -46,7 +46,7 @@ function downloadRedirected(uri: string, redirects: string[] = []): Promise<Inco
     if (redirects.indexOf(uri) >= 0) throw new Error(`Redirect looped.\n${redirects.join('\n')}\n${uri}`)
 
     return new Promise((res, rej) => {
-        requireHttp(url).get(url, (response: IncomingMessage) => {
+        requireHttp(url).get(uri, (response: IncomingMessage) => {
             if (!response.statusCode) return rej(new Error(`Download ${uri} failed.`))
 
             if (response.statusCode >= 400) return rej(new Error(`Download ${uri} failed(${response.statusCode}).`))
@@ -81,7 +81,7 @@ export function getRedirectLocation(uri: string): Promise<string> {
     const url = new URL(uri)
 
     return new Promise((res, rej) => {
-        requireHttp(url).get(url, (response: IncomingMessage) => {
+        requireHttp(url).get(uri, (response: IncomingMessage) => {
             if (!response.statusCode) return rej(new Error(`GET ${uri} failed.`))
 
             if (response.statusCode >= 400) return rej(new Error(`GET ${uri} failed(${response.statusCode}).`))

diff --git a/packages/sisyphus-runtime-proto/package.json b/packages/sisyphus-runtime-proto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sisyphus.js/runtime.proto",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Protobuf full runtime for sisyphus project on js platform, support protobuf binary format.",
   "main": "lib/index.js",
   "scripts": {
@@ -34,7 +34,7 @@
   },
   "homepage": "https://github.com/ButterCam/sisyphus-js#readme",
   "dependencies": {
-    "@sisyphus.js/runtime": "^2.0.4"
+    "@sisyphus.js/runtime": "^2.0.5"
   },
   "directories": {
     "lib": "lib"

diff --git a/packages/sisyphus-runtime/package.json b/packages/sisyphus-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sisyphus.js/runtime",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Protobuf lite runtime for sisyphus project on js platform, only support JSON format.",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/sisyphus-runtime/src/any.ts b/packages/sisyphus-runtime/src/any.ts
@@ -8,6 +8,8 @@ declare module './google/protobuf/any' {
         function isAny(object: any): boolean
 
         function typeOf(object: any): string
+
+        function typeUrl(type: string): string
     }
 }
 
@@ -20,6 +22,9 @@ Any.isAny = function (object: any): boolean {
 Any.typeOf = function typeOf(object: any): string {
     if (!Any.isAny(object)) throw new Error(`Object must contains '@type' type info.`)
     const type: string = object['@type']
+    return type.substring(type.lastIndexOf('/') + 1)
+}
 
-    return type.substring(type.lastIndexOf('/'))
+Any.typeUrl = function typeUrl(type: string): string {
+    return `type.butterapis.com/${type}`
 }
diff --git a/packages/sisyphus-transport-aip/package.json b/packages/sisyphus-transport-aip/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sisyphus.js/transport-aip",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "gRPC transport based on AIP spec(gRPC to HTTP/Json Transcoding).",
   "main": "lib/index.js",
   "scripts": {
@@ -32,8 +32,8 @@
   },
   "homepage": "https://github.com/ButterCam/sisyphus-js#readme",
   "dependencies": {
-    "@sisyphus.js/google": "^2.0.4",
-    "@sisyphus.js/runtime": "^2.0.4"
+    "@sisyphus.js/google": "^2.0.5",
+    "@sisyphus.js/runtime": "^2.0.5"
   },
   "directories": {
     "lib": "lib",

diff --git a/packages/sisyphus-transport-aip/src/rpc.ts b/packages/sisyphus-transport-aip/src/rpc.ts
@@ -28,6 +28,7 @@ export class StatusError extends Error {
 }
 
 export function transcoding(host: string, config?: TranscodingListener): Rpc {
+    host = host.replace(/\/+$/, '')
     return async function (method: MethodDescriptor, input: any): Promise<any> {
         let rawInput = input
         input = {...input}