quidproquo-webserver 0.1.1 → 0.1.2

package/lib/commonjs/services/webSocketQueue/logic/webSocket/messageProcessors/askProcessOnAuthenticate.js

@@ -14,28 +14,35 @@ function isWebSocketAuthenticateMessage(event) {
 }
 function* askProcessOnAuthenticate(connectionId, accessToken) {
     const connection = yield* data_1.webSocketConnectionData.askGetById(connectionId);
-    if (connection) {
-        const apiName = yield* (0, context_1.askWebsocketReadApiNameOrThrow)();
-        const userDirectoryName = yield* (0, quidproquo_core_1.askConfigGetGlobal)((0, config_1.getWebSocketQueueGlobalConfigKeyForUserDirectoryName)(apiName));
-        if (userDirectoryName) {
-            const result = yield* (0, quidproquo_core_1.askCatch)((0, quidproquo_core_1.askUserDirectorySetAccessToken)(userDirectoryName, accessToken));
-            if (!result.success) {
-                yield* (0, askSendMessage_1.askSendMessage)(connectionId, {
-                    type: types_1.WebSocketQueueServerMessageEventType.Unauthenticated,
-                });
-                return;
-            }
-            const decodedAccessToken = result.result;
-            yield* data_1.webSocketConnectionData.askUpsert(Object.assign(Object.assign({}, connection), { userId: decodedAccessToken.userId, accessToken }));
+    // No connection record (e.g. the connect event hasn't been processed yet) —
+    // tell the client rather than dropping the request silently, so it can
+    // distinguish "not authenticated" from "no reply".
+    if (!connection) {
+        yield* (0, askSendMessage_1.askSendMessage)(connectionId, {
+            type: types_1.WebSocketQueueServerMessageEventType.Unauthenticated,
+        });
+        return;
+    }
+    const apiName = yield* (0, context_1.askWebsocketReadApiNameOrThrow)();
+    const userDirectoryName = yield* (0, quidproquo_core_1.askConfigGetGlobal)((0, config_1.getWebSocketQueueGlobalConfigKeyForUserDirectoryName)(apiName));
+    if (userDirectoryName) {
+        const result = yield* (0, quidproquo_core_1.askCatch)((0, quidproquo_core_1.askUserDirectorySetAccessToken)(userDirectoryName, accessToken));
+        if (!result.success) {
             yield* (0, askSendMessage_1.askSendMessage)(connectionId, {
-                type: types_1.WebSocketQueueServerMessageEventType.Authenticated,
+                type: types_1.WebSocketQueueServerMessageEventType.Unauthenticated,
             });
-            // Send a websocket message to the event buss WITHOUT an access token
-            const webSocketQueueClientEventMessageAuthenticate = {
-                type: types_1.WebSocketQueueClientMessageEventType.Authenticate,
-                payload: {},
-            };
-            yield* (0, askBroadcastUnknownMessage_1.askBroadcastUnknownMessage)(webSocketQueueClientEventMessageAuthenticate);
+            return;
         }
+        const decodedAccessToken = result.result;
+        yield* data_1.webSocketConnectionData.askUpsert(Object.assign(Object.assign({}, connection), { userId: decodedAccessToken.userId, accessToken }));
+        yield* (0, askSendMessage_1.askSendMessage)(connectionId, {
+            type: types_1.WebSocketQueueServerMessageEventType.Authenticated,
+        });
+        // Send a websocket message to the event buss WITHOUT an access token
+        const webSocketQueueClientEventMessageAuthenticate = {
+            type: types_1.WebSocketQueueClientMessageEventType.Authenticate,
+            payload: {},
+        };
+        yield* (0, askBroadcastUnknownMessage_1.askBroadcastUnknownMessage)(webSocketQueueClientEventMessageAuthenticate);
     }
 }

package/lib/commonjs/utils/httpEventUtils.d.ts

@@ -4,6 +4,7 @@ import { HTTPEvent, HTTPEventResponse } from '../types/HTTPEvent';
 export declare const rawFromJsonEventRequest: (httpJsonEvent: HTTPEvent) => string | undefined;
 export declare const fromJsonEventRequest: <T>(httpJsonEvent: HTTPEvent) => T;
 export declare function askFromJsonEventRequest<T>(httpJsonEvent: HTTPEvent): AskResponse<T>;
+export declare const readUriQueryParamFromEvent: (event: HTTPEvent, paramName: string) => string | undefined;
 export declare const toJsonEventResponse: (item: any, status?: number) => HTTPEventResponse;
 export declare const toHtmlResponse: (html: string, status?: number) => HTTPEventResponse;
 export declare const toTextResponse: (text: string, status?: number) => HTTPEventResponse;

package/lib/commonjs/utils/httpEventUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toCdnResponse = exports.toMovedTemporarilyRedirectResponse = exports.toMovedPermanentlyRedirectResponse = exports.toTextResponse = exports.toHtmlResponse = exports.toJsonEventResponse = exports.fromJsonEventRequest = exports.rawFromJsonEventRequest = void 0;
+exports.toCdnResponse = exports.toMovedTemporarilyRedirectResponse = exports.toMovedPermanentlyRedirectResponse = exports.toTextResponse = exports.toHtmlResponse = exports.toJsonEventResponse = exports.readUriQueryParamFromEvent = exports.fromJsonEventRequest = exports.rawFromJsonEventRequest = void 0;
 exports.askFromJsonEventRequest = askFromJsonEventRequest;
 const quidproquo_core_1 = require("quidproquo-core");
 const rawFromJsonEventRequest = (httpJsonEvent) => {
@@ -39,6 +39,14 @@ function* askFromJsonEventRequest(httpJsonEvent) {
         return yield* (0, quidproquo_core_1.askThrowError)(quidproquo_core_1.ErrorTypeEnum.BadRequest, 'Unable to parse incoming json from HTTPEvent.');
     }
 }
+const readUriQueryParamFromEvent = (event, paramName) => {
+    const rawValue = event.query[paramName];
+    if (!rawValue) {
+        return undefined;
+    }
+    return Array.isArray(rawValue) ? rawValue[0] : rawValue;
+};
+exports.readUriQueryParamFromEvent = readUriQueryParamFromEvent;
 const toJsonEventResponse = (item, status = 200) => {
     return {
         status,

package/lib/commonjs/utils/networkRequestUtils.js

@@ -22,7 +22,7 @@ const isAbsoluteUrl = (url) => /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url);
 // Join basePath + url like axios' combineURLs (path concatenation), NOT URL
 // resolution. `new URL('/v1/x', 'http://host/api/svc')` drops the base path
 // because a leading-slash url is root-absolute; we want '.../api/svc/v1/x'.
-const combineUrls = (basePath, url) => url ? `${basePath.replace(/\/+$/, '')}/${url.replace(/^\/+/, '')}` : basePath;
+const combineUrls = (basePath, url) => (url ? `${basePath.replace(/\/+$/, '')}/${url.replace(/^\/+/, '')}` : basePath);
 const buildRequestUrl = (payload) => {
     const fullUrl = payload.basePath && !isAbsoluteUrl(payload.url) ? combineUrls(payload.basePath, payload.url) : payload.url;
     const url = new URL(fullUrl);

package/lib/esm/services/webSocketQueue/logic/webSocket/messageProcessors/askProcessOnAuthenticate.js

@@ -10,32 +10,39 @@ export function isWebSocketAuthenticateMessage(event) {
 }
 export function* askProcessOnAuthenticate(connectionId, accessToken) {
     const connection = yield* webSocketConnectionData.askGetById(connectionId);
-    if (connection) {
-        const apiName = yield* askWebsocketReadApiNameOrThrow();
-        const userDirectoryName = yield* askConfigGetGlobal(getWebSocketQueueGlobalConfigKeyForUserDirectoryName(apiName));
-        if (userDirectoryName) {
-            const result = yield* askCatch(askUserDirectorySetAccessToken(userDirectoryName, accessToken));
-            if (!result.success) {
-                yield* askSendMessage(connectionId, {
-                    type: WebSocketQueueServerMessageEventType.Unauthenticated,
-                });
-                return;
-            }
-            const decodedAccessToken = result.result;
-            yield* webSocketConnectionData.askUpsert({
-                ...connection,
-                userId: decodedAccessToken.userId,
-                accessToken,
-            });
+    // No connection record (e.g. the connect event hasn't been processed yet) —
+    // tell the client rather than dropping the request silently, so it can
+    // distinguish "not authenticated" from "no reply".
+    if (!connection) {
+        yield* askSendMessage(connectionId, {
+            type: WebSocketQueueServerMessageEventType.Unauthenticated,
+        });
+        return;
+    }
+    const apiName = yield* askWebsocketReadApiNameOrThrow();
+    const userDirectoryName = yield* askConfigGetGlobal(getWebSocketQueueGlobalConfigKeyForUserDirectoryName(apiName));
+    if (userDirectoryName) {
+        const result = yield* askCatch(askUserDirectorySetAccessToken(userDirectoryName, accessToken));
+        if (!result.success) {
             yield* askSendMessage(connectionId, {
-                type: WebSocketQueueServerMessageEventType.Authenticated,
+                type: WebSocketQueueServerMessageEventType.Unauthenticated,
             });
-            // Send a websocket message to the event buss WITHOUT an access token
-            const webSocketQueueClientEventMessageAuthenticate = {
-                type: WebSocketQueueClientMessageEventType.Authenticate,
-                payload: {},
-            };
-            yield* askBroadcastUnknownMessage(webSocketQueueClientEventMessageAuthenticate);
+            return;
         }
+        const decodedAccessToken = result.result;
+        yield* webSocketConnectionData.askUpsert({
+            ...connection,
+            userId: decodedAccessToken.userId,
+            accessToken,
+        });
+        yield* askSendMessage(connectionId, {
+            type: WebSocketQueueServerMessageEventType.Authenticated,
+        });
+        // Send a websocket message to the event buss WITHOUT an access token
+        const webSocketQueueClientEventMessageAuthenticate = {
+            type: WebSocketQueueClientMessageEventType.Authenticate,
+            payload: {},
+        };
+        yield* askBroadcastUnknownMessage(webSocketQueueClientEventMessageAuthenticate);
     }
 }

package/lib/esm/utils/httpEventUtils.d.ts

@@ -4,6 +4,7 @@ import { HTTPEvent, HTTPEventResponse } from '../types/HTTPEvent';
 export declare const rawFromJsonEventRequest: (httpJsonEvent: HTTPEvent) => string | undefined;
 export declare const fromJsonEventRequest: <T>(httpJsonEvent: HTTPEvent) => T;
 export declare function askFromJsonEventRequest<T>(httpJsonEvent: HTTPEvent): AskResponse<T>;
+export declare const readUriQueryParamFromEvent: (event: HTTPEvent, paramName: string) => string | undefined;
 export declare const toJsonEventResponse: (item: any, status?: number) => HTTPEventResponse;
 export declare const toHtmlResponse: (html: string, status?: number) => HTTPEventResponse;
 export declare const toTextResponse: (text: string, status?: number) => HTTPEventResponse;

package/lib/esm/utils/httpEventUtils.js

@@ -33,6 +33,13 @@ export function* askFromJsonEventRequest(httpJsonEvent) {
         return yield* askThrowError(ErrorTypeEnum.BadRequest, 'Unable to parse incoming json from HTTPEvent.');
     }
 }
+export const readUriQueryParamFromEvent = (event, paramName) => {
+    const rawValue = event.query[paramName];
+    if (!rawValue) {
+        return undefined;
+    }
+    return Array.isArray(rawValue) ? rawValue[0] : rawValue;
+};
 export const toJsonEventResponse = (item, status = 200) => {
     return {
         status,

package/lib/esm/utils/networkRequestUtils.js

@@ -10,7 +10,7 @@ const isAbsoluteUrl = (url) => /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url);
 // Join basePath + url like axios' combineURLs (path concatenation), NOT URL
 // resolution. `new URL('/v1/x', 'http://host/api/svc')` drops the base path
 // because a leading-slash url is root-absolute; we want '.../api/svc/v1/x'.
-const combineUrls = (basePath, url) => url ? `${basePath.replace(/\/+$/, '')}/${url.replace(/^\/+/, '')}` : basePath;
+const combineUrls = (basePath, url) => (url ? `${basePath.replace(/\/+$/, '')}/${url.replace(/^\/+/, '')}` : basePath);
 const buildRequestUrl = (payload) => {
     const fullUrl = payload.basePath && !isAbsoluteUrl(payload.url) ? combineUrls(payload.basePath, payload.url) : payload.url;
     const url = new URL(fullUrl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-webserver",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
@@ -33,10 +33,10 @@
   "homepage": "https://github.com/joe-coady/quidproquo#readme",
   "dependencies": {
     "@anthropic-ai/sdk": "^0.19.1",
-    "quidproquo-core": "0.1.1"
+    "quidproquo-core": "0.1.2"
   },
   "devDependencies": {
-    "quidproquo-tsconfig": "0.1.1",
+    "quidproquo-tsconfig": "0.1.2",
     "typescript": "^5.8.2"
   }
 }