starpc 0.15.2 → 0.15.4

package/dist/srpc/server-rpc.js

@@ -33,11 +33,14 @@ export class ServerRPC extends CommonRPC {
         return super.handleCallData(packet);
     }
     // invokeRPC starts invoking the RPC handler.
-    invokeRPC(invokeFn) {
+    async invokeRPC(invokeFn) {
         const dataSink = this._createDataSink();
-        invokeFn(this.rpcDataSource, dataSink).catch((err) => {
+        try {
+            await invokeFn(this.rpcDataSource, dataSink);
+        }
+        catch (err) {
             this.close(err);
-        });
+        }
     }
     // _createDataSink creates a sink for outgoing data packets.
     _createDataSink() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.15.2",
+  "version": "0.15.4",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -36,7 +36,7 @@
     "build": "rimraf ./dist && tsc --project tsconfig.build.json --outDir ./dist/",
     "check": "npm run typecheck",
     "typecheck": "tsc --noEmit",
-    "deps": "depcheck --ignores 'bufferutil,utf-8-validate,ts-proto'",
+    "deps": "depcheck --ignores 'bufferutil,utf-8-validate,ts-proto,@aperturerobotics/ts-common'",
     "codegen": "npm run gen",
     "ci": "npm run build && npm run lint:js && npm run lint:go",
     "format": "prettier --write './{srpc,echo,e2e,integration,rpcstream}/**/(*.ts|*.tsx|*.html|*.css)'",
@@ -51,7 +51,8 @@
     "lint": "npm run lint:go && npm run lint:js",
     "lint:go": "make lint",
     "lint:js": "eslint -c .eslintrc.js --ext .ts ./{srpc,echo,rpcstream}/**/*.ts",
-    "prepare": "patch-package",
+    "patch": "patch-package --use-yarn --patch-dir ./node_modules/@aperturerobotics/ts-common/patches",
+    "prepare": "npm run patch && go mod vendor",
     "precommit": "npm run format"
   },
   "prettier": {
@@ -59,6 +60,7 @@
     "singleQuote": true
   },
   "devDependencies": {
+    "@aperturerobotics/ts-common": "^0.2.6",
     "@typescript-eslint/eslint-plugin": "^5.45.0",
     "@typescript-eslint/parser": "^5.45.0",
     "bufferutil": "^4.0.7",

package/srpc/client-rpc.go

@@ -99,10 +99,10 @@ func (r *ClientRPC) HandleCallStart(pkt *CallStart) error {
 
 // Close releases any resources held by the ClientRPC.
 func (r *ClientRPC) Close() {
-	r.mtx.Lock()
 	if r.writer != nil {
-		_ = r.writeCancelLocked()
+		_ = r.WriteCancel()
 	}
+	r.mtx.Lock()
 	r.closeLocked()
 	r.bcast.Broadcast()
 	r.mtx.Unlock()

package/srpc/common-rpc.go

@@ -107,8 +107,6 @@ func (c *commonRPC) ReadOne() ([]byte, error) {
 
 // WriteCallData writes a call data packet.
 func (c *commonRPC) WriteCallData(data []byte, complete bool, err error) error {
-	c.mtx.Lock()
-	defer c.mtx.Unlock()
 	if c.writer == nil {
 		return ErrCompleted
 	}
@@ -173,8 +171,8 @@ func (c *commonRPC) HandleCallData(pkt *CallData) error {
 	return nil
 }
 
-// writeCancelLocked writes a call cancel packet.
-func (c *commonRPC) writeCancelLocked() error {
+// WriteCancel writes a call cancel packet.
+func (c *commonRPC) WriteCancel() error {
 	if c.writer != nil {
 		return c.writer.WritePacket(NewCallCancelPacket())
 	}

package/srpc/server-rpc.ts

@@ -45,11 +45,13 @@ export class ServerRPC extends CommonRPC {
   }
 
   // invokeRPC starts invoking the RPC handler.
-  private invokeRPC(invokeFn: InvokeFn) {
+  private async invokeRPC(invokeFn: InvokeFn) {
     const dataSink = this._createDataSink()
-    invokeFn(this.rpcDataSource, dataSink).catch((err) => {
-      this.close(err)
-    })
+    try {
+      await invokeFn(this.rpcDataSource, dataSink)
+    } catch (err) {
+      this.close(err as Error)
+    }
   }
 
   // _createDataSink creates a sink for outgoing data packets.

package/patches/ts-poet+6.1.0.patch

@@ -1,43 +0,0 @@
-diff --git a/node_modules/ts-poet/build/Import.js b/node_modules/ts-poet/build/Import.js
-index e2c318e..5d46854 100644
---- a/node_modules/ts-poet/build/Import.js
-+++ b/node_modules/ts-poet/build/Import.js
-@@ -294,6 +294,18 @@ function emitImports(imports, ourModulePath, importMappings) {
-         return "";
-     }
-     let result = "";
-+    // HACK: take the project root import path from $PROJECT
-+    const thisProject = process.env.PROJECT;
-+    let ourModuleImportPath = path.normalize(ourModulePath);
-+    // HACK: if this is an import from our project, set the path accordingly
-+    // github.com/aperturerobotics/protobuf-project/example/example -> ./example/example
-+    if (thisProject) {
-+        if (ourModuleImportPath.startsWith(thisProject)) {
-+            ourModuleImportPath = './' + ourModuleImportPath.substr(thisProject.length + 1);
-+        } else {
-+            ourModuleImportPath = '@go/' + ourModuleImportPath;
-+        }
-+    }
-     const augmentImports = (0, utils_1.groupBy)(filterInstances(imports, Augmented), (a) => a.augmented);
-     // Group the imports by source module they're imported from
-     const importsByModule = (0, utils_1.groupBy)(imports.filter((it) => it.source !== undefined &&
-@@ -308,7 +320,18 @@ function emitImports(imports, ourModulePath, importMappings) {
-         if (modulePath in importMappings) {
-             modulePath = importMappings[modulePath];
-         }
--        const importPath = maybeRelativePath(ourModulePath, modulePath);
-+        if (thisProject) {
-+            if (modulePath.startsWith('./')) {
-+                if (modulePath.substring(2).startsWith(thisProject)) {
-+                    modulePath = './' + modulePath.substring(3 + thisProject.length);
-+                } else if (modulePath.startsWith('./google/protobuf')) {
-+                    modulePath = '@aperturerobotics/ts-proto-common-types/' + path.normalize(modulePath);
-+                } else {
-+                    modulePath = '@go/' + path.normalize(modulePath);
-+                }
-+            }
-+        }
-+        const importPath = maybeRelativePath(ourModuleImportPath, modulePath);
-         // Output star imports individually
-         unique(filterInstances(imports, ImportsAll).map((i) => i.symbol)).forEach((symbol) => {
-             result += `import * as ${symbol} from '${importPath}';\n`;