@fluidframework/request-handler 0.54.1 → 0.55.1

package/.eslintrc.js

@@ -5,7 +5,7 @@
 
 module.exports = {
     "extends": [
-        "@fluidframework/eslint-config-fluid/eslint7"
+        "@fluidframework/eslint-config-fluid"
     ],
     "parserOptions": {
         "project": ["./tsconfig.json", "./src/test/tsconfig.json"]

package/dist/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/request-handler";
-export declare const pkgVersion = "0.54.1";
+export declare const pkgVersion = "0.55.1";
 //# sourceMappingURL=packageVersion.d.ts.map

package/dist/packageVersion.js

@@ -8,5 +8,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pkgVersion = exports.pkgName = void 0;
 exports.pkgName = "@fluidframework/request-handler";
-exports.pkgVersion = "0.54.1";
+exports.pkgVersion = "0.55.1";
 //# sourceMappingURL=packageVersion.js.map

package/dist/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,iCAAiC,CAAC;AAC5C,QAAA,UAAU,GAAG,QAAQ,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/request-handler\";\nexport const pkgVersion = \"0.54.1\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,iCAAiC,CAAC;AAC5C,QAAA,UAAU,GAAG,QAAQ,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/request-handler\";\nexport const pkgVersion = \"0.55.1\";\n"]}

package/dist/requestHandlers.d.ts

@@ -13,24 +13,13 @@ import { RequestParser } from "@fluidframework/runtime-utils";
  * the route, or fulling the specific request.
  */
 export declare type RuntimeRequestHandler = (request: RequestParser, runtime: IContainerRuntime) => Promise<IResponse | undefined>;
-/**
- * @deprecated - please avoid adding new references to this API!  Instead prefer rootDataObjectRequestHandler.
- * It exposes internal container guts to external world, which is not ideal.
- * It also relies heavily on internal routing schema (formation of handle URIs) which will change in future
- * And last, but not least, it does not allow any policy to be implemented around GC of data stores exposed
- * through internal URIs. I.e. if there are no other references to such objects, they will be GC'd and
- * external links would get broken. Maybe that's what is needed in some cases, but better, more centralized
- * handling of external URI to internal handle is required (in future, we will support weak handle references,
- * that will allow any GC policy to be implemented by container authors.)
- */
-export declare const innerRequestHandler: (request: IRequest, runtime: IContainerRuntimeBase) => Promise<IResponse>;
 /**
  * A request handler to expose access to all root data stores in the container by id.
  * @param request - the request for the root data store.  The first path part must be the data store's ID.
  * @param runtime - the container runtime
  * @returns the result of the request
  */
