@based/server 5.0.3 → 6.0.0

package/dist/query/unsub.d.ts

@@ -0,0 +1,6 @@
+import { BasedServer } from '../server';
+import { WebSocketSession, Context } from '@based/functions';
+import { ObservableUpdateFunction } from './types';
+export declare const unsubscribeFunction: (server: BasedServer, id: number, update: ObservableUpdateFunction) => true | void;
+export declare const unsubscribeWs: (server: BasedServer, id: number, ctx: Context<WebSocketSession>) => true | void;
+export declare const unsubscribeWsIgnoreClient: (server: BasedServer, id: number, ctx: Context<WebSocketSession>) => true | void;

package/dist/query/unsub.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unsubscribeWsIgnoreClient = exports.unsubscribeWs = exports.unsubscribeFunction = void 0;
+const destroy_1 = require("./destroy");
+const unsubscribeFunction = (server, id, update) => {
+    const obs = server.activeObservablesById.get(id);
+    if (!obs) {
+        return;
+    }
+    if (obs.functionObserveClients.delete(update)) {
+        (0, destroy_1.destroyObs)(server, id);
+        return true;
+    }
+};
+exports.unsubscribeFunction = unsubscribeFunction;
+const unsubscribeWs = (server, id, ctx) => {
+    const session = ctx.session;
+    if (!session || !session.obs.has(id)) {
+        return;
+    }
+    ctx.session.ws.unsubscribe(String(id));
+    const obs = server.activeObservablesById.get(id);
+    session.obs.delete(id);
+    if (!obs) {
+        return;
+    }
+    if (obs.clients.delete(session.id)) {
+        (0, destroy_1.destroyObs)(server, id);
+        return true;
+    }
+};
+exports.unsubscribeWs = unsubscribeWs;
+const unsubscribeWsIgnoreClient = (server, id, ctx) => {
+    const session = ctx.session;
+    if (!session) {
+        return;
+    }
+    const obs = server.activeObservablesById.get(id);
+    if (!obs) {
+        return true;
+    }
+    obs.clients.delete(session.id);
+    (0, destroy_1.destroyObs)(server, id);
+};
+exports.unsubscribeWsIgnoreClient = unsubscribeWsIgnoreClient;
+//# sourceMappingURL=unsub.js.map

package/dist/query/unsub.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/query/unsub.ts"],"names":[],"mappings":";;;AAEA,uCAAsC;AAG/B,MAAM,mBAAmB,GAAG,CACjC,MAAmB,EACnB,EAAU,EACV,MAAgC,EACnB,EAAE;IACf,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC7C,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAbY,QAAA,mBAAmB,uBAa/B;AAEM,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QACpC,OAAM;KACP;IACD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACtB,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QAClC,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAnBY,QAAA,aAAa,iBAmBzB;AAEM,MAAM,yBAAyB,GAAG,CACvC,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,IAAI,CAAA;KACZ;IACD,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC9B,IAAA,oBAAU,EAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA;AAfY,QAAA,yBAAyB,6BAerC"}

package/dist/sendError.d.ts

@@ -1,6 +1,7 @@
 import { BasedServer } from './server';
-import { HttpSession, WebSocketSession, Context } from '@based/functions';
+import { HttpSession, WebSocketSession, Context, BasedRoute } from '@based/functions';
 import { BasedErrorCode, ErrorPayload, BasedErrorData } from './error';
 export declare function sendHttpError<T extends BasedErrorCode>(server: BasedServer, ctx: Context<HttpSession>, basedCode: T, payload: ErrorPayload[T]): void;
 export declare function sendErrorData(ctx: Context<WebSocketSession | HttpSession>, errorData: BasedErrorData): void;
 export declare function sendError<T extends BasedErrorCode>(server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, basedCode: T, payload: ErrorPayload[T]): void;
+export declare function sendSimpleError<T extends BasedErrorCode>(server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, basedCode: T, route: BasedRoute, id?: number, payload?: ErrorPayload[T]): void;

