starta.microservice 0.1.10327 → 0.1.10329

package/lib/serverInitialization.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import http from 'http';
-declare const _default: {
+declare const _default: () => {
     app: import("express-serve-static-core").Express;
     server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
 };

package/lib/serverInitialization.js

@@ -7,24 +7,36 @@ const cookie_parser_1 = __importDefault(require("cookie-parser"));
 const cors_1 = __importDefault(require("cors"));
 const http_1 = __importDefault(require("http"));
 const config_1 = __importDefault(require("./config"));
-const app = (0, express_1.default)();
-if (config_1.default.cors.enabled && config_1.default.cors.origins?.length > 0) {
-    app.use((0, cors_1.default)({
-        origin: (origin, callback) => {
-            if (!origin || config_1.default.cors.origins.includes(origin)) {
-                callback(null, true);
-            }
-            else {
-                callback(new Error('Not allowed by CORS'));
-            }
-        },
-        credentials: true,
-    }));
-}
-const server = new http_1.default.Server(app);
-app.use((0, cookie_parser_1.default)());
-module.exports = {
-    app,
-    server,
+module.exports = () => {
+    const app = (0, express_1.default)();
+    if (config_1.default.cors.enabled && config_1.default.cors.origins?.length > 0) {
+        app.use((0, cors_1.default)({
+            origin: (origin, callback) => {
+                if (!origin) {
+                    return callback(null, true);
+                }
+                const isAllowed = config_1.default.cors.origins.some((allowedOrigin) => {
+                    if (allowedOrigin.includes('*')) {
+                        const regex = new RegExp(`^${allowedOrigin.replace(/\./g, '\\.').replace(/\*/g, '.*')}$`);
+                        return regex.test(origin);
+                    }
+                    return allowedOrigin === origin;
+                });
+                if (isAllowed) {
+                    callback(null, true);
+                }
+                else {
+                    callback(new Error('Not allowed by CORS'));
+                }
+            },
+            credentials: true,
+        }));
+    }
+    const server = new http_1.default.Server(app);
+    app.use((0, cookie_parser_1.default)());
+    return {
+        app,
+        server,
+    };
 };
 //# sourceMappingURL=serverInitialization.js.map

package/lib/serverInitialization.js.map

@@ -1 +1 @@
-{"version":3,"file":"serverInitialization.js","sourceRoot":"","sources":["../src/serverInitialization.ts"],"names":[],"mappings":";;;;AAAA,sDAA8B;AAC9B,kEAAyC;AACzC,gDAAwB;AACxB,gDAAwB;AACxB,sDAA8B;AAE9B,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;AAEtB,IAAI,gBAAM,CAAC,IAAI,CAAC,OAAO,IAAI,gBAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,EAAE;IAC1D,GAAG,CAAC,GAAG,CACL,IAAA,cAAI,EAAC;QACH,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YAC3B,IAAI,CAAC,MAAM,IAAI,gBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACnD,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aACtB;iBAAM;gBACL,QAAQ,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;aAC5C;QACH,CAAC;QACD,WAAW,EAAE,IAAI;KAClB,CAAC,CACH,CAAC;CACH;AAED,MAAM,MAAM,GAAG,IAAI,cAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACpC,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAC;AAExB,iBAAS;IACP,GAAG;IACH,MAAM;CACP,CAAC"}
+{"version":3,"file":"serverInitialization.js","sourceRoot":"","sources":["../src/serverInitialization.ts"],"names":[],"mappings":";;;;AAAA,sDAA8B;AAC9B,kEAAyC;AACzC,gDAAwB;AACxB,gDAAwB;AACxB,sDAA8B;AAE9B,iBAAS,GAAG,EAAE;IACZ,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;IAEtB,IAAI,gBAAM,CAAC,IAAI,CAAC,OAAO,IAAI,gBAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,EAAE;QAC1D,GAAG,CAAC,GAAG,CACL,IAAA,cAAI,EAAC;YACH,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;gBAC3B,IAAI,CAAC,MAAM,EAAE;oBACX,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBAC7B;gBAED,MAAM,SAAS,GAAG,gBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE;oBAC3D,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;wBAC/B,MAAM,KAAK,GAAG,IAAI,MAAM,CACtB,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAChE,CAAC;wBACF,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;qBAC3B;oBACD,OAAO,aAAa,KAAK,MAAM,CAAC;gBAClC,CAAC,CAAC,CAAC;gBAEH,IAAI,SAAS,EAAE;oBACb,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACtB;qBAAM;oBACL,QAAQ,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;iBAC5C;YACH,CAAC;YACD,WAAW,EAAE,IAAI;SAClB,CAAC,CACH,CAAC;KACH;IAED,MAAM,MAAM,GAAG,IAAI,cAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAC;IAExB,OAAO;QACL,GAAG;QACH,MAAM;KACP,CAAC;AACJ,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starta.microservice",
-  "version": "0.1.10327",
+  "version": "0.1.10329",
   "main": "./lib/index.js",
   "description": "Core library for Starta.one microservice",
   "author": "Collaboracia OÜ",