akanjs 3.0.0-alpha.7 → 3.0.0-alpha.71
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +103 -0
- package/README.ko.md +1 -1
- package/README.md +1 -1
- package/base/baseEnv.ts +7 -4
- package/base/primitiveRegistry.ts +59 -12
- package/base/symbols.ts +4 -0
- package/client/capacitor.ts +34 -0
- package/client/clientRuntime.ts +5 -0
- package/client/csrTypes.ts +4 -3
- package/client/index.ts +1 -0
- package/client/locale.ts +2 -2
- package/client/router.ts +7 -7
- package/client/sharedContext.ts +31 -0
- package/client/translator.ts +2 -2
- package/client/types.ts +3 -3
- package/common/Logger.ts +280 -67
- package/common/clientAddress.ts +40 -0
- package/common/deepObjectify.ts +24 -9
- package/common/index.ts +42 -1
- package/common/logContext.ts +27 -0
- package/common/mcpExposure.ts +114 -0
- package/common/pathGetLoose.ts +31 -0
- package/common/pathSet.ts +17 -5
- package/common/plainFieldsOf.ts +13 -0
- package/common/routeConvention.ts +22 -12
- package/common/websocketBinaryFrame.ts +46 -0
- package/constant/crystalize.ts +94 -28
- package/constant/dateSlot.ts +62 -0
- package/constant/deserialize.ts +3 -2
- package/constant/fieldInfo.ts +43 -3
- package/constant/fieldQueryMeta.ts +35 -0
- package/constant/getDefault.ts +16 -11
- package/constant/hydrationPlan.ts +72 -0
- package/constant/immerify.ts +4 -6
- package/constant/index.ts +5 -0
- package/constant/labelOf.ts +26 -0
- package/constant/mask.ts +67 -0
- package/constant/purify.ts +17 -11
- package/constant/textFieldPaths.ts +13 -7
- package/constant/types.ts +19 -13
- package/constant/via.ts +24 -17
- package/dictionary/DictionaryLookup.ts +30 -0
- package/dictionary/agent.dictionary.ts +31 -0
- package/dictionary/agentTurn.dictionary.ts +29 -0
- package/dictionary/base.dictionary.ts +81 -0
- package/dictionary/dictInfo.ts +11 -2
- package/dictionary/dictionary.ts +9 -3
- package/dictionary/index.ts +1 -0
- package/dictionary/trans.ts +2 -2
- package/document/documentQuery.ts +1 -0
- package/document/filterMeta.ts +77 -12
- package/document/index.ts +1 -0
- package/document/noDocumentError.ts +12 -0
- package/document/types.ts +0 -1
- package/fetch/agentTurn.ts +19 -0
- package/fetch/client/fetchClient.ts +137 -37
- package/fetch/client/httpClient.ts +95 -20
- package/fetch/client/wsClient.ts +27 -12
- package/fetch/fetchType/appliedReturn.type.ts +65 -44
- package/fetch/fetchType/endpointFetch.type.ts +17 -8
- package/fetch/fetchType/sliceFetch.type.ts +27 -50
- package/fetch/index.ts +1 -0
- package/index.ts +80 -6
- package/local/apps/akan/akan-local.db +0 -0
- package/local/apps/akan/akan-local.db-shm +0 -0
- package/local/apps/akan/akan-local.db-wal +0 -0
- package/local/apps/akan/akan-local_solid.db +0 -0
- package/local/apps/akan/akan-local_solid.db-shm +0 -0
- package/local/apps/akan/akan-local_solid.db-wal +0 -0
- package/local/apps/serverLifecycle/serverLifecycle-local.db +0 -0
- package/local/apps/serverLifecycle/serverLifecycle-local.db-shm +0 -0
- package/local/apps/serverLifecycle/serverLifecycle-local.db-wal +0 -0
- package/local/apps/serverLifecycle/serverLifecycle-local_solid.db +0 -0
- package/local/apps/serverLifecycle/serverLifecycle-local_solid.db-shm +0 -0
- package/local/apps/serverLifecycle/serverLifecycle-local_solid.db-wal +0 -0
- package/package.json +27 -18
- package/server/akanApp.ts +278 -138
- package/server/akanAppHeaders.ts +16 -2
- package/server/akanOption.ts +63 -8
- package/server/akanServer.ts +387 -32
- package/server/animatedImage.ts +83 -0
- package/server/assetEncoding.ts +4 -24
- package/server/binaryPubsub.ts +55 -0
- package/server/console.ts +110 -101
- package/server/consoleEvaluator.ts +51 -0
- package/server/consolePasteFilter.ts +91 -0
- package/server/consoleSession.ts +242 -0
- package/server/contentEncoding.ts +83 -0
- package/server/devtools/signalSerializer.ts +2 -2
- package/server/devtools/types.ts +4 -4
- package/server/di/diLifecycle.ts +123 -13
- package/server/di/predefinedAdaptor.ts +6 -0
- package/server/di/utils.ts +40 -0
- package/server/imageOptimizer.ts +154 -57
- package/server/lifecycle/runtimeDir.ts +14 -0
- package/server/lifecycle/shutdownManager.ts +1 -1
- package/server/logging/childOutputReader.ts +137 -0
- package/server/logging/hubFileSink.ts +39 -0
- package/server/logging/logControlSocket.ts +173 -0
- package/server/logging/logForwarder.ts +131 -0
- package/server/logging/logHub.ts +0 -0
- package/server/logging/logQuery.ts +130 -0
- package/server/logging/logStdoutWriter.ts +39 -0
- package/server/logging/logStreamRoute.ts +87 -0
- package/server/logging/logTailClient.ts +161 -0
- package/server/mcp/McpAuth.ts +177 -0
- package/server/mcp/McpDispatcher.ts +289 -0
- package/server/mcp/McpEventStream.ts +24 -0
- package/server/mcp/McpExecutionContext.ts +105 -0
- package/server/mcp/McpRouter.ts +621 -0
- package/server/mcp/index.ts +5 -0
- package/server/processMetricsCollector.ts +1 -1
- package/server/resolver/database.resolver.ts +5 -4
- package/server/resolver/signal.resolver.ts +208 -86
- package/server/routeTreeBuilder.ts +10 -8
- package/server/routing/apiRouter.ts +44 -14
- package/server/routing/appWsData.ts +24 -2
- package/server/routing/eventStream.ts +93 -0
- package/server/routing/soloAppRoutes.ts +50 -0
- package/server/rscWorker.tsx +36 -22
- package/server/rscWorkerHost.ts +59 -8
- package/server/semaphore.ts +22 -0
- package/server/subRouteIndexDocument.tsx +61 -0
- package/server/systemPageDocument.tsx +3 -3
- package/server/systemPages.tsx +49 -16
- package/server/types.tsx +28 -0
- package/server/vendor/akanjs-fetch.ts +1 -0
- package/server/webRouter.ts +96 -39
- package/service/adapt.ts +4 -4
- package/service/agent.service.ts +81 -0
- package/service/base.service.ts +2 -1
- package/service/index.ts +1 -0
- package/service/injectInfo.ts +8 -3
- package/service/ipcTypes.ts +6 -0
- package/service/predefinedAdaptor/compress.adaptor.ts +5 -1
- package/service/predefinedAdaptor/database.adaptor.ts +68 -37
- package/service/predefinedAdaptor/deepseekLlm.ts +271 -0
- package/service/predefinedAdaptor/index.ts +3 -0
- package/service/predefinedAdaptor/insightQuery.ts +183 -0
- package/service/predefinedAdaptor/llm.adaptor.ts +115 -0
- package/service/predefinedAdaptor/logging.adaptor.ts +1 -1
- package/service/predefinedAdaptor/queue.adaptor.ts +5 -2
- package/service/predefinedAdaptor/role.adaptor.ts +2 -0
- package/service/predefinedAdaptor/schedule.adaptor.ts +12 -5
- package/service/predefinedAdaptor/solidPubsub.adaptor.ts +10 -6
- package/service/predefinedAdaptor/solidQueue.adaptor.ts +6 -2
- package/service/predefinedAdaptor/solidSqlite.ts +11 -9
- package/service/predefinedAdaptor/websocket.adaptor.ts +6 -1
- package/service/serve.ts +16 -9
- package/service/toolNames.ts +119 -0
- package/signal/agent/AgentCatalogue.ts +165 -0
- package/signal/agent/index.ts +1 -0
- package/signal/agent.signal.ts +38 -0
- package/signal/agentTurn.ts +8 -0
- package/signal/agentTurnStream.ts +60 -0
- package/signal/base.signal.ts +2 -1
- package/signal/endpointInfo.ts +38 -2
- package/signal/guard.ts +28 -1
- package/signal/guards.ts +49 -1
- package/signal/index.ts +6 -0
- package/signal/intercept.ts +4 -4
- package/signal/internalArg.ts +21 -4
- package/signal/mcp/McpDocument.ts +326 -0
- package/signal/mcp/McpProgress.ts +106 -0
- package/signal/mcp/McpUriTemplate.ts +80 -0
- package/signal/mcp/Msg.ts +368 -0
- package/signal/mcp/index.ts +5 -0
- package/signal/mcp/mcpProtocol.ts +120 -0
- package/signal/middleware.ts +3 -3
- package/signal/openapi/openapi.ts +36 -173
- package/signal/schema/JsonSchemaBuilder.ts +221 -0
- package/signal/schema/index.ts +1 -0
- package/signal/serializer/fetch.serializer.ts +51 -0
- package/signal/signalContext.ts +324 -76
- package/signal/slice.ts +62 -27
- package/signal/trace.ts +268 -9
- package/signal/types.ts +55 -4
- package/store/action.ts +34 -41
- package/store/actionTag.ts +33 -0
- package/store/agent/AgentBridge.ts +87 -0
- package/store/agent/AgentContext.ts +71 -0
- package/store/agent/AgentPrompts.ts +111 -0
- package/store/agent/ScreenReader.ts +349 -0
- package/store/agent/ScreenSettle.ts +45 -0
- package/store/agent/ScreenTarget.ts +135 -0
- package/store/agent/StoreCatalogue.ts +116 -0
- package/store/agent/StoreSurfaceSource.ts +225 -0
- package/store/agent/index.ts +13 -0
- package/store/agent/storeSurface.ts +28 -0
- package/store/agent/types.ts +16 -0
- package/store/agentic/AgentValue.ts +119 -0
- package/store/agentic/StExposeBuilder.ts +47 -0
- package/store/agentic/StExposeDraft.ts +24 -0
- package/store/agentic/StStateBuilder.ts +85 -0
- package/store/agentic/StStateDraft.ts +23 -0
- package/store/agentic/StToolBuilder.ts +279 -0
- package/store/agentic/StToolDraft.ts +22 -0
- package/store/agentic/attachAgentic.ts +33 -0
- package/store/agentic/formFields.ts +194 -0
- package/store/agentic/index.ts +12 -0
- package/store/agentic/useFieldTool.ts +183 -0
- package/store/agentic/useFormTools.ts +77 -0
- package/store/agentic/useRelationFieldTool.ts +113 -0
- package/store/baseSt.ts +1 -1
- package/store/databaseStateNames.ts +31 -0
- package/store/formSetterNames.ts +35 -0
- package/store/index.ts +8 -0
- package/store/rootStore.ts +3 -1
- package/store/sliceRole.ts +36 -0
- package/store/state.ts +2 -12
- package/store/store.ts +9 -0
- package/store/storeInstance.ts +185 -20
- package/store/storeRegistry.ts +39 -1
- package/store/types.ts +5 -0
- package/store/withSelector.ts +5 -4
- package/test/index.ts +1 -1
- package/test/registerDom.ts +4 -0
- package/test/sampleOf.ts +2 -0
- package/test/signalTestRuntime.ts +5 -5
- package/test/testServer.ts +14 -11
- package/types/base/baseEnv.d.ts +1 -1
- package/types/base/primitiveRegistry.d.ts +20 -8
- package/types/base/symbols.d.ts +4 -0
- package/types/client/capacitor.d.ts +39 -0
- package/types/client/clientRuntime.d.ts +7 -0
- package/types/client/index.d.ts +1 -0
- package/types/client/sharedContext.d.ts +21 -0
- package/types/client/types.d.ts +5 -3
- package/types/common/Logger.d.ts +88 -6
- package/types/common/clientAddress.d.ts +19 -0
- package/types/common/deepObjectify.d.ts +4 -2
- package/types/common/index.d.ts +8 -2
- package/types/common/logContext.d.ts +17 -0
- package/types/common/mcpExposure.d.ts +64 -0
- package/types/common/pathGetLoose.d.ts +8 -0
- package/types/common/plainFieldsOf.d.ts +6 -0
- package/types/common/routeConvention.d.ts +6 -0
- package/types/common/websocketBinaryFrame.d.ts +17 -0
- package/types/constant/constantRegistry.d.ts +2 -10
- package/types/constant/crystalize.d.ts +5 -0
- package/types/constant/dateSlot.d.ts +14 -0
- package/types/constant/fieldInfo.d.ts +20 -3
- package/types/constant/fieldQueryMeta.d.ts +17 -0
- package/types/constant/getDefault.d.ts +8 -0
- package/types/constant/hydrationPlan.d.ts +24 -0
- package/types/constant/index.d.ts +5 -0
- package/types/constant/labelOf.d.ts +7 -0
- package/types/constant/mask.d.ts +41 -0
- package/types/constant/purify.d.ts +2 -2
- package/types/constant/types.d.ts +5 -5
- package/types/dictionary/DictionaryLookup.d.ts +14 -0
- package/types/dictionary/agent.dictionary.d.ts +1 -0
- package/types/dictionary/agentTurn.dictionary.d.ts +1 -0
- package/types/dictionary/base.dictionary.d.ts +1 -1
- package/types/dictionary/dictInfo.d.ts +7 -1
- package/types/dictionary/dictionary.d.ts +11 -9
- package/types/dictionary/index.d.ts +1 -0
- package/types/document/filterMeta.d.ts +24 -4
- package/types/document/index.d.ts +1 -0
- package/types/document/noDocumentError.d.ts +12 -0
- package/types/document/types.d.ts +0 -1
- package/types/fetch/agentTurn.d.ts +475 -0
- package/types/fetch/client/fetchClient.d.ts +12 -0
- package/types/fetch/client/httpClient.d.ts +2 -1
- package/types/fetch/fetchType/appliedReturn.type.d.ts +37 -18
- package/types/fetch/fetchType/endpointFetch.type.d.ts +8 -5
- package/types/fetch/fetchType/sliceFetch.type.d.ts +11 -15
- package/types/fetch/index.d.ts +1 -0
- package/types/index.d.ts +74 -10
- package/types/server/akanApp.d.ts +12 -0
- package/types/server/akanAppHeaders.d.ts +7 -1
- package/types/server/akanOption.d.ts +36 -6
- package/types/server/akanServer.d.ts +67 -9
- package/types/server/animatedImage.d.ts +7 -0
- package/types/server/assetEncoding.d.ts +1 -1
- package/types/server/binaryPubsub.d.ts +18 -0
- package/types/server/console.d.ts +11 -1
- package/types/server/consoleEvaluator.d.ts +2 -0
- package/types/server/consolePasteFilter.d.ts +11 -0
- package/types/server/consoleSession.d.ts +22 -0
- package/types/server/contentEncoding.d.ts +28 -0
- package/types/server/devtools/types.d.ts +4 -4
- package/types/server/di/diLifecycle.d.ts +10 -2
- package/types/server/di/predefinedAdaptor.d.ts +4 -1
- package/types/server/di/utils.d.ts +16 -0
- package/types/server/lifecycle/runtimeDir.d.ts +5 -0
- package/types/server/logging/childOutputReader.d.ts +40 -0
- package/types/server/logging/hubFileSink.d.ts +18 -0
- package/types/server/logging/logControlSocket.d.ts +60 -0
- package/types/server/logging/logForwarder.d.ts +37 -0
- package/types/server/logging/logHub.d.ts +70 -0
- package/types/server/logging/logQuery.d.ts +31 -0
- package/types/server/logging/logStdoutWriter.d.ts +35 -0
- package/types/server/logging/logStreamRoute.d.ts +20 -0
- package/types/server/logging/logTailClient.d.ts +42 -0
- package/types/server/mcp/McpAuth.d.ts +62 -0
- package/types/server/mcp/McpDispatcher.d.ts +61 -0
- package/types/server/mcp/McpEventStream.d.ts +17 -0
- package/types/server/mcp/McpExecutionContext.d.ts +44 -0
- package/types/server/mcp/McpRouter.d.ts +65 -0
- package/types/server/mcp/index.d.ts +5 -0
- package/types/server/mcp.d.ts +1 -0
- package/types/server/resolver/signal.resolver.d.ts +7 -4
- package/types/server/routing/apiRouter.d.ts +2 -1
- package/types/server/routing/appWsData.d.ts +13 -1
- package/types/server/routing/eventStream.d.ts +23 -0
- package/types/server/routing/soloAppRoutes.d.ts +17 -0
- package/types/server/rscWorkerHost.d.ts +4 -1
- package/types/server/semaphore.d.ts +5 -0
- package/types/server/subRouteIndexDocument.d.ts +8 -0
- package/types/server/systemPageDocument.d.ts +1 -0
- package/types/server/systemPages.d.ts +5 -0
- package/types/server/types.d.ts +16 -0
- package/types/server/vendor/akanjs-fetch.d.ts +1 -0
- package/types/server/webRouter.d.ts +15 -4
- package/types/service/adapt.d.ts +2 -2
- package/types/service/agent.service.d.ts +32 -0
- package/types/service/base.service.d.ts +4 -0
- package/types/service/index.d.ts +1 -0
- package/types/service/injectInfo.d.ts +2 -2
- package/types/service/ipcTypes.d.ts +12 -0
- package/types/service/predefinedAdaptor/compress.adaptor.d.ts +1 -1
- package/types/service/predefinedAdaptor/database.adaptor.d.ts +9 -3
- package/types/service/predefinedAdaptor/deepseekLlm.d.ts +76 -0
- package/types/service/predefinedAdaptor/index.d.ts +3 -0
- package/types/service/predefinedAdaptor/insightQuery.d.ts +50 -0
- package/types/service/predefinedAdaptor/llm.adaptor.d.ts +105 -0
- package/types/service/predefinedAdaptor/queue.adaptor.d.ts +3 -2
- package/types/service/predefinedAdaptor/role.adaptor.d.ts +2 -0
- package/types/service/predefinedAdaptor/schedule.adaptor.d.ts +10 -6
- package/types/service/predefinedAdaptor/solidQueue.adaptor.d.ts +6 -2
- package/types/service/predefinedAdaptor/solidSqlite.d.ts +2 -2
- package/types/service/serve.d.ts +3 -3
- package/types/service/toolNames.d.ts +35 -0
- package/types/signal/agent/AgentCatalogue.d.ts +100 -0
- package/types/signal/agent/index.d.ts +1 -0
- package/types/signal/agent.d.ts +1 -0
- package/types/signal/agent.signal.d.ts +24 -0
- package/types/signal/agentTurn.d.ts +9 -0
- package/types/signal/agentTurnStream.d.ts +24 -0
- package/types/signal/base.signal.d.ts +1 -1
- package/types/signal/endpointInfo.d.ts +21 -3
- package/types/signal/guard.d.ts +12 -0
- package/types/signal/guards.d.ts +23 -1
- package/types/signal/index.d.ts +6 -0
- package/types/signal/intercept.d.ts +2 -2
- package/types/signal/internalArg.d.ts +22 -6
- package/types/signal/mcp/McpDocument.d.ts +84 -0
- package/types/signal/mcp/McpProgress.d.ts +40 -0
- package/types/signal/mcp/McpUriTemplate.d.ts +25 -0
- package/types/signal/mcp/Msg.d.ts +143 -0
- package/types/signal/mcp/index.d.ts +5 -0
- package/types/signal/mcp/mcpProtocol.d.ts +107 -0
- package/types/signal/mcp.d.ts +1 -0
- package/types/signal/middleware.d.ts +7 -7
- package/types/signal/openapi/openapi.d.ts +3 -3
- package/types/signal/schema/JsonSchemaBuilder.d.ts +51 -0
- package/types/signal/schema/index.d.ts +1 -0
- package/types/signal/schema.d.ts +1 -0
- package/types/signal/signalContext.d.ts +67 -8
- package/types/signal/slice.d.ts +42 -15
- package/types/signal/trace.d.ts +52 -2
- package/types/signal/types.d.ts +53 -4
- package/types/store/action.d.ts +7 -5
- package/types/store/actionTag.d.ts +21 -0
- package/types/store/agent/AgentBridge.d.ts +37 -0
- package/types/store/agent/AgentContext.d.ts +16 -0
- package/types/store/agent/AgentPrompts.d.ts +31 -0
- package/types/store/agent/ScreenReader.d.ts +29 -0
- package/types/store/agent/ScreenSettle.d.ts +22 -0
- package/types/store/agent/ScreenTarget.d.ts +34 -0
- package/types/store/agent/StoreCatalogue.d.ts +26 -0
- package/types/store/agent/StoreSurfaceSource.d.ts +30 -0
- package/types/store/agent/index.d.ts +11 -0
- package/types/store/agent/storeSurface.d.ts +14 -0
- package/types/store/agent/types.d.ts +15 -0
- package/types/store/agent.d.ts +1 -0
- package/types/store/agentic/AgentValue.d.ts +43 -0
- package/types/store/agentic/StExposeBuilder.d.ts +21 -0
- package/types/store/agentic/StExposeDraft.d.ts +13 -0
- package/types/store/agentic/StStateBuilder.d.ts +21 -0
- package/types/store/agentic/StStateDraft.d.ts +12 -0
- package/types/store/agentic/StToolBuilder.d.ts +56 -0
- package/types/store/agentic/StToolDraft.d.ts +13 -0
- package/types/store/agentic/attachAgentic.d.ts +25 -0
- package/types/store/agentic/formFields.d.ts +53 -0
- package/types/store/agentic/index.d.ts +12 -0
- package/types/store/agentic/useFieldTool.d.ts +22 -0
- package/types/store/agentic/useFormTools.d.ts +19 -0
- package/types/store/agentic/useRelationFieldTool.d.ts +27 -0
- package/types/store/agentic.d.ts +1 -0
- package/types/store/baseSt.d.ts +35 -39
- package/types/store/databaseStateNames.d.ts +25 -0
- package/types/store/formSetterNames.d.ts +30 -0
- package/types/store/index.d.ts +7 -0
- package/types/store/rootStore.d.ts +5 -1
- package/types/store/sliceRole.d.ts +25 -0
- package/types/store/store.d.ts +5 -1
- package/types/store/storeInstance.d.ts +33 -1
- package/types/store/storeRegistry.d.ts +5 -0
- package/types/store/types.d.ts +4 -0
- package/types/store/withSelector.d.ts +5 -4
- package/types/test/index.d.ts +1 -1
- package/types/test/registerDom.d.ts +1 -0
- package/types/test/signalTestRuntime.d.ts +2 -3
- package/types/test/testServer.d.ts +6 -4
- package/types/ui/Agent/Approval.d.ts +8 -0
- package/types/ui/Agent/Attach.d.ts +16 -0
- package/types/ui/Agent/Bubble.d.ts +26 -0
- package/types/ui/Agent/Chat.d.ts +91 -0
- package/types/ui/Agent/ChatCommands.d.ts +34 -0
- package/types/ui/Agent/Composer.d.ts +23 -0
- package/types/ui/Agent/Context.d.ts +13 -0
- package/types/ui/Agent/Dock.d.ts +17 -0
- package/types/ui/Agent/Guide.d.ts +9 -0
- package/types/ui/Agent/History.d.ts +26 -0
- package/types/ui/Agent/Launcher.d.ts +16 -0
- package/types/ui/Agent/Markdown.d.ts +19 -0
- package/types/ui/Agent/Menu.d.ts +18 -0
- package/types/ui/Agent/Mic.d.ts +8 -0
- package/types/ui/Agent/Question.d.ts +14 -0
- package/types/ui/Agent/Section.d.ts +10 -0
- package/types/ui/Agent/Skip.d.ts +22 -0
- package/types/ui/Agent/StateKey.d.ts +16 -0
- package/types/ui/Agent/Tool.d.ts +15 -0
- package/types/ui/Agent/Transcript.d.ts +13 -0
- package/types/ui/Agent/Zone.d.ts +48 -0
- package/types/ui/Agent/agentSessionOf.d.ts +27 -0
- package/types/ui/Agent/attachment.d.ts +34 -0
- package/types/ui/Agent/fetchRunner.d.ts +12 -0
- package/types/ui/Agent/index.d.ts +19 -0
- package/types/ui/Agent/index_.d.ts +1 -0
- package/types/ui/Agent/markdownBlocks.d.ts +35 -0
- package/types/ui/Agent/markdownSpans.d.ts +2 -0
- package/types/ui/Agent/markdownTable.d.ts +16 -0
- package/types/ui/Agent/sessionHistory.d.ts +14 -0
- package/types/ui/Agent/sessionView.d.ts +15 -0
- package/types/ui/Agent/tokenCount.d.ts +6 -0
- package/types/ui/Agent/useChatAttachments.d.ts +24 -0
- package/types/ui/Agent/useChatVoice.d.ts +30 -0
- package/types/ui/Agent/useDraftRecall.d.ts +14 -0
- package/types/ui/Agent/useKeyboardInset.d.ts +8 -0
- package/types/ui/Agent/useSlashMenu.d.ts +24 -0
- package/types/ui/Agent/voice.d.ts +71 -0
- package/types/ui/Agent.d.ts +1 -0
- package/types/ui/Badge.d.ts +1 -1
- package/types/ui/Button.d.ts +1 -1
- package/types/ui/Constant/Graph.d.ts +10 -0
- package/types/ui/Constant/index.d.ts +2 -1
- package/types/ui/Constant/schemaGraph.d.ts +39 -0
- package/types/ui/Data/Dashboard.d.ts +16 -3
- package/types/ui/Data/Insight.d.ts +1 -1
- package/types/ui/Data/ListContainer.d.ts +15 -7
- package/types/ui/Data/QueryMaker.d.ts +45 -3
- package/types/ui/Data/RefPicker.d.ts +16 -0
- package/types/ui/Data/dataExport.d.ts +5 -0
- package/types/ui/Data/dataText.d.ts +6 -0
- package/types/ui/Data/index.d.ts +2 -0
- package/types/ui/Data/index_.d.ts +1 -0
- package/types/ui/DatePicker.d.ts +15 -11
- package/types/ui/Dialog/LegacyModal.d.ts +13 -0
- package/types/ui/Dialog/Provider.d.ts +3 -1
- package/types/ui/Dialog/context.d.ts +9 -1
- package/types/ui/Dialog/index.d.ts +1 -0
- package/types/ui/DraggableList.d.ts +1 -1
- package/types/ui/Dropdown.d.ts +5 -1
- package/types/ui/Field.d.ts +13 -12
- package/types/ui/Layout/BottomTab.d.ts +3 -2
- package/types/ui/LegacyModal.d.ts +24 -0
- package/types/ui/Loading/ProgressBar.d.ts +4 -0
- package/types/ui/Loading/Spin.d.ts +2 -1
- package/types/ui/Model/AdminPanel.d.ts +15 -3
- package/types/ui/Model/EditModal.d.ts +1 -1
- package/types/ui/Model/New.d.ts +3 -1
- package/types/ui/Model/NewWrapper.d.ts +2 -0
- package/types/ui/Model/NewWrapper_Client.d.ts +2 -1
- package/types/ui/Pagination.d.ts +2 -2
- package/types/ui/Radio.d.ts +1 -1
- package/types/ui/RecentTime.d.ts +18 -1
- package/types/ui/Reference/Collapse.d.ts +11 -0
- package/types/ui/Reference/Panel.d.ts +29 -0
- package/types/ui/Reference/Segmented.d.ts +17 -0
- package/types/ui/Reference/Summary.d.ts +13 -0
- package/types/ui/Reference/Toolbar.d.ts +21 -0
- package/types/ui/Reference/dictText.d.ts +6 -0
- package/types/ui/Reference/index.d.ts +7 -0
- package/types/ui/Reference/style.d.ts +20 -0
- package/types/ui/Reference.d.ts +1 -0
- package/types/ui/ScreenNavigator.d.ts +3 -1
- package/types/ui/Signal/Arg.d.ts +7 -3
- package/types/ui/Signal/Doc.d.ts +4 -6
- package/types/ui/Signal/Object.d.ts +2 -1
- package/types/ui/Signal/RestApi.d.ts +2 -1
- package/types/ui/Signal/WebSocket.d.ts +2 -1
- package/types/ui/Signal/endpointEntries.d.ts +20 -0
- package/types/ui/Signal/style.d.ts +9 -8
- package/types/ui/System/Client.d.ts +1 -2
- package/types/ui/System/Common.d.ts +3 -4
- package/types/ui/System/Messages.d.ts +1 -1
- package/types/ui/Tab/Provider.d.ts +3 -1
- package/types/ui/Tab/context.d.ts +4 -2
- package/types/ui/ToggleSelect.d.ts +1 -0
- package/types/ui/UiOverride/context.d.ts +18 -1
- package/types/ui/agentAttrs.d.ts +14 -0
- package/types/ui/index.d.ts +22 -1
- package/types/ui/overlayLayer.d.ts +13 -0
- package/types/ui/overlayPosition.d.ts +28 -0
- package/types/ui/recipe/badgeRecipe.d.ts +2 -2
- package/types/ui/recipe/buttonRecipe.d.ts +2 -2
- package/types/vendor/use-agentic/AgentAbort.d.ts +17 -0
- package/types/vendor/use-agentic/AgentProgress.d.ts +27 -0
- package/types/vendor/use-agentic/AgentProvider.d.ts +17 -0
- package/types/vendor/use-agentic/AgentScope.d.ts +9 -0
- package/types/vendor/use-agentic/AgentSession.d.ts +163 -0
- package/types/vendor/use-agentic/Agentic.d.ts +21 -0
- package/types/vendor/use-agentic/AgenticSurface.d.ts +58 -0
- package/types/vendor/use-agentic/Compaction.d.ts +48 -0
- package/types/vendor/use-agentic/ToolOutput.d.ts +21 -0
- package/types/vendor/use-agentic/Transcript.d.ts +18 -0
- package/types/vendor/use-agentic/httpRunner.d.ts +15 -0
- package/types/vendor/use-agentic/index.d.ts +19 -0
- package/types/vendor/use-agentic/sharedContext.d.ts +15 -0
- package/types/vendor/use-agentic/surfaceContext.d.ts +5 -0
- package/types/vendor/use-agentic/types.d.ts +182 -0
- package/types/vendor/use-agentic/useAgent.d.ts +4 -0
- package/types/vendor/use-agentic/useAgentGuide.d.ts +6 -0
- package/types/vendor/use-agentic/useAgentResource.d.ts +12 -0
- package/types/vendor/use-agentic/useAgentState.d.ts +16 -0
- package/types/vendor/use-agentic/useAgentTool.d.ts +16 -0
- package/types/vendor/use-agentic.d.ts +1 -0
- package/types/webkit/index.d.ts +4 -0
- package/types/webkit/useBodyScrollLock.d.ts +2 -0
- package/types/webkit/usePageTool.d.ts +19 -0
- package/types/webkit/useScreenScope.d.ts +25 -0
- package/ui/Agent/Approval.tsx +32 -0
- package/ui/Agent/Attach.tsx +77 -0
- package/ui/Agent/Bubble.tsx +192 -0
- package/ui/Agent/Chat.tsx +525 -0
- package/ui/Agent/ChatCommands.ts +141 -0
- package/ui/Agent/Composer.tsx +94 -0
- package/ui/Agent/Context.tsx +49 -0
- package/ui/Agent/Dock.tsx +77 -0
- package/ui/Agent/Guide.tsx +16 -0
- package/ui/Agent/History.tsx +49 -0
- package/ui/Agent/Launcher.tsx +60 -0
- package/ui/Agent/Markdown.tsx +142 -0
- package/ui/Agent/Menu.tsx +55 -0
- package/ui/Agent/Mic.tsx +27 -0
- package/ui/Agent/Question.tsx +63 -0
- package/ui/Agent/Section.tsx +24 -0
- package/ui/Agent/Skip.tsx +30 -0
- package/ui/Agent/StateKey.tsx +46 -0
- package/ui/Agent/Tool.tsx +59 -0
- package/ui/Agent/Transcript.tsx +33 -0
- package/ui/Agent/Zone.tsx +116 -0
- package/ui/Agent/agentSessionOf.ts +60 -0
- package/ui/Agent/attachment.ts +73 -0
- package/ui/Agent/fetchRunner.ts +44 -0
- package/ui/Agent/index.ts +27 -0
- package/ui/Agent/index_.tsx +4 -0
- package/ui/Agent/markdownBlocks.ts +137 -0
- package/ui/Agent/markdownSpans.tsx +49 -0
- package/ui/Agent/markdownTable.ts +54 -0
- package/ui/Agent/sessionHistory.ts +62 -0
- package/ui/Agent/sessionView.ts +38 -0
- package/ui/Agent/tokenCount.ts +10 -0
- package/ui/Agent/useChatAttachments.ts +84 -0
- package/ui/Agent/useChatVoice.ts +129 -0
- package/ui/Agent/useDraftRecall.ts +42 -0
- package/ui/Agent/useKeyboardInset.ts +26 -0
- package/ui/Agent/useSlashMenu.ts +58 -0
- package/ui/Agent/voice.ts +177 -0
- package/ui/Badge.tsx +1 -1
- package/ui/BottomSheet.tsx +32 -36
- package/ui/Button.tsx +3 -1
- package/ui/Clipboard.tsx +3 -6
- package/ui/Constant/Doc.tsx +265 -254
- package/ui/Constant/Graph.tsx +151 -0
- package/ui/Constant/index.ts +3 -2
- package/ui/Constant/schemaGraph.ts +232 -0
- package/ui/Data/CardList.tsx +14 -3
- package/ui/Data/Dashboard.tsx +70 -52
- package/ui/Data/Insight.tsx +18 -12
- package/ui/Data/Item.tsx +42 -56
- package/ui/Data/ListContainer.tsx +246 -132
- package/ui/Data/Pagination.tsx +10 -3
- package/ui/Data/QueryMaker.tsx +160 -11
- package/ui/Data/RefPicker.tsx +202 -0
- package/ui/Data/TableList.tsx +22 -13
- package/ui/Data/dataExport.ts +54 -0
- package/ui/Data/dataText.ts +22 -0
- package/ui/Data/index.ts +13 -1
- package/ui/Data/index_.tsx +1 -0
- package/ui/DatePicker.tsx +110 -128
- package/ui/Dialog/Close.tsx +3 -7
- package/ui/Dialog/LegacyModal.tsx +241 -0
- package/ui/Dialog/Modal.tsx +62 -195
- package/ui/Dialog/Provider.tsx +47 -3
- package/ui/Dialog/Trigger.tsx +3 -7
- package/ui/Dialog/context.ts +14 -2
- package/ui/Dialog/index.tsx +2 -0
- package/ui/DragAction.tsx +3 -2
- package/ui/DraggableList.tsx +9 -4
- package/ui/Dropdown.tsx +89 -27
- package/ui/Empty.tsx +6 -4
- package/ui/Field.tsx +128 -58
- package/ui/Input.tsx +27 -5
- package/ui/KeyboardAvoiding.tsx +2 -2
- package/ui/Layout/BottomTab.tsx +32 -37
- package/ui/Layout/Sider.tsx +37 -14
- package/ui/LegacyModal.tsx +53 -0
- package/ui/Link/CsrLink.tsx +1 -1
- package/ui/Load/Pagination.tsx +15 -8
- package/ui/Load/Units.tsx +30 -7
- package/ui/Load/View.tsx +10 -3
- package/ui/Loading/Area.tsx +7 -6
- package/ui/Loading/Button.tsx +7 -9
- package/ui/Loading/Input.tsx +7 -9
- package/ui/Loading/ProgressBar.tsx +16 -7
- package/ui/Loading/Skeleton.tsx +8 -13
- package/ui/Loading/Spin.tsx +20 -14
- package/ui/Menu.tsx +1 -1
- package/ui/Model/AdminPanel.tsx +52 -12
- package/ui/Model/EditModal.tsx +28 -6
- package/ui/Model/EditWrapper.tsx +16 -4
- package/ui/Model/New.tsx +4 -0
- package/ui/Model/NewWrapper.tsx +2 -0
- package/ui/Model/NewWrapper_Client.tsx +20 -6
- package/ui/Model/Remove.tsx +18 -6
- package/ui/Model/RemoveWrapper.tsx +12 -2
- package/ui/Model/SureToRemove.tsx +18 -6
- package/ui/Model/ViewEditModal.tsx +64 -15
- package/ui/Model/ViewModal.tsx +25 -11
- package/ui/Model/ViewWrapper.tsx +15 -4
- package/ui/Model/index_.tsx +1 -1
- package/ui/Pagination.tsx +51 -66
- package/ui/Popconfirm.tsx +88 -78
- package/ui/Radio.tsx +53 -24
- package/ui/RecentTime.tsx +83 -35
- package/ui/Reference/Collapse.tsx +26 -0
- package/ui/Reference/Panel.tsx +79 -0
- package/ui/Reference/Segmented.tsx +41 -0
- package/ui/Reference/Summary.tsx +25 -0
- package/ui/Reference/Toolbar.tsx +44 -0
- package/ui/Reference/dictText.ts +9 -0
- package/ui/Reference/index.ts +7 -0
- package/ui/Reference/style.ts +45 -0
- package/ui/ScreenNavigator.tsx +17 -2
- package/ui/Select.tsx +96 -57
- package/ui/Signal/Arg.tsx +83 -68
- package/ui/Signal/Doc.tsx +163 -129
- package/ui/Signal/Listener.tsx +40 -29
- package/ui/Signal/Message.tsx +87 -135
- package/ui/Signal/Object.tsx +79 -57
- package/ui/Signal/PubSub.tsx +72 -113
- package/ui/Signal/Request.tsx +2 -22
- package/ui/Signal/Response.tsx +19 -45
- package/ui/Signal/RestApi.tsx +170 -200
- package/ui/Signal/WebSocket.tsx +29 -26
- package/ui/Signal/endpointEntries.ts +59 -0
- package/ui/Signal/makeExample.ts +10 -3
- package/ui/Signal/style.ts +34 -29
- package/ui/Switch.tsx +4 -0
- package/ui/System/CSR.tsx +1 -1
- package/ui/System/Client.tsx +31 -15
- package/ui/System/Common.tsx +3 -4
- package/ui/System/DevModeToggle.tsx +1 -1
- package/ui/System/Gtag.tsx +2 -2
- package/ui/System/Messages.tsx +52 -31
- package/ui/System/Reconnect.tsx +22 -56
- package/ui/System/SelectLanguage.tsx +24 -15
- package/ui/System/ThemeToggle.tsx +25 -13
- package/ui/Tab/Menu.tsx +24 -12
- package/ui/Tab/Menus.tsx +6 -3
- package/ui/Tab/Provider.tsx +30 -3
- package/ui/Tab/context.ts +8 -4
- package/ui/Table.tsx +66 -60
- package/ui/ToggleSelect.tsx +8 -7
- package/ui/Tooltip.tsx +15 -1
- package/ui/UiOverride/context.ts +21 -2
- package/ui/Unauthorized.tsx +6 -4
- package/ui/agentAttrs.ts +19 -0
- package/ui/index.ts +49 -1
- package/ui/overlayLayer.ts +12 -2
- package/ui/overlayPosition.ts +104 -0
- package/ui/recipe/buttonRecipe.ts +2 -2
- package/ui/styles.css +31 -0
- package/vendor/use-agentic/AgentAbort.ts +29 -0
- package/vendor/use-agentic/AgentProgress.ts +40 -0
- package/vendor/use-agentic/AgentProvider.tsx +39 -0
- package/vendor/use-agentic/AgentScope.tsx +20 -0
- package/vendor/use-agentic/AgentSession.ts +750 -0
- package/vendor/use-agentic/Agentic.tsx +44 -0
- package/vendor/use-agentic/AgenticSurface.ts +333 -0
- package/vendor/use-agentic/Compaction.ts +120 -0
- package/vendor/use-agentic/ToolOutput.ts +60 -0
- package/vendor/use-agentic/Transcript.ts +50 -0
- package/vendor/use-agentic/WIRE.md +86 -0
- package/vendor/use-agentic/httpRunner.ts +131 -0
- package/vendor/use-agentic/index.ts +20 -0
- package/vendor/use-agentic/sharedContext.ts +25 -0
- package/vendor/use-agentic/surfaceContext.ts +10 -0
- package/vendor/use-agentic/types.ts +192 -0
- package/vendor/use-agentic/useAgent.ts +18 -0
- package/vendor/use-agentic/useAgentGuide.ts +16 -0
- package/vendor/use-agentic/useAgentResource.ts +36 -0
- package/vendor/use-agentic/useAgentState.ts +64 -0
- package/vendor/use-agentic/useAgentTool.ts +55 -0
- package/webkit/bootCsr.tsx +10 -8
- package/webkit/index.ts +4 -0
- package/webkit/lazy.tsx +5 -1
- package/webkit/useBodyScrollLock.tsx +29 -0
- package/webkit/useFrameRuntime.ts +1 -1
- package/webkit/usePageTool.tsx +37 -0
- package/webkit/useScreenScope.tsx +60 -0
- package/types/ui/Constant/Mermaid.d.ts +0 -8
- package/types/ui/Signal/Collapse.d.ts +0 -12
- package/ui/Constant/Mermaid.tsx +0 -149
- package/ui/Signal/Collapse.tsx +0 -29
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
import { DataList, getEnv, PrimitiveRegistry, type PromiseOrObject } from "akanjs/base";
|
|
2
2
|
import { capitalize, type FetchPolicy, fileUploadContract, Logger, resolveFileUploadCapability } from "akanjs/common";
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
type BaseInsight,
|
|
5
|
+
type BaseObject,
|
|
6
|
+
ConstantRegistry,
|
|
7
|
+
deserialize,
|
|
8
|
+
serialize,
|
|
9
|
+
withSharedInstances,
|
|
10
|
+
} from "akanjs/constant";
|
|
4
11
|
import type {
|
|
5
12
|
DatabaseSignal,
|
|
6
13
|
SerializedArg,
|
|
@@ -10,8 +17,14 @@ import type {
|
|
|
10
17
|
SerializedSlice,
|
|
11
18
|
ServiceSignal,
|
|
12
19
|
} from "akanjs/signal";
|
|
20
|
+
import { agentTurnConstant } from "../agentTurn";
|
|
13
21
|
import type { ClientSignal, FetchClientType, FetchSignalInput, MergeAllFetchTypes, SliceMeta } from "../fetchType";
|
|
14
|
-
import {
|
|
22
|
+
import {
|
|
23
|
+
getRequestStore,
|
|
24
|
+
memoizeRequestQuery,
|
|
25
|
+
cookies as requestCookies,
|
|
26
|
+
headers as requestHeaders,
|
|
27
|
+
} from "../requestStorage";
|
|
15
28
|
import type { GetSliceMetaObjFromDatabaseSignals } from "../types";
|
|
16
29
|
import { type ErrorConstructor, HttpClient } from "./httpClient";
|
|
17
30
|
import { WsClient } from "./wsClient";
|
|
@@ -47,6 +60,19 @@ const globalWithSharedClient = globalThis as typeof globalThis & { [SHARED_CLIEN
|
|
|
47
60
|
const sharedClientState: SharedClientState = globalWithSharedClient[SHARED_CLIENT_KEY] ?? { proxy: null, origin: null };
|
|
48
61
|
globalWithSharedClient[SHARED_CLIENT_KEY] = sharedClientState;
|
|
49
62
|
|
|
63
|
+
interface SharedSignalRegistry {
|
|
64
|
+
signal: { [key: string]: SerializedSignal };
|
|
65
|
+
version: number;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
const SHARED_SIGNAL_KEY = Symbol.for("akanjs.fetch.sharedSignalRegistry");
|
|
69
|
+
const globalWithSharedSignal = globalThis as typeof globalThis & { [SHARED_SIGNAL_KEY]?: SharedSignalRegistry };
|
|
70
|
+
const sharedSignalRegistry: SharedSignalRegistry = globalWithSharedSignal[SHARED_SIGNAL_KEY] ?? {
|
|
71
|
+
signal: {},
|
|
72
|
+
version: 0,
|
|
73
|
+
};
|
|
74
|
+
globalWithSharedSignal[SHARED_SIGNAL_KEY] = sharedSignalRegistry;
|
|
75
|
+
|
|
50
76
|
type ClientSignalMap<SigType extends { fetch: any }> = {
|
|
51
77
|
[K in keyof SigType as SigType[K] extends DatabaseSignal<any, any, any, any>
|
|
52
78
|
? K
|
|
@@ -57,8 +83,9 @@ type ClientSignalMap<SigType extends { fetch: any }> = {
|
|
|
57
83
|
|
|
58
84
|
/** Runtime fetch client that registers serialized Akan signals as HTTP/WebSocket methods. */
|
|
59
85
|
export class FetchClient {
|
|
60
|
-
static
|
|
61
|
-
|
|
86
|
+
static {
|
|
87
|
+
ConstantRegistry.setScalar(agentTurnConstant.refName, agentTurnConstant);
|
|
88
|
+
}
|
|
62
89
|
readonly logger = new Logger("FetchClient");
|
|
63
90
|
readonly origin: string;
|
|
64
91
|
readonly http: HttpClient;
|
|
@@ -66,6 +93,8 @@ export class FetchClient {
|
|
|
66
93
|
readonly handler: Record<string, FetchHandler>;
|
|
67
94
|
readonly slice: Record<string, SliceMeta> = {};
|
|
68
95
|
readonly sortKeyMap = new Map<string, string[]>();
|
|
96
|
+
readonly filterQueryMap = new Map<string, { [queryKey: string]: SerializedArg[] }>();
|
|
97
|
+
readonly #originWs = new Map<string, WsClient>();
|
|
69
98
|
readonly #handlerStore: Record<string, FetchHandler> = {};
|
|
70
99
|
readonly #handlerFactory = new Map<string, FetchHandlerFactory>();
|
|
71
100
|
#sharedRegistryAppliedVersion = 0;
|
|
@@ -80,15 +109,23 @@ export class FetchClient {
|
|
|
80
109
|
) {
|
|
81
110
|
this.origin = origin;
|
|
82
111
|
this.http = new HttpClient(origin, ErrorCls);
|
|
83
|
-
|
|
84
|
-
this.ws = new WsClient(wsUri, ErrorCls);
|
|
112
|
+
this.ws = new WsClient(FetchClient.#makeWsUri(origin), ErrorCls);
|
|
85
113
|
Object.assign(this.#handlerStore, handler);
|
|
86
114
|
this.handler = this.#makeHandlerProxy();
|
|
87
115
|
this.applySignal(serializedSignal);
|
|
88
116
|
}
|
|
117
|
+
/**
|
|
118
|
+
* Every signal any client in this process has applied, which is the whole callable surface of the app.
|
|
119
|
+
*
|
|
120
|
+
* A copy, because this is the registry each client merges its own signals into and a reader that mutated it
|
|
121
|
+
* would change what the next client applies. Read by the agent catalogue, which needs the argument schemas.
|
|
122
|
+
*/
|
|
123
|
+
static get sharedSerializedSignal(): { [key: string]: SerializedSignal } {
|
|
124
|
+
return { ...sharedSignalRegistry.signal };
|
|
125
|
+
}
|
|
89
126
|
static resetSharedRegistry() {
|
|
90
|
-
|
|
91
|
-
|
|
127
|
+
sharedSignalRegistry.signal = {};
|
|
128
|
+
sharedSignalRegistry.version++;
|
|
92
129
|
}
|
|
93
130
|
static resetSharedClient() {
|
|
94
131
|
sharedClientState.proxy = null;
|
|
@@ -134,13 +171,14 @@ export class FetchClient {
|
|
|
134
171
|
this.ErrorCls = ErrorCls;
|
|
135
172
|
this.http.setErrorConstructor(ErrorCls);
|
|
136
173
|
this.ws.setErrorConstructor(ErrorCls);
|
|
174
|
+
for (const ws of this.#originWs.values()) ws.setErrorConstructor(ErrorCls);
|
|
137
175
|
}
|
|
138
176
|
applySignal(serializedSignal: { [key: string]: SerializedSignal }, { share = true }: { share?: boolean } = {}) {
|
|
139
177
|
if (share && Object.keys(serializedSignal).length > 0) {
|
|
140
178
|
for (const [refName, signal] of Object.entries(serializedSignal))
|
|
141
|
-
FetchClient.#mergeSerializedSignalInto(
|
|
142
|
-
|
|
143
|
-
this.#sharedRegistryAppliedVersion =
|
|
179
|
+
FetchClient.#mergeSerializedSignalInto(sharedSignalRegistry.signal, refName, signal);
|
|
180
|
+
sharedSignalRegistry.version++;
|
|
181
|
+
this.#sharedRegistryAppliedVersion = sharedSignalRegistry.version;
|
|
144
182
|
}
|
|
145
183
|
for (const [refName, signal] of Object.entries(serializedSignal))
|
|
146
184
|
FetchClient.#mergeSerializedSignalInto(this.serializedSignal, refName, signal);
|
|
@@ -153,10 +191,10 @@ export class FetchClient {
|
|
|
153
191
|
this.#registerSlice(refName, suffix, slice, signal.prefix);
|
|
154
192
|
}
|
|
155
193
|
if (signal.filter) {
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
194
|
+
|
|
195
|
+
const filter = this.serializedSignal[refName]?.filter ?? signal.filter;
|
|
196
|
+
this.#registerFilterSortKey(refName, filter.sortKeys);
|
|
197
|
+
this.#registerFilterQuery(refName, filter.filter);
|
|
160
198
|
}
|
|
161
199
|
}
|
|
162
200
|
return this;
|
|
@@ -174,9 +212,9 @@ export class FetchClient {
|
|
|
174
212
|
});
|
|
175
213
|
}
|
|
176
214
|
#syncSharedRegistry() {
|
|
177
|
-
if (this.#sharedRegistryAppliedVersion ===
|
|
178
|
-
this.applySignal(
|
|
179
|
-
this.#sharedRegistryAppliedVersion =
|
|
215
|
+
if (this.#sharedRegistryAppliedVersion === sharedSignalRegistry.version) return;
|
|
216
|
+
this.applySignal(sharedSignalRegistry.signal, { share: false });
|
|
217
|
+
this.#sharedRegistryAppliedVersion = sharedSignalRegistry.version;
|
|
180
218
|
}
|
|
181
219
|
#getOrCreateHandler(key: string): FetchHandler | undefined {
|
|
182
220
|
const current = this.#handlerStore[key];
|
|
@@ -208,6 +246,8 @@ export class FetchClient {
|
|
|
208
246
|
}
|
|
209
247
|
disconnect() {
|
|
210
248
|
this.ws.destroy();
|
|
249
|
+
for (const ws of this.#originWs.values()) ws.destroy();
|
|
250
|
+
this.#originWs.clear();
|
|
211
251
|
}
|
|
212
252
|
clone({ origin, connect = true, jwt }: { origin?: string; connect?: boolean; jwt?: string } = {}) {
|
|
213
253
|
const instance = new FetchClient(origin ?? this.origin, {}, this.serializedSignal, this.ErrorCls);
|
|
@@ -221,6 +261,20 @@ export class FetchClient {
|
|
|
221
261
|
setJwt(jwt: string | null) {
|
|
222
262
|
this.jwt = jwt;
|
|
223
263
|
this.ws.setJwt(jwt);
|
|
264
|
+
for (const ws of this.#originWs.values()) ws.setJwt(jwt);
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
#resolveWs(origin?: string) {
|
|
268
|
+
if (!origin) return this.ws;
|
|
269
|
+
const target = origin.replace(/\/+$/, "");
|
|
270
|
+
if (target === this.origin.replace(/\/+$/, "")) return this.ws;
|
|
271
|
+
const cached = this.#originWs.get(target);
|
|
272
|
+
if (cached) return cached;
|
|
273
|
+
const ws = new WsClient(FetchClient.#makeWsUri(target), this.ErrorCls);
|
|
274
|
+
this.#originWs.set(target, ws);
|
|
275
|
+
ws.setJwt(this.jwt);
|
|
276
|
+
ws.connect();
|
|
277
|
+
return ws;
|
|
224
278
|
}
|
|
225
279
|
#makeAuthHeaders(option?: FetchPolicy): Record<string, string> {
|
|
226
280
|
if (option?.token) return { Authorization: `Bearer ${option.token}` };
|
|
@@ -238,7 +292,8 @@ export class FetchClient {
|
|
|
238
292
|
#registerFilterSortKey(refName: string, sortKeys: string[]) {
|
|
239
293
|
this.sortKeyMap.set(refName, sortKeys);
|
|
240
294
|
}
|
|
241
|
-
#registerFilterQuery(
|
|
295
|
+
#registerFilterQuery(refName: string, filter: { [queryKey: string]: SerializedArg[] }) {
|
|
296
|
+
this.filterQueryMap.set(refName, filter);
|
|
242
297
|
}
|
|
243
298
|
#makeHttpFn(key: string, endpoint: SerializedEndpoint, prefix?: string) {
|
|
244
299
|
const argLength = endpoint.args.length;
|
|
@@ -246,6 +301,8 @@ export class FetchClient {
|
|
|
246
301
|
const parseReturn = this.#makeReturnParser(endpoint.returns);
|
|
247
302
|
const { bodyArgs, uploadArgs } = FetchClient.classifyHttpArgs(endpoint.args);
|
|
248
303
|
switch (endpoint.type) {
|
|
304
|
+
|
|
305
|
+
case "prompt":
|
|
249
306
|
case "query": {
|
|
250
307
|
const queryFn = async (...argData: unknown[]) => {
|
|
251
308
|
const args = argData.slice(0, argLength);
|
|
@@ -259,8 +316,9 @@ export class FetchClient {
|
|
|
259
316
|
const response = baseUrl
|
|
260
317
|
? await requestQuery()
|
|
261
318
|
: await memoizeRequestQuery(FetchClient.#makeRequestQueryCacheKey(this.origin, url, headers), requestQuery);
|
|
262
|
-
|
|
263
|
-
|
|
319
|
+
|
|
320
|
+
const payload = !baseUrl && getRequestStore() ? FetchClient.#deepCopy(response) : response;
|
|
321
|
+
return parseReturn(payload, { crystalize: option?.crystalize ?? true });
|
|
264
322
|
};
|
|
265
323
|
return queryFn;
|
|
266
324
|
}
|
|
@@ -271,7 +329,7 @@ export class FetchClient {
|
|
|
271
329
|
const argMap = new Map(serializerMap.entries().map(([key, serializer], idx) => [key, serializer(args[idx])]));
|
|
272
330
|
const url = FetchClient.makeHttpUrl(key, endpoint, prefix, argMap);
|
|
273
331
|
const body = HttpClient.makeBody(bodyArgs, uploadArgs, argMap);
|
|
274
|
-
const response = await this.http.
|
|
332
|
+
const response = await this.http.send(endpoint.method ?? "POST", url, body, {
|
|
275
333
|
headers: this.#makeAuthHeaders(option),
|
|
276
334
|
baseUrl: option?.origin,
|
|
277
335
|
});
|
|
@@ -286,6 +344,7 @@ export class FetchClient {
|
|
|
286
344
|
}
|
|
287
345
|
#registerEndpoint(key: string, endpoint: SerializedEndpoint, prefix?: string) {
|
|
288
346
|
switch (endpoint.type) {
|
|
347
|
+
case "prompt":
|
|
289
348
|
case "query": {
|
|
290
349
|
this.#setHandlerFactory(key, () => this.#makeHttpFn(key, endpoint, prefix));
|
|
291
350
|
return;
|
|
@@ -311,13 +370,13 @@ export class FetchClient {
|
|
|
311
370
|
handleEvent(parsedReturn);
|
|
312
371
|
};
|
|
313
372
|
wrappedListeners.set(handleEvent, wrapped);
|
|
314
|
-
this
|
|
373
|
+
const ws = this.#resolveWs(fetchPolicy?.origin);
|
|
374
|
+
ws.subscribe({
|
|
315
375
|
key,
|
|
316
376
|
data,
|
|
317
377
|
handleEvent: wrapped,
|
|
318
378
|
});
|
|
319
|
-
return () =>
|
|
320
|
-
this.ws.unsubscribe({ key, data, handleEvent: wrappedListeners.get(handleEvent) ?? handleEvent });
|
|
379
|
+
return () => ws.unsubscribe({ key, data, handleEvent: wrappedListeners.get(handleEvent) ?? handleEvent });
|
|
321
380
|
};
|
|
322
381
|
});
|
|
323
382
|
return;
|
|
@@ -329,8 +388,9 @@ export class FetchClient {
|
|
|
329
388
|
const serializerMap = this.#makeArgSerializer(endpoint.args);
|
|
330
389
|
return (...argData: unknown[]) => {
|
|
331
390
|
const args = argData.slice(0, msgArgLength);
|
|
391
|
+
const fetchPolicy = argData[msgArgLength] as FetchPolicy | undefined;
|
|
332
392
|
const data = msgArgs.map((arg, idx) => serializerMap.get(arg.name)?.(args[idx]) ?? null);
|
|
333
|
-
this.
|
|
393
|
+
this.#resolveWs(fetchPolicy?.origin).emit(key, data);
|
|
334
394
|
};
|
|
335
395
|
});
|
|
336
396
|
this.#setHandlerFactory(`listen${capitalize(key)}`, () => {
|
|
@@ -342,8 +402,9 @@ export class FetchClient {
|
|
|
342
402
|
handleEvent(parsedReturn);
|
|
343
403
|
};
|
|
344
404
|
wrappedListeners.set(handleEvent, wrapped);
|
|
345
|
-
this.
|
|
346
|
-
|
|
405
|
+
const ws = this.#resolveWs(fetchPolicy.origin);
|
|
406
|
+
ws.on(key, wrapped);
|
|
407
|
+
return () => ws.off(key, wrappedListeners.get(handleEvent) ?? handleEvent);
|
|
347
408
|
}) as FetchHandler;
|
|
348
409
|
});
|
|
349
410
|
return;
|
|
@@ -353,6 +414,10 @@ export class FetchClient {
|
|
|
353
414
|
break;
|
|
354
415
|
}
|
|
355
416
|
}
|
|
417
|
+
static #makeWsUri(origin: string) {
|
|
418
|
+
return `${origin.replace("http://", "ws://").replace("https://", "wss://")}/ws`;
|
|
419
|
+
}
|
|
420
|
+
|
|
356
421
|
static paginationArgs: SerializedArg[] = [
|
|
357
422
|
{ type: "search", name: "skip", refName: "Int" },
|
|
358
423
|
{ type: "search", name: "limit", refName: "Int" },
|
|
@@ -384,6 +449,9 @@ export class FetchClient {
|
|
|
384
449
|
const createGuards = signal.createGuards ?? signal.cruGuards;
|
|
385
450
|
const updateGuards = signal.updateGuards ?? signal.cruGuards;
|
|
386
451
|
const removeGuards = signal.removeGuards ?? signal.cruGuards;
|
|
452
|
+
|
|
453
|
+
const mcp = (verb: keyof NonNullable<SerializedSignal["mcp"]>) =>
|
|
454
|
+
signal.mcp?.[verb] === false ? { mcp: false as const } : {};
|
|
387
455
|
const endpoint: { [key: string]: SerializedEndpoint } = {};
|
|
388
456
|
if (signal.getGuards) {
|
|
389
457
|
endpoint[names.model] = {
|
|
@@ -391,12 +459,14 @@ export class FetchClient {
|
|
|
391
459
|
args: [{ type: "param", name: names.modelId, refName: "ID" }],
|
|
392
460
|
returns: { refName, modelType: "full" },
|
|
393
461
|
guards: signal.getGuards,
|
|
462
|
+
...mcp("get"),
|
|
394
463
|
};
|
|
395
464
|
endpoint[names.lightModel] = {
|
|
396
465
|
type: "query",
|
|
397
466
|
args: [{ type: "param", name: names.modelId, refName: "ID" }],
|
|
398
467
|
returns: { refName, modelType: "light" },
|
|
399
468
|
guards: signal.getGuards,
|
|
469
|
+
...mcp("get"),
|
|
400
470
|
};
|
|
401
471
|
}
|
|
402
472
|
if (createGuards) {
|
|
@@ -405,6 +475,7 @@ export class FetchClient {
|
|
|
405
475
|
args: [{ type: "body", name: "data", refName, modelType: "input" }],
|
|
406
476
|
returns: { refName, modelType: "full" },
|
|
407
477
|
guards: createGuards,
|
|
478
|
+
...mcp("create"),
|
|
408
479
|
};
|
|
409
480
|
}
|
|
410
481
|
if (updateGuards) {
|
|
@@ -416,6 +487,7 @@ export class FetchClient {
|
|
|
416
487
|
],
|
|
417
488
|
returns: { refName, modelType: "full" },
|
|
418
489
|
guards: updateGuards,
|
|
490
|
+
...mcp("update"),
|
|
419
491
|
};
|
|
420
492
|
}
|
|
421
493
|
if (removeGuards) {
|
|
@@ -424,6 +496,7 @@ export class FetchClient {
|
|
|
424
496
|
args: [{ type: "param", name: names.modelId, refName: "ID" }],
|
|
425
497
|
returns: { refName, modelType: "full" },
|
|
426
498
|
guards: removeGuards,
|
|
499
|
+
...mcp("remove"),
|
|
427
500
|
};
|
|
428
501
|
}
|
|
429
502
|
return endpoint;
|
|
@@ -543,18 +616,22 @@ export class FetchClient {
|
|
|
543
616
|
list: `${refName}List${capSuffix}`,
|
|
544
617
|
insight: `${refName}Insight${capSuffix}`,
|
|
545
618
|
};
|
|
619
|
+
|
|
620
|
+
const mcp = slice.mcp === false ? { mcp: false as const } : {};
|
|
546
621
|
const endpoint: { [key: string]: SerializedEndpoint } = {
|
|
547
622
|
[names.list]: {
|
|
548
623
|
type: "query",
|
|
549
624
|
args: [...slice.args, ...FetchClient.paginationArgs],
|
|
550
625
|
returns: { refName, modelType: "light", arrDepth: 1 },
|
|
551
626
|
guards: slice.guards,
|
|
627
|
+
...mcp,
|
|
552
628
|
},
|
|
553
629
|
[names.insight]: {
|
|
554
630
|
type: "query",
|
|
555
631
|
args: [...slice.args],
|
|
556
632
|
returns: { refName, modelType: "insight" },
|
|
557
633
|
guards: slice.guards,
|
|
634
|
+
...mcp,
|
|
558
635
|
},
|
|
559
636
|
};
|
|
560
637
|
return endpoint;
|
|
@@ -594,8 +671,6 @@ export class FetchClient {
|
|
|
594
671
|
listFn(...fetchQueryArgs, skip, limit, sort, { ...option, crystalize: false }),
|
|
595
672
|
fetchInsight ? insightFn(...fetchQueryArgs, { ...option, crystalize: false }) : null,
|
|
596
673
|
])) as unknown as [BaseObject[], BaseInsight];
|
|
597
|
-
const modelList = new DataList(modelObjList.map((modelObj) => new cnst.light(modelObj)));
|
|
598
|
-
const modelInsight = new cnst.insight(modelObjInsight);
|
|
599
674
|
const lastPage = modelObjInsight?.count
|
|
600
675
|
? Math.max(Math.floor((modelObjInsight.count - 1) / (limit || 20)) + 1, 1)
|
|
601
676
|
: 1;
|
|
@@ -613,11 +688,27 @@ export class FetchClient {
|
|
|
613
688
|
[`sortOf${capRefName}`]: sort,
|
|
614
689
|
[`${refName}InitAt`]: new Date(),
|
|
615
690
|
};
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
691
|
+
|
|
692
|
+
let modelList: DataList<BaseObject> | undefined;
|
|
693
|
+
let modelInsight: object | undefined;
|
|
694
|
+
return Object.defineProperties({ [`${refName}Init${capSuffix}`]: serverInit } as Record<string, unknown>, {
|
|
695
|
+
[`${refName}List${capSuffix}`]: {
|
|
696
|
+
enumerable: true,
|
|
697
|
+
get: () => {
|
|
698
|
+
modelList ??= new DataList(
|
|
699
|
+
withSharedInstances(() => modelObjList.map((modelObj) => new cnst.light(modelObj) as BaseObject)),
|
|
700
|
+
);
|
|
701
|
+
return modelList;
|
|
702
|
+
},
|
|
703
|
+
},
|
|
704
|
+
[`${refName}Insight${capSuffix}`]: {
|
|
705
|
+
enumerable: true,
|
|
706
|
+
get: () => {
|
|
707
|
+
modelInsight ??= new cnst.insight(modelObjInsight);
|
|
708
|
+
return modelInsight;
|
|
709
|
+
},
|
|
710
|
+
},
|
|
711
|
+
});
|
|
621
712
|
});
|
|
622
713
|
this.#setHandlerFactory(names.getInit, () => async (...args: unknown[]) => {
|
|
623
714
|
const initFn = this.#requireHandler<(...args: unknown[]) => Promise<Record<string, unknown>>>(
|
|
@@ -707,9 +798,16 @@ export class FetchClient {
|
|
|
707
798
|
});
|
|
708
799
|
}
|
|
709
800
|
});
|
|
710
|
-
const instance = new FetchClient(
|
|
801
|
+
const instance = new FetchClient(FetchClient.#originFromEnv(), handler, serializedSignal);
|
|
711
802
|
return FetchClient.#makeProxy<MergeAllFetchTypes<Signals>, GetSliceMetaObjFromDatabaseSignals<Signals>>(instance);
|
|
712
803
|
}
|
|
804
|
+
static #originFromEnv() {
|
|
805
|
+
try {
|
|
806
|
+
return getEnv().serverHttpUri;
|
|
807
|
+
} catch {
|
|
808
|
+
return "";
|
|
809
|
+
}
|
|
810
|
+
}
|
|
713
811
|
static build<SigType extends { fetch: any }>(
|
|
714
812
|
constant: object,
|
|
715
813
|
serializedSignal: { [key: string]: SerializedSignal },
|
|
@@ -755,7 +853,9 @@ export class FetchClient {
|
|
|
755
853
|
const handler = instance.#getOrCreateHandler(prop);
|
|
756
854
|
if (handler) return handler;
|
|
757
855
|
}
|
|
758
|
-
|
|
856
|
+
const value = (instance as unknown as Record<PropertyKey, unknown>)[prop];
|
|
857
|
+
|
|
858
|
+
return typeof value === "function" ? value.bind(instance) : value;
|
|
759
859
|
},
|
|
760
860
|
}) as FetchProxy<FetchType, SliceMetaObj>;
|
|
761
861
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { SerializedArg } from "akanjs/signal";
|
|
1
|
+
import type { HttpMutationMethod, SerializedArg } from "akanjs/signal";
|
|
2
2
|
|
|
3
3
|
export interface ErrorResponsePayload {
|
|
4
4
|
error: string;
|
|
@@ -27,6 +27,19 @@ interface FetchOptions {
|
|
|
27
27
|
baseUrl?: string;
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
+
const jsonContentType = /^application\/(?:[\w.+-]+\+)?json\b/i;
|
|
31
|
+
|
|
32
|
+
const transportErrorKeyMap = {
|
|
33
|
+
408: "base.error.gatewayTimeout",
|
|
34
|
+
502: "base.error.serverUnavailable",
|
|
35
|
+
503: "base.error.serverUnavailable",
|
|
36
|
+
504: "base.error.gatewayTimeout",
|
|
37
|
+
} as const;
|
|
38
|
+
|
|
39
|
+
const serverUnreachableKey = "base.error.serverUnreachable";
|
|
40
|
+
const unexpectedResponseKey = "base.error.unexpectedResponse";
|
|
41
|
+
const transportDetailLimit = 200;
|
|
42
|
+
|
|
30
43
|
export class HttpClient {
|
|
31
44
|
readonly baseUrl: string;
|
|
32
45
|
constructor(
|
|
@@ -42,57 +55,114 @@ export class HttpClient {
|
|
|
42
55
|
#resolveBaseUrl(baseUrl?: string) {
|
|
43
56
|
return (baseUrl ?? this.baseUrl).replace(/\/$/, "");
|
|
44
57
|
}
|
|
58
|
+
#resolveUrl(url: string, options: FetchOptions) {
|
|
59
|
+
return `${this.#resolveBaseUrl(options.baseUrl)}${url}`;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
static #makeHeaders(headers: Record<string, string>, options: FetchOptions) {
|
|
63
|
+
return { Accept: "application/json", ...headers, ...options.headers };
|
|
64
|
+
}
|
|
45
65
|
async get<Returns = unknown>(url: string, options: FetchOptions = {}): Promise<Returns> {
|
|
46
|
-
|
|
47
|
-
headers: { "Content-Type": "application/json",
|
|
66
|
+
return await this.#request<Returns>(this.#resolveUrl(url, options), {
|
|
67
|
+
headers: HttpClient.#makeHeaders({ "Content-Type": "application/json" }, options),
|
|
48
68
|
});
|
|
49
|
-
return await this.#readJsonResponse<Returns>(res);
|
|
50
69
|
}
|
|
51
70
|
#makeReqContent(data: FormData | Record<string, unknown>): { body: BodyInit; headers: Record<string, string> } {
|
|
52
71
|
|
|
53
72
|
if (data instanceof FormData) return { body: data, headers: {} };
|
|
54
73
|
return { body: JSON.stringify(data), headers: { "Content-Type": "application/json" } };
|
|
55
74
|
}
|
|
56
|
-
async
|
|
75
|
+
async send<Returns = unknown>(
|
|
76
|
+
method: HttpMutationMethod,
|
|
57
77
|
url: string,
|
|
58
78
|
data: FormData | Record<string, unknown>,
|
|
59
79
|
options: FetchOptions = {},
|
|
60
80
|
): Promise<Returns> {
|
|
61
81
|
const { body, headers } = this.#makeReqContent(data);
|
|
62
|
-
|
|
63
|
-
method
|
|
82
|
+
return await this.#request<Returns>(this.#resolveUrl(url, options), {
|
|
83
|
+
method,
|
|
64
84
|
body,
|
|
65
|
-
headers:
|
|
85
|
+
headers: HttpClient.#makeHeaders(headers, options),
|
|
66
86
|
});
|
|
67
|
-
|
|
87
|
+
}
|
|
88
|
+
async put<Returns = unknown>(
|
|
89
|
+
url: string,
|
|
90
|
+
data: FormData | Record<string, unknown>,
|
|
91
|
+
options: FetchOptions = {},
|
|
92
|
+
): Promise<Returns> {
|
|
93
|
+
return await this.send<Returns>("PUT", url, data, options);
|
|
68
94
|
}
|
|
69
95
|
async post<Returns = unknown>(
|
|
70
96
|
url: string,
|
|
71
97
|
data: FormData | Record<string, unknown>,
|
|
72
98
|
options: FetchOptions = {},
|
|
73
99
|
): Promise<Returns> {
|
|
74
|
-
|
|
75
|
-
const res = await fetch(`${this.#resolveBaseUrl(options.baseUrl)}${url}`, {
|
|
76
|
-
method: "POST",
|
|
77
|
-
body,
|
|
78
|
-
headers: { ...headers, ...options.headers },
|
|
79
|
-
});
|
|
80
|
-
return await this.#readJsonResponse<Returns>(res);
|
|
100
|
+
return await this.send<Returns>("POST", url, data, options);
|
|
81
101
|
}
|
|
82
102
|
async delete<Returns = unknown>(url: string, options: FetchOptions = {}): Promise<Returns> {
|
|
83
|
-
|
|
103
|
+
return await this.#request<Returns>(this.#resolveUrl(url, options), {
|
|
84
104
|
method: "DELETE",
|
|
85
|
-
headers: { "Content-Type": "application/json",
|
|
105
|
+
headers: HttpClient.#makeHeaders({ "Content-Type": "application/json" }, options),
|
|
86
106
|
});
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
async #request<Returns>(url: string, init: RequestInit): Promise<Returns> {
|
|
110
|
+
const res = await this.#fetch(url, init);
|
|
87
111
|
return await this.#readJsonResponse<Returns>(res);
|
|
88
112
|
}
|
|
89
113
|
|
|
114
|
+
/**
|
|
115
|
+
* `fetch` rejects only when no response arrived at all — a refused connection, a DNS failure, a socket
|
|
116
|
+
* dropped mid-flight. That is the server being unreachable, not an error this API reported, so it is
|
|
117
|
+
* restored as one rather than surfacing the runtime's own `TypeError: Failed to fetch`.
|
|
118
|
+
*/
|
|
119
|
+
async #fetch(url: string, init: RequestInit) {
|
|
120
|
+
try {
|
|
121
|
+
return await fetch(url, init);
|
|
122
|
+
} catch (error) {
|
|
123
|
+
if (error instanceof Error && error.name === "AbortError") throw error;
|
|
124
|
+
throw this.#restoreError({ error: serverUnreachableKey, details: String(error) }, 503);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
|
|
90
128
|
async #readJsonResponse<Returns>(res: Response): Promise<Returns> {
|
|
91
|
-
const body = await res
|
|
129
|
+
const body = await this.#readBody(res);
|
|
92
130
|
if (res.ok) return body as Returns;
|
|
93
131
|
throw this.#restoreError(body, res.status);
|
|
94
132
|
}
|
|
95
133
|
|
|
134
|
+
/**
|
|
135
|
+
* A proxy answers a restarting upstream with a page of its own — nginx's `504 Gateway Time-out` HTML,
|
|
136
|
+
* the federation gateway's plain-text 503. That body is not this API's, so parsing it would surface the
|
|
137
|
+
* parser's complaint (`Unexpected token '<'`) instead of the fact that the server is down.
|
|
138
|
+
*/
|
|
139
|
+
async #readBody(res: Response) {
|
|
140
|
+
if (jsonContentType.test(res.headers.get("content-type") ?? "")) {
|
|
141
|
+
try {
|
|
142
|
+
return (await res.json()) as unknown;
|
|
143
|
+
} catch (error) {
|
|
144
|
+
throw this.#transportError(res.status, String(error));
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
const raw = await res.text();
|
|
148
|
+
const parsed = HttpClient.#parseJson(raw);
|
|
149
|
+
if (parsed === undefined) throw this.#transportError(res.status, raw);
|
|
150
|
+
return parsed;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
static #parseJson(raw: string): unknown {
|
|
154
|
+
try {
|
|
155
|
+
return JSON.parse(raw) as unknown;
|
|
156
|
+
} catch {
|
|
157
|
+
return undefined;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
#transportError(status: number, detail: string): RestoredError {
|
|
162
|
+
const error = transportErrorKeyMap[status as keyof typeof transportErrorKeyMap] ?? unexpectedResponseKey;
|
|
163
|
+
return this.#restoreError({ error, data: { status }, details: detail.slice(0, transportDetailLimit) }, status);
|
|
164
|
+
}
|
|
165
|
+
|
|
96
166
|
#restoreError(body: unknown, fallbackStatusCode: number): RestoredError {
|
|
97
167
|
const payload =
|
|
98
168
|
body && typeof body === "object" && "error" in body
|
|
@@ -112,7 +182,12 @@ export class HttpClient {
|
|
|
112
182
|
searchArgs.forEach((arg) => {
|
|
113
183
|
const argValue = argMap.get(arg.name);
|
|
114
184
|
if (argValue === null || argValue === undefined) return;
|
|
115
|
-
|
|
185
|
+
|
|
186
|
+
if (arg.refName === "Any") {
|
|
187
|
+
|
|
188
|
+
const encoded = JSON.stringify(argValue);
|
|
189
|
+
if (encoded !== undefined) searchParams.set(arg.name, encoded);
|
|
190
|
+
} else if (arg.arrDepth && Array.isArray(argValue))
|
|
116
191
|
argValue.forEach((value) => {
|
|
117
192
|
searchParams.append(arg.name, String(value));
|
|
118
193
|
});
|
package/fetch/client/wsClient.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Logger, websocketAuthContract } from "akanjs/common";
|
|
1
|
+
import { Logger, websocketAuthContract, websocketBinaryFrameContract } from "akanjs/common";
|
|
2
2
|
import type {
|
|
3
3
|
WebsocketAuthAck,
|
|
4
4
|
WebsocketMessageData,
|
|
@@ -41,6 +41,7 @@ export class WsClient {
|
|
|
41
41
|
#listenerMap = new Map<string, Set<Listener>>();
|
|
42
42
|
#destroyed = false;
|
|
43
43
|
#connectRequested = false;
|
|
44
|
+
#outbox: string[] = [];
|
|
44
45
|
#unconnectedWarnTimers = new Map<string, ReturnType<typeof setTimeout>>();
|
|
45
46
|
#jwt: string | null = null;
|
|
46
47
|
connected = false;
|
|
@@ -84,6 +85,7 @@ export class WsClient {
|
|
|
84
85
|
if (this.#destroyed) return;
|
|
85
86
|
|
|
86
87
|
this.#ws = new WebSocket(this.url);
|
|
88
|
+
this.#ws.binaryType = "arraybuffer";
|
|
87
89
|
this.#ws.onopen = (e) => {
|
|
88
90
|
this.#reconnectAttempts = 0;
|
|
89
91
|
this.connected = true;
|
|
@@ -94,10 +96,19 @@ export class WsClient {
|
|
|
94
96
|
const data: WebsocketReqData = { key: option.key, data: option.data, subscribe: true };
|
|
95
97
|
this.#ws?.send(JSON.stringify(data));
|
|
96
98
|
});
|
|
99
|
+
const queued = this.#outbox;
|
|
100
|
+
this.#outbox = [];
|
|
101
|
+
for (const frame of queued) this.#ws?.send(frame);
|
|
97
102
|
};
|
|
98
103
|
this.#ws.onmessage = (e) => {
|
|
99
104
|
try {
|
|
100
|
-
|
|
105
|
+
if (typeof e.data !== "string") {
|
|
106
|
+
const frame = websocketBinaryFrameContract.decode(e.data as ArrayBuffer);
|
|
107
|
+
if (frame) this.#handlePubsub(frame.roomId, frame.payload);
|
|
108
|
+
else this.logger.warn("Unknown binary WebSocket frame");
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
const parsed = JSON.parse(e.data) as { error?: unknown } & WebsocketResData;
|
|
101
112
|
if (parsed?.error) {
|
|
102
113
|
throw this.#restoreError(parsed);
|
|
103
114
|
}
|
|
@@ -197,6 +208,7 @@ export class WsClient {
|
|
|
197
208
|
}
|
|
198
209
|
for (const timer of this.#unconnectedWarnTimers.values()) clearTimeout(timer);
|
|
199
210
|
this.#unconnectedWarnTimers.clear();
|
|
211
|
+
this.#outbox = [];
|
|
200
212
|
this.#ws?.close();
|
|
201
213
|
this.#ws = null;
|
|
202
214
|
}
|
|
@@ -240,28 +252,31 @@ export class WsClient {
|
|
|
240
252
|
`[akanjs] WebSocket is not connected. Call fetch.instance.connect(), or drop the root layout "wsConnect = false", before ${action} "${key}".`,
|
|
241
253
|
);
|
|
242
254
|
}
|
|
243
|
-
#
|
|
244
|
-
|
|
255
|
+
#warnUnconnected(action: "emit" | "subscribe", key: string) {
|
|
256
|
+
const timerKey = `${action}:${key}`;
|
|
257
|
+
if (this.#connectRequested || this.#unconnectedWarnTimers.has(timerKey)) return;
|
|
245
258
|
const timer = setTimeout(() => {
|
|
246
|
-
this.#unconnectedWarnTimers.delete(
|
|
259
|
+
this.#unconnectedWarnTimers.delete(timerKey);
|
|
247
260
|
if (this.#connectRequested || this.#destroyed) return;
|
|
248
|
-
this.#warnNotConnected(
|
|
261
|
+
this.#warnNotConnected(action, key);
|
|
249
262
|
}, 0);
|
|
250
|
-
this.#unconnectedWarnTimers.set(
|
|
263
|
+
this.#unconnectedWarnTimers.set(timerKey, timer);
|
|
251
264
|
}
|
|
252
265
|
emit(key: string, data: WsRequestPayload) {
|
|
266
|
+
const payload: WebsocketReqData = { key, data: Array.isArray(data) ? data : [data] };
|
|
267
|
+
const frame = JSON.stringify(payload);
|
|
268
|
+
|
|
253
269
|
if (this.#ws?.readyState !== WebSocket.OPEN) {
|
|
254
|
-
this.
|
|
255
|
-
this.#
|
|
270
|
+
this.#outbox.push(frame);
|
|
271
|
+
this.#warnUnconnected("emit", key);
|
|
256
272
|
return this;
|
|
257
273
|
}
|
|
258
|
-
|
|
259
|
-
this.#ws.send(JSON.stringify(payload));
|
|
274
|
+
this.#ws.send(frame);
|
|
260
275
|
return this;
|
|
261
276
|
}
|
|
262
277
|
subscribe(option: { key: string; data: unknown[]; handleEvent: (data: unknown) => void }) {
|
|
263
278
|
const roomId = WsClient.makeRoomId(option.key, option.data);
|
|
264
|
-
if (!this.#ws) this.#
|
|
279
|
+
if (!this.#ws) this.#warnUnconnected("subscribe", option.key);
|
|
265
280
|
if (!this.#roomSubscribeMap.has(roomId)) {
|
|
266
281
|
this.#roomSubscribeMap.set(roomId, { key: option.key, data: option.data, listener: new Set() });
|
|
267
282
|
if (this.#ws?.readyState === WebSocket.OPEN) {
|