@webda/graphql 4.0.0-beta.6 → 4.0.0-beta.8

package/lib/graphql.service.js

@@ -32,10 +32,10 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-import { DomainService, DomainServiceParameters, Route, WebdaError, useApplication, useCore, useCoreEvents, useModelMetadata, useRepository, isModelActionAllowed, queryModelWithPermissions, getClientWritableAttributes, assertNoPrivateFields, assertFilterOnly } from "@webda/core";
+import { DomainService, DomainServiceParameters, Route, WebdaError, useApplication, useCore, useCoreEvents, useModelMetadata, useRepository, isModelActionAllowed, queryModelWithPermissions, getClientWritableAttributes, assertNoPrivateFields, assertFilterOnly, callOperation, canCallOperation, createOperationFilter, useInstanceStorage, runWithInstanceStorage, emitCoreEvent, runWithContext, useRouter } from "@webda/core";
 import * as WebdaQL from "@webda/ql";
 import { EventIterator, MergedIterator } from "@webda/runtime";
-import { GraphQLBoolean, GraphQLError, GraphQLInputObjectType, GraphQLList, GraphQLObjectType, GraphQLSchema, GraphQLString, printSchema } from "graphql";
+import { GraphQLBoolean, GraphQLError, GraphQLInputObjectType, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLSchema, GraphQLString, printSchema } from "graphql";
 import { createHandler } from "graphql-http";
 import { CloseCode, makeServer } from "graphql-ws";
 import { nextTick } from "process";
@@ -43,7 +43,9 @@ import { WebSocketServer } from "ws";
 import { AnyScalarType } from "./types/any.js";
 import { DateScalar } from "./types/date.js";
 import { GraphQLLong } from "./types/long.js";
