@fonoster/apiserver 0.8.20 → 0.8.21

package/dist/calls/buildService.d.ts

@@ -1,4 +1,4 @@
-import { InfluxDBClient } from "./types";
+import { InfluxDBClient } from "@fonoster/common";
 declare function buildService(influxdb: InfluxDBClient): Promise<{
     definition: {
         serviceName: string;

package/dist/calls/createFetchCalls.d.ts

@@ -1,3 +1,4 @@
-import { InfluxDBClient, ListCallsRequest, ListCallsResponse } from "./types";
+import { ListCallsRequest, ListCallsResponse } from "@fonoster/types";
+import { InfluxDBClient } from "@fonoster/common";
 declare function createFetchCalls(influxdb: InfluxDBClient): (accessKeyId: string, request: ListCallsRequest) => Promise<ListCallsResponse>;
 export { createFetchCalls };

package/dist/calls/createFetchCalls.js

@@ -30,8 +30,7 @@ exports.createFetchCalls = createFetchCalls;
  */
 const logger_1 = require("@fonoster/logger");
 const influxdb_client_1 = require("@influxdata/influxdb-client");
-const types_1 = require("./types");
-const envs_1 = require("../envs");
+const common_1 = require("@fonoster/common");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function createFetchCalls(influxdb) {
     return (accessKeyId, request) => __awaiter(this, void 0, void 0, function* () {
@@ -51,7 +50,7 @@ function createFetchCalls(influxdb) {
         const parsedBefore = before
             ? new Date(before).getTime() / 1000
             : new Date().getTime() / 1000;
-        const query = (0, influxdb_client_1.flux) `from(bucket: "${envs_1.INFLUXDB_BUCKET}")
+        const query = (0, influxdb_client_1.flux) `from(bucket: "${common_1.INFLUXDB_CALLS_BUCKET}")
       |> range(start: ${parsedAfter})
       |> pivot(rowKey: ["callId"], columnKey: ["_field"], valueColumn: "_value")
       |> map(fn: (r) => ({
@@ -60,7 +59,7 @@ function createFetchCalls(influxdb) {
           startedAtParsed: int(v: r.startedAt) / 1000,
         }))
       |> filter(fn: (r) =>
-        r._measurement == "${types_1.CALL_DETAIL_RECORD_MEASUREMENT}"
+        r._measurement == "${common_1.CALL_DETAIL_RECORD_MEASUREMENT}"
         and r.startedAtParsed < ${parsedBefore}
         ${accessKeyIdFilter}
         ${typeFilter}

package/dist/calls/createFetchSingleCall.d.ts

@@ -1,3 +1,4 @@
-import { CallDetailRecord, InfluxDBClient } from "./types";
+import { CallDetailRecord } from "@fonoster/types";
+import { InfluxDBClient } from "@fonoster/common";
 declare function createFetchSingleCall(influxdb: InfluxDBClient): (accessKeyId: string, ref: string) => Promise<CallDetailRecord>;
 export { createFetchSingleCall };

package/dist/calls/createFetchSingleCall.js

@@ -30,19 +30,18 @@ exports.createFetchSingleCall = createFetchSingleCall;
  */
 const logger_1 = require("@fonoster/logger");
 const influxdb_client_1 = require("@influxdata/influxdb-client");
-const types_1 = require("./types");
-const envs_1 = require("../envs");
+const common_1 = require("@fonoster/common");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function createFetchSingleCall(influxdb) {
     return (accessKeyId, ref) => __awaiter(this, void 0, void 0, function* () {
-        const query = (0, influxdb_client_1.flux) `from(bucket: "${envs_1.INFLUXDB_BUCKET}")
+        const query = (0, influxdb_client_1.flux) `from(bucket: "${common_1.INFLUXDB_CALLS_BUCKET}")
       |> range(start: -360d)
       |> pivot(rowKey: ["callId"], columnKey: ["_field"], valueColumn: "_value")
       |> map(fn: (r) => ({
           r with
           duration: int(v: r.endedAt) - int(v: r.startedAt)
         }))
-      |> filter(fn: (r) => r._measurement == "${types_1.CALL_DETAIL_RECORD_MEASUREMENT}")
+      |> filter(fn: (r) => r._measurement == "${common_1.CALL_DETAIL_RECORD_MEASUREMENT}")
       |> filter(fn: (r) => r.ref == ${ref} and r.accessKeyId == "${accessKeyId}")
       |> sort(columns: ["_time"], desc: true)
       |> limit(n: 1)`;

package/dist/calls/getCall.d.ts

@@ -1,5 +1,4 @@
-import { GrpcErrorMessage } from "@fonoster/common";
-import { InfluxDBClient } from "./types";
+import { GrpcErrorMessage, InfluxDBClient } from "@fonoster/common";
 declare function getCall(influx: InfluxDBClient): (call: {
     request: unknown;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;

package/dist/calls/listCalls.d.ts

@@ -1,5 +1,4 @@
-import { GrpcErrorMessage } from "@fonoster/common";
-import { InfluxDBClient } from "./types";
+import { GrpcErrorMessage, InfluxDBClient } from "@fonoster/common";
 declare function listCalls(influx: InfluxDBClient): (call: {
     request: unknown;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;

package/dist/calls/types.d.ts

@@ -1,19 +1,5 @@
 import { DialStatus, GrpcErrorMessage } from "@fonoster/common";
-import { CallDirection, CallStatus, CallType } from "@fonoster/types";
-import { ParameterizedQuery } from "@influxdata/influxdb-client";
-declare const CALL_DETAIL_RECORD_MEASUREMENT = "cdr";
-type CallDetailRecord = {
-    ref: string;
-    callId: string;
-    status: CallStatus;
-    type: CallType;
-    from: string;
-    to: string;
-    duration: number;
-    direction: CallDirection;
-    startedAt: number;
-    endedAt: number;
-};
+import { CallDetailRecord, CallStatus, CallType } from "@fonoster/types";
 type ListCallsRequest = {
     after?: string;
     before?: string;
@@ -31,9 +17,6 @@ type ListCallsResponse = {
 type GetCallRequest = {
     ref: string;
 };
-type InfluxDBClient = {
-    collectRows(query: ParameterizedQuery): Promise<unknown[]>;
-};
 type CreateCallRequest = {
     from: string;
     to: string;
@@ -59,4 +42,4 @@ type TrackCallSubscriber = {
         on: (event: string, cb: (data: TrackCallResponse | Error) => void) => void;
     };
 };
-export { CALL_DETAIL_RECORD_MEASUREMENT, CallDetailRecord, CallDirection, CallPublisher, CallStatus, CallStream, CallType, CreateCallRequest, GetCallRequest, InfluxDBClient, ListCallsRequest, ListCallsResponse, TrackCallResponse, TrackCallSubscriber };
+export { CallPublisher, CallStream, CreateCallRequest, GetCallRequest, ListCallsRequest, ListCallsResponse, TrackCallResponse, TrackCallSubscriber };

package/dist/calls/types.js

@@ -1,9 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CallType = exports.CallStatus = exports.CallDirection = exports.CALL_DETAIL_RECORD_MEASUREMENT = void 0;
-const types_1 = require("@fonoster/types");
-Object.defineProperty(exports, "CallDirection", { enumerable: true, get: function () { return types_1.CallDirection; } });
-Object.defineProperty(exports, "CallStatus", { enumerable: true, get: function () { return types_1.CallStatus; } });
-Object.defineProperty(exports, "CallType", { enumerable: true, get: function () { return types_1.CallType; } });
-const CALL_DETAIL_RECORD_MEASUREMENT = "cdr";
-exports.CALL_DETAIL_RECORD_MEASUREMENT = CALL_DETAIL_RECORD_MEASUREMENT;

package/dist/envs.d.ts

@@ -27,7 +27,6 @@ export declare const AUTHZ_SERVICE_ENABLED: boolean;
 export declare const AUTHZ_SERVICE_HOST: string;
 export declare const AUTHZ_SERVICE_PORT: string | number;
 export declare const AUTHZ_SERVICE_METHODS: string[];
-export declare const INFLUXDB_BUCKET: string;
 export declare const INFLUXDB_ORG: string;
 export declare const INFLUXDB_PASSWORD: string;
 export declare const INFLUXDB_TOKEN: string;

package/dist/envs.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SMTP_SECURE = exports.SMTP_PORT = exports.SMTP_HOST = exports.SMTP_AUTH_USER = exports.SMTP_AUTH_PASS = exports.ROUTR_DEFAULT_PEER_USERNAME = exports.ROUTR_DEFAULT_PEER_PASSWORD = exports.ROUTR_DEFAULT_PEER_NAME = exports.ROUTR_DEFAULT_PEER_AOR = exports.ROUTR_API_ENDPOINT = exports.OWNER_PASSWORD = exports.OWNER_NAME = exports.OWNER_EMAIL = exports.NATS_URL = exports.INTEGRATIONS_FILE = exports.INFLUXDB_USERNAME = exports.INFLUXDB_URL = exports.INFLUXDB_TOKEN = exports.INFLUXDB_PASSWORD = exports.INFLUXDB_ORG = exports.INFLUXDB_BUCKET = exports.AUTHZ_SERVICE_METHODS = exports.AUTHZ_SERVICE_PORT = exports.AUTHZ_SERVICE_HOST = exports.AUTHZ_SERVICE_ENABLED = exports.IDENTITY_WORKSPACE_INVITATION_FAIL_URL = exports.IDENTITY_REFRESH_TOKEN_EXPIRES_IN = exports.IDENTITY_PUBLIC_KEY = exports.IDENTITY_PRIVATE_KEY = exports.IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET = exports.IDENTITY_OAUTH2_GITHUB_CLIENT_ID = exports.IDENTITY_OAUTH2_GITHUB_ENABLED = exports.IDENTITY_USER_VERIFICATION_REQUIRED = exports.IDENTITY_ISSUER = exports.IDENTITY_ID_TOKEN_EXPIRES_IN = exports.IDENTITY_AUDIENCE = exports.IDENTITY_ACCESS_TOKEN_EXPIRES_IN = exports.HTTP_BRIDGE_PORT = exports.DEFAULT_NATS_QUEUE_GROUP = exports.CLOAK_ENCRYPTION_KEY = exports.CALLS_TRACK_CALL_SUBJECT = exports.CALLS_CREATE_SUBJECT = exports.ASTERISK_TRUNK = exports.ASTERISK_SYSTEM_DOMAIN = exports.ASTERISK_ARI_USERNAME = exports.ASTERISK_ARI_SECRET = exports.ASTERISK_ARI_PROXY_URL = exports.APP_URL = exports.APISERVER_HOST = exports.APISERVER_BIND_ADDR = void 0;
-exports.TWILIO_PHONE_NUMBER = exports.TWILIO_AUTH_TOKEN = exports.TWILIO_ACCOUNT_SID = exports.TEMPLATES_DIR = exports.SMTP_SENDER = void 0;
+exports.SMTP_SENDER = exports.SMTP_SECURE = exports.SMTP_PORT = exports.SMTP_HOST = exports.SMTP_AUTH_USER = exports.SMTP_AUTH_PASS = exports.ROUTR_DEFAULT_PEER_USERNAME = exports.ROUTR_DEFAULT_PEER_PASSWORD = exports.ROUTR_DEFAULT_PEER_NAME = exports.ROUTR_DEFAULT_PEER_AOR = exports.ROUTR_API_ENDPOINT = exports.OWNER_PASSWORD = exports.OWNER_NAME = exports.OWNER_EMAIL = exports.NATS_URL = exports.INTEGRATIONS_FILE = exports.INFLUXDB_USERNAME = exports.INFLUXDB_URL = exports.INFLUXDB_TOKEN = exports.INFLUXDB_PASSWORD = exports.INFLUXDB_ORG = exports.AUTHZ_SERVICE_METHODS = exports.AUTHZ_SERVICE_PORT = exports.AUTHZ_SERVICE_HOST = exports.AUTHZ_SERVICE_ENABLED = exports.IDENTITY_WORKSPACE_INVITATION_FAIL_URL = exports.IDENTITY_REFRESH_TOKEN_EXPIRES_IN = exports.IDENTITY_PUBLIC_KEY = exports.IDENTITY_PRIVATE_KEY = exports.IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET = exports.IDENTITY_OAUTH2_GITHUB_CLIENT_ID = exports.IDENTITY_OAUTH2_GITHUB_ENABLED = exports.IDENTITY_USER_VERIFICATION_REQUIRED = exports.IDENTITY_ISSUER = exports.IDENTITY_ID_TOKEN_EXPIRES_IN = exports.IDENTITY_AUDIENCE = exports.IDENTITY_ACCESS_TOKEN_EXPIRES_IN = exports.HTTP_BRIDGE_PORT = exports.DEFAULT_NATS_QUEUE_GROUP = exports.CLOAK_ENCRYPTION_KEY = exports.CALLS_TRACK_CALL_SUBJECT = exports.CALLS_CREATE_SUBJECT = exports.ASTERISK_TRUNK = exports.ASTERISK_SYSTEM_DOMAIN = exports.ASTERISK_ARI_USERNAME = exports.ASTERISK_ARI_SECRET = exports.ASTERISK_ARI_PROXY_URL = exports.APP_URL = exports.APISERVER_HOST = exports.APISERVER_BIND_ADDR = void 0;
+exports.TWILIO_PHONE_NUMBER = exports.TWILIO_AUTH_TOKEN = exports.TWILIO_ACCOUNT_SID = exports.TEMPLATES_DIR = void 0;
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -49,7 +49,6 @@ const e = process.env;
     "INFLUXDB_INIT_USERNAME",
     "INFLUXDB_INIT_PASSWORD",
     "INFLUXDB_INIT_ORG",
-    "INFLUXDB_INIT_BUCKET",
     "INFLUXDB_INIT_TOKEN",
     "NATS_URL"
 ]);
@@ -102,7 +101,6 @@ exports.AUTHZ_SERVICE_METHODS = e.AUTHZ_SERVICE_METHODS
     ? e.AUTHZ_SERVICE_METHODS.split(",")
     : ["/fonoster.calls.v1beta2.Calls/CreateCall"];
 // InfluxDB configurations
-exports.INFLUXDB_BUCKET = e.INFLUXDB_INIT_BUCKET;
 exports.INFLUXDB_ORG = e.INFLUXDB_INIT_ORG;
 exports.INFLUXDB_PASSWORD = e.INFLUXDB_INIT_PASSWORD;
 exports.INFLUXDB_TOKEN = e.INFLUXDB_INIT_TOKEN;

package/dist/events/mapCallDirectionToEnum.d.ts

@@ -1,3 +1,3 @@
-import { CallDirection } from "../calls/types";
+import { CallDirection } from "@fonoster/types";
 declare function mapCallDirectionToEnum(direction: string): CallDirection;
 export { mapCallDirectionToEnum };

package/dist/events/mapCallDirectionToEnum.js

@@ -19,7 +19,7 @@ exports.mapCallDirectionToEnum = mapCallDirectionToEnum;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const types_1 = require("../calls/types");
+const types_1 = require("@fonoster/types");
 function mapCallDirectionToEnum(direction) {
     switch (direction) {
         case "from-pstn":

package/dist/index.js

@@ -66,13 +66,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
-const types_1 = require("./calls/types");
 const runServices_1 = __importDefault(require("./core/runServices"));
 const upsertDefaultPeer_1 = require("./core/upsertDefaultPeer");
 const envs_1 = require("./envs");
 const createInfluxDbPub_1 = require("./events/createInfluxDbPub");
 const nats_1 = require("./events/nats");
 const transformEvent_1 = require("./events/transformEvent");
+const common_1 = require("@fonoster/common");
 Promise.resolve().then(() => __importStar(require("./core/removeSwaggerNotice")));
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -92,13 +92,13 @@ function main() {
             url: envs_1.INFLUXDB_URL,
             token: envs_1.INFLUXDB_TOKEN,
             org: envs_1.INFLUXDB_ORG,
-            bucket: envs_1.INFLUXDB_BUCKET
+            bucket: common_1.INFLUXDB_CALLS_BUCKET
         });
         // Subscribe to NATs events
         (0, nats_1.watchNats)(envs_1.NATS_URL, (event) => {
             logger.verbose("received nats event", Object.assign({}, event));
             pubToInfluxDb({
-                name: types_1.CALL_DETAIL_RECORD_MEASUREMENT,
+                name: common_1.CALL_DETAIL_RECORD_MEASUREMENT,
                 tag: event.callId,
                 data: (0, transformEvent_1.transformEvent)(event)
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/apiserver",
-  "version": "0.8.20",
+  "version": "0.8.21",
   "description": "APIServer for Fonoster",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@deepgram/sdk": "^3.5.1",
-    "@fonoster/authz": "^0.8.20",
-    "@fonoster/common": "^0.8.20",
-    "@fonoster/identity": "^0.8.20",
+    "@fonoster/authz": "^0.8.21",
+    "@fonoster/common": "^0.8.21",
+    "@fonoster/identity": "^0.8.21",
     "@fonoster/logger": "^0.8.20",
-    "@fonoster/sipnet": "^0.8.20",
+    "@fonoster/sipnet": "^0.8.21",
     "@fonoster/streams": "^0.8.20",
-    "@fonoster/types": "^0.8.20",
+    "@fonoster/types": "^0.8.21",
     "@google-cloud/speech": "^6.6.0",
     "@google-cloud/text-to-speech": "^5.3.0",
     "@grpc/grpc-js": "~1.10.6",
@@ -73,5 +73,5 @@
     "@types/uuid": "^10.0.0",
     "@types/validator": "^13.12.0"
   },
-  "gitHead": "4e605a379fec5ac31bf0a3d2f57cbd54da6c732b"
+  "gitHead": "2590a20d7309494faca50831ac0c0abdb14c2308"
 }