update non-esm packages

Author: howardchung

package-lock.json

@@ -31,7 +31,7 @@
     "url": "http://github.com/odota/core"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.726.0",
+    "@aws-sdk/client-s3": "^3.879.0",
     "@elastic/elasticsearch": "^7.17.14",
     "ansi-colors": "^4.1.3",
     "axios": "^1.7.9",
@@ -50,7 +50,7 @@
     "moment": "^2.30.1",
     "passport": "^0.5.3",
     "passport-steam": "^1.0.18",
-    "pg": "^8.13.1",
+    "pg": "^8.16.3",
     "pg-query-stream": "^4.7.1",
     "pm2": "^6.0.8",
     "protobufjs": "^7.2.5",

package.json

@@ -1,6 +1,6 @@
 import constants from 'dotaconstants';
 import moment from 'moment';
-import pg from 'pg';
+import { Client } from 'pg';
 import config from '../../config.ts';
 import { addJob, addReliableJob, getReliableJob } from '../store/queue.ts';
 import { search } from '../store/search.ts';
@@ -50,7 +50,6 @@ import {
   getItemTimings,
   isSubscriber,
 } from '../util/queries.ts';
-const { Client } = pg;
 import heroParams from './requests/heroParams.ts';
 import leagueParams from './requests/leagueParams.ts';
 import matchParams from './requests/matchParams.ts';

svc/api/spec.ts

@@ -1,12 +1,10 @@
 import type { PutObjectCommandInput, PutObjectCommandOutput } from '@aws-sdk/client-s3';
 import config from '../../config.ts';
 import { gzipSync, gunzipSync } from 'zlib';
-import s3 from '@aws-sdk/client-s3';
+import { S3Client, PutObjectCommand, GetObjectCommand } from '@aws-sdk/client-s3';
 import { redisCount } from '../util/utility.ts';
 import axios from 'axios';
 
-const { S3Client, PutObjectCommand, GetObjectCommand } = s3;
-
 async function stream2buffer(stream: any): Promise<Buffer> {
   return new Promise((resolve, reject) => {
     const _buf: any[] = [];
@@ -21,7 +19,7 @@ class Archive {
   private accessKeyId: string = '';
   private secretAccessKey: string = '';
   private bucket: string = '';
-  private client: s3.S3Client | null = null;
+  private client: S3Client | null = null;
   constructor(type: 'match' | 'player' | 'blob') {
     this.endpoint = config.ARCHIVE_S3_ENDPOINT;
     this.accessKeyId = config.ARCHIVE_S3_KEY_ID;

svc/store/archive.ts

@@ -1,8 +1,8 @@
-import pg from 'pg';
+import { types } from 'pg';
 import knex from 'knex';
 import config from '../../config.ts';
 // remember: all values returned from the server are either NULL or a string
-pg.types.setTypeParser(20, (val) => (val === null ? null : parseInt(val, 10)));
+types.setTypeParser(20, (val) => (val === null ? null : parseInt(val, 10)));
 console.log('connecting %s', config.POSTGRES_URL);
 export const db = knex({
   client: 'pg',

svc/store/db.ts

@@ -3,11 +3,9 @@ import redis from './redis.ts';
 import db from './db.ts';
 import { Redis } from 'ioredis';
 import config from '../../config.ts';
-import pg from 'pg';
+import { Client } from 'pg';
 import c from 'ansi-colors';
 
-const { Client } = pg;
-
 moment.relativeTimeThreshold('ss', 0);
 
 export async function runQueue(

svc/store/queue.ts

@@ -1,15 +1,13 @@
 import config from '../../config.ts';
 import { matchArchive, playerArchive } from '../store/archive.ts';
 import QueryStream from 'pg-query-stream';
-import pg from 'pg';
+import { Client } from 'pg';
 import db from '../store/db.ts';
 import type { PutObjectCommandOutput } from '@aws-sdk/client-s3';
 import { getFullPlayerMatchesWithMetadata } from './buildPlayer.ts';
 import { getMatchDataFromBlobWithMetadata } from './buildMatch.ts';
 import { isDataComplete, randomInt, redisCount } from './utility.ts';
 
-const { Client } = pg;
-
 async function processMatch(matchId: number) {
   // Check if we should archive the blobs (should be parsed and not archived)
   // const isParsed = await checkIsParsed(matchId);

svc/util/archiveUtil.ts

@@ -8,7 +8,7 @@ import nock from 'nock';
 import assert from 'assert';
 import supertest from 'supertest';
 import stripe from '../svc/store/stripe.ts';
-import pg from 'pg';
+import { Pool } from 'pg';
 import { readFileSync } from 'fs';
 import url from 'url';
 import { Client } from 'cassandra-driver';
@@ -31,11 +31,8 @@ import redis from '../svc/store/redis.ts';
 import db from '../svc/store/db.ts';
 import cassandra from '../svc/store/cassandra.ts';
 import c from 'ansi-colors';
-import s3 from '@aws-sdk/client-s3';
+import { CreateBucketCommand, S3Client } from '@aws-sdk/client-s3';
 
-const { CreateBucketCommand, S3Client } = s3;
-
-const { Pool } = pg;
 const { RETRIEVER_HOST, POSTGRES_URL, CASSANDRA_URL } = config;
 const initPostgresHost = POSTGRES_URL.replace('/yasp_test', '/postgres');
 const initCassandraHost = url.parse(CASSANDRA_URL).host as string;

test/test.ts

@@ -1,11 +1,10 @@
 {
   "compilerOptions": {
     "target": "es2020",
-    "module": "NodeNext",
+    "module": "nodenext",
     "allowJs": true,
     "strict": true,
     "esModuleInterop": true,
-    "outDir": "./build",
     "resolveJsonModule": true,
     "noEmit": true,
     "allowImportingTsExtensions": true