package/dist/sendError.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendError = exports.sendErrorData = exports.sendHttpError = void 0;
+exports.sendSimpleError = exports.sendError = exports.sendErrorData = exports.sendHttpError = void 0;
 const sendHttpResponse_1 = require("./sendHttpResponse");
 const functions_1 = require("@based/functions");
 const protocol_1 = require("./protocol");
@@ -51,4 +51,36 @@ function sendError(server, ctx, basedCode, payload) {
     }
 }
 exports.sendError = sendError;
+function sendSimpleError(server, ctx, basedCode, route, id, payload) {
+    if (!ctx.session) {
+        return;
+    }
+    if (!payload) {
+        // @ts-ignore tmp for now
+        payload = id
+            ? route.type === 'query'
+                ? {
+                    route,
+                    observableId: id,
+                }
+                : route.type === 'channel'
+                    ? {
+                        route,
+                        channelId: id,
+                    }
+                    : {
+                        route,
+                        requestId: id,
+                    }
+            : { route };
+    }
+    if ((0, functions_1.isHttpContext)(ctx)) {
+        return sendHttpError(server, ctx, basedCode, payload);
+    }
+    else if ((0, functions_1.isWsSession)(ctx.session)) {
+        const errorData = (0, error_1.createError)(server, ctx, basedCode, payload);
+        ctx.session.ws.send((0, protocol_1.encodeErrorResponse)((0, protocol_1.valueToBuffer)(errorData)), true, false);
+    }
+}
+exports.sendSimpleError = sendSimpleError;
 //# sourceMappingURL=sendError.js.map

package/dist/sendError.js.map

@@ -1 +1 @@
-{"version":3,"file":"sendError.js","sourceRoot":"","sources":["../src/sendError.ts"],"names":[],"mappings":";;;AAAA,yDAAwC;AAExC,gDAMyB;AACzB,yCAA+D;AAC/D,mCAKgB;AAEhB,MAAM,iBAAiB,GAAG,CACxB,SAAyB,EACzB,GAAyB,EACzB,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;IAC9D,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;QACxB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,UAAU,IAAI,aAAa,EAAE,CAAC,CAAA;QAC7D,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;YACpC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;SAChE;QACD,IAAA,sBAAG,EACD,GAAG,EACH,IAAI,CAAC,SAAS,CAAC;YACb,KAAK,EAAE,OAAO;YACd,IAAI;SACL,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,SAAgB,aAAa,CAC3B,MAAmB,EACnB,GAAyB,EACzB,SAAY,EACZ,OAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,MAAM,OAAO,GAAG,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IAC5D,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;AACjC,CAAC;AAXD,sCAWC;AAED,SAAgB,aAAa,CAC3B,GAA4C,EAC5C,SAAyB;IAEzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,IAAA,yBAAa,EAAC,GAAG,CAAC,EAAE;QACtB,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;KAClC;SAAM,IAAI,IAAA,uBAAW,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CACjB,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAC7C,IAAI,EACJ,KAAK,CACN,CAAA;KACF;AACH,CAAC;AAhBD,sCAgBC;AAED,SAAgB,SAAS,CACvB,MAAmB,EACnB,GAA4C,EAC5C,SAAY,EACZ,OAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,IAAA,yBAAa,EAAC,GAAG,CAAC,EAAE;QACtB,OAAO,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;KACtD;SAAM,IAAI,IAAA,uBAAW,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAC9D,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CACjB,IAAA,8BAAmB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAC7C,IAAI,EACJ,KAAK,CACN,CAAA;KACF;AACH,CAAC;AAnBD,8BAmBC"}
+{"version":3,"file":"sendError.js","sourceRoot":"","sources":["../src/sendError.ts"],"names":[],"mappings":"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"}

package/dist/server.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { Context, BasedFunctionClient, WebSocketSession, HttpSession, Geo } from '@based/functions';
-import type { ActiveObservable } from './observable';
+import type { ActiveObservable } from './query';
 import uws from '@based/uws';
 import { BasedFunctions, FunctionConfig } from './functions';
 import { BasedAuth, AuthConfig } from './auth';
