feat(pubsub): split GAPIC from the pubsub handwritten package

handwritten/pubsub/package.json

@@ -43,7 +43,7 @@
     "clean": "gts clean",
     "compile": "tsc -p . && cp -r protos build/",
     "compile-protos": "compileProtos src",
-    "prepare": "npm run compile-protos && npm run compile",
+    "prepare": "npm run compile",
     "pretest": "npm run compile",
     "benchwrapper": "node bin/benchwrapper.js",
     "prelint": "cd samples; npm link ../; npm install",
@@ -54,6 +54,7 @@
     "@google-cloud/precise-date": "^5.0.0",
     "@google-cloud/projectify": "^5.0.0",
     "@google-cloud/promisify": "^5.0.0",
+    "@google-cloud/pubsub-api": "^0.2.1",
     "@opentelemetry/api": "~1.9.0",
     "@opentelemetry/core": "^1.30.1",
     "@opentelemetry/semantic-conventions": "~1.39.0",

handwritten/pubsub/src/index.ts

@@ -84,7 +84,7 @@
  * @property {constructor} SubscriberClient
  *     Reference to {@link v1.SubscriberClient}.
  */
-import * as v1 from './v1';
+import * as v1 from '@google-cloud/pubsub-api';
 export {v1};
 export {ServiceError, CallOptions} from 'google-gax';
 export {

handwritten/pubsub/src/message-stream.ts

@@ -44,9 +44,10 @@ export const logs = {
 const KEEP_ALIVE_INTERVAL = 30000;
 
 /*!
- * Deadline for the stream.
+ * Deadline for the stream. This will need to go away and be replaced with something
+ * more graceful for pulling the config out of the pubsub-api package.
  */
-const PULL_TIMEOUT = require('./v1/subscriber_client_config.json').interfaces[
+const PULL_TIMEOUT = require('./v1-old/subscriber_client_config.json').interfaces[
   'google.pubsub.v1.Subscriber'
 ].methods.StreamingPull.timeout_millis;
 

handwritten/pubsub/src/pubsub.ts

@@ -19,11 +19,10 @@ import {replaceProjectIdToken} from '@google-cloud/projectify';
 import * as extend from 'extend';
 import {AuthClient, GoogleAuth, GoogleAuthOptions} from 'google-auth-library';
 import * as gax from 'google-gax';
+import {v1} from './';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const PKG = require('../../package.json');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const v1 = require('./v1');
 
 import {promisifySome} from './util';
 import {
@@ -57,9 +56,10 @@ import {PublishOptions} from './publisher';
 import {CallOptions} from 'google-gax';
 import {Transform} from 'stream';
 import {google} from '../protos/protos';
-import {SchemaServiceClient} from './v1';
 import * as tracing from './telemetry-tracing';
 
+type SchemaServiceClient = v1.SchemaServiceClient;
+
 /**
  * Project ID placeholder.
  * @type {string}
@@ -1262,7 +1262,7 @@ export class PubSub {
    */
   async getSchemaClient(): Promise<SchemaServiceClient> {
     if (!this.schemaClient) {
-      const options = await this.getClientConfig();
+      const options = await this.getClientConfig() as gax.ClientOptions;
       this.schemaClient = new v1.SchemaServiceClient(options);
     }
 
@@ -1307,13 +1307,13 @@ export class PubSub {
    */
   async getClientAsync_(config: GetClientConfig): Promise<gax.ClientStub> {
     // Make sure we've got a fully created config with projectId and such.
-    const options = await this.getClientConfig();
+    const options = await this.getClientConfig() as gax.ClientOptions;
 
     let gaxClient = this.api[config.client];
 
     if (!gaxClient) {
       // Lazily instantiate client.
-      gaxClient = new v1[config.client](options) as gax.ClientStub;
+      gaxClient = new v1[config.client](options) as unknown as gax.ClientStub;
       this.api[config.client] = gaxClient;
     }
 

handwritten/pubsub/src/subscriber.ts

@@ -17,7 +17,7 @@
 import {DateStruct, PreciseDate} from '@google-cloud/precise-date';
 import {replaceProjectIdToken} from '@google-cloud/projectify';
 import {promisify} from '@google-cloud/promisify';
-import defer = require('p-defer');
+import * as defer from 'p-defer';
 
 import {google} from '../protos/protos';
 import {Histogram} from './histogram';
@@ -26,7 +26,6 @@ import {AckQueue, BatchOptions, ModAckQueue} from './message-queues';
 import {MessageStream, MessageStreamOptions} from './message-stream';
 import {Subscription} from './subscription';
 import {defaultOptions} from './default-options';
-import {SubscriberClient} from './v1';
 import * as tracing from './telemetry-tracing';
 import {Duration, atMost as durationAtMost} from './temporal';
 import {EventEmitter} from 'events';
@@ -36,6 +35,9 @@ import {logs as baseLogs, LoggingFunction} from './logs';
 
 export {StatusError} from './message-stream';
 
+import {v1} from '.';
+type SubscriberClient = v1.SubscriberClient;
+
 /**
  * Loggers. Exported for unit tests.
  *