-export declare const rootDataStoreRequestHandler: (request: IRequest, runtime: IContainerRuntime) => Promise<IResponse>;
+export declare const rootDataStoreRequestHandler: (request: IRequest, runtime: IContainerRuntime) => Promise<IResponse | undefined>;
 export declare const createFluidObjectResponse: (fluidObject: FluidObject) => {
     status: 200;
     mimeType: "fluid/object";

package/dist/requestHandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestHandlers.d.ts","sourceRoot":"","sources":["../src/requestHandlers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACH,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,cAAc,EACd,WAAW,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAqB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAEjF;;;;;GAKG;AACH,oBAAY,qBAAqB,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,iBAAiB,KAChF,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;AAEtC;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,YAAmB,QAAQ,WAAW,qBAAqB,uBACrC,CAAC;AAEvD;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,YAAmB,QAAQ,WAAW,iBAAiB,uBAW9F,CAAC;AAEF,eAAO,MAAM,yBAAyB,gBAAiB,WAAW,KAC9D;IAAC,QAAQ,GAAG,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAE7D,CAAC;AA6BF,wBAAgB,mBAAmB,CAAC,CAAC,GAAG,YAAY,GAAG,WAAW,GAAG,cAAc,EAC/E,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,qBAAqB,GAC/B,YAAY,CAAC,CAAC,CAAC,CAEjB"}
+{"version":3,"file":"requestHandlers.d.ts","sourceRoot":"","sources":["../src/requestHandlers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACH,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,cAAc,EACd,WAAW,EAEd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D;;;;;GAKG;AACH,oBAAY,qBAAqB,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,iBAAiB,KAChF,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;AAEtC;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,YAAmB,QAAQ,WAAW,iBAAiB,mCAgB9F,CAAC;AAEF,eAAO,MAAM,yBAAyB,gBAAiB,WAAW,KAC9D;IAAC,QAAQ,GAAG,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAE7D,CAAC;AA4BF,wBAAgB,mBAAmB,CAAC,CAAC,GAAG,YAAY,GAAG,WAAW,GAAG,cAAc,EAC/E,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,qBAAqB,GAC/B,YAAY,CAAC,CAAC,CAAC,CAEjB"}

package/dist/requestHandlers.js

@@ -4,21 +4,9 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleFromLegacyUri = exports.createFluidObjectResponse = exports.rootDataStoreRequestHandler = exports.innerRequestHandler = void 0;
+exports.handleFromLegacyUri = exports.createFluidObjectResponse = exports.rootDataStoreRequestHandler = void 0;
 const common_utils_1 = require("@fluidframework/common-utils");
 const runtime_utils_1 = require("@fluidframework/runtime-utils");
-/**
- * @deprecated - please avoid adding new references to this API!  Instead prefer rootDataObjectRequestHandler.
- * It exposes internal container guts to external world, which is not ideal.
- * It also relies heavily on internal routing schema (formation of handle URIs) which will change in future
- * And last, but not least, it does not allow any policy to be implemented around GC of data stores exposed
- * through internal URIs. I.e. if there are no other references to such objects, they will be GC'd and
- * external links would get broken. Maybe that's what is needed in some cases, but better, more centralized
- * handling of external URI to internal handle is required (in future, we will support weak handle references,
- * that will allow any GC policy to be implemented by container authors.)
- */
-const innerRequestHandler = async (request, runtime) => runtime.IFluidHandleContext.resolveHandle(request);
-exports.innerRequestHandler = innerRequestHandler;
 /**
  * A request handler to expose access to all root data stores in the container by id.
  * @param request - the request for the root data store.  The first path part must be the data store's ID.
@@ -30,13 +18,19 @@ const rootDataStoreRequestHandler = async (request, runtime) => {
     const requestParser = runtime_utils_1.RequestParser.create(request);
     const id = requestParser.pathParts[0];
     const wait = typeof ((_a = request.headers) === null || _a === void 0 ? void 0 : _a.wait) === "boolean" ? request.headers.wait : undefined;
+    let rootDataStore;
     try {
         // getRootDataStore currently throws if the data store is not found
-        const rootDataStore = await runtime.getRootDataStore(id, wait);
+        rootDataStore = await runtime.getRootDataStore(id, wait);
+    }
+    catch (error) {
+        return undefined; // continue search
+    }
+    try {
         return rootDataStore.IFluidRouter.request(requestParser.createSubRequest(1));
     }
     catch (error) {
-        return runtime_utils_1.create404Response(request);
+        return { status: 500, mimeType: "fluid/object", value: error };
     }
 };
 exports.rootDataStoreRequestHandler = rootDataStoreRequestHandler;
@@ -66,7 +60,6 @@ class LegacyUriHandle {
         throw new Error("Cannot bind to LegacyUriHandle");
     }
 }
-// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
 function handleFromLegacyUri(uri, runtime) {
     return new LegacyUriHandle(uri, runtime);
 }

package/dist/requestHandlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestHandlers.js","sourceRoot":"","sources":["../src/requestHandlers.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+DAAsD;AAWtD,iEAAiF;AAWjF;;;;;;;;;GASG;AACI,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAAiB,EAAE,OAA8B,EAAE,EAAE,CAC3F,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AAD1C,QAAA,mBAAmB,uBACuB;AAEvD;;;;;GAKG;AACI,MAAM,2BAA2B,GAAG,KAAK,EAAE,OAAiB,EAAE,OAA0B,EAAE,EAAE;;IAC/F,MAAM,aAAa,GAAG,6BAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,EAAE,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,cAAO,OAAO,CAAC,OAAO,0CAAE,IAAI,CAAA,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3F,IAAI;QACA,mEAAmE;QACnE,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC/D,OAAO,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;KAChF;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,iCAAiB,CAAC,OAAO,CAAC,CAAC;KACrC;AACL,CAAC,CAAC;AAXW,QAAA,2BAA2B,+BAWtC;AAEK,MAAM,yBAAyB,GAAG,CAAC,WAAwB,EACF,EAAE;IAC9D,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;AACzE,CAAC,CAAC;AAHW,QAAA,yBAAyB,6BAGpC;AAEF,MAAM,eAAe;IAKjB,YAAmC,YAAY,EAAkB,OAA8B;QAA5D,iBAAY,GAAZ,YAAY,CAAA;QAAkB,YAAO,GAAP,OAAO,CAAuB;QAJ/E,eAAU,GAAG,IAAI,CAAC;IAKlC,CAAC;IAHD,IAAW,YAAY,KAAmB,OAAO,IAAI,CAAC,CAAC,CAAC;IAKjD,WAAW;QACd,qBAAM,CAAC,KAAK,EAAE,KAAK,CAAC,0CAA0C,CAAC,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,GAAG;QACZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAClG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,QAAQ,KAAK,cAAc,EAAE;YACjE,+DAA+D;YAC/D,OAAO,QAAQ,CAAC,KAAK,CAAC;SACzB;QACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IAC7E,CAAC;IAEM,IAAI,CAAC,MAAoB;QAC5B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACtD,CAAC;CACJ;AAED,+DAA+D;AAC/D,SAAgB,mBAAmB,CAC/B,GAAW,EACX,OAA8B;IAE9B,OAAO,IAAI,eAAe,CAAI,GAAG,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AALD,kDAKC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/common-utils\";\nimport {\n    IFluidObject,\n    IResponse,\n    IRequest,\n    IFluidHandle,\n    IFluidLoadable,\n    FluidObject,\n} from \"@fluidframework/core-interfaces\";\nimport { IContainerRuntime } from \"@fluidframework/container-runtime-definitions\";\nimport { IContainerRuntimeBase } from \"@fluidframework/runtime-definitions\";\nimport { create404Response, RequestParser } from \"@fluidframework/runtime-utils\";\n\n/**\n * A request handler for the container runtime. Each handler should handle a specific request, and return undefined\n * if it does not apply. These handlers are called in series, so there may be other handlers before or after.\n * A handler should only return error if the request is for a route the handler owns, and there is a problem with\n * the route, or fulling the specific request.\n */\nexport type RuntimeRequestHandler = (request: RequestParser, runtime: IContainerRuntime)\n    => Promise<IResponse | undefined>;\n\n/**\n * @deprecated - please avoid adding new references to this API!  Instead prefer rootDataObjectRequestHandler.\n * It exposes internal container guts to external world, which is not ideal.\n * It also relies heavily on internal routing schema (formation of handle URIs) which will change in future\n * And last, but not least, it does not allow any policy to be implemented around GC of data stores exposed\n * through internal URIs. I.e. if there are no other references to such objects, they will be GC'd and\n * external links would get broken. Maybe that's what is needed in some cases, but better, more centralized\n * handling of external URI to internal handle is required (in future, we will support weak handle references,\n * that will allow any GC policy to be implemented by container authors.)\n */\nexport const innerRequestHandler = async (request: IRequest, runtime: IContainerRuntimeBase) =>\n    runtime.IFluidHandleContext.resolveHandle(request);\n\n/**\n * A request handler to expose access to all root data stores in the container by id.\n * @param request - the request for the root data store.  The first path part must be the data store's ID.\n * @param runtime - the container runtime\n * @returns the result of the request\n */\nexport const rootDataStoreRequestHandler = async (request: IRequest, runtime: IContainerRuntime) => {\n    const requestParser = RequestParser.create(request);\n    const id = requestParser.pathParts[0];\n    const wait = typeof request.headers?.wait === \"boolean\" ? request.headers.wait : undefined;\n    try {\n        // getRootDataStore currently throws if the data store is not found\n        const rootDataStore = await runtime.getRootDataStore(id, wait);\n        return rootDataStore.IFluidRouter.request(requestParser.createSubRequest(1));\n    } catch (error) {\n        return create404Response(request);\n    }\n};\n\nexport const createFluidObjectResponse = (fluidObject: FluidObject):\n    {status: 200, mimeType: \"fluid/object\", value: FluidObject} => {\n    return { status: 200, mimeType: \"fluid/object\", value: fluidObject };\n};\n\nclass LegacyUriHandle<T = IFluidObject & FluidObject & IFluidLoadable> implements IFluidHandle<T> {\n    public readonly isAttached = true;\n\n    public get IFluidHandle(): IFluidHandle { return this; }\n\n    public constructor(public readonly absolutePath, public readonly runtime: IContainerRuntimeBase) {\n    }\n\n    public attachGraph() {\n        assert(false, 0x0ca /* \"Trying to use legacy graph attach!\" */);\n    }\n\n    public async get(): Promise<any> {\n        const response = await this.runtime.IFluidHandleContext.resolveHandle({ url: this.absolutePath });\n        if (response.status === 200 && response.mimeType === \"fluid/object\") {\n            // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n            return response.value;\n        }\n        throw new Error(`Failed to resolve container path ${this.absolutePath}`);\n    }\n\n    public bind(handle: IFluidHandle) {\n        throw new Error(\"Cannot bind to LegacyUriHandle\");\n    }\n}\n\n// eslint-disable-next-line prefer-arrow/prefer-arrow-functions\nexport function handleFromLegacyUri<T = IFluidObject & FluidObject & IFluidLoadable>(\n    uri: string,\n    runtime: IContainerRuntimeBase,\n): IFluidHandle<T> {\n    return new LegacyUriHandle<T>(uri, runtime);\n}\n"]}
+{"version":3,"file":"requestHandlers.js","sourceRoot":"","sources":["../src/requestHandlers.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+DAAsD;AAYtD,iEAA8D;AAW9D;;;;;GAKG;AACI,MAAM,2BAA2B,GAAG,KAAK,EAAE,OAAiB,EAAE,OAA0B,EAAE,EAAE;;IAC/F,MAAM,aAAa,GAAG,6BAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,EAAE,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,cAAO,OAAO,CAAC,OAAO,0CAAE,IAAI,CAAA,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3F,IAAI,aAA2B,CAAC;IAChC,IAAI;QACA,mEAAmE;QACnE,aAAa,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;KAC5D;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,SAAS,CAAC,CAAC,kBAAkB;KACvC;IACD,IAAI;QACA,OAAO,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;KAChF;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;KAClE;AACL,CAAC,CAAC;AAhBW,QAAA,2BAA2B,+BAgBtC;AAEK,MAAM,yBAAyB,GAAG,CAAC,WAAwB,EACF,EAAE;IAC9D,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;AACzE,CAAC,CAAC;AAHW,QAAA,yBAAyB,6BAGpC;AAEF,MAAM,eAAe;IAKjB,YAAmC,YAAY,EAAkB,OAA8B;QAA5D,iBAAY,GAAZ,YAAY,CAAA;QAAkB,YAAO,GAAP,OAAO,CAAuB;QAJ/E,eAAU,GAAG,IAAI,CAAC;IAKlC,CAAC;IAHD,IAAW,YAAY,KAAmB,OAAO,IAAI,CAAC,CAAC,CAAC;IAKjD,WAAW;QACd,qBAAM,CAAC,KAAK,EAAE,KAAK,CAAC,0CAA0C,CAAC,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,GAAG;QACZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAClG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,QAAQ,KAAK,cAAc,EAAE;YACjE,+DAA+D;YAC/D,OAAO,QAAQ,CAAC,KAAK,CAAC;SACzB;QACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IAC7E,CAAC;IAEM,IAAI,CAAC,MAAoB;QAC5B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACtD,CAAC;CACJ;AAED,SAAgB,mBAAmB,CAC/B,GAAW,EACX,OAA8B;IAE9B,OAAO,IAAI,eAAe,CAAI,GAAG,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AALD,kDAKC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/common-utils\";\nimport {\n    IFluidObject,\n    IResponse,\n    IRequest,\n    IFluidHandle,\n    IFluidLoadable,\n    FluidObject,\n    IFluidRouter,\n} from \"@fluidframework/core-interfaces\";\nimport { IContainerRuntime } from \"@fluidframework/container-runtime-definitions\";\nimport { IContainerRuntimeBase } from \"@fluidframework/runtime-definitions\";\nimport { RequestParser } from \"@fluidframework/runtime-utils\";\n\n/**\n * A request handler for the container runtime. Each handler should handle a specific request, and return undefined\n * if it does not apply. These handlers are called in series, so there may be other handlers before or after.\n * A handler should only return error if the request is for a route the handler owns, and there is a problem with\n * the route, or fulling the specific request.\n */\nexport type RuntimeRequestHandler = (request: RequestParser, runtime: IContainerRuntime)\n    => Promise<IResponse | undefined>;\n\n/**\n * A request handler to expose access to all root data stores in the container by id.\n * @param request - the request for the root data store.  The first path part must be the data store's ID.\n * @param runtime - the container runtime\n * @returns the result of the request\n */\nexport const rootDataStoreRequestHandler = async (request: IRequest, runtime: IContainerRuntime) => {\n    const requestParser = RequestParser.create(request);\n    const id = requestParser.pathParts[0];\n    const wait = typeof request.headers?.wait === \"boolean\" ? request.headers.wait : undefined;\n    let rootDataStore: IFluidRouter;\n    try {\n        // getRootDataStore currently throws if the data store is not found\n        rootDataStore = await runtime.getRootDataStore(id, wait);\n    } catch (error) {\n        return undefined; // continue search\n    }\n    try {\n        return rootDataStore.IFluidRouter.request(requestParser.createSubRequest(1));\n    } catch (error) {\n        return { status: 500, mimeType: \"fluid/object\", value: error };\n    }\n};\n\nexport const createFluidObjectResponse = (fluidObject: FluidObject):\n    {status: 200, mimeType: \"fluid/object\", value: FluidObject} => {\n    return { status: 200, mimeType: \"fluid/object\", value: fluidObject };\n};\n\nclass LegacyUriHandle<T = IFluidObject & FluidObject & IFluidLoadable> implements IFluidHandle<T> {\n    public readonly isAttached = true;\n\n    public get IFluidHandle(): IFluidHandle { return this; }\n\n    public constructor(public readonly absolutePath, public readonly runtime: IContainerRuntimeBase) {\n    }\n\n    public attachGraph() {\n        assert(false, 0x0ca /* \"Trying to use legacy graph attach!\" */);\n    }\n\n    public async get(): Promise<any> {\n        const response = await this.runtime.IFluidHandleContext.resolveHandle({ url: this.absolutePath });\n        if (response.status === 200 && response.mimeType === \"fluid/object\") {\n            // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n            return response.value;\n        }\n        throw new Error(`Failed to resolve container path ${this.absolutePath}`);\n    }\n\n    public bind(handle: IFluidHandle) {\n        throw new Error(\"Cannot bind to LegacyUriHandle\");\n    }\n}\n\nexport function handleFromLegacyUri<T = IFluidObject & FluidObject & IFluidLoadable>(\n    uri: string,\n    runtime: IContainerRuntimeBase,\n): IFluidHandle<T> {\n    return new LegacyUriHandle<T>(uri, runtime);\n}\n"]}

package/lib/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/request-handler";
-export declare const pkgVersion = "0.54.1";
+export declare const pkgVersion = "0.55.1";
 //# sourceMappingURL=packageVersion.d.ts.map

package/lib/packageVersion.js

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export const pkgName = "@fluidframework/request-handler";
-export const pkgVersion = "0.54.1";
+export const pkgVersion = "0.55.1";
 //# sourceMappingURL=packageVersion.js.map

package/lib/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,iCAAiC,CAAC;AACzD,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/request-handler\";\nexport const pkgVersion = \"0.54.1\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,iCAAiC,CAAC;AACzD,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/request-handler\";\nexport const pkgVersion = \"0.55.1\";\n"]}

