service-bridge 1.8.4-dev.45 → 1.8.4-dev.46

package/dist/index.js

@@ -841,11 +841,11 @@ function ensureSbResolverRegistered() {
   }
   registerResolver("sb", SbResolver);
 }
-function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}) {
-  const service = typeof serviceOrOpts === "string" ? serviceOrOpts.trim() : "";
-  const globalOpts = typeof serviceOrOpts === "string" ? maybeGlobalOpts : serviceOrOpts ?? {};
+function servicebridge(url, serviceKey, opts = {}) {
   const parsedServiceKey = parseServiceKeyV2(serviceKey);
-  const defaultConsumerPrefix = parsedServiceKey.keyId || "consumer";
+  const service = parsedServiceKey.keyId || "";
+  const globalOpts = opts;
+  const defaultConsumerPrefix = service || "consumer";
   const meta = new grpc.Metadata;
   meta.add("x-service-key", serviceKey);
   const rawUrl = url.trim();
@@ -2097,7 +2097,7 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
     }
   }
   const svc = {
-    async rpc(targetService, fn, payload, opts) {
+    async rpc(targetService, fn, payload, opts2) {
       try {
         await _controlReady;
       } catch (err) {
@@ -2110,10 +2110,10 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
       }
       const lookupKey = `${svcName}/${fname}`;
       const tc = traceStorage.getStore();
-      const traceId = opts?.traceId ?? tc?.traceId ?? crypto.randomUUID();
-      const maxRetries = normalizeNonNegativeInt(opts?.retries ?? globalOpts.retries ?? 3, 3);
-      const baseDelay = normalizePositiveInt(opts?.retryDelay ?? globalOpts.retryDelay ?? 300, 300);
-      const timeout = normalizePositiveInt(opts?.timeout ?? globalOpts.timeout ?? 30000, 30000);
+      const traceId = opts2?.traceId ?? tc?.traceId ?? crypto.randomUUID();
+      const maxRetries = normalizeNonNegativeInt(opts2?.retries ?? globalOpts.retries ?? 3, 3);
+      const baseDelay = normalizePositiveInt(opts2?.retryDelay ?? globalOpts.retryDelay ?? 300, 300);
+      const timeout = normalizePositiveInt(opts2?.timeout ?? globalOpts.timeout ?? 30000, 30000);
       let functionKey = resolveFunctionKey(lookupKey);
       if (!functionKey) {
         await doLookupFunction(lookupKey);
@@ -2132,12 +2132,12 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
       const rpcFnName = fname;
       const rpcServiceName = svcName;
       const rootSpanId = crypto.randomUUID();
-      const parentSpanId = opts?.parentSpanId ?? tc?.spanId ?? "";
+      const parentSpanId = opts2?.parentSpanId ?? tc?.spanId ?? "";
       const rootStartedAt = Date.now();
       const hasRetries = maxRetries > 0;
       reportCallStartAsync(traceId, rootSpanId, parentSpanId, rpcFnName, rootStartedAt, telemetryInputBuf, 1, "rpc", rpcServiceName);
       return traceStorage.run({ traceId, spanId: rootSpanId }, async () => {
-        if (opts?.mode === "proxy") {
+        if (opts2?.mode === "proxy") {
           return await new Promise((resolve, reject) => {
             stub.ProxyCall({
               function_name: functionKey,
@@ -2248,9 +2248,9 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
         throw normalizeServiceError(lastError, lookupKey, "worker");
       });
     },
-    event(topic, payload, opts) {
+    event(topic, payload, opts2) {
       if (!isOnline) {
-        enqueueOffline({ type: "event", topic, payload, opts });
+        enqueueOffline({ type: "event", topic, payload, opts: opts2 });
         return Promise.resolve("");
       }
       const tc = traceStorage.getStore();
@@ -2258,15 +2258,15 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
         stub.Publish({
           topic,
           payload: toJsonBuffer(payload),
-          headers: toWireStringMap(opts?.headers),
-          trace_id: opts?.traceId ?? tc?.traceId ?? "",
-          parent_span_id: opts?.parentSpanId ?? tc?.spanId ?? "",
+          headers: toWireStringMap(opts2?.headers),
+          trace_id: opts2?.traceId ?? tc?.traceId ?? "",
+          parent_span_id: opts2?.parentSpanId ?? tc?.spanId ?? "",
           producer_service: defaultConsumerPrefix,
-          idempotency_key: opts?.idempotencyKey ?? ""
+          idempotency_key: opts2?.idempotencyKey ?? ""
         }, meta, unaryDeadlineOptions(), (err, res) => err ? reject(normalizeServiceError(err, `publish:${topic}`)) : resolve(res?.message_id ?? ""));
       });
     },
-    publishEvent(topic, payload, opts) {
+    publishEvent(topic, payload, opts2) {
       const stream = workerSessionStream;
       if (!stream) {
         return Promise.reject(new Error("publishEvent requires an active worker session (call serve() first)"));
@@ -2277,9 +2277,9 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
         request_id: requestId,
         topic,
         payload: toJsonBuffer(payload),
-        headers: toWireStringMap(opts?.headers),
-        trace_id: opts?.traceId ?? tc?.traceId ?? "",
-        parent_span_id: opts?.parentSpanId ?? tc?.spanId ?? ""
+        headers: toWireStringMap(opts2?.headers),
+        trace_id: opts2?.traceId ?? tc?.traceId ?? "",
+        parent_span_id: opts2?.parentSpanId ?? tc?.spanId ?? ""
       };
       return new Promise((resolve, reject) => {
         const timer = setTimeout(() => {
@@ -2296,12 +2296,12 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
         }
       });
     },
-    handleRpc(fn, handler, opts) {
-      fnHandlers.set(fn, { handler, opts: opts ?? {} });
+    handleRpc(fn, handler, opts2) {
+      fnHandlers.set(fn, { handler, opts: opts2 ?? {} });
       return svc;
     },
-    handleEvent(pattern, handler, opts) {
-      const normalizedOpts = opts ?? {};
+    handleEvent(pattern, handler, opts2) {
+      const normalizedOpts = opts2 ?? {};
       const groupName = `${defaultConsumerPrefix}.${pattern}`;
       if (eventHandlers.has(groupName)) {
         throw new Error(`Duplicate event consumer group "${groupName}". ` + "Use handleEvent() with a unique topic pattern per handler.");
@@ -2314,13 +2314,13 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
       });
       return svc;
     },
-    async serve(opts = {}) {
+    async serve(opts2 = {}) {
       if (workerServer)
         throw new Error("serve() already called");
       if (fnHandlers.size === 0 && eventHandlers.size === 0) {
         throw new Error("No handlers registered. Call handleRpc() or handleEvent() before serve().");
       }
-      if (opts.maxInFlight != null && (!Number.isInteger(opts.maxInFlight) || opts.maxInFlight < 1)) {
+      if (opts2.maxInFlight != null && (!Number.isInteger(opts2.maxInFlight) || opts2.maxInFlight < 1)) {
         throw new Error("serve() maxInFlight must be a positive integer");
       }
       try {
@@ -2329,10 +2329,10 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
           Handle: handleRpc,
           Deliver: handleDeliver
         });
-        const host = opts.host || "localhost";
+        const host = opts2.host || "localhost";
         const isWildcardBind = host === "0.0.0.0" || host === "::";
         const advertiseHost = isWildcardBind ? await outboundIP() || host : host;
-        const tlsOpts = opts.tls ?? effectiveWorkerTLS ?? undefined;
+        const tlsOpts = opts2.tls ?? effectiveWorkerTLS ?? undefined;
         let effectiveCert = toPemBuffer(tlsOpts?.cert);
         let effectiveKey = toPemBuffer(tlsOpts?.key);
         const explicitWorkerCACert = toPemBuffer(tlsOpts?.caCert);
@@ -2344,7 +2344,7 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
           validateWorkerCertAndKeyPair(effectiveCert, effectiveKey);
         }
         if (!effectiveCert || !effectiveKey) {
-          const instanceIdForCert = opts.instanceId || Array.from(crypto.getRandomValues(new Uint8Array(3))).map((b) => b.toString(16).padStart(2, "0")).join("");
+          const instanceIdForCert = opts2.instanceId || Array.from(crypto.getRandomValues(new Uint8Array(3))).map((b) => b.toString(16).padStart(2, "0")).join("");
           const provisioned = await provisionWorkerTLS(stub, meta, service, instanceIdForCert, isWildcardBind && advertiseHost !== host ? advertiseHost : undefined, isWildcardBind && advertiseHost !== host ? [advertiseHost] : undefined);
           effectiveCert = provisioned.cert;
           effectiveKey = provisioned.key;
@@ -2368,13 +2368,13 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
           server.bindAsync(`${host}:0`, serverCreds, (err, p) => err ? reject(err) : resolve(p));
         });
         const endpoint = `${advertiseHost}:${port}`;
-        const instanceId = opts.instanceId || Array.from(crypto.getRandomValues(new Uint8Array(3))).map((b) => b.toString(16).padStart(2, "0")).join("");
+        const instanceId = opts2.instanceId || Array.from(crypto.getRandomValues(new Uint8Array(3))).map((b) => b.toString(16).padStart(2, "0")).join("");
         serveState = {
           endpoint,
           transport: "tls",
-          opts,
+          opts: opts2,
           instanceId,
-          maxInFlight: Math.max(1, Math.trunc(opts.maxInFlight ?? 128))
+          maxInFlight: Math.max(1, Math.trunc(opts2.maxInFlight ?? 128))
         };
         if (effectiveCACert && effectiveCert && effectiveKey) {
           effectiveWorkerTLS = {
@@ -2430,47 +2430,47 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
     },
     async job(serviceOrTarget, fnOrOpts, optsOrUndefined) {
       let target2;
-      let opts;
+      let opts2;
       if (typeof fnOrOpts === "string") {
         const service2 = serviceOrTarget.trim();
         const fn = fnOrOpts.trim();
-        opts = optsOrUndefined ?? { via: "rpc" };
+        opts2 = optsOrUndefined ?? { via: "rpc" };
         if (!service2 || !fn) {
           throw new Error("job: service and fn are required for RPC jobs");
         }
-        if (opts.via !== "rpc") {
+        if (opts2.via !== "rpc") {
           throw new Error("job: via must be 'rpc' when using (service, fn) form");
         }
         target2 = `${service2}/${fn}`;
       } else {
         target2 = serviceOrTarget;
-        opts = fnOrOpts;
-        if (opts.via === "rpc") {
+        opts2 = fnOrOpts;
+        if (opts2.via === "rpc") {
           throw new Error("job: use job(service, fn, opts) form for RPC jobs");
         }
       }
-      jobRegistrations.set(target2, { target: target2, opts });
+      jobRegistrations.set(target2, { target: target2, opts: opts2 });
       if (isOnline) {
         await reconcileRegistrations(`job:${target2}`).catch((err) => {
           reportSDKError(`register-job:${target2}`, err);
         });
       } else {
-        enqueueOffline({ type: "job", target: target2, opts });
+        enqueueOffline({ type: "job", target: target2, opts: opts2 });
       }
       return target2;
     },
-    async workflow(name, steps, opts) {
-      workflowRegistrations.set(name, { name, steps, opts });
+    async workflow(name, steps, opts2) {
+      workflowRegistrations.set(name, { name, steps, opts: opts2 });
       if (isOnline) {
         await reconcileRegistrations(`workflow:${name}`).catch((err) => {
           reportSDKError(`register-workflow:${name}`, err);
         });
       } else {
-        enqueueOffline({ type: "workflow", name, steps, opts });
+        enqueueOffline({ type: "workflow", name, steps, opts: opts2 });
       }
       return name;
     },
-    async executeWorkflow(service2, name, input, opts) {
+    async executeWorkflow(service2, name, input, opts2) {
       await _controlReady;
       const svc2 = service2.trim();
       const wfName = name.trim();
@@ -2510,14 +2510,14 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
         });
       });
     },
-    startHttpSpan(opts) {
+    startHttpSpan(opts2) {
       const tc = traceStorage.getStore();
-      const traceId = opts.traceId ?? tc?.traceId ?? crypto.randomUUID();
+      const traceId = opts2.traceId ?? tc?.traceId ?? crypto.randomUUID();
       const spanId = crypto.randomUUID();
-      const parentSpanId = opts.parentSpanId ?? tc?.spanId ?? "";
-      const fn = `${opts.method} ${opts.path}`;
+      const parentSpanId = opts2.parentSpanId ?? tc?.spanId ?? "";
+      const fn = `${opts2.method} ${opts2.path}`;
       const startedAt = Date.now();
-      const inputBuf = toJsonBuffer({ method: opts.method, path: opts.path });
+      const inputBuf = toJsonBuffer({ method: opts2.method, path: opts2.path });
       reportCallStartAsync(traceId, spanId, parentSpanId, fn, startedAt, inputBuf, 1, "http");
       return {
         traceId,
@@ -2532,17 +2532,17 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
         }
       };
     },
-    async registerHttpEndpoint(opts) {
+    async registerHttpEndpoint(opts2) {
       await _controlReady;
       if (serveState) {
-        const existing = httpRegistrations.get(`${opts.method}:${opts.route}`);
+        const existing = httpRegistrations.get(`${opts2.method}:${opts2.route}`);
         if (!existing) {
-          httpRegistrations.set(`${opts.method}:${opts.route}`, {
-            method: opts.method,
-            route: opts.route,
-            allowedCallers: opts.allowedCallers,
-            requestSchemaJson: opts.requestSchemaJson,
-            responseSchemaJson: opts.responseSchemaJson
+          httpRegistrations.set(`${opts2.method}:${opts2.route}`, {
+            method: opts2.method,
+            route: opts2.route,
+            allowedCallers: opts2.allowedCallers,
+            requestSchemaJson: opts2.requestSchemaJson,
+            responseSchemaJson: opts2.responseSchemaJson
           });
           reconcileRegistrations("http-register").catch((err) => {
             reportSDKError("register-http-endpoint", err);
@@ -2550,9 +2550,9 @@ function servicebridge(url, serviceKey, serviceOrOpts = {}, maybeGlobalOpts = {}
         }
       }
     },
-    watchTrace(traceId, opts) {
-      const key = opts?.key ?? "";
-      const fromSeq = opts?.fromSequence ?? 0;
+    watchTrace(traceId, opts2) {
+      const key = opts2?.key ?? "";
+      const fromSeq = opts2?.fromSequence ?? 0;
       const WATCH_TRACE_QUEUE_LIMIT = 256;
       const WATCH_TRACE_RETRY_MIN_MS = 500;
       const WATCH_TRACE_RETRY_MAX_MS = 5000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "service-bridge",
-  "version": "1.8.4-dev.45",
+  "version": "1.8.4-dev.46",
   "type": "module",
   "description": "ServiceBridge SDK for Node.js — one self-hosted runtime for RPC, events, workflows, and jobs without a service mesh or sidecars. Direct gRPC between workers; durable events, jobs, tracing, auto mTLS. One Go runtime + PostgreSQL.",
   "keywords": [