-import { createFromInput, isInputAttribute, loadForAction, updateFromInput } from "./mutations.js";
+import { graphQLNames, restoreInputKeys, WEBDA_KEY } from "./names.js";
+import { createFromInput, isInputAttribute, loadForAction, operationError, updateFromInput } from "./mutations.js";
+import { GRAPHQL_NAME, GraphQLOperationContext, graphqlPlacement, operationTypeName, publicCopy } from "./operations.js";
 const GraphIQL = `
 <!doctype html>
 <html lang="en">
@@ -140,6 +142,7 @@ export class GraphQLParameters extends DomainServiceParameters {
         this.userModel ?? (this.userModel = "User");
         this.exposeMe ?? (this.exposeMe = true);
         this.globalSubscription ?? (this.globalSubscription = true);
+        this.exposeOperations ?? (this.exposeOperations = ["*"]);
         return this;
     }
 }
@@ -161,6 +164,10 @@ let GraphQLService = (() => {
             constructor() {
                 super(...arguments);
                 this.schema = __runInitializers(this, _instanceExtraInitializers);
+                /**
+                 * Generated named types, by name: a name is generated once per shape (reset by generateSchema)
+                 */
+                this.namedTypes = new Map();
             }
             /**
              * Load and initialize GraphQL service parameters
@@ -170,6 +177,14 @@ let GraphQLService = (() => {
             loadParameters(params) {
                 return new GraphQLParameters().load(params);
             }
+            /**
+             * Parameters with their defaults (the core builds a service configuration through this, not loadParameters)
+             * @param params - raw partial configuration
+             * @returns initialized GraphQLParameters
+             */
+            static createConfiguration(params = {}) {
+                return new GraphQLParameters().load(params);
+            }
             /**
              * Resolve a JSON Schema property by following $ref pointers
              * @param prop - JSON Schema property that may contain $ref
@@ -188,6 +203,41 @@ let GraphQLService = (() => {
                 }
                 return prop || { type: "null" };
             }
+            /**
+             * One GraphQL type per name: reuse the type already generated for this name and shape
+             * @param name - type name
+             * @param shape - what makes two types of this name the same (kind and field names)
+             * @param create - builds the type the first time
+             * @returns the type
+             * @throws Error when the name was generated for another shape
+             */
+            namedType(name, shape, create) {
+                this.namedTypes ?? (this.namedTypes = new Map());
+                const known = this.namedTypes.get(name);
+                if (known) {
+                    if (known.shape !== shape) {
+                        throw new Error(`GraphQL type ${name} is generated for two different schemas (${known.shape} / ${shape}): give one of them another title`);
+                    }
+                    return known.type;
+                }
+                const type = create();
+                this.namedTypes.set(name, { type, shape });
+                return type;
+            }
+            /**
+             * Reserve a type name for a type built later (its entry gets the type once built)
+             * @param name - type name
+             * @param shape - identity of the reserving type
+             * @throws Error when the name is already taken by another shape
+             */
+            reserveName(name, shape) {
+                this.namedTypes ?? (this.namedTypes = new Map());
+                const known = this.namedTypes.get(name);
+                if (known && known.shape !== shape) {
+                    throw new Error(`GraphQL type ${name} is generated for two different schemas (${known.shape} / ${shape}): give one of them another title`);
+                }
+                this.namedTypes.set(name, known || { type: undefined, shape });
+            }
             /**
              * Convert a JSON Schema to a GraphQL type definition
              * @param schema - JSON Schema to convert
@@ -196,6 +246,17 @@ let GraphQLService = (() => {
              * @returns object with the GraphQL type and optional description, or undefined for null types
              */
             getGraphQLSchemaFromSchema(schema, defaultName, input) {
+                // `type: ["string", "null"]`: the nullable form of one type (GraphQL fields are nullable already)
+                if (Array.isArray(schema?.type)) {
+                    const types = schema.type.filter(t => t !== "null");
+                    if (types.length === 0) {
+                        return undefined;
+                    }
+                    if (types.length > 1) {
+                        return { type: AnyScalarType, description: schema.description };
+                    }
+                    return this.getGraphQLSchemaFromSchema({ ...schema, type: types[0] }, defaultName, input);
+                }
                 let type;
                 if (!schema || !schema.type) {
                     type = AnyScalarType;
@@ -228,27 +289,57 @@ let GraphQLService = (() => {
                     if (!schema.properties) {
                         return { type: AnyScalarType, description: "Map" };
                     }
-                    for (const i in schema.properties) {
-                        // Private (`__`) fields are server-only, at any depth
-                        if (i.startsWith("__")) {
-                            continue;
-                        }
-                        const res = this.getGraphQLSchemaFromSchema(this.getJsonSchemaDefinition(schema.properties[i], schema.definitions), `${schema.title || defaultName}_${i}`, input);
+                    // Private (`__`) fields are server-only, at any depth
+                    const names = this.graphQLNames(Object.keys(schema.properties).filter(i => !i.startsWith("__")), schema.title || defaultName);
+                    for (const [i, field] of names) {
+                        const res = this.getGraphQLSchemaFromSchema(this.getJsonSchemaDefinition(schema.properties[i], schema.definitions), `${schema.title || defaultName}_${field}`, input);
                         if (!res)
                             continue;
-                        fields[i] = res;
+                        fields[field] = this.renamedField(res, i, field, input);
                     }
                     if (Object.keys(fields).length === 0) {
                         this.log("DEBUG", "Return map for", defaultName, "because no fields");
                         return { type: AnyScalarType, description: "Map" };
                     }
-                    type = new (input ? GraphQLInputObjectType : GraphQLObjectType)({
-                        fields,
-                        name: schema.title || defaultName
-                    });
+                    // A titled input type gets its own name: the output type of the same title already uses the title
+                    const name = schema.title ? (input ? `${schema.title}Input` : schema.title) : defaultName;
+                    type = this.namedType(name, `${input ? "input" : "output"}:${Object.keys(fields)
+                        .sort()
+                        .map(k => `${k}:${fields[k].type}`)
+                        .join(",")}`, () => (input ? new GraphQLInputObjectType({ fields, name }) : new GraphQLObjectType({ fields, name })));
                 }
                 return { type, description: schema.description };
             }
+            /**
+             * GraphQL names of the properties of a type, see {@link graphQLNames}: a JSON key that is not a GraphQL name
+             * (`available-balance`) is exposed as `availableBalance`, unless that name is taken (logged, left out)
+             * @param keys - the property keys
+             * @param type - the type holding them, for the log
+             * @returns the GraphQL name of each key exposed
+             */
+            graphQLNames(keys, type) {
+                return graphQLNames(keys, (key, name) => 
+                // The real property (or the first key renamed so) keeps the name: this key stays REST only
+                this.log("INFO", `Property '${key}' of ${type} is left out of GraphQL: its name '${name}' is already used`));
+            }
+            /**
+             * A field renamed from its JSON key reads that key (output), and carries it to be put back on inputs
+             * ({@link restoreInputKeys})
+             * @param config - the field config
+             * @param key - the JSON key
+             * @param name - the GraphQL name
+             * @param input - an input type field
+             * @returns the field config
+             */
+            renamedField(config, key, name, input) {
+                if (key === name)
+                    return config;
+                return {
+                    ...config,
+                    extensions: { ...config.extensions, [WEBDA_KEY]: key },
+                    ...(input ? {} : { resolve: (source) => source?.[key] })
+                };
+            }
             /**
              * Get or create a GraphQL query result wrapper type with results array and continuationToken
              * @param type - GraphQL object type to wrap in a query result
@@ -359,22 +450,20 @@ let GraphQLService = (() => {
                         };
                     });
                 }
-                for (const i in schema.properties) {
-                    // Private (`__`) fields are server-only: never part of an output or input type
-                    if (i.startsWith("__")) {
-                        continue;
-                    }
+                // Private (`__`) fields are server-only: never part of an output or input type
+                const names = this.graphQLNames(Object.keys(schema.properties ?? {}).filter(i => !i.startsWith("__")), defaultName);
+                for (const [i, field] of names) {
                     // Was initiated by the known graph; inputs never carry private or behavior attributes
-                    if (fields[i] ||
+                    if (fields[field] ||
                         skipFields.includes(i) ||
                         (input && (schema.properties[i].readOnly || !isInputAttribute(i, webdaGraph, writable)))) {
                         continue;
                     }
-                    const prop = this.getGraphQLSchemaFromSchema(this.getJsonSchemaDefinition(schema.properties[i], schema.definitions), `${defaultName}_${i}`, input);
+                    const prop = this.getGraphQLSchemaFromSchema(this.getJsonSchemaDefinition(schema.properties[i], schema.definitions), `${defaultName}_${field}`, input);
                     if (!prop) {
                         continue;
                     }
-                    fields[i] = prop;
+                    fields[field] = this.renamedField(prop, i, field, input);
                 }
                 return fields;
             }
@@ -490,17 +579,40 @@ let GraphQLService = (() => {
                 super.resolve();
                 // Set-up ws server
                 this.wss = new WebSocketServer({ noServer: true });
+                // The HTTP server events fire outside the instance storage: re-enter it
+                const storage = useInstanceStorage();
                 useCoreEvents("Webda.Init.Http", (http) => {
                     http.on("upgrade", (req, socket, head) => {
-                        if (req.url === this.parameters.url) {
+                        runWithInstanceStorage(storage, () => {
+                            if (req.url !== this.parameters.url)
+                                return;
                             (async () => {
-                                req.webdaContext ?? (req.webdaContext = await useCore().getContextFromRequest(req));
-                                await req.webdaContext.init();
+                                const httpServer = Object.values(useCore().getServices()).find(s => s.server === http && typeof s.getContextFromRequest === "function");
+                                req.webdaContext ?? (req.webdaContext = await (httpServer ?? useCore()).getContextFromRequest(req));
+                                const context = req.webdaContext;
+                                await context.init();
+                                // Same checks as a normal request: Webda.Request listeners and the router request filters
+                                const allowed = await runWithContext(context, async () => {
+                                    try {
+                                        emitCoreEvent("Webda.Request", { context });
+                                    }
+                                    catch {
+                                        // listener error
+                                    }
+                                    return useRouter().checkRequest(context);
+                                });
+                                if (!allowed) {
+                                    socket.end("HTTP/1.1 403 Forbidden\r\nConnection: close\r\nContent-Length: 0\r\n\r\n");
+                                    return;
+                                }
                                 this.wss.handleUpgrade(req, socket, head, ws => {
                                     this.wss.emit("connection", ws, req);
                                 });
-                            })();
-                        }
+                            })().catch(err => {
+                                this.log("ERROR", "GraphQL WebSocket upgrade failed", err);
+                                socket.destroy();
+                            });
+                        });
                     });
                 });
                 return this;
@@ -514,6 +626,10 @@ let GraphQLService = (() => {
                 const subscriptions = {};
                 const models = this.app.getModels();
                 this.modelsMap = {};
+                this.namedTypes = new Map();
+                // First pass: reserve every exposed model name (and its Input) before any type is built, so a nested
+                // titled type of the same name fails whatever the model order
+                const exposed = [];
                 for (const i in models) {
                     const model = models[i];
                     const metadata = useModelMetadata(model);
@@ -534,6 +650,11 @@ let GraphQLService = (() => {
                     if (!schema)
                         continue;
                     const name = (metadata.ShortName || i.split("/").pop()).replace("/", "_");
+                    this.reserveName(name, `model ${i}`);
+                    this.reserveName(`${name}Input`, `model input ${i}`);
+                    exposed.push({ i, model, metadata, schema, name });
+                }
+                for (const { i, model, metadata, schema, name } of exposed) {
                     this.log("INFO", "Add GraphQL type", name);
                     const modelGraph = metadata.Relations;
                     this.modelsMap[i] = new GraphQLObjectType({
@@ -544,6 +665,8 @@ let GraphQLService = (() => {
                         fields: this.getGraphQLFieldsFromSchema(schema, name + "Input", modelGraph, true, getClientWritableAttributes(model)),
                         name: name + "Input"
                     });
+                    this.namedTypes.get(name).type = this.modelsMap[i];
+                    this.namedTypes.get(`${name}Input`).type = input;
                     const actionsName = Object.keys(metadata.Actions);
                     if (!actionsName.includes("create")) {
                         mutations[`create${name}`] = {
@@ -553,7 +676,7 @@ let GraphQLService = (() => {
                             },
                             resolve: async (_, args, context) => {
                                 this.log("INFO", "Create", name, context.getCurrentUserId());
-                                return createFromInput(model, args[name], context);
+                                return createFromInput(model, restoreInputKeys(input, args[name]), context);
                             }
                         };
                     }
@@ -566,7 +689,7 @@ let GraphQLService = (() => {
                                     type: GraphQLString
                                 }
                             },
-                            resolve: async (_, args, context) => updateFromInput(model, args.uuid, args[name], context)
+                            resolve: async (_, args, context) => updateFromInput(model, args.uuid, restoreInputKeys(input, args[name]), context)
                         };
                     }
                     // check for actions
@@ -619,7 +742,8 @@ let GraphQLService = (() => {
                         },
                         subscribe: async (_source, args, context) => {
                             this.log("DEBUG", "Subscription called on", args);
-                            return this.registerAsyncIterator(model, args[uuidField], context);
+                            // The payload is keyed by the field name: the default resolver reads it from there
+                            return this.registerAsyncIterator(model, args[uuidField], context, this.transformName(i.split("/").pop()));
                         }
                     };
                     const events = metadata.Events || [];
@@ -776,6 +900,9 @@ let GraphQLService = (() => {
                 for (const i in rootFields) {
                     subscriptions[i] ?? (subscriptions[i] = { ...rootFields[i], resolve: undefined });
                 }
+                // Operations (service operations, model and behaviour actions) next to the model schema; added after the copy
+                // above on purpose: a query operation is not a subscription
+                this.addOperationFields(rootFields, mutations, subscriptions);
                 if (this.parameters.globalSubscription) {
                     // Create global type based on all previous subscriptions
                     subscriptions["Aggregate"] = {
@@ -811,6 +938,153 @@ let GraphQLService = (() => {
                 }
                 this.schema = this.getGraphQLSchema(rootFields, mutations, subscriptions);
             }
+            /**
+             * Expose the registered operations, except the model CRUD the model schema already serves: read-only ones as
+             * queries, the others as mutations, server-streaming ones as subscriptions
+             * @param rootFields - query fields
+             * @param mutations - mutation fields
+             * @param subscriptions - subscription fields
+             * @throws Error when a field name is already defined
+             */
+            addOperationFields(rootFields, mutations, subscriptions) {
+                const exposed = createOperationFilter(this.parameters.exposeOperations);
+                const targets = { query: rootFields, mutation: mutations, subscription: subscriptions };
+                const owners = new Map();
+                const operations = useInstanceStorage().operations;
+                for (const id of Object.keys(operations).sort()) {
+                    const op = operations[id];
+                    if (!exposed(id))
+                        continue;
+                    const placement = graphqlPlacement(id, op);
+                    if (!placement)
+                        continue;
+                    const target = targets[placement.kind];
+                    const key = `${placement.kind}.${placement.name}`;
+                    if (placement.kind === "subscription" && placement.name === "Aggregate" && this.parameters.globalSubscription) {
+                        throw new Error(`GraphQL subscription field Aggregate of operation ${id} is already defined by the global Aggregate subscription (globalSubscription): rename it with @Operation({ graphql: { subscription: "…" } })`);
+                    }
+                    if (target[placement.name]) {
+                        throw new Error(`GraphQL ${placement.kind} field ${placement.name} of operation ${id} is already defined by ${owners.get(key) ?? "the model schema"}: rename it with @Operation({ graphql: { ${placement.kind}: "…" } })`);
+                    }
+                    owners.set(key, `operation ${id}`);
+                    const base = operationTypeName(id);
+                    const { args, toInput } = this.operationArgs(op, base);
+                    const type = this.operationOutputType(op, base);
+                    const description = op.description || op.summary;
+                    target[placement.name] =
+                        placement.kind === "subscription"
+                            ? {
+                                type,
+                                args,
+                                description,
+                                subscribe: async (_source, fieldArgs, context) => this.subscribeOperation(id, op, toInput(fieldArgs), context),
+                                resolve: (chunk) => chunk
+                            }
+                            : {
+                                type,
+                                args,
+                                description,
+                                resolve: async (_source, fieldArgs, context) => this.runOperation(id, op, toInput(fieldArgs), context)
+                            };
+                    this.log("INFO", `Add GraphQL ${placement.kind}`, placement.name, "for operation", id);
+                }
+            }
+            /**
+             * GraphQL arguments of an operation: one per input schema property, or a single `input` argument
+             * @param op - operation
+             * @param base - type name prefix
+             * @returns the arguments and how to turn them back into the operation input
+             */
+            operationArgs(op, base) {
+                const schema = op.input && op.input !== "void" ? this.app.getSchema(op.input) : undefined;
+                if (!schema) {
+                    return { args: {}, toInput: () => undefined };
+                }
+                const resolved = this.getJsonSchemaDefinition(schema, schema.definitions);
+                const names = Object.keys(resolved.properties ?? {}).filter(name => !name.startsWith("__"));
+                if (resolved.type === "object" && names.length > 0 && names.every(name => GRAPHQL_NAME.test(name))) {
+                    const required = new Set(resolved.required ?? []);
+                    const args = {};
+                    for (const name of names) {
+                        const converted = this.getGraphQLSchemaFromSchema(this.getJsonSchemaDefinition(resolved.properties[name], resolved.definitions ?? schema.definitions), `${base}Input_${name}`, true);
+                        // A property the converter cannot map still is an argument: the Object scalar takes anything
+                        const type = (converted?.type ?? AnyScalarType);
+                        args[name] = {
+                            type: required.has(name) ? new GraphQLNonNull(type) : type,
+                            description: converted?.description
+                        };
+                    }
+                    return {
+                        args,
+                        toInput: fieldArgs => Object.fromEntries(Object.entries(fieldArgs).map(([k, v]) => [k, args[k] ? restoreInputKeys(args[k].type, v) : v]))
+                    };
+                }
+                const converted = this.getGraphQLSchemaFromSchema(resolved, `${base}Input`, true);
+                const type = (converted?.type ?? AnyScalarType);
+                return {
+                    args: { input: { type } },
+                    toInput: fieldArgs => restoreInputKeys(type, fieldArgs.input)
+                };
+            }
+            /**
+             * GraphQL type of an operation result
+             * @param op - operation
+             * @param base - type name prefix
+             * @returns the model type for a model output, Boolean for void, else the converted output schema
+             */
+            operationOutputType(op, base) {
+                if (!op.output || op.output === "void") {
+                    return GraphQLBoolean;
+                }
+                if (this.modelsMap[op.output]) {
+                    return this.modelsMap[op.output];
+                }
+                const schema = this.app.getSchema(op.output);
+                const converted = schema &&
+                    this.getGraphQLSchemaFromSchema(this.getJsonSchemaDefinition(schema, schema.definitions), `${base}Output`);
+                return (converted?.type ?? AnyScalarType);
+            }
+            /**
+             * Run an operation for a query or mutation field
+             * @param id - operation id
+             * @param op - operation
+             * @param input - operation input
+             * @param context - the GraphQL request context
+             * @returns the field value
+             */
+            async runOperation(id, op, input, context) {
+                this.countOperation(context);
+                const ctx = new GraphQLOperationContext(context, input);
+                await ctx.init();
+                try {
+                    await callOperation(ctx, id);
+                }
+                catch (err) {
+                    throw operationError(err);
+                }
+                if (!op.output || op.output === "void") {
+                    return true;
+                }
+                return this.modelsMap[op.output] ? ctx.result : publicCopy(ctx.result);
+            }
+            /**
+             * Start a server-streaming operation for a subscription field
+             * @param id - operation id
+             * @param op - operation
+             * @param input - operation input
+             * @param context - the GraphQL request context
+             * @returns the chunks; leaving the subscription cancels the operation
+             */
+            async subscribeOperation(id, op, input, context) {
+                this.countOperation(context);
+                const ctx = new GraphQLOperationContext(context, input, this.modelsMap[op.output] ? chunk => chunk : publicCopy);
+                await ctx.init();
+                if (!(await canCallOperation(ctx, id, { input }))) {
+                    throw operationError(new WebdaError.Forbidden(`${id} PermissionDenied`));
+                }
+                callOperation(ctx, id).then(() => ctx.finish(), err => ctx.fail(err));
+                return ctx.chunks();
+            }
             /**
              * Extract the list of event names from the GraphQL selection set (excluding latestEventTime)
              * @param info - GraphQL resolve info containing field selections
@@ -980,11 +1254,24 @@ let GraphQLService = (() => {
              */
             async registerAsyncEventIterator(model, uuid, events, context, identifier) {
                 const updatedCallback = eventName => async (evt) => {
-                    if (uuid === null || evt.object_id !== uuid)
+                    // A class-wide subscription (uuid null) receives the events of every object of the model
+                    if (uuid !== null && evt.object_id !== uuid)
                         return;
-                    // We rely on the cache of the store to get the full object
-                    // We let the other listeners finish before returning the object
-                    return { latestEventTime: Date.now(), [eventName]: evt };
+                    if (uuid === null) {
+                        // Only the events of objects the subscriber can read: an object that is gone or unreadable is skipped
+                        let object = evt.object;
+                        if (!object) {
+                            try {
+                                object = await model.ref(evt.object_id).get();
+                            }
+                            catch {
+                                return;
+                            }
+                        }
+                        if (!object || !(await isModelActionAllowed(object, context, "get", model)))
+                            return;
+                    }
+                    return { latestEventTime: Date.now(), [eventName]: publicCopy(evt) };
                 };
                 const eventsMap = {};
                 if (uuid !== null) {
@@ -1008,6 +1295,30 @@ let GraphQLService = (() => {
                     logout: { evt: "nok?" }
                 }).iterate();
             }
+            /**
+             * Hand a WebSocket message to graphql-ws; a failure is logged and closes the socket without leaking details
+             * @param socket - the WebSocket
+             * @param cb - the graphql-ws message handler
+             * @param data - the message
+             * @param storage - the instance storage to re-enter for the resolvers
+             * @returns a promise settled once the message is handled
+             */
+            async handleSocketMessage(socket, cb, data, storage) {
+                try {
+                    // wait for the the operation to complete
+                    // - if init message, waits for connect
+                    // - if query/mutation, waits for result
+                    // - if subscription, waits for complete
+                    // The socket events fire outside the instance storage: re-enter it for the resolvers
+                    await runWithInstanceStorage(storage, () => cb(data));
+                }
+                catch (err) {
+                    // all errors that could be thrown during the execution of operations will be caught here
+                    this.log("ERROR", "GraphQL websocket message failed", err);
+                    // A close reason is limited to 123 bytes and must not leak internal details
+                    socket.close(CloseCode.InternalServerError, "Internal server error");
+                }
+            }
             /**
              * Assemble the final GraphQLSchema from root query fields, mutations, and subscriptions
              * @param rootFields - top-level query fields
@@ -1059,6 +1370,7 @@ let GraphQLService = (() => {
                         return req.extra?.context || {};
                     }
                 });
+                const storage = useInstanceStorage();
                 this.wss.on("connection", async (socket, request) => {
                     // a new socket opened, let graphql-ws take over
                     const closed = this.wsHandler.opened({
@@ -1067,20 +1379,7 @@ let GraphQLService = (() => {
                             socket.send(data, err => (err ? reject(err) : resolve()));
                         }), // control your data flow by timing the promise resolve
                         close: (code, reason) => socket.close(code, reason), // there are protocol standard closures
-                        onMessage: cb => socket.on("message", async (event) => {
-                            try {
-                                // wait for the the operation to complete
-                                // - if init message, waits for connect
-                                // - if query/mutation, waits for result
-                                // - if subscription, waits for complete
-                                await cb(event.toString());
-                            }
-                            catch (err) {
-                                // all errors that could be thrown during the
-                                // execution of operations will be caught here
-                                socket.close(CloseCode.InternalServerError, err.message);
-                            }
-                        })
+                        onMessage: cb => socket.on("message", event => this.handleSocketMessage(socket, cb, event.toString(), storage))
                     }, 
                     // pass values to the `extra` field in the context
                     { socket, request, context: request.webdaContext });