package/lib/requestHandlers.d.ts

@@ -13,24 +13,13 @@ import { RequestParser } from "@fluidframework/runtime-utils";
  * the route, or fulling the specific request.
  */
 export declare type RuntimeRequestHandler = (request: RequestParser, runtime: IContainerRuntime) => Promise<IResponse | undefined>;
-/**
- * @deprecated - please avoid adding new references to this API!  Instead prefer rootDataObjectRequestHandler.
- * It exposes internal container guts to external world, which is not ideal.
- * It also relies heavily on internal routing schema (formation of handle URIs) which will change in future
- * And last, but not least, it does not allow any policy to be implemented around GC of data stores exposed
- * through internal URIs. I.e. if there are no other references to such objects, they will be GC'd and
- * external links would get broken. Maybe that's what is needed in some cases, but better, more centralized
- * handling of external URI to internal handle is required (in future, we will support weak handle references,
- * that will allow any GC policy to be implemented by container authors.)
- */
-export declare const innerRequestHandler: (request: IRequest, runtime: IContainerRuntimeBase) => Promise<IResponse>;
 /**
  * A request handler to expose access to all root data stores in the container by id.
  * @param request - the request for the root data store.  The first path part must be the data store's ID.
  * @param runtime - the container runtime
  * @returns the result of the request
  */
