Fix protobuf build issue

Author: mjameswh

package-lock.json

@@ -21,11 +21,11 @@
   "license": "MIT",
   "dependencies": {
     "long": "^5.2.3",
-    "protobufjs": "^7.2.5"
+    "protobufjs": "^7.5.1"
   },
   "devDependencies": {
     "glob": "^10.3.10",
-    "protobufjs-cli": "^1.1.2"
+    "protobufjs-cli": "^1.1.3"
   },
   "bugs": {
     "url": "https://github.com/temporalio/sdk-typescript/issues"

packages/core-bridge/sdk-core

@@ -9,24 +9,8 @@ const pbts = require('protobufjs-cli/pbts');
 const outputDir = resolve(__dirname, '../protos');
 const jsOutputFile = resolve(outputDir, 'json-module.js');
 const tempFile = resolve(outputDir, 'temp.js');
-const protoBaseDir = resolve(__dirname, '../../core-bridge/sdk-core/sdk-core-protos/protos');
 
-const coreProtoPath = resolve(protoBaseDir, 'local/temporal/sdk/core/core_interface.proto');
-const workflowServiceProtoPath = resolve(protoBaseDir, 'api_upstream/temporal/api/workflowservice/v1/service.proto');
-const operatorServiceProtoPath = resolve(protoBaseDir, 'api_upstream/temporal/api/operatorservice/v1/service.proto');
-const cloudServiceProtoPath = resolve(
-  protoBaseDir,
-  'api_cloud_upstream/temporal/api/cloud/cloudservice/v1/service.proto'
-);
-const errorDetailsProtoPath = resolve(protoBaseDir, 'api_upstream/temporal/api/errordetails/v1/message.proto');
-const workflowMetadataProtoPath = resolve(protoBaseDir, 'api_upstream/temporal/api/sdk/v1/workflow_metadata.proto');
-const testServiceRRProtoPath = resolve(
-  protoBaseDir,
-  'testsrv_upstream/temporal/api/testservice/v1/request_response.proto'
-);
-const testServiceProtoPath = resolve(protoBaseDir, 'testsrv_upstream/temporal/api/testservice/v1/service.proto');
-const healthServiceProtoPath = resolve(protoBaseDir, 'grpc/health/v1/health.proto');
-const googleRpcStatusProtoPath = resolve(protoBaseDir, 'google/rpc/status.proto');
+const protoBaseDir = resolve(__dirname, '../../core-bridge/sdk-core/sdk-core-protos/protos');
 
 function mtime(path) {
   try {
@@ -40,28 +24,15 @@ function mtime(path) {
 }
 
 async function compileProtos(dtsOutputFile, ...args) {
-  // Use --root to avoid conflicting with user's root
-  // and to avoid this error: https://github.com/protobufjs/protobuf.js/issues/1114
   const pbjsArgs = [
-    ...args,
-    '--wrap',
-    'commonjs',
+    ...['--wrap', 'commonjs'],
     '--force-long',
     '--no-verify',
     '--alt-comment',
-    '--root',
-    '__temporal',
-    resolve(require.resolve('protobufjs'), '../google/protobuf/descriptor.proto'),
-    coreProtoPath,
-    workflowServiceProtoPath,
-    operatorServiceProtoPath,
-    cloudServiceProtoPath,
-    errorDetailsProtoPath,
-    workflowMetadataProtoPath,
-    testServiceRRProtoPath,
-    testServiceProtoPath,
-    healthServiceProtoPath,
-    googleRpcStatusProtoPath,
+    // Use --root to avoid conflicting with user's root
+    // and to avoid this error: https://github.com/protobufjs/protobuf.js/issues/1114
+    ...['--root', '__temporal'],
+    ...args,
   ];
 
   console.log(`Creating protobuf JS definitions`);
@@ -101,14 +72,32 @@ async function main() {
     return;
   }
 
-  await compileProtos(
-    resolve(outputDir, 'root.d.ts'),
-    '--path',
+  const rootDirs = [
     resolve(protoBaseDir, 'api_upstream'),
-    '--path',
+    resolve(protoBaseDir, 'testsrv_upstream'),
     resolve(protoBaseDir, 'local'),
-    '--path',
-    resolve(protoBaseDir, 'api_cloud_upstream')
+    resolve(protoBaseDir, 'api_cloud_upstream'),
+    protoBaseDir, // 'grpc' and 'google' are directly under protoBaseDir
+  ];
+
+  const entrypoints = [
+    'temporal/sdk/core/core_interface.proto',
+    'temporal/api/workflowservice/v1/service.proto',
+    'temporal/api/operatorservice/v1/service.proto',
+    'temporal/api/cloud/cloudservice/v1/service.proto',
+    'temporal/api/errordetails/v1/message.proto',
+    'temporal/api/sdk/v1/workflow_metadata.proto',
+    'temporal/api/testservice/v1/request_response.proto',
+    'temporal/api/testservice/v1/service.proto',
+    'grpc/health/v1/health.proto',
+    'google/rpc/status.proto',
+  ];
+
+  await compileProtos(
+    resolve(outputDir, 'root.d.ts'),
+    // Make sure to include all
+    ...rootDirs.flatMap((dir) => ['--path', dir]),
+    ...entrypoints
   );
 
   console.log('Done');

packages/proto/package.json

@@ -51,8 +51,8 @@
     "istanbul-lib-coverage": "^3.2.2",
     "long": "^5.2.3",
     "node-fetch": "^2.7.0",
-    "protobufjs": "^7.2.5",
-    "protobufjs-cli": "^1.1.2",
+    "protobufjs": "^7.5.1",
+    "protobufjs-cli": "^1.1.3",
     "rxjs": "7.8.1",
     "stack-utils": "^2.0.6",
     "uuid": "^9.0.1"