@8ms/helpers 2.0.7 → 2.0.9

package/aws/ec2/AwsEc2Namespace.d.ts

@@ -3,7 +3,7 @@ import { AwsConfig } from "../server";
 import type { EC2Client } from "@aws-sdk/client-ec2";
 export declare class AwsEc2Namespace extends BaseNamespace {
     client: EC2Client | null;
-    config: AwsConfig;
+    config: AwsConfig | null;
     ensureInit: () => Promise<void>;
     startInstances: (instanceIds: string[], additionalInfo?: string, dryRun?: boolean) => Promise<any>;
     stopInstances: (instanceIds: string[], hibernate?: boolean, force?: boolean, dryRun?: boolean) => Promise<any>;

package/aws/ec2/AwsEc2Namespace.js

@@ -38,7 +38,6 @@ const _class_1 = require("../../_class");
 class AwsEc2Namespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/aws/ecs/AwsEcsNamespace.d.ts

@@ -26,7 +26,7 @@ type RunTaskProps = {
 };
 export declare class AwsEcsNamespace extends BaseNamespace {
     client: ECSClient | null;
-    config: AwsConfig;
+    config: AwsConfig | null;
     ensureInit: () => Promise<void>;
     /**
      * https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/ecs/command/ListClustersCommand/

package/aws/ecs/AwsEcsNamespace.js

@@ -39,7 +39,6 @@ const server_1 = require("../server");
 class AwsEcsNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/aws/glue/AwsGlueNamespace.d.ts

@@ -3,7 +3,7 @@ import { AwsConfig } from "../server";
 import type { GlueClient } from "@aws-sdk/client-glue";
 export declare class AwsGlueNamespace extends BaseNamespace {
     client: GlueClient | null;
-    config: AwsConfig;
+    config: AwsConfig | null;
     ensureInit: () => Promise<void>;
     /**
      * Invoke an AWS Glue Crawler by passing in the name of the Crawler.

package/aws/glue/AwsGlueNamespace.js

@@ -39,7 +39,6 @@ const server_1 = require("../server");
 class AwsGlueNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/aws/lambda/AwsLambdaNamespace.d.ts

@@ -9,7 +9,7 @@ type InvokeProps = {
 };
 export declare class AwsLambdaNamespace extends BaseNamespace {
     client: LambdaClient | null;
-    config: AwsConfig;
+    config: AwsConfig | null;
     ensureInit: () => Promise<void>;
     /**
      * Invoke a AWS Lambda function by passing in the Function name and optional Payload data.

package/aws/lambda/AwsLambdaNamespace.js

@@ -40,7 +40,6 @@ const api_1 = require("../../api");
 class AwsLambdaNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/aws/s3/AwsS3Namespace.d.ts

@@ -17,7 +17,7 @@ type WritePresignedPostProps = {
 };
 export declare class AwsS3Namespace extends BaseNamespace {
     client: S3Client | null;
-    config: AwsConfig;
+    config: AwsConfig | null;
     ensureInit: () => Promise<void>;
     copy: (fromBucket: string, fromKey: string, toBucket: string, toKey: string) => Promise<void>;
     deleteFile: (bucket: string, key: string) => Promise<void>;

package/aws/s3/AwsS3Namespace.js

@@ -48,7 +48,6 @@ const axios_1 = __importDefault(require("axios"));
 class AwsS3Namespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/aws/ses/AwsSesNamespace.d.ts

@@ -11,7 +11,7 @@ type SendProps = {
 };
 export declare class AwsSesNamespace extends BaseNamespace {
     client: SESClient | null;
-    config: AwsConfig;
+    config: AwsConfig | null;
     ensureInit: () => Promise<void>;
     send: (props: SendProps) => Promise<any>;
 }

package/aws/ses/AwsSesNamespace.js

@@ -38,7 +38,6 @@ const _class_1 = require("../../_class");
 class AwsSesNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/aws/sqs/AwsSqsNamespace.d.ts

@@ -25,7 +25,7 @@ type AddToQueue = {
 };
 export declare class AwsSqsNamespace extends BaseNamespace {
     client: SQSClient | null;
-    config: AwsConfig;
+    config: AwsConfig | null;
     ensureInit: () => Promise<void>;
     addToQueue: (props: AddToQueue) => Promise<import("@aws-sdk/client-sqs").SendMessageCommandOutput>;
     deleteFromQueue: (queueUrl: string, recipientHandle: string) => Promise<import("@aws-sdk/client-sqs").DeleteMessageCommandOutput>;

package/aws/sqs/AwsSqsNamespace.js

@@ -38,7 +38,6 @@ const _class_1 = require("../../_class");
 class AwsSqsNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/aws/ssm/AwsSsmNamespace.d.ts

@@ -3,7 +3,7 @@ import { AwsConfig } from "../server";
 import type { SSMClient } from "@aws-sdk/client-ssm";
 export declare class AwsSsmNamespace extends BaseNamespace {
     client: SSMClient | null;
-    config: AwsConfig;
+    config: AwsConfig | null;
     parameters: Map<string, any>;
     constructor(key: string, config: any);
     ensureInit: () => Promise<void>;

package/aws/ssm/AwsSsmNamespace.js

@@ -38,7 +38,6 @@ const _class_1 = require("../../_class");
 class AwsSsmNamespace extends _class_1.BaseNamespace {
     constructor(key, config) {
         super(key, config);
-        this.client = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/google/bigQuery/GoogleBigQueryNamespace.d.ts

@@ -16,7 +16,7 @@ type Tables = {
 };
 export declare class GoogleBigQueryNamespace extends BaseNamespace {
     client: BigQuery | null;
-    config: GoogleCloudConfig;
+    config: GoogleCloudConfig | null;
     ensureInit: () => Promise<void>;
     /**
      * Create a Dataset if it doesn't already exist.

package/google/bigQuery/GoogleBigQueryNamespace.js

@@ -39,7 +39,6 @@ const server_1 = require("../server");
 class GoogleBigQueryNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/google/sheets/GoogleSheetsNamespace.js

@@ -39,9 +39,6 @@ const server_1 = require("../server");
 class GoogleSheetsNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        // Stores auth only for Google Sheets
-        this.client = null;
-        this.config = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/google/storage/GoogleCloudStorageNamespace.d.ts

@@ -3,7 +3,7 @@ import type { Storage } from "@google-cloud/storage";
 import { GoogleCloudConfig } from "../server";
 export declare class GoogleCloudStorageNamespace extends BaseNamespace {
     client: Storage | null;
-    config: GoogleCloudConfig;
+    config: GoogleCloudConfig | null;
     ensureInit: () => Promise<void>;
     /**
      * Copy a local file to Google Cloud Storage.

package/google/storage/GoogleCloudStorageNamespace.js

@@ -39,7 +39,6 @@ const server_1 = require("../server");
 class GoogleCloudStorageNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/googleAds/GoogleAdsNamespace.js

@@ -38,8 +38,6 @@ const _class_1 = require("../_class");
 class GoogleAdsNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
-        this.config = null;
         this.mccAccountId = "";
         this.refreshToken = "";
         this.ensureInit = async () => {

package/googlePageSpeed/GooglePageSpeedNamespace.d.ts

@@ -5,7 +5,7 @@ import { Category, GooglePageSpeedConfig, Strategy } from "./server";
  */
 export declare class GooglePageSpeedNamespace extends BaseNamespace {
     client: boolean | null;
-    config: GooglePageSpeedConfig;
+    config: GooglePageSpeedConfig | null;
     ensureInit: () => Promise<void>;
     getReport: (url: string, category?: Category, strategy?: Strategy) => Promise<any>;
 }

package/googlePageSpeed/GooglePageSpeedNamespace.js

@@ -10,7 +10,6 @@ const axios_1 = require("../axios");
 class GooglePageSpeedNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/littleWarden/LittleWardenNamespace.d.ts

@@ -5,7 +5,7 @@ import { LittleWardenConfig } from "./server";
  */
 export declare class LittleWardenNamespace extends BaseNamespace {
     client: boolean | null;
-    config: LittleWardenConfig;
+    config: LittleWardenConfig | null;
     ensureInit: () => Promise<void>;
     getReport: (urlId: string) => Promise<any>;
 }

package/littleWarden/LittleWardenNamespace.js

@@ -9,7 +9,6 @@ const axios_1 = require("../axios");
 class LittleWardenNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
         this.ensureInit = async () => {
             if (!this.client) {
                 try {

package/onePassword/OnePasswordNamespace.d.ts

@@ -3,8 +3,7 @@ import { BaseNamespace } from "../_class";
 import type { Client } from "@1password/sdk";
 export declare class OnePasswordNamespace extends BaseNamespace {
     client: Client | null;
-    config: OnePasswordConfig;
-    constructor(key: string, config: OnePasswordConfig);
+    config: OnePasswordConfig | null;
     ensureInit: () => Promise<void>;
     listVaults: () => Promise<import("@1password/sdk").VaultOverview[]>;
     getItem: (vaultId: string, itemId: string) => Promise<import("@1password/sdk").Item>;

package/onePassword/OnePasswordNamespace.js

@@ -36,9 +36,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OnePasswordNamespace = void 0;
 const _class_1 = require("../_class");
 class OnePasswordNamespace extends _class_1.BaseNamespace {
-    constructor(key, config) {
-        super(key, config);
-        this.client = null;
+    constructor() {
+        super(...arguments);
         // Async setup to only initialise where required
         this.ensureInit = async () => {
             if (!this.client) {
@@ -76,6 +75,5 @@ class OnePasswordNamespace extends _class_1.BaseNamespace {
             return this.client.items.list(vaultId);
         };
     }
-    ;
 }
 exports.OnePasswordNamespace = OnePasswordNamespace;

package/openAi/OpenAiNamespace.js

@@ -6,8 +6,6 @@ const axios_1 = require("../axios");
 class OpenAiNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
-        this.config = null;
         /**
          * Renew the access token as it expires every 3 hours.
          */

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@8ms/helpers",
 	"license": "UNLICENSED",
-	"version": "2.0.7",
+	"version": "2.0.9",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"

package/prisma/PrismaNamespace.js

@@ -38,24 +38,28 @@ const _class_1 = require("../_class");
 class PrismaNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
-        this.config = null;
         // Async setup to only initialise where required
         this.ensureInit = async () => {
             if (!this.client) {
-                try {
-                    const { PrismaClient } = await Promise.resolve().then(() => __importStar(require("@prisma/client")));
-                    let adapter;
-                    if (this.config.isPlanetScale) {
+                let adapter;
+                if (this.config.isPlanetScale) {
+                    try {
                         const { PrismaPlanetScale } = await Promise.resolve().then(() => __importStar(require("@prisma/adapter-planetscale")));
                         adapter = new PrismaPlanetScale({
                             url: this.config.url,
                         });
                     }
+                    catch (e) {
+                        throw new Error("PlanetScale Client not installed");
+                    }
+                }
+                try {
+                    const { PrismaClient } = await Promise.resolve().then(() => __importStar(require("@prisma/client")));
                     // Show the full query if debugging
                     if (this.config.isDebug) {
                         this.client = new PrismaClient({
                             adapter,
+                            datasourceUrl: this.config.url,
                             log: [
                                 {
                                     emit: "event",
@@ -66,11 +70,14 @@ class PrismaNamespace extends _class_1.BaseNamespace {
                     }
                     // Standard prisma
                     else {
-                        this.client = new PrismaClient({ adapter });
+                        this.client = new PrismaClient({
+                            adapter,
+                            datasourceUrl: this.config.url,
+                        });
                     }
                 }
                 catch (e) {
-                    throw new Error("Prisma / PlanetScale Client not installed");
+                    throw new Error("Prisma Client not installed");
                 }
             }
         };

package/prisma/server.js

@@ -21,6 +21,7 @@ const prismaClient = async (key = "default", config) => {
         }
     }
     const namespace = new PrismaNamespace_1.PrismaNamespace(key, config);
+    await namespace.ensureInit();
     prismaNamespaces.set(key, namespace);
     return namespace;
 };

package/snapchat/SnapchatNamespace.js

@@ -7,8 +7,6 @@ const luxon_1 = require("luxon");
 class SnapchatNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
-        this.config = null;
         /**
          * Renew the access token as it expires every 3 hours.
          */
@@ -19,7 +17,8 @@ class SnapchatNamespace extends _class_1.BaseNamespace {
                 const apiResponse = await (0, axios_1.post)(url);
                 if (apiResponse.isSuccess()) {
                     this.client = {
-                        expires: luxon_1.DateTime.now().toUnixInteger() + (3 * 60 * 60 * 1000),
+                        expires: luxon_1.DateTime.now()
+                            .toUnixInteger() + (3 * 60 * 60 * 1000),
                         refreshToken: apiResponse.getBodyDefaultTo(["data", "access_token"], null)
                     };
                 }

package/upTimeRobot/UpTimeRobotNamespace.js

@@ -14,8 +14,6 @@ const isArray_1 = __importDefault(require("lodash/isArray"));
 class UpTimeRobotNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
-        this.client = null;
-        this.config = null;
         /**
          * Renew the access token as it expires every 3 hours.
          */