-export declare const rootDataStoreRequestHandler: (request: IRequest, runtime: IContainerRuntime) => Promise<IResponse>;
+export declare const rootDataStoreRequestHandler: (request: IRequest, runtime: IContainerRuntime) => Promise<IResponse | undefined>;
 export declare const createFluidObjectResponse: (fluidObject: FluidObject) => {
     status: 200;
     mimeType: "fluid/object";

package/lib/requestHandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestHandlers.d.ts","sourceRoot":"","sources":["../src/requestHandlers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACH,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,cAAc,EACd,WAAW,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAqB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAEjF;;;;;GAKG;AACH,oBAAY,qBAAqB,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,iBAAiB,KAChF,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;AAEtC;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,YAAmB,QAAQ,WAAW,qBAAqB,uBACrC,CAAC;AAEvD;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,YAAmB,QAAQ,WAAW,iBAAiB,uBAW9F,CAAC;AAEF,eAAO,MAAM,yBAAyB,gBAAiB,WAAW,KAC9D;IAAC,QAAQ,GAAG,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAE7D,CAAC;AA6BF,wBAAgB,mBAAmB,CAAC,CAAC,GAAG,YAAY,GAAG,WAAW,GAAG,cAAc,EAC/E,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,qBAAqB,GAC/B,YAAY,CAAC,CAAC,CAAC,CAEjB"}
+{"version":3,"file":"requestHandlers.d.ts","sourceRoot":"","sources":["../src/requestHandlers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACH,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,cAAc,EACd,WAAW,EAEd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D;;;;;GAKG;AACH,oBAAY,qBAAqB,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,iBAAiB,KAChF,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;AAEtC;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,YAAmB,QAAQ,WAAW,iBAAiB,mCAgB9F,CAAC;AAEF,eAAO,MAAM,yBAAyB,gBAAiB,WAAW,KAC9D;IAAC,QAAQ,GAAG,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAE7D,CAAC;AA4BF,wBAAgB,mBAAmB,CAAC,CAAC,GAAG,YAAY,GAAG,WAAW,GAAG,cAAc,EAC/E,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,qBAAqB,GAC/B,YAAY,CAAC,CAAC,CAAC,CAEjB"}

package/lib/requestHandlers.js

@@ -3,18 +3,7 @@
  * Licensed under the MIT License.
  */
 import { assert } from "@fluidframework/common-utils";
-import { create404Response, RequestParser } from "@fluidframework/runtime-utils";
-/**
- * @deprecated - please avoid adding new references to this API!  Instead prefer rootDataObjectRequestHandler.
- * It exposes internal container guts to external world, which is not ideal.
- * It also relies heavily on internal routing schema (formation of handle URIs) which will change in future
- * And last, but not least, it does not allow any policy to be implemented around GC of data stores exposed
- * through internal URIs. I.e. if there are no other references to such objects, they will be GC'd and
- * external links would get broken. Maybe that's what is needed in some cases, but better, more centralized
- * handling of external URI to internal handle is required (in future, we will support weak handle references,
- * that will allow any GC policy to be implemented by container authors.)
- */
-export const innerRequestHandler = async (request, runtime) => runtime.IFluidHandleContext.resolveHandle(request);
+import { RequestParser } from "@fluidframework/runtime-utils";
 /**
  * A request handler to expose access to all root data stores in the container by id.
  * @param request - the request for the root data store.  The first path part must be the data store's ID.
@@ -26,13 +15,19 @@ export const rootDataStoreRequestHandler = async (request, runtime) => {
     const requestParser = RequestParser.create(request);
     const id = requestParser.pathParts[0];
     const wait = typeof ((_a = request.headers) === null || _a === void 0 ? void 0 : _a.wait) === "boolean" ? request.headers.wait : undefined;
+    let rootDataStore;
     try {
         // getRootDataStore currently throws if the data store is not found
-        const rootDataStore = await runtime.getRootDataStore(id, wait);
+        rootDataStore = await runtime.getRootDataStore(id, wait);
+    }
+    catch (error) {
+        return undefined; // continue search
+    }
+    try {
         return rootDataStore.IFluidRouter.request(requestParser.createSubRequest(1));
     }
     catch (error) {
-        return create404Response(request);
+        return { status: 500, mimeType: "fluid/object", value: error };
     }
 };
 export const createFluidObjectResponse = (fluidObject) => {
@@ -60,7 +55,6 @@ class LegacyUriHandle {
         throw new Error("Cannot bind to LegacyUriHandle");
     }
 }
-// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
 export function handleFromLegacyUri(uri, runtime) {
     return new LegacyUriHandle(uri, runtime);
 }

package/lib/requestHandlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestHandlers.js","sourceRoot":"","sources":["../src/requestHandlers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAWtD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAWjF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAAiB,EAAE,OAA8B,EAAE,EAAE,CAC3F,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AAEvD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,EAAE,OAAiB,EAAE,OAA0B,EAAE,EAAE;;IAC/F,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,EAAE,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,cAAO,OAAO,CAAC,OAAO,0CAAE,IAAI,CAAA,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3F,IAAI;QACA,mEAAmE;QACnE,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC/D,OAAO,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;KAChF;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC;KACrC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,WAAwB,EACF,EAAE;IAC9D,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,eAAe;IAKjB,YAAmC,YAAY,EAAkB,OAA8B;QAA5D,iBAAY,GAAZ,YAAY,CAAA;QAAkB,YAAO,GAAP,OAAO,CAAuB;QAJ/E,eAAU,GAAG,IAAI,CAAC;IAKlC,CAAC;IAHD,IAAW,YAAY,KAAmB,OAAO,IAAI,CAAC,CAAC,CAAC;IAKjD,WAAW;QACd,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,0CAA0C,CAAC,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,GAAG;QACZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAClG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,QAAQ,KAAK,cAAc,EAAE;YACjE,+DAA+D;YAC/D,OAAO,QAAQ,CAAC,KAAK,CAAC;SACzB;QACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IAC7E,CAAC;IAEM,IAAI,CAAC,MAAoB;QAC5B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACtD,CAAC;CACJ;AAED,+DAA+D;AAC/D,MAAM,UAAU,mBAAmB,CAC/B,GAAW,EACX,OAA8B;IAE9B,OAAO,IAAI,eAAe,CAAI,GAAG,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/common-utils\";\nimport {\n    IFluidObject,\n    IResponse,\n    IRequest,\n    IFluidHandle,\n    IFluidLoadable,\n    FluidObject,\n} from \"@fluidframework/core-interfaces\";\nimport { IContainerRuntime } from \"@fluidframework/container-runtime-definitions\";\nimport { IContainerRuntimeBase } from \"@fluidframework/runtime-definitions\";\nimport { create404Response, RequestParser } from \"@fluidframework/runtime-utils\";\n\n/**\n * A request handler for the container runtime. Each handler should handle a specific request, and return undefined\n * if it does not apply. These handlers are called in series, so there may be other handlers before or after.\n * A handler should only return error if the request is for a route the handler owns, and there is a problem with\n * the route, or fulling the specific request.\n */\nexport type RuntimeRequestHandler = (request: RequestParser, runtime: IContainerRuntime)\n    => Promise<IResponse | undefined>;\n\n/**\n * @deprecated - please avoid adding new references to this API!  Instead prefer rootDataObjectRequestHandler.\n * It exposes internal container guts to external world, which is not ideal.\n * It also relies heavily on internal routing schema (formation of handle URIs) which will change in future\n * And last, but not least, it does not allow any policy to be implemented around GC of data stores exposed\n * through internal URIs. I.e. if there are no other references to such objects, they will be GC'd and\n * external links would get broken. Maybe that's what is needed in some cases, but better, more centralized\n * handling of external URI to internal handle is required (in future, we will support weak handle references,\n * that will allow any GC policy to be implemented by container authors.)\n */\nexport const innerRequestHandler = async (request: IRequest, runtime: IContainerRuntimeBase) =>\n    runtime.IFluidHandleContext.resolveHandle(request);\n\n/**\n * A request handler to expose access to all root data stores in the container by id.\n * @param request - the request for the root data store.  The first path part must be the data store's ID.\n * @param runtime - the container runtime\n * @returns the result of the request\n */\nexport const rootDataStoreRequestHandler = async (request: IRequest, runtime: IContainerRuntime) => {\n    const requestParser = RequestParser.create(request);\n    const id = requestParser.pathParts[0];\n    const wait = typeof request.headers?.wait === \"boolean\" ? request.headers.wait : undefined;\n    try {\n        // getRootDataStore currently throws if the data store is not found\n        const rootDataStore = await runtime.getRootDataStore(id, wait);\n        return rootDataStore.IFluidRouter.request(requestParser.createSubRequest(1));\n    } catch (error) {\n        return create404Response(request);\n    }\n};\n\nexport const createFluidObjectResponse = (fluidObject: FluidObject):\n    {status: 200, mimeType: \"fluid/object\", value: FluidObject} => {\n    return { status: 200, mimeType: \"fluid/object\", value: fluidObject };\n};\n\nclass LegacyUriHandle<T = IFluidObject & FluidObject & IFluidLoadable> implements IFluidHandle<T> {\n    public readonly isAttached = true;\n\n    public get IFluidHandle(): IFluidHandle { return this; }\n\n    public constructor(public readonly absolutePath, public readonly runtime: IContainerRuntimeBase) {\n    }\n\n    public attachGraph() {\n        assert(false, 0x0ca /* \"Trying to use legacy graph attach!\" */);\n    }\n\n    public async get(): Promise<any> {\n        const response = await this.runtime.IFluidHandleContext.resolveHandle({ url: this.absolutePath });\n        if (response.status === 200 && response.mimeType === \"fluid/object\") {\n            // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n            return response.value;\n        }\n        throw new Error(`Failed to resolve container path ${this.absolutePath}`);\n    }\n\n    public bind(handle: IFluidHandle) {\n        throw new Error(\"Cannot bind to LegacyUriHandle\");\n    }\n}\n\n// eslint-disable-next-line prefer-arrow/prefer-arrow-functions\nexport function handleFromLegacyUri<T = IFluidObject & FluidObject & IFluidLoadable>(\n    uri: string,\n    runtime: IContainerRuntimeBase,\n): IFluidHandle<T> {\n    return new LegacyUriHandle<T>(uri, runtime);\n}\n"]}
+{"version":3,"file":"requestHandlers.js","sourceRoot":"","sources":["../src/requestHandlers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAYtD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAW9D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,EAAE,OAAiB,EAAE,OAA0B,EAAE,EAAE;;IAC/F,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,EAAE,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,cAAO,OAAO,CAAC,OAAO,0CAAE,IAAI,CAAA,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3F,IAAI,aAA2B,CAAC;IAChC,IAAI;QACA,mEAAmE;QACnE,aAAa,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;KAC5D;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,SAAS,CAAC,CAAC,kBAAkB;KACvC;IACD,IAAI;QACA,OAAO,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;KAChF;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;KAClE;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,WAAwB,EACF,EAAE;IAC9D,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,eAAe;IAKjB,YAAmC,YAAY,EAAkB,OAA8B;QAA5D,iBAAY,GAAZ,YAAY,CAAA;QAAkB,YAAO,GAAP,OAAO,CAAuB;QAJ/E,eAAU,GAAG,IAAI,CAAC;IAKlC,CAAC;IAHD,IAAW,YAAY,KAAmB,OAAO,IAAI,CAAC,CAAC,CAAC;IAKjD,WAAW;QACd,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,0CAA0C,CAAC,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,GAAG;QACZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAClG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,QAAQ,KAAK,cAAc,EAAE;YACjE,+DAA+D;YAC/D,OAAO,QAAQ,CAAC,KAAK,CAAC;SACzB;QACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IAC7E,CAAC;IAEM,IAAI,CAAC,MAAoB;QAC5B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACtD,CAAC;CACJ;AAED,MAAM,UAAU,mBAAmB,CAC/B,GAAW,EACX,OAA8B;IAE9B,OAAO,IAAI,eAAe,CAAI,GAAG,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/common-utils\";\nimport {\n    IFluidObject,\n    IResponse,\n    IRequest,\n    IFluidHandle,\n    IFluidLoadable,\n    FluidObject,\n    IFluidRouter,\n} from \"@fluidframework/core-interfaces\";\nimport { IContainerRuntime } from \"@fluidframework/container-runtime-definitions\";\nimport { IContainerRuntimeBase } from \"@fluidframework/runtime-definitions\";\nimport { RequestParser } from \"@fluidframework/runtime-utils\";\n\n/**\n * A request handler for the container runtime. Each handler should handle a specific request, and return undefined\n * if it does not apply. These handlers are called in series, so there may be other handlers before or after.\n * A handler should only return error if the request is for a route the handler owns, and there is a problem with\n * the route, or fulling the specific request.\n */\nexport type RuntimeRequestHandler = (request: RequestParser, runtime: IContainerRuntime)\n    => Promise<IResponse | undefined>;\n\n/**\n * A request handler to expose access to all root data stores in the container by id.\n * @param request - the request for the root data store.  The first path part must be the data store's ID.\n * @param runtime - the container runtime\n * @returns the result of the request\n */\nexport const rootDataStoreRequestHandler = async (request: IRequest, runtime: IContainerRuntime) => {\n    const requestParser = RequestParser.create(request);\n    const id = requestParser.pathParts[0];\n    const wait = typeof request.headers?.wait === \"boolean\" ? request.headers.wait : undefined;\n    let rootDataStore: IFluidRouter;\n    try {\n        // getRootDataStore currently throws if the data store is not found\n        rootDataStore = await runtime.getRootDataStore(id, wait);\n    } catch (error) {\n        return undefined; // continue search\n    }\n    try {\n        return rootDataStore.IFluidRouter.request(requestParser.createSubRequest(1));\n    } catch (error) {\n        return { status: 500, mimeType: \"fluid/object\", value: error };\n    }\n};\n\nexport const createFluidObjectResponse = (fluidObject: FluidObject):\n    {status: 200, mimeType: \"fluid/object\", value: FluidObject} => {\n    return { status: 200, mimeType: \"fluid/object\", value: fluidObject };\n};\n\nclass LegacyUriHandle<T = IFluidObject & FluidObject & IFluidLoadable> implements IFluidHandle<T> {\n    public readonly isAttached = true;\n\n    public get IFluidHandle(): IFluidHandle { return this; }\n\n    public constructor(public readonly absolutePath, public readonly runtime: IContainerRuntimeBase) {\n    }\n\n    public attachGraph() {\n        assert(false, 0x0ca /* \"Trying to use legacy graph attach!\" */);\n    }\n\n    public async get(): Promise<any> {\n        const response = await this.runtime.IFluidHandleContext.resolveHandle({ url: this.absolutePath });\n        if (response.status === 200 && response.mimeType === \"fluid/object\") {\n            // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n            return response.value;\n        }\n        throw new Error(`Failed to resolve container path ${this.absolutePath}`);\n    }\n\n    public bind(handle: IFluidHandle) {\n        throw new Error(\"Cannot bind to LegacyUriHandle\");\n    }\n}\n\nexport function handleFromLegacyUri<T = IFluidObject & FluidObject & IFluidLoadable>(\n    uri: string,\n    runtime: IContainerRuntimeBase,\n): IFluidHandle<T> {\n    return new LegacyUriHandle<T>(uri, runtime);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/request-handler",
-  "version": "0.54.1",
+  "version": "0.55.1",
   "description": "A simple request handling library for Fluid Framework",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -23,7 +23,7 @@
     "ci:build:docs": "api-extractor run --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/* ../../../_api-extractor-temp/",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
     "eslint": "eslint --format stylish src",
-    "eslint:fix": "eslint --format stylish src --fix",
+    "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
     "lint": "npm run eslint",
     "lint:fix": "npm run eslint:fix",
     "test": "npm run test:mocha",
@@ -56,33 +56,34 @@
   },
   "dependencies": {
     "@fluidframework/common-utils": "^0.32.1",
-    "@fluidframework/container-runtime-definitions": "^0.54.1",
+    "@fluidframework/container-runtime-definitions": "^0.55.1",
     "@fluidframework/core-interfaces": "^0.41.0",
-    "@fluidframework/runtime-definitions": "^0.54.1",
-    "@fluidframework/runtime-utils": "^0.54.1"
+    "@fluidframework/runtime-definitions": "^0.55.1",
+    "@fluidframework/runtime-utils": "^0.55.1"
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/eslint-config-fluid": "^0.24.0",
-    "@fluidframework/mocha-test-setup": "^0.54.1",
-    "@fluidframework/test-runtime-utils": "^0.54.1",
+    "@fluidframework/eslint-config-fluid": "^0.25.0",
+    "@fluidframework/mocha-test-setup": "^0.55.1",
+    "@fluidframework/test-runtime-utils": "^0.55.1",
     "@microsoft/api-extractor": "^7.16.1",
+    "@rushstack/eslint-config": "^2.5.1",
     "@types/diff": "^3.5.1",
     "@types/mocha": "^8.2.2",
     "@types/random-js": "^1.0.31",
-    "@typescript-eslint/eslint-plugin": "~4.14.0",
-    "@typescript-eslint/parser": "~4.14.0",
+    "@typescript-eslint/eslint-plugin": "~5.9.0",
+    "@typescript-eslint/parser": "~5.9.0",
     "concurrently": "^6.2.0",
     "copyfiles": "^2.1.0",
     "cross-env": "^7.0.2",
     "diff": "^3.5.0",
-    "eslint": "~7.18.0",
+    "eslint": "~8.6.0",
+    "eslint-plugin-editorconfig": "~3.2.0",
     "eslint-plugin-eslint-comments": "~3.2.0",
-    "eslint-plugin-import": "~2.22.1",
+    "eslint-plugin-import": "~2.25.4",
     "eslint-plugin-no-null": "~1.0.2",
-    "eslint-plugin-prefer-arrow": "~1.2.2",
-    "eslint-plugin-react": "~7.22.0",
-    "eslint-plugin-unicorn": "~26.0.1",
+    "eslint-plugin-react": "~7.28.0",
+    "eslint-plugin-unicorn": "~40.0.0",
     "mocha": "^8.4.0",
     "nyc": "^15.0.0",
     "random-js": "^1.0.8",

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/request-handler";
-export const pkgVersion = "0.54.1";
+export const pkgVersion = "0.55.1";

package/src/requestHandlers.ts

@@ -11,10 +11,11 @@ import {
     IFluidHandle,
     IFluidLoadable,
     FluidObject,
+    IFluidRouter,
 } from "@fluidframework/core-interfaces";
 import { IContainerRuntime } from "@fluidframework/container-runtime-definitions";
 import { IContainerRuntimeBase } from "@fluidframework/runtime-definitions";
-import { create404Response, RequestParser } from "@fluidframework/runtime-utils";
+import { RequestParser } from "@fluidframework/runtime-utils";
 
 /**
  * A request handler for the container runtime. Each handler should handle a specific request, and return undefined
@@ -25,19 +26,6 @@ import { create404Response, RequestParser } from "@fluidframework/runtime-utils"
 export type RuntimeRequestHandler = (request: RequestParser, runtime: IContainerRuntime)
     => Promise<IResponse | undefined>;
 
-/**
- * @deprecated - please avoid adding new references to this API!  Instead prefer rootDataObjectRequestHandler.
- * It exposes internal container guts to external world, which is not ideal.
- * It also relies heavily on internal routing schema (formation of handle URIs) which will change in future
- * And last, but not least, it does not allow any policy to be implemented around GC of data stores exposed
- * through internal URIs. I.e. if there are no other references to such objects, they will be GC'd and
- * external links would get broken. Maybe that's what is needed in some cases, but better, more centralized
- * handling of external URI to internal handle is required (in future, we will support weak handle references,
- * that will allow any GC policy to be implemented by container authors.)
- */
-export const innerRequestHandler = async (request: IRequest, runtime: IContainerRuntimeBase) =>
-    runtime.IFluidHandleContext.resolveHandle(request);
-
 /**
  * A request handler to expose access to all root data stores in the container by id.
  * @param request - the request for the root data store.  The first path part must be the data store's ID.
@@ -48,12 +36,17 @@ export const rootDataStoreRequestHandler = async (request: IRequest, runtime: IC
     const requestParser = RequestParser.create(request);
     const id = requestParser.pathParts[0];
     const wait = typeof request.headers?.wait === "boolean" ? request.headers.wait : undefined;
+    let rootDataStore: IFluidRouter;
     try {
         // getRootDataStore currently throws if the data store is not found
-        const rootDataStore = await runtime.getRootDataStore(id, wait);
+        rootDataStore = await runtime.getRootDataStore(id, wait);
+    } catch (error) {
+        return undefined; // continue search
+    }
+    try {
         return rootDataStore.IFluidRouter.request(requestParser.createSubRequest(1));
     } catch (error) {
-        return create404Response(request);
+        return { status: 500, mimeType: "fluid/object", value: error };
     }
 };
 
@@ -88,7 +81,6 @@ class LegacyUriHandle<T = IFluidObject & FluidObject & IFluidLoadable> implement
     }
 }
 
-// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
 export function handleFromLegacyUri<T = IFluidObject & FluidObject & IFluidLoadable>(
     uri: string,
     runtime: IContainerRuntimeBase,