@@ -53,24 +53,25 @@ Based server
 const server = new BasedServer({
   port: 9910,
   functions: {
-    specs: {
+    configs: {
       hello: {
-        function: async () => 'hello'
+        type: 'function',
+        fn: async () => 'hello'
       },
       counter: {
         type: 'query',
-        function: () => () => {}
+        fn: () => () => {}
       }
     }
   }
 })
 
-server.functions.addSpecs({
-  hello: { function: async () => 'hello' }
+server.functions.add({
+  hello: { type: 'function', fn: async () => 'hello' }
 })
 
 server.functions.addRoutes({
-  bla: { type: 'query  }
+  bla: { type: 'query' }
 })
 
 await server.start()

package/dist/server.js

@@ -20,24 +20,25 @@ Based server
 const server = new BasedServer({
   port: 9910,
   functions: {
-    specs: {
+    configs: {
       hello: {
-        function: async () => 'hello'
+        type: 'function',
+        fn: async () => 'hello'
       },
       counter: {
         type: 'query',
-        function: () => () => {}
+        fn: () => () => {}
       }
     }
   }
 })
 
-server.functions.addSpecs({
-  hello: { function: async () => 'hello' }
+server.functions.add({
+  hello: { type: 'function', fn: async () => 'hello' }
 })
 
 server.functions.addRoutes({
-  bla: { type: 'query  }
+  bla: { type: 'query' }
 })
 
 await server.start()

package/dist/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}

package/dist/verifyRoute.d.ts

@@ -1,15 +1,3 @@
-import { Context } from '@based/functions';
-import { BasedFunctionRoute, BasedQueryFunctionRoute, BasedRoute, BasedStreamFunctionRoute, BasedChannelFunctionRoute } from './functions';
+import { Context, BasedRoute, BasedFunctionTypes } from '@based/functions';
 import { BasedServer } from './server';
-type FnType = 'query' | 'stream' | 'fn' | 'channel';
-export declare const verifyRoute: <T extends FnType>(server: BasedServer, ctx: Context, type: T, route: BasedRoute | null, name: string, id?: number) => T extends "channel" ? BasedChannelFunctionRoute : T extends "query" ? BasedQueryFunctionRoute : T extends "stream" ? BasedStreamFunctionRoute : {
-    name: string;
-    path?: string;
-    maxPayloadSize?: number;
-    rateLimitTokens?: number;
-    public?: boolean;
-    headers?: string[];
-    internalOnly?: boolean;
-    data?: any;
-};
-export {};
+export declare const verifyRoute: <T extends BasedFunctionTypes>(server: BasedServer, ctx: Context, type: T, route: BasedRoute | null, name: string, id?: number) => BasedRoute<T, "type" | "name">;

package/dist/verifyRoute.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyRoute = void 0;
 const functions_1 = require("@based/functions");
-const functions_2 = require("./functions");
 const sendError_1 = require("./sendError");
 const error_1 = require("./error");
 const verifyRoute = (server, ctx = server.client.ctx, type, route, name, id) => {
@@ -14,93 +13,25 @@ const verifyRoute = (server, ctx = server.client.ctx, type, route, name, id) =>
             throw (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, {
                 route: {
                     name,
+                    type: 'function',
                 },
             });
         }
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, type === 'channel'
-            ? {
-                route: { name },
-                channelId: id,
-            }
-            : type === 'query'
-                ? {
-                    route: { name },
-                    observableId: id,
-                }
-                : {
-                    route: { name },
-                    requestId: id,
-                });
+        (0, sendError_1.sendSimpleError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, { name, type }, id);
         return null;
     }
     if (route.internalOnly === true && (0, functions_1.isClientContext)(ctx)) {
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, type === 'query'
-            ? {
-                route: { name },
-                observableId: id,
-            }
-            : {
-                route: { name },
-                requestId: id,
-            });
+        (0, sendError_1.sendSimpleError)(server, ctx, error_1.BasedErrorCode.FunctionNotFound, { name, type }, id);
         return null;
     }
-    if (type === 'query') {
-        if (!(0, functions_2.isQueryFunctionRoute)(route)) {
-            if (!(0, functions_1.isClientContext)(ctx)) {
-                throw (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
-                    route,
-                    observableId: id,
-                });
-            }
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
-                route: { name },
-                observableId: id,
-            });
-            return null;
-        }
-    }
-    if (type === 'stream') {
-        if (!(0, functions_2.isStreamFunctionRoute)(route)) {
-            if (!(0, functions_1.isClientContext)(ctx)) {
-                throw (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
-                    route,
-                    requestId: id,
-                });
-            }
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
-                route: { name },
-                requestId: id,
-            });
-            return null;
-        }
-    }
-    if (type === 'channel') {
-        if (!(0, functions_2.isChannelFunctionRoute)(route)) {
-            if (!(0, functions_1.isClientContext)(ctx)) {
-                throw (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
-                    route,
-                    channelId: id,
-                });
-            }
-            (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
-                route: { name },
-                channelId: id,
-            });
-            return null;
-        }
-    }
-    if (type === 'fn' && !(0, functions_2.isFunctionRoute)(route)) {
+    if (!(0, functions_1.isBasedRoute)(type, route)) {
         if (!(0, functions_1.isClientContext)(ctx)) {
             throw (0, error_1.createError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
                 route,
-                requestId: id,
+                observableId: id,
             });
         }
-        (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, {
-            route,
-            requestId: id,
-        });
+        (0, sendError_1.sendSimpleError)(server, ctx, error_1.BasedErrorCode.FunctionIsWrongType, { name, type }, id);
         return null;
     }
     // @ts-ignore fixed by checking the routes

package/dist/verifyRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyRoute.js","sourceRoot":"","sources":["../src/verifyRoute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verifyRoute.js","sourceRoot":"","sources":["../src/verifyRoute.ts"],"names":[],"mappings":";;;AAAA,gDAMyB;AACzB,2CAA6C;AAC7C,mCAAqD;AAG9C,MAAM,WAAW,GAAG,CACzB,MAAmB,EACnB,MAAe,MAAM,CAAC,MAAM,CAAC,GAAG,EAChC,IAAO,EACP,KAAwB,EACxB,IAAY,EACZ,EAAW,EACW,EAAE;IACxB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,CAAC,KAAK,EAAE;QACV,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;YACzB,MAAM,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,gBAAgB,EAAE;gBAC9D,KAAK,EAAE;oBACL,IAAI;oBACJ,IAAI,EAAE,UAAU;iBACjB;aACF,CAAC,CAAA;SACH;QACD,IAAA,2BAAe,EACb,MAAM,EACN,GAAG,EACH,sBAAc,CAAC,gBAAgB,EAC/B,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,EAAE,CACH,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,KAAK,CAAC,YAAY,KAAK,IAAI,IAAI,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;QACvD,IAAA,2BAAe,EACb,MAAM,EACN,GAAG,EACH,sBAAc,CAAC,gBAAgB,EAC/B,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,EAAE,CACH,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,CAAC,IAAA,wBAAY,EAAC,IAAI,EAAE,KAAK,CAAC,EAAE;QAC9B,IAAI,CAAC,IAAA,2BAAe,EAAC,GAAG,CAAC,EAAE;YACzB,MAAM,IAAA,mBAAW,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,mBAAmB,EAAE;gBACjE,KAAK;gBACL,YAAY,EAAE,EAAE;aACjB,CAAC,CAAA;SACH;QACD,IAAA,2BAAe,EACb,MAAM,EACN,GAAG,EACH,sBAAc,CAAC,mBAAmB,EAClC,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,EAAE,CACH,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,0CAA0C;IAC1C,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AA7DY,QAAA,WAAW,eA6DvB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/server",
-  "version": "5.0.3",
+  "version": "6.0.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "files": [
@@ -19,6 +19,7 @@
     "clean": "rimraf {.turbo,dist,node_modules}"
   },
   "dependencies": {
+    "utility-types": "^3.10.0",
     "@based/uws": "^4.0.0",
     "@saulx/diff": "^1.1.4",
     "@saulx/hash": "^2.0.0",
@@ -27,7 +28,7 @@
     "jsonexport": "^3.2.0",
     "jsonwebtoken": "^8.5.1",
     "mime-types": "^2.1.31",
-    "@based/functions": "^1.2.2"
+    "@based/functions": "^2.0.0"
   },
   "devDependencies": {
     "@types/mime-types": "